diff options
383 files changed, 2192 insertions, 1533 deletions
diff --git a/apps/comments/l10n/sl.js b/apps/comments/l10n/sl.js index ff0fc49ac49..b4b78e55571 100644 --- a/apps/comments/l10n/sl.js +++ b/apps/comments/l10n/sl.js @@ -1,7 +1,7 @@ OC.L10N.register( "comments", { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komentarji</strong> za datoteke <em>(vedno prikaži)</em>", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Opombe</strong> k datotekam <em>(vedno pokaži)</em>", "You commented" : "Vaša opomba", "%1$s commented" : "%1$s opomb", "You commented on %2$s" : "Napisali ste opombo na %2$s", diff --git a/apps/comments/l10n/sl.json b/apps/comments/l10n/sl.json index 3efe21ae26e..0a1af42d80c 100644 --- a/apps/comments/l10n/sl.json +++ b/apps/comments/l10n/sl.json @@ -1,5 +1,5 @@ { "translations": { - "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komentarji</strong> za datoteke <em>(vedno prikaži)</em>", + "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Opombe</strong> k datotekam <em>(vedno pokaži)</em>", "You commented" : "Vaša opomba", "%1$s commented" : "%1$s opomb", "You commented on %2$s" : "Napisali ste opombo na %2$s", diff --git a/apps/dav/appinfo/v1/publicwebdav.php b/apps/dav/appinfo/v1/publicwebdav.php index 43fedb19415..39c169728b9 100644 --- a/apps/dav/appinfo/v1/publicwebdav.php +++ b/apps/dav/appinfo/v1/publicwebdav.php @@ -55,7 +55,9 @@ $linkCheckPlugin = new \OCA\DAV\Files\Sharing\PublicLinkCheckPlugin(); $server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin) { $isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest'); - if (OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled() === false && !$isAjax) { + $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing'); + $federatedShareProvider = $federatedSharingApp->getFederatedShareProvider(); + if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) { // this is what is thrown when trying to access a non-existing share throw new \Sabre\DAV\Exception\NotAuthenticated(); } diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js index de064986950..4b3e9e44520 100644 --- a/apps/encryption/l10n/de.js +++ b/apps/encryption/l10n/de.js @@ -34,7 +34,7 @@ OC.L10N.register( "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.", "Cheers!" : "Noch einen schönen Tag!", "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hey,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melde dich im Web-Interface an, gehe in deine persönlichen Einstellungen. Dort findest du die Option 'ownCloud-Basisverschlüsselungsmodul' und aktualisiere dort dein Verschlüsselungspasswort indem du das Passwort in das 'alte Log - in Passwort' und in das 'aktuellen Login - Passwort' Feld eingibst.<br><br>", - "Encrypt the home storage" : "verschlüssel den Speicher", + "Encrypt the home storage" : "Verschlüssle den Speicher", "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt", "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren", "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren", diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json index 53754dcc4c8..f37c9e040fb 100644 --- a/apps/encryption/l10n/de.json +++ b/apps/encryption/l10n/de.json @@ -32,7 +32,7 @@ "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.", "Cheers!" : "Noch einen schönen Tag!", "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hey,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melde dich im Web-Interface an, gehe in deine persönlichen Einstellungen. Dort findest du die Option 'ownCloud-Basisverschlüsselungsmodul' und aktualisiere dort dein Verschlüsselungspasswort indem du das Passwort in das 'alte Log - in Passwort' und in das 'aktuellen Login - Passwort' Feld eingibst.<br><br>", - "Encrypt the home storage" : "verschlüssel den Speicher", + "Encrypt the home storage" : "Verschlüssle den Speicher", "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt", "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren", "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren", diff --git a/apps/federatedfilesharing/appinfo/app.php b/apps/federatedfilesharing/appinfo/app.php index 804ab69759c..23af62037a3 100644 --- a/apps/federatedfilesharing/appinfo/app.php +++ b/apps/federatedfilesharing/appinfo/app.php @@ -21,7 +21,5 @@ namespace OCA\FederatedFileSharing\AppInfo; -use OCP\AppFramework\App; - -new App('federatedfilesharing'); - +$app = new Application('federatedfilesharing'); +$app->registerSettings(); diff --git a/apps/federatedfilesharing/appinfo/application.php b/apps/federatedfilesharing/appinfo/application.php new file mode 100644 index 00000000000..5a213aec8e2 --- /dev/null +++ b/apps/federatedfilesharing/appinfo/application.php @@ -0,0 +1,88 @@ +<?php +/** + * @author Björn Schießle <schiessle@owncloud.com> + * + * @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\FederatedFileSharing\AppInfo; + + +use OCA\FederatedFileSharing\FederatedShareProvider; +use OCP\AppFramework\App; + +class Application extends App { + + /** @var FederatedShareProvider */ + protected $federatedShareProvider; + + /** + * register personal and admin settings page + */ + public function registerSettings() { + \OCP\App::registerAdmin('federatedfilesharing', 'settings-admin'); + \OCP\App::registerPersonal('federatedfilesharing', 'settings-personal'); + } + + /** + * get instance of federated share provider + * + * @return FederatedShareProvider + */ + public function getFederatedShareProvider() { + if ($this->federatedShareProvider === null) { + $this->initFederatedShareProvider(); + } + return $this->federatedShareProvider; + } + + /** + * initialize federated share provider + */ + protected function initFederatedShareProvider() { + $addressHandler = new \OCA\FederatedFileSharing\AddressHandler( + \OC::$server->getURLGenerator(), + \OC::$server->getL10N('federatedfilesharing') + ); + $discoveryManager = new \OCA\FederatedFileSharing\DiscoveryManager( + \OC::$server->getMemCacheFactory(), + \OC::$server->getHTTPClientService() + ); + $notifications = new \OCA\FederatedFileSharing\Notifications( + $addressHandler, + \OC::$server->getHTTPClientService(), + $discoveryManager, + \OC::$server->getJobList() + ); + $tokenHandler = new \OCA\FederatedFileSharing\TokenHandler( + \OC::$server->getSecureRandom() + ); + + $this->federatedShareProvider = new \OCA\FederatedFileSharing\FederatedShareProvider( + \OC::$server->getDatabaseConnection(), + $addressHandler, + $notifications, + $tokenHandler, + \OC::$server->getL10N('federatedfilesharing'), + \OC::$server->getLogger(), + \OC::$server->getLazyRootFolder(), + \OC::$server->getConfig() + ); + } + +} diff --git a/apps/files_sharing/css/3rdparty/gs-share/style.css b/apps/federatedfilesharing/css/3rdparty/gs-share/style.css index c699ddb3db5..c699ddb3db5 100644 --- a/apps/files_sharing/css/3rdparty/gs-share/style.css +++ b/apps/federatedfilesharing/css/3rdparty/gs-share/style.css diff --git a/apps/files_sharing/css/settings-personal.css b/apps/federatedfilesharing/css/settings-personal.css index f53365c9371..f53365c9371 100644 --- a/apps/files_sharing/css/settings-personal.css +++ b/apps/federatedfilesharing/css/settings-personal.css diff --git a/apps/files_sharing/img/social-diaspora.svg b/apps/federatedfilesharing/img/social-diaspora.svg index 1d5131129a9..1d5131129a9 100644 --- a/apps/files_sharing/img/social-diaspora.svg +++ b/apps/federatedfilesharing/img/social-diaspora.svg diff --git a/apps/files_sharing/img/social-facebook.svg b/apps/federatedfilesharing/img/social-facebook.svg index aad02bc3853..aad02bc3853 100644 --- a/apps/files_sharing/img/social-facebook.svg +++ b/apps/federatedfilesharing/img/social-facebook.svg diff --git a/apps/files_sharing/img/social-gnu.svg b/apps/federatedfilesharing/img/social-gnu.svg index 24556aaa024..24556aaa024 100644 --- a/apps/files_sharing/img/social-gnu.svg +++ b/apps/federatedfilesharing/img/social-gnu.svg diff --git a/apps/files_sharing/img/social-googleplus.svg b/apps/federatedfilesharing/img/social-googleplus.svg index 123273f2d38..123273f2d38 100644 --- a/apps/files_sharing/img/social-googleplus.svg +++ b/apps/federatedfilesharing/img/social-googleplus.svg diff --git a/apps/files_sharing/img/social-twitter.svg b/apps/federatedfilesharing/img/social-twitter.svg index 00ce390de6b..00ce390de6b 100644 --- a/apps/files_sharing/img/social-twitter.svg +++ b/apps/federatedfilesharing/img/social-twitter.svg diff --git a/apps/files_sharing/js/3rdparty/gs-share/gs-share.js b/apps/federatedfilesharing/js/3rdparty/gs-share/gs-share.js index fd4442708a4..fd4442708a4 100644 --- a/apps/files_sharing/js/3rdparty/gs-share/gs-share.js +++ b/apps/federatedfilesharing/js/3rdparty/gs-share/gs-share.js diff --git a/apps/files_sharing/js/settings-admin.js b/apps/federatedfilesharing/js/settings-admin.js index 95578bff548..95578bff548 100644 --- a/apps/files_sharing/js/settings-admin.js +++ b/apps/federatedfilesharing/js/settings-admin.js diff --git a/apps/files_sharing/js/settings-personal.js b/apps/federatedfilesharing/js/settings-personal.js index 14a9b7bbfa7..14a9b7bbfa7 100644 --- a/apps/files_sharing/js/settings-personal.js +++ b/apps/federatedfilesharing/js/settings-personal.js diff --git a/apps/federatedfilesharing/l10n/az.js b/apps/federatedfilesharing/l10n/az.js new file mode 100644 index 00000000000..023c4560256 --- /dev/null +++ b/apps/federatedfilesharing/l10n/az.js @@ -0,0 +1,9 @@ +OC.L10N.register( + "federatedfilesharing", + { + "Federated Cloud Sharing" : "Federal Cloud Paylaşım", + "Open documentation" : "Sənədləri aç", + "Allow users on this server to send shares to other servers" : "Bu serverdən digər serverlərə istifadəçilər tərəfindən paylaşımın göndərilməsinə izin vermək", + "Allow users on this server to receive shares from other servers" : "Digər serverlərdən bu serverə istifadəçilər tərəfindən paylaşımın ötürülməsinə izin vermək" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/az.json b/apps/federatedfilesharing/l10n/az.json new file mode 100644 index 00000000000..c6c2f05ad13 --- /dev/null +++ b/apps/federatedfilesharing/l10n/az.json @@ -0,0 +1,7 @@ +{ "translations": { + "Federated Cloud Sharing" : "Federal Cloud Paylaşım", + "Open documentation" : "Sənədləri aç", + "Allow users on this server to send shares to other servers" : "Bu serverdən digər serverlərə istifadəçilər tərəfindən paylaşımın göndərilməsinə izin vermək", + "Allow users on this server to receive shares from other servers" : "Digər serverlərdən bu serverə istifadəçilər tərəfindən paylaşımın ötürülməsinə izin vermək" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/bg_BG.js b/apps/federatedfilesharing/l10n/bg_BG.js index e65e1d0ce3a..4221613faeb 100644 --- a/apps/federatedfilesharing/l10n/bg_BG.js +++ b/apps/federatedfilesharing/l10n/bg_BG.js @@ -2,6 +2,9 @@ OC.L10N.register( "federatedfilesharing", { "Sharing %s failed, because this item is already shared with %s" : "Неуспешно споделяне на %s, защото това съдържание е вече споделено с %s.", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Неуспешно споделяне на на %s, не може бъде намерено %s. Може би сървъра в момента е недостъпен." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Неуспешно споделяне на на %s, не може бъде намерено %s. Може би сървъра в момента е недостъпен.", + "Open documentation" : "Отвори документацията", + "Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки с други сървъри", + "Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/bg_BG.json b/apps/federatedfilesharing/l10n/bg_BG.json index 5e78abddff6..4a80df95c1d 100644 --- a/apps/federatedfilesharing/l10n/bg_BG.json +++ b/apps/federatedfilesharing/l10n/bg_BG.json @@ -1,5 +1,8 @@ { "translations": { "Sharing %s failed, because this item is already shared with %s" : "Неуспешно споделяне на %s, защото това съдържание е вече споделено с %s.", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Неуспешно споделяне на на %s, не може бъде намерено %s. Може би сървъра в момента е недостъпен." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Неуспешно споделяне на на %s, не може бъде намерено %s. Може би сървъра в момента е недостъпен.", + "Open documentation" : "Отвори документацията", + "Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки с други сървъри", + "Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/ca.js b/apps/federatedfilesharing/l10n/ca.js index 0b5c16a0239..bc2ea1e51c6 100644 --- a/apps/federatedfilesharing/l10n/ca.js +++ b/apps/federatedfilesharing/l10n/ca.js @@ -1,6 +1,7 @@ OC.L10N.register( "federatedfilesharing", { - "Sharing %s failed, because this item is already shared with %s" : "Ha fallat en compartir %s, perquè l'element ja està compartit amb %s" + "Sharing %s failed, because this item is already shared with %s" : "Ha fallat en compartir %s, perquè l'element ja està compartit amb %s", + "Open documentation" : "Obre la documentació" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/ca.json b/apps/federatedfilesharing/l10n/ca.json index efff946dabd..9ac1be24429 100644 --- a/apps/federatedfilesharing/l10n/ca.json +++ b/apps/federatedfilesharing/l10n/ca.json @@ -1,4 +1,5 @@ { "translations": { - "Sharing %s failed, because this item is already shared with %s" : "Ha fallat en compartir %s, perquè l'element ja està compartit amb %s" + "Sharing %s failed, because this item is already shared with %s" : "Ha fallat en compartir %s, perquè l'element ja està compartit amb %s", + "Open documentation" : "Obre la documentació" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/cs_CZ.js b/apps/federatedfilesharing/l10n/cs_CZ.js index fc3eeda97b3..2a5790b4584 100644 --- a/apps/federatedfilesharing/l10n/cs_CZ.js +++ b/apps/federatedfilesharing/l10n/cs_CZ.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Neplatné sdružené cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena", "Not allowed to create a federated share with the same user" : "Není povoleno vytvořit propojené sdílení s tím samým uživatelem", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sdílení %s selhalo, %s se nepodařilo nalézt, server pravděpodobně právě není dostupný." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sdílení %s selhalo, %s se nepodařilo nalézt, server pravděpodobně právě není dostupný.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID", + "Federated Cloud Sharing" : "Propojené cloudové sdílení", + "Open documentation" : "Otevřít dokumentaci", + "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery", + "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů", + "Federated Cloud" : "Sdružený cloud", + "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:", + "Share it:" : "Sdílet:", + "Add to your website" : "Přidat na svou webovou stránku", + "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud", + "HTML Code:" : "HTML kód:" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/federatedfilesharing/l10n/cs_CZ.json b/apps/federatedfilesharing/l10n/cs_CZ.json index 04ce3315c7f..f3c057af1b0 100644 --- a/apps/federatedfilesharing/l10n/cs_CZ.json +++ b/apps/federatedfilesharing/l10n/cs_CZ.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Neplatné sdružené cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena", "Not allowed to create a federated share with the same user" : "Není povoleno vytvořit propojené sdílení s tím samým uživatelem", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sdílení %s selhalo, %s se nepodařilo nalézt, server pravděpodobně právě není dostupný." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sdílení %s selhalo, %s se nepodařilo nalézt, server pravděpodobně právě není dostupný.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID", + "Federated Cloud Sharing" : "Propojené cloudové sdílení", + "Open documentation" : "Otevřít dokumentaci", + "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery", + "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů", + "Federated Cloud" : "Sdružený cloud", + "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:", + "Share it:" : "Sdílet:", + "Add to your website" : "Přidat na svou webovou stránku", + "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud", + "HTML Code:" : "HTML kód:" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/da.js b/apps/federatedfilesharing/l10n/da.js index 0b113d6ae4f..7d9959e030b 100644 --- a/apps/federatedfilesharing/l10n/da.js +++ b/apps/federatedfilesharing/l10n/da.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Ugyldigt Federated Cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Der skete en fejl ved deling af %s, objektet er allerede delt med %s", "Not allowed to create a federated share with the same user" : "Det er ikke tilladt at danne et datafællesskab med samme bruger", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling af %s mislykkedes - kunne ikke finde %s. Måske er serveren ikke tilgængelig i øjeblikket." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling af %s mislykkedes - kunne ikke finde %s. Måske er serveren ikke tilgængelig i øjeblikket.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID", + "Federated Cloud Sharing" : "Sammensluttet Cloud deling", + "Open documentation" : "Åben dokumentation", + "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere", + "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Din Federated Cloud ID:", + "Share it:" : "Del:", + "Add to your website" : "Tilføj til dit websted", + "Share with me via ownCloud" : "Del med mig gennem ownCloud", + "HTML Code:" : "HTMLkode:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/da.json b/apps/federatedfilesharing/l10n/da.json index 3f4e82b0528..1994feb6884 100644 --- a/apps/federatedfilesharing/l10n/da.json +++ b/apps/federatedfilesharing/l10n/da.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Ugyldigt Federated Cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Der skete en fejl ved deling af %s, objektet er allerede delt med %s", "Not allowed to create a federated share with the same user" : "Det er ikke tilladt at danne et datafællesskab med samme bruger", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling af %s mislykkedes - kunne ikke finde %s. Måske er serveren ikke tilgængelig i øjeblikket." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling af %s mislykkedes - kunne ikke finde %s. Måske er serveren ikke tilgængelig i øjeblikket.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID", + "Federated Cloud Sharing" : "Sammensluttet Cloud deling", + "Open documentation" : "Åben dokumentation", + "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere", + "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Din Federated Cloud ID:", + "Share it:" : "Del:", + "Add to your website" : "Tilføj til dit websted", + "Share with me via ownCloud" : "Del med mig gennem ownCloud", + "HTML Code:" : "HTMLkode:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/de.js b/apps/federatedfilesharing/l10n/de.js index 4831e514990..ab90b424dc5 100644 --- a/apps/federatedfilesharing/l10n/de.js +++ b/apps/federatedfilesharing/l10n/de.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Ungültige Federated-Cloud-ID", "Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird", "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID", + "Federated Cloud Sharing" : "Federated-Cloud-Sharing", + "Open documentation" : "Dokumentation öffnen", + "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", + "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", + "Share it:" : "Zum Teilen:", + "Add to your website" : "Zu deiner Webseite hinzufügen", + "Share with me via ownCloud" : "Teile mit mir über ownCloud", + "HTML Code:" : "HTML-Code:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/de.json b/apps/federatedfilesharing/l10n/de.json index b6ea0174877..3fd04ae7ec6 100644 --- a/apps/federatedfilesharing/l10n/de.json +++ b/apps/federatedfilesharing/l10n/de.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Ungültige Federated-Cloud-ID", "Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird", "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID", + "Federated Cloud Sharing" : "Federated-Cloud-Sharing", + "Open documentation" : "Dokumentation öffnen", + "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", + "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", + "Share it:" : "Zum Teilen:", + "Add to your website" : "Zu deiner Webseite hinzufügen", + "Share with me via ownCloud" : "Teile mit mir über ownCloud", + "HTML Code:" : "HTML-Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/de_DE.js b/apps/federatedfilesharing/l10n/de_DE.js index bbedbf1da43..c2c336ad9db 100644 --- a/apps/federatedfilesharing/l10n/de_DE.js +++ b/apps/federatedfilesharing/l10n/de_DE.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Ungültige Federated-Cloud-ID", "Sharing %s failed, because this item is already shared with %s" : "Die Freigabe von %s ist fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird", "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Die Freigabe von %s ist fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Die Freigabe von %s ist fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID", + "Federated Cloud Sharing" : "Federated-Cloud-Sharing", + "Open documentation" : "Dokumentation öffnen", + "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", + "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", + "Share it:" : "Zum Teilen:", + "Add to your website" : "Zu Ihrer Website hinzufügen", + "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud", + "HTML Code:" : "HTML-Code:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/de_DE.json b/apps/federatedfilesharing/l10n/de_DE.json index 6fb0aead190..840827cbb08 100644 --- a/apps/federatedfilesharing/l10n/de_DE.json +++ b/apps/federatedfilesharing/l10n/de_DE.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Ungültige Federated-Cloud-ID", "Sharing %s failed, because this item is already shared with %s" : "Die Freigabe von %s ist fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird", "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Die Freigabe von %s ist fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Die Freigabe von %s ist fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID", + "Federated Cloud Sharing" : "Federated-Cloud-Sharing", + "Open documentation" : "Dokumentation öffnen", + "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", + "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", + "Share it:" : "Zum Teilen:", + "Add to your website" : "Zu Ihrer Website hinzufügen", + "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud", + "HTML Code:" : "HTML-Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/el.js b/apps/federatedfilesharing/l10n/el.js index b501a4007ea..23d0c9ae6cf 100644 --- a/apps/federatedfilesharing/l10n/el.js +++ b/apps/federatedfilesharing/l10n/el.js @@ -3,6 +3,18 @@ OC.L10N.register( { "Invalid Federated Cloud ID" : "Μη έγκυρο Federated Cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο ήδη με τον χρήστη %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Αποτυχία διαμοιρασμού %s, δεν βρέθηκε το %s, μπορεί ο διακομιστής να είναι προσωρινά απροσπέλαστος." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Αποτυχία διαμοιρασμού %s, δεν βρέθηκε το %s, μπορεί ο διακομιστής να είναι προσωρινά απροσπέλαστος.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου", + "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ", + "Open documentation" : "Ανοιχτή τεκμηρίωση.", + "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", + "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές", + "Federated Cloud" : "Federated σύννεφο", + "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", + "Share it:" : "Μοιραστείτε το:", + "Add to your website" : "Προσθήκη στην ιστοσελίδα σας", + "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", + "HTML Code:" : "Κώδικας HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/el.json b/apps/federatedfilesharing/l10n/el.json index ece127aa7d1..bd133b05cd2 100644 --- a/apps/federatedfilesharing/l10n/el.json +++ b/apps/federatedfilesharing/l10n/el.json @@ -1,6 +1,18 @@ { "translations": { "Invalid Federated Cloud ID" : "Μη έγκυρο Federated Cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο ήδη με τον χρήστη %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Αποτυχία διαμοιρασμού %s, δεν βρέθηκε το %s, μπορεί ο διακομιστής να είναι προσωρινά απροσπέλαστος." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Αποτυχία διαμοιρασμού %s, δεν βρέθηκε το %s, μπορεί ο διακομιστής να είναι προσωρινά απροσπέλαστος.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου", + "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ", + "Open documentation" : "Ανοιχτή τεκμηρίωση.", + "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", + "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές", + "Federated Cloud" : "Federated σύννεφο", + "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", + "Share it:" : "Μοιραστείτε το:", + "Add to your website" : "Προσθήκη στην ιστοσελίδα σας", + "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", + "HTML Code:" : "Κώδικας HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/en_GB.js b/apps/federatedfilesharing/l10n/en_GB.js index 9b4cccd8731..de214687f99 100644 --- a/apps/federatedfilesharing/l10n/en_GB.js +++ b/apps/federatedfilesharing/l10n/en_GB.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Invalid Federated Cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s", "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sharing %s failed, could not find %s, maybe the server is currently unreachable." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sharing %s failed, could not find %s, maybe the server is currently unreachable.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Share with me through my #ownCloud Federated Cloud ID, see %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Share with me through my #ownCloud Federated Cloud ID", + "Federated Cloud Sharing" : "Federated Cloud Sharing", + "Open documentation" : "Open documentation", + "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", + "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Your Federated Cloud ID:", + "Share it:" : "Share it:", + "Add to your website" : "Add to your website", + "Share with me via ownCloud" : "Share with me via ownCloud", + "HTML Code:" : "HTML Code:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/en_GB.json b/apps/federatedfilesharing/l10n/en_GB.json index 3193b3e59d9..05215fead67 100644 --- a/apps/federatedfilesharing/l10n/en_GB.json +++ b/apps/federatedfilesharing/l10n/en_GB.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Invalid Federated Cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s", "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sharing %s failed, could not find %s, maybe the server is currently unreachable." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sharing %s failed, could not find %s, maybe the server is currently unreachable.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Share with me through my #ownCloud Federated Cloud ID, see %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Share with me through my #ownCloud Federated Cloud ID", + "Federated Cloud Sharing" : "Federated Cloud Sharing", + "Open documentation" : "Open documentation", + "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", + "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Your Federated Cloud ID:", + "Share it:" : "Share it:", + "Add to your website" : "Add to your website", + "Share with me via ownCloud" : "Share with me via ownCloud", + "HTML Code:" : "HTML Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/eo.js b/apps/federatedfilesharing/l10n/eo.js index 706f4ff43af..18a502628bf 100644 --- a/apps/federatedfilesharing/l10n/eo.js +++ b/apps/federatedfilesharing/l10n/eo.js @@ -2,6 +2,16 @@ OC.L10N.register( "federatedfilesharing", { "Sharing %s failed, because this item is already shared with %s" : "Kunhavigo de %s malsukcesis, ĉar la ero jam kunhavatas kun %s", - "Not allowed to create a federated share with the same user" : "Vi ne permesas krei federan kunhavon kun la sama uzanto" + "Not allowed to create a federated share with the same user" : "Vi ne permesas krei federan kunhavon kun la sama uzanto", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Kunhavigi kun mi per mia identigilo de #ownCloud-federnuba identigilo; vidu %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Kunhavigi kun mi per mia #ownCloud-federnuba identigilo", + "Federated Cloud Sharing" : "Federnuba kunhavado", + "Open documentation" : "Malfermi la dokumentaron", + "Federated Cloud" : "Federa nubo", + "Your Federated Cloud ID:" : "Via federnuba identigilo:", + "Share it:" : "Kunhavigi ĝin:", + "Add to your website" : "Aldoni al via TTT-ejo", + "Share with me via ownCloud" : "Kunhavigi kun mi per ownCloud", + "HTML Code:" : "HTML-kodo:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/eo.json b/apps/federatedfilesharing/l10n/eo.json index 169e5314f39..3396c643076 100644 --- a/apps/federatedfilesharing/l10n/eo.json +++ b/apps/federatedfilesharing/l10n/eo.json @@ -1,5 +1,15 @@ { "translations": { "Sharing %s failed, because this item is already shared with %s" : "Kunhavigo de %s malsukcesis, ĉar la ero jam kunhavatas kun %s", - "Not allowed to create a federated share with the same user" : "Vi ne permesas krei federan kunhavon kun la sama uzanto" + "Not allowed to create a federated share with the same user" : "Vi ne permesas krei federan kunhavon kun la sama uzanto", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Kunhavigi kun mi per mia identigilo de #ownCloud-federnuba identigilo; vidu %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Kunhavigi kun mi per mia #ownCloud-federnuba identigilo", + "Federated Cloud Sharing" : "Federnuba kunhavado", + "Open documentation" : "Malfermi la dokumentaron", + "Federated Cloud" : "Federa nubo", + "Your Federated Cloud ID:" : "Via federnuba identigilo:", + "Share it:" : "Kunhavigi ĝin:", + "Add to your website" : "Aldoni al via TTT-ejo", + "Share with me via ownCloud" : "Kunhavigi kun mi per ownCloud", + "HTML Code:" : "HTML-kodo:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/es.js b/apps/federatedfilesharing/l10n/es.js index 4fdd8545ece..9b39eb669ad 100644 --- a/apps/federatedfilesharing/l10n/es.js +++ b/apps/federatedfilesharing/l10n/es.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "ID Nube federada inválida", "Sharing %s failed, because this item is already shared with %s" : "Se falló al compartir %s, ya que este elemento ya está compartido con %s", "Not allowed to create a federated share with the same user" : "No se permite crear un recurso compartido federado con el mismo usuario", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Se falló al compartir %s. No se pudo hallar %s, quizás haya un problema de conexión con el servidor." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Se falló al compartir %s. No se pudo hallar %s, quizás haya un problema de conexión con el servidor.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud", + "Federated Cloud Sharing" : "Compartido en Cloud Federado", + "Open documentation" : "Documentación abierta", + "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores", + "Federated Cloud" : "Nube Federada", + "Your Federated Cloud ID:" : "Su ID Nube Federada:", + "Share it:" : "Compartir:", + "Add to your website" : "Añadir a su sitio web", + "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud", + "HTML Code:" : "Código HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/es.json b/apps/federatedfilesharing/l10n/es.json index 532139b87a6..a23dfe6c2e9 100644 --- a/apps/federatedfilesharing/l10n/es.json +++ b/apps/federatedfilesharing/l10n/es.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "ID Nube federada inválida", "Sharing %s failed, because this item is already shared with %s" : "Se falló al compartir %s, ya que este elemento ya está compartido con %s", "Not allowed to create a federated share with the same user" : "No se permite crear un recurso compartido federado con el mismo usuario", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Se falló al compartir %s. No se pudo hallar %s, quizás haya un problema de conexión con el servidor." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Se falló al compartir %s. No se pudo hallar %s, quizás haya un problema de conexión con el servidor.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud", + "Federated Cloud Sharing" : "Compartido en Cloud Federado", + "Open documentation" : "Documentación abierta", + "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores", + "Federated Cloud" : "Nube Federada", + "Your Federated Cloud ID:" : "Su ID Nube Federada:", + "Share it:" : "Compartir:", + "Add to your website" : "Añadir a su sitio web", + "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud", + "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/et_EE.js b/apps/federatedfilesharing/l10n/et_EE.js index ccb134f4878..13ba34661e9 100644 --- a/apps/federatedfilesharing/l10n/et_EE.js +++ b/apps/federatedfilesharing/l10n/et_EE.js @@ -1,6 +1,13 @@ OC.L10N.register( "federatedfilesharing", { - "Sharing %s failed, because this item is already shared with %s" : "%s jagamine ebaõnnestus, kuna see üksus on juba jagatud %s" + "Sharing %s failed, because this item is already shared with %s" : "%s jagamine ebaõnnestus, kuna see üksus on juba jagatud %s", + "Open documentation" : "Ava dokumentatsioon", + "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse", + "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest", + "Share it:" : "Jaga seda:", + "Add to your website" : "Lisa oma veebisaidile", + "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga", + "HTML Code:" : "HTML kood:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/et_EE.json b/apps/federatedfilesharing/l10n/et_EE.json index 58ddf74c295..fc605a5c4b1 100644 --- a/apps/federatedfilesharing/l10n/et_EE.json +++ b/apps/federatedfilesharing/l10n/et_EE.json @@ -1,4 +1,11 @@ { "translations": { - "Sharing %s failed, because this item is already shared with %s" : "%s jagamine ebaõnnestus, kuna see üksus on juba jagatud %s" + "Sharing %s failed, because this item is already shared with %s" : "%s jagamine ebaõnnestus, kuna see üksus on juba jagatud %s", + "Open documentation" : "Ava dokumentatsioon", + "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse", + "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest", + "Share it:" : "Jaga seda:", + "Add to your website" : "Lisa oma veebisaidile", + "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga", + "HTML Code:" : "HTML kood:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/eu.js b/apps/federatedfilesharing/l10n/eu.js index 6e033874bee..3539dcbfc34 100644 --- a/apps/federatedfilesharing/l10n/eu.js +++ b/apps/federatedfilesharing/l10n/eu.js @@ -2,6 +2,9 @@ OC.L10N.register( "federatedfilesharing", { "Sharing %s failed, because this item is already shared with %s" : "%s elkarbanatzeak huts egin du, dagoeneko %s erabiltzailearekin elkarbanatuta dagoelako", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s partekatzeak huts egin du, ezin da %s aurkitu, agian zerbitzaria orain ez dago eskuragarri." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s partekatzeak huts egin du, ezin da %s aurkitu, agian zerbitzaria orain ez dago eskuragarri.", + "Federated Cloud Sharing" : "Federatutako Hodei Partekatzea", + "Allow users on this server to send shares to other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzariekin partekatzera", + "Allow users on this server to receive shares from other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzarietatik partekatutakoak jasotzen" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/eu.json b/apps/federatedfilesharing/l10n/eu.json index 6c223f57545..c7df411a1a6 100644 --- a/apps/federatedfilesharing/l10n/eu.json +++ b/apps/federatedfilesharing/l10n/eu.json @@ -1,5 +1,8 @@ { "translations": { "Sharing %s failed, because this item is already shared with %s" : "%s elkarbanatzeak huts egin du, dagoeneko %s erabiltzailearekin elkarbanatuta dagoelako", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s partekatzeak huts egin du, ezin da %s aurkitu, agian zerbitzaria orain ez dago eskuragarri." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s partekatzeak huts egin du, ezin da %s aurkitu, agian zerbitzaria orain ez dago eskuragarri.", + "Federated Cloud Sharing" : "Federatutako Hodei Partekatzea", + "Allow users on this server to send shares to other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzariekin partekatzera", + "Allow users on this server to receive shares from other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzarietatik partekatutakoak jasotzen" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/fa.js b/apps/federatedfilesharing/l10n/fa.js new file mode 100644 index 00000000000..a96919f5252 --- /dev/null +++ b/apps/federatedfilesharing/l10n/fa.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "federatedfilesharing", + { + "Open documentation" : "بازکردن مستند", + "HTML Code:" : "کد HTML :" +}, +"nplurals=1; plural=0;"); diff --git a/apps/federatedfilesharing/l10n/fa.json b/apps/federatedfilesharing/l10n/fa.json new file mode 100644 index 00000000000..131e83df6d8 --- /dev/null +++ b/apps/federatedfilesharing/l10n/fa.json @@ -0,0 +1,5 @@ +{ "translations": { + "Open documentation" : "بازکردن مستند", + "HTML Code:" : "کد HTML :" +},"pluralForm" :"nplurals=1; plural=0;" +}
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/fi_FI.js b/apps/federatedfilesharing/l10n/fi_FI.js index 13d536cfe2c..5380916d11a 100644 --- a/apps/federatedfilesharing/l10n/fi_FI.js +++ b/apps/federatedfilesharing/l10n/fi_FI.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Virheellinen federoidun pilven tunniste", "Sharing %s failed, because this item is already shared with %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa", "Not allowed to create a federated share with the same user" : "Saman käyttäjän kanssa ei ole sallittua luoda federoitua jakoa", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Kohteen %s jakaminen epäonnistui, kohdetta %s ei löytynyt. Kenties palvelin ei ole juuri nyt tavoitettavissa." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Kohteen %s jakaminen epäonnistui, kohdetta %s ei löytynyt. Kenties palvelin ei ole juuri nyt tavoitettavissa.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta", + "Federated Cloud Sharing" : "Federoitu pilvijakaminen", + "Open documentation" : "Avaa dokumentaatio", + "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", + "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta", + "Federated Cloud" : "Federoitu pilvi", + "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", + "Share it:" : "Jaa se:", + "Add to your website" : "Lisää verkkosivuillesi", + "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta", + "HTML Code:" : "HTML-koodi:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/fi_FI.json b/apps/federatedfilesharing/l10n/fi_FI.json index e96f4c0582d..526c3883ef4 100644 --- a/apps/federatedfilesharing/l10n/fi_FI.json +++ b/apps/federatedfilesharing/l10n/fi_FI.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Virheellinen federoidun pilven tunniste", "Sharing %s failed, because this item is already shared with %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa", "Not allowed to create a federated share with the same user" : "Saman käyttäjän kanssa ei ole sallittua luoda federoitua jakoa", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Kohteen %s jakaminen epäonnistui, kohdetta %s ei löytynyt. Kenties palvelin ei ole juuri nyt tavoitettavissa." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Kohteen %s jakaminen epäonnistui, kohdetta %s ei löytynyt. Kenties palvelin ei ole juuri nyt tavoitettavissa.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta", + "Federated Cloud Sharing" : "Federoitu pilvijakaminen", + "Open documentation" : "Avaa dokumentaatio", + "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", + "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta", + "Federated Cloud" : "Federoitu pilvi", + "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", + "Share it:" : "Jaa se:", + "Add to your website" : "Lisää verkkosivuillesi", + "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta", + "HTML Code:" : "HTML-koodi:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/fr.js b/apps/federatedfilesharing/l10n/fr.js index b9f4d3d9807..c13b161125e 100644 --- a/apps/federatedfilesharing/l10n/fr.js +++ b/apps/federatedfilesharing/l10n/fr.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "ID Federated Cloud incorrect", "Sharing %s failed, because this item is already shared with %s" : "Le partage de %s a échoué car cet élément est déjà partagé avec %s", "Not allowed to create a federated share with the same user" : "Non autorisé à créer un partage fédéré avec le même utilisateur", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Le partage de %s a échoué : impossible de trouver %s. Peut-être le serveur est-il momentanément injoignable." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Le partage de %s a échoué : impossible de trouver %s. Peut-être le serveur est-il momentanément injoignable.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud", + "Federated Cloud Sharing" : "Federated Cloud Sharing", + "Open documentation" : "Voir la documentation", + "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", + "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :", + "Share it:" : "Partager :", + "Add to your website" : "Ajouter à votre site web", + "Share with me via ownCloud" : "Partagez avec moi via ownCloud", + "HTML Code:" : "Code HTML :" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federatedfilesharing/l10n/fr.json b/apps/federatedfilesharing/l10n/fr.json index 5f5ba5f6c16..651b14a210b 100644 --- a/apps/federatedfilesharing/l10n/fr.json +++ b/apps/federatedfilesharing/l10n/fr.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "ID Federated Cloud incorrect", "Sharing %s failed, because this item is already shared with %s" : "Le partage de %s a échoué car cet élément est déjà partagé avec %s", "Not allowed to create a federated share with the same user" : "Non autorisé à créer un partage fédéré avec le même utilisateur", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Le partage de %s a échoué : impossible de trouver %s. Peut-être le serveur est-il momentanément injoignable." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Le partage de %s a échoué : impossible de trouver %s. Peut-être le serveur est-il momentanément injoignable.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud", + "Federated Cloud Sharing" : "Federated Cloud Sharing", + "Open documentation" : "Voir la documentation", + "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", + "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :", + "Share it:" : "Partager :", + "Add to your website" : "Ajouter à votre site web", + "Share with me via ownCloud" : "Partagez avec moi via ownCloud", + "HTML Code:" : "Code HTML :" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/gl.js b/apps/federatedfilesharing/l10n/gl.js index b63658ea439..0c3acb791ff 100644 --- a/apps/federatedfilesharing/l10n/gl.js +++ b/apps/federatedfilesharing/l10n/gl.js @@ -4,6 +4,17 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "ID de nube federada incorrecto", "Sharing %s failed, because this item is already shared with %s" : "Fallou a compartición de %s, este elemento xa está compartido con %s", "Not allowed to create a federated share with the same user" : "Non está permitido crear unha compartición federada co mesmo usuario", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Fallou a compartición de %s, non foi posíbel atopar %s,é probábel que o servidor non estea accesíbel." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Fallou a compartición de %s, non foi posíbel atopar %s,é probábel que o servidor non estea accesíbel.", + "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", + "Share with me through my #ownCloud Federated Cloud ID" : "Comparte comigo a través do meu ID da nube federada do #ownCloud", + "Federated Cloud Sharing" : "Nube federada compartida", + "Open documentation" : "Abrir a documentación", + "Allow users on this server to send shares to other servers" : "Permitir aos usuarios deste servidor enviar comparticións a outros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores", + "Federated Cloud" : "Nube federada", + "Your Federated Cloud ID:" : "ID da súa nube federada:", + "Share it:" : "Compártao:", + "Share with me via ownCloud" : "Comparte comigo a través do ownCloud", + "HTML Code:" : "Código HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/gl.json b/apps/federatedfilesharing/l10n/gl.json index 555ffa51968..aeba950d052 100644 --- a/apps/federatedfilesharing/l10n/gl.json +++ b/apps/federatedfilesharing/l10n/gl.json @@ -2,6 +2,17 @@ "Invalid Federated Cloud ID" : "ID de nube federada incorrecto", "Sharing %s failed, because this item is already shared with %s" : "Fallou a compartición de %s, este elemento xa está compartido con %s", "Not allowed to create a federated share with the same user" : "Non está permitido crear unha compartición federada co mesmo usuario", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Fallou a compartición de %s, non foi posíbel atopar %s,é probábel que o servidor non estea accesíbel." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Fallou a compartición de %s, non foi posíbel atopar %s,é probábel que o servidor non estea accesíbel.", + "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", + "Share with me through my #ownCloud Federated Cloud ID" : "Comparte comigo a través do meu ID da nube federada do #ownCloud", + "Federated Cloud Sharing" : "Nube federada compartida", + "Open documentation" : "Abrir a documentación", + "Allow users on this server to send shares to other servers" : "Permitir aos usuarios deste servidor enviar comparticións a outros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores", + "Federated Cloud" : "Nube federada", + "Your Federated Cloud ID:" : "ID da súa nube federada:", + "Share it:" : "Compártao:", + "Share with me via ownCloud" : "Comparte comigo a través do ownCloud", + "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/he.js b/apps/federatedfilesharing/l10n/he.js index 74cb9ee2672..15c0bde9aa8 100644 --- a/apps/federatedfilesharing/l10n/he.js +++ b/apps/federatedfilesharing/l10n/he.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "זיהוי ענן מאוגד לא חוקי", "Sharing %s failed, because this item is already shared with %s" : "שיתוף %s נכשל, כיוון שפריט זה כבר משותף עם %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, ייתכן שהשרת לא ניתן להשגה כרגע." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "שיתוף %s נכשל, לא ניתן לאתר %s, ייתכן שהשרת לא ניתן להשגה כרגע.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "שיתוף איתי באמצעות מספר זהות שרת ה- #ownCloud המאוגד שלי, ניתן לראות %s", + "Share with me through my #ownCloud Federated Cloud ID" : "שיתוף איתי באמצעות מספר זהות שרת ה- #ownCloud המאוגד שלי", + "Federated Cloud Sharing" : "ענן שיתוף מאוגד", + "Open documentation" : "תיעוד פתוח", + "Allow users on this server to send shares to other servers" : "מאפשר למשתמשים בשרת זה לשלוח שיתופים לשרתים אחרים", + "Allow users on this server to receive shares from other servers" : "מאפשר למשתמשים בשרת זה לקבל שיתופים משרתים אחרים", + "Federated Cloud" : "ענן מאוגד", + "Your Federated Cloud ID:" : "מספר זיהוי הענן המאוגד שלך:", + "Share it:" : "שיתוף שלו:", + "Add to your website" : "הוספה לאתר האינטרנט שלך", + "Share with me via ownCloud" : "שיתוף איתי באמצעות ownCloud", + "HTML Code:" : "קוד HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/he.json b/apps/federatedfilesharing/l10n/he.json index a9cd4313568..a0f156f42e8 100644 --- a/apps/federatedfilesharing/l10n/he.json +++ b/apps/federatedfilesharing/l10n/he.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "זיהוי ענן מאוגד לא חוקי", "Sharing %s failed, because this item is already shared with %s" : "שיתוף %s נכשל, כיוון שפריט זה כבר משותף עם %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, ייתכן שהשרת לא ניתן להשגה כרגע." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "שיתוף %s נכשל, לא ניתן לאתר %s, ייתכן שהשרת לא ניתן להשגה כרגע.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "שיתוף איתי באמצעות מספר זהות שרת ה- #ownCloud המאוגד שלי, ניתן לראות %s", + "Share with me through my #ownCloud Federated Cloud ID" : "שיתוף איתי באמצעות מספר זהות שרת ה- #ownCloud המאוגד שלי", + "Federated Cloud Sharing" : "ענן שיתוף מאוגד", + "Open documentation" : "תיעוד פתוח", + "Allow users on this server to send shares to other servers" : "מאפשר למשתמשים בשרת זה לשלוח שיתופים לשרתים אחרים", + "Allow users on this server to receive shares from other servers" : "מאפשר למשתמשים בשרת זה לקבל שיתופים משרתים אחרים", + "Federated Cloud" : "ענן מאוגד", + "Your Federated Cloud ID:" : "מספר זיהוי הענן המאוגד שלך:", + "Share it:" : "שיתוף שלו:", + "Add to your website" : "הוספה לאתר האינטרנט שלך", + "Share with me via ownCloud" : "שיתוף איתי באמצעות ownCloud", + "HTML Code:" : "קוד HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/hu_HU.js b/apps/federatedfilesharing/l10n/hu_HU.js index 0f4785e6665..4e17934c032 100644 --- a/apps/federatedfilesharing/l10n/hu_HU.js +++ b/apps/federatedfilesharing/l10n/hu_HU.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Érvénytelen Egyesített Felhő Azonosító", "Sharing %s failed, because this item is already shared with %s" : "%s megosztása nem sikerült, mert ez már meg van osztva vele: %s", "Not allowed to create a federated share with the same user" : "Azonos felhasználóval nem lehet létrehozni egyesített megosztást", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s megosztása sikertelen, mert %s nem található; talán a szerver jelenleg nem elérhető." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s megosztása sikertelen, mert %s nem található; talán a szerver jelenleg nem elérhető.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével ", + "Federated Cloud Sharing" : "Megosztás Egyesített Felhőben", + "Open documentation" : "Dokumentáció megnyitása", + "Allow users on this server to send shares to other servers" : "Engedélyezze ezen szerver felhasználóinak, hogy fájlokat osszanak meg más szerverekkel.", + "Allow users on this server to receive shares from other servers" : "Engedélyezze ezen szerver felhasználóinak, hogy megosztásokat fogadjanak más szerverektől", + "Federated Cloud" : "Egyesített felhő", + "Your Federated Cloud ID:" : "Egyesített felhő azonosító:", + "Share it:" : "Ossza meg:", + "Add to your website" : "Adja hozzá saját weboldalához", + "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül", + "HTML Code:" : "HTML kód:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/hu_HU.json b/apps/federatedfilesharing/l10n/hu_HU.json index 7297ea1bd4f..0ceac624c27 100644 --- a/apps/federatedfilesharing/l10n/hu_HU.json +++ b/apps/federatedfilesharing/l10n/hu_HU.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Érvénytelen Egyesített Felhő Azonosító", "Sharing %s failed, because this item is already shared with %s" : "%s megosztása nem sikerült, mert ez már meg van osztva vele: %s", "Not allowed to create a federated share with the same user" : "Azonos felhasználóval nem lehet létrehozni egyesített megosztást", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s megosztása sikertelen, mert %s nem található; talán a szerver jelenleg nem elérhető." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s megosztása sikertelen, mert %s nem található; talán a szerver jelenleg nem elérhető.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével ", + "Federated Cloud Sharing" : "Megosztás Egyesített Felhőben", + "Open documentation" : "Dokumentáció megnyitása", + "Allow users on this server to send shares to other servers" : "Engedélyezze ezen szerver felhasználóinak, hogy fájlokat osszanak meg más szerverekkel.", + "Allow users on this server to receive shares from other servers" : "Engedélyezze ezen szerver felhasználóinak, hogy megosztásokat fogadjanak más szerverektől", + "Federated Cloud" : "Egyesített felhő", + "Your Federated Cloud ID:" : "Egyesített felhő azonosító:", + "Share it:" : "Ossza meg:", + "Add to your website" : "Adja hozzá saját weboldalához", + "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül", + "HTML Code:" : "HTML kód:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/id.js b/apps/federatedfilesharing/l10n/id.js index b5ec0340304..fa407c02af8 100644 --- a/apps/federatedfilesharing/l10n/id.js +++ b/apps/federatedfilesharing/l10n/id.js @@ -3,6 +3,18 @@ OC.L10N.register( { "Invalid Federated Cloud ID" : "Federated Cloud ID tidak sah", "Sharing %s failed, because this item is already shared with %s" : "Gagal membagkan %s, karena item ini sudah dibagikan dengan %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Berbagi %s gagal, tidak menemukan %s, kemungkinan saat ini server tidak dapat dijangkau." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Berbagi %s gagal, tidak menemukan %s, kemungkinan saat ini server tidak dapat dijangkau.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya", + "Federated Cloud Sharing" : "Federated Cloud Sharing", + "Open documentation" : "Buka dokumentasi", + "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.", + "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya.", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Federated Cloud ID Anda:", + "Share it:" : "Bagikan:", + "Add to your website" : "Tambahkan pada situs web Anda", + "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud", + "HTML Code:" : "Kode HTML:" }, "nplurals=1; plural=0;"); diff --git a/apps/federatedfilesharing/l10n/id.json b/apps/federatedfilesharing/l10n/id.json index 9f349e97533..d21649ba386 100644 --- a/apps/federatedfilesharing/l10n/id.json +++ b/apps/federatedfilesharing/l10n/id.json @@ -1,6 +1,18 @@ { "translations": { "Invalid Federated Cloud ID" : "Federated Cloud ID tidak sah", "Sharing %s failed, because this item is already shared with %s" : "Gagal membagkan %s, karena item ini sudah dibagikan dengan %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Berbagi %s gagal, tidak menemukan %s, kemungkinan saat ini server tidak dapat dijangkau." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Berbagi %s gagal, tidak menemukan %s, kemungkinan saat ini server tidak dapat dijangkau.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya", + "Federated Cloud Sharing" : "Federated Cloud Sharing", + "Open documentation" : "Buka dokumentasi", + "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.", + "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya.", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Federated Cloud ID Anda:", + "Share it:" : "Bagikan:", + "Add to your website" : "Tambahkan pada situs web Anda", + "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud", + "HTML Code:" : "Kode HTML:" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/is.js b/apps/federatedfilesharing/l10n/is.js index 54c9fa5bf14..fbe6d2ee2d5 100644 --- a/apps/federatedfilesharing/l10n/is.js +++ b/apps/federatedfilesharing/l10n/is.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Ógilt skýjasambandsauðkenni (Federated Cloud ID)", "Sharing %s failed, because this item is already shared with %s" : "Deiling %s mistókst, því þessu atriði er þegar deilt með %s", "Not allowed to create a federated share with the same user" : "Ekki er heimilt að búa til skýjasambandssameign með sama notanda", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deiling %s mistókst, gat ekki fundið %s, hugsanlega er þjónninn ekki tiltækur í augnablikinu." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deiling %s mistókst, gat ekki fundið %s, hugsanlega er þjónninn ekki tiltækur í augnablikinu.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID, sjá %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID", + "Federated Cloud Sharing" : "Deiling með skýjasambandi", + "Open documentation" : "Opna hjálparskjöl", + "Allow users on this server to send shares to other servers" : "Leyfa notendum á þessum þjóni að senda sameignir til annarra þjóna", + "Allow users on this server to receive shares from other servers" : "Leyfa notendum á þessum þjóni að taka á móti sameignum frá öðrum þjónum", + "Federated Cloud" : "Skýjasamband (federated)", + "Your Federated Cloud ID:" : "Skýjasambandsauðkennið þitt (Federated Cloud ID):", + "Share it:" : "Deila því:", + "Add to your website" : "Bæta við vefsvæðið þitt", + "Share with me via ownCloud" : "Deila með mér í gegnum ownCloud", + "HTML Code:" : "HTML-kóði:" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/federatedfilesharing/l10n/is.json b/apps/federatedfilesharing/l10n/is.json index e5989d430ff..9600e01aed3 100644 --- a/apps/federatedfilesharing/l10n/is.json +++ b/apps/federatedfilesharing/l10n/is.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Ógilt skýjasambandsauðkenni (Federated Cloud ID)", "Sharing %s failed, because this item is already shared with %s" : "Deiling %s mistókst, því þessu atriði er þegar deilt með %s", "Not allowed to create a federated share with the same user" : "Ekki er heimilt að búa til skýjasambandssameign með sama notanda", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deiling %s mistókst, gat ekki fundið %s, hugsanlega er þjónninn ekki tiltækur í augnablikinu." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deiling %s mistókst, gat ekki fundið %s, hugsanlega er þjónninn ekki tiltækur í augnablikinu.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID, sjá %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID", + "Federated Cloud Sharing" : "Deiling með skýjasambandi", + "Open documentation" : "Opna hjálparskjöl", + "Allow users on this server to send shares to other servers" : "Leyfa notendum á þessum þjóni að senda sameignir til annarra þjóna", + "Allow users on this server to receive shares from other servers" : "Leyfa notendum á þessum þjóni að taka á móti sameignum frá öðrum þjónum", + "Federated Cloud" : "Skýjasamband (federated)", + "Your Federated Cloud ID:" : "Skýjasambandsauðkennið þitt (Federated Cloud ID):", + "Share it:" : "Deila því:", + "Add to your website" : "Bæta við vefsvæðið þitt", + "Share with me via ownCloud" : "Deila með mér í gegnum ownCloud", + "HTML Code:" : "HTML-kóði:" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/it.js b/apps/federatedfilesharing/l10n/it.js index be449b92dfa..142a976f45f 100644 --- a/apps/federatedfilesharing/l10n/it.js +++ b/apps/federatedfilesharing/l10n/it.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "ID di cloud federata non valido", "Sharing %s failed, because this item is already shared with %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s", "Not allowed to create a federated share with the same user" : "Non è consentito creare una condivisione federata con lo stesso utente", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "La condivisione di %s non è riuscita, impossibile trovare %s, è probabile che il server non sia al momento raggiungibile." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "La condivisione di %s non è riuscita, impossibile trovare %s, è probabile che il server non sia al momento raggiungibile.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud", + "Federated Cloud Sharing" : "Condivisione cloud federata", + "Open documentation" : "Apri la documentazione", + "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", + "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server", + "Federated Cloud" : "Cloud federata", + "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", + "Share it:" : "Condividilo:", + "Add to your website" : "Aggiungilo al tuo sito web", + "Share with me via ownCloud" : "Condividi con me tramite ownCloud", + "HTML Code:" : "Codice HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/it.json b/apps/federatedfilesharing/l10n/it.json index 133cf7d0281..553e9504501 100644 --- a/apps/federatedfilesharing/l10n/it.json +++ b/apps/federatedfilesharing/l10n/it.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "ID di cloud federata non valido", "Sharing %s failed, because this item is already shared with %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s", "Not allowed to create a federated share with the same user" : "Non è consentito creare una condivisione federata con lo stesso utente", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "La condivisione di %s non è riuscita, impossibile trovare %s, è probabile che il server non sia al momento raggiungibile." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "La condivisione di %s non è riuscita, impossibile trovare %s, è probabile che il server non sia al momento raggiungibile.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud", + "Federated Cloud Sharing" : "Condivisione cloud federata", + "Open documentation" : "Apri la documentazione", + "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", + "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server", + "Federated Cloud" : "Cloud federata", + "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", + "Share it:" : "Condividilo:", + "Add to your website" : "Aggiungilo al tuo sito web", + "Share with me via ownCloud" : "Condividi con me tramite ownCloud", + "HTML Code:" : "Codice HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/ja.js b/apps/federatedfilesharing/l10n/ja.js index 539557dfec6..5522ae279e6 100644 --- a/apps/federatedfilesharing/l10n/ja.js +++ b/apps/federatedfilesharing/l10n/ja.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "無効な統合されたクラウドID", "Sharing %s failed, because this item is already shared with %s" : "%s を共有できませんでした。このアイテムはすでに %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 が見つかりませんでした。現在サーバーに接続できないようです。" + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s を共有できませんでした。%s が見つかりませんでした。現在サーバーに接続できないようです。", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud の「クラウド連携ID」で私と共有できます。こちらを見てください。%s", + "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud の「クラウド連携ID」で私と共有できます。", + "Federated Cloud Sharing" : "統合されたクラウド共有", + "Open documentation" : "ドキュメントを開く", + "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する", + "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する", + "Federated Cloud" : "クラウド連携", + "Your Federated Cloud ID:" : "あなたのクラウド連携ID：", + "Share it:" : "以下で共有:", + "Add to your website" : "ウェブサイトに追加", + "Share with me via ownCloud" : "OwnCloud経由で共有", + "HTML Code:" : "HTMLコード:" }, "nplurals=1; plural=0;"); diff --git a/apps/federatedfilesharing/l10n/ja.json b/apps/federatedfilesharing/l10n/ja.json index 40cd02b7385..6a7ca1b59d5 100644 --- a/apps/federatedfilesharing/l10n/ja.json +++ b/apps/federatedfilesharing/l10n/ja.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "無効な統合されたクラウドID", "Sharing %s failed, because this item is already shared with %s" : "%s を共有できませんでした。このアイテムはすでに %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 が見つかりませんでした。現在サーバーに接続できないようです。" + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s を共有できませんでした。%s が見つかりませんでした。現在サーバーに接続できないようです。", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud の「クラウド連携ID」で私と共有できます。こちらを見てください。%s", + "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud の「クラウド連携ID」で私と共有できます。", + "Federated Cloud Sharing" : "統合されたクラウド共有", + "Open documentation" : "ドキュメントを開く", + "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する", + "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する", + "Federated Cloud" : "クラウド連携", + "Your Federated Cloud ID:" : "あなたのクラウド連携ID：", + "Share it:" : "以下で共有:", + "Add to your website" : "ウェブサイトに追加", + "Share with me via ownCloud" : "OwnCloud経由で共有", + "HTML Code:" : "HTMLコード:" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/ko.js b/apps/federatedfilesharing/l10n/ko.js index 87eb7f9c206..4e6294e66ca 100644 --- a/apps/federatedfilesharing/l10n/ko.js +++ b/apps/federatedfilesharing/l10n/ko.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "잘못된 연합 클라우드 ID", "Sharing %s failed, because this item is already shared with %s" : "%s을(를) 공유할 수 없습니다. 이미 %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을(를) 찾을 수 없습니다. 서버에 접근하지 못할 수도 있습니다." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s을(를) 공유할 수 없습니다. %s을(를) 찾을 수 없습니다. 서버에 접근하지 못할 수도 있습니다.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s", + "Share with me through my #ownCloud Federated Cloud ID" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨", + "Federated Cloud Sharing" : "클라우드 연합 공유", + "Open documentation" : "문서 열기", + "Allow users on this server to send shares to other servers" : "이 서버의 사용자가 다른 서버와 공유할 수 있도록 허용", + "Allow users on this server to receive shares from other servers" : "이 서버의 사용자가 다른 서버에서 공유한 파일을 받을 수 있도록 허용", + "Federated Cloud" : "연합 클라우드", + "Your Federated Cloud ID:" : "내 연합 클라우드 ID:", + "Share it:" : "공유하기:", + "Add to your website" : "내 웹 사이트에 추가", + "Share with me via ownCloud" : "ownCloud로 나와 공유하기", + "HTML Code:" : "HTML 코드:" }, "nplurals=1; plural=0;"); diff --git a/apps/federatedfilesharing/l10n/ko.json b/apps/federatedfilesharing/l10n/ko.json index 8fcae0e8e66..0e1a2247ba9 100644 --- a/apps/federatedfilesharing/l10n/ko.json +++ b/apps/federatedfilesharing/l10n/ko.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "잘못된 연합 클라우드 ID", "Sharing %s failed, because this item is already shared with %s" : "%s을(를) 공유할 수 없습니다. 이미 %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을(를) 찾을 수 없습니다. 서버에 접근하지 못할 수도 있습니다." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s을(를) 공유할 수 없습니다. %s을(를) 찾을 수 없습니다. 서버에 접근하지 못할 수도 있습니다.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s", + "Share with me through my #ownCloud Federated Cloud ID" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨", + "Federated Cloud Sharing" : "클라우드 연합 공유", + "Open documentation" : "문서 열기", + "Allow users on this server to send shares to other servers" : "이 서버의 사용자가 다른 서버와 공유할 수 있도록 허용", + "Allow users on this server to receive shares from other servers" : "이 서버의 사용자가 다른 서버에서 공유한 파일을 받을 수 있도록 허용", + "Federated Cloud" : "연합 클라우드", + "Your Federated Cloud ID:" : "내 연합 클라우드 ID:", + "Share it:" : "공유하기:", + "Add to your website" : "내 웹 사이트에 추가", + "Share with me via ownCloud" : "ownCloud로 나와 공유하기", + "HTML Code:" : "HTML 코드:" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/lb.js b/apps/federatedfilesharing/l10n/lb.js new file mode 100644 index 00000000000..8515e8eada4 --- /dev/null +++ b/apps/federatedfilesharing/l10n/lb.js @@ -0,0 +1,6 @@ +OC.L10N.register( + "federatedfilesharing", + { + "Open documentation" : "Dokumentatioun opmaachen" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/lb.json b/apps/federatedfilesharing/l10n/lb.json new file mode 100644 index 00000000000..66e7cf9e135 --- /dev/null +++ b/apps/federatedfilesharing/l10n/lb.json @@ -0,0 +1,4 @@ +{ "translations": { + "Open documentation" : "Dokumentatioun opmaachen" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/lt_LT.js b/apps/federatedfilesharing/l10n/lt_LT.js new file mode 100644 index 00000000000..c6d05f617a4 --- /dev/null +++ b/apps/federatedfilesharing/l10n/lt_LT.js @@ -0,0 +1,17 @@ +OC.L10N.register( + "federatedfilesharing", + { + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Pasidalink su manimi per #ownCloud padebesius, plačiau %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Pasidalink su manimi per #ownCloud padebesius", + "Federated Cloud Sharing" : "Viešas dalijimasis padebesiu", + "Open documentation" : "Atidaryti dokumentą", + "Allow users on this server to send shares to other servers" : "Leisti vartotojams šiame serveryje dalintis su kitais serveriais", + "Allow users on this server to receive shares from other servers" : "Leisti vartotojams šiame serveryje priimti dalijimusis iš kitų serverių", + "Federated Cloud" : "Viešas debesis", + "Your Federated Cloud ID:" : "Tavo debesies ID:", + "Share it:" : "Pasidalink:", + "Add to your website" : "Pridėti tavo puslapį", + "Share with me via ownCloud" : "Pasidalink su manimi per ownCloud", + "HTML Code:" : "HTML kodas:" +}, +"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/federatedfilesharing/l10n/lt_LT.json b/apps/federatedfilesharing/l10n/lt_LT.json new file mode 100644 index 00000000000..4b295d4c1b7 --- /dev/null +++ b/apps/federatedfilesharing/l10n/lt_LT.json @@ -0,0 +1,15 @@ +{ "translations": { + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Pasidalink su manimi per #ownCloud padebesius, plačiau %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Pasidalink su manimi per #ownCloud padebesius", + "Federated Cloud Sharing" : "Viešas dalijimasis padebesiu", + "Open documentation" : "Atidaryti dokumentą", + "Allow users on this server to send shares to other servers" : "Leisti vartotojams šiame serveryje dalintis su kitais serveriais", + "Allow users on this server to receive shares from other servers" : "Leisti vartotojams šiame serveryje priimti dalijimusis iš kitų serverių", + "Federated Cloud" : "Viešas debesis", + "Your Federated Cloud ID:" : "Tavo debesies ID:", + "Share it:" : "Pasidalink:", + "Add to your website" : "Pridėti tavo puslapį", + "Share with me via ownCloud" : "Pasidalink su manimi per ownCloud", + "HTML Code:" : "HTML kodas:" +},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);" +}
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/lv.js b/apps/federatedfilesharing/l10n/lv.js new file mode 100644 index 00000000000..aa26ac01d65 --- /dev/null +++ b/apps/federatedfilesharing/l10n/lv.js @@ -0,0 +1,9 @@ +OC.L10N.register( + "federatedfilesharing", + { + "Federated Cloud Sharing" : "Federatīva mākoņkoplietošana", + "Open documentation" : "Atvērt dokumentāciju", + "Allow users on this server to send shares to other servers" : "Atļaut šī servera lietotājiem sūtīt koplietotnes uz citiem serveriem", + "Allow users on this server to receive shares from other servers" : "Atļaut šī servera lietotājiem saņem koplietotnes no citiem serveriem" +}, +"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"); diff --git a/apps/federatedfilesharing/l10n/lv.json b/apps/federatedfilesharing/l10n/lv.json new file mode 100644 index 00000000000..986c430151b --- /dev/null +++ b/apps/federatedfilesharing/l10n/lv.json @@ -0,0 +1,7 @@ +{ "translations": { + "Federated Cloud Sharing" : "Federatīva mākoņkoplietošana", + "Open documentation" : "Atvērt dokumentāciju", + "Allow users on this server to send shares to other servers" : "Atļaut šī servera lietotājiem sūtīt koplietotnes uz citiem serveriem", + "Allow users on this server to receive shares from other servers" : "Atļaut šī servera lietotājiem saņem koplietotnes no citiem serveriem" +},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);" +}
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/mk.js b/apps/federatedfilesharing/l10n/mk.js new file mode 100644 index 00000000000..4d5fc92658b --- /dev/null +++ b/apps/federatedfilesharing/l10n/mk.js @@ -0,0 +1,13 @@ +OC.L10N.register( + "federatedfilesharing", + { + "Federated Cloud Sharing" : "Федерирано клауд споделување", + "Open documentation" : "Отвори ја документацијата", + "Federated Cloud" : "Федериран клауд", + "Your Federated Cloud ID:" : "Вашиот федериран Cloud ID:", + "Share it:" : "Сподели го:", + "Add to your website" : "Додади на твојот веб сајт", + "Share with me via ownCloud" : "Сподели со мене преку ownCloud", + "HTML Code:" : "HTML код:" +}, +"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"); diff --git a/apps/federatedfilesharing/l10n/mk.json b/apps/federatedfilesharing/l10n/mk.json new file mode 100644 index 00000000000..9862c2ecf89 --- /dev/null +++ b/apps/federatedfilesharing/l10n/mk.json @@ -0,0 +1,11 @@ +{ "translations": { + "Federated Cloud Sharing" : "Федерирано клауд споделување", + "Open documentation" : "Отвори ја документацијата", + "Federated Cloud" : "Федериран клауд", + "Your Federated Cloud ID:" : "Вашиот федериран Cloud ID:", + "Share it:" : "Сподели го:", + "Add to your website" : "Додади на твојот веб сајт", + "Share with me via ownCloud" : "Сподели со мене преку ownCloud", + "HTML Code:" : "HTML код:" +},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;" +}
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/nb_NO.js b/apps/federatedfilesharing/l10n/nb_NO.js index 6b04d4b4b35..c6ee1cc632f 100644 --- a/apps/federatedfilesharing/l10n/nb_NO.js +++ b/apps/federatedfilesharing/l10n/nb_NO.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Ugyldig ID for sammenknyttet sky", "Sharing %s failed, because this item is already shared with %s" : "Deling av %s feilet, fordi dette elementet allerede er delt med %s", "Not allowed to create a federated share with the same user" : "Ikke tillatt å opprette en Sammenknyttet sky-deling med den samme brukeren", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling %s feilet, fant ikke %s, kanskje servern er utilgjengelig for øyeblikket." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling %s feilet, fant ikke %s, kanskje servern er utilgjengelig for øyeblikket.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky", + "Federated Cloud Sharing" : "Sammenknyttet sky-deling", + "Open documentation" : "Åpne dokumentasjonen", + "Allow users on this server to send shares to other servers" : "Tillat at brukere på denne serveren sender delinger til andre servere", + "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere", + "Federated Cloud" : "Sammenknyttet sky", + "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:", + "Share it:" : "Del den:", + "Add to your website" : "Legg på websiden din", + "Share with me via ownCloud" : "Del med meg via ownCloud", + "HTML Code:" : "HTML-kode:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/nb_NO.json b/apps/federatedfilesharing/l10n/nb_NO.json index 777a3b4c963..89a23700e5c 100644 --- a/apps/federatedfilesharing/l10n/nb_NO.json +++ b/apps/federatedfilesharing/l10n/nb_NO.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Ugyldig ID for sammenknyttet sky", "Sharing %s failed, because this item is already shared with %s" : "Deling av %s feilet, fordi dette elementet allerede er delt med %s", "Not allowed to create a federated share with the same user" : "Ikke tillatt å opprette en Sammenknyttet sky-deling med den samme brukeren", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling %s feilet, fant ikke %s, kanskje servern er utilgjengelig for øyeblikket." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Deling %s feilet, fant ikke %s, kanskje servern er utilgjengelig for øyeblikket.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky", + "Federated Cloud Sharing" : "Sammenknyttet sky-deling", + "Open documentation" : "Åpne dokumentasjonen", + "Allow users on this server to send shares to other servers" : "Tillat at brukere på denne serveren sender delinger til andre servere", + "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere", + "Federated Cloud" : "Sammenknyttet sky", + "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:", + "Share it:" : "Del den:", + "Add to your website" : "Legg på websiden din", + "Share with me via ownCloud" : "Del med meg via ownCloud", + "HTML Code:" : "HTML-kode:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/nl.js b/apps/federatedfilesharing/l10n/nl.js index 718a7504b34..d46f7c30389 100644 --- a/apps/federatedfilesharing/l10n/nl.js +++ b/apps/federatedfilesharing/l10n/nl.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Ongeldige Federated Cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s", "Not allowed to create a federated share with the same user" : "Het is niet toegestaan om een gefedereerde share met dezelfde gebruikersserver te maken", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Delen van %s mislukt, kon %s niet vinden, misschien is de server niet bereikbaar." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Delen van %s mislukt, kon %s niet vinden, misschien is de server niet bereikbaar.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID", + "Federated Cloud Sharing" : "Federated Cloud Sharing", + "Open documentation" : "Open documentatie", + "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", + "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers", + "Federated Cloud" : "Gefedereerde Cloud", + "Your Federated Cloud ID:" : "Uw Federated Cloud ID:", + "Share it:" : "Deel het:", + "Add to your website" : "Toevoegen aan uw website", + "Share with me via ownCloud" : "Deel met mij via ownCloud", + "HTML Code:" : "HTML Code:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/nl.json b/apps/federatedfilesharing/l10n/nl.json index 7b1c35c7355..849af078f92 100644 --- a/apps/federatedfilesharing/l10n/nl.json +++ b/apps/federatedfilesharing/l10n/nl.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Ongeldige Federated Cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s", "Not allowed to create a federated share with the same user" : "Het is niet toegestaan om een gefedereerde share met dezelfde gebruikersserver te maken", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Delen van %s mislukt, kon %s niet vinden, misschien is de server niet bereikbaar." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Delen van %s mislukt, kon %s niet vinden, misschien is de server niet bereikbaar.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID", + "Federated Cloud Sharing" : "Federated Cloud Sharing", + "Open documentation" : "Open documentatie", + "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", + "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers", + "Federated Cloud" : "Gefedereerde Cloud", + "Your Federated Cloud ID:" : "Uw Federated Cloud ID:", + "Share it:" : "Deel het:", + "Add to your website" : "Toevoegen aan uw website", + "Share with me via ownCloud" : "Deel met mij via ownCloud", + "HTML Code:" : "HTML Code:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/oc.js b/apps/federatedfilesharing/l10n/oc.js index f83325956b3..c337f1ca2b1 100644 --- a/apps/federatedfilesharing/l10n/oc.js +++ b/apps/federatedfilesharing/l10n/oc.js @@ -3,6 +3,18 @@ OC.L10N.register( { "Invalid Federated Cloud ID" : "ID Federated Cloud incorrècte", "Sharing %s failed, because this item is already shared with %s" : "Lo partiment de %s a fracassat perque aqueste objècte es ja partejat amb %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Lo partiment de %s a fracassat : impossible de trobar %s. Benlèu que lo servidor es momentanèament injonhable." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Lo partiment de %s a fracassat : impossible de trobar %s. Benlèu que lo servidor es momentanèament injonhable.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partejatz amb ieu gràcias a mon identificant Federated Cloud #owncloud %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Partejatz amb ieu gràcias a mon identificant Federated Cloud #owncloud", + "Federated Cloud Sharing" : "Federated Cloud Sharing", + "Open documentation" : "Veire la documentacion", + "Allow users on this server to send shares to other servers" : "Autorizar los utilizaires d'aqueste servidor a mandar de partiments cap a d'autres servidors", + "Allow users on this server to receive shares from other servers" : "Autorizar los utilizaires d'aqueste servidor a recebre de partiments d'autres servidors", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Vòstre identificant Federated Cloud :", + "Share it:" : "Partejar :", + "Add to your website" : "Apondre a vòstre site web", + "Share with me via ownCloud" : "Partejatz amb ieu via ownCloud", + "HTML Code:" : "Còde HTML :" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federatedfilesharing/l10n/oc.json b/apps/federatedfilesharing/l10n/oc.json index 140cabe0282..81bce1d1577 100644 --- a/apps/federatedfilesharing/l10n/oc.json +++ b/apps/federatedfilesharing/l10n/oc.json @@ -1,6 +1,18 @@ { "translations": { "Invalid Federated Cloud ID" : "ID Federated Cloud incorrècte", "Sharing %s failed, because this item is already shared with %s" : "Lo partiment de %s a fracassat perque aqueste objècte es ja partejat amb %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Lo partiment de %s a fracassat : impossible de trobar %s. Benlèu que lo servidor es momentanèament injonhable." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Lo partiment de %s a fracassat : impossible de trobar %s. Benlèu que lo servidor es momentanèament injonhable.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partejatz amb ieu gràcias a mon identificant Federated Cloud #owncloud %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Partejatz amb ieu gràcias a mon identificant Federated Cloud #owncloud", + "Federated Cloud Sharing" : "Federated Cloud Sharing", + "Open documentation" : "Veire la documentacion", + "Allow users on this server to send shares to other servers" : "Autorizar los utilizaires d'aqueste servidor a mandar de partiments cap a d'autres servidors", + "Allow users on this server to receive shares from other servers" : "Autorizar los utilizaires d'aqueste servidor a recebre de partiments d'autres servidors", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Vòstre identificant Federated Cloud :", + "Share it:" : "Partejar :", + "Add to your website" : "Apondre a vòstre site web", + "Share with me via ownCloud" : "Partejatz amb ieu via ownCloud", + "HTML Code:" : "Còde HTML :" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/pl.js b/apps/federatedfilesharing/l10n/pl.js index d82967ae5db..7293e72689e 100644 --- a/apps/federatedfilesharing/l10n/pl.js +++ b/apps/federatedfilesharing/l10n/pl.js @@ -2,6 +2,8 @@ OC.L10N.register( "federatedfilesharing", { "Sharing %s failed, because this item is already shared with %s" : "Współdzielenie %s nie powiodło się, ponieważ element jest już współdzielony z %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Współdzielenie %s nie powiodło się, nie można odnaleźć %s. Prawdopobnie serwer nie jest teraz osiągalny." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Współdzielenie %s nie powiodło się, nie można odnaleźć %s. Prawdopobnie serwer nie jest teraz osiągalny.", + "Open documentation" : "Otwórz dokumentację", + "Add to your website" : "Dodaj do swojej strony" }, "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/federatedfilesharing/l10n/pl.json b/apps/federatedfilesharing/l10n/pl.json index 19c9b8029ac..d8b5219b963 100644 --- a/apps/federatedfilesharing/l10n/pl.json +++ b/apps/federatedfilesharing/l10n/pl.json @@ -1,5 +1,7 @@ { "translations": { "Sharing %s failed, because this item is already shared with %s" : "Współdzielenie %s nie powiodło się, ponieważ element jest już współdzielony z %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Współdzielenie %s nie powiodło się, nie można odnaleźć %s. Prawdopobnie serwer nie jest teraz osiągalny." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Współdzielenie %s nie powiodło się, nie można odnaleźć %s. Prawdopobnie serwer nie jest teraz osiągalny.", + "Open documentation" : "Otwórz dokumentację", + "Add to your website" : "Dodaj do swojej strony" },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/pt_BR.js b/apps/federatedfilesharing/l10n/pt_BR.js index 550fc8d5c94..34c6357b8e0 100644 --- a/apps/federatedfilesharing/l10n/pt_BR.js +++ b/apps/federatedfilesharing/l10n/pt_BR.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Inválida Associação de Nuvem ID", "Sharing %s failed, because this item is already shared with %s" : "Compartilhamento %s falhou, porque este ítem já está compartilhado com %s", "Not allowed to create a federated share with the same user" : "Não é permitido criar um compartilhamento associado com o mesmo usuário", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "O compartilhamento %s falhou, porque não foi possível encontrar %s, talvez o servidor esteja inacessível." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "O compartilhamento %s falhou, porque não foi possível encontrar %s, talvez o servidor esteja inacessível.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem ID Associada, veja %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem ID Associada", + "Federated Cloud Sharing" : "Compartilhamento de Nuvem Associada", + "Open documentation" : "Abrir documentação", + "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores", + "Federated Cloud" : "Nuvem Associada", + "Your Federated Cloud ID:" : "Sua ID na Nuvem Associada:", + "Share it:" : "Compartilhe:", + "Add to your website" : "Adicione ao seu website", + "Share with me via ownCloud" : "Compartilhe comigo via ownCloud", + "HTML Code:" : "Código HTML:" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federatedfilesharing/l10n/pt_BR.json b/apps/federatedfilesharing/l10n/pt_BR.json index 29fe0c4dbf3..2fdb6a45f4d 100644 --- a/apps/federatedfilesharing/l10n/pt_BR.json +++ b/apps/federatedfilesharing/l10n/pt_BR.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Inválida Associação de Nuvem ID", "Sharing %s failed, because this item is already shared with %s" : "Compartilhamento %s falhou, porque este ítem já está compartilhado com %s", "Not allowed to create a federated share with the same user" : "Não é permitido criar um compartilhamento associado com o mesmo usuário", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "O compartilhamento %s falhou, porque não foi possível encontrar %s, talvez o servidor esteja inacessível." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "O compartilhamento %s falhou, porque não foi possível encontrar %s, talvez o servidor esteja inacessível.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem ID Associada, veja %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem ID Associada", + "Federated Cloud Sharing" : "Compartilhamento de Nuvem Associada", + "Open documentation" : "Abrir documentação", + "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores", + "Federated Cloud" : "Nuvem Associada", + "Your Federated Cloud ID:" : "Sua ID na Nuvem Associada:", + "Share it:" : "Compartilhe:", + "Add to your website" : "Adicione ao seu website", + "Share with me via ownCloud" : "Compartilhe comigo via ownCloud", + "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/pt_PT.js b/apps/federatedfilesharing/l10n/pt_PT.js index ecdab299d20..f11078268a4 100644 --- a/apps/federatedfilesharing/l10n/pt_PT.js +++ b/apps/federatedfilesharing/l10n/pt_PT.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Id. de Nuvem Federada Inválida", "Sharing %s failed, because this item is already shared with %s" : "A partilha %s falhou, porque o item já está a ser partilhado com %s", "Not allowed to create a federated share with the same user" : "Não é possível criar uma partilha federada com o mesmo utilizador", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "A partilha de %s falhou, não foi possível encontrar %s. É possível que o servidor esteja inacessível." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "A partilha de %s falhou, não foi possível encontrar %s. É possível que o servidor esteja inacessível.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud", + "Federated Cloud Sharing" : "Partilha de Nuvem Federada", + "Open documentation" : "Abrir documentação", + "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores", + "Federated Cloud" : "Nuvem Federada", + "Your Federated Cloud ID:" : "A Sua Id. da Nuvem Federada", + "Share it:" : "Partilhe:", + "Add to your website" : "Adicione ao seu sítio da Web", + "Share with me via ownCloud" : "Partilhe comigo via ownCloud", + "HTML Code:" : "Código HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/pt_PT.json b/apps/federatedfilesharing/l10n/pt_PT.json index d7e79940097..5f254812859 100644 --- a/apps/federatedfilesharing/l10n/pt_PT.json +++ b/apps/federatedfilesharing/l10n/pt_PT.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Id. de Nuvem Federada Inválida", "Sharing %s failed, because this item is already shared with %s" : "A partilha %s falhou, porque o item já está a ser partilhado com %s", "Not allowed to create a federated share with the same user" : "Não é possível criar uma partilha federada com o mesmo utilizador", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "A partilha de %s falhou, não foi possível encontrar %s. É possível que o servidor esteja inacessível." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "A partilha de %s falhou, não foi possível encontrar %s. É possível que o servidor esteja inacessível.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud", + "Federated Cloud Sharing" : "Partilha de Nuvem Federada", + "Open documentation" : "Abrir documentação", + "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores", + "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores", + "Federated Cloud" : "Nuvem Federada", + "Your Federated Cloud ID:" : "A Sua Id. da Nuvem Federada", + "Share it:" : "Partilhe:", + "Add to your website" : "Adicione ao seu sítio da Web", + "Share with me via ownCloud" : "Partilhe comigo via ownCloud", + "HTML Code:" : "Código HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/ru.js b/apps/federatedfilesharing/l10n/ru.js index 9ddb75f8cb8..f8f5c998e84 100644 --- a/apps/federatedfilesharing/l10n/ru.js +++ b/apps/federatedfilesharing/l10n/ru.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Неверный ID в объединении облачных хранилищ.", "Sharing %s failed, because this item is already shared with %s" : "Не удалось поделиться %s, пользователь %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, возможно, сервер не доступен." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Не удалось поделиться %s, не удалось найти %s, возможно, сервер не доступен.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ", + "Federated Cloud Sharing" : "Объединение облачных хранилищ", + "Open documentation" : "Открыть документацию", + "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", + "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", + "Federated Cloud" : "Объединение облачных хранилищ", + "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:", + "Share it:" : "Поделись этим:", + "Add to your website" : "Добавить к себе на сайт", + "Share with me via ownCloud" : "Поделитесь мной через ownCloud", + "HTML Code:" : "HTML код:" }, "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/apps/federatedfilesharing/l10n/ru.json b/apps/federatedfilesharing/l10n/ru.json index a03bfe118cb..713f61d0982 100644 --- a/apps/federatedfilesharing/l10n/ru.json +++ b/apps/federatedfilesharing/l10n/ru.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Неверный ID в объединении облачных хранилищ.", "Sharing %s failed, because this item is already shared with %s" : "Не удалось поделиться %s, пользователь %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, возможно, сервер не доступен." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Не удалось поделиться %s, не удалось найти %s, возможно, сервер не доступен.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ", + "Federated Cloud Sharing" : "Объединение облачных хранилищ", + "Open documentation" : "Открыть документацию", + "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", + "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", + "Federated Cloud" : "Объединение облачных хранилищ", + "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:", + "Share it:" : "Поделись этим:", + "Add to your website" : "Добавить к себе на сайт", + "Share with me via ownCloud" : "Поделитесь мной через ownCloud", + "HTML Code:" : "HTML код:" },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/sk_SK.js b/apps/federatedfilesharing/l10n/sk_SK.js index d08679d19f1..61bf85b79d5 100644 --- a/apps/federatedfilesharing/l10n/sk_SK.js +++ b/apps/federatedfilesharing/l10n/sk_SK.js @@ -3,6 +3,18 @@ OC.L10N.register( { "Invalid Federated Cloud ID" : "Neplatné združené Cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Zdieľanie %s zlyhalo, pretože táto položka už je zdieľaná s %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Zdieľanie %s zlyhalo, nepodarilo sa nájsť %s, možno je server v súčasnej dobe nedostupný." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Zdieľanie %s zlyhalo, nepodarilo sa nájsť %s, možno je server v súčasnej dobe nedostupný.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID", + "Federated Cloud Sharing" : "Združené cloudové zdieľanie", + "Open documentation" : "Otvoriť dokumentáciu", + "Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery", + "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov", + "Federated Cloud" : "Združený Cloud", + "Your Federated Cloud ID:" : "Vaše združené Cloud ID", + "Share it:" : "Zdieľať:", + "Add to your website" : "Pridať na svoju webstránku", + "Share with me via ownCloud" : "Zdieľané so mnou cez ownCloud", + "HTML Code:" : "HTML kód:" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/federatedfilesharing/l10n/sk_SK.json b/apps/federatedfilesharing/l10n/sk_SK.json index 2dd753a961b..4c56aaa23b6 100644 --- a/apps/federatedfilesharing/l10n/sk_SK.json +++ b/apps/federatedfilesharing/l10n/sk_SK.json @@ -1,6 +1,18 @@ { "translations": { "Invalid Federated Cloud ID" : "Neplatné združené Cloud ID", "Sharing %s failed, because this item is already shared with %s" : "Zdieľanie %s zlyhalo, pretože táto položka už je zdieľaná s %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Zdieľanie %s zlyhalo, nepodarilo sa nájsť %s, možno je server v súčasnej dobe nedostupný." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Zdieľanie %s zlyhalo, nepodarilo sa nájsť %s, možno je server v súčasnej dobe nedostupný.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID", + "Federated Cloud Sharing" : "Združené cloudové zdieľanie", + "Open documentation" : "Otvoriť dokumentáciu", + "Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery", + "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov", + "Federated Cloud" : "Združený Cloud", + "Your Federated Cloud ID:" : "Vaše združené Cloud ID", + "Share it:" : "Zdieľať:", + "Add to your website" : "Pridať na svoju webstránku", + "Share with me via ownCloud" : "Zdieľané so mnou cez ownCloud", + "HTML Code:" : "HTML kód:" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/sl.js b/apps/federatedfilesharing/l10n/sl.js index 3c7d08882ff..04c97908a1f 100644 --- a/apps/federatedfilesharing/l10n/sl.js +++ b/apps/federatedfilesharing/l10n/sl.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Neveljaven ID zveznega oblaka ownCloud", "Sharing %s failed, because this item is already shared with %s" : "Nastavljanje souporabe %s je spodletelo, ker je ima uporabnik %s predmet že v souporabi.", "Not allowed to create a federated share with the same user" : "Ni dovoljeno ustvariti souporabe zveznega oblaka z istim uporabnikom", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Omogočanje souporabe %s je spodletelo, ker ni mogoče najti %s. Najverjetneje je strežnik nedosegljiv." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Omogočanje souporabe %s je spodletelo, ker ni mogoče najti %s. Najverjetneje je strežnik nedosegljiv.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Omogoči souporabo prek #ownCloud ID zveznega oblaka, več na %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Omogoči souporabo prek #ownCloud ID zveznega oblaka", + "Federated Cloud Sharing" : "Souporaba zveznega oblaka", + "Open documentation" : "Odpri dokumentacijo", + "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.", + "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov.", + "Federated Cloud" : "Zvezni oblak", + "Your Federated Cloud ID:" : "Vaš ID zveznega oblaka:", + "Share it:" : "Omogoči souporabo:", + "Add to your website" : "Dodaj na spletišče", + "Share with me via ownCloud" : "Omogoči souporabo prek oblaka ownCloud", + "HTML Code:" : "Koda HTML:" }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/federatedfilesharing/l10n/sl.json b/apps/federatedfilesharing/l10n/sl.json index 6f374bbe917..aa17e71e4ac 100644 --- a/apps/federatedfilesharing/l10n/sl.json +++ b/apps/federatedfilesharing/l10n/sl.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Neveljaven ID zveznega oblaka ownCloud", "Sharing %s failed, because this item is already shared with %s" : "Nastavljanje souporabe %s je spodletelo, ker je ima uporabnik %s predmet že v souporabi.", "Not allowed to create a federated share with the same user" : "Ni dovoljeno ustvariti souporabe zveznega oblaka z istim uporabnikom", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Omogočanje souporabe %s je spodletelo, ker ni mogoče najti %s. Najverjetneje je strežnik nedosegljiv." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Omogočanje souporabe %s je spodletelo, ker ni mogoče najti %s. Najverjetneje je strežnik nedosegljiv.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Omogoči souporabo prek #ownCloud ID zveznega oblaka, več na %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Omogoči souporabo prek #ownCloud ID zveznega oblaka", + "Federated Cloud Sharing" : "Souporaba zveznega oblaka", + "Open documentation" : "Odpri dokumentacijo", + "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.", + "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov.", + "Federated Cloud" : "Zvezni oblak", + "Your Federated Cloud ID:" : "Vaš ID zveznega oblaka:", + "Share it:" : "Omogoči souporabo:", + "Add to your website" : "Dodaj na spletišče", + "Share with me via ownCloud" : "Omogoči souporabo prek oblaka ownCloud", + "HTML Code:" : "Koda HTML:" },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/sq.js b/apps/federatedfilesharing/l10n/sq.js index 31fdefd4df7..5e2393f11c7 100644 --- a/apps/federatedfilesharing/l10n/sq.js +++ b/apps/federatedfilesharing/l10n/sq.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "ID Federated Cloud e pavlefshme", "Sharing %s failed, because this item is already shared with %s" : "Ndarja për %s dështoi, ngaqë ky objekt është ndarë një herë me %s", "Not allowed to create a federated share with the same user" : "S’i lejohet të krijojë një ndarje të federuar me të njëjtin përdorues", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Ndarja për %s dështoi, s’u gjet dot %s, ndoshta shërbyesi është hëpërhë jashtë pune." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Ndarja për %s dështoi, s’u gjet dot %s, ndoshta shërbyesi është hëpërhë jashtë pune.", + "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", + "Share with me through my #ownCloud Federated Cloud ID" : "Ndani me mua përmes ID-së time për #ownCloud Federated Cloud", + "Federated Cloud Sharing" : "Ndarje Në Re të Federuar ", + "Open documentation" : "Hap dokumentimin", + "Allow users on this server to send shares to other servers" : "Lejoju përdoruesve në këtë shërbyes të dërgojnë ndarje në shërbyes të tjerë", + "Allow users on this server to receive shares from other servers" : "Lejoju përdoruesve në këtë shërbyes të marrin ndarje nga shërbyes të tjerë", + "Federated Cloud" : "Re e Federuar", + "Your Federated Cloud ID:" : "ID-ja juaj për Re të Federuar:", + "Share it:" : "Ndajeni:", + "Add to your website" : "Shtojeni te sajti juaj", + "Share with me via ownCloud" : "Ndani me mua përmes ownCloud-it", + "HTML Code:" : "Kod HTML:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/sq.json b/apps/federatedfilesharing/l10n/sq.json index a415ae125d8..cead371d182 100644 --- a/apps/federatedfilesharing/l10n/sq.json +++ b/apps/federatedfilesharing/l10n/sq.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "ID Federated Cloud e pavlefshme", "Sharing %s failed, because this item is already shared with %s" : "Ndarja për %s dështoi, ngaqë ky objekt është ndarë një herë me %s", "Not allowed to create a federated share with the same user" : "S’i lejohet të krijojë një ndarje të federuar me të njëjtin përdorues", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Ndarja për %s dështoi, s’u gjet dot %s, ndoshta shërbyesi është hëpërhë jashtë pune." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Ndarja për %s dështoi, s’u gjet dot %s, ndoshta shërbyesi është hëpërhë jashtë pune.", + "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", + "Share with me through my #ownCloud Federated Cloud ID" : "Ndani me mua përmes ID-së time për #ownCloud Federated Cloud", + "Federated Cloud Sharing" : "Ndarje Në Re të Federuar ", + "Open documentation" : "Hap dokumentimin", + "Allow users on this server to send shares to other servers" : "Lejoju përdoruesve në këtë shërbyes të dërgojnë ndarje në shërbyes të tjerë", + "Allow users on this server to receive shares from other servers" : "Lejoju përdoruesve në këtë shërbyes të marrin ndarje nga shërbyes të tjerë", + "Federated Cloud" : "Re e Federuar", + "Your Federated Cloud ID:" : "ID-ja juaj për Re të Federuar:", + "Share it:" : "Ndajeni:", + "Add to your website" : "Shtojeni te sajti juaj", + "Share with me via ownCloud" : "Ndani me mua përmes ownCloud-it", + "HTML Code:" : "Kod HTML:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/sr.js b/apps/federatedfilesharing/l10n/sr.js index 1377d133e50..7613ffa928e 100644 --- a/apps/federatedfilesharing/l10n/sr.js +++ b/apps/federatedfilesharing/l10n/sr.js @@ -3,6 +3,13 @@ OC.L10N.register( { "Invalid Federated Cloud ID" : "Неисправан ИД Здруженог облака", "Sharing %s failed, because this item is already shared with %s" : "Дељење %s није успело зато што се ова ставка већ дели са %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Дељење %s није успело, није могуће пронаћи %s, можда сервер тренутно није доступан." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Дељење %s није успело, није могуће пронаћи %s, можда сервер тренутно није доступан.", + "Federated Cloud Sharing" : "Здружено дељење у облаку", + "Open documentation" : "Отвори документацију", + "Allow users on this server to send shares to other servers" : "Дозвољава корисницима овог сервера да шаљу дељења на друге сервере", + "Allow users on this server to receive shares from other servers" : "Дозвољава корисницима овог сервера да примају дељења са других сервера", + "Federated Cloud" : "Здружени облак", + "Your Federated Cloud ID:" : "ИД вашег здруженог облака:", + "HTML Code:" : "ХТМЛ кôд:" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/federatedfilesharing/l10n/sr.json b/apps/federatedfilesharing/l10n/sr.json index 6b3cb347d1f..89d8a38c521 100644 --- a/apps/federatedfilesharing/l10n/sr.json +++ b/apps/federatedfilesharing/l10n/sr.json @@ -1,6 +1,13 @@ { "translations": { "Invalid Federated Cloud ID" : "Неисправан ИД Здруженог облака", "Sharing %s failed, because this item is already shared with %s" : "Дељење %s није успело зато што се ова ставка већ дели са %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Дељење %s није успело, није могуће пронаћи %s, можда сервер тренутно није доступан." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Дељење %s није успело, није могуће пронаћи %s, можда сервер тренутно није доступан.", + "Federated Cloud Sharing" : "Здружено дељење у облаку", + "Open documentation" : "Отвори документацију", + "Allow users on this server to send shares to other servers" : "Дозвољава корисницима овог сервера да шаљу дељења на друге сервере", + "Allow users on this server to receive shares from other servers" : "Дозвољава корисницима овог сервера да примају дељења са других сервера", + "Federated Cloud" : "Здружени облак", + "Your Federated Cloud ID:" : "ИД вашег здруженог облака:", + "HTML Code:" : "ХТМЛ кôд:" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/sr@latin.js b/apps/federatedfilesharing/l10n/sr@latin.js new file mode 100644 index 00000000000..b06f53393e0 --- /dev/null +++ b/apps/federatedfilesharing/l10n/sr@latin.js @@ -0,0 +1,7 @@ +OC.L10N.register( + "federatedfilesharing", + { + "Allow users on this server to send shares to other servers" : "Dozvoli korisnicima na ovom serveru da šalju deljene resurse na druge servere", + "Allow users on this server to receive shares from other servers" : "Dozvoli korisnicima na ovom serveru da primaju deljene resurse sa drugih servera" +}, +"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/federatedfilesharing/l10n/sr@latin.json b/apps/federatedfilesharing/l10n/sr@latin.json new file mode 100644 index 00000000000..64463cf1ebc --- /dev/null +++ b/apps/federatedfilesharing/l10n/sr@latin.json @@ -0,0 +1,5 @@ +{ "translations": { + "Allow users on this server to send shares to other servers" : "Dozvoli korisnicima na ovom serveru da šalju deljene resurse na druge servere", + "Allow users on this server to receive shares from other servers" : "Dozvoli korisnicima na ovom serveru da primaju deljene resurse sa drugih servera" +},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" +}
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/sv.js b/apps/federatedfilesharing/l10n/sv.js index 54f98bcb34f..fc9f0c824e5 100644 --- a/apps/federatedfilesharing/l10n/sv.js +++ b/apps/federatedfilesharing/l10n/sv.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Ogiltig Federerad Cloud-ID", "Sharing %s failed, because this item is already shared with %s" : "Delning %s misslyckades därför att objektet redan är delat med %s", "Not allowed to create a federated share with the same user" : "Ej tillåtet att skapa en federerad delning med samma användare", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Misslyckades dela ut %s, kan inte hitta %s, kanske är servern inte åtkomlig för närvarande." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Misslyckades dela ut %s, kan inte hitta %s, kanske är servern inte åtkomlig för närvarande.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dela med mig genom min #owncloud Federated Cloud ID, se %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Dela med mig genom min #ownCloud Federated Cloud ID", + "Federated Cloud Sharing" : "Federate Cloud delning", + "Open documentation" : "Öppna dokumentation", + "Allow users on this server to send shares to other servers" : "Tillåt användare på denna server att skicka utdelningar till andra servrar", + "Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Ditt Federated Cloud ID", + "Share it:" : "Dela detta:", + "Add to your website" : "Lägg till på din hemsida", + "Share with me via ownCloud" : "Dela med mig via Owncloud", + "HTML Code:" : "HTML Kod:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/sv.json b/apps/federatedfilesharing/l10n/sv.json index 70a11577280..5a4164a3c47 100644 --- a/apps/federatedfilesharing/l10n/sv.json +++ b/apps/federatedfilesharing/l10n/sv.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Ogiltig Federerad Cloud-ID", "Sharing %s failed, because this item is already shared with %s" : "Delning %s misslyckades därför att objektet redan är delat med %s", "Not allowed to create a federated share with the same user" : "Ej tillåtet att skapa en federerad delning med samma användare", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Misslyckades dela ut %s, kan inte hitta %s, kanske är servern inte åtkomlig för närvarande." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Misslyckades dela ut %s, kan inte hitta %s, kanske är servern inte åtkomlig för närvarande.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dela med mig genom min #owncloud Federated Cloud ID, se %s", + "Share with me through my #ownCloud Federated Cloud ID" : "Dela med mig genom min #ownCloud Federated Cloud ID", + "Federated Cloud Sharing" : "Federate Cloud delning", + "Open documentation" : "Öppna dokumentation", + "Allow users on this server to send shares to other servers" : "Tillåt användare på denna server att skicka utdelningar till andra servrar", + "Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar", + "Federated Cloud" : "Federated Cloud", + "Your Federated Cloud ID:" : "Ditt Federated Cloud ID", + "Share it:" : "Dela detta:", + "Add to your website" : "Lägg till på din hemsida", + "Share with me via ownCloud" : "Dela med mig via Owncloud", + "HTML Code:" : "HTML Kod:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/th_TH.js b/apps/federatedfilesharing/l10n/th_TH.js index cb8e2622ffb..2ee6c54047d 100644 --- a/apps/federatedfilesharing/l10n/th_TH.js +++ b/apps/federatedfilesharing/l10n/th_TH.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "ไอดีคลาวด์ในเครือไม่ถูกต้อง", "Sharing %s failed, because this item is already shared with %s" : "การแชร์ %s ล้มเหลวเพราะรายการนี้ถูกแชร์กับ %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, บางทีอาจจะยังไม่สามารถเข้าถึงเซิร์ฟเวอร์ปัจจุบัน" + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "การแชร์ %s ล้มเหลวไม่สามารถหา %s, บางทีอาจจะยังไม่สามารถเข้าถึงเซิร์ฟเวอร์ปัจจุบัน", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s", + "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ", + "Federated Cloud Sharing" : "สหพันธ์การแชร์คลาวด์", + "Open documentation" : "เปิดเอกสาร", + "Allow users on this server to send shares to other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ส่งแชร์ไปยังเซิร์ฟเวอร์อื่นๆ", + "Allow users on this server to receive shares from other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ได้รับการแชร์จากเซิร์ฟเวอร์อื่นๆ", + "Federated Cloud" : "สหพันธ์คลาวด์", + "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:", + "Share it:" : "แชร์มัน:", + "Add to your website" : "เพิ่มไปยังเว็บไซต์", + "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud", + "HTML Code:" : "โค้ด HTML:" }, "nplurals=1; plural=0;"); diff --git a/apps/federatedfilesharing/l10n/th_TH.json b/apps/federatedfilesharing/l10n/th_TH.json index 79ff6056026..b1ca0b43f90 100644 --- a/apps/federatedfilesharing/l10n/th_TH.json +++ b/apps/federatedfilesharing/l10n/th_TH.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "ไอดีคลาวด์ในเครือไม่ถูกต้อง", "Sharing %s failed, because this item is already shared with %s" : "การแชร์ %s ล้มเหลวเพราะรายการนี้ถูกแชร์กับ %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, บางทีอาจจะยังไม่สามารถเข้าถึงเซิร์ฟเวอร์ปัจจุบัน" + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "การแชร์ %s ล้มเหลวไม่สามารถหา %s, บางทีอาจจะยังไม่สามารถเข้าถึงเซิร์ฟเวอร์ปัจจุบัน", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s", + "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ", + "Federated Cloud Sharing" : "สหพันธ์การแชร์คลาวด์", + "Open documentation" : "เปิดเอกสาร", + "Allow users on this server to send shares to other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ส่งแชร์ไปยังเซิร์ฟเวอร์อื่นๆ", + "Allow users on this server to receive shares from other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ได้รับการแชร์จากเซิร์ฟเวอร์อื่นๆ", + "Federated Cloud" : "สหพันธ์คลาวด์", + "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:", + "Share it:" : "แชร์มัน:", + "Add to your website" : "เพิ่มไปยังเว็บไซต์", + "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud", + "HTML Code:" : "โค้ด HTML:" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/tr.js b/apps/federatedfilesharing/l10n/tr.js index c0e9f843271..a4f4ad92329 100644 --- a/apps/federatedfilesharing/l10n/tr.js +++ b/apps/federatedfilesharing/l10n/tr.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "Geçersiz Birleşmiş Bulut Kimliği", "Sharing %s failed, because this item is already shared with %s" : "%s paylaşımı, %s ile zaten paylaşıldığından dolayı başarısız oldu", "Not allowed to create a federated share with the same user" : "Aynı kullanıcı ile bir birleşmiş paylaşım oluşturulamaz", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s paylaşımı başarısız. %s bulunamadı veya sunucu şu anda ulaşılamıyor olabilir." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s paylaşımı başarısız. %s bulunamadı veya sunucu şu anda ulaşılamıyor olabilir.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaş, bkz %s", + "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaş", + "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı", + "Open documentation" : "Belgelendirmeyi aç", + "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver", + "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver", + "Federated Cloud" : "Birleşmiş Bulut", + "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", + "Share it:" : "Paylaşın:", + "Add to your website" : "Web sitenize ekleyin", + "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşın", + "HTML Code:" : "HTML Kodu:" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federatedfilesharing/l10n/tr.json b/apps/federatedfilesharing/l10n/tr.json index dc9bd7a8f46..23477fdd9c3 100644 --- a/apps/federatedfilesharing/l10n/tr.json +++ b/apps/federatedfilesharing/l10n/tr.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "Geçersiz Birleşmiş Bulut Kimliği", "Sharing %s failed, because this item is already shared with %s" : "%s paylaşımı, %s ile zaten paylaşıldığından dolayı başarısız oldu", "Not allowed to create a federated share with the same user" : "Aynı kullanıcı ile bir birleşmiş paylaşım oluşturulamaz", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s paylaşımı başarısız. %s bulunamadı veya sunucu şu anda ulaşılamıyor olabilir." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "%s paylaşımı başarısız. %s bulunamadı veya sunucu şu anda ulaşılamıyor olabilir.", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaş, bkz %s", + "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaş", + "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı", + "Open documentation" : "Belgelendirmeyi aç", + "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver", + "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver", + "Federated Cloud" : "Birleşmiş Bulut", + "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", + "Share it:" : "Paylaşın:", + "Add to your website" : "Web sitenize ekleyin", + "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşın", + "HTML Code:" : "HTML Kodu:" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/uk.js b/apps/federatedfilesharing/l10n/uk.js index c25fd3ad8c8..fe92bd9440c 100644 --- a/apps/federatedfilesharing/l10n/uk.js +++ b/apps/federatedfilesharing/l10n/uk.js @@ -2,6 +2,12 @@ OC.L10N.register( "federatedfilesharing", { "Sharing %s failed, because this item is already shared with %s" : "Не вдалося поділитися %s, оскільки файл вже в загальному доступі з %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Не вдалося поділитися %s, не вдалося знайти %s, можливо, сервер не доступний." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Не вдалося поділитися %s, не вдалося знайти %s, можливо, сервер не доступний.", + "Federated Cloud Sharing" : "Об’єднання хмарних сховищ", + "Open documentation" : "Відкрити документацію", + "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах", + "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів", + "Share it:" : "Поділитися цим:", + "HTML Code:" : "HTML код:" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/federatedfilesharing/l10n/uk.json b/apps/federatedfilesharing/l10n/uk.json index 61a4f3a2c9c..5f3c2002f39 100644 --- a/apps/federatedfilesharing/l10n/uk.json +++ b/apps/federatedfilesharing/l10n/uk.json @@ -1,5 +1,11 @@ { "translations": { "Sharing %s failed, because this item is already shared with %s" : "Не вдалося поділитися %s, оскільки файл вже в загальному доступі з %s", - "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Не вдалося поділитися %s, не вдалося знайти %s, можливо, сервер не доступний." + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Не вдалося поділитися %s, не вдалося знайти %s, можливо, сервер не доступний.", + "Federated Cloud Sharing" : "Об’єднання хмарних сховищ", + "Open documentation" : "Відкрити документацію", + "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах", + "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів", + "Share it:" : "Поділитися цим:", + "HTML Code:" : "HTML код:" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/zh_CN.js b/apps/federatedfilesharing/l10n/zh_CN.js index 9a3b8e0d06a..9126112cf8b 100644 --- a/apps/federatedfilesharing/l10n/zh_CN.js +++ b/apps/federatedfilesharing/l10n/zh_CN.js @@ -4,6 +4,16 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "联合云ID不正确", "Sharing %s failed, because this item is already shared with %s" : "共享 %s 失败，因为它已经共享给 %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，请检查设置或联系管理员。" + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "共享 %s 失败，联合云无法找到 %s，请检查设置或联系管理员。", + "Federated Cloud Sharing" : "联合云共享", + "Open documentation" : "打开文档", + "Allow users on this server to send shares to other servers" : "允许用户分享文件给其他服务器上的用户", + "Allow users on this server to receive shares from other servers" : "允许用户从其他服务器接收分享", + "Federated Cloud" : "联合云", + "Your Federated Cloud ID:" : "你的联合云ID：", + "Share it:" : "分享它：", + "Add to your website" : "添加到您的网站", + "Share with me via ownCloud" : "通过联合云与我共享", + "HTML Code:" : "HTML 代码:" }, "nplurals=1; plural=0;"); diff --git a/apps/federatedfilesharing/l10n/zh_CN.json b/apps/federatedfilesharing/l10n/zh_CN.json index 6a3c1843682..b8d473f2d12 100644 --- a/apps/federatedfilesharing/l10n/zh_CN.json +++ b/apps/federatedfilesharing/l10n/zh_CN.json @@ -2,6 +2,16 @@ "Invalid Federated Cloud ID" : "联合云ID不正确", "Sharing %s failed, because this item is already shared with %s" : "共享 %s 失败，因为它已经共享给 %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，请检查设置或联系管理员。" + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "共享 %s 失败，联合云无法找到 %s，请检查设置或联系管理员。", + "Federated Cloud Sharing" : "联合云共享", + "Open documentation" : "打开文档", + "Allow users on this server to send shares to other servers" : "允许用户分享文件给其他服务器上的用户", + "Allow users on this server to receive shares from other servers" : "允许用户从其他服务器接收分享", + "Federated Cloud" : "联合云", + "Your Federated Cloud ID:" : "你的联合云ID：", + "Share it:" : "分享它：", + "Add to your website" : "添加到您的网站", + "Share with me via ownCloud" : "通过联合云与我共享", + "HTML Code:" : "HTML 代码:" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/zh_TW.js b/apps/federatedfilesharing/l10n/zh_TW.js index cfdeb1f8bc1..1a687eb0416 100644 --- a/apps/federatedfilesharing/l10n/zh_TW.js +++ b/apps/federatedfilesharing/l10n/zh_TW.js @@ -4,6 +4,18 @@ OC.L10N.register( "Invalid Federated Cloud ID" : "無效的雲端聯盟ID:", "Sharing %s failed, because this item is already shared with %s" : "分享 %s 失敗，因為此項目目前已經與 %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，或許目前無法連線到該伺服器" + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "分享%s失敗，找不到%s，或許目前無法連線到該伺服器", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "可透過我的 #ownCloud 聯盟雲端 ID，與我分享，請看 %s", + "Share with me through my #ownCloud Federated Cloud ID" : "可透過我的 #ownCloud 聯盟雲端 ID，與我分享", + "Federated Cloud Sharing" : "聯盟式雲端分享", + "Open documentation" : "開啟說明文件", + "Allow users on this server to send shares to other servers" : "允許這台伺服器上的使用者發送分享給其他伺服器", + "Allow users on this server to receive shares from other servers" : "允許這台伺服器上的使用者發送接收來自其他伺服器的分享", + "Federated Cloud" : "聯盟式雲端", + "Your Federated Cloud ID:" : "您的雲端聯盟 ID：", + "Share it:" : "分享它：", + "Add to your website" : "新增至您的網站", + "Share with me via ownCloud" : "透過 ownCloud 與我分享", + "HTML Code:" : "HTML Code:" }, "nplurals=1; plural=0;"); diff --git a/apps/federatedfilesharing/l10n/zh_TW.json b/apps/federatedfilesharing/l10n/zh_TW.json index 6207be0d519..81d4833ce47 100644 --- a/apps/federatedfilesharing/l10n/zh_TW.json +++ b/apps/federatedfilesharing/l10n/zh_TW.json @@ -2,6 +2,18 @@ "Invalid Federated Cloud ID" : "無效的雲端聯盟ID:", "Sharing %s failed, because this item is already shared with %s" : "分享 %s 失敗，因為此項目目前已經與 %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，或許目前無法連線到該伺服器" + "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "分享%s失敗，找不到%s，或許目前無法連線到該伺服器", + "Share with me through my #ownCloud Federated Cloud ID, see %s" : "可透過我的 #ownCloud 聯盟雲端 ID，與我分享，請看 %s", + "Share with me through my #ownCloud Federated Cloud ID" : "可透過我的 #ownCloud 聯盟雲端 ID，與我分享", + "Federated Cloud Sharing" : "聯盟式雲端分享", + "Open documentation" : "開啟說明文件", + "Allow users on this server to send shares to other servers" : "允許這台伺服器上的使用者發送分享給其他伺服器", + "Allow users on this server to receive shares from other servers" : "允許這台伺服器上的使用者發送接收來自其他伺服器的分享", + "Federated Cloud" : "聯盟式雲端", + "Your Federated Cloud ID:" : "您的雲端聯盟 ID：", + "Share it:" : "分享它：", + "Add to your website" : "新增至您的網站", + "Share with me via ownCloud" : "透過 ownCloud 與我分享", + "HTML Code:" : "HTML Code:" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/lib/federatedshareprovider.php b/apps/federatedfilesharing/lib/federatedshareprovider.php index 78b0b664204..d014a6219a3 100644 --- a/apps/federatedfilesharing/lib/federatedshareprovider.php +++ b/apps/federatedfilesharing/lib/federatedshareprovider.php @@ -25,6 +25,8 @@ namespace OCA\FederatedFileSharing; use OC\Share20\Share; use OCP\Files\IRootFolder; +use OCP\IAppConfig; +use OCP\IConfig; use OCP\IL10N; use OCP\ILogger; use OCP\Share\IShare; @@ -65,6 +67,9 @@ class FederatedShareProvider implements IShareProvider { /** @var IRootFolder */ private $rootFolder; + /** @var IConfig */ + private $config; + /** * DefaultShareProvider constructor. * @@ -75,6 +80,7 @@ class FederatedShareProvider implements IShareProvider { * @param IL10N $l10n * @param ILogger $logger * @param IRootFolder $rootFolder + * @param IConfig $config */ public function __construct( IDBConnection $connection, @@ -83,7 +89,8 @@ class FederatedShareProvider implements IShareProvider { TokenHandler $tokenHandler, IL10N $l10n, ILogger $logger, - IRootFolder $rootFolder + IRootFolder $rootFolder, + IConfig $config ) { $this->dbConnection = $connection; $this->addressHandler = $addressHandler; @@ -92,6 +99,7 @@ class FederatedShareProvider implements IShareProvider { $this->l = $l10n; $this->logger = $logger; $this->rootFolder = $rootFolder; + $this->config = $config; } /** @@ -601,4 +609,24 @@ class FederatedShareProvider implements IShareProvider { // We don't handle groups here return; } + + /** + * check if users from other ownCloud instances are allowed to mount public links share by this instance + * + * @return bool + */ + public function isOutgoingServer2serverShareEnabled() { + $result = $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes'); + return ($result === 'yes') ? true : false; + } + + /** + * check if users are allowed to mount public links from other ownClouds + * + * @return bool + */ + public function isIncomingServer2serverShareEnabled() { + $result = $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes'); + return ($result === 'yes') ? true : false; + } } diff --git a/apps/files_sharing/settings-admin.php b/apps/federatedfilesharing/settings-admin.php index b2a305ebcdb..9dd21281fda 100644 --- a/apps/files_sharing/settings-admin.php +++ b/apps/federatedfilesharing/settings-admin.php @@ -20,12 +20,15 @@ * */ +use OCA\FederatedFileSharing\AppInfo\Application; + \OC_Util::checkAdminUser(); -\OCP\Util::addScript('files_sharing', 'settings-admin'); +$app = new Application('federatedfilesharing'); +$federatedShareProvider = $app->getFederatedShareProvider(); -$tmpl = new OCP\Template('files_sharing', 'settings-admin'); -$tmpl->assign('outgoingServer2serverShareEnabled', OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled()); -$tmpl->assign('incomingServer2serverShareEnabled', OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled()); +$tmpl = new OCP\Template('federatedfilesharing', 'settings-admin'); +$tmpl->assign('outgoingServer2serverShareEnabled', $federatedShareProvider->isOutgoingServer2serverShareEnabled()); +$tmpl->assign('incomingServer2serverShareEnabled', $federatedShareProvider->isIncomingServer2serverShareEnabled()); return $tmpl->fetchPage(); diff --git a/apps/files_sharing/settings-personal.php b/apps/federatedfilesharing/settings-personal.php index 982a8b05c15..385d3971146 100644 --- a/apps/files_sharing/settings-personal.php +++ b/apps/federatedfilesharing/settings-personal.php @@ -21,9 +21,14 @@ * */ +use OCA\FederatedFileSharing\AppInfo\Application; + \OC_Util::checkLoggedIn(); -$l = \OC::$server->getL10N('files_sharing'); +$l = \OC::$server->getL10N('federatedfilesharing'); + +$app = new Application('federatedfilesharing'); +$federatedShareProvider = $app->getFederatedShareProvider(); $isIE8 = false; preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches); @@ -35,8 +40,8 @@ $cloudID = \OC::$server->getUserSession()->getUser()->getCloudId(); $url = 'https://owncloud.org/federation#' . $cloudID; $ownCloudLogoPath = \OC::$server->getURLGenerator()->imagePath('core', 'logo-icon.svg'); -$tmpl = new OCP\Template('files_sharing', 'settings-personal'); -$tmpl->assign('outgoingServer2serverShareEnabled', \OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled()); +$tmpl = new OCP\Template('federatedfilesharing', 'settings-personal'); +$tmpl->assign('outgoingServer2serverShareEnabled', $federatedShareProvider->isOutgoingServer2serverShareEnabled()); $tmpl->assign('message_with_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID, see %s', [$url])); $tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud Federated Cloud ID', [$cloudID])); $tmpl->assign('owncloud_logo_path', $ownCloudLogoPath); diff --git a/apps/files_sharing/templates/settings-admin.php b/apps/federatedfilesharing/templates/settings-admin.php index 64b6b8e72a3..5d2eb04c170 100644 --- a/apps/files_sharing/templates/settings-admin.php +++ b/apps/federatedfilesharing/templates/settings-admin.php @@ -1,7 +1,9 @@ <?php /** @var OC_L10N $l */ /** @var array $_ */ +script('federatedfilesharing', 'settings-admin'); ?> + <div id="fileSharingSettings"> <h3><?php p($l->t('Federated Cloud Sharing'));?></h3> <a target="_blank" rel="noreferrer" class="icon-info svg" diff --git a/apps/files_sharing/templates/settings-personal.php b/apps/federatedfilesharing/templates/settings-personal.php index ea9aae038a7..87b524af3e8 100644 --- a/apps/files_sharing/templates/settings-personal.php +++ b/apps/federatedfilesharing/templates/settings-personal.php @@ -1,11 +1,11 @@ <?php /** @var OC_L10N $l */ /** @var array $_ */ -script('files_sharing', 'settings-personal'); -style('files_sharing', 'settings-personal'); +script('federatedfilesharing', 'settings-personal'); +style('federatedfilesharing', 'settings-personal'); if ($_['showShareIT']) { - script('files_sharing', '3rdparty/gs-share/gs-share'); - style('files_sharing', '3rdparty/gs-share/style'); + script('federatedfilesharing', '3rdparty/gs-share/gs-share'); + style('federatedfilesharing', '3rdparty/gs-share/style'); } ?> diff --git a/apps/federatedfilesharing/tests/federatedshareprovidertest.php b/apps/federatedfilesharing/tests/federatedshareprovidertest.php index 92e9f10c3cd..1fbae90a46f 100644 --- a/apps/federatedfilesharing/tests/federatedshareprovidertest.php +++ b/apps/federatedfilesharing/tests/federatedshareprovidertest.php @@ -26,6 +26,7 @@ use OCA\FederatedFileSharing\FederatedShareProvider; use OCA\FederatedFileSharing\Notifications; use OCA\FederatedFileSharing\TokenHandler; use OCP\Files\IRootFolder; +use OCP\IConfig; use OCP\IDBConnection; use OCP\IL10N; use OCP\ILogger; @@ -54,6 +55,8 @@ class FederatedShareProviderTest extends TestCase { protected $logger; /** @var IRootFolder | \PHPUnit_Framework_MockObject_MockObject */ protected $rootFolder; + /** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ + protected $config; /** @var IManager */ protected $shareManager; @@ -78,6 +81,7 @@ class FederatedShareProviderTest extends TestCase { })); $this->logger = $this->getMock('OCP\ILogger'); $this->rootFolder = $this->getMock('OCP\Files\IRootFolder'); + $this->config = $this->getMock('OCP\IConfig'); $this->addressHandler = new AddressHandler(\OC::$server->getURLGenerator(), $this->l); $this->provider = new FederatedShareProvider( @@ -87,7 +91,8 @@ class FederatedShareProviderTest extends TestCase { $this->tokenHandler, $this->l, $this->logger, - $this->rootFolder + $this->rootFolder, + $this->config ); $this->shareManager = \OC::$server->getShareManager(); @@ -510,4 +515,43 @@ class FederatedShareProviderTest extends TestCase { $this->assertCount($rowDeleted ? 0 : 1, $data); } + + /** + * @dataProvider dataTestFederatedSharingSettings + * + * @param string $isEnabled + * @param bool $expected + */ + public function testIsOutgoingServer2serverShareEnabled($isEnabled, $expected) { + $this->config->expects($this->once())->method('getAppValue') + ->with('files_sharing', 'outgoing_server2server_share_enabled', 'yes') + ->willReturn($isEnabled); + + $this->assertSame($expected, + $this->provider->isOutgoingServer2serverShareEnabled() + ); + } + + /** + * @dataProvider dataTestFederatedSharingSettings + * + * @param string $isEnabled + * @param bool $expected + */ + public function testIsIncomingServer2serverShareEnabled($isEnabled, $expected) { + $this->config->expects($this->once())->method('getAppValue') + ->with('files_sharing', 'incoming_server2server_share_enabled', 'yes') + ->willReturn($isEnabled); + + $this->assertSame($expected, + $this->provider->isIncomingServer2serverShareEnabled() + ); + } + + public function dataTestFederatedSharingSettings() { + return [ + ['yes', true], + ['no', false] + ]; + } } diff --git a/apps/federation/l10n/bg_BG.js b/apps/federation/l10n/bg_BG.js new file mode 100644 index 00000000000..402b89d086a --- /dev/null +++ b/apps/federation/l10n/bg_BG.js @@ -0,0 +1,12 @@ +OC.L10N.register( + "federation", + { + "Server added to the list of trusted ownClouds" : "Сървърат добавен в листа със сигурни ownClouds", + "Server is already in the list of trusted servers." : "Сървъра вече е добавен в листа с сигурни сървъри", + "No ownCloud server found" : "Не е намерен ownCloud сървър", + "Federation" : "Федерация", + "Trusted ownCloud Servers" : "Сигурни ownCloud сървъри", + "+ Add ownCloud server" : "+ Добавяне ownCloud сървър", + "ownCloud Server" : "ownCloud сървър" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/federation/l10n/bg_BG.json b/apps/federation/l10n/bg_BG.json new file mode 100644 index 00000000000..f0fed16602c --- /dev/null +++ b/apps/federation/l10n/bg_BG.json @@ -0,0 +1,10 @@ +{ "translations": { + "Server added to the list of trusted ownClouds" : "Сървърат добавен в листа със сигурни ownClouds", + "Server is already in the list of trusted servers." : "Сървъра вече е добавен в листа с сигурни сървъри", + "No ownCloud server found" : "Не е намерен ownCloud сървър", + "Federation" : "Федерация", + "Trusted ownCloud Servers" : "Сигурни ownCloud сървъри", + "+ Add ownCloud server" : "+ Добавяне ownCloud сървър", + "ownCloud Server" : "ownCloud сървър" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js index be0457c9b9a..b9f19666fa0 100644 --- a/apps/files/l10n/sl.js +++ b/apps/files/l10n/sl.js @@ -105,6 +105,7 @@ OC.L10N.register( "With PHP-FPM it might take 5 minutes for changes to be applied." : "Uveljavljanje sprememb prek PHP-FPM lahko traja tudi 5 minut.", "Missing permissions to edit from here." : "Ni ustreznih dovoljenj za urejanje na tej ravni.", "Settings" : "Nastavitve", + "Show hidden files" : "Pokaži skrite datoteke", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Uporabite naslov <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> za dostop do datotek prek sistema WebDAV</a>.", "Cancel upload" : "Prekliči pošiljanje", diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json index 4f2cf82b46b..ce674108901 100644 --- a/apps/files/l10n/sl.json +++ b/apps/files/l10n/sl.json @@ -103,6 +103,7 @@ "With PHP-FPM it might take 5 minutes for changes to be applied." : "Uveljavljanje sprememb prek PHP-FPM lahko traja tudi 5 minut.", "Missing permissions to edit from here." : "Ni ustreznih dovoljenj za urejanje na tej ravni.", "Settings" : "Nastavitve", + "Show hidden files" : "Pokaži skrite datoteke", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">access your Files via WebDAV</a>" : "Uporabite naslov <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\"> za dostop do datotek prek sistema WebDAV</a>.", "Cancel upload" : "Prekliči pošiljanje", diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js index e8d78ea8f6e..d2abf4eb427 100644 --- a/apps/files_external/l10n/th_TH.js +++ b/apps/files_external/l10n/th_TH.js @@ -75,7 +75,7 @@ OC.L10N.register( "Enable Path Style" : "เปิดใช้งานสไตล์เส้นทาง", "WebDAV" : "WebDAV", "URL" : "URL", - "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล", + "Remote subfolder" : "โฟลเดอร์ย่อยรีโมท", "Secure https://" : "โหมดปลอดภัย https://", "Dropbox" : "Dropbox", "FTP" : "FTP", diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json index 4b42ad575b1..16035bfc6b5 100644 --- a/apps/files_external/l10n/th_TH.json +++ b/apps/files_external/l10n/th_TH.json @@ -73,7 +73,7 @@ "Enable Path Style" : "เปิดใช้งานสไตล์เส้นทาง", "WebDAV" : "WebDAV", "URL" : "URL", - "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล", + "Remote subfolder" : "โฟลเดอร์ย่อยรีโมท", "Secure https://" : "โหมดปลอดภัย https://", "Dropbox" : "Dropbox", "FTP" : "FTP", diff --git a/apps/files_external/service/dbconfigservice.php b/apps/files_external/service/dbconfigservice.php index a37c541f045..9f7061eb938 100644 --- a/apps/files_external/service/dbconfigservice.php +++ b/apps/files_external/service/dbconfigservice.php @@ -322,10 +322,19 @@ class DBConfigService { private function getMountsFromQuery(IQueryBuilder $query) { $result = $query->execute(); $mounts = $result->fetchAll(); + $uniqueMounts = []; + foreach ($mounts as $mount) { + $id = $mount['mount_id']; + if (!isset($uniqueMounts[$id])) { + $uniqueMounts[$id] = $mount; + } + } + $uniqueMounts = array_values($uniqueMounts); $mountIds = array_map(function ($mount) { return $mount['mount_id']; - }, $mounts); + }, $uniqueMounts); + $mountIds = array_values(array_unique($mountIds)); $applicable = $this->getApplicableForMounts($mountIds); $config = $this->getConfigForMounts($mountIds); @@ -338,7 +347,7 @@ class DBConfigService { $mount['config'] = $config; $mount['options'] = $options; return $mount; - }, $mounts, $applicable, $config, $options); + }, $uniqueMounts, $applicable, $config, $options); } /** diff --git a/apps/files_external/tests/service/dbconfigservicetest.php b/apps/files_external/tests/service/dbconfigservicetest.php index c6d1add36b6..b088a7078d1 100644 --- a/apps/files_external/tests/service/dbconfigservicetest.php +++ b/apps/files_external/tests/service/dbconfigservicetest.php @@ -271,4 +271,15 @@ class DBConfigServiceTest extends TestCase { $mount = $this->dbConfig->getMountById($id2); $this->assertEquals('bar', $mount['auth_backend']); } + + public function testGetMountsForDuplicateByGroup() { + $id1 = $this->addMount('/test', 'foo', 'bar', 100, DBConfigService::MOUNT_TYPE_ADMIN); + + $this->dbConfig->addApplicable($id1, DBConfigService::APPLICABLE_TYPE_GROUP, 'group1'); + $this->dbConfig->addApplicable($id1, DBConfigService::APPLICABLE_TYPE_GROUP, 'group2'); + + $mounts = $this->dbConfig->getAdminMountsForMultiple(DBConfigService::APPLICABLE_TYPE_GROUP, ['group1', 'group2']); + $this->assertCount(1, $mounts); + $this->assertEquals($id1, $mounts[0]['mount_id']); + } } diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php index 76f9d5d7668..78e648618be 100644 --- a/apps/files_sharing/ajax/external.php +++ b/apps/files_sharing/ajax/external.php @@ -31,8 +31,11 @@ OCP\JSON::checkAppEnabled('files_sharing'); $l = \OC::$server->getL10N('files_sharing'); +$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing'); +$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider(); + // check if server admin allows to mount public links from other servers -if (OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled() === false) { +if ($federatedShareProvider->isIncomingServer2serverShareEnabled() === false) { \OCP\JSON::error(array('data' => array('message' => $l->t('Server to server sharing is not enabled on this server')))); exit(); } diff --git a/apps/files_sharing/ajax/shareinfo.php b/apps/files_sharing/ajax/shareinfo.php index 47bc061c136..d7f756b0039 100644 --- a/apps/files_sharing/ajax/shareinfo.php +++ b/apps/files_sharing/ajax/shareinfo.php @@ -29,7 +29,10 @@ if (!isset($_GET['t'])) { exit; } -if (OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled() === false) { +$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing'); +$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider(); + +if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false) { \OC_Response::setStatus(404); // 404 not found exit; } diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php index 11b24d9148b..034ec5105e4 100644 --- a/apps/files_sharing/api/server2server.php +++ b/apps/files_sharing/api/server2server.php @@ -26,11 +26,25 @@ namespace OCA\Files_Sharing\API; use OCA\FederatedFileSharing\DiscoveryManager; +use OCA\FederatedFileSharing\FederatedShareProvider; use OCA\Files_Sharing\Activity; use OCP\Files\NotFoundException; class Server2Server { + /** @var FederatedShareProvider */ + private $federatedShareProvider; + + + /** + * Server2Server constructor. + * + * @param FederatedShareProvider $federatedShareProvider + */ + public function __construct(FederatedShareProvider $federatedShareProvider) { + $this->federatedShareProvider = $federatedShareProvider; + } + /** * create a new share * @@ -300,9 +314,9 @@ class Server2Server { $result = \OCP\App::isEnabled('files_sharing'); if ($incoming) { - $result = $result && \OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled(); + $result = $result && $this->federatedShareProvider->isIncomingServer2serverShareEnabled(); } else { - $result = $result && \OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled(); + $result = $result && $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(); } return $result; diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 29202c15b22..e0cbfd7f5ba 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -44,9 +44,6 @@ $l = \OC::$server->getL10N('files_sharing'); $application = new Application(); $application->registerMountProviders(); -\OCP\App::registerAdmin('files_sharing', 'settings-admin'); -\OCP\App::registerPersonal('files_sharing', 'settings-personal'); - \OCA\Files_Sharing\Helper::registerHooks(); \OCP\Share::registerBackend('file', 'OC_Share_Backend_File'); diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php index 5233b343830..b17e213e2e2 100644 --- a/apps/files_sharing/appinfo/application.php +++ b/apps/files_sharing/appinfo/application.php @@ -45,6 +45,7 @@ class Application extends App { * Controllers */ $container->registerService('ShareController', function (SimpleContainer $c) use ($server) { + $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing'); return new ShareController( $c->query('AppName'), $c->query('Request'), @@ -56,7 +57,8 @@ class Application extends App { $server->getShareManager(), $server->getSession(), $server->getPreviewManager(), - $server->getRootFolder() + $server->getRootFolder(), + $federatedSharingApp->getFederatedShareProvider() ); }); $container->registerService('ExternalSharesController', function (SimpleContainer $c) { diff --git a/apps/files_sharing/l10n/az.js b/apps/files_sharing/l10n/az.js index 5cec471aa24..7bf3472dfef 100644 --- a/apps/files_sharing/l10n/az.js +++ b/apps/files_sharing/l10n/az.js @@ -55,10 +55,6 @@ OC.L10N.register( "Add to your ownCloud" : "Öz ownCloud-nuza əlavə edin", "Download" : "Yüklə", "Download %s" : "Endir %s", - "Direct link" : "Birbaşa link", - "Federated Cloud Sharing" : "Federal Cloud Paylaşım", - "Open documentation" : "Sənədləri aç", - "Allow users on this server to send shares to other servers" : "Bu serverdən digər serverlərə istifadəçilər tərəfindən paylaşımın göndərilməsinə izin vermək", - "Allow users on this server to receive shares from other servers" : "Digər serverlərdən bu serverə istifadəçilər tərəfindən paylaşımın ötürülməsinə izin vermək" + "Direct link" : "Birbaşa link" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/az.json b/apps/files_sharing/l10n/az.json index bd74add7ca8..40e16a7cc0c 100644 --- a/apps/files_sharing/l10n/az.json +++ b/apps/files_sharing/l10n/az.json @@ -53,10 +53,6 @@ "Add to your ownCloud" : "Öz ownCloud-nuza əlavə edin", "Download" : "Yüklə", "Download %s" : "Endir %s", - "Direct link" : "Birbaşa link", - "Federated Cloud Sharing" : "Federal Cloud Paylaşım", - "Open documentation" : "Sənədləri aç", - "Allow users on this server to send shares to other servers" : "Bu serverdən digər serverlərə istifadəçilər tərəfindən paylaşımın göndərilməsinə izin vermək", - "Allow users on this server to receive shares from other servers" : "Digər serverlərdən bu serverə istifadəçilər tərəfindən paylaşımın ötürülməsinə izin vermək" + "Direct link" : "Birbaşa link" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/bg_BG.js b/apps/files_sharing/l10n/bg_BG.js index 540f7d0f14a..01f9e6b989c 100644 --- a/apps/files_sharing/l10n/bg_BG.js +++ b/apps/files_sharing/l10n/bg_BG.js @@ -51,8 +51,6 @@ OC.L10N.register( "Add to your ownCloud" : "Добави към своя ownCloud", "Download" : "Изтегли", "Download %s" : "Изтегли %s", - "Direct link" : "Директна връзка", - "Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки с други сървъри", - "Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри" + "Direct link" : "Директна връзка" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/bg_BG.json b/apps/files_sharing/l10n/bg_BG.json index 18dddd90cbc..6cca34b23e1 100644 --- a/apps/files_sharing/l10n/bg_BG.json +++ b/apps/files_sharing/l10n/bg_BG.json @@ -49,8 +49,6 @@ "Add to your ownCloud" : "Добави към своя ownCloud", "Download" : "Изтегли", "Download %s" : "Изтегли %s", - "Direct link" : "Директна връзка", - "Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки с други сървъри", - "Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри" + "Direct link" : "Директна връзка" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ca.js b/apps/files_sharing/l10n/ca.js index 31255f628bb..cb13956f91b 100644 --- a/apps/files_sharing/l10n/ca.js +++ b/apps/files_sharing/l10n/ca.js @@ -38,7 +38,6 @@ OC.L10N.register( "Add to your ownCloud" : "Afegiu a ownCloud", "Download" : "Baixa", "Download %s" : "Baixa %s", - "Direct link" : "Enllaç directe", - "Open documentation" : "Obre la documentació" + "Direct link" : "Enllaç directe" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/ca.json b/apps/files_sharing/l10n/ca.json index e244021d55f..fa80c60befb 100644 --- a/apps/files_sharing/l10n/ca.json +++ b/apps/files_sharing/l10n/ca.json @@ -36,7 +36,6 @@ "Add to your ownCloud" : "Afegiu a ownCloud", "Download" : "Baixa", "Download %s" : "Baixa %s", - "Direct link" : "Enllaç directe", - "Open documentation" : "Obre la documentació" + "Direct link" : "Enllaç directe" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js index 3394608fd6f..2f82224e276 100644 --- a/apps/files_sharing/l10n/cs_CZ.js +++ b/apps/files_sharing/l10n/cs_CZ.js @@ -74,8 +74,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "Obdržel(a) jsi \"/%2$s\" jako vzdálené sdílení od %1$s", "Accept" : "Přijmout", "Decline" : "Zamítnout", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID", "This share is password-protected" : "Toto sdílení je chráněno heslem", "The password is wrong. Try again." : "Heslo není správné. Zkuste to znovu.", "Password" : "Heslo", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Přidat do svého ownCloudu", "Download" : "Stáhnout", "Download %s" : "Stáhnout %s", - "Direct link" : "Přímý odkaz", - "Federated Cloud Sharing" : "Propojené cloudové sdílení", - "Open documentation" : "Otevřít dokumentaci", - "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery", - "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů", - "Federated Cloud" : "Sdružený cloud", - "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:", - "Share it:" : "Sdílet:", - "Add to your website" : "Přidat na svou webovou stránku", - "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud", - "HTML Code:" : "HTML kód:" + "Direct link" : "Přímý odkaz" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json index d193eb69373..060a7af4154 100644 --- a/apps/files_sharing/l10n/cs_CZ.json +++ b/apps/files_sharing/l10n/cs_CZ.json @@ -72,8 +72,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "Obdržel(a) jsi \"/%2$s\" jako vzdálené sdílení od %1$s", "Accept" : "Přijmout", "Decline" : "Zamítnout", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID", "This share is password-protected" : "Toto sdílení je chráněno heslem", "The password is wrong. Try again." : "Heslo není správné. Zkuste to znovu.", "Password" : "Heslo", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Přidat do svého ownCloudu", "Download" : "Stáhnout", "Download %s" : "Stáhnout %s", - "Direct link" : "Přímý odkaz", - "Federated Cloud Sharing" : "Propojené cloudové sdílení", - "Open documentation" : "Otevřít dokumentaci", - "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery", - "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů", - "Federated Cloud" : "Sdružený cloud", - "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:", - "Share it:" : "Sdílet:", - "Add to your website" : "Přidat na svou webovou stránku", - "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud", - "HTML Code:" : "HTML kód:" + "Direct link" : "Přímý odkaz" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js index b981022986a..8ecd981af45 100644 --- a/apps/files_sharing/l10n/da.js +++ b/apps/files_sharing/l10n/da.js @@ -56,8 +56,6 @@ OC.L10N.register( "Shares" : "Delt", "Accept" : "Acceptér", "Decline" : "Afvis", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID", "This share is password-protected" : "Delingen er beskyttet af kodeord", "The password is wrong. Try again." : "Kodeordet er forkert. Prøv igen.", "Password" : "Kodeord", @@ -73,16 +71,6 @@ OC.L10N.register( "Add to your ownCloud" : "Tilføj til din ownCload", "Download" : "Hent", "Download %s" : "Hent %s", - "Direct link" : "Direkte link", - "Federated Cloud Sharing" : "Sammensluttet Cloud deling", - "Open documentation" : "Åben dokumentation", - "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere", - "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Din Federated Cloud ID:", - "Share it:" : "Del:", - "Add to your website" : "Tilføj til dit websted", - "Share with me via ownCloud" : "Del med mig gennem ownCloud", - "HTML Code:" : "HTMLkode:" + "Direct link" : "Direkte link" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json index 38f98ca22b8..d68cdfb0452 100644 --- a/apps/files_sharing/l10n/da.json +++ b/apps/files_sharing/l10n/da.json @@ -54,8 +54,6 @@ "Shares" : "Delt", "Accept" : "Acceptér", "Decline" : "Afvis", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID", "This share is password-protected" : "Delingen er beskyttet af kodeord", "The password is wrong. Try again." : "Kodeordet er forkert. Prøv igen.", "Password" : "Kodeord", @@ -71,16 +69,6 @@ "Add to your ownCloud" : "Tilføj til din ownCload", "Download" : "Hent", "Download %s" : "Hent %s", - "Direct link" : "Direkte link", - "Federated Cloud Sharing" : "Sammensluttet Cloud deling", - "Open documentation" : "Åben dokumentation", - "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere", - "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Din Federated Cloud ID:", - "Share it:" : "Del:", - "Add to your website" : "Tilføj til dit websted", - "Share with me via ownCloud" : "Del med mig gennem ownCloud", - "HTML Code:" : "HTMLkode:" + "Direct link" : "Direkte link" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index 6526012e24a..cb14c5e010f 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -74,8 +74,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "Du empfängst \"/%2$s\" als Remotefreigabe von %1$s", "Accept" : "Ok", "Decline" : "Abgelehnt", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", "The password is wrong. Try again." : "Bitte überprüfe Dein Passwort und versuche es erneut.", "Password" : "Passwort", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Zu Deiner ownCloud hinzufügen", "Download" : "Herunterladen", "Download %s" : "Download %s", - "Direct link" : "Direkter Link", - "Federated Cloud Sharing" : "Federated-Cloud-Sharing", - "Open documentation" : "Dokumentation öffnen", - "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", - "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", - "Share it:" : "Zum Teilen:", - "Add to your website" : "Zu deiner Webseite hinzufügen", - "Share with me via ownCloud" : "Teile mit mir über ownCloud", - "HTML Code:" : "HTML-Code:" + "Direct link" : "Direkter Link" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index f9d6118769c..4306e96c20a 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -72,8 +72,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "Du empfängst \"/%2$s\" als Remotefreigabe von %1$s", "Accept" : "Ok", "Decline" : "Abgelehnt", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", "The password is wrong. Try again." : "Bitte überprüfe Dein Passwort und versuche es erneut.", "Password" : "Passwort", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Zu Deiner ownCloud hinzufügen", "Download" : "Herunterladen", "Download %s" : "Download %s", - "Direct link" : "Direkter Link", - "Federated Cloud Sharing" : "Federated-Cloud-Sharing", - "Open documentation" : "Dokumentation öffnen", - "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", - "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:", - "Share it:" : "Zum Teilen:", - "Add to your website" : "Zu deiner Webseite hinzufügen", - "Share with me via ownCloud" : "Teile mit mir über ownCloud", - "HTML Code:" : "HTML-Code:" + "Direct link" : "Direkter Link" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index aaa93baf2f0..269c0bb208e 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -74,8 +74,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "Sie haben \"/%2$s\" als Remotefreigabe von %1$s erhalten", "Accept" : "Akzeptieren", "Decline" : "Ablehnen", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.", "Password" : "Passwort", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen", "Download" : "Herunterladen", "Download %s" : "Download %s", - "Direct link" : "Direkte Verlinkung", - "Federated Cloud Sharing" : "Federated-Cloud-Sharing", - "Open documentation" : "Dokumentation öffnen", - "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", - "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", - "Share it:" : "Zum Teilen:", - "Add to your website" : "Zu Ihrer Website hinzufügen", - "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud", - "HTML Code:" : "HTML-Code:" + "Direct link" : "Direkte Verlinkung" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 24bb6c43cdb..f2952f3db60 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -72,8 +72,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "Sie haben \"/%2$s\" als Remotefreigabe von %1$s erhalten", "Accept" : "Akzeptieren", "Decline" : "Ablehnen", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID", "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt", "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.", "Password" : "Passwort", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen", "Download" : "Herunterladen", "Download %s" : "Download %s", - "Direct link" : "Direkte Verlinkung", - "Federated Cloud Sharing" : "Federated-Cloud-Sharing", - "Open documentation" : "Dokumentation öffnen", - "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", - "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:", - "Share it:" : "Zum Teilen:", - "Add to your website" : "Zu Ihrer Website hinzufügen", - "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud", - "HTML Code:" : "HTML-Code:" + "Direct link" : "Direkte Verlinkung" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js index fe3a62c4357..1959036f6fc 100644 --- a/apps/files_sharing/l10n/el.js +++ b/apps/files_sharing/l10n/el.js @@ -54,8 +54,6 @@ OC.L10N.register( "Shares" : "Κοινόχρηστοι φάκελοι", "Accept" : "Αποδοχή", "Decline" : "Απόρριψη", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου", "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", "The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.", "Password" : "Κωδικός πρόσβασης", @@ -71,16 +69,6 @@ OC.L10N.register( "Add to your ownCloud" : "Προσθήκη στο ownCloud σου", "Download" : "Λήψη", "Download %s" : "Λήψη %s", - "Direct link" : "Άμεσος σύνδεσμος", - "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ", - "Open documentation" : "Ανοιχτή τεκμηρίωση.", - "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", - "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές", - "Federated Cloud" : "Federated σύννεφο", - "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", - "Share it:" : "Μοιραστείτε το:", - "Add to your website" : "Προσθήκη στην ιστοσελίδα σας", - "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", - "HTML Code:" : "Κώδικας HTML:" + "Direct link" : "Άμεσος σύνδεσμος" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json index 3283aa0a029..c241c7613a1 100644 --- a/apps/files_sharing/l10n/el.json +++ b/apps/files_sharing/l10n/el.json @@ -52,8 +52,6 @@ "Shares" : "Κοινόχρηστοι φάκελοι", "Accept" : "Αποδοχή", "Decline" : "Απόρριψη", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου", "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", "The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.", "Password" : "Κωδικός πρόσβασης", @@ -69,16 +67,6 @@ "Add to your ownCloud" : "Προσθήκη στο ownCloud σου", "Download" : "Λήψη", "Download %s" : "Λήψη %s", - "Direct link" : "Άμεσος σύνδεσμος", - "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ", - "Open documentation" : "Ανοιχτή τεκμηρίωση.", - "Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές", - "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές", - "Federated Cloud" : "Federated σύννεφο", - "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:", - "Share it:" : "Μοιραστείτε το:", - "Add to your website" : "Προσθήκη στην ιστοσελίδα σας", - "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ", - "HTML Code:" : "Κώδικας HTML:" + "Direct link" : "Άμεσος σύνδεσμος" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js index 545934771bd..f8ba89b2fa0 100644 --- a/apps/files_sharing/l10n/en_GB.js +++ b/apps/files_sharing/l10n/en_GB.js @@ -74,8 +74,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "You received \"/%2$s\" as a remote share from %1$s", "Accept" : "Accept", "Decline" : "Decline", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Share with me through my #ownCloud Federated Cloud ID, see %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Share with me through my #ownCloud Federated Cloud ID", "This share is password-protected" : "This share is password-protected", "The password is wrong. Try again." : "The password is wrong. Try again.", "Password" : "Password", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Add to your ownCloud", "Download" : "Download", "Download %s" : "Download %s", - "Direct link" : "Direct link", - "Federated Cloud Sharing" : "Federated Cloud Sharing", - "Open documentation" : "Open documentation", - "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", - "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Your Federated Cloud ID:", - "Share it:" : "Share it:", - "Add to your website" : "Add to your website", - "Share with me via ownCloud" : "Share with me via ownCloud", - "HTML Code:" : "HTML Code:" + "Direct link" : "Direct link" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json index a478bb9301a..9ab2cabe562 100644 --- a/apps/files_sharing/l10n/en_GB.json +++ b/apps/files_sharing/l10n/en_GB.json @@ -72,8 +72,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "You received \"/%2$s\" as a remote share from %1$s", "Accept" : "Accept", "Decline" : "Decline", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Share with me through my #ownCloud Federated Cloud ID, see %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Share with me through my #ownCloud Federated Cloud ID", "This share is password-protected" : "This share is password-protected", "The password is wrong. Try again." : "The password is wrong. Try again.", "Password" : "Password", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Add to your ownCloud", "Download" : "Download", "Download %s" : "Download %s", - "Direct link" : "Direct link", - "Federated Cloud Sharing" : "Federated Cloud Sharing", - "Open documentation" : "Open documentation", - "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", - "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Your Federated Cloud ID:", - "Share it:" : "Share it:", - "Add to your website" : "Add to your website", - "Share with me via ownCloud" : "Share with me via ownCloud", - "HTML Code:" : "HTML Code:" + "Direct link" : "Direct link" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/eo.js b/apps/files_sharing/l10n/eo.js index bce9d7298b0..1656264fd57 100644 --- a/apps/files_sharing/l10n/eo.js +++ b/apps/files_sharing/l10n/eo.js @@ -66,8 +66,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "Vi ricevis “/%2$s” kiel fora kunhavigo de %1$s", "Accept" : "Akcepti", "Decline" : "Malakcepti", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Kunhavigi kun mi per mia identigilo de #ownCloud-federnuba identigilo; vidu %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Kunhavigi kun mi per mia #ownCloud-federnuba identigilo", "This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto", "The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.", "Password" : "Pasvorto", @@ -83,14 +81,6 @@ OC.L10N.register( "Add to your ownCloud" : "Aldoni al via ownCloud", "Download" : "Elŝuti", "Download %s" : "Elŝuti %s", - "Direct link" : "Direkta ligilo", - "Federated Cloud Sharing" : "Federnuba kunhavado", - "Open documentation" : "Malfermi la dokumentaron", - "Federated Cloud" : "Federa nubo", - "Your Federated Cloud ID:" : "Via federnuba identigilo:", - "Share it:" : "Kunhavigi ĝin:", - "Add to your website" : "Aldoni al via TTT-ejo", - "Share with me via ownCloud" : "Kunhavigi kun mi per ownCloud", - "HTML Code:" : "HTML-kodo:" + "Direct link" : "Direkta ligilo" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/eo.json b/apps/files_sharing/l10n/eo.json index 63655bcea55..fb8793e6efc 100644 --- a/apps/files_sharing/l10n/eo.json +++ b/apps/files_sharing/l10n/eo.json @@ -64,8 +64,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "Vi ricevis “/%2$s” kiel fora kunhavigo de %1$s", "Accept" : "Akcepti", "Decline" : "Malakcepti", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Kunhavigi kun mi per mia identigilo de #ownCloud-federnuba identigilo; vidu %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Kunhavigi kun mi per mia #ownCloud-federnuba identigilo", "This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto", "The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.", "Password" : "Pasvorto", @@ -81,14 +79,6 @@ "Add to your ownCloud" : "Aldoni al via ownCloud", "Download" : "Elŝuti", "Download %s" : "Elŝuti %s", - "Direct link" : "Direkta ligilo", - "Federated Cloud Sharing" : "Federnuba kunhavado", - "Open documentation" : "Malfermi la dokumentaron", - "Federated Cloud" : "Federa nubo", - "Your Federated Cloud ID:" : "Via federnuba identigilo:", - "Share it:" : "Kunhavigi ĝin:", - "Add to your website" : "Aldoni al via TTT-ejo", - "Share with me via ownCloud" : "Kunhavigi kun mi per ownCloud", - "HTML Code:" : "HTML-kodo:" + "Direct link" : "Direkta ligilo" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index 2dc3a69c2d0..70bc8e7e61c 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -74,8 +74,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "Acaba de recibir el siguiente enlace demoto \"/%2$s\" de %1$s", "Accept" : "Aceptar", "Decline" : "Denegar", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud", "This share is password-protected" : "Este elemento compartido está protegido por contraseña", "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.", "Password" : "Contraseña", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Agregue su propio ownCloud", "Download" : "Descargar", "Download %s" : "Descargar %s", - "Direct link" : "Enlace directo", - "Federated Cloud Sharing" : "Compartido en Cloud Federado", - "Open documentation" : "Documentación abierta", - "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores", - "Federated Cloud" : "Nube Federada", - "Your Federated Cloud ID:" : "Su ID Nube Federada:", - "Share it:" : "Compartir:", - "Add to your website" : "Añadir a su sitio web", - "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud", - "HTML Code:" : "Código HTML:" + "Direct link" : "Enlace directo" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 40a16c5f25d..79e4713298a 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -72,8 +72,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "Acaba de recibir el siguiente enlace demoto \"/%2$s\" de %1$s", "Accept" : "Aceptar", "Decline" : "Denegar", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud", "This share is password-protected" : "Este elemento compartido está protegido por contraseña", "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.", "Password" : "Contraseña", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Agregue su propio ownCloud", "Download" : "Descargar", "Download %s" : "Descargar %s", - "Direct link" : "Enlace directo", - "Federated Cloud Sharing" : "Compartido en Cloud Federado", - "Open documentation" : "Documentación abierta", - "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores", - "Federated Cloud" : "Nube Federada", - "Your Federated Cloud ID:" : "Su ID Nube Federada:", - "Share it:" : "Compartir:", - "Add to your website" : "Añadir a su sitio web", - "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud", - "HTML Code:" : "Código HTML:" + "Direct link" : "Enlace directo" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js index 8e74001649b..8033c8706c2 100644 --- a/apps/files_sharing/l10n/et_EE.js +++ b/apps/files_sharing/l10n/et_EE.js @@ -54,13 +54,6 @@ OC.L10N.register( "Add to your ownCloud" : "Lisa oma ownCloudi", "Download" : "Lae alla", "Download %s" : "Laadi alla %s", - "Direct link" : "Otsene link", - "Open documentation" : "Ava dokumentatsioon", - "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse", - "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest", - "Share it:" : "Jaga seda:", - "Add to your website" : "Lisa oma veebisaidile", - "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga", - "HTML Code:" : "HTML kood:" + "Direct link" : "Otsene link" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json index 08643648796..fc46f9dc0b8 100644 --- a/apps/files_sharing/l10n/et_EE.json +++ b/apps/files_sharing/l10n/et_EE.json @@ -52,13 +52,6 @@ "Add to your ownCloud" : "Lisa oma ownCloudi", "Download" : "Lae alla", "Download %s" : "Laadi alla %s", - "Direct link" : "Otsene link", - "Open documentation" : "Ava dokumentatsioon", - "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse", - "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest", - "Share it:" : "Jaga seda:", - "Add to your website" : "Lisa oma veebisaidile", - "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga", - "HTML Code:" : "HTML kood:" + "Direct link" : "Otsene link" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js index e7e5220d3f3..ba5b3d1f709 100644 --- a/apps/files_sharing/l10n/eu.js +++ b/apps/files_sharing/l10n/eu.js @@ -49,9 +49,6 @@ OC.L10N.register( "Add to your ownCloud" : "Gehitu zure ownCloud-era", "Download" : "Deskargatu", "Download %s" : "Deskargatu %s", - "Direct link" : "Lotura zuzena", - "Federated Cloud Sharing" : "Federatutako Hodei Partekatzea", - "Allow users on this server to send shares to other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzariekin partekatzera", - "Allow users on this server to receive shares from other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzarietatik partekatutakoak jasotzen" + "Direct link" : "Lotura zuzena" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json index 72e3b036323..9c2e2324f07 100644 --- a/apps/files_sharing/l10n/eu.json +++ b/apps/files_sharing/l10n/eu.json @@ -47,9 +47,6 @@ "Add to your ownCloud" : "Gehitu zure ownCloud-era", "Download" : "Deskargatu", "Download %s" : "Deskargatu %s", - "Direct link" : "Lotura zuzena", - "Federated Cloud Sharing" : "Federatutako Hodei Partekatzea", - "Allow users on this server to send shares to other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzariekin partekatzera", - "Allow users on this server to receive shares from other servers" : "Baimendu zerbitzari honetako erabiltzaileak beste zerbitzarietatik partekatutakoak jasotzen" + "Direct link" : "Lotura zuzena" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fa.js b/apps/files_sharing/l10n/fa.js index b6cb143a3dd..45b0343d6df 100644 --- a/apps/files_sharing/l10n/fa.js +++ b/apps/files_sharing/l10n/fa.js @@ -44,8 +44,6 @@ OC.L10N.register( "Add to your ownCloud" : "افزودن به ownCloud شما", "Download" : "دانلود", "Download %s" : "دانلود %s", - "Direct link" : "پیوند مستقیم", - "Open documentation" : "بازکردن مستند", - "HTML Code:" : "کد HTML :" + "Direct link" : "پیوند مستقیم" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/fa.json b/apps/files_sharing/l10n/fa.json index e3d73a7a633..ca60b238ba7 100644 --- a/apps/files_sharing/l10n/fa.json +++ b/apps/files_sharing/l10n/fa.json @@ -42,8 +42,6 @@ "Add to your ownCloud" : "افزودن به ownCloud شما", "Download" : "دانلود", "Download %s" : "دانلود %s", - "Direct link" : "پیوند مستقیم", - "Open documentation" : "بازکردن مستند", - "HTML Code:" : "کد HTML :" + "Direct link" : "پیوند مستقیم" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js index 68b41feb46c..04d8a74e974 100644 --- a/apps/files_sharing/l10n/fi_FI.js +++ b/apps/files_sharing/l10n/fi_FI.js @@ -62,8 +62,6 @@ OC.L10N.register( "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta", "This share is password-protected" : "Tämä jako on suojattu salasanalla", "The password is wrong. Try again." : "Väärä salasana. Yritä uudelleen.", "Password" : "Salasana", @@ -79,16 +77,6 @@ OC.L10N.register( "Add to your ownCloud" : "Lisää ownCloudiisi", "Download" : "Lataa", "Download %s" : "Lataa %s", - "Direct link" : "Suora linkki", - "Federated Cloud Sharing" : "Federoitu pilvijakaminen", - "Open documentation" : "Avaa dokumentaatio", - "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", - "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta", - "Federated Cloud" : "Federoitu pilvi", - "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", - "Share it:" : "Jaa se:", - "Add to your website" : "Lisää verkkosivuillesi", - "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta", - "HTML Code:" : "HTML-koodi:" + "Direct link" : "Suora linkki" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json index e1834ab3c0e..c2ded25771b 100644 --- a/apps/files_sharing/l10n/fi_FI.json +++ b/apps/files_sharing/l10n/fi_FI.json @@ -60,8 +60,6 @@ "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta", "This share is password-protected" : "Tämä jako on suojattu salasanalla", "The password is wrong. Try again." : "Väärä salasana. Yritä uudelleen.", "Password" : "Salasana", @@ -77,16 +75,6 @@ "Add to your ownCloud" : "Lisää ownCloudiisi", "Download" : "Lataa", "Download %s" : "Lataa %s", - "Direct link" : "Suora linkki", - "Federated Cloud Sharing" : "Federoitu pilvijakaminen", - "Open documentation" : "Avaa dokumentaatio", - "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", - "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta", - "Federated Cloud" : "Federoitu pilvi", - "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:", - "Share it:" : "Jaa se:", - "Add to your website" : "Lisää verkkosivuillesi", - "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta", - "HTML Code:" : "HTML-koodi:" + "Direct link" : "Suora linkki" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index e99dffcdcac..72275072598 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -74,8 +74,6 @@ OC.L10N.register( "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud", "This share is password-protected" : "Ce partage est protégé par un mot de passe", "The password is wrong. Try again." : "Le mot de passe est incorrect. Veuillez réessayer.", "Password" : "Mot de passe", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Ajouter à votre ownCloud", "Download" : "Télécharger", "Download %s" : "Télécharger %s", - "Direct link" : "Lien direct", - "Federated Cloud Sharing" : "Federated Cloud Sharing", - "Open documentation" : "Voir la documentation", - "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", - "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :", - "Share it:" : "Partager :", - "Add to your website" : "Ajouter à votre site web", - "Share with me via ownCloud" : "Partagez avec moi via ownCloud", - "HTML Code:" : "Code HTML :" + "Direct link" : "Lien direct" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index c0c7b85bf96..03c39ca719f 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -72,8 +72,6 @@ "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud", "This share is password-protected" : "Ce partage est protégé par un mot de passe", "The password is wrong. Try again." : "Le mot de passe est incorrect. Veuillez réessayer.", "Password" : "Mot de passe", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Ajouter à votre ownCloud", "Download" : "Télécharger", "Download %s" : "Télécharger %s", - "Direct link" : "Lien direct", - "Federated Cloud Sharing" : "Federated Cloud Sharing", - "Open documentation" : "Voir la documentation", - "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", - "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :", - "Share it:" : "Partager :", - "Add to your website" : "Ajouter à votre site web", - "Share with me via ownCloud" : "Partagez avec moi via ownCloud", - "HTML Code:" : "Code HTML :" + "Direct link" : "Lien direct" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js index 7d4028f0bad..2430b2555f6 100644 --- a/apps/files_sharing/l10n/gl.js +++ b/apps/files_sharing/l10n/gl.js @@ -42,8 +42,6 @@ OC.L10N.register( "%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", - "Share with me through my #ownCloud Federated Cloud ID" : "Comparte comigo a través do meu ID da nube federada do #ownCloud", "This share is password-protected" : "Esta compartición está protexida con contrasinal", "The password is wrong. Try again." : "O contrasinal é incorrecto. Ténteo de novo.", "Password" : "Contrasinal", @@ -59,15 +57,6 @@ OC.L10N.register( "Add to your ownCloud" : "Engadir ao seu ownCloud", "Download" : "Descargar", "Download %s" : "Descargar %s", - "Direct link" : "Ligazón directa", - "Federated Cloud Sharing" : "Nube federada compartida", - "Open documentation" : "Abrir a documentación", - "Allow users on this server to send shares to other servers" : "Permitir aos usuarios deste servidor enviar comparticións a outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores", - "Federated Cloud" : "Nube federada", - "Your Federated Cloud ID:" : "ID da súa nube federada:", - "Share it:" : "Compártao:", - "Share with me via ownCloud" : "Comparte comigo a través do ownCloud", - "HTML Code:" : "Código HTML:" + "Direct link" : "Ligazón directa" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json index a6aa34d14cb..fc8b8b8f6f7 100644 --- a/apps/files_sharing/l10n/gl.json +++ b/apps/files_sharing/l10n/gl.json @@ -40,8 +40,6 @@ "%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", - "Share with me through my #ownCloud Federated Cloud ID" : "Comparte comigo a través do meu ID da nube federada do #ownCloud", "This share is password-protected" : "Esta compartición está protexida con contrasinal", "The password is wrong. Try again." : "O contrasinal é incorrecto. Ténteo de novo.", "Password" : "Contrasinal", @@ -57,15 +55,6 @@ "Add to your ownCloud" : "Engadir ao seu ownCloud", "Download" : "Descargar", "Download %s" : "Descargar %s", - "Direct link" : "Ligazón directa", - "Federated Cloud Sharing" : "Nube federada compartida", - "Open documentation" : "Abrir a documentación", - "Allow users on this server to send shares to other servers" : "Permitir aos usuarios deste servidor enviar comparticións a outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir aos usuarios deste servidor recibir comparticións de outros servidores", - "Federated Cloud" : "Nube federada", - "Your Federated Cloud ID:" : "ID da súa nube federada:", - "Share it:" : "Compártao:", - "Share with me via ownCloud" : "Comparte comigo a través do ownCloud", - "HTML Code:" : "Código HTML:" + "Direct link" : "Ligazón directa" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/he.js b/apps/files_sharing/l10n/he.js index b0be1d34c97..2b4d4966254 100644 --- a/apps/files_sharing/l10n/he.js +++ b/apps/files_sharing/l10n/he.js @@ -74,8 +74,6 @@ OC.L10N.register( "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", - "Share with me through my #ownCloud Federated Cloud ID" : "שיתוף איתי באמצעות מספר זהות שרת ה- #ownCloud המאוגד שלי", "This share is password-protected" : "שיתוף זה מוגן סיסמא", "The password is wrong. Try again." : "הסיסמא שגויה. יש לנסות שנית.", "Password" : "סיסמא", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "הוספה ל- ownCloud שלך", "Download" : "הורדה", "Download %s" : "הורדה %s", - "Direct link" : "קישור ישיר", - "Federated Cloud Sharing" : "ענן שיתוף מאוגד", - "Open documentation" : "תיעוד פתוח", - "Allow users on this server to send shares to other servers" : "מאפשר למשתמשים בשרת זה לשלוח שיתופים לשרתים אחרים", - "Allow users on this server to receive shares from other servers" : "מאפשר למשתמשים בשרת זה לקבל שיתופים משרתים אחרים", - "Federated Cloud" : "ענן מאוגד", - "Your Federated Cloud ID:" : "מספר זיהוי הענן המאוגד שלך:", - "Share it:" : "שיתוף שלו:", - "Add to your website" : "הוספה לאתר האינטרנט שלך", - "Share with me via ownCloud" : "שיתוף איתי באמצעות ownCloud", - "HTML Code:" : "קוד HTML:" + "Direct link" : "קישור ישיר" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/he.json b/apps/files_sharing/l10n/he.json index de1cfff07b5..411bebd4d01 100644 --- a/apps/files_sharing/l10n/he.json +++ b/apps/files_sharing/l10n/he.json @@ -72,8 +72,6 @@ "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", - "Share with me through my #ownCloud Federated Cloud ID" : "שיתוף איתי באמצעות מספר זהות שרת ה- #ownCloud המאוגד שלי", "This share is password-protected" : "שיתוף זה מוגן סיסמא", "The password is wrong. Try again." : "הסיסמא שגויה. יש לנסות שנית.", "Password" : "סיסמא", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "הוספה ל- ownCloud שלך", "Download" : "הורדה", "Download %s" : "הורדה %s", - "Direct link" : "קישור ישיר", - "Federated Cloud Sharing" : "ענן שיתוף מאוגד", - "Open documentation" : "תיעוד פתוח", - "Allow users on this server to send shares to other servers" : "מאפשר למשתמשים בשרת זה לשלוח שיתופים לשרתים אחרים", - "Allow users on this server to receive shares from other servers" : "מאפשר למשתמשים בשרת זה לקבל שיתופים משרתים אחרים", - "Federated Cloud" : "ענן מאוגד", - "Your Federated Cloud ID:" : "מספר זיהוי הענן המאוגד שלך:", - "Share it:" : "שיתוף שלו:", - "Add to your website" : "הוספה לאתר האינטרנט שלך", - "Share with me via ownCloud" : "שיתוף איתי באמצעות ownCloud", - "HTML Code:" : "קוד HTML:" + "Direct link" : "קישור ישיר" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js index d76fa12435e..7febea97b6e 100644 --- a/apps/files_sharing/l10n/hu_HU.js +++ b/apps/files_sharing/l10n/hu_HU.js @@ -55,8 +55,6 @@ OC.L10N.register( "Shares" : "Megosztások", "Accept" : "Elfogadás", "Decline" : "Elutasítás", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével ", "This share is password-protected" : "Ez egy jelszóval védett megosztás", "The password is wrong. Try again." : "A megadott jelszó nem megfelelő. Próbálja újra!", "Password" : "Jelszó", @@ -72,16 +70,6 @@ OC.L10N.register( "Add to your ownCloud" : "Adjuk hozzá a saját ownCloudunkhoz", "Download" : "Letöltés", "Download %s" : "%s letöltése", - "Direct link" : "Közvetlen link", - "Federated Cloud Sharing" : "Megosztás Egyesített Felhőben", - "Open documentation" : "Dokumentáció megnyitása", - "Allow users on this server to send shares to other servers" : "Engedélyezze ezen szerver felhasználóinak, hogy fájlokat osszanak meg más szerverekkel.", - "Allow users on this server to receive shares from other servers" : "Engedélyezze ezen szerver felhasználóinak, hogy megosztásokat fogadjanak más szerverektől", - "Federated Cloud" : "Egyesített felhő", - "Your Federated Cloud ID:" : "Egyesített felhő azonosító:", - "Share it:" : "Ossza meg:", - "Add to your website" : "Adja hozzá saját weboldalához", - "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül", - "HTML Code:" : "HTML kód:" + "Direct link" : "Közvetlen link" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json index 242961a1960..9fb55800e75 100644 --- a/apps/files_sharing/l10n/hu_HU.json +++ b/apps/files_sharing/l10n/hu_HU.json @@ -53,8 +53,6 @@ "Shares" : "Megosztások", "Accept" : "Elfogadás", "Decline" : "Elutasítás", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével ", "This share is password-protected" : "Ez egy jelszóval védett megosztás", "The password is wrong. Try again." : "A megadott jelszó nem megfelelő. Próbálja újra!", "Password" : "Jelszó", @@ -70,16 +68,6 @@ "Add to your ownCloud" : "Adjuk hozzá a saját ownCloudunkhoz", "Download" : "Letöltés", "Download %s" : "%s letöltése", - "Direct link" : "Közvetlen link", - "Federated Cloud Sharing" : "Megosztás Egyesített Felhőben", - "Open documentation" : "Dokumentáció megnyitása", - "Allow users on this server to send shares to other servers" : "Engedélyezze ezen szerver felhasználóinak, hogy fájlokat osszanak meg más szerverekkel.", - "Allow users on this server to receive shares from other servers" : "Engedélyezze ezen szerver felhasználóinak, hogy megosztásokat fogadjanak más szerverektől", - "Federated Cloud" : "Egyesített felhő", - "Your Federated Cloud ID:" : "Egyesített felhő azonosító:", - "Share it:" : "Ossza meg:", - "Add to your website" : "Adja hozzá saját weboldalához", - "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül", - "HTML Code:" : "HTML kód:" + "Direct link" : "Közvetlen link" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js index 837c0cfa843..5c182bd1a8a 100644 --- a/apps/files_sharing/l10n/id.js +++ b/apps/files_sharing/l10n/id.js @@ -54,8 +54,6 @@ OC.L10N.register( "Shares" : "Dibagikan", "Accept" : "Terima", "Decline" : "Tolak", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya", "This share is password-protected" : "Berbagi ini dilindungi sandi", "The password is wrong. Try again." : "Sandi salah. Coba lagi", "Password" : "Sandi", @@ -71,16 +69,6 @@ OC.L10N.register( "Add to your ownCloud" : "Tambahkan ke ownCloud Anda", "Download" : "Unduh", "Download %s" : "Unduh %s", - "Direct link" : "Tautan langsung", - "Federated Cloud Sharing" : "Federated Cloud Sharing", - "Open documentation" : "Buka dokumentasi", - "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.", - "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya.", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Federated Cloud ID Anda:", - "Share it:" : "Bagikan:", - "Add to your website" : "Tambahkan pada situs web Anda", - "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud", - "HTML Code:" : "Kode HTML:" + "Direct link" : "Tautan langsung" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json index 40789ec9355..739719b460e 100644 --- a/apps/files_sharing/l10n/id.json +++ b/apps/files_sharing/l10n/id.json @@ -52,8 +52,6 @@ "Shares" : "Dibagikan", "Accept" : "Terima", "Decline" : "Tolak", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya", "This share is password-protected" : "Berbagi ini dilindungi sandi", "The password is wrong. Try again." : "Sandi salah. Coba lagi", "Password" : "Sandi", @@ -69,16 +67,6 @@ "Add to your ownCloud" : "Tambahkan ke ownCloud Anda", "Download" : "Unduh", "Download %s" : "Unduh %s", - "Direct link" : "Tautan langsung", - "Federated Cloud Sharing" : "Federated Cloud Sharing", - "Open documentation" : "Buka dokumentasi", - "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.", - "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya.", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Federated Cloud ID Anda:", - "Share it:" : "Bagikan:", - "Add to your website" : "Tambahkan pada situs web Anda", - "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud", - "HTML Code:" : "Kode HTML:" + "Direct link" : "Tautan langsung" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/is.js b/apps/files_sharing/l10n/is.js index 1b5e7e23be1..b4bf1168ef1 100644 --- a/apps/files_sharing/l10n/is.js +++ b/apps/files_sharing/l10n/is.js @@ -74,8 +74,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "Þú tókst við \"/%2$s\" sem fjartengdri sameign frá %1$s", "Accept" : "Samþykkja", "Decline" : "Hafna", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID, sjá %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID", "This share is password-protected" : "Þessi sameign er varin með lykilorði", "The password is wrong. Try again." : "Lykilorðið er rangt. Reyndu aftur.", "Password" : "Lykilorð", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Bæta í þitt eigið ownCloud", "Download" : "Niðurhal", "Download %s" : "Sækja %s", - "Direct link" : "Beinn tengill", - "Federated Cloud Sharing" : "Deiling með skýjasambandi", - "Open documentation" : "Opna hjálparskjöl", - "Allow users on this server to send shares to other servers" : "Leyfa notendum á þessum þjóni að senda sameignir til annarra þjóna", - "Allow users on this server to receive shares from other servers" : "Leyfa notendum á þessum þjóni að taka á móti sameignum frá öðrum þjónum", - "Federated Cloud" : "Skýjasamband (federated)", - "Your Federated Cloud ID:" : "Skýjasambandsauðkennið þitt (Federated Cloud ID):", - "Share it:" : "Deila því:", - "Add to your website" : "Bæta við vefsvæðið þitt", - "Share with me via ownCloud" : "Deila með mér í gegnum ownCloud", - "HTML Code:" : "HTML-kóði:" + "Direct link" : "Beinn tengill" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/files_sharing/l10n/is.json b/apps/files_sharing/l10n/is.json index c80c91d55dc..e2b10c4de87 100644 --- a/apps/files_sharing/l10n/is.json +++ b/apps/files_sharing/l10n/is.json @@ -72,8 +72,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "Þú tókst við \"/%2$s\" sem fjartengdri sameign frá %1$s", "Accept" : "Samþykkja", "Decline" : "Hafna", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID, sjá %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID", "This share is password-protected" : "Þessi sameign er varin með lykilorði", "The password is wrong. Try again." : "Lykilorðið er rangt. Reyndu aftur.", "Password" : "Lykilorð", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Bæta í þitt eigið ownCloud", "Download" : "Niðurhal", "Download %s" : "Sækja %s", - "Direct link" : "Beinn tengill", - "Federated Cloud Sharing" : "Deiling með skýjasambandi", - "Open documentation" : "Opna hjálparskjöl", - "Allow users on this server to send shares to other servers" : "Leyfa notendum á þessum þjóni að senda sameignir til annarra þjóna", - "Allow users on this server to receive shares from other servers" : "Leyfa notendum á þessum þjóni að taka á móti sameignum frá öðrum þjónum", - "Federated Cloud" : "Skýjasamband (federated)", - "Your Federated Cloud ID:" : "Skýjasambandsauðkennið þitt (Federated Cloud ID):", - "Share it:" : "Deila því:", - "Add to your website" : "Bæta við vefsvæðið þitt", - "Share with me via ownCloud" : "Deila með mér í gegnum ownCloud", - "HTML Code:" : "HTML-kóði:" + "Direct link" : "Beinn tengill" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index 93adc336604..6355c5c2c64 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -74,8 +74,6 @@ OC.L10N.register( "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud", "This share is password-protected" : "Questa condivisione è protetta da password", "The password is wrong. Try again." : "La password è errata. Prova ancora.", "Password" : "Password", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Aggiungi al tuo ownCloud", "Download" : "Scarica", "Download %s" : "Scarica %s", - "Direct link" : "Collegamento diretto", - "Federated Cloud Sharing" : "Condivisione cloud federata", - "Open documentation" : "Apri la documentazione", - "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", - "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server", - "Federated Cloud" : "Cloud federata", - "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", - "Share it:" : "Condividilo:", - "Add to your website" : "Aggiungilo al tuo sito web", - "Share with me via ownCloud" : "Condividi con me tramite ownCloud", - "HTML Code:" : "Codice HTML:" + "Direct link" : "Collegamento diretto" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index d95f35be0a9..44c1f8f784a 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -72,8 +72,6 @@ "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud", "This share is password-protected" : "Questa condivisione è protetta da password", "The password is wrong. Try again." : "La password è errata. Prova ancora.", "Password" : "Password", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Aggiungi al tuo ownCloud", "Download" : "Scarica", "Download %s" : "Scarica %s", - "Direct link" : "Collegamento diretto", - "Federated Cloud Sharing" : "Condivisione cloud federata", - "Open documentation" : "Apri la documentazione", - "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", - "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server", - "Federated Cloud" : "Cloud federata", - "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", - "Share it:" : "Condividilo:", - "Add to your website" : "Aggiungilo al tuo sito web", - "Share with me via ownCloud" : "Condividi con me tramite ownCloud", - "HTML Code:" : "Codice HTML:" + "Direct link" : "Collegamento diretto" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js index 3af2b548dfe..a643bf7f445 100644 --- a/apps/files_sharing/l10n/ja.js +++ b/apps/files_sharing/l10n/ja.js @@ -74,8 +74,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "%1$s からリモート共有として \"/%2$s\" を受け取りました。", "Accept" : "承諾", "Decline" : "拒否《はてなキーワード》", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud の「クラウド連携ID」で私と共有できます。こちらを見てください。%s", - "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud の「クラウド連携ID」で私と共有できます。", "This share is password-protected" : "この共有はパスワードで保護されています", "The password is wrong. Try again." : "パスワードが間違っています。再試行してください。", "Password" : "パスワード", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "ownCloud に追加", "Download" : "ダウンロード", "Download %s" : "%s をダウンロード", - "Direct link" : "リンク", - "Federated Cloud Sharing" : "統合されたクラウド共有", - "Open documentation" : "ドキュメントを開く", - "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する", - "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する", - "Federated Cloud" : "クラウド連携", - "Your Federated Cloud ID:" : "あなたのクラウド連携ID：", - "Share it:" : "以下で共有:", - "Add to your website" : "ウェブサイトに追加", - "Share with me via ownCloud" : "OwnCloud経由で共有", - "HTML Code:" : "HTMLコード:" + "Direct link" : "リンク" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json index 5d36081daf3..a7adc456d9f 100644 --- a/apps/files_sharing/l10n/ja.json +++ b/apps/files_sharing/l10n/ja.json @@ -72,8 +72,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "%1$s からリモート共有として \"/%2$s\" を受け取りました。", "Accept" : "承諾", "Decline" : "拒否《はてなキーワード》", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud の「クラウド連携ID」で私と共有できます。こちらを見てください。%s", - "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud の「クラウド連携ID」で私と共有できます。", "This share is password-protected" : "この共有はパスワードで保護されています", "The password is wrong. Try again." : "パスワードが間違っています。再試行してください。", "Password" : "パスワード", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "ownCloud に追加", "Download" : "ダウンロード", "Download %s" : "%s をダウンロード", - "Direct link" : "リンク", - "Federated Cloud Sharing" : "統合されたクラウド共有", - "Open documentation" : "ドキュメントを開く", - "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する", - "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する", - "Federated Cloud" : "クラウド連携", - "Your Federated Cloud ID:" : "あなたのクラウド連携ID：", - "Share it:" : "以下で共有:", - "Add to your website" : "ウェブサイトに追加", - "Share with me via ownCloud" : "OwnCloud経由で共有", - "HTML Code:" : "HTMLコード:" + "Direct link" : "リンク" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js index ff2a630c569..a9c6b58011e 100644 --- a/apps/files_sharing/l10n/ko.js +++ b/apps/files_sharing/l10n/ko.js @@ -74,8 +74,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "%1$s에서 원격 공유로 \"/%2$s\"을(를) 받음", "Accept" : "수락", "Decline" : "거절", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s", - "Share with me through my #ownCloud Federated Cloud ID" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨", "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다", "The password is wrong. Try again." : "암호가 잘못되었습니다. 다시 입력해 주십시오.", "Password" : "암호", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "내 ownCloud에 추가하기", "Download" : "다운로드", "Download %s" : "%s 다운로드", - "Direct link" : "직접 링크", - "Federated Cloud Sharing" : "클라우드 연합 공유", - "Open documentation" : "문서 열기", - "Allow users on this server to send shares to other servers" : "이 서버의 사용자가 다른 서버와 공유할 수 있도록 허용", - "Allow users on this server to receive shares from other servers" : "이 서버의 사용자가 다른 서버에서 공유한 파일을 받을 수 있도록 허용", - "Federated Cloud" : "연합 클라우드", - "Your Federated Cloud ID:" : "내 연합 클라우드 ID:", - "Share it:" : "공유하기:", - "Add to your website" : "내 웹 사이트에 추가", - "Share with me via ownCloud" : "ownCloud로 나와 공유하기", - "HTML Code:" : "HTML 코드:" + "Direct link" : "직접 링크" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json index 727265c259f..326ea68b1b3 100644 --- a/apps/files_sharing/l10n/ko.json +++ b/apps/files_sharing/l10n/ko.json @@ -72,8 +72,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "%1$s에서 원격 공유로 \"/%2$s\"을(를) 받음", "Accept" : "수락", "Decline" : "거절", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s", - "Share with me through my #ownCloud Federated Cloud ID" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨", "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다", "The password is wrong. Try again." : "암호가 잘못되었습니다. 다시 입력해 주십시오.", "Password" : "암호", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "내 ownCloud에 추가하기", "Download" : "다운로드", "Download %s" : "%s 다운로드", - "Direct link" : "직접 링크", - "Federated Cloud Sharing" : "클라우드 연합 공유", - "Open documentation" : "문서 열기", - "Allow users on this server to send shares to other servers" : "이 서버의 사용자가 다른 서버와 공유할 수 있도록 허용", - "Allow users on this server to receive shares from other servers" : "이 서버의 사용자가 다른 서버에서 공유한 파일을 받을 수 있도록 허용", - "Federated Cloud" : "연합 클라우드", - "Your Federated Cloud ID:" : "내 연합 클라우드 ID:", - "Share it:" : "공유하기:", - "Add to your website" : "내 웹 사이트에 추가", - "Share with me via ownCloud" : "ownCloud로 나와 공유하기", - "HTML Code:" : "HTML 코드:" + "Direct link" : "직접 링크" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/lb.js b/apps/files_sharing/l10n/lb.js index deaddb26139..fcbfd04c64f 100644 --- a/apps/files_sharing/l10n/lb.js +++ b/apps/files_sharing/l10n/lb.js @@ -10,7 +10,6 @@ OC.L10N.register( "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt", "Name" : "Numm", "Download" : "Download", - "Direct link" : "Direkte Link", - "Open documentation" : "Dokumentatioun opmaachen" + "Direct link" : "Direkte Link" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/lb.json b/apps/files_sharing/l10n/lb.json index 43de4dbb667..5a466e560c6 100644 --- a/apps/files_sharing/l10n/lb.json +++ b/apps/files_sharing/l10n/lb.json @@ -8,7 +8,6 @@ "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt", "Name" : "Numm", "Download" : "Download", - "Direct link" : "Direkte Link", - "Open documentation" : "Dokumentatioun opmaachen" + "Direct link" : "Direkte Link" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/lt_LT.js b/apps/files_sharing/l10n/lt_LT.js index 8aa1be493b9..3e46d74f16d 100644 --- a/apps/files_sharing/l10n/lt_LT.js +++ b/apps/files_sharing/l10n/lt_LT.js @@ -55,8 +55,6 @@ OC.L10N.register( "Shares" : "Dalijimaisi", "Accept" : "Priimti", "Decline" : "Atmesti", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Pasidalink su manimi per #ownCloud padebesius, plačiau %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Pasidalink su manimi per #ownCloud padebesius", "This share is password-protected" : "Turinys apsaugotas slaptažodžiu", "The password is wrong. Try again." : "Netinka slaptažodis: Bandykite dar kartą.", "Password" : "Slaptažodis", @@ -72,16 +70,6 @@ OC.L10N.register( "Add to your ownCloud" : "Pridėti prie tavo ownCloud", "Download" : "Atsisiųsti", "Download %s" : "Atsiųsti %s", - "Direct link" : "Tiesioginė nuoroda", - "Federated Cloud Sharing" : "Viešas dalijimasis padebesiu", - "Open documentation" : "Atidaryti dokumentą", - "Allow users on this server to send shares to other servers" : "Leisti vartotojams šiame serveryje dalintis su kitais serveriais", - "Allow users on this server to receive shares from other servers" : "Leisti vartotojams šiame serveryje priimti dalijimusis iš kitų serverių", - "Federated Cloud" : "Viešas debesis", - "Your Federated Cloud ID:" : "Tavo debesies ID:", - "Share it:" : "Pasidalink:", - "Add to your website" : "Pridėti tavo puslapį", - "Share with me via ownCloud" : "Pasidalink su manimi per ownCloud", - "HTML Code:" : "HTML kodas:" + "Direct link" : "Tiesioginė nuoroda" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/lt_LT.json b/apps/files_sharing/l10n/lt_LT.json index ef139068832..03cfb47634b 100644 --- a/apps/files_sharing/l10n/lt_LT.json +++ b/apps/files_sharing/l10n/lt_LT.json @@ -53,8 +53,6 @@ "Shares" : "Dalijimaisi", "Accept" : "Priimti", "Decline" : "Atmesti", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Pasidalink su manimi per #ownCloud padebesius, plačiau %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Pasidalink su manimi per #ownCloud padebesius", "This share is password-protected" : "Turinys apsaugotas slaptažodžiu", "The password is wrong. Try again." : "Netinka slaptažodis: Bandykite dar kartą.", "Password" : "Slaptažodis", @@ -70,16 +68,6 @@ "Add to your ownCloud" : "Pridėti prie tavo ownCloud", "Download" : "Atsisiųsti", "Download %s" : "Atsiųsti %s", - "Direct link" : "Tiesioginė nuoroda", - "Federated Cloud Sharing" : "Viešas dalijimasis padebesiu", - "Open documentation" : "Atidaryti dokumentą", - "Allow users on this server to send shares to other servers" : "Leisti vartotojams šiame serveryje dalintis su kitais serveriais", - "Allow users on this server to receive shares from other servers" : "Leisti vartotojams šiame serveryje priimti dalijimusis iš kitų serverių", - "Federated Cloud" : "Viešas debesis", - "Your Federated Cloud ID:" : "Tavo debesies ID:", - "Share it:" : "Pasidalink:", - "Add to your website" : "Pridėti tavo puslapį", - "Share with me via ownCloud" : "Pasidalink su manimi per ownCloud", - "HTML Code:" : "HTML kodas:" + "Direct link" : "Tiesioginė nuoroda" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/lv.js b/apps/files_sharing/l10n/lv.js index a27ea0de207..abc9d4ce301 100644 --- a/apps/files_sharing/l10n/lv.js +++ b/apps/files_sharing/l10n/lv.js @@ -54,10 +54,6 @@ OC.L10N.register( "Add to your ownCloud" : "Pievienot savam ownCloud", "Download" : "Lejupielādēt", "Download %s" : "Lejupielādēt %s", - "Direct link" : "Tiešā saite", - "Federated Cloud Sharing" : "Federatīva mākoņkoplietošana", - "Open documentation" : "Atvērt dokumentāciju", - "Allow users on this server to send shares to other servers" : "Atļaut šī servera lietotājiem sūtīt koplietotnes uz citiem serveriem", - "Allow users on this server to receive shares from other servers" : "Atļaut šī servera lietotājiem saņem koplietotnes no citiem serveriem" + "Direct link" : "Tiešā saite" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/lv.json b/apps/files_sharing/l10n/lv.json index 45868381304..5ea0c87b814 100644 --- a/apps/files_sharing/l10n/lv.json +++ b/apps/files_sharing/l10n/lv.json @@ -52,10 +52,6 @@ "Add to your ownCloud" : "Pievienot savam ownCloud", "Download" : "Lejupielādēt", "Download %s" : "Lejupielādēt %s", - "Direct link" : "Tiešā saite", - "Federated Cloud Sharing" : "Federatīva mākoņkoplietošana", - "Open documentation" : "Atvērt dokumentāciju", - "Allow users on this server to send shares to other servers" : "Atļaut šī servera lietotājiem sūtīt koplietotnes uz citiem serveriem", - "Allow users on this server to receive shares from other servers" : "Atļaut šī servera lietotājiem saņem koplietotnes no citiem serveriem" + "Direct link" : "Tiešā saite" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/mk.js b/apps/files_sharing/l10n/mk.js index e628c96125b..cbae94a41ae 100644 --- a/apps/files_sharing/l10n/mk.js +++ b/apps/files_sharing/l10n/mk.js @@ -50,14 +50,6 @@ OC.L10N.register( "Add to your ownCloud" : "Додади во вашиот ownCloud", "Download" : "Преземи", "Download %s" : "Преземи %s", - "Direct link" : "Директна врска", - "Federated Cloud Sharing" : "Федерирано клауд споделување", - "Open documentation" : "Отвори ја документацијата", - "Federated Cloud" : "Федериран клауд", - "Your Federated Cloud ID:" : "Вашиот федериран Cloud ID:", - "Share it:" : "Сподели го:", - "Add to your website" : "Додади на твојот веб сајт", - "Share with me via ownCloud" : "Сподели со мене преку ownCloud", - "HTML Code:" : "HTML код:" + "Direct link" : "Директна врска" }, "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"); diff --git a/apps/files_sharing/l10n/mk.json b/apps/files_sharing/l10n/mk.json index 33358b782b7..3a0a353dc4c 100644 --- a/apps/files_sharing/l10n/mk.json +++ b/apps/files_sharing/l10n/mk.json @@ -48,14 +48,6 @@ "Add to your ownCloud" : "Додади во вашиот ownCloud", "Download" : "Преземи", "Download %s" : "Преземи %s", - "Direct link" : "Директна врска", - "Federated Cloud Sharing" : "Федерирано клауд споделување", - "Open documentation" : "Отвори ја документацијата", - "Federated Cloud" : "Федериран клауд", - "Your Federated Cloud ID:" : "Вашиот федериран Cloud ID:", - "Share it:" : "Сподели го:", - "Add to your website" : "Додади на твојот веб сајт", - "Share with me via ownCloud" : "Сподели со мене преку ownCloud", - "HTML Code:" : "HTML код:" + "Direct link" : "Директна врска" },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js index 29cf14fb4a5..402677e1028 100644 --- a/apps/files_sharing/l10n/nb_NO.js +++ b/apps/files_sharing/l10n/nb_NO.js @@ -74,8 +74,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "Du mottok \"/%2$s\" som en ekstern deling fra %1$s", "Accept" : "Aksepter", "Decline" : "Avslå", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky", "This share is password-protected" : "Denne delingen er passordbeskyttet", "The password is wrong. Try again." : "Passordet er feil. Prøv på nytt.", "Password" : "Passord", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Legg til i din ownCloud", "Download" : "Last ned", "Download %s" : "Last ned %s", - "Direct link" : "Direkte lenke", - "Federated Cloud Sharing" : "Sammenknyttet sky-deling", - "Open documentation" : "Åpne dokumentasjonen", - "Allow users on this server to send shares to other servers" : "Tillat at brukere på denne serveren sender delinger til andre servere", - "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere", - "Federated Cloud" : "Sammenknyttet sky", - "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:", - "Share it:" : "Del den:", - "Add to your website" : "Legg på websiden din", - "Share with me via ownCloud" : "Del med meg via ownCloud", - "HTML Code:" : "HTML-kode:" + "Direct link" : "Direkte lenke" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json index b52aa14c6b4..f6234318255 100644 --- a/apps/files_sharing/l10n/nb_NO.json +++ b/apps/files_sharing/l10n/nb_NO.json @@ -72,8 +72,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "Du mottok \"/%2$s\" som en ekstern deling fra %1$s", "Accept" : "Aksepter", "Decline" : "Avslå", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky", "This share is password-protected" : "Denne delingen er passordbeskyttet", "The password is wrong. Try again." : "Passordet er feil. Prøv på nytt.", "Password" : "Passord", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Legg til i din ownCloud", "Download" : "Last ned", "Download %s" : "Last ned %s", - "Direct link" : "Direkte lenke", - "Federated Cloud Sharing" : "Sammenknyttet sky-deling", - "Open documentation" : "Åpne dokumentasjonen", - "Allow users on this server to send shares to other servers" : "Tillat at brukere på denne serveren sender delinger til andre servere", - "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne serveren mottar delinger fra andre servere", - "Federated Cloud" : "Sammenknyttet sky", - "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:", - "Share it:" : "Del den:", - "Add to your website" : "Legg på websiden din", - "Share with me via ownCloud" : "Del med meg via ownCloud", - "HTML Code:" : "HTML-kode:" + "Direct link" : "Direkte lenke" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index 99979f08d39..0f36714bb13 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -74,8 +74,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "U ontving \"/%2$s\" als een externe share van %1$s", "Accept" : "Accepteren", "Decline" : "Afwijzen", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID", "This share is password-protected" : "Deze share is met een wachtwoord beveiligd", "The password is wrong. Try again." : "Wachtwoord ongeldig. Probeer het nogmaals.", "Password" : "Wachtwoord", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Toevoegen aan uw ownCloud", "Download" : "Downloaden", "Download %s" : "Download %s", - "Direct link" : "Directe link", - "Federated Cloud Sharing" : "Federated Cloud Sharing", - "Open documentation" : "Open documentatie", - "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", - "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers", - "Federated Cloud" : "Gefedereerde Cloud", - "Your Federated Cloud ID:" : "Uw Federated Cloud ID:", - "Share it:" : "Deel het:", - "Add to your website" : "Toevoegen aan uw website", - "Share with me via ownCloud" : "Deel met mij via ownCloud", - "HTML Code:" : "HTML Code:" + "Direct link" : "Directe link" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index 1d66dd578fe..b09ac101e2e 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -72,8 +72,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "U ontving \"/%2$s\" als een externe share van %1$s", "Accept" : "Accepteren", "Decline" : "Afwijzen", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID", "This share is password-protected" : "Deze share is met een wachtwoord beveiligd", "The password is wrong. Try again." : "Wachtwoord ongeldig. Probeer het nogmaals.", "Password" : "Wachtwoord", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Toevoegen aan uw ownCloud", "Download" : "Downloaden", "Download %s" : "Download %s", - "Direct link" : "Directe link", - "Federated Cloud Sharing" : "Federated Cloud Sharing", - "Open documentation" : "Open documentatie", - "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers", - "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers", - "Federated Cloud" : "Gefedereerde Cloud", - "Your Federated Cloud ID:" : "Uw Federated Cloud ID:", - "Share it:" : "Deel het:", - "Add to your website" : "Toevoegen aan uw website", - "Share with me via ownCloud" : "Deel met mij via ownCloud", - "HTML Code:" : "HTML Code:" + "Direct link" : "Directe link" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/oc.js b/apps/files_sharing/l10n/oc.js index 350d35b2de0..f5a9096df32 100644 --- a/apps/files_sharing/l10n/oc.js +++ b/apps/files_sharing/l10n/oc.js @@ -54,8 +54,6 @@ OC.L10N.register( "Shares" : "Partiments", "Accept" : "Acceptar", "Decline" : "Refusar", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partejatz amb ieu gràcias a mon identificant Federated Cloud #owncloud %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Partejatz amb ieu gràcias a mon identificant Federated Cloud #owncloud", "This share is password-protected" : "Aqueste partiment es protegit per un senhal", "The password is wrong. Try again." : "Lo senhal es incorrècte. Ensajatz tornamai.", "Password" : "Senhal", @@ -71,16 +69,6 @@ OC.L10N.register( "Add to your ownCloud" : "Apondre a vòstre ownCloud", "Download" : "Telecargar", "Download %s" : "Telecargar %s", - "Direct link" : "Ligam dirècte", - "Federated Cloud Sharing" : "Federated Cloud Sharing", - "Open documentation" : "Veire la documentacion", - "Allow users on this server to send shares to other servers" : "Autorizar los utilizaires d'aqueste servidor a mandar de partiments cap a d'autres servidors", - "Allow users on this server to receive shares from other servers" : "Autorizar los utilizaires d'aqueste servidor a recebre de partiments d'autres servidors", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Vòstre identificant Federated Cloud :", - "Share it:" : "Partejar :", - "Add to your website" : "Apondre a vòstre site web", - "Share with me via ownCloud" : "Partejatz amb ieu via ownCloud", - "HTML Code:" : "Còde HTML :" + "Direct link" : "Ligam dirècte" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/oc.json b/apps/files_sharing/l10n/oc.json index 90254deca48..658219ca2b0 100644 --- a/apps/files_sharing/l10n/oc.json +++ b/apps/files_sharing/l10n/oc.json @@ -52,8 +52,6 @@ "Shares" : "Partiments", "Accept" : "Acceptar", "Decline" : "Refusar", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partejatz amb ieu gràcias a mon identificant Federated Cloud #owncloud %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Partejatz amb ieu gràcias a mon identificant Federated Cloud #owncloud", "This share is password-protected" : "Aqueste partiment es protegit per un senhal", "The password is wrong. Try again." : "Lo senhal es incorrècte. Ensajatz tornamai.", "Password" : "Senhal", @@ -69,16 +67,6 @@ "Add to your ownCloud" : "Apondre a vòstre ownCloud", "Download" : "Telecargar", "Download %s" : "Telecargar %s", - "Direct link" : "Ligam dirècte", - "Federated Cloud Sharing" : "Federated Cloud Sharing", - "Open documentation" : "Veire la documentacion", - "Allow users on this server to send shares to other servers" : "Autorizar los utilizaires d'aqueste servidor a mandar de partiments cap a d'autres servidors", - "Allow users on this server to receive shares from other servers" : "Autorizar los utilizaires d'aqueste servidor a recebre de partiments d'autres servidors", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Vòstre identificant Federated Cloud :", - "Share it:" : "Partejar :", - "Add to your website" : "Apondre a vòstre site web", - "Share with me via ownCloud" : "Partejatz amb ieu via ownCloud", - "HTML Code:" : "Còde HTML :" + "Direct link" : "Ligam dirècte" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js index f96a684b704..d8e7a105618 100644 --- a/apps/files_sharing/l10n/pl.js +++ b/apps/files_sharing/l10n/pl.js @@ -47,8 +47,6 @@ OC.L10N.register( "Add to your ownCloud" : "Dodaj do twojego ownCloud", "Download" : "Pobierz", "Download %s" : "Pobierz %s", - "Direct link" : "Bezpośredni link", - "Open documentation" : "Otwórz dokumentację", - "Add to your website" : "Dodaj do swojej strony" + "Direct link" : "Bezpośredni link" }, "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json index 917d1a4cfaa..2026437ff75 100644 --- a/apps/files_sharing/l10n/pl.json +++ b/apps/files_sharing/l10n/pl.json @@ -45,8 +45,6 @@ "Add to your ownCloud" : "Dodaj do twojego ownCloud", "Download" : "Pobierz", "Download %s" : "Pobierz %s", - "Direct link" : "Bezpośredni link", - "Open documentation" : "Otwórz dokumentację", - "Add to your website" : "Dodaj do swojej strony" + "Direct link" : "Bezpośredni link" },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index b41f5492a0e..ae7d8ba5ae0 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -74,8 +74,6 @@ OC.L10N.register( "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem ID Associada", "This share is password-protected" : "Este compartilhamento esta protegido por senha", "The password is wrong. Try again." : "Senha incorreta. Tente novamente.", "Password" : "Senha", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Adiconar ao seu ownCloud", "Download" : "Baixar", "Download %s" : "Baixar %s", - "Direct link" : "Link direto", - "Federated Cloud Sharing" : "Compartilhamento de Nuvem Associada", - "Open documentation" : "Abrir documentação", - "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores", - "Federated Cloud" : "Nuvem Associada", - "Your Federated Cloud ID:" : "Sua ID na Nuvem Associada:", - "Share it:" : "Compartilhe:", - "Add to your website" : "Adicione ao seu website", - "Share with me via ownCloud" : "Compartilhe comigo via ownCloud", - "HTML Code:" : "Código HTML:" + "Direct link" : "Link direto" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index be38812857e..c55f4204b7c 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -72,8 +72,6 @@ "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem ID Associada", "This share is password-protected" : "Este compartilhamento esta protegido por senha", "The password is wrong. Try again." : "Senha incorreta. Tente novamente.", "Password" : "Senha", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Adiconar ao seu ownCloud", "Download" : "Baixar", "Download %s" : "Baixar %s", - "Direct link" : "Link direto", - "Federated Cloud Sharing" : "Compartilhamento de Nuvem Associada", - "Open documentation" : "Abrir documentação", - "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores", - "Federated Cloud" : "Nuvem Associada", - "Your Federated Cloud ID:" : "Sua ID na Nuvem Associada:", - "Share it:" : "Compartilhe:", - "Add to your website" : "Adicione ao seu website", - "Share with me via ownCloud" : "Compartilhe comigo via ownCloud", - "HTML Code:" : "Código HTML:" + "Direct link" : "Link direto" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js index e9cf412bc53..41c20a6ff4f 100644 --- a/apps/files_sharing/l10n/pt_PT.js +++ b/apps/files_sharing/l10n/pt_PT.js @@ -74,8 +74,6 @@ OC.L10N.register( "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud", "This share is password-protected" : "Esta partilha está protegida por senha", "The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.", "Password" : "Senha", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Adicionar à sua ownCloud", "Download" : "Transferir", "Download %s" : "Transferir %s", - "Direct link" : "Hiperligação direta", - "Federated Cloud Sharing" : "Partilha de Nuvem Federada", - "Open documentation" : "Abrir documentação", - "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores", - "Federated Cloud" : "Nuvem Federada", - "Your Federated Cloud ID:" : "A Sua Id. da Nuvem Federada", - "Share it:" : "Partilhe:", - "Add to your website" : "Adicione ao seu sítio da Web", - "Share with me via ownCloud" : "Partilhe comigo via ownCloud", - "HTML Code:" : "Código HTML:" + "Direct link" : "Hiperligação direta" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json index f311ef6bb33..5ff546a1397 100644 --- a/apps/files_sharing/l10n/pt_PT.json +++ b/apps/files_sharing/l10n/pt_PT.json @@ -72,8 +72,6 @@ "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud", "This share is password-protected" : "Esta partilha está protegida por senha", "The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.", "Password" : "Senha", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Adicionar à sua ownCloud", "Download" : "Transferir", "Download %s" : "Transferir %s", - "Direct link" : "Hiperligação direta", - "Federated Cloud Sharing" : "Partilha de Nuvem Federada", - "Open documentation" : "Abrir documentação", - "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores", - "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores", - "Federated Cloud" : "Nuvem Federada", - "Your Federated Cloud ID:" : "A Sua Id. da Nuvem Federada", - "Share it:" : "Partilhe:", - "Add to your website" : "Adicione ao seu sítio da Web", - "Share with me via ownCloud" : "Partilhe comigo via ownCloud", - "HTML Code:" : "Código HTML:" + "Direct link" : "Hiperligação direta" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js index 8c9de804011..ab9dccd5ad5 100644 --- a/apps/files_sharing/l10n/ru.js +++ b/apps/files_sharing/l10n/ru.js @@ -74,8 +74,6 @@ OC.L10N.register( "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ", "This share is password-protected" : "Общий ресурс защищен паролем", "The password is wrong. Try again." : "Неверный пароль. Попробуйте еще раз.", "Password" : "Пароль", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Добавить в свой ownCloud", "Download" : "Скачать", "Download %s" : "Скачать %s", - "Direct link" : "Прямая ссылка", - "Federated Cloud Sharing" : "Объединение облачных хранилищ", - "Open documentation" : "Открыть документацию", - "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", - "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", - "Federated Cloud" : "Объединение облачных хранилищ", - "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:", - "Share it:" : "Поделись этим:", - "Add to your website" : "Добавить к себе на сайт", - "Share with me via ownCloud" : "Поделитесь мной через ownCloud", - "HTML Code:" : "HTML код:" + "Direct link" : "Прямая ссылка" }, "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json index 5dc7af37190..0e2464a98b2 100644 --- a/apps/files_sharing/l10n/ru.json +++ b/apps/files_sharing/l10n/ru.json @@ -72,8 +72,6 @@ "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ", "This share is password-protected" : "Общий ресурс защищен паролем", "The password is wrong. Try again." : "Неверный пароль. Попробуйте еще раз.", "Password" : "Пароль", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Добавить в свой ownCloud", "Download" : "Скачать", "Download %s" : "Скачать %s", - "Direct link" : "Прямая ссылка", - "Federated Cloud Sharing" : "Объединение облачных хранилищ", - "Open documentation" : "Открыть документацию", - "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", - "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", - "Federated Cloud" : "Объединение облачных хранилищ", - "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:", - "Share it:" : "Поделись этим:", - "Add to your website" : "Добавить к себе на сайт", - "Share with me via ownCloud" : "Поделитесь мной через ownCloud", - "HTML Code:" : "HTML код:" + "Direct link" : "Прямая ссылка" },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js index dfd287e067d..2dab005e2c2 100644 --- a/apps/files_sharing/l10n/sk_SK.js +++ b/apps/files_sharing/l10n/sk_SK.js @@ -54,8 +54,6 @@ OC.L10N.register( "Shares" : "Zdieľanie", "Accept" : "Schváliť", "Decline" : "Odmietnuť", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID", "This share is password-protected" : "Toto zdieľanie je chránené heslom", "The password is wrong. Try again." : "Heslo je chybné. Skúste to znova.", "Password" : "Heslo", @@ -71,16 +69,6 @@ OC.L10N.register( "Add to your ownCloud" : "Pridať do svojho ownCloudu", "Download" : "Sťahovanie", "Download %s" : "Stiahnuť %s", - "Direct link" : "Priama linka", - "Federated Cloud Sharing" : "Združené cloudové zdieľanie", - "Open documentation" : "Otvoriť dokumentáciu", - "Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery", - "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov", - "Federated Cloud" : "Združený Cloud", - "Your Federated Cloud ID:" : "Vaše združené Cloud ID", - "Share it:" : "Zdieľať:", - "Add to your website" : "Pridať na svoju webstránku", - "Share with me via ownCloud" : "Zdieľané so mnou cez ownCloud", - "HTML Code:" : "HTML kód:" + "Direct link" : "Priama linka" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json index 5d23d16c976..70e97f90c38 100644 --- a/apps/files_sharing/l10n/sk_SK.json +++ b/apps/files_sharing/l10n/sk_SK.json @@ -52,8 +52,6 @@ "Shares" : "Zdieľanie", "Accept" : "Schváliť", "Decline" : "Odmietnuť", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID", "This share is password-protected" : "Toto zdieľanie je chránené heslom", "The password is wrong. Try again." : "Heslo je chybné. Skúste to znova.", "Password" : "Heslo", @@ -69,16 +67,6 @@ "Add to your ownCloud" : "Pridať do svojho ownCloudu", "Download" : "Sťahovanie", "Download %s" : "Stiahnuť %s", - "Direct link" : "Priama linka", - "Federated Cloud Sharing" : "Združené cloudové zdieľanie", - "Open documentation" : "Otvoriť dokumentáciu", - "Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery", - "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov", - "Federated Cloud" : "Združený Cloud", - "Your Federated Cloud ID:" : "Vaše združené Cloud ID", - "Share it:" : "Zdieľať:", - "Add to your website" : "Pridať na svoju webstránku", - "Share with me via ownCloud" : "Zdieľané so mnou cez ownCloud", - "HTML Code:" : "HTML kód:" + "Direct link" : "Priama linka" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js index b1961214842..1a55c4bebe5 100644 --- a/apps/files_sharing/l10n/sl.js +++ b/apps/files_sharing/l10n/sl.js @@ -47,14 +47,12 @@ OC.L10N.register( "Downloaded via public link" : "Prejeto preko javne povezave", "Shared with %2$s" : "Omogočena souporaba z %2$s", "Shared via public link" : "Omogočena javna povezava za souporabo", - "Removed public link" : "Javno dostopna povezava odstranjena", + "Removed public link" : "Javno povezava je odstranjena", "Public link expired" : "Javna povezava je potekla", "Shared by %2$s" : "Omogočena souporaba iz strani %2$s", "Shares" : "Souporaba", "Accept" : "Sprejmi", "Decline" : "Zavrni", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Omogoči souporabo prek #ownCloud ID zveznega oblaka, več na %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Omogoči souporabo prek #ownCloud ID zveznega oblaka", "This share is password-protected" : "To mesto je zaščiteno z geslom.", "The password is wrong. Try again." : "Geslo je napačno. Poskusite znova.", "Password" : "Geslo", @@ -70,16 +68,6 @@ OC.L10N.register( "Add to your ownCloud" : "Dodaj v svoj oblak ownCloud", "Download" : "Prejmi", "Download %s" : "Prejmi %s", - "Direct link" : "Neposredna povezava", - "Federated Cloud Sharing" : "Souporaba zveznega oblaka", - "Open documentation" : "Odpri dokumentacijo", - "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.", - "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov.", - "Federated Cloud" : "Zvezni oblak", - "Your Federated Cloud ID:" : "Vaš ID zveznega oblaka:", - "Share it:" : "Omogoči souporabo:", - "Add to your website" : "Dodaj na spletišče", - "Share with me via ownCloud" : "Omogoči souporabo prek ownCloud", - "HTML Code:" : "Koda HTML:" + "Direct link" : "Neposredna povezava" }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json index 32e53159c70..29feacf2c24 100644 --- a/apps/files_sharing/l10n/sl.json +++ b/apps/files_sharing/l10n/sl.json @@ -45,14 +45,12 @@ "Downloaded via public link" : "Prejeto preko javne povezave", "Shared with %2$s" : "Omogočena souporaba z %2$s", "Shared via public link" : "Omogočena javna povezava za souporabo", - "Removed public link" : "Javno dostopna povezava odstranjena", + "Removed public link" : "Javno povezava je odstranjena", "Public link expired" : "Javna povezava je potekla", "Shared by %2$s" : "Omogočena souporaba iz strani %2$s", "Shares" : "Souporaba", "Accept" : "Sprejmi", "Decline" : "Zavrni", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Omogoči souporabo prek #ownCloud ID zveznega oblaka, več na %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Omogoči souporabo prek #ownCloud ID zveznega oblaka", "This share is password-protected" : "To mesto je zaščiteno z geslom.", "The password is wrong. Try again." : "Geslo je napačno. Poskusite znova.", "Password" : "Geslo", @@ -68,16 +66,6 @@ "Add to your ownCloud" : "Dodaj v svoj oblak ownCloud", "Download" : "Prejmi", "Download %s" : "Prejmi %s", - "Direct link" : "Neposredna povezava", - "Federated Cloud Sharing" : "Souporaba zveznega oblaka", - "Open documentation" : "Odpri dokumentacijo", - "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.", - "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov.", - "Federated Cloud" : "Zvezni oblak", - "Your Federated Cloud ID:" : "Vaš ID zveznega oblaka:", - "Share it:" : "Omogoči souporabo:", - "Add to your website" : "Dodaj na spletišče", - "Share with me via ownCloud" : "Omogoči souporabo prek ownCloud", - "HTML Code:" : "Koda HTML:" + "Direct link" : "Neposredna povezava" },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sq.js b/apps/files_sharing/l10n/sq.js index 8ffc9dba389..2e019ab3ace 100644 --- a/apps/files_sharing/l10n/sq.js +++ b/apps/files_sharing/l10n/sq.js @@ -74,8 +74,6 @@ OC.L10N.register( "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Ndani me mua përmes ID-së time për #ownCloud Federated Cloud", "This share is password-protected" : "Kjo pjesë është e mbrojtur me fjalëkalim", "The password is wrong. Try again." : "Fjalëkalimi është i gabuar. Riprovoni.", "Password" : "Fjalëkalim", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Shtojeni te ownCloud-i juaj", "Download" : "Shkarko", "Download %s" : "Shkarko %s", - "Direct link" : "Lidhje e drejtpërdrejtë", - "Federated Cloud Sharing" : "Ndarje e Federuar Në Re", - "Open documentation" : "Hap dokumentimin", - "Allow users on this server to send shares to other servers" : "Lejoju përdoruesve në këtë shërbyes të dërgojnë ndarje në shërbyes të tjerë", - "Allow users on this server to receive shares from other servers" : "Lejoju përdoruesve në këtë shërbyes të marrin ndarje nga shërbyes të tjerë", - "Federated Cloud" : "Re e Federuar", - "Your Federated Cloud ID:" : "ID-ja juaj për Re të Federuar:", - "Share it:" : "Ndajeni:", - "Add to your website" : "Shtojeni te sajti juaj", - "Share with me via ownCloud" : "Ndani me mua përmes ownCloud-it", - "HTML Code:" : "Kod HTML:" + "Direct link" : "Lidhje e drejtpërdrejtë" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/sq.json b/apps/files_sharing/l10n/sq.json index 70b2a3ff20d..f853e3420cb 100644 --- a/apps/files_sharing/l10n/sq.json +++ b/apps/files_sharing/l10n/sq.json @@ -72,8 +72,6 @@ "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", - "Share with me through my #ownCloud Federated Cloud ID" : "Ndani me mua përmes ID-së time për #ownCloud Federated Cloud", "This share is password-protected" : "Kjo pjesë është e mbrojtur me fjalëkalim", "The password is wrong. Try again." : "Fjalëkalimi është i gabuar. Riprovoni.", "Password" : "Fjalëkalim", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Shtojeni te ownCloud-i juaj", "Download" : "Shkarko", "Download %s" : "Shkarko %s", - "Direct link" : "Lidhje e drejtpërdrejtë", - "Federated Cloud Sharing" : "Ndarje e Federuar Në Re", - "Open documentation" : "Hap dokumentimin", - "Allow users on this server to send shares to other servers" : "Lejoju përdoruesve në këtë shërbyes të dërgojnë ndarje në shërbyes të tjerë", - "Allow users on this server to receive shares from other servers" : "Lejoju përdoruesve në këtë shërbyes të marrin ndarje nga shërbyes të tjerë", - "Federated Cloud" : "Re e Federuar", - "Your Federated Cloud ID:" : "ID-ja juaj për Re të Federuar:", - "Share it:" : "Ndajeni:", - "Add to your website" : "Shtojeni te sajti juaj", - "Share with me via ownCloud" : "Ndani me mua përmes ownCloud-it", - "HTML Code:" : "Kod HTML:" + "Direct link" : "Lidhje e drejtpërdrejtë" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js index 1c532341231..494b4937cc2 100644 --- a/apps/files_sharing/l10n/sr.js +++ b/apps/files_sharing/l10n/sr.js @@ -58,13 +58,6 @@ OC.L10N.register( "Add to your ownCloud" : "Додај у свој облак", "Download" : "Преузми", "Download %s" : "Преузми %s", - "Direct link" : "Директна веза", - "Federated Cloud Sharing" : "Здружено дељење у облаку", - "Open documentation" : "Отвори документацију", - "Allow users on this server to send shares to other servers" : "Дозвољава корисницима овог сервера да шаљу дељења на друге сервере", - "Allow users on this server to receive shares from other servers" : "Дозвољава корисницима овог сервера да примају дељења са других сервера", - "Federated Cloud" : "Здружени облак", - "Your Federated Cloud ID:" : "ИД вашег здруженог облака:", - "HTML Code:" : "ХТМЛ кôд:" + "Direct link" : "Директна веза" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json index 7e993ae039e..a254e2dcce6 100644 --- a/apps/files_sharing/l10n/sr.json +++ b/apps/files_sharing/l10n/sr.json @@ -56,13 +56,6 @@ "Add to your ownCloud" : "Додај у свој облак", "Download" : "Преузми", "Download %s" : "Преузми %s", - "Direct link" : "Директна веза", - "Federated Cloud Sharing" : "Здружено дељење у облаку", - "Open documentation" : "Отвори документацију", - "Allow users on this server to send shares to other servers" : "Дозвољава корисницима овог сервера да шаљу дељења на друге сервере", - "Allow users on this server to receive shares from other servers" : "Дозвољава корисницима овог сервера да примају дељења са других сервера", - "Federated Cloud" : "Здружени облак", - "Your Federated Cloud ID:" : "ИД вашег здруженог облака:", - "HTML Code:" : "ХТМЛ кôд:" + "Direct link" : "Директна веза" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sr@latin.js b/apps/files_sharing/l10n/sr@latin.js index d9ea5a22416..e044946e117 100644 --- a/apps/files_sharing/l10n/sr@latin.js +++ b/apps/files_sharing/l10n/sr@latin.js @@ -51,8 +51,6 @@ OC.L10N.register( "Add to your ownCloud" : "Dodaj na svoj ownCloud", "Download" : "Preuzmi", "Download %s" : "Preuzmi %s", - "Direct link" : "Direktna prečica", - "Allow users on this server to send shares to other servers" : "Dozvoli korisnicima na ovom serveru da šalju deljene resurse na druge servere", - "Allow users on this server to receive shares from other servers" : "Dozvoli korisnicima na ovom serveru da primaju deljene resurse sa drugih servera" + "Direct link" : "Direktna prečica" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/sr@latin.json b/apps/files_sharing/l10n/sr@latin.json index 8cba518384e..f4942a0dfa9 100644 --- a/apps/files_sharing/l10n/sr@latin.json +++ b/apps/files_sharing/l10n/sr@latin.json @@ -49,8 +49,6 @@ "Add to your ownCloud" : "Dodaj na svoj ownCloud", "Download" : "Preuzmi", "Download %s" : "Preuzmi %s", - "Direct link" : "Direktna prečica", - "Allow users on this server to send shares to other servers" : "Dozvoli korisnicima na ovom serveru da šalju deljene resurse na druge servere", - "Allow users on this server to receive shares from other servers" : "Dozvoli korisnicima na ovom serveru da primaju deljene resurse sa drugih servera" + "Direct link" : "Direktna prečica" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sv.js b/apps/files_sharing/l10n/sv.js index 2381031c192..165b5a20deb 100644 --- a/apps/files_sharing/l10n/sv.js +++ b/apps/files_sharing/l10n/sv.js @@ -74,8 +74,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "Du mottog \"/%2$s\" som fjärrdelning från %1$s", "Accept" : "Acceptera", "Decline" : "Neka", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dela med mig genom min #owncloud Federated Cloud ID, se %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Dela med mig genom min #ownCloud Federated Cloud ID", "This share is password-protected" : "Den här delningen är lösenordsskyddad", "The password is wrong. Try again." : "Lösenordet är fel. Försök igen.", "Password" : "Lösenord", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "Lägg till i din ownCloud", "Download" : "Ladda ner", "Download %s" : "Ladda ner %s", - "Direct link" : "Direkt länk", - "Federated Cloud Sharing" : "Federate Cloud delning", - "Open documentation" : "Öppna dokumentation", - "Allow users on this server to send shares to other servers" : "Tillåt användare på denna server att skicka utdelningar till andra servrar", - "Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Ditt Federated Cloud ID", - "Share it:" : "Dela detta:", - "Add to your website" : "Lägg till på din hemsida", - "Share with me via ownCloud" : "Dela med mig via Owncloud", - "HTML Code:" : "HTML Kod:" + "Direct link" : "Direkt länk" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json index f86e9491149..748caa6b57f 100644 --- a/apps/files_sharing/l10n/sv.json +++ b/apps/files_sharing/l10n/sv.json @@ -72,8 +72,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "Du mottog \"/%2$s\" som fjärrdelning från %1$s", "Accept" : "Acceptera", "Decline" : "Neka", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dela med mig genom min #owncloud Federated Cloud ID, se %s", - "Share with me through my #ownCloud Federated Cloud ID" : "Dela med mig genom min #ownCloud Federated Cloud ID", "This share is password-protected" : "Den här delningen är lösenordsskyddad", "The password is wrong. Try again." : "Lösenordet är fel. Försök igen.", "Password" : "Lösenord", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "Lägg till i din ownCloud", "Download" : "Ladda ner", "Download %s" : "Ladda ner %s", - "Direct link" : "Direkt länk", - "Federated Cloud Sharing" : "Federate Cloud delning", - "Open documentation" : "Öppna dokumentation", - "Allow users on this server to send shares to other servers" : "Tillåt användare på denna server att skicka utdelningar till andra servrar", - "Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar", - "Federated Cloud" : "Federated Cloud", - "Your Federated Cloud ID:" : "Ditt Federated Cloud ID", - "Share it:" : "Dela detta:", - "Add to your website" : "Lägg till på din hemsida", - "Share with me via ownCloud" : "Dela med mig via Owncloud", - "HTML Code:" : "HTML Kod:" + "Direct link" : "Direkt länk" },"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 ef79c38cbeb..a03951d4cef 100644 --- a/apps/files_sharing/l10n/th_TH.js +++ b/apps/files_sharing/l10n/th_TH.js @@ -5,9 +5,9 @@ OC.L10N.register( "The mountpoint name contains invalid characters." : "ชื่อจุดเชื่อมต่อมีตัวอักษรที่ไม่ถูกต้อง", "Not allowed to create a federated share with the same user server" : "ไม่อนุญาตให้สร้างแชร์ในเครือกับเซิร์ฟเวอร์ที่มีผู้ใช้เดียวกัน", "Invalid or untrusted SSL certificate" : "ใบรับรอง SSL ไม่ถูกต้องหรือไม่น่าเชื่อถือ", - "Could not authenticate to remote share, password might be wrong" : "ไม่สามารถรับรองความถูกต้องจากการแชร์ระยะไกลรหัสผ่านอาจจะผิด", + "Could not authenticate to remote share, password might be wrong" : "ไม่สามารถรับรองความถูกต้องจากรีโมทแชร์ บางทีรหัสผ่านอาจจะผิด", "Storage not valid" : "การจัดเก็บข้อมูลไม่ถูกต้อง", - "Couldn't add remote share" : "ไม่สามารถเพิ่มแชร์ระยะไกล", + "Couldn't add remote share" : "ไม่สามารถเพิ่มรีโมทแชร์", "Shared with you" : "แชร์กับคุณ", "Shared with others" : "แชร์กับผู้อื่น", "Shared by link" : "แชร์โดยลิงค์", @@ -18,11 +18,11 @@ OC.L10N.register( "Files and folders you share will show up here" : "ไฟล์และโฟลเดอร์ที่คุณแชร์จะปรากฏขึ้นที่นี่", "No shared links" : "ไม่มีลิงค์ที่แชร์", "Files and folders you share by link will show up here" : "ไฟล์และโฟลเดอร์ที่คุณแชร์โดยลิงค์จะปรากฏขึ้นที่นี่", - "Do you want to add the remote share {name} from {owner}@{remote}?" : "คุณต้องการที่จะเพิ่มการแชร์ระยะไกล {name} จาก {owner}@{remote}?", - "Remote share" : "แชร์ระยะไกล", - "Remote share password" : "รหัสผ่านการแชร์ระยะไกล", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "คุณต้องการที่จะเพิ่มรีโมทแชร์ {name} จาก {owner}@{remote}?", + "Remote share" : "รีโมทแชร์", + "Remote share password" : "รหัสผ่านรีโมทแชร์", "Cancel" : "ยกเลิก", - "Add remote share" : "เพิ่มการแชร์ระยะไกล", + "Add remote share" : "เพิ่มรีโมทแชร์", "You can upload into this folder" : "คุณสามารถอัพโหลดลงในโฟลเดอร์นี้", "No ownCloud installation (7 or higher) found at {remote}" : "ไม่มีการติดตั้ง ownCloud (7 หรือสูงกว่า) พบได้ที่ {remote}", "Invalid ownCloud url" : "URL ownCloud ไม่ถูกต้อง", @@ -31,10 +31,10 @@ OC.L10N.register( "A file or folder has been <strong>shared</strong>" : "ไฟล์หรือโฟลเดอร์ได้ถูก <strong>แชร์</strong>", "A file or folder was shared from <strong>another server</strong>" : "ไฟล์หรือโฟลเดอร์จะถูกแชร์จาก <strong>เซิร์ฟเวอร์อื่นๆ</ strong>", "A public shared file or folder was <strong>downloaded</strong>" : "แชร์ไฟล์หรือโฟลเดอร์สาธารณะถูก <strong>ดาวน์โหลด</strong>", - "You received a new remote share %2$s from %1$s" : "คุณได้รับการแชร์ระยะไกลใหม่ %2$s จาก %1$s", - "You received a new remote share from %s" : "คุณได้รับการแชร์ระยะไกลใหม่จาก %s", - "%1$s accepted remote share %2$s" : "%1$s ยอมรับการแชร์ %2$s จากระยะไกล", - "%1$s declined remote share %2$s" : "%1$s ปฏิเสธการแชร์ %2$s จากระยะไกล", + "You received a new remote share %2$s from %1$s" : "คุณได้รับ %2$s รีโมทแชร์ใหม่จาก %1$s", + "You received a new remote share from %s" : "คุณได้รับรีโมทแชร์ใหม่จาก %s", + "%1$s accepted remote share %2$s" : "%1$s ยอมรับรีโมทแชร์จาก %2$s", + "%1$s declined remote share %2$s" : "%1$s ปฏิเสธรีโมทแชร์จาก %2$s", "%1$s unshared %2$s from you" : "%1$s ไม่ได้แชร์ %2$s จากคุณ", "Public shared folder %1$s was downloaded" : "โฟลเดอร์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด", "Public shared file %1$s was downloaded" : "ไฟล์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด", @@ -71,10 +71,9 @@ OC.L10N.register( "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", - "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ", "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน", "The password is wrong. Try again." : "รหัสผ่านที่ไม่ถูกต้อง กรุณาลองอีกครั้ง", "Password" : "รหัสผ่าน", @@ -90,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "เพิ่มลงใน ownCloud ของคุณ", "Download" : "ดาวน์โหลด", "Download %s" : "ดาวน์โหลด %s", - "Direct link" : "ลิงค์โดยตรง", - "Federated Cloud Sharing" : "สหพันธ์การแชร์คลาวด์", - "Open documentation" : "เปิดเอกสาร", - "Allow users on this server to send shares to other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ส่งแชร์ไปยังเซิร์ฟเวอร์อื่นๆ", - "Allow users on this server to receive shares from other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ได้รับการแชร์จากเซิร์ฟเวอร์อื่นๆ", - "Federated Cloud" : "สหพันธ์คลาวด์", - "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:", - "Share it:" : "แชร์มัน:", - "Add to your website" : "เพิ่มไปยังเว็บไซต์", - "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud", - "HTML Code:" : "โค้ด HTML:" + "Direct link" : "ลิงค์โดยตรง" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json index 2bc0d8b64b9..182331ffc1a 100644 --- a/apps/files_sharing/l10n/th_TH.json +++ b/apps/files_sharing/l10n/th_TH.json @@ -3,9 +3,9 @@ "The mountpoint name contains invalid characters." : "ชื่อจุดเชื่อมต่อมีตัวอักษรที่ไม่ถูกต้อง", "Not allowed to create a federated share with the same user server" : "ไม่อนุญาตให้สร้างแชร์ในเครือกับเซิร์ฟเวอร์ที่มีผู้ใช้เดียวกัน", "Invalid or untrusted SSL certificate" : "ใบรับรอง SSL ไม่ถูกต้องหรือไม่น่าเชื่อถือ", - "Could not authenticate to remote share, password might be wrong" : "ไม่สามารถรับรองความถูกต้องจากการแชร์ระยะไกลรหัสผ่านอาจจะผิด", + "Could not authenticate to remote share, password might be wrong" : "ไม่สามารถรับรองความถูกต้องจากรีโมทแชร์ บางทีรหัสผ่านอาจจะผิด", "Storage not valid" : "การจัดเก็บข้อมูลไม่ถูกต้อง", - "Couldn't add remote share" : "ไม่สามารถเพิ่มแชร์ระยะไกล", + "Couldn't add remote share" : "ไม่สามารถเพิ่มรีโมทแชร์", "Shared with you" : "แชร์กับคุณ", "Shared with others" : "แชร์กับผู้อื่น", "Shared by link" : "แชร์โดยลิงค์", @@ -16,11 +16,11 @@ "Files and folders you share will show up here" : "ไฟล์และโฟลเดอร์ที่คุณแชร์จะปรากฏขึ้นที่นี่", "No shared links" : "ไม่มีลิงค์ที่แชร์", "Files and folders you share by link will show up here" : "ไฟล์และโฟลเดอร์ที่คุณแชร์โดยลิงค์จะปรากฏขึ้นที่นี่", - "Do you want to add the remote share {name} from {owner}@{remote}?" : "คุณต้องการที่จะเพิ่มการแชร์ระยะไกล {name} จาก {owner}@{remote}?", - "Remote share" : "แชร์ระยะไกล", - "Remote share password" : "รหัสผ่านการแชร์ระยะไกล", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "คุณต้องการที่จะเพิ่มรีโมทแชร์ {name} จาก {owner}@{remote}?", + "Remote share" : "รีโมทแชร์", + "Remote share password" : "รหัสผ่านรีโมทแชร์", "Cancel" : "ยกเลิก", - "Add remote share" : "เพิ่มการแชร์ระยะไกล", + "Add remote share" : "เพิ่มรีโมทแชร์", "You can upload into this folder" : "คุณสามารถอัพโหลดลงในโฟลเดอร์นี้", "No ownCloud installation (7 or higher) found at {remote}" : "ไม่มีการติดตั้ง ownCloud (7 หรือสูงกว่า) พบได้ที่ {remote}", "Invalid ownCloud url" : "URL ownCloud ไม่ถูกต้อง", @@ -29,10 +29,10 @@ "A file or folder has been <strong>shared</strong>" : "ไฟล์หรือโฟลเดอร์ได้ถูก <strong>แชร์</strong>", "A file or folder was shared from <strong>another server</strong>" : "ไฟล์หรือโฟลเดอร์จะถูกแชร์จาก <strong>เซิร์ฟเวอร์อื่นๆ</ strong>", "A public shared file or folder was <strong>downloaded</strong>" : "แชร์ไฟล์หรือโฟลเดอร์สาธารณะถูก <strong>ดาวน์โหลด</strong>", - "You received a new remote share %2$s from %1$s" : "คุณได้รับการแชร์ระยะไกลใหม่ %2$s จาก %1$s", - "You received a new remote share from %s" : "คุณได้รับการแชร์ระยะไกลใหม่จาก %s", - "%1$s accepted remote share %2$s" : "%1$s ยอมรับการแชร์ %2$s จากระยะไกล", - "%1$s declined remote share %2$s" : "%1$s ปฏิเสธการแชร์ %2$s จากระยะไกล", + "You received a new remote share %2$s from %1$s" : "คุณได้รับ %2$s รีโมทแชร์ใหม่จาก %1$s", + "You received a new remote share from %s" : "คุณได้รับรีโมทแชร์ใหม่จาก %s", + "%1$s accepted remote share %2$s" : "%1$s ยอมรับรีโมทแชร์จาก %2$s", + "%1$s declined remote share %2$s" : "%1$s ปฏิเสธรีโมทแชร์จาก %2$s", "%1$s unshared %2$s from you" : "%1$s ไม่ได้แชร์ %2$s จากคุณ", "Public shared folder %1$s was downloaded" : "โฟลเดอร์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด", "Public shared file %1$s was downloaded" : "ไฟล์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด", @@ -69,10 +69,9 @@ "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", - "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ", "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน", "The password is wrong. Try again." : "รหัสผ่านที่ไม่ถูกต้อง กรุณาลองอีกครั้ง", "Password" : "รหัสผ่าน", @@ -88,16 +87,6 @@ "Add to your ownCloud" : "เพิ่มลงใน ownCloud ของคุณ", "Download" : "ดาวน์โหลด", "Download %s" : "ดาวน์โหลด %s", - "Direct link" : "ลิงค์โดยตรง", - "Federated Cloud Sharing" : "สหพันธ์การแชร์คลาวด์", - "Open documentation" : "เปิดเอกสาร", - "Allow users on this server to send shares to other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ส่งแชร์ไปยังเซิร์ฟเวอร์อื่นๆ", - "Allow users on this server to receive shares from other servers" : "อนุญาตให้ผู้ใช้บนเซิร์ฟเวอร์นี้ได้รับการแชร์จากเซิร์ฟเวอร์อื่นๆ", - "Federated Cloud" : "สหพันธ์คลาวด์", - "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:", - "Share it:" : "แชร์มัน:", - "Add to your website" : "เพิ่มไปยังเว็บไซต์", - "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud", - "HTML Code:" : "โค้ด HTML:" + "Direct link" : "ลิงค์โดยตรง" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index c08d9baa0d5..a836a20e88d 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -74,8 +74,6 @@ OC.L10N.register( "You received \"/%2$s\" as a remote share from %1$s" : "%1$s kişisinden \"/%2$s\" uzak paylaşımını aldınız", "Accept" : "Kabul et", "Decline" : "Reddet", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaş, bkz %s", - "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaş", "This share is password-protected" : "Bu paylaşım parola korumalı", "The password is wrong. Try again." : "Parola hatalı. Yeniden deneyin.", "Password" : "Parola", @@ -91,16 +89,6 @@ OC.L10N.register( "Add to your ownCloud" : "ownCloud'ınıza Ekleyin", "Download" : "İndir", "Download %s" : "İndir: %s", - "Direct link" : "Doğrudan bağlantı", - "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı", - "Open documentation" : "Belgelendirmeyi aç", - "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver", - "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver", - "Federated Cloud" : "Birleşmiş Bulut", - "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", - "Share it:" : "Paylaşın:", - "Add to your website" : "Web sitenize ekleyin", - "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşın", - "HTML Code:" : "HTML Kodu:" + "Direct link" : "Doğrudan bağlantı" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index b107ec25589..901098f1f54 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -72,8 +72,6 @@ "You received \"/%2$s\" as a remote share from %1$s" : "%1$s kişisinden \"/%2$s\" uzak paylaşımını aldınız", "Accept" : "Kabul et", "Decline" : "Reddet", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaş, bkz %s", - "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaş", "This share is password-protected" : "Bu paylaşım parola korumalı", "The password is wrong. Try again." : "Parola hatalı. Yeniden deneyin.", "Password" : "Parola", @@ -89,16 +87,6 @@ "Add to your ownCloud" : "ownCloud'ınıza Ekleyin", "Download" : "İndir", "Download %s" : "İndir: %s", - "Direct link" : "Doğrudan bağlantı", - "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı", - "Open documentation" : "Belgelendirmeyi aç", - "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver", - "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunuculardan paylaşım almalarına izin ver", - "Federated Cloud" : "Birleşmiş Bulut", - "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:", - "Share it:" : "Paylaşın:", - "Add to your website" : "Web sitenize ekleyin", - "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşın", - "HTML Code:" : "HTML Kodu:" + "Direct link" : "Doğrudan bağlantı" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js index b122664beca..fcd56b8afc2 100644 --- a/apps/files_sharing/l10n/uk.js +++ b/apps/files_sharing/l10n/uk.js @@ -55,12 +55,6 @@ OC.L10N.register( "Add to your ownCloud" : "Додати до вашого ownCloud", "Download" : "Завантажити", "Download %s" : "Завантажити %s", - "Direct link" : "Пряме посилання", - "Federated Cloud Sharing" : "Об’єднання хмарних сховищ", - "Open documentation" : "Відкрити документацію", - "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах", - "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів", - "Share it:" : "Поділитися цим:", - "HTML Code:" : "HTML код:" + "Direct link" : "Пряме посилання" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files_sharing/l10n/uk.json b/apps/files_sharing/l10n/uk.json index 363a02ed7ed..3aebedad135 100644 --- a/apps/files_sharing/l10n/uk.json +++ b/apps/files_sharing/l10n/uk.json @@ -53,12 +53,6 @@ "Add to your ownCloud" : "Додати до вашого ownCloud", "Download" : "Завантажити", "Download %s" : "Завантажити %s", - "Direct link" : "Пряме посилання", - "Federated Cloud Sharing" : "Об’єднання хмарних сховищ", - "Open documentation" : "Відкрити документацію", - "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах", - "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів", - "Share it:" : "Поділитися цим:", - "HTML Code:" : "HTML код:" + "Direct link" : "Пряме посилання" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js index 8270a39e6d7..a9f676fad98 100644 --- a/apps/files_sharing/l10n/zh_CN.js +++ b/apps/files_sharing/l10n/zh_CN.js @@ -62,16 +62,6 @@ OC.L10N.register( "Add to your ownCloud" : "添加到您的 ownCloud", "Download" : "下载", "Download %s" : "下载 %s", - "Direct link" : "直接链接", - "Federated Cloud Sharing" : "联合云共享", - "Open documentation" : "打开文档", - "Allow users on this server to send shares to other servers" : "允许用户分享文件给其他服务器上的用户", - "Allow users on this server to receive shares from other servers" : "允许用户从其他服务器接收分享", - "Federated Cloud" : "联合云", - "Your Federated Cloud ID:" : "你的联合云ID：", - "Share it:" : "分享它：", - "Add to your website" : "添加到您的网站", - "Share with me via ownCloud" : "通过联合云与我共享", - "HTML Code:" : "HTML 代码:" + "Direct link" : "直接链接" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json index c59c4684c39..bffaa9b6b5b 100644 --- a/apps/files_sharing/l10n/zh_CN.json +++ b/apps/files_sharing/l10n/zh_CN.json @@ -60,16 +60,6 @@ "Add to your ownCloud" : "添加到您的 ownCloud", "Download" : "下载", "Download %s" : "下载 %s", - "Direct link" : "直接链接", - "Federated Cloud Sharing" : "联合云共享", - "Open documentation" : "打开文档", - "Allow users on this server to send shares to other servers" : "允许用户分享文件给其他服务器上的用户", - "Allow users on this server to receive shares from other servers" : "允许用户从其他服务器接收分享", - "Federated Cloud" : "联合云", - "Your Federated Cloud ID:" : "你的联合云ID：", - "Share it:" : "分享它：", - "Add to your website" : "添加到您的网站", - "Share with me via ownCloud" : "通过联合云与我共享", - "HTML Code:" : "HTML 代码:" + "Direct link" : "直接链接" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/zh_TW.js b/apps/files_sharing/l10n/zh_TW.js index a3de7a5ef4a..43e9c23a38b 100644 --- a/apps/files_sharing/l10n/zh_TW.js +++ b/apps/files_sharing/l10n/zh_TW.js @@ -55,8 +55,6 @@ OC.L10N.register( "Shares" : "分享", "Accept" : "接受", "Decline" : "拒絕", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "可透過我的 #ownCloud 聯盟雲端 ID，與我分享，請看 %s", - "Share with me through my #ownCloud Federated Cloud ID" : "可透過我的 #ownCloud 聯盟雲端 ID，與我分享", "This share is password-protected" : "這個分享有密碼保護", "The password is wrong. Try again." : "請檢查您的密碼並再試一次", "Password" : "密碼", @@ -72,16 +70,6 @@ OC.L10N.register( "Add to your ownCloud" : "加入到你的 ownCloud", "Download" : "下載", "Download %s" : "下載 %s", - "Direct link" : "直接連結", - "Federated Cloud Sharing" : "聯盟式雲端分享", - "Open documentation" : "開啟文件", - "Allow users on this server to send shares to other servers" : "允許這台伺服器上的使用者發送分享給其他伺服器", - "Allow users on this server to receive shares from other servers" : "允許這台伺服器上的使用者發送接收來自其他伺服器的分享", - "Federated Cloud" : "聯盟式雲端", - "Your Federated Cloud ID:" : "您的雲端聯盟 ID：", - "Share it:" : "分享它：", - "Add to your website" : "新增至您的網站", - "Share with me via ownCloud" : "透過 ownCloud 與我分享", - "HTML Code:" : "HTML Code:" + "Direct link" : "直接連結" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/zh_TW.json b/apps/files_sharing/l10n/zh_TW.json index 7a237c1c58a..7ca97b77f8a 100644 --- a/apps/files_sharing/l10n/zh_TW.json +++ b/apps/files_sharing/l10n/zh_TW.json @@ -53,8 +53,6 @@ "Shares" : "分享", "Accept" : "接受", "Decline" : "拒絕", - "Share with me through my #ownCloud Federated Cloud ID, see %s" : "可透過我的 #ownCloud 聯盟雲端 ID，與我分享，請看 %s", - "Share with me through my #ownCloud Federated Cloud ID" : "可透過我的 #ownCloud 聯盟雲端 ID，與我分享", "This share is password-protected" : "這個分享有密碼保護", "The password is wrong. Try again." : "請檢查您的密碼並再試一次", "Password" : "密碼", @@ -70,16 +68,6 @@ "Add to your ownCloud" : "加入到你的 ownCloud", "Download" : "下載", "Download %s" : "下載 %s", - "Direct link" : "直接連結", - "Federated Cloud Sharing" : "聯盟式雲端分享", - "Open documentation" : "開啟文件", - "Allow users on this server to send shares to other servers" : "允許這台伺服器上的使用者發送分享給其他伺服器", - "Allow users on this server to receive shares from other servers" : "允許這台伺服器上的使用者發送接收來自其他伺服器的分享", - "Federated Cloud" : "聯盟式雲端", - "Your Federated Cloud ID:" : "您的雲端聯盟 ID：", - "Share it:" : "分享它：", - "Add to your website" : "新增至您的網站", - "Share with me via ownCloud" : "透過 ownCloud 與我分享", - "HTML Code:" : "HTML Code:" + "Direct link" : "直接連結" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php index ea024b6016a..72294f6b26f 100644 --- a/apps/files_sharing/lib/controllers/sharecontroller.php +++ b/apps/files_sharing/lib/controllers/sharecontroller.php @@ -33,6 +33,7 @@ namespace OCA\Files_Sharing\Controllers; use OC; use OC_Files; use OC_Util; +use OCA\FederatedFileSharing\FederatedShareProvider; use OCP; use OCP\Template; use OCP\Share; @@ -79,6 +80,8 @@ class ShareController extends Controller { protected $previewManager; /** @var IRootFolder */ protected $rootFolder; + /** @var FederatedShareProvider */ + protected $federatedShareProvider; /** * @param string $appName @@ -92,6 +95,7 @@ class ShareController extends Controller { * @param ISession $session * @param IPreview $previewManager * @param IRootFolder $rootFolder + * @param FederatedShareProvider $federatedShareProvider */ public function __construct($appName, IRequest $request, @@ -103,7 +107,8 @@ class ShareController extends Controller { \OCP\Share\IManager $shareManager, ISession $session, IPreview $previewManager, - IRootFolder $rootFolder) { + IRootFolder $rootFolder, + FederatedShareProvider $federatedShareProvider) { parent::__construct($appName, $request); $this->config = $config; @@ -115,6 +120,7 @@ class ShareController extends Controller { $this->session = $session; $this->previewManager = $previewManager; $this->rootFolder = $rootFolder; + $this->federatedShareProvider = $federatedShareProvider; } /** @@ -300,7 +306,7 @@ class ShareController extends Controller { $shareTmpl['previewSupported'] = $this->previewManager->isMimeSupported($share->getNode()->getMimetype()); $shareTmpl['dirToken'] = $token; $shareTmpl['sharingToken'] = $token; - $shareTmpl['server2serversharing'] = Helper::isOutgoingServer2serverShareEnabled(); + $shareTmpl['server2serversharing'] = $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(); $shareTmpl['protected'] = $share->getPassword() !== null ? 'true' : 'false'; $shareTmpl['dir'] = ''; $shareTmpl['nonHumanFileSize'] = $share->getNode()->getSize(); diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php index e857974ae74..c09694e9888 100644 --- a/apps/files_sharing/lib/helper.php +++ b/apps/files_sharing/lib/helper.php @@ -280,26 +280,6 @@ class Helper { } /** - * allow users from other ownCloud instances to mount public links share by this instance - * @return bool - */ - public static function isOutgoingServer2serverShareEnabled() { - $appConfig = \OC::$server->getAppConfig(); - $result = $appConfig->getValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes'); - return ($result === 'yes') ? true : false; - } - - /** - * allow user to mount public links from onther ownClouds - * @return bool - */ - public static function isIncomingServer2serverShareEnabled() { - $appConfig = \OC::$server->getAppConfig(); - $result = $appConfig->getValue('files_sharing', 'incoming_server2server_share_enabled', 'yes'); - return ($result === 'yes') ? true : false; - } - - /** * get default share folder * * @return string diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index 113675508fb..38605def73a 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -1,4 +1,6 @@ <?php +use OCA\FederatedFileSharing\FederatedShareProvider; + /** * @author Andreas Fischer <bantu@owncloud.com> * @author Bart Visscher <bartv@thisnet.nl> @@ -40,6 +42,18 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { private $path; + /** @var FederatedShareProvider */ + private $federatedShareProvider; + + public function __construct(FederatedShareProvider $federatedShareProvider = null) { + if ($federatedShareProvider) { + $this->federatedShareProvider = $federatedShareProvider; + } else { + $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing'); + $this->federatedShareProvider = $federatedSharingApp->getFederatedShareProvider(); + } + } + public function isValidSource($itemSource, $uidOwner) { try { $path = \OC\Files\Filesystem::getPath($itemSource); @@ -173,7 +187,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { */ public function isShareTypeAllowed($shareType) { if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) { - return \OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled(); + return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(); } return true; diff --git a/apps/files_sharing/lib/sharedpropagator.php b/apps/files_sharing/lib/sharedpropagator.php index 8de90b9552b..f17cfc3a75b 100644 --- a/apps/files_sharing/lib/sharedpropagator.php +++ b/apps/files_sharing/lib/sharedpropagator.php @@ -33,7 +33,6 @@ class SharedPropagator extends Propagator { * @param string $internalPath * @param int $time * @param int $sizeDifference - * @return \array[] all propagated entries */ public function propagateChange($internalPath, $time, $sizeDifference = 0) { /** @var \OC\Files\Storage\Storage $storage */ diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 48ab3fad5f6..1a040364f11 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -332,7 +332,7 @@ class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage { if (!$storage) { $storage = $this; } - return new \OCA\Files_Sharing\SharedPropagator($storage); + return new \OCA\Files_Sharing\SharedPropagator($storage, \OC::$server->getDatabaseConnection()); } public function getOwner($path) { diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php index db8c7fe553c..df3973099fb 100644 --- a/apps/files_sharing/tests/controller/sharecontroller.php +++ b/apps/files_sharing/tests/controller/sharecontroller.php @@ -29,6 +29,7 @@ namespace OCA\Files_Sharing\Controllers; use OC\Files\Filesystem; +use OCA\FederatedFileSharing\FederatedShareProvider; use OCP\Share\Exceptions\ShareNotFound; use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\RedirectResponse; @@ -66,6 +67,8 @@ class ShareControllerTest extends \Test\TestCase { private $shareManager; /** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject */ private $userManager; + /** @var FederatedShareProvider | \PHPUnit_Framework_MockObject_MockObject */ + private $federatedShareProvider; protected function setUp() { $this->appName = 'files_sharing'; @@ -76,6 +79,12 @@ class ShareControllerTest extends \Test\TestCase { $this->previewManager = $this->getMock('\OCP\IPreview'); $this->config = $this->getMock('\OCP\IConfig'); $this->userManager = $this->getMock('\OCP\IUserManager'); + $this->federatedShareProvider = $this->getMockBuilder('OCA\FederatedFileSharing\FederatedShareProvider') + ->disableOriginalConstructor()->getMock(); + $this->federatedShareProvider->expects($this->any()) + ->method('isOutgoingServer2serverShareEnabled')->willReturn(true); + $this->federatedShareProvider->expects($this->any()) + ->method('isIncomingServer2serverShareEnabled')->willReturn(true); $this->shareController = new \OCA\Files_Sharing\Controllers\ShareController( $this->appName, @@ -88,7 +97,8 @@ class ShareControllerTest extends \Test\TestCase { $this->shareManager, $this->session, $this->previewManager, - $this->getMock('\OCP\Files\IRootFolder') + $this->getMock('\OCP\Files\IRootFolder'), + $this->federatedShareProvider ); diff --git a/apps/files_sharing/tests/server2server.php b/apps/files_sharing/tests/server2server.php index 7714f274c6d..1d047916ca9 100644 --- a/apps/files_sharing/tests/server2server.php +++ b/apps/files_sharing/tests/server2server.php @@ -44,6 +44,9 @@ class Test_Files_Sharing_S2S_OCS_API extends TestCase { */ private $s2s; + /** @var \OCA\FederatedFileSharing\FederatedShareProvider | PHPUnit_Framework_MockObject_MockObject */ + private $federatedShareProvider; + protected function setUp() { parent::setUp(); @@ -57,10 +60,16 @@ class Test_Files_Sharing_S2S_OCS_API extends TestCase { ->setConstructorArgs([$config, $clientService]) ->getMock(); $httpHelperMock->expects($this->any())->method('post')->with($this->anything())->will($this->returnValue(true)); + $this->federatedShareProvider = $this->getMockBuilder('OCA\FederatedFileSharing\FederatedShareProvider') + ->disableOriginalConstructor()->getMock(); + $this->federatedShareProvider->expects($this->any()) + ->method('isOutgoingServer2serverShareEnabled')->willReturn(true); + $this->federatedShareProvider->expects($this->any()) + ->method('isIncomingServer2serverShareEnabled')->willReturn(true); $this->registerHttpHelper($httpHelperMock); - $this->s2s = new \OCA\Files_Sharing\API\Server2Server(); + $this->s2s = new \OCA\Files_Sharing\API\Server2Server($this->federatedShareProvider); $this->connection = \OC::$server->getDatabaseConnection(); } diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php index a213ea75238..3c23f2f730a 100644 --- a/apps/files_versions/lib/storage.php +++ b/apps/files_versions/lib/storage.php @@ -45,6 +45,7 @@ use OC\Files\Filesystem; use OC\Files\View; use OCA\Files_Versions\AppInfo\Application; use OCA\Files_Versions\Command\Expire; +use OCP\Files\NotFoundException; use OCP\Lock\ILockingProvider; use OCP\User; diff --git a/apps/systemtags/activity/extension.php b/apps/systemtags/activity/extension.php index 4a974611509..8c101a6f550 100644 --- a/apps/systemtags/activity/extension.php +++ b/apps/systemtags/activity/extension.php @@ -142,9 +142,15 @@ class Extension implements IExtension { switch ($text) { case self::ASSIGN_TAG: $params[2] = $this->convertParameterToTag($params[2], $l); + if ($this->actorIsCurrentUser($params[0])) { + return (string) $l->t('You assigned system tag %3$s', $params); + } return (string) $l->t('%1$s assigned system tag %3$s', $params); case self::UNASSIGN_TAG: $params[2] = $this->convertParameterToTag($params[2], $l); + if ($this->actorIsCurrentUser($params[0])) { + return (string) $l->t('You unassigned system tag %3$s', $params); + } return (string) $l->t('%1$s unassigned system tag %3$s', $params); } @@ -162,19 +168,34 @@ class Extension implements IExtension { switch ($text) { case self::CREATE_TAG: $params[1] = $this->convertParameterToTag($params[1], $l); + if ($this->actorIsCurrentUser($params[0])) { + return (string) $l->t('You created system tag %2$s', $params); + } return (string) $l->t('%1$s created system tag %2$s', $params); case self::DELETE_TAG: $params[1] = $this->convertParameterToTag($params[1], $l); + if ($this->actorIsCurrentUser($params[0])) { + return (string) $l->t('You deleted system tag %2$s', $params); + } return (string) $l->t('%1$s deleted system tag %2$s', $params); case self::UPDATE_TAG: $params[1] = $this->convertParameterToTag($params[1], $l); $params[2] = $this->convertParameterToTag($params[2], $l); + if ($this->actorIsCurrentUser($params[0])) { + return (string) $l->t('You updated system tag %3$s to %2$s', $params); + } return (string) $l->t('%1$s updated system tag %3$s to %2$s', $params); case self::ASSIGN_TAG: $params[2] = $this->convertParameterToTag($params[2], $l); + if ($this->actorIsCurrentUser($params[0])) { + return (string) $l->t('You assigned system tag %3$s to %2$s', $params); + } return (string) $l->t('%1$s assigned system tag %3$s to %2$s', $params); case self::UNASSIGN_TAG: $params[2] = $this->convertParameterToTag($params[2], $l); + if ($this->actorIsCurrentUser($params[0])) { + return (string) $l->t('You unassigned system tag %3$s from %2$s', $params); + } return (string) $l->t('%1$s unassigned system tag %3$s from %2$s', $params); } @@ -182,6 +203,20 @@ class Extension implements IExtension { } /** + * Check if the author is the current user + * + * @param string $user Parameter e.g. `<user display-name="admin">admin</user>` + * @return bool + */ + protected function actorIsCurrentUser($user) { + try { + return strip_tags($user) === $this->activityManager->getCurrentUserId(); + } catch (\UnexpectedValueException $e) { + return false; + } + } + + /** * The extension can define the type of parameters for translation * * Currently known types are: diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index c50ab0a8e1f..eba39ca50f7 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -72,8 +72,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { return false; } $cacheKey = 'inGroup'.$uid.':'.$gid; - if($this->access->connection->isCached($cacheKey)) { - return $this->access->connection->getFromCache($cacheKey); + $inGroup = $this->access->connection->getFromCache($cacheKey); + if(!is_null($inGroup)) { + return (bool)$inGroup; } $userDN = $this->access->username2dn($uid); @@ -84,8 +85,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { } $cacheKeyMembers = 'inGroup-members:'.$gid; - if($this->access->connection->isCached($cacheKeyMembers)) { - $members = $this->access->connection->getFromCache($cacheKeyMembers); + $members = $this->access->connection->getFromCache($cacheKeyMembers); + if(!is_null($members)) { $this->cachedGroupMembers[$gid] = $members; $isInGroup = in_array($userDN, $members); $this->access->connection->writeToCache($cacheKey, $isInGroup); @@ -204,8 +205,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { } // used extensively in cron job, caching makes sense for nested groups $cacheKey = '_groupMembers'.$dnGroup; - if($this->access->connection->isCached($cacheKey)) { - return $this->access->connection->getFromCache($cacheKey); + $groupMembers = $this->access->connection->getFromCache($cacheKey); + if(!is_null($groupMembers)) { + return $groupMembers; } $seen[$dnGroup] = 1; $members = $this->access->readAttribute($dnGroup, $this->access->connection->ldapGroupMemberAssocAttr, @@ -267,11 +269,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { */ public function primaryGroupID2Name($gid, $dn) { $cacheKey = 'primaryGroupIDtoName'; - if($this->access->connection->isCached($cacheKey)) { - $groupNames = $this->access->connection->getFromCache($cacheKey); - if(isset($groupNames[$gid])) { - return $groupNames[$gid]; - } + $groupNames = $this->access->connection->getFromCache($cacheKey); + if(!is_null($groupNames) && isset($groupNames[$gid])) { + return $groupNames[$gid]; } $domainObjectSid = $this->access->getSID($dn); @@ -440,8 +440,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { return array(); } $cacheKey = 'getUserGroups'.$uid; - if($this->access->connection->isCached($cacheKey)) { - return $this->access->connection->getFromCache($cacheKey); + $userGroups = $this->access->connection->getFromCache($cacheKey); + if(!is_null($userGroups)) { + return $userGroups; } $userDN = $this->access->username2dn($uid); if(!$userDN) { @@ -861,8 +862,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { * @return bool */ public function groupExists($gid) { - if($this->access->connection->isCached('groupExists'.$gid)) { - return $this->access->connection->getFromCache('groupExists'.$gid); + $groupExists = $this->access->connection->getFromCache('groupExists'.$gid); + if(!is_null($groupExists)) { + return (bool)$groupExists; } //getting dn, if false the group does not exist. If dn, it may be mapped diff --git a/apps/user_ldap/js/wizard/view.js b/apps/user_ldap/js/wizard/view.js index 39133554121..9c7e2132dc6 100644 --- a/apps/user_ldap/js/wizard/view.js +++ b/apps/user_ldap/js/wizard/view.js @@ -24,6 +24,8 @@ OCA = OCA || {}; STATUS_INCOMPLETE: 1, /** @constant {number} */ STATUS_SUCCESS: 2, + /** @constant {number} */ + STATUS_UNTESTED: 3, /** * initializes the instance. Always call it after creating the instance. @@ -210,6 +212,7 @@ OCA = OCA || {}; * @listens ConfigModel#configLoaded */ onConfigLoaded: function(view) { + view._updateStatusIndicator(view.STATUS_UNTESTED); view.basicStatusCheck(view); view.functionalityCheck(); }, @@ -370,6 +373,14 @@ OCA = OCA || {}; var $indicatorLight = $('.ldap_config_state_indicator_sign'); switch(state) { + case this.STATUS_UNTESTED: + $indicator.text(t('user_ldap', + 'Testing configuration…' + )); + $indicator.addClass('ldap_grey'); + $indicatorLight.removeClass('error'); + $indicatorLight.removeClass('success'); + break; case this.STATUS_ERROR: $indicator.text(t('user_ldap', 'Configuration incorrect' diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 135eca1e625..f92ded64797 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -364,8 +364,9 @@ class Access extends LDAPUtility implements user\IUserTools { $validGroupDNs = []; foreach($groupDNs as $dn) { $cacheKey = 'groupsMatchFilter-'.$dn; - if($this->connection->isCached($cacheKey)) { - if($this->connection->getFromCache($cacheKey)) { + $groupMatchFilter = $this->connection->getFromCache($cacheKey); + if(!is_null($groupMatchFilter)) { + if($groupMatchFilter) { $validGroupDNs[] = $dn; } continue; @@ -1295,9 +1296,7 @@ class Access extends LDAPUtility implements user\IUserTools { if(!$testConnection->setConfiguration($credentials)) { return false; } - $result=$testConnection->bind(); - $this->ldap->unbind($this->connection->getConnectionResource()); - return $result; + return $testConnection->bind(); } /** @@ -1505,8 +1504,9 @@ class Access extends LDAPUtility implements user\IUserTools { public function getSID($dn) { $domainDN = $this->getDomainDNFromDN($dn); $cacheKey = 'getSID-'.$domainDN; - if($this->connection->isCached($cacheKey)) { - return $this->connection->getFromCache($cacheKey); + $sid = $this->connection->getFromCache($cacheKey); + if(!is_null($sid)) { + return $sid; } $objectSid = $this->readAttribute($domainDN, 'objectsid'); diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 53c9b3790a7..93e7e4bf974 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -49,9 +49,6 @@ class Connection extends LDAPUtility { private $configPrefix; private $configID; private $configured = false; - - //whether connection should be kept on __destruct - private $dontDestruct = false; private $hasPagedResultSupport = true; /** @@ -94,8 +91,7 @@ class Connection extends LDAPUtility { } public function __destruct() { - if(!$this->dontDestruct && - $this->ldap->isResource($this->ldapConnectionRes)) { + if($this->ldap->isResource($this->ldapConnectionRes)) { @$this->ldap->unbind($this->ldapConnectionRes); }; } @@ -104,11 +100,9 @@ class Connection extends LDAPUtility { * defines behaviour when the instance is cloned */ public function __clone() { - //a cloned instance inherits the connection resource. It may use it, - //but it may not disconnect it - $this->dontDestruct = true; $this->configuration = new Configuration($this->configPrefix, !is_null($this->configID)); + $this->ldapConnectionRes = null; } /** @@ -213,10 +207,6 @@ class Connection extends LDAPUtility { if(is_null($this->cache) || !$this->configuration->ldapCacheTTL) { return null; } - if(!$this->isCached($key)) { - return null; - - } $key = $this->getCacheKey($key); return json_decode(base64_decode($this->cache->get($key)), true); @@ -224,21 +214,6 @@ class Connection extends LDAPUtility { /** * @param string $key - * @return bool - */ - public function isCached($key) { - if(!$this->configured) { - $this->readConfiguration(); - } - if(is_null($this->cache) || !$this->configuration->ldapCacheTTL) { - return false; - } - $key = $this->getCacheKey($key); - return $this->cache->hasKey($key); - } - - /** - * @param string $key * @param mixed $value * * @return string diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php index 23aba0e0d85..4da8ae5f098 100644 --- a/apps/user_ldap/lib/user/user.php +++ b/apps/user_ldap/lib/user/user.php @@ -297,8 +297,9 @@ class User { public function getMemberOfGroups() { $cacheKey = 'getMemberOf'.$this->getUsername(); - if($this->connection->isCached($cacheKey)) { - return $this->connection->getFromCache($cacheKey); + $memberOfGroups = $this->connection->getFromCache($cacheKey); + if(!is_null($memberOfGroups)) { + return $memberOfGroups; } $groupDNs = $this->access->readAttribute($this->getDN(), 'memberOf'); $this->connection->writeToCache($cacheKey, $groupDNs); diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php index 667a1c3acb2..51bb1d84732 100644 --- a/apps/user_ldap/tests/group_ldap.php +++ b/apps/user_ldap/tests/group_ldap.php @@ -294,10 +294,6 @@ class Test_Group_Ldap extends \Test\TestCase { $uid = 'someUser'; $gid = 'someGroup'; $cacheKey = 'inGroup'.$uid.':'.$gid; - $access->connection->expects($this->once()) - ->method('isCached') - ->with($cacheKey) - ->will($this->returnValue(true)); $access->connection->expects($this->once()) ->method('getFromCache') diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 26d3429818f..224cf5c9a35 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -250,8 +250,9 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn * @throws \Exception when connection could not be established */ public function userExists($uid) { - if($this->access->connection->isCached('userExists'.$uid)) { - return $this->access->connection->getFromCache('userExists'.$uid); + $userExists = $this->access->connection->getFromCache('userExists'.$uid); + if(!is_null($userExists)) { + return (bool)$userExists; } //getting dn, if false the user does not exist. If dn, he may be mapped only, requires more checking. $user = $this->access->userManager->get($uid); @@ -321,8 +322,9 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn } $cacheKey = 'getHome'.$uid; - if($this->access->connection->isCached($cacheKey)) { - return $this->access->connection->getFromCache($cacheKey); + $path = $this->access->connection->getFromCache($cacheKey); + if(!is_null($path)) { + return $path; } $user = $this->access->userManager->get($uid); diff --git a/core/l10n/de.js b/core/l10n/de.js index 66a9ae4fbb8..e3936c3a03a 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -98,6 +98,7 @@ OC.L10N.register( "Dec." : "Dez.", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme mit dem Code - Integritätsprüfung. Mehr Informationen…</a>", "Settings" : "Einstellungen", + "Problem loading page, reloading in 5 seconds" : "Problem beim Laden der Seite, Seite wird in 5 Sekunden nochmals geladen", "Saving..." : "Speichern…", "Dismiss" : "Ausblenden", "seconds ago" : "Gerade eben", diff --git a/core/l10n/de.json b/core/l10n/de.json index 9864da63f6d..4e4cc5e682f 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -96,6 +96,7 @@ "Dec." : "Dez.", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme mit dem Code - Integritätsprüfung. Mehr Informationen…</a>", "Settings" : "Einstellungen", + "Problem loading page, reloading in 5 seconds" : "Problem beim Laden der Seite, Seite wird in 5 Sekunden nochmals geladen", "Saving..." : "Speichern…", "Dismiss" : "Ausblenden", "seconds ago" : "Gerade eben", diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index 1bb4aebe1a4..e7d7d13b8b7 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -98,6 +98,7 @@ OC.L10N.register( "Dec." : "Dez.", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme bei der Code Integritätsprüfung. Mehr Information...</a>", "Settings" : "Einstellungen", + "Problem loading page, reloading in 5 seconds" : "Problem beim Laden der Seite, Seite wird in 5 Sekunden nochmals geladen", "Saving..." : "Speichervorgang…", "Dismiss" : "Ausblenden", "seconds ago" : "Gerade eben", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index 7f3f6e675f0..180fab7a2f8 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -96,6 +96,7 @@ "Dec." : "Dez.", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Es gab Probleme bei der Code Integritätsprüfung. Mehr Information...</a>", "Settings" : "Einstellungen", + "Problem loading page, reloading in 5 seconds" : "Problem beim Laden der Seite, Seite wird in 5 Sekunden nochmals geladen", "Saving..." : "Speichervorgang…", "Dismiss" : "Ausblenden", "seconds ago" : "Gerade eben", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index cc2d853e5a3..4287ee9b315 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -160,6 +160,7 @@ OC.L10N.register( "Send" : "Envoyer", "Sending ..." : "Envoi…", "Email sent" : "Courriel envoyé", + "Send link via email" : "Envoyer le lien par mail", "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}", "Shared with you by {owner}" : "Partagé avec vous par {owner}", "group" : "groupe", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index c37fca44e35..d3f38dac997 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -158,6 +158,7 @@ "Send" : "Envoyer", "Sending ..." : "Envoi…", "Email sent" : "Courriel envoyé", + "Send link via email" : "Envoyer le lien par mail", "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}", "Shared with you by {owner}" : "Partagé avec vous par {owner}", "group" : "groupe", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index ae2d8289b32..9a9c4ca46c1 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -98,6 +98,7 @@ OC.L10N.register( "Dec." : "Dez.", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Houve problemas com a verificação de integridade do código. Mais informações…</a>", "Settings" : "Configurações", + "Problem loading page, reloading in 5 seconds" : "Problema no carregamento da página, recarregando em 5 segundos", "Saving..." : "Salvando...", "Dismiss" : "Dispensar", "seconds ago" : "segundos atrás", diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index 0e0da450e9b..6fbceabc2e5 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -96,6 +96,7 @@ "Dec." : "Dez.", "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Houve problemas com a verificação de integridade do código. Mais informações…</a>", "Settings" : "Configurações", + "Problem loading page, reloading in 5 seconds" : "Problema no carregamento da página, recarregando em 5 segundos", "Saving..." : "Salvando...", "Dismiss" : "Dispensar", "seconds ago" : "segundos atrás", diff --git a/core/l10n/sl.js b/core/l10n/sl.js index b1d255040c2..247cd8baa58 100644 --- a/core/l10n/sl.js +++ b/core/l10n/sl.js @@ -27,7 +27,7 @@ OC.L10N.register( "Error unfavoriting" : "Napaka odstranjevanja oznake priljubljenosti", "Couldn't send mail to following users: %s " : "Ni mogoče poslati sporočila za: %s", "Preparing update" : "Pripravljanje posodobitve", - "Please use the command line updater because automatic updating is disabled in the config.php." : "Za posodobitev uporabite ukazno vrstico, saj je samodejna posodobitev v config.php onemogočena.", + "Please use the command line updater because automatic updating is disabled in the config.php." : "Posodobitev sistema je treba izvesti prek ukazne vrstice, ker je nastavitev samodejne posodobitve v config.php onemogočena.", "[%d / %d]: %s" : "[%d / %d]: %s", "[%d / %d]: Checking table %s" : "[%d / %d]: Poteka preverjanje razpredelnice %s", "Turned on maintenance mode" : "Vzdrževalni način je omogočen", @@ -96,8 +96,9 @@ OC.L10N.register( "Oct." : "okt", "Nov." : "nov", "Dec." : "dec", - "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Pri preverjanju celovitosti podatkov kode je prišlo do težav. Več informacij…</a>", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Med preverjanjem celovitosti kode je prišlo do napak. Več podrobnosti …</a>", "Settings" : "Nastavitve", + "Problem loading page, reloading in 5 seconds" : "Napaka nalaganja strani! Poskus ponovnega nalaganja bo izveden čez 5 sekund.", "Saving..." : "Poteka shranjevanje ...", "Dismiss" : "Opusti", "seconds ago" : "pred nekaj sekundami", @@ -129,10 +130,10 @@ OC.L10N.register( "Good password" : "Dobro geslo", "Strong password" : "Odlično geslo", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je vmesnik WebDAV videti okvarjen.", - "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Vaš spletni strežnik nima ustreznih nastavitev za preslikavo \"url\". Več informacij boste našlji v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji</a>.", - "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Ta strežnik nima delujoče internetne povezave. To pomeni, da nekatere možnosti, kot so priklapljanje zunanjih diskov, opozorila za posodobitve ali namestitev programske opreme iz drugih virov, ne bodo mogoče. Za uporabo vseh možnosti v oblaku OwnCloud je potrebna delujoča internetna povezava.", - "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "PHP nima pravic za branje za datoteko /dev/urandom, kar je iz varnostnih razlogov nepriporočljivo. Dodatne informacije boste našli v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji<-a>", - "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Trenutno uporabljate PHP {version}. Svetujemo vam, da PHP posodobite, saj boste tako lahko koristili <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">varnostne in posodobitve delovanja, ki jih zagotavlja skupina PHP</a> in to takoj, ko bodo v vaši distribuciji na voljo.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Spletni strežnik ni ustrezno nastavljen za razreševanje \"{url}\". Več pdorobnosti je zapisanih v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji</a>.", + "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Strežnik je brez vzpostavljene internetne povezave. To pomeni, da priklapljanje zunanjih diskov, opozorila za posodobitve in namestitve programske opreme iz drugih virov, niso mogoče. Za popolno delovanje OwnCloud je nujna delujoča internetna povezava.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Iz varnostnih razlogov je priporočljivo nastaviti dovoljenja ukaza /dev/urandom za branje prek PHP. Več podrobnosti je zavedenih v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji<-a>", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Trenutno je zagnana različica PHP {version}. Priporočljivo je posodobiti sistem na najnovejšo različico in s tem namestiti <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">funkcijske in varnostne posodobitve delovanja, ki jih zagotavlja skupnost PHP</a>. Pakete je priporočljivo posodobiti takoj, ko so na voljo za nameščeno distribucijo.", "Error occurred while checking server setup" : "Prišlo je do napake med preverjanjem nastavitev strežnika", "Shared" : "V souporabi", "Shared with {recipients}" : "V souporabi z {recipients}", @@ -155,7 +156,7 @@ OC.L10N.register( "Send" : "Pošlji", "Sending ..." : "Pošiljanje ...", "Email sent" : "Elektronska pošta je poslana", - "Send link via email" : "Pošlji sporočilo po elektronski pošti", + "Send link via email" : "Pošlji povezavo prek elektronske pošte", "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.", "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.", "group" : "skupina", @@ -171,17 +172,17 @@ OC.L10N.register( "Could not unshare" : "Ni mogoče prekiniti souporabe", "Share details could not be loaded for this item." : "Podrobnosti souporabe za te predmet ni mogoče naložiti.", "No users or groups found for {search}" : "Ni najdenih uporabnikov ali skupin za {search}", - "No users found for {search}" : "Noben uporabnik ne ustreza iskanju {search}", - "An error occurred. Please try again" : "Prišlo je do napako. Poskusite znova.", + "No users found for {search}" : "Ni uporabnikov, skladnih z iskalnim nizom {search}", + "An error occurred. Please try again" : "Prišlo je do napake. Poskusite znova.", "{sharee} (group)" : "{sharee} (skupina)", "{sharee} (at {server})" : "{sharee} (na {server})", "{sharee} (remote)" : "{sharee} (oddaljeno)", "Share" : "Souporaba", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Souporaba z uporabniki, ki so na drugih oblakih ownCloud s povezavo uporabnik@domena.si/owncloud", "Share with users…" : "Omogoči souporabo z ...", - "Share with users, groups or remote users…" : "Souporaba z uporabniki, skupinami ali zunanjimi uporabniki...", - "Share with users or groups…" : "Souporaba z uporabniki ali skupinami...", - "Share with users or remote users…" : "Souporaba z uporabniki ali zunanjimi uporabniki...", + "Share with users, groups or remote users…" : "Souporaba z uporabniki, skupinami ali zunanjimi uporabniki ...", + "Share with users or groups…" : "Souporaba z uporabniki ali skupinami ...", + "Share with users or remote users…" : "Souporaba z uporabniki ali oddaljenimi uporabniki ...", "Error removing share" : "Napaka odstranjevanja souporabe", "Warning" : "Opozorilo", "Error while sending notification" : "Napaka med pošiljanjem obvestila", @@ -205,9 +206,10 @@ OC.L10N.register( "new" : "novo", "_download %n file_::_download %n files_" : ["prejmi %n datoteko","prejmi %n datoteki","prejmi %n datoteke","prejmi %n datotek"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Trenutno se izvaja posodobitev sistema. Priporočljivo je počakati, saj se lahko opravilo, če stran zapustite, prekine.", - "Updating to {version}" : "Posodabljanje na {version}", + "Updating to {version}" : "Posodabljanje na različico {version}", "An error occurred." : "Prišlo je do napake.", "Please reload the page." : "Stran je treba ponovno naložiti", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Posodobitev je spodletela. Za več podrobnosti o napaki je <a href=\"{url}\">objavljenih na forumu</a>.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." : "Posodobitev je spodletela uspela. Pošljite poročilo o napaki razvijalcem sistema <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.", "The update was successful. There were warnings." : "Posodobitev je uspešno končana, vendar z nekaj opozorili.", "The update was successful. Redirecting you to ownCloud now." : "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.", @@ -241,6 +243,7 @@ OC.L10N.register( "Trace" : "Sledenje povezav", "Security warning" : "Varnostno opozorilo", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "Za več podrobnosti o pravilnem nastavljanju strežnika si oglejte <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dokumentacijo</a>.", "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>", "Username" : "Uporabniško ime", "Storage & database" : "Shramba in podatkovna zbirka", @@ -256,12 +259,14 @@ OC.L10N.register( "Database host" : "Gostitelj podatkovne zbirke", "Performance warning" : "Opozorilo učinkovitosti delovanja", "SQLite will be used as database." : "Kot podatkovna zbirka bo uporabljena zbirka SQLite", - "For larger installations we recommend to choose a different database backend." : "Za večje namestitve priporočamo, da uporabite drugo zbirko za podatke.", + "For larger installations we recommend to choose a different database backend." : "Za večje namestitve je priporočljivo uporabiti drugo ozadnji program zbirke podatkov.", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Uporaba SQLite ni priporočljiva iz varnostnih razlogov, še posebej če se sistem krajevno usklajuje z namizjem prek odjemalca.", "Finish setup" : "Končaj nastavitev", "Finishing …" : "Poteka zaključevanje opravila ...", "Need help?" : "Ali potrebujete pomoč?", "See the documentation" : "Preverite dokumentacijo", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>", + "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Program zahteva podporo JavaScript za pravilno delovanje. Med nastavitvami omogočite {linkstart}JavaScript{linkend} in osvežite spletno stran.", "Log out" : "Odjava", "Search" : "Poišči", "Server side authentication failed!" : "Overitev s strežnika je spodletela!", @@ -292,9 +297,10 @@ OC.L10N.register( "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred nadaljevanjem se prepričajte se, da je ustvarjena varnostna kopija podatkovne zbirke, nastavitvenih datotek in podatkovne mape.", "Start update" : "Začni posodobitev", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Za razreševanje časovnih zahtev večjih namestitev lahko uporabite ukaz iz namestitvene mape:", - "Detailed logs" : "Podrobnosti", - "Update needed" : "Potrebna je posodobitev", - "Please use the command line updater because you have a big instance." : "Posodobitev opravite preko ukazne vrstice, saj imate večji sistem.", + "Detailed logs" : "Podrobni dnevniški zapisi", + "Update needed" : "Zahtevana je posodobitev", + "Please use the command line updater because you have a big instance." : "Posodobitev večjih namestitev je priporočljivo izvesti prek ukazne vrstice.", + "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Za več podrobnosti si oglejte <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentacijo</a>.", "This %s instance is currently in maintenance mode, which may take a while." : "Strežnik %s je trenutno v načinu vzdrževanja, kar lahko traja.", "This page will refresh itself when the %s instance is available again." : "Stran bo osvežena ko bo %s spet na voljo." }, diff --git a/core/l10n/sl.json b/core/l10n/sl.json index ee46058cf4a..cf116d353f3 100644 --- a/core/l10n/sl.json +++ b/core/l10n/sl.json @@ -25,7 +25,7 @@ "Error unfavoriting" : "Napaka odstranjevanja oznake priljubljenosti", "Couldn't send mail to following users: %s " : "Ni mogoče poslati sporočila za: %s", "Preparing update" : "Pripravljanje posodobitve", - "Please use the command line updater because automatic updating is disabled in the config.php." : "Za posodobitev uporabite ukazno vrstico, saj je samodejna posodobitev v config.php onemogočena.", + "Please use the command line updater because automatic updating is disabled in the config.php." : "Posodobitev sistema je treba izvesti prek ukazne vrstice, ker je nastavitev samodejne posodobitve v config.php onemogočena.", "[%d / %d]: %s" : "[%d / %d]: %s", "[%d / %d]: Checking table %s" : "[%d / %d]: Poteka preverjanje razpredelnice %s", "Turned on maintenance mode" : "Vzdrževalni način je omogočen", @@ -94,8 +94,9 @@ "Oct." : "okt", "Nov." : "nov", "Dec." : "dec", - "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Pri preverjanju celovitosti podatkov kode je prišlo do težav. Več informacij…</a>", + "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Med preverjanjem celovitosti kode je prišlo do napak. Več podrobnosti …</a>", "Settings" : "Nastavitve", + "Problem loading page, reloading in 5 seconds" : "Napaka nalaganja strani! Poskus ponovnega nalaganja bo izveden čez 5 sekund.", "Saving..." : "Poteka shranjevanje ...", "Dismiss" : "Opusti", "seconds ago" : "pred nekaj sekundami", @@ -127,10 +128,10 @@ "Good password" : "Dobro geslo", "Strong password" : "Odlično geslo", "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je vmesnik WebDAV videti okvarjen.", - "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Vaš spletni strežnik nima ustreznih nastavitev za preslikavo \"url\". Več informacij boste našlji v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji</a>.", - "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Ta strežnik nima delujoče internetne povezave. To pomeni, da nekatere možnosti, kot so priklapljanje zunanjih diskov, opozorila za posodobitve ali namestitev programske opreme iz drugih virov, ne bodo mogoče. Za uporabo vseh možnosti v oblaku OwnCloud je potrebna delujoča internetna povezava.", - "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "PHP nima pravic za branje za datoteko /dev/urandom, kar je iz varnostnih razlogov nepriporočljivo. Dodatne informacije boste našli v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji<-a>", - "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Trenutno uporabljate PHP {version}. Svetujemo vam, da PHP posodobite, saj boste tako lahko koristili <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">varnostne in posodobitve delovanja, ki jih zagotavlja skupina PHP</a> in to takoj, ko bodo v vaši distribuciji na voljo.", + "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Spletni strežnik ni ustrezno nastavljen za razreševanje \"{url}\". Več pdorobnosti je zapisanih v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji</a>.", + "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Strežnik je brez vzpostavljene internetne povezave. To pomeni, da priklapljanje zunanjih diskov, opozorila za posodobitve in namestitve programske opreme iz drugih virov, niso mogoče. Za popolno delovanje OwnCloud je nujna delujoča internetna povezava.", + "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Iz varnostnih razlogov je priporočljivo nastaviti dovoljenja ukaza /dev/urandom za branje prek PHP. Več podrobnosti je zavedenih v <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaciji<-a>", + "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Trenutno je zagnana različica PHP {version}. Priporočljivo je posodobiti sistem na najnovejšo različico in s tem namestiti <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">funkcijske in varnostne posodobitve delovanja, ki jih zagotavlja skupnost PHP</a>. Pakete je priporočljivo posodobiti takoj, ko so na voljo za nameščeno distribucijo.", "Error occurred while checking server setup" : "Prišlo je do napake med preverjanjem nastavitev strežnika", "Shared" : "V souporabi", "Shared with {recipients}" : "V souporabi z {recipients}", @@ -153,7 +154,7 @@ "Send" : "Pošlji", "Sending ..." : "Pošiljanje ...", "Email sent" : "Elektronska pošta je poslana", - "Send link via email" : "Pošlji sporočilo po elektronski pošti", + "Send link via email" : "Pošlji povezavo prek elektronske pošte", "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.", "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.", "group" : "skupina", @@ -169,17 +170,17 @@ "Could not unshare" : "Ni mogoče prekiniti souporabe", "Share details could not be loaded for this item." : "Podrobnosti souporabe za te predmet ni mogoče naložiti.", "No users or groups found for {search}" : "Ni najdenih uporabnikov ali skupin za {search}", - "No users found for {search}" : "Noben uporabnik ne ustreza iskanju {search}", - "An error occurred. Please try again" : "Prišlo je do napako. Poskusite znova.", + "No users found for {search}" : "Ni uporabnikov, skladnih z iskalnim nizom {search}", + "An error occurred. Please try again" : "Prišlo je do napake. Poskusite znova.", "{sharee} (group)" : "{sharee} (skupina)", "{sharee} (at {server})" : "{sharee} (na {server})", "{sharee} (remote)" : "{sharee} (oddaljeno)", "Share" : "Souporaba", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Souporaba z uporabniki, ki so na drugih oblakih ownCloud s povezavo uporabnik@domena.si/owncloud", "Share with users…" : "Omogoči souporabo z ...", - "Share with users, groups or remote users…" : "Souporaba z uporabniki, skupinami ali zunanjimi uporabniki...", - "Share with users or groups…" : "Souporaba z uporabniki ali skupinami...", - "Share with users or remote users…" : "Souporaba z uporabniki ali zunanjimi uporabniki...", + "Share with users, groups or remote users…" : "Souporaba z uporabniki, skupinami ali zunanjimi uporabniki ...", + "Share with users or groups…" : "Souporaba z uporabniki ali skupinami ...", + "Share with users or remote users…" : "Souporaba z uporabniki ali oddaljenimi uporabniki ...", "Error removing share" : "Napaka odstranjevanja souporabe", "Warning" : "Opozorilo", "Error while sending notification" : "Napaka med pošiljanjem obvestila", @@ -203,9 +204,10 @@ "new" : "novo", "_download %n file_::_download %n files_" : ["prejmi %n datoteko","prejmi %n datoteki","prejmi %n datoteke","prejmi %n datotek"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Trenutno se izvaja posodobitev sistema. Priporočljivo je počakati, saj se lahko opravilo, če stran zapustite, prekine.", - "Updating to {version}" : "Posodabljanje na {version}", + "Updating to {version}" : "Posodabljanje na različico {version}", "An error occurred." : "Prišlo je do napake.", "Please reload the page." : "Stran je treba ponovno naložiti", + "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Posodobitev je spodletela. Za več podrobnosti o napaki je <a href=\"{url}\">objavljenih na forumu</a>.", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." : "Posodobitev je spodletela uspela. Pošljite poročilo o napaki razvijalcem sistema <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.", "The update was successful. There were warnings." : "Posodobitev je uspešno končana, vendar z nekaj opozorili.", "The update was successful. Redirecting you to ownCloud now." : "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.", @@ -239,6 +241,7 @@ "Trace" : "Sledenje povezav", "Security warning" : "Varnostno opozorilo", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.", + "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "Za več podrobnosti o pravilnem nastavljanju strežnika si oglejte <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dokumentacijo</a>.", "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>", "Username" : "Uporabniško ime", "Storage & database" : "Shramba in podatkovna zbirka", @@ -254,12 +257,14 @@ "Database host" : "Gostitelj podatkovne zbirke", "Performance warning" : "Opozorilo učinkovitosti delovanja", "SQLite will be used as database." : "Kot podatkovna zbirka bo uporabljena zbirka SQLite", - "For larger installations we recommend to choose a different database backend." : "Za večje namestitve priporočamo, da uporabite drugo zbirko za podatke.", + "For larger installations we recommend to choose a different database backend." : "Za večje namestitve je priporočljivo uporabiti drugo ozadnji program zbirke podatkov.", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Uporaba SQLite ni priporočljiva iz varnostnih razlogov, še posebej če se sistem krajevno usklajuje z namizjem prek odjemalca.", "Finish setup" : "Končaj nastavitev", "Finishing …" : "Poteka zaključevanje opravila ...", "Need help?" : "Ali potrebujete pomoč?", "See the documentation" : "Preverite dokumentacijo", "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>", + "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Program zahteva podporo JavaScript za pravilno delovanje. Med nastavitvami omogočite {linkstart}JavaScript{linkend} in osvežite spletno stran.", "Log out" : "Odjava", "Search" : "Poišči", "Server side authentication failed!" : "Overitev s strežnika je spodletela!", @@ -290,9 +295,10 @@ "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred nadaljevanjem se prepričajte se, da je ustvarjena varnostna kopija podatkovne zbirke, nastavitvenih datotek in podatkovne mape.", "Start update" : "Začni posodobitev", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Za razreševanje časovnih zahtev večjih namestitev lahko uporabite ukaz iz namestitvene mape:", - "Detailed logs" : "Podrobnosti", - "Update needed" : "Potrebna je posodobitev", - "Please use the command line updater because you have a big instance." : "Posodobitev opravite preko ukazne vrstice, saj imate večji sistem.", + "Detailed logs" : "Podrobni dnevniški zapisi", + "Update needed" : "Zahtevana je posodobitev", + "Please use the command line updater because you have a big instance." : "Posodobitev večjih namestitev je priporočljivo izvesti prek ukazne vrstice.", + "For help, see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Za več podrobnosti si oglejte <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentacijo</a>.", "This %s instance is currently in maintenance mode, which may take a while." : "Strežnik %s je trenutno v načinu vzdrževanja, kar lahko traja.", "This page will refresh itself when the %s instance is available again." : "Stran bo osvežena ko bo %s spet na voljo." },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js index abbf8796ea0..a570642b4c9 100644 --- a/core/l10n/th_TH.js +++ b/core/l10n/th_TH.js @@ -159,7 +159,7 @@ OC.L10N.register( "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}", "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}", "group" : "กลุ่มผู้ใช้งาน", - "remote" : "ระยะไกล", + "remote" : "รีโมท", "notify by email" : "แจ้งเตือนทางอีเมล", "Unshare" : "ยกเลิกการแชร์", "can share" : "สามารถแชร์ได้", @@ -170,8 +170,11 @@ OC.L10N.register( "access control" : "ควบคุมการเข้าถึง", "Could not unshare" : "ไม่สามารถยกเลิกการแชร์ได้", "Share details could not be loaded for this item." : "รายละเอียดการแชร์ไม่สามารถโหลดสำหรับรายการนี้", + "{sharee} (remote)" : "{sharee} (รีโมท)", "Share" : "แชร์", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ", + "Share with users, groups or remote users…" : "แชร์กับผู้ใช้หรือกลุ่มหรือผู้ใช้โดยการรีโมท ...", + "Share with users or remote users…" : "แชร์กับผู้ใช้หรือผู้ใช้โดยการรีโมท ...", "Error removing share" : "พบข้อผิดพลาดในรายการที่แชร์ออก", "Warning" : "คำเตือน", "Error while sending notification" : "เกิดข้อผิดพลาดขณะกำลังส่งการแจ้งเตือน", @@ -220,7 +223,7 @@ OC.L10N.register( "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "กรุณาติดต่อผู้ดูแลเซิร์ฟเวอร์ถ้าพบข้อผิดพลาดนี้หลายครั้ง กรุณาระบุรายละเอียดทางเทคนิคที่ด้านล่างในรายงานของคุณ", "More details can be found in the server log." : "รายละเอียดเพิ่มเติมสามารถดูได้ที่บันทึกของระบบเซิร์ฟเวอร์", "Technical details" : "รายละเอียดทางเทคนิค", - "Remote Address: %s" : "ที่อยู่รีโมทระยะไกล: %s", + "Remote Address: %s" : "ที่อยู่รีโมท: %s", "Request ID: %s" : "คำขอ ID: %s", "Type: %s" : "ชนิด: %s", "Code: %s" : "โค้ด: %s", diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json index ea62edf0b46..7fafea0e35f 100644 --- a/core/l10n/th_TH.json +++ b/core/l10n/th_TH.json @@ -157,7 +157,7 @@ "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}", "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}", "group" : "กลุ่มผู้ใช้งาน", - "remote" : "ระยะไกล", + "remote" : "รีโมท", "notify by email" : "แจ้งเตือนทางอีเมล", "Unshare" : "ยกเลิกการแชร์", "can share" : "สามารถแชร์ได้", @@ -168,8 +168,11 @@ "access control" : "ควบคุมการเข้าถึง", "Could not unshare" : "ไม่สามารถยกเลิกการแชร์ได้", "Share details could not be loaded for this item." : "รายละเอียดการแชร์ไม่สามารถโหลดสำหรับรายการนี้", + "{sharee} (remote)" : "{sharee} (รีโมท)", "Share" : "แชร์", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ", + "Share with users, groups or remote users…" : "แชร์กับผู้ใช้หรือกลุ่มหรือผู้ใช้โดยการรีโมท ...", + "Share with users or remote users…" : "แชร์กับผู้ใช้หรือผู้ใช้โดยการรีโมท ...", "Error removing share" : "พบข้อผิดพลาดในรายการที่แชร์ออก", "Warning" : "คำเตือน", "Error while sending notification" : "เกิดข้อผิดพลาดขณะกำลังส่งการแจ้งเตือน", @@ -218,7 +221,7 @@ "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "กรุณาติดต่อผู้ดูแลเซิร์ฟเวอร์ถ้าพบข้อผิดพลาดนี้หลายครั้ง กรุณาระบุรายละเอียดทางเทคนิคที่ด้านล่างในรายงานของคุณ", "More details can be found in the server log." : "รายละเอียดเพิ่มเติมสามารถดูได้ที่บันทึกของระบบเซิร์ฟเวอร์", "Technical details" : "รายละเอียดทางเทคนิค", - "Remote Address: %s" : "ที่อยู่รีโมทระยะไกล: %s", + "Remote Address: %s" : "ที่อยู่รีโมท: %s", "Request ID: %s" : "คำขอ ID: %s", "Type: %s" : "ชนิด: %s", "Code: %s" : "โค้ด: %s", diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index f74fe4aeb99..2951ee536d2 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -175,6 +175,10 @@ class DIContainer extends SimpleContainer implements IAppContainer { return $this->getServer()->getMimeTypeDetector(); }); + $this->registerService('OCP\\Mail\\IMailer', function() { + return $this->getServer()->getMailer(); + }); + $this->registerService('OCP\\INavigationManager', function($c) { return $this->getServer()->getNavigationManager(); }); diff --git a/lib/private/backgroundjob/job.php b/lib/private/BackgroundJob/Job.php index e7268894848..e7268894848 100644 --- a/lib/private/backgroundjob/job.php +++ b/lib/private/BackgroundJob/Job.php diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/BackgroundJob/JobList.php index 2429b830446..2429b830446 100644 --- a/lib/private/backgroundjob/joblist.php +++ b/lib/private/BackgroundJob/JobList.php diff --git a/lib/private/backgroundjob/legacy/queuedjob.php b/lib/private/BackgroundJob/Legacy/QueuedJob.php index 983c06fe551..983c06fe551 100644 --- a/lib/private/backgroundjob/legacy/queuedjob.php +++ b/lib/private/BackgroundJob/Legacy/QueuedJob.php diff --git a/lib/private/backgroundjob/legacy/regularjob.php b/lib/private/BackgroundJob/Legacy/RegularJob.php index aedd6ef657a..aedd6ef657a 100644 --- a/lib/private/backgroundjob/legacy/regularjob.php +++ b/lib/private/BackgroundJob/Legacy/RegularJob.php diff --git a/lib/private/backgroundjob/queuedjob.php b/lib/private/BackgroundJob/QueuedJob.php index bf34db7cc02..bf34db7cc02 100644 --- a/lib/private/backgroundjob/queuedjob.php +++ b/lib/private/BackgroundJob/QueuedJob.php diff --git a/lib/private/backgroundjob/timedjob.php b/lib/private/BackgroundJob/TimedJob.php index abf487a89e1..abf487a89e1 100644 --- a/lib/private/backgroundjob/timedjob.php +++ b/lib/private/BackgroundJob/TimedJob.php diff --git a/lib/private/DB/AdapterSqlite.php b/lib/private/DB/AdapterSqlite.php index d7769238abc..3466e0e1aac 100644 --- a/lib/private/DB/AdapterSqlite.php +++ b/lib/private/DB/AdapterSqlite.php @@ -32,6 +32,7 @@ class AdapterSqlite extends Adapter { $statement = preg_replace('/`(\w+)` ILIKE \?/', 'LOWER($1) LIKE LOWER(?)', $statement); $statement = str_replace( '`', '"', $statement ); $statement = str_ireplace( 'NOW()', 'datetime(\'now\')', $statement ); + $statement = str_ireplace('GREATEST(', 'MAX(', $statement); $statement = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement ); return $statement; } diff --git a/lib/private/files/cache/cache.php b/lib/private/Files/Cache/Cache.php index 53467c278d2..53467c278d2 100644 --- a/lib/private/files/cache/cache.php +++ b/lib/private/Files/Cache/Cache.php diff --git a/lib/private/files/cache/cacheentry.php b/lib/private/Files/Cache/CacheEntry.php index 6d3c5d5b089..6d3c5d5b089 100644 --- a/lib/private/files/cache/cacheentry.php +++ b/lib/private/Files/Cache/CacheEntry.php diff --git a/lib/private/files/cache/failedcache.php b/lib/private/Files/Cache/FailedCache.php index 0386ba3ca32..0386ba3ca32 100644 --- a/lib/private/files/cache/failedcache.php +++ b/lib/private/Files/Cache/FailedCache.php diff --git a/lib/private/files/cache/homecache.php b/lib/private/Files/Cache/HomeCache.php index ae92504ddd6..ae92504ddd6 100644 --- a/lib/private/files/cache/homecache.php +++ b/lib/private/Files/Cache/HomeCache.php diff --git a/lib/private/files/cache/homepropagator.php b/lib/private/Files/Cache/HomePropagator.php index 8edca9c0c87..db9e30ae0fc 100644 --- a/lib/private/files/cache/homepropagator.php +++ b/lib/private/Files/Cache/HomePropagator.php @@ -21,14 +21,16 @@ namespace OC\Files\Cache; +use OCP\IDBConnection; + class HomePropagator extends Propagator { private $ignoredBaseFolders; /** * @param \OC\Files\Storage\Storage $storage */ - public function __construct(\OC\Files\Storage\Storage $storage) { - parent::__construct($storage); + public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) { + parent::__construct($storage, $connection); $this->ignoredBaseFolders = ['files_encryption']; } @@ -37,14 +39,13 @@ class HomePropagator extends Propagator { * @param string $internalPath * @param int $time * @param int $sizeDifference number of bytes the file has grown - * @return array[] all propagated entries */ public function propagateChange($internalPath, $time, $sizeDifference = 0) { list($baseFolder) = explode('/', $internalPath, 2); if (in_array($baseFolder, $this->ignoredBaseFolders)) { return []; } else { - return parent::propagateChange($internalPath, $time, $sizeDifference); + parent::propagateChange($internalPath, $time, $sizeDifference); } } } diff --git a/lib/private/files/cache/movefromcachetrait.php b/lib/private/Files/Cache/MoveFromCacheTrait.php index 7d8ed7b5d21..7d8ed7b5d21 100644 --- a/lib/private/files/cache/movefromcachetrait.php +++ b/lib/private/Files/Cache/MoveFromCacheTrait.php diff --git a/lib/private/Files/Cache/Propagator.php b/lib/private/Files/Cache/Propagator.php new file mode 100644 index 00000000000..b998c6bcfae --- /dev/null +++ b/lib/private/Files/Cache/Propagator.php @@ -0,0 +1,101 @@ +<?php +/** + * @author Robin Appelman <icewind@owncloud.com> + * + * @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 OC\Files\Cache; + +use OCP\DB\QueryBuilder\IQueryBuilder; +use OCP\Files\Cache\IPropagator; +use OCP\IDBConnection; + +/** + * Propagate etags and mtimes within the storage + */ +class Propagator implements IPropagator { + /** + * @var \OC\Files\Storage\Storage + */ + protected $storage; + + /** + * @var IDBConnection + */ + private $connection; + + /** + * @param \OC\Files\Storage\Storage $storage + * @param IDBConnection $connection + */ + public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) { + $this->storage = $storage; + $this->connection = $connection; + } + + + /** + * @param string $internalPath + * @param int $time + * @param int $sizeDifference number of bytes the file has grown + */ + public function propagateChange($internalPath, $time, $sizeDifference = 0) { + $storageId = (int)$this->storage->getStorageCache()->getNumericId(); + + $parents = $this->getParents($internalPath); + + $parentHashes = array_map('md5', $parents); + $etag = uniqid(); // since we give all folders the same etag we don't ask the storage for the etag + + $builder = $this->connection->getQueryBuilder(); + $hashParams = array_map(function ($hash) use ($builder) { + return $builder->expr()->literal($hash); + }, $parentHashes); + + $builder->update('filecache') + ->set('mtime', $builder->createFunction('GREATEST(`mtime`, ' . $builder->createNamedParameter($time) . ')')) + ->set('etag', $builder->createNamedParameter($etag, IQueryBuilder::PARAM_STR)) + ->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT))) + ->andWhere($builder->expr()->in('path_hash', $hashParams)); + + $builder->execute(); + + if ($sizeDifference !== 0) { + // we need to do size separably so we can ignore entries with uncalculated size + $builder = $this->connection->getQueryBuilder(); + $builder->update('filecache') + ->set('size', $builder->createFunction('`size` + ' . $builder->createNamedParameter($sizeDifference))) + ->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT))) + ->andWhere($builder->expr()->in('path_hash', $hashParams)) + ->andWhere($builder->expr()->gt('size', $builder->expr()->literal(-1, IQueryBuilder::PARAM_INT))); + } + + $builder->execute(); + } + + protected function getParents($path) { + $parts = explode('/', $path); + $parent = ''; + $parents = []; + foreach ($parts as $part) { + $parents[] = $parent; + $parent = trim($parent . '/' . $part, '/'); + } + return $parents; + } +} diff --git a/lib/private/files/cache/scanner.php b/lib/private/Files/Cache/Scanner.php index 8730707f1c2..03aca1924b0 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/Files/Cache/Scanner.php @@ -296,6 +296,7 @@ class Scanner extends BasicEmitter implements IScanner { } if ($lock) { if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { + $this->storage->acquireLock('scanner::' . $path, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider); $this->storage->acquireLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider); } } @@ -307,6 +308,7 @@ class Scanner extends BasicEmitter implements IScanner { if ($lock) { if ($this->storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) { $this->storage->releaseLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider); + $this->storage->releaseLock('scanner::' . $path, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider); } } return $data; @@ -478,7 +480,7 @@ class Scanner extends BasicEmitter implements IScanner { try { $callback(); \OC_Hook::emit('Scanner', 'correctFolderSize', array('path' => $path)); - if ($this->cacheActive) { + if ($this->cacheActive && $this->cache instanceof Cache) { $this->cache->correctFolderSize($path); } } catch (\OCP\Files\StorageInvalidException $e) { diff --git a/lib/private/files/cache/storage.php b/lib/private/Files/Cache/Storage.php index 90c451ecc21..90c451ecc21 100644 --- a/lib/private/files/cache/storage.php +++ b/lib/private/Files/Cache/Storage.php diff --git a/lib/private/files/cache/updater.php b/lib/private/Files/Cache/Updater.php index 3f80f2b6167..9e4214ad72a 100644 --- a/lib/private/files/cache/updater.php +++ b/lib/private/Files/Cache/Updater.php @@ -126,7 +126,9 @@ class Updater implements IUpdater { } else { // scanner didn't provide size info, fallback to full size calculation $sizeDifference = 0; - $this->cache->correctFolderSize($path, $data); + if ($this->cache instanceof Cache) { + $this->cache->correctFolderSize($path, $data); + } } $this->correctParentStorageMtime($path); $this->propagator->propagateChange($path, $time, $sizeDifference); @@ -148,7 +150,9 @@ class Updater implements IUpdater { } $this->cache->remove($path); - $this->cache->correctFolderSize($parent); + if ($this->cache instanceof Cache) { + $this->cache->correctFolderSize($parent); + } $this->correctParentStorageMtime($path); $this->propagator->propagateChange($path, time()); } @@ -190,8 +194,12 @@ class Updater implements IUpdater { $this->cache->update($fileId, ['mimetype' => $mimeType]); } - $sourceCache->correctFolderSize($source); - $this->cache->correctFolderSize($target); + if ($sourceCache instanceof Cache) { + $sourceCache->correctFolderSize($source); + } + if ($this->cache instanceof Cache) { + $this->cache->correctFolderSize($target); + } if ($sourceUpdater instanceof Updater) { $sourceUpdater->correctParentStorageMtime($source); } diff --git a/lib/private/files/cache/watcher.php b/lib/private/Files/Cache/Watcher.php index a00e875a2d4..0cf6caf0c28 100644 --- a/lib/private/files/cache/watcher.php +++ b/lib/private/Files/Cache/Watcher.php @@ -106,7 +106,9 @@ class Watcher implements IWatcher { if ($cachedData['mimetype'] === 'httpd/unix-directory') { $this->cleanFolder($path); } - $this->cache->correctFolderSize($path); + if ($this->cache instanceof Cache) { + $this->cache->correctFolderSize($path); + } } /** diff --git a/lib/private/files/cache/wrapper/cachejail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php index 88b0f23a1fc..3148d1412f4 100644 --- a/lib/private/files/cache/wrapper/cachejail.php +++ b/lib/private/Files/Cache/Wrapper/CacheJail.php @@ -23,6 +23,7 @@ */ namespace OC\Files\Cache\Wrapper; +use OC\Files\Cache\Cache; /** * Jail to a subdirectory of the wrapped cache @@ -233,7 +234,9 @@ class CacheJail extends CacheWrapper { * @param array $data (optional) meta data of the folder */ public function correctFolderSize($path, $data = null) { - $this->cache->correctFolderSize($this->getSourcePath($path), $data); + if ($this->cache instanceof Cache) { + $this->cache->correctFolderSize($this->getSourcePath($path), $data); + } } /** @@ -244,7 +247,12 @@ class CacheJail extends CacheWrapper { * @return int */ public function calculateFolderSize($path, $entry = null) { - return $this->cache->calculateFolderSize($this->getSourcePath($path), $entry); + if ($this->cache instanceof Cache) { + return $this->cache->calculateFolderSize($this->getSourcePath($path), $entry); + } else { + return 0; + } + } /** diff --git a/lib/private/files/cache/wrapper/cachepermissionsmask.php b/lib/private/Files/Cache/Wrapper/CachePermissionsMask.php index b3a7bcb3a73..b3a7bcb3a73 100644 --- a/lib/private/files/cache/wrapper/cachepermissionsmask.php +++ b/lib/private/Files/Cache/Wrapper/CachePermissionsMask.php diff --git a/lib/private/files/cache/wrapper/cachewrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php index 8c77e3c340e..a6e6e61b8c7 100644 --- a/lib/private/files/cache/wrapper/cachewrapper.php +++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php @@ -240,7 +240,9 @@ class CacheWrapper extends Cache { * @param array $data (optional) meta data of the folder */ public function correctFolderSize($path, $data = null) { - $this->cache->correctFolderSize($path, $data); + if ($this->cache instanceof Cache) { + $this->cache->correctFolderSize($path, $data); + } } /** @@ -251,7 +253,11 @@ class CacheWrapper extends Cache { * @return int */ public function calculateFolderSize($path, $entry = null) { - return $this->cache->calculateFolderSize($path, $entry); + if ($this->cache instanceof Cache) { + return $this->cache->calculateFolderSize($path, $entry); + } else { + return 0; + } } /** diff --git a/lib/private/files/config/cachedmountinfo.php b/lib/private/Files/Config/CachedMountInfo.php index ce75cb66896..ce75cb66896 100644 --- a/lib/private/files/config/cachedmountinfo.php +++ b/lib/private/Files/Config/CachedMountInfo.php diff --git a/lib/private/files/config/lazystoragemountinfo.php b/lib/private/Files/Config/LazyStorageMountInfo.php index 654c5b2b23e..654c5b2b23e 100644 --- a/lib/private/files/config/lazystoragemountinfo.php +++ b/lib/private/Files/Config/LazyStorageMountInfo.php diff --git a/lib/private/files/config/mountprovidercollection.php b/lib/private/Files/Config/MountProviderCollection.php index 499fa576fbc..499fa576fbc 100644 --- a/lib/private/files/config/mountprovidercollection.php +++ b/lib/private/Files/Config/MountProviderCollection.php diff --git a/lib/private/files/config/usermountcache.php b/lib/private/Files/Config/UserMountCache.php index 05ca146f4be..05ca146f4be 100644 --- a/lib/private/files/config/usermountcache.php +++ b/lib/private/Files/Config/UserMountCache.php diff --git a/lib/private/files/config/usermountcachelistener.php b/lib/private/Files/Config/UserMountCacheListener.php index 99673cf6285..99673cf6285 100644 --- a/lib/private/files/config/usermountcachelistener.php +++ b/lib/private/Files/Config/UserMountCacheListener.php diff --git a/lib/private/files/fileinfo.php b/lib/private/Files/FileInfo.php index 5f32ad34bb3..5f32ad34bb3 100644 --- a/lib/private/files/fileinfo.php +++ b/lib/private/Files/FileInfo.php diff --git a/lib/private/files/filesystem.php b/lib/private/Files/Filesystem.php index 7283c815c97..7283c815c97 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/Files/Filesystem.php diff --git a/lib/private/files/mount/manager.php b/lib/private/Files/Mount/Manager.php index ba4a7f8d910..ba4a7f8d910 100644 --- a/lib/private/files/mount/manager.php +++ b/lib/private/Files/Mount/Manager.php diff --git a/lib/private/files/mount/mountpoint.php b/lib/private/Files/Mount/MountPoint.php index 7b9294fc1e0..7b9294fc1e0 100644 --- a/lib/private/files/mount/mountpoint.php +++ b/lib/private/Files/Mount/MountPoint.php diff --git a/lib/private/files/mount/moveablemount.php b/lib/private/Files/Mount/MoveableMount.php index 8a1bd7dd9c5..8a1bd7dd9c5 100644 --- a/lib/private/files/mount/moveablemount.php +++ b/lib/private/Files/Mount/MoveableMount.php diff --git a/lib/private/files/node/file.php b/lib/private/Files/Node/File.php index 9e0014abb0b..9e0014abb0b 100644 --- a/lib/private/files/node/file.php +++ b/lib/private/Files/Node/File.php diff --git a/lib/private/files/node/folder.php b/lib/private/Files/Node/Folder.php index f4d7dae20a3..f4d7dae20a3 100644 --- a/lib/private/files/node/folder.php +++ b/lib/private/Files/Node/Folder.php diff --git a/lib/private/files/node/hookconnector.php b/lib/private/Files/Node/HookConnector.php index 5c36ca3848e..5c36ca3848e 100644 --- a/lib/private/files/node/hookconnector.php +++ b/lib/private/Files/Node/HookConnector.php diff --git a/lib/private/files/node/lazyroot.php b/lib/private/Files/Node/LazyRoot.php index 9661f036579..9661f036579 100644 --- a/lib/private/files/node/lazyroot.php +++ b/lib/private/Files/Node/LazyRoot.php diff --git a/lib/private/files/node/node.php b/lib/private/Files/Node/Node.php index c4fabfc2e2e..c4fabfc2e2e 100644 --- a/lib/private/files/node/node.php +++ b/lib/private/Files/Node/Node.php diff --git a/lib/private/files/node/nonexistingfile.php b/lib/private/Files/Node/NonExistingFile.php index c1d09bcc491..c1d09bcc491 100644 --- a/lib/private/files/node/nonexistingfile.php +++ b/lib/private/Files/Node/NonExistingFile.php diff --git a/lib/private/files/node/nonexistingfolder.php b/lib/private/Files/Node/NonExistingFolder.php index 7d6576f1bd6..7d6576f1bd6 100644 --- a/lib/private/files/node/nonexistingfolder.php +++ b/lib/private/Files/Node/NonExistingFolder.php diff --git a/lib/private/files/node/root.php b/lib/private/Files/Node/Root.php index 04866e60b87..04866e60b87 100644 --- a/lib/private/files/node/root.php +++ b/lib/private/Files/Node/Root.php diff --git a/lib/private/files/objectstore/homeobjectstorestorage.php b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php index 6a330e2dab3..6a330e2dab3 100644 --- a/lib/private/files/objectstore/homeobjectstorestorage.php +++ b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php diff --git a/lib/private/files/objectstore/noopscanner.php b/lib/private/Files/ObjectStore/NoopScanner.php index f5316175ecf..f5316175ecf 100644 --- a/lib/private/files/objectstore/noopscanner.php +++ b/lib/private/Files/ObjectStore/NoopScanner.php diff --git a/lib/private/files/objectstore/objectstorestorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 8c643dbdcc7..8c643dbdcc7 100644 --- a/lib/private/files/objectstore/objectstorestorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php diff --git a/lib/private/files/objectstore/swift.php b/lib/private/Files/ObjectStore/Swift.php index 4af09dca254..4af09dca254 100644 --- a/lib/private/files/objectstore/swift.php +++ b/lib/private/Files/ObjectStore/Swift.php diff --git a/lib/private/files/storage/common.php b/lib/private/Files/Storage/Common.php index 3a811b312c6..6382dbd26b1 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/Files/Storage/Common.php @@ -352,7 +352,7 @@ abstract class Common implements Storage, ILockingStorage { $storage = $this; } if (!isset($storage->propagator)) { - $storage->propagator = new Propagator($storage); + $storage->propagator = new Propagator($storage, \OC::$server->getDatabaseConnection()); } return $storage->propagator; } diff --git a/lib/private/files/storage/commontest.php b/lib/private/Files/Storage/CommonTest.php index 0047a51169c..0047a51169c 100644 --- a/lib/private/files/storage/commontest.php +++ b/lib/private/Files/Storage/CommonTest.php diff --git a/lib/private/files/storage/dav.php b/lib/private/Files/Storage/DAV.php index 8eebea1f3ba..8eebea1f3ba 100644 --- a/lib/private/files/storage/dav.php +++ b/lib/private/Files/Storage/DAV.php diff --git a/lib/private/files/storage/failedstorage.php b/lib/private/Files/Storage/FailedStorage.php index df7f76856d5..df7f76856d5 100644 --- a/lib/private/files/storage/failedstorage.php +++ b/lib/private/Files/Storage/FailedStorage.php diff --git a/lib/private/files/storage/flysystem.php b/lib/private/Files/Storage/Flysystem.php index 608639b71a6..608639b71a6 100644 --- a/lib/private/files/storage/flysystem.php +++ b/lib/private/Files/Storage/Flysystem.php diff --git a/lib/private/files/storage/home.php b/lib/private/Files/Storage/Home.php index 9b98f2f7e12..19ba217fa42 100644 --- a/lib/private/files/storage/home.php +++ b/lib/private/Files/Storage/Home.php @@ -88,7 +88,7 @@ class Home extends Local implements \OCP\Files\IHomeStorage { $storage = $this; } if (!isset($this->propagator)) { - $this->propagator = new HomePropagator($storage); + $this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection()); } return $this->propagator; } diff --git a/lib/private/files/storage/local.php b/lib/private/Files/Storage/Local.php index 25b202af5f8..25b202af5f8 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/Files/Storage/Local.php diff --git a/lib/private/files/storage/localtempfiletrait.php b/lib/private/Files/Storage/LocalTempFileTrait.php index 88f11e4e752..88f11e4e752 100644 --- a/lib/private/files/storage/localtempfiletrait.php +++ b/lib/private/Files/Storage/LocalTempFileTrait.php diff --git a/lib/private/files/storage/polyfill/copydirectory.php b/lib/private/Files/Storage/PolyFill/CopyDirectory.php index d4cac117ade..d4cac117ade 100644 --- a/lib/private/files/storage/polyfill/copydirectory.php +++ b/lib/private/Files/Storage/PolyFill/CopyDirectory.php diff --git a/lib/private/files/storage/storage.php b/lib/private/Files/Storage/Storage.php index c066336d4b8..c066336d4b8 100644 --- a/lib/private/files/storage/storage.php +++ b/lib/private/Files/Storage/Storage.php diff --git a/lib/private/files/storage/storagefactory.php b/lib/private/Files/Storage/StorageFactory.php index 84362cabecc..84362cabecc 100644 --- a/lib/private/files/storage/storagefactory.php +++ b/lib/private/Files/Storage/StorageFactory.php diff --git a/lib/private/files/storage/temporary.php b/lib/private/Files/Storage/Temporary.php index 2d8e84c2d52..2d8e84c2d52 100644 --- a/lib/private/files/storage/temporary.php +++ b/lib/private/Files/Storage/Temporary.php diff --git a/lib/private/files/storage/wrapper/availability.php b/lib/private/Files/Storage/Wrapper/Availability.php index 0ed31ba854a..0ed31ba854a 100644 --- a/lib/private/files/storage/wrapper/availability.php +++ b/lib/private/Files/Storage/Wrapper/Availability.php diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php index 02da978a700..02da978a700 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/Files/Storage/Wrapper/Encryption.php diff --git a/lib/private/files/storage/wrapper/jail.php b/lib/private/Files/Storage/Wrapper/Jail.php index e8063f670c5..e8063f670c5 100644 --- a/lib/private/files/storage/wrapper/jail.php +++ b/lib/private/Files/Storage/Wrapper/Jail.php diff --git a/lib/private/files/storage/wrapper/permissionsmask.php b/lib/private/Files/Storage/Wrapper/PermissionsMask.php index 01dd78d418c..01dd78d418c 100644 --- a/lib/private/files/storage/wrapper/permissionsmask.php +++ b/lib/private/Files/Storage/Wrapper/PermissionsMask.php diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/Files/Storage/Wrapper/Quota.php index 500677b092e..500677b092e 100644 --- a/lib/private/files/storage/wrapper/quota.php +++ b/lib/private/Files/Storage/Wrapper/Quota.php diff --git a/lib/private/files/storage/wrapper/wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php index 21d7db1099b..21d7db1099b 100644 --- a/lib/private/files/storage/wrapper/wrapper.php +++ b/lib/private/Files/Storage/Wrapper/Wrapper.php diff --git a/lib/private/files/stream/close.php b/lib/private/Files/Stream/Close.php index 1c9b30705dd..1c9b30705dd 100644 --- a/lib/private/files/stream/close.php +++ b/lib/private/Files/Stream/Close.php diff --git a/lib/private/files/stream/dir.php b/lib/private/Files/Stream/Dir.php index 7489ee683a2..7489ee683a2 100644 --- a/lib/private/files/stream/dir.php +++ b/lib/private/Files/Stream/Dir.php diff --git a/lib/private/files/stream/encryption.php b/lib/private/Files/Stream/Encryption.php index 772c9769bf7..772c9769bf7 100644 --- a/lib/private/files/stream/encryption.php +++ b/lib/private/Files/Stream/Encryption.php diff --git a/lib/private/files/stream/oc.php b/lib/private/Files/Stream/OC.php index 8439770e8fa..8439770e8fa 100644 --- a/lib/private/files/stream/oc.php +++ b/lib/private/Files/Stream/OC.php diff --git a/lib/private/files/stream/quota.php b/lib/private/Files/Stream/Quota.php index 8d27575c568..8d27575c568 100644 --- a/lib/private/files/stream/quota.php +++ b/lib/private/Files/Stream/Quota.php diff --git a/lib/private/files/stream/staticstream.php b/lib/private/Files/Stream/StaticStream.php index 7aacf7a9fe4..7aacf7a9fe4 100644 --- a/lib/private/files/stream/staticstream.php +++ b/lib/private/Files/Stream/StaticStream.php diff --git a/lib/private/files/type/detection.php b/lib/private/Files/Type/Detection.php index f106a98064f..f106a98064f 100644 --- a/lib/private/files/type/detection.php +++ b/lib/private/Files/Type/Detection.php diff --git a/lib/private/files/type/loader.php b/lib/private/Files/Type/Loader.php index 95ba7597257..95ba7597257 100644 --- a/lib/private/files/type/loader.php +++ b/lib/private/Files/Type/Loader.php diff --git a/lib/private/files/type/templatemanager.php b/lib/private/Files/Type/TemplateManager.php index 363fb7a2a6c..363fb7a2a6c 100644 --- a/lib/private/files/type/templatemanager.php +++ b/lib/private/Files/Type/TemplateManager.php diff --git a/lib/private/files/utils/scanner.php b/lib/private/Files/Utils/Scanner.php index 06526583899..b013cbecabc 100644 --- a/lib/private/files/utils/scanner.php +++ b/lib/private/Files/Utils/Scanner.php @@ -29,6 +29,7 @@ use OC\Files\Filesystem; use OC\ForbiddenException; use OC\Hooks\PublicEmitter; use OC\Lock\DBLockingProvider; +use OCP\Files\Storage\IStorage; use OCP\Files\StorageNotAvailableException; use OCP\ILogger; @@ -153,6 +154,17 @@ class Scanner extends PublicEmitter { $scanner->setUseTransactions(false); $this->attachListener($mount); $isDbLocking = \OC::$server->getLockingProvider() instanceof DBLockingProvider; + + $scanner->listen('\OC\Files\Cache\Scanner', 'removeFromCache', function ($path) use ($storage) { + $this->triggerPropagator($storage, $path); + }); + $scanner->listen('\OC\Files\Cache\Scanner', 'updateCache', function ($path) use ($storage) { + $this->triggerPropagator($storage, $path); + }); + $scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path) use ($storage) { + $this->triggerPropagator($storage, $path); + }); + if (!$isDbLocking) { $this->db->beginTransaction(); } @@ -168,5 +180,9 @@ class Scanner extends PublicEmitter { } } } + + private function triggerPropagator(IStorage $storage, $internalPath) { + $storage->getPropagator()->propagateChange($internalPath, time()); + } } diff --git a/lib/private/files/view.php b/lib/private/Files/View.php index aac33a4598c..22e53a00706 100644 --- a/lib/private/files/view.php +++ b/lib/private/Files/View.php @@ -726,7 +726,7 @@ class View { $result = false; } // moving a file/folder within the same mount point - } elseif ($storage1 == $storage2) { + } elseif ($storage1 === $storage2) { if ($storage1) { $result = $storage1->rename($internalPath1, $internalPath2); } else { diff --git a/lib/private/Repair/AssetCache.php b/lib/private/Repair/AssetCache.php index 72fe99bbe1a..e4787bab95f 100644 --- a/lib/private/Repair/AssetCache.php +++ b/lib/private/Repair/AssetCache.php @@ -23,23 +23,23 @@ namespace OC\Repair; -use Doctrine\DBAL\Platforms\MySqlPlatform; -use OC\Hooks\BasicEmitter; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; -class AssetCache extends BasicEmitter implements \OC\RepairStep { +class AssetCache implements IRepairStep { public function getName() { return 'Clear asset cache after upgrade'; } - public function run() { + public function run(IOutput $output) { if (!\OC_Template::isAssetPipelineEnabled()) { - $this->emit('\OC\Repair', 'info', array('Asset pipeline disabled -> nothing to do')); + $output->info('Asset pipeline disabled -> nothing to do'); return; } $assetDir = \OC::$server->getConfig()->getSystemValue('assetdirectory', \OC::$SERVERROOT) . '/assets'; \OC_Helper::rmdirr($assetDir, false); - $this->emit('\OC\Repair', 'info', array('Asset cache cleared.')); + $output->info('Asset cache cleared.'); } } diff --git a/lib/private/Repair/CleanTags.php b/lib/private/Repair/CleanTags.php index 537c4da78aa..2607151cd9c 100644 --- a/lib/private/Repair/CleanTags.php +++ b/lib/private/Repair/CleanTags.php @@ -22,17 +22,17 @@ namespace OC\Repair; -use OC\Hooks\BasicEmitter; -use OC\RepairStep; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; /** * Class RepairConfig * * @package OC\Repair */ -class CleanTags extends BasicEmitter implements RepairStep { +class CleanTags implements IRepairStep { /** @var IDBConnection */ protected $connection; @@ -54,17 +54,18 @@ class CleanTags extends BasicEmitter implements RepairStep { /** * Updates the configuration after running an update */ - public function run() { - $this->deleteOrphanFileEntries(); - $this->deleteOrphanTagEntries(); - $this->deleteOrphanCategoryEntries(); + public function run(IOutput $output) { + $this->deleteOrphanFileEntries($output); + $this->deleteOrphanTagEntries($output); + $this->deleteOrphanCategoryEntries($output); } /** * Delete tag entries for deleted files */ - protected function deleteOrphanFileEntries() { + protected function deleteOrphanFileEntries(IOutput $output) { $this->deleteOrphanEntries( + $output, '%d tags for delete files have been removed.', 'vcategory_to_object', 'objid', 'filecache', 'fileid', 'path_hash' @@ -74,8 +75,9 @@ class CleanTags extends BasicEmitter implements RepairStep { /** * Delete tag entries for deleted tags */ - protected function deleteOrphanTagEntries() { + protected function deleteOrphanTagEntries(IOutput $output) { $this->deleteOrphanEntries( + $output, '%d tag entries for deleted tags have been removed.', 'vcategory_to_object', 'categoryid', 'vcategory', 'id', 'uid' @@ -85,8 +87,9 @@ class CleanTags extends BasicEmitter implements RepairStep { /** * Delete tags that have no entries */ - protected function deleteOrphanCategoryEntries() { + protected function deleteOrphanCategoryEntries(IOutput $output) { $this->deleteOrphanEntries( + $output, '%d tags with no entries have been removed.', 'vcategory', 'id', 'vcategory_to_object', 'categoryid', 'type' @@ -108,7 +111,7 @@ class CleanTags extends BasicEmitter implements RepairStep { * @param string $sourceNullColumn If this column is null in the source table, * the entry is deleted in the $deleteTable */ - protected function deleteOrphanEntries($repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) { + protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) { $qb = $this->connection->getQueryBuilder(); $qb->select('d.' . $deleteId) @@ -141,7 +144,7 @@ class CleanTags extends BasicEmitter implements RepairStep { } if ($repairInfo) { - $this->emit('\OC\Repair', 'info', array(sprintf($repairInfo, sizeof($orphanItems)))); + $output->info(sprintf($repairInfo, sizeof($orphanItems))); } } } diff --git a/lib/private/Repair/Collation.php b/lib/private/Repair/Collation.php index 48035f8d331..1376785e17d 100644 --- a/lib/private/Repair/Collation.php +++ b/lib/private/Repair/Collation.php @@ -23,9 +23,10 @@ namespace OC\Repair; use Doctrine\DBAL\Platforms\MySqlPlatform; -use OC\Hooks\BasicEmitter; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; -class Collation extends BasicEmitter implements \OC\RepairStep { +class Collation implements IRepairStep { /** * @var \OCP\IConfig */ @@ -52,15 +53,15 @@ class Collation extends BasicEmitter implements \OC\RepairStep { /** * Fix mime types */ - public function run() { + public function run(IOutput $output) { if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) { - $this->emit('\OC\Repair', 'info', array('Not a mysql database -> nothing to no')); + $output->info('Not a mysql database -> nothing to no'); return; } $tables = $this->getAllNonUTF8BinTables($this->connection); foreach ($tables as $table) { - $this->emit('\OC\Repair', 'info', array("Change collation for $table ...")); + $output->info("Change collation for $table ..."); $query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;'); $query->execute(); } diff --git a/lib/private/Repair/DropOldJobs.php b/lib/private/Repair/DropOldJobs.php index 594af83e511..489b89d0869 100644 --- a/lib/private/Repair/DropOldJobs.php +++ b/lib/private/Repair/DropOldJobs.php @@ -22,11 +22,11 @@ namespace OC\Repair; -use OC\Hooks\BasicEmitter; -use OC\RepairStep; use OCP\BackgroundJob\IJobList; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; -class DropOldJobs extends BasicEmitter implements RepairStep { +class DropOldJobs implements IRepairStep { /** @var IJobList */ protected $jobList; @@ -53,7 +53,7 @@ class DropOldJobs extends BasicEmitter implements RepairStep { * * @throws \Exception in case of failure */ - public function run() { + public function run(IOutput $output) { $oldJobs = $this->oldJobs(); foreach($oldJobs as $job) { if($this->jobList->has($job['class'], $job['arguments'])) { diff --git a/lib/private/Repair/DropOldTables.php b/lib/private/Repair/DropOldTables.php index 67eafaa930e..15d5b9a3577 100644 --- a/lib/private/Repair/DropOldTables.php +++ b/lib/private/Repair/DropOldTables.php @@ -23,11 +23,11 @@ namespace OC\Repair; -use OC\Hooks\BasicEmitter; -use OC\RepairStep; use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; -class DropOldTables extends BasicEmitter implements RepairStep { +class DropOldTables implements IRepairStep { /** @var IDBConnection */ protected $connection; @@ -54,12 +54,10 @@ class DropOldTables extends BasicEmitter implements RepairStep { * * @throws \Exception in case of failure */ - public function run() { + public function run(IOutput $output) { foreach ($this->oldDatabaseTables() as $tableName) { if ($this->connection->tableExists($tableName)){ - $this->emit('\OC\Repair', 'info', [ - sprintf('Table %s has been deleted', $tableName) - ]); + $output->info(sprintf('Table %s has been deleted', $tableName)); $this->connection->dropTable($tableName); } } diff --git a/lib/private/Repair/FillETags.php b/lib/private/Repair/FillETags.php index dc2ffdcbc36..7ed55f20ac1 100644 --- a/lib/private/Repair/FillETags.php +++ b/lib/private/Repair/FillETags.php @@ -23,9 +23,10 @@ namespace OC\Repair; -use OC\Hooks\BasicEmitter; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; -class FillETags extends BasicEmitter implements \OC\RepairStep { +class FillETags implements IRepairStep { /** @var \OCP\IDBConnection */ protected $connection; @@ -41,7 +42,7 @@ class FillETags extends BasicEmitter implements \OC\RepairStep { return 'Generate ETags for file where no ETag is present.'; } - public function run() { + public function run(IOutput $output) { $qb = $this->connection->getQueryBuilder(); $qb->update('filecache') ->set('etag', $qb->expr()->literal('xxx')) @@ -49,7 +50,7 @@ class FillETags extends BasicEmitter implements \OC\RepairStep { ->orWhere($qb->expr()->isNull('etag')); $result = $qb->execute(); - $this->emit('\OC\Repair', 'info', array("ETags have been fixed for $result files/folders.")); + $output->info("ETags have been fixed for $result files/folders."); } } diff --git a/lib/private/Repair/InnoDB.php b/lib/private/Repair/InnoDB.php index 4e157e66045..ed119dcc032 100644 --- a/lib/private/Repair/InnoDB.php +++ b/lib/private/Repair/InnoDB.php @@ -25,9 +25,10 @@ namespace OC\Repair; use Doctrine\DBAL\Platforms\MySqlPlatform; -use OC\Hooks\BasicEmitter; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; -class InnoDB extends BasicEmitter implements \OC\RepairStep { +class InnoDB implements IRepairStep { public function getName() { return 'Repair MySQL database engine'; @@ -36,10 +37,10 @@ class InnoDB extends BasicEmitter implements \OC\RepairStep { /** * Fix mime types */ - public function run() { + public function run(IOutput $output) { $connection = \OC::$server->getDatabaseConnection(); if (!$connection->getDatabasePlatform() instanceof MySqlPlatform) { - $this->emit('\OC\Repair', 'info', array('Not a mysql database -> nothing to do')); + $output->info('Not a mysql database -> nothing to do'); return; } @@ -47,7 +48,7 @@ class InnoDB extends BasicEmitter implements \OC\RepairStep { if (is_array($tables)) { foreach ($tables as $table) { $connection->exec("ALTER TABLE $table ENGINE=InnoDB;"); - $this->emit('\OC\Repair', 'info', array("Fixed $table")); + $output->info("Fixed $table"); } } } diff --git a/lib/private/Repair/OldGroupMembershipShares.php b/lib/private/Repair/OldGroupMembershipShares.php index 627645b116d..e982dd81f3b 100644 --- a/lib/private/Repair/OldGroupMembershipShares.php +++ b/lib/private/Repair/OldGroupMembershipShares.php @@ -21,14 +21,13 @@ namespace OC\Repair; - -use OC\Hooks\BasicEmitter; -use OC\RepairStep; use OCP\IDBConnection; use OCP\IGroupManager; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; use OCP\Share; -class OldGroupMembershipShares extends BasicEmitter implements RepairStep { +class OldGroupMembershipShares implements IRepairStep { /** @var \OCP\IDBConnection */ protected $connection; @@ -65,7 +64,7 @@ class OldGroupMembershipShares extends BasicEmitter implements RepairStep { * * @throws \Exception in case of failure */ - public function run() { + public function run(IOutput $output) { $deletedEntries = 0; $query = $this->connection->getQueryBuilder(); @@ -92,7 +91,7 @@ class OldGroupMembershipShares extends BasicEmitter implements RepairStep { $result->closeCursor(); if ($deletedEntries) { - $this->emit('\OC\Repair', 'info', array('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore')); + $output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore'); } } diff --git a/lib/private/Repair/Preview.php b/lib/private/Repair/Preview.php index 481e98b42d1..7e26e45cb80 100644 --- a/lib/private/Repair/Preview.php +++ b/lib/private/Repair/Preview.php @@ -21,15 +21,16 @@ namespace OC\Repair; use OC\Files\View; -use OC\Hooks\BasicEmitter; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; -class Preview extends BasicEmitter implements \OC\RepairStep { +class Preview implements IRepairStep { public function getName() { return 'Cleaning-up broken previews'; } - public function run() { + public function run(IOutput $out) { $view = new View('/'); $children = $view->getDirectoryContent('/'); @@ -42,4 +43,4 @@ class Preview extends BasicEmitter implements \OC\RepairStep { } } } -}
\ No newline at end of file +} diff --git a/lib/private/Repair/RemoveGetETagEntries.php b/lib/private/Repair/RemoveGetETagEntries.php index e118da7973a..67bfb53bf14 100644 --- a/lib/private/Repair/RemoveGetETagEntries.php +++ b/lib/private/Repair/RemoveGetETagEntries.php @@ -21,10 +21,11 @@ namespace OC\Repair; -use OC\Hooks\BasicEmitter; use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; -class RemoveGetETagEntries extends BasicEmitter { +class RemoveGetETagEntries implements IRepairStep { /** * @var IDBConnection @@ -45,15 +46,11 @@ class RemoveGetETagEntries extends BasicEmitter { /** * Removes all entries with the key "{DAV:}getetag" from the table properties */ - public function run() { + public function run(IOutput $out) { $sql = 'DELETE FROM `*PREFIX*properties`' . ' WHERE `propertyname` = ?'; $deletedRows = $this->connection->executeUpdate($sql, ['{DAV:}getetag']); - $this->emit( - '\OC\Repair', - 'info', - ['Removed ' . $deletedRows . ' unneeded "{DAV:}getetag" entries from properties table.'] - ); + $out->info('Removed ' . $deletedRows . ' unneeded "{DAV:}getetag" entries from properties table.'); } } diff --git a/lib/private/Repair/RepairInvalidShares.php b/lib/private/Repair/RepairInvalidShares.php index beef5e37798..e30b4ab0d31 100644 --- a/lib/private/Repair/RepairInvalidShares.php +++ b/lib/private/Repair/RepairInvalidShares.php @@ -23,23 +23,20 @@ namespace OC\Repair; -use OC\Hooks\BasicEmitter; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; /** * Repairs shares with invalid data */ -class RepairInvalidShares extends BasicEmitter implements \OC\RepairStep { +class RepairInvalidShares implements IRepairStep { const CHUNK_SIZE = 200; - /** - * @var \OCP\IConfig - */ + /** @var \OCP\IConfig */ protected $config; - /** - * @var \OCP\IDBConnection - */ + /** @var \OCP\IDBConnection */ protected $connection; /** @@ -59,7 +56,7 @@ class RepairInvalidShares extends BasicEmitter implements \OC\RepairStep { * Past bugs would make it possible to set an expiration date on user shares even * though it is not supported. This functions removes the expiration date from such entries. */ - private function removeExpirationDateFromNonLinkShares() { + private function removeExpirationDateFromNonLinkShares(IOutput $out) { $builder = $this->connection->getQueryBuilder(); $builder ->update('share') @@ -69,14 +66,14 @@ class RepairInvalidShares extends BasicEmitter implements \OC\RepairStep { $updatedEntries = $builder->execute(); if ($updatedEntries > 0) { - $this->emit('\OC\Repair', 'info', array('Removed invalid expiration date from ' . $updatedEntries . ' shares')); + $out->info('Removed invalid expiration date from ' . $updatedEntries . ' shares'); } } /** * Remove shares where the parent share does not exist anymore */ - private function removeSharesNonExistingParent() { + private function removeSharesNonExistingParent(IOutput $out) { $deletedEntries = 0; $query = $this->connection->getQueryBuilder(); @@ -105,17 +102,17 @@ class RepairInvalidShares extends BasicEmitter implements \OC\RepairStep { } if ($deletedEntries) { - $this->emit('\OC\Repair', 'info', array('Removed ' . $deletedEntries . ' shares where the parent did not exist')); + $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist'); } } - public function run() { + public function run(IOutput $out) { $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0'); if (version_compare($ocVersionFromBeforeUpdate, '8.2.0.7', '<')) { // this situation was only possible before 8.2 - $this->removeExpirationDateFromNonLinkShares(); + $this->removeExpirationDateFromNonLinkShares($out); } - $this->removeSharesNonExistingParent(); + $this->removeSharesNonExistingParent($out); } } diff --git a/lib/private/Repair/RepairLegacyStorages.php b/lib/private/Repair/RepairLegacyStorages.php index ee189110a87..9582629b1a3 100644 --- a/lib/private/Repair/RepairLegacyStorages.php +++ b/lib/private/Repair/RepairLegacyStorages.php @@ -24,10 +24,11 @@ namespace OC\Repair; use OC\Files\Cache\Storage; -use OC\Hooks\BasicEmitter; use OC\RepairException; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; -class RepairLegacyStorages extends BasicEmitter { +class RepairLegacyStorages implements IRepairStep{ /** * @var \OCP\IConfig */ @@ -149,7 +150,7 @@ class RepairLegacyStorages extends BasicEmitter { * Converts legacy home storage ids in the format * "local::/data/dir/path/userid/" to the new format "home::userid" */ - public function run() { + public function run(IOutput $out) { // only run once if ($this->config->getAppValue('core', 'repairlegacystoragesdone') === 'yes') { return; @@ -186,11 +187,7 @@ class RepairLegacyStorages extends BasicEmitter { } catch (RepairException $e) { $hasWarnings = true; - $this->emit( - '\OC\Repair', - 'warning', - array('Could not repair legacy storage ' . $currentId . ' automatically.') - ); + $out->warning('Could not repair legacy storage ' . $currentId . ' automatically.'); } } @@ -233,11 +230,7 @@ class RepairLegacyStorages extends BasicEmitter { } catch (RepairException $e) { $hasWarnings = true; - $this->emit( - '\OC\Repair', - 'warning', - array('Could not repair legacy storage ' . $storageId . ' automatically.') - ); + $out->warning('Could not repair legacy storage ' . $storageId . ' automatically.'); } } } @@ -245,16 +238,12 @@ class RepairLegacyStorages extends BasicEmitter { } while (count($results) >= $limit); } - $this->emit('\OC\Repair', 'info', array('Updated ' . $count . ' legacy home storage ids')); + $out->info('Updated ' . $count . ' legacy home storage ids'); $this->connection->commit(); if ($hasWarnings) { - $this->emit( - '\OC\Repair', - 'warning', - array('Some legacy storages could not be repaired. Please manually fix them then re-run ./occ maintenance:repair') - ); + $out->warning('Some legacy storages could not be repaired. Please manually fix them then re-run ./occ maintenance:repair'); } else { // if all were done, no need to redo the repair during next upgrade $this->config->setAppValue('core', 'repairlegacystoragesdone', 'yes'); diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php index c5180302443..0d56245312a 100644 --- a/lib/private/Repair/RepairMimeTypes.php +++ b/lib/private/Repair/RepairMimeTypes.php @@ -28,9 +28,10 @@ namespace OC\Repair; -use OC\Hooks\BasicEmitter; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; -class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { +class RepairMimeTypes implements IRepairStep { /** * @var \OCP\IConfig */ @@ -308,7 +309,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { /** * Fix mime types */ - public function run() { + public function run(IOutput $out) { $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0'); @@ -318,60 +319,60 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { // only update mime types if necessary as it can be expensive if (version_compare($ocVersionFromBeforeUpdate, '8.2.0', '<')) { if ($this->fixOfficeMimeTypes()) { - $this->emit('\OC\Repair', 'info', array('Fixed office mime types')); + $out->info('Fixed office mime types'); } if ($this->fixApkMimeType()) { - $this->emit('\OC\Repair', 'info', array('Fixed APK mime type')); + $out->info('Fixed APK mime type'); } if ($this->fixFontsMimeTypes()) { - $this->emit('\OC\Repair', 'info', array('Fixed fonts mime types')); + $out->info('Fixed fonts mime types'); } if ($this->fixPostscriptMimeType()) { - $this->emit('\OC\Repair', 'info', array('Fixed Postscript mime types')); + $out->info('Fixed Postscript mime types'); } if ($this->introduceRawMimeType()) { - $this->emit('\OC\Repair', 'info', array('Fixed Raw mime types')); + $out->info('Fixed Raw mime types'); } if ($this->introduce3dImagesMimeType()) { - $this->emit('\OC\Repair', 'info', array('Fixed 3D images mime types')); + $out->info('Fixed 3D images mime types'); } if ($this->introduceConfMimeType()) { - $this->emit('\OC\Repair', 'info', array('Fixed Conf/cnf mime types')); + $out->info('Fixed Conf/cnf mime types'); } if ($this->introduceYamlMimeType()) { - $this->emit('\OC\Repair', 'info', array('Fixed Yaml/Yml mime types')); + $out->info('Fixed Yaml/Yml mime types'); } } // Mimetype updates from #19272 if (version_compare($ocVersionFromBeforeUpdate, '8.2.0.8', '<')) { if ($this->introduceJavaMimeType()) { - $this->emit('\OC\Repair', 'info', array('Fixed java/class mime types')); + $out->info('Fixed java/class mime types'); } if ($this->introduceHppMimeType()) { - $this->emit('\OC\Repair', 'info', array('Fixed hpp mime type')); + $out->info('Fixed hpp mime type'); } if ($this->introduceRssMimeType()) { - $this->emit('\OC\Repair', 'info', array('Fixed rss mime type')); + $out->info('Fixed rss mime type'); } if ($this->introduceRtfMimeType()) { - $this->emit('\OC\Repair', 'info', array('Fixed rtf mime type')); + $out->info('Fixed rtf mime type'); } } if (version_compare($ocVersionFromBeforeUpdate, '9.0.0.10', '<')) { if ($this->introduceRichDocumentsMimeTypes()) { - $this->emit('\OC\Repair', 'info', array('Fixed richdocuments additional office mime types')); + $out->info('Fixed richdocuments additional office mime types'); } } } diff --git a/lib/private/Repair/SearchLuceneTables.php b/lib/private/Repair/SearchLuceneTables.php index 9f3601eeb03..56bae6ff655 100644 --- a/lib/private/Repair/SearchLuceneTables.php +++ b/lib/private/Repair/SearchLuceneTables.php @@ -22,9 +22,10 @@ namespace OC\Repair; -use OC\Hooks\BasicEmitter; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; -class SearchLuceneTables extends BasicEmitter implements \OC\RepairStep { +class SearchLuceneTables implements IRepairStep { public function getName() { return 'Repair duplicate entries in oc_lucene_status'; @@ -51,10 +52,10 @@ class SearchLuceneTables extends BasicEmitter implements \OC\RepairStep { * * search_lucene will then reindex the fileids without a status when the next indexing job is executed */ - public function run() { + public function run(IOutput $out) { $connection = \OC::$server->getDatabaseConnection(); if ($connection->tableExists('lucene_status')) { - $this->emit('\OC\Repair', 'info', array('removing duplicate entries from lucene_status')); + $out->info('removing duplicate entries from lucene_status'); $query = $connection->prepare(' DELETE FROM `*PREFIX*lucene_status` @@ -69,7 +70,7 @@ class SearchLuceneTables extends BasicEmitter implements \OC\RepairStep { )'); $query->execute(); } else { - $this->emit('\OC\Repair', 'info', array('lucene_status table does not exist -> nothing to do')); + $out->info('lucene_status table does not exist -> nothing to do'); } } diff --git a/lib/private/Repair/SharePropagation.php b/lib/private/Repair/SharePropagation.php index 26d7a9e128c..cd0c091b325 100644 --- a/lib/private/Repair/SharePropagation.php +++ b/lib/private/Repair/SharePropagation.php @@ -20,10 +20,12 @@ */ namespace OC\Repair; -use OC\Hooks\BasicEmitter; use OCP\IConfig; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; + +class SharePropagation implements IRepairStep { -class SharePropagation extends BasicEmitter implements \OC\RepairStep { /** @var IConfig */ private $config; @@ -40,7 +42,7 @@ class SharePropagation extends BasicEmitter implements \OC\RepairStep { return 'Remove old share propagation app entries'; } - public function run() { + public function run(IOutput $out ) { $keys = $this->config->getAppKeys('files_sharing'); foreach ($keys as $key) { diff --git a/lib/private/Repair/SqliteAutoincrement.php b/lib/private/Repair/SqliteAutoincrement.php index d7cac57229d..e6f90dcece3 100644 --- a/lib/private/Repair/SqliteAutoincrement.php +++ b/lib/private/Repair/SqliteAutoincrement.php @@ -26,13 +26,14 @@ use Doctrine\DBAL\Schema\SchemaException; use Doctrine\DBAL\Schema\SchemaDiff; use Doctrine\DBAL\Schema\TableDiff; use Doctrine\DBAL\Schema\ColumnDiff; -use OC\Hooks\BasicEmitter; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; /** * Fixes Sqlite autoincrement by forcing the SQLite table schemas to be * altered in order to retrigger SQL schema generation through OCSqlitePlatform. */ -class SqliteAutoincrement extends BasicEmitter implements \OC\RepairStep { +class SqliteAutoincrement implements IRepairStep { /** * @var \OC\DB\Connection */ @@ -52,7 +53,7 @@ class SqliteAutoincrement extends BasicEmitter implements \OC\RepairStep { /** * Fix mime types */ - public function run() { + public function run(IOutput $out) { if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) { return; } diff --git a/lib/private/Repair/UpdateCertificateStore.php b/lib/private/Repair/UpdateCertificateStore.php index ae7585f07f6..9397fc77bce 100644 --- a/lib/private/Repair/UpdateCertificateStore.php +++ b/lib/private/Repair/UpdateCertificateStore.php @@ -22,10 +22,10 @@ namespace OC\Repair; use OC\Files\View; -use OC\Hooks\BasicEmitter; -use OC\RepairStep; use OC\Server; use OCP\IConfig; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; /** * Class UpdateCertificateStore rewrites the user specific certificate store after @@ -34,7 +34,7 @@ use OCP\IConfig; * * @package OC\Repair */ -class UpdateCertificateStore extends BasicEmitter implements RepairStep { +class UpdateCertificateStore implements IRepairStep { /** * FIXME: The certificate manager does only allow specifying the user * within the constructor. This makes DI impossible. @@ -60,7 +60,7 @@ class UpdateCertificateStore extends BasicEmitter implements RepairStep { } /** {@inheritDoc} */ - public function run() { + public function run(IOutput $out) { $rootView = new View(); $dataDirectory = $this->config->getSystemValue('datadirectory', null); if(is_null($dataDirectory)) { diff --git a/lib/private/Repair/UpdateOutdatedOcsIds.php b/lib/private/Repair/UpdateOutdatedOcsIds.php index 60024b3055c..4c768e93bd6 100644 --- a/lib/private/Repair/UpdateOutdatedOcsIds.php +++ b/lib/private/Repair/UpdateOutdatedOcsIds.php @@ -21,9 +21,9 @@ namespace OC\Repair; -use OC\Hooks\BasicEmitter; -use OC\RepairStep; use OCP\IConfig; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; /** * Class UpdateOutdatedOcsIds is used to update invalid outdated OCS IDs, this is @@ -33,7 +33,7 @@ use OCP\IConfig; * * @package OC\Repair */ -class UpdateOutdatedOcsIds extends BasicEmitter implements RepairStep { +class UpdateOutdatedOcsIds implements IRepairStep { /** @var IConfig */ private $config; @@ -71,7 +71,7 @@ class UpdateOutdatedOcsIds extends BasicEmitter implements RepairStep { /** * {@inheritdoc} */ - public function run() { + public function run(IOutput $output) { $appsToUpdate = [ 'contacts' => [ 'old' => '166044', @@ -97,11 +97,7 @@ class UpdateOutdatedOcsIds extends BasicEmitter implements RepairStep { foreach($appsToUpdate as $appName => $ids) { if ($this->fixOcsId($appName, $ids['old'], $ids['new'])) { - $this->emit( - '\OC\Repair', - 'info', - [sprintf('Fixed invalid %s OCS id', $appName)] - ); + $output->info("Fixed invalid $appName OCS id"); } } } diff --git a/lib/private/route/cachingrouter.php b/lib/private/Route/CachingRouter.php index d6270dcf2c7..d6270dcf2c7 100644 --- a/lib/private/route/cachingrouter.php +++ b/lib/private/Route/CachingRouter.php diff --git a/lib/private/route/route.php b/lib/private/Route/Route.php index 966790a63c0..966790a63c0 100644 --- a/lib/private/route/route.php +++ b/lib/private/Route/Route.php diff --git a/lib/private/route/router.php b/lib/private/Route/Router.php index ef02b5aba0e..ef02b5aba0e 100644 --- a/lib/private/route/router.php +++ b/lib/private/Route/Router.php diff --git a/lib/private/search/provider/file.php b/lib/private/Search/Provider/File.php index 69ffbd3ae6b..69ffbd3ae6b 100644 --- a/lib/private/search/provider/file.php +++ b/lib/private/Search/Provider/File.php diff --git a/lib/private/search/result/audio.php b/lib/private/Search/Result/Audio.php index 3f9b3dc640c..3f9b3dc640c 100644 --- a/lib/private/search/result/audio.php +++ b/lib/private/Search/Result/Audio.php diff --git a/lib/private/search/result/file.php b/lib/private/Search/Result/File.php index f1347001eaf..f1347001eaf 100644 --- a/lib/private/search/result/file.php +++ b/lib/private/Search/Result/File.php diff --git a/lib/private/search/result/folder.php b/lib/private/Search/Result/Folder.php index 6f0c0a7b2a5..6f0c0a7b2a5 100644 --- a/lib/private/search/result/folder.php +++ b/lib/private/Search/Result/Folder.php diff --git a/lib/private/search/result/image.php b/lib/private/Search/Result/Image.php index 87b36fc9f73..87b36fc9f73 100644 --- a/lib/private/search/result/image.php +++ b/lib/private/Search/Result/Image.php diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php index 0948b567046..0bedfb84fc7 100644 --- a/lib/private/Share20/ProviderFactory.php +++ b/lib/private/Share20/ProviderFactory.php @@ -114,7 +114,8 @@ class ProviderFactory implements IProviderFactory { $tokenHandler, $l, $this->serverContainer->getLogger(), - $this->serverContainer->getLazyRootFolder() + $this->serverContainer->getLazyRootFolder(), + $this->serverContainer->getConfig() ); } diff --git a/lib/private/updater/versioncheck.php b/lib/private/Updater/VersionCheck.php index e42a1e2a40c..e42a1e2a40c 100644 --- a/lib/private/updater/versioncheck.php +++ b/lib/private/Updater/VersionCheck.php diff --git a/lib/private/files/cache/propagator.php b/lib/private/files/cache/propagator.php deleted file mode 100644 index 50264e54d44..00000000000 --- a/lib/private/files/cache/propagator.php +++ /dev/null @@ -1,74 +0,0 @@ -<?php -/** - * @author Robin Appelman <icewind@owncloud.com> - * - * @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 OC\Files\Cache; - -use OCP\Files\Cache\IPropagator; - -/** - * Propagate etags and mtimes within the storage - */ -class Propagator implements IPropagator { - /** - * @var \OC\Files\Storage\Storage - */ - protected $storage; - - /** - * @param \OC\Files\Storage\Storage $storage - */ - public function __construct(\OC\Files\Storage\Storage $storage) { - $this->storage = $storage; - } - - - /** - * @param string $internalPath - * @param int $time - * @param int $sizeDifference number of bytes the file has grown - * @return array[] all propagated entries - */ - public function propagateChange($internalPath, $time, $sizeDifference = 0) { - $cache = $this->storage->getCache($internalPath); - - $parentId = $cache->getParentId($internalPath); - $propagatedEntries = []; - while ($parentId !== -1) { - $entry = $cache->get($parentId); - $propagatedEntries[] = $entry; - if (!$entry) { - return $propagatedEntries; - } - $mtime = max($time, $entry['mtime']); - - if ($entry['size'] === -1) { - $newSize = -1; - } else { - $newSize = $entry['size'] + $sizeDifference; - } - $cache->update($parentId, ['mtime' => $mtime, 'etag' => $this->storage->getETag($entry['path']), 'size' => $newSize]); - - $parentId = $entry['parent']; - } - - return $propagatedEntries; - } -} diff --git a/lib/private/installer.php b/lib/private/installer.php index 421e281e56b..24c79b2dd8c 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -269,7 +269,8 @@ class OC_Installer{ //download the file if necessary if($data['source']=='http') { $pathInfo = pathinfo($data['href']); - $path = \OC::$server->getTempManager()->getTemporaryFile('.' . $pathInfo['extension']); + $extension = isset($pathInfo['extension']) ? '.' . $pathInfo['extension'] : ''; + $path = \OC::$server->getTempManager()->getTemporaryFile($extension); if(!isset($data['href'])) { throw new \Exception($l->t("No href specified when installing app from http")); } diff --git a/lib/private/repair.php b/lib/private/repair.php index 28fe993db07..586e4e42b13 100644 --- a/lib/private/repair.php +++ b/lib/private/repair.php @@ -46,11 +46,13 @@ use OC\Repair\RepairMimeTypes; use OC\Repair\SearchLuceneTables; use OC\Repair\UpdateOutdatedOcsIds; use OC\Repair\RepairInvalidShares; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\GenericEvent; -class Repair extends BasicEmitter { - /* @var RepairStep[] */ +class Repair extends BasicEmitter implements IOutput{ + /* @var IRepairStep[] */ private $repairSteps; /** @var EventDispatcher */ private $dispatcher; @@ -58,7 +60,7 @@ class Repair extends BasicEmitter { /** * Creates a new repair step runner * - * @param RepairStep[] $repairSteps array of RepairStep instances + * @param IRepairStep[] $repairSteps array of RepairStep instances * @param EventDispatcher $dispatcher */ public function __construct($repairSteps = [], EventDispatcher $dispatcher = null) { @@ -88,24 +90,24 @@ class Repair extends BasicEmitter { }); } - $step->run(); + $step->run($this); } } /** * Add repair step * - * @param RepairStep|string $repairStep repair step + * @param IRepairStep|string $repairStep repair step * @throws \Exception */ public function addStep($repairStep) { if (is_string($repairStep)) { if (class_exists($repairStep)) { $s = new $repairStep(); - if ($s instanceof RepairStep) { + if ($s instanceof IRepairStep) { $this->repairSteps[] = $s; } else { - throw new \Exception("Repair step '$repairStep' is not of type \\OC\\RepairStep"); + throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep"); } } else { throw new \Exception("Repair step '$repairStep' is unknown"); @@ -119,7 +121,7 @@ class Repair extends BasicEmitter { * Returns the default repair steps to be run on the * command line or after an upgrade. * - * @return array of RepairStep instances + * @return IRepairStep[] */ public static function getRepairSteps() { return [ @@ -141,7 +143,7 @@ class Repair extends BasicEmitter { * Returns expensive repair steps to be run on the * command line with a special option. * - * @return array of RepairStep instances + * @return IRepairStep[] */ public static function getExpensiveRepairSteps() { return [ @@ -153,7 +155,7 @@ class Repair extends BasicEmitter { * Returns the repair steps to be run before an * upgrade. * - * @return array of RepairStep instances + * @return IRepairStep[] */ public static function getBeforeUpgradeRepairSteps() { $connection = \OC::$server->getDatabaseConnection(); @@ -185,4 +187,41 @@ class Repair extends BasicEmitter { new GenericEvent("$scope::$method", $arguments)); } } + + public function info($string) { + // for now just emit as we did in the past + $this->emit('\OC\Repair', 'info', array($string)); + } + + /** + * @param string $message + */ + public function warning($message) { + // for now just emit as we did in the past + $this->emit('\OC\Repair', 'warning', [$message]); + } + + /** + * @param int $max + */ + public function startProgress($max = 0) { + // for now just emit as we did in the past + $this->emit('\OC\Repair', 'startProgress', [$max]); + } + + /** + * @param int $step + */ + public function advance($step = 1) { + // for now just emit as we did in the past + $this->emit('\OC\Repair', 'advance', [$step]); + } + + /** + * @param int $max + */ + public function finishProgress() { + // for now just emit as we did in the past + $this->emit('\OC\Repair', 'finishProgress', []); + } } diff --git a/lib/private/setup.php b/lib/private/setup.php index d2f3802ebad..196ae8a8bce 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -427,10 +427,18 @@ class Setup { //custom 404 error page $content.= "\nErrorDocument 404 ".$webRoot."/core/templates/404.php"; + // ownCloud may be configured to live at the root folder without a + // trailing slash being specified. In this case manually set the + // rewrite base to `/` + $rewriteBase = $webRoot; + if($webRoot === '') { + $rewriteBase = '/'; + } + // Add rewrite base $content .= "\n<IfModule mod_rewrite.c>"; $content .= "\n RewriteRule . index.php [PT,E=PATH_INFO:$1]"; - $content .= "\n RewriteBase ".$webRoot; + $content .= "\n RewriteBase ".$rewriteBase; $content .= "\n <IfModule mod_env.c>"; $content .= "\n SetEnv front_controller_active true"; $content .= "\n <IfModule mod_dir.c>"; diff --git a/lib/public/files/cache/ipropagator.php b/lib/public/files/cache/ipropagator.php index 9730601d573..5494ec9a54e 100644 --- a/lib/public/files/cache/ipropagator.php +++ b/lib/public/files/cache/ipropagator.php @@ -30,7 +30,6 @@ interface IPropagator { /** * @param string $internalPath * @param int $time - * @return array[] all propagated cache entries * @since 9.0.0 */ public function propagateChange($internalPath, $time); diff --git a/lib/public/mail/imailer.php b/lib/public/mail/imailer.php index 61eb895752b..e3c751277ac 100644 --- a/lib/public/mail/imailer.php +++ b/lib/public/mail/imailer.php @@ -32,9 +32,10 @@ use OC\Mail\Message; * $mailer = \OC::$server->getMailer(); * $message = $mailer->createMessage(); * $message->setSubject('Your Subject'); - * $message->setFrom(array('cloud@domain.org' => 'ownCloud Notifier'); - * $message->setTo(array('recipient@domain.org' => 'Recipient'); - * $message->setBody('The message text'); + * $message->setFrom(['cloud@domain.org' => 'ownCloud Notifier']); + * $message->setTo(['recipient@domain.org' => 'Recipient']); + * $message->setPlainBody('The message text'); + * $message->setHtmlBody('The <strong>message</strong> text'); * $mailer->send($message); * * This message can then be passed to send() of \OC\Mail\Mailer diff --git a/lib/public/migration/ioutput.php b/lib/public/migration/ioutput.php new file mode 100644 index 00000000000..c52f13b31dc --- /dev/null +++ b/lib/public/migration/ioutput.php @@ -0,0 +1,61 @@ +<?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 OCP\Migration; + +/** + * Interface IOutput + * + * @package OCP\Migration + * @since 9.1.0 + */ +interface IOutput { + + /** + * @param string $message + * @since 9.1.0 + */ + public function info($message); + + /** + * @param string $message + * @since 9.1.0 + */ + public function warning($message); + + /** + * @param int $max + * @since 9.1.0 + */ + public function startProgress($max = 0); + + /** + * @param int $step + * @since 9.1.0 + */ + public function advance($step = 1); + + /** + * @param int $max + * @since 9.1.0 + */ + public function finishProgress(); + +} diff --git a/lib/private/repairstep.php b/lib/public/migration/irepairstep.php index e1b8442fb8a..07830a935f9 100644 --- a/lib/private/repairstep.php +++ b/lib/public/migration/irepairstep.php @@ -18,17 +18,19 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -namespace OC; +namespace OCP\Migration; /** * Repair step + * @since 9.1.0 */ -interface RepairStep { +interface IRepairStep { /** * Returns the step's name * * @return string + * @since 9.1.0 */ public function getName(); @@ -36,8 +38,9 @@ interface RepairStep { * Run repair step. * Must throw exception on error. * + * @since 9.1.0 * @throws \Exception in case of failure */ - public function run(); + public function run(IOutput $output); } diff --git a/ocs/routes.php b/ocs/routes.php index b99aa5c7597..af9c3e74137 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -99,7 +99,8 @@ API::register( // Server-to-Server Sharing if (\OC::$server->getAppManager()->isEnabledForUser('files_sharing')) { - $s2s = new \OCA\Files_Sharing\API\Server2Server(); + $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing'); + $s2s = new \OCA\Files_Sharing\API\Server2Server($federatedSharingApp->getFederatedShareProvider()); API::register('post', '/cloud/shares', array($s2s, 'createShare'), diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json index 545d4b0c399..6a47e3c9adf 100644 --- a/resources/config/mimetypealiases.dist.json +++ b/resources/config/mimetypealiases.dist.json @@ -4,7 +4,7 @@ "_comment3": "Put any custom mappings in a new file mimetypealiases.json in the config/ folder of ownCloud", "_comment4": "After any change to mimetypealiases.json run:", - "_comment5": "./occ maintenance:mimetypesjs", + "_comment5": "./occ occ maintenance:mimetype:update-js", "_comment6": "Otherwise your update won't propagate through the system.", diff --git a/settings/js/personal.js b/settings/js/personal.js index b6e8e2ff508..09f63f3f6af 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -110,8 +110,15 @@ function updateAvatar (hidedefault) { } $displaydiv.css({'background-color': ''}); $displaydiv.avatar(OC.currentUser, 145, true); - - $('#removeavatar').removeClass('hidden').addClass('inlineblock'); + $.get(OC.generateUrl( + '/avatar/{user}/{size}', + {user: OC.currentUser, size: 1} + ), function (result) { + if (typeof(result) === 'string') { + // Show the delete button when the avatar is custom + $('#removeavatar').removeClass('hidden').addClass('inlineblock'); + } + }); } function showAvatarCropper () { diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js index e3c97191c0d..78d679fffbf 100644 --- a/settings/l10n/bg_BG.js +++ b/settings/l10n/bg_BG.js @@ -105,6 +105,7 @@ OC.L10N.register( "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Силно препоръчваме инсталиране на необходимите паките на системата, за поддръжка на следните местоположения: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не е в основата на вашия домейн и използва системния cron, могат да възникнат проблеми с генерирането на URLи. За избягване на тези проблеми, моля настройте <code>overwrite.cli.url</code> опцията в config.php файла с мрежовия път към вашята инсталация (Вероятно : \\\"%s\\\")", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Не бе възможно да изпълним cron задачата през команден интерфейс. Следните технически грешки се появиха:", + "Open documentation" : "Отвори документацията", "Allow apps to use the Share API" : "Разреши приложенията да използват Share API.", "Allow users to share via link" : "Разреши потребителите да споделят с връзка", "Enforce password protection" : "Изискай защита с парола.", diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json index cb9e8d94f2e..0f3bb99ed1b 100644 --- a/settings/l10n/bg_BG.json +++ b/settings/l10n/bg_BG.json @@ -103,6 +103,7 @@ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Силно препоръчваме инсталиране на необходимите паките на системата, за поддръжка на следните местоположения: %s.", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не е в основата на вашия домейн и използва системния cron, могат да възникнат проблеми с генерирането на URLи. За избягване на тези проблеми, моля настройте <code>overwrite.cli.url</code> опцията в config.php файла с мрежовия път към вашята инсталация (Вероятно : \\\"%s\\\")", "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Не бе възможно да изпълним cron задачата през команден интерфейс. Следните технически грешки се появиха:", + "Open documentation" : "Отвори документацията", "Allow apps to use the Share API" : "Разреши приложенията да използват Share API.", "Allow users to share via link" : "Разреши потребителите да споделят с връзка", "Enforce password protection" : "Изискай защита с парола.", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index a48cbaed1b0..4795f1535da 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -174,7 +174,7 @@ OC.L10N.register( "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?", "Enable encryption" : "Verschlüsselung aktivieren", "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.", - "Select default encryption module:" : "Bite Standard-Verschlüsselungs-Modul auswählen:", + "Select default encryption module:" : "Bitte Standard-Verschlüsselungs-Modul auswählen:", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du musst Deine Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur Neuen migrieren. Bitte aktiviere das \"Default Encryption Module\" und rufe 'occ encryption:migrate' auf.", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du musst Deine Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur Neuen migrieren.", "Start migration" : "Migration beginnen", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index 6ac249dbe86..8c221a2f9ad 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -172,7 +172,7 @@ "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?", "Enable encryption" : "Verschlüsselung aktivieren", "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.", - "Select default encryption module:" : "Bite Standard-Verschlüsselungs-Modul auswählen:", + "Select default encryption module:" : "Bitte Standard-Verschlüsselungs-Modul auswählen:", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du musst Deine Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur Neuen migrieren. Bitte aktiviere das \"Default Encryption Module\" und rufe 'occ encryption:migrate' auf.", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du musst Deine Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur Neuen migrieren.", "Start migration" : "Migration beginnen", diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js index 615cd409e59..74f4a10d3a0 100644 --- a/settings/l10n/sl.js +++ b/settings/l10n/sl.js @@ -170,6 +170,7 @@ OC.L10N.register( "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Dnevniškega datoteka je večja od 100 MB. Hitrost prejema je odvisna od širokopasovne povezave!", "What to log" : "Kaj naj se beleži?", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Uporabljena zbirka je SQLite. Za obsežnejše sisteme je priporočljiv prehod na drugo vrsto zbirke.", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Uporaba SQLite ni priporočljiva iz varnostnih razlogov, še posebej če se sistem krajevno usklajuje z namizjem prek odjemalca.", "How to do backups" : "Kako ustvariti varnostne kopije", "Advanced monitoring" : "Napredno sledenje", "Performance tuning" : "Prilagajanje delovanja", diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json index ade5b3def67..0b255cef767 100644 --- a/settings/l10n/sl.json +++ b/settings/l10n/sl.json @@ -168,6 +168,7 @@ "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Dnevniškega datoteka je večja od 100 MB. Hitrost prejema je odvisna od širokopasovne povezave!", "What to log" : "Kaj naj se beleži?", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Uporabljena zbirka je SQLite. Za obsežnejše sisteme je priporočljiv prehod na drugo vrsto zbirke.", + "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Uporaba SQLite ni priporočljiva iz varnostnih razlogov, še posebej če se sistem krajevno usklajuje z namizjem prek odjemalca.", "How to do backups" : "Kako ustvariti varnostne kopije", "Advanced monitoring" : "Napredno sledenje", "Performance tuning" : "Prilagajanje delovanja", diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js index 3f3743bdad9..84536fa4f00 100644 --- a/settings/l10n/th_TH.js +++ b/settings/l10n/th_TH.js @@ -74,6 +74,9 @@ OC.L10N.register( "Disable" : "ปิดใช้งาน", "Enable" : "เปิดใช้งาน", "Error while enabling app" : "เกิดข้อผิดพลาดขณะกำลังตรวจสอบแอพฯ", + "Error: this app cannot be enabled because it makes the server unstable" : "ข้อผิดพลาด: ไม่สามารถเปิดใช้งานแอพฯนี้ เพราะมันอาจทำให้เซิร์ฟเวอร์มีปัญหา", + "Error: could not disable broken app" : "ข้อผิดพลาด: ไม่สามารถปิดการใช้งานแอพฯที่มีปัญหา", + "Error while disabling broken app" : "ข้อผิดพลาดขณะกำลังปิดการใช้งานแอพฯที่มีปัญหา", "Updating...." : "กำลังอัพเดทข้อมูล...", "Error while updating app" : "เกิดข้อผิดพลาดขณะกำลังอัพเดทแอพฯ", "Updated" : "อัพเดทแล้ว", @@ -82,6 +85,7 @@ OC.L10N.register( "Uninstall" : "ถอนการติดตั้ง", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "แอพฯจะต้องเปิดใช้งานก่อนทำการอัพเดท คุณจะถูกนำไปยังหน้าอัพเดทใน 5 วินาที", "App update" : "อัพเดทแอพฯ", + "No apps found for {query}" : "ไม่พบแอพฯสำหรับ {query}", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "เกิดข้อผิดพลาด กรุณาอัพโหลดใบรับรองเข้ารหัส ASCII PEM", "Valid until {date}" : "ใช้ได้จนถึงวันที่ {date}", "Delete" : "ลบ", diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json index b66083e612c..5314f9809e8 100644 --- a/settings/l10n/th_TH.json +++ b/settings/l10n/th_TH.json @@ -72,6 +72,9 @@ "Disable" : "ปิดใช้งาน", "Enable" : "เปิดใช้งาน", "Error while enabling app" : "เกิดข้อผิดพลาดขณะกำลังตรวจสอบแอพฯ", + "Error: this app cannot be enabled because it makes the server unstable" : "ข้อผิดพลาด: ไม่สามารถเปิดใช้งานแอพฯนี้ เพราะมันอาจทำให้เซิร์ฟเวอร์มีปัญหา", + "Error: could not disable broken app" : "ข้อผิดพลาด: ไม่สามารถปิดการใช้งานแอพฯที่มีปัญหา", + "Error while disabling broken app" : "ข้อผิดพลาดขณะกำลังปิดการใช้งานแอพฯที่มีปัญหา", "Updating...." : "กำลังอัพเดทข้อมูล...", "Error while updating app" : "เกิดข้อผิดพลาดขณะกำลังอัพเดทแอพฯ", "Updated" : "อัพเดทแล้ว", @@ -80,6 +83,7 @@ "Uninstall" : "ถอนการติดตั้ง", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "แอพฯจะต้องเปิดใช้งานก่อนทำการอัพเดท คุณจะถูกนำไปยังหน้าอัพเดทใน 5 วินาที", "App update" : "อัพเดทแอพฯ", + "No apps found for {query}" : "ไม่พบแอพฯสำหรับ {query}", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "เกิดข้อผิดพลาด กรุณาอัพโหลดใบรับรองเข้ารหัส ASCII PEM", "Valid until {date}" : "ใช้ได้จนถึงวันที่ {date}", "Delete" : "ลบ", diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php index 7779e2778cb..1220c57e962 100644 --- a/tests/lib/files/utils/scanner.php +++ b/tests/lib/files/utils/scanner.php @@ -163,4 +163,28 @@ class Scanner extends \Test\TestCase { $scanner = new TestScanner('', \OC::$server->getDatabaseConnection(), \OC::$server->getLogger()); $scanner->scan($invalidPath); } + + public function testPropagateEtag() { + $storage = new Temporary(array()); + $mount = new MountPoint($storage, ''); + Filesystem::getMountManager()->addMount($mount); + $cache = $storage->getCache(); + + $storage->mkdir('folder'); + $storage->file_put_contents('folder/bar.txt', 'qwerty'); + $storage->touch('folder/bar.txt', time() - 200); + + $scanner = new TestScanner('', \OC::$server->getDatabaseConnection(), \OC::$server->getLogger()); + $scanner->addMount($mount); + + $scanner->scan(''); + $this->assertTrue($cache->inCache('folder/bar.txt')); + $oldRoot = $cache->get(''); + + $storage->file_put_contents('folder/bar.txt', 'qwerty'); + $scanner->scan(''); + $newRoot = $cache->get(''); + + $this->assertNotEquals($oldRoot->getEtag(), $newRoot->getEtag()); + } } diff --git a/tests/lib/repair.php b/tests/lib/repair.php index 248db382140..a598d3c1a29 100644 --- a/tests/lib/repair.php +++ b/tests/lib/repair.php @@ -6,9 +6,9 @@ * See the COPYING-README file. */ -use OC\Hooks\BasicEmitter; +use OCP\Migration\IRepairStep; -class TestRepairStep extends BasicEmitter implements \OC\RepairStep{ +class TestRepairStep implements IRepairStep { private $warning; public function __construct($warning = false) { @@ -19,12 +19,12 @@ class TestRepairStep extends BasicEmitter implements \OC\RepairStep{ return 'Test Name'; } - public function run() { + public function run(\OCP\Migration\IOutput $out) { if ($this->warning) { - $this->emit('\OC\Repair', 'warning', array('Simulated warning')); + $out->warning('Simulated warning'); } else { - $this->emit('\OC\Repair', 'info', array('Simulated info')); + $out->info('Simulated info'); } } } diff --git a/tests/lib/repair/cleantags.php b/tests/lib/repair/cleantags.php index fa11a7f736e..214e2a17c94 100644 --- a/tests/lib/repair/cleantags.php +++ b/tests/lib/repair/cleantags.php @@ -8,6 +8,7 @@ namespace Test\Repair; use OCP\DB\QueryBuilder\IQueryBuilder; +use OCP\Migration\IOutput; /** * Tests for the cleaning the tags tables @@ -18,7 +19,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder; */ class CleanTags extends \Test\TestCase { - /** @var \OC\RepairStep */ + /** @var \OC\Repair\CleanTags */ protected $repair; /** @var \OCP\IDBConnection */ @@ -27,9 +28,16 @@ class CleanTags extends \Test\TestCase { /** @var int */ protected $createdFile; + /** @var IOutput */ + private $outputMock; + protected function setUp() { parent::setUp(); + $this->outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); + $this->connection = \OC::$server->getDatabaseConnection(); $this->repair = new \OC\Repair\CleanTags($this->connection); $this->cleanUpTables(); @@ -67,15 +75,15 @@ class CleanTags extends \Test\TestCase { $this->assertEntryCount('vcategory_to_object', 4, 'Assert tag entries count before repair step'); $this->assertEntryCount('vcategory', 4, 'Assert tag categories count before repair step'); - self::invokePrivate($this->repair, 'deleteOrphanFileEntries'); + self::invokePrivate($this->repair, 'deleteOrphanFileEntries', [$this->outputMock]); $this->assertEntryCount('vcategory_to_object', 3, 'Assert tag entries count after cleaning file entries'); $this->assertEntryCount('vcategory', 4, 'Assert tag categories count after cleaning file entries'); - self::invokePrivate($this->repair, 'deleteOrphanTagEntries'); + self::invokePrivate($this->repair, 'deleteOrphanTagEntries', [$this->outputMock]); $this->assertEntryCount('vcategory_to_object', 2, 'Assert tag entries count after cleaning tag entries'); $this->assertEntryCount('vcategory', 4, 'Assert tag categories count after cleaning tag entries'); - self::invokePrivate($this->repair, 'deleteOrphanCategoryEntries'); + self::invokePrivate($this->repair, 'deleteOrphanCategoryEntries', [$this->outputMock]); $this->assertEntryCount('vcategory_to_object', 2, 'Assert tag entries count after cleaning category entries'); $this->assertEntryCount('vcategory', 2, 'Assert tag categories count after cleaning category entries'); } diff --git a/tests/lib/repair/dropoldjobs.php b/tests/lib/repair/dropoldjobs.php index a85c6506dbb..c8a4aa3f1c2 100644 --- a/tests/lib/repair/dropoldjobs.php +++ b/tests/lib/repair/dropoldjobs.php @@ -9,6 +9,7 @@ namespace Test\Repair; use OCP\BackgroundJob\IJobList; +use OCP\Migration\IOutput; /** * Tests for the dropping old tables @@ -33,8 +34,13 @@ class DropOldJobs extends \Test\TestCase { $this->assertTrue($this->jobList->has('OC\Cache\FileGlobalGC', null), 'Asserting that the job OC\Cache\FileGlobalGC exists before repairing'); $this->assertTrue($this->jobList->has('OC_Cache_FileGlobalGC', null), 'Asserting that the job OC_Cache_FileGlobalGC exists before repairing'); + /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); + $repair = new \OC\Repair\DropOldJobs($this->jobList); - $repair->run(); + $repair->run($outputMock); $this->assertFalse($this->jobList->has('OC\Cache\FileGlobalGC', null), 'Asserting that the job OC\Cache\FileGlobalGC does not exist after repairing'); $this->assertFalse($this->jobList->has('OC_Cache_FileGlobalGC', null), 'Asserting that the job OC_Cache_FileGlobalGC does not exist after repairing'); diff --git a/tests/lib/repair/dropoldtables.php b/tests/lib/repair/dropoldtables.php index 6ece8cf04d5..d2e1d7c3449 100644 --- a/tests/lib/repair/dropoldtables.php +++ b/tests/lib/repair/dropoldtables.php @@ -7,6 +7,7 @@ */ namespace Test\Repair; +use OCP\Migration\IOutput; /** * Tests for the dropping old tables @@ -31,8 +32,13 @@ class DropOldTables extends \Test\TestCase { $this->assertFalse($this->connection->tableExists('sharing'), 'Asserting that the table oc_sharing does not exist before repairing'); $this->assertTrue($this->connection->tableExists('permissions'), 'Asserting that the table oc_permissions does exist before repairing'); + /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); + $repair = new \OC\Repair\DropOldTables($this->connection); - $repair->run(); + $repair->run($outputMock); $this->assertFalse($this->connection->tableExists('sharing'), 'Asserting that the table oc_sharing does not exist after repairing'); $this->assertFalse($this->connection->tableExists('permissions'), 'Asserting that the table oc_permissions does not exist after repairing'); diff --git a/tests/lib/repair/oldgroupmembershipsharestest.php b/tests/lib/repair/oldgroupmembershipsharestest.php index f02babab21d..cc04a80eef9 100644 --- a/tests/lib/repair/oldgroupmembershipsharestest.php +++ b/tests/lib/repair/oldgroupmembershipsharestest.php @@ -10,6 +10,7 @@ namespace Test\Repair; use OC\Repair\OldGroupMembershipShares; use OC\Share\Constants; +use OCP\Migration\IOutput; /** * Class OldGroupMembershipSharesTest @@ -82,7 +83,12 @@ class OldGroupMembershipSharesTest extends \Test\TestCase { $this->assertEquals([['id' => $parent], ['id' => $group2], ['id' => $user1], ['id' => $member], ['id' => $notAMember]], $rows); $result->closeCursor(); - $repair->run(); + /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); + + $repair->run($outputMock); $query = $this->connection->getQueryBuilder(); $result = $query->select('id') diff --git a/tests/lib/repair/removegetetagentriestest.php b/tests/lib/repair/removegetetagentriestest.php index 12f0ae8a8d6..c00923228d0 100644 --- a/tests/lib/repair/removegetetagentriestest.php +++ b/tests/lib/repair/removegetetagentriestest.php @@ -22,6 +22,7 @@ namespace Test\Repair; use OC\Repair\RemoveGetETagEntries; +use OCP\Migration\IOutput; use Test\TestCase; /** @@ -65,9 +66,14 @@ class RemoveGetETagEntriesTest extends TestCase { $this->assertTrue(in_array($entry, $data), 'Asserts that the entries are the ones from the test data set'); } + /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); + // run repair step $repair = new RemoveGetETagEntries($this->connection); - $repair->run(); + $repair->run($outputMock); // check if test data is correctly modified in DB $stmt = $this->connection->executeQuery($sqlToFetchProperties, [$userName]); diff --git a/tests/lib/repair/repaircollation.php b/tests/lib/repair/repaircollation.php index 8d609aeed38..4efa8ccc552 100644 --- a/tests/lib/repair/repaircollation.php +++ b/tests/lib/repair/repaircollation.php @@ -1,4 +1,6 @@ <?php +use OCP\Migration\IOutput; + /** * Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com> * This file is licensed under the Affero General Public License version 3 or @@ -70,7 +72,12 @@ class TestRepairCollation extends \Test\TestCase { $tables = $this->repair->getAllNonUTF8BinTables($this->connection); $this->assertGreaterThanOrEqual(1, count($tables)); - $this->repair->run(); + /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); + + $this->repair->run($outputMock); $tables = $this->repair->getAllNonUTF8BinTables($this->connection); $this->assertCount(0, $tables); diff --git a/tests/lib/repair/repairinnodb.php b/tests/lib/repair/repairinnodb.php index 5c73b931367..9b02bc46e29 100644 --- a/tests/lib/repair/repairinnodb.php +++ b/tests/lib/repair/repairinnodb.php @@ -6,6 +6,8 @@ * See the COPYING-README file. */ namespace Test\Repair; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; /** * Tests for the converting of MySQL tables to InnoDB engine @@ -16,7 +18,7 @@ namespace Test\Repair; */ class RepairInnoDB extends \Test\TestCase { - /** @var \OC\RepairStep */ + /** @var IRepairStep */ private $repair; /** @var \Doctrine\DBAL\Connection */ @@ -49,7 +51,12 @@ class RepairInnoDB extends \Test\TestCase { $result = $this->countMyIsamTables(); $this->assertEquals(1, $result); - $this->repair->run(); + /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); + + $this->repair->run($outputMock); $result = $this->countMyIsamTables(); $this->assertEquals(0, $result); diff --git a/tests/lib/repair/repairinvalidsharestest.php b/tests/lib/repair/repairinvalidsharestest.php index 9655e0eacbc..a1e871bcc80 100644 --- a/tests/lib/repair/repairinvalidsharestest.php +++ b/tests/lib/repair/repairinvalidsharestest.php @@ -11,6 +11,8 @@ namespace Test\Repair; use OC\Repair\RepairInvalidShares; use OC\Share\Constants; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; use Test\TestCase; /** @@ -22,7 +24,7 @@ use Test\TestCase; */ class RepairInvalidSharesTest extends TestCase { - /** @var \OC\RepairStep */ + /** @var IRepairStep */ private $repair; /** @var \OCP\IDBConnection */ @@ -98,7 +100,12 @@ class RepairInvalidSharesTest extends TestCase { 'token' => $qb->expr()->literal('abcdefg') ])->execute(); - $this->repair->run(); + /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); + + $this->repair->run($outputMock); $results = $this->connection->getQueryBuilder() ->select('*') @@ -167,7 +174,12 @@ class RepairInvalidSharesTest extends TestCase { $this->assertEquals([['id' => $parent], ['id' => $validChild], ['id' => $invalidChild]], $rows); $result->closeCursor(); - $this->repair->run(); + /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); + + $this->repair->run($outputMock); $query = $this->connection->getQueryBuilder(); $result = $query->select('id') diff --git a/tests/lib/repair/repairlegacystorage.php b/tests/lib/repair/repairlegacystorage.php index 3ae6578f7ec..5b560458e76 100644 --- a/tests/lib/repair/repairlegacystorage.php +++ b/tests/lib/repair/repairlegacystorage.php @@ -10,6 +10,8 @@ namespace Test\Repair; use OC\Files\Cache\Cache; use OC\Files\Cache\Storage; +use OCP\Migration\IOutput; +use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; /** @@ -34,7 +36,8 @@ class RepairLegacyStorages extends TestCase { private $legacyStorageId; private $newStorageId; - private $warnings; + /** @var IOutput | PHPUnit_Framework_MockObject_MockObject */ + private $outputMock; protected function setUp() { parent::setUp(); @@ -45,11 +48,9 @@ class RepairLegacyStorages extends TestCase { $this->repair = new \OC\Repair\RepairLegacyStorages($this->config, $this->connection); - $this->warnings = []; - - $this->repair->listen('\OC\Repair', 'warning', function ($description){ - $this->warnings[] = $description; - }); + $this->outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); } protected function tearDown() { @@ -141,7 +142,7 @@ class RepairLegacyStorages extends TestCase { $this->prepareSettings($dataDir, $userId); $newStorageNumId = $this->createStorage($this->newStorageId); - $this->repair->run(); + $this->repair->run($this->outputMock); $this->assertNull($this->getStorageId($this->legacyStorageId)); $this->assertEquals($newStorageNumId, $this->getStorageId($this->newStorageId)); @@ -160,7 +161,7 @@ class RepairLegacyStorages extends TestCase { $this->prepareSettings($dataDir, $userId); $legacyStorageNumId = $this->createStorage($this->legacyStorageId); - $this->repair->run(); + $this->repair->run($this->outputMock); $this->assertNull($this->getStorageId($this->legacyStorageId)); $this->assertEquals($legacyStorageNumId, $this->getStorageId($this->newStorageId)); @@ -182,7 +183,7 @@ class RepairLegacyStorages extends TestCase { $this->createData($this->legacyStorageId); - $this->repair->run(); + $this->repair->run($this->outputMock); $this->assertNull($this->getStorageId($this->legacyStorageId)); $this->assertEquals($legacyStorageNumId, $this->getStorageId($this->newStorageId)); @@ -205,7 +206,7 @@ class RepairLegacyStorages extends TestCase { $this->createData($this->newStorageId); - $this->repair->run(); + $this->repair->run($this->outputMock); $this->assertNull($this->getStorageId($this->legacyStorageId)); $this->assertEquals($newStorageNumId, $this->getStorageId($this->newStorageId)); @@ -228,10 +229,8 @@ class RepairLegacyStorages extends TestCase { $this->createData($this->legacyStorageId); $this->createData($this->newStorageId); - $this->repair->run(); - - $this->assertEquals(2, count($this->warnings)); - $this->assertEquals('Could not repair legacy storage ', substr(current($this->warnings), 0, 32)); + $this->outputMock->expects($this->exactly(2))->method('warning'); + $this->repair->run($this->outputMock); // storages left alone $this->assertEquals($legacyStorageNumId, $this->getStorageId($this->legacyStorageId)); @@ -254,7 +253,7 @@ class RepairLegacyStorages extends TestCase { $storageId = 'local::' . $this->dataDir; $numId = $this->createStorage($storageId); - $this->repair->run(); + $this->repair->run($this->outputMock); $this->assertEquals($numId, $this->getStorageId($storageId)); } @@ -272,7 +271,7 @@ class RepairLegacyStorages extends TestCase { $storageId = 'local::/tmp/somedir/' . $this->user; $numId = $this->createStorage($storageId); - $this->repair->run(); + $this->repair->run($this->outputMock); $this->assertEquals($numId, $this->getStorageId($storageId)); } @@ -290,7 +289,7 @@ class RepairLegacyStorages extends TestCase { $storageId = 'smb::user@password/tmp/somedir/' . $this->user; $numId = $this->createStorage($storageId); - $this->repair->run(); + $this->repair->run($this->outputMock); $this->assertEquals($numId, $this->getStorageId($storageId)); } @@ -322,21 +321,15 @@ class RepairLegacyStorages extends TestCase { * Only run the repair once */ public function testOnlyRunOnce() { - $output = array(); - $this->repair->listen('\OC\Repair', 'info', function ($description) use (&$output) { - $output[] = 'info: ' . $description; - }); + $this->outputMock->expects($this->exactly(1))->method('info'); $this->prepareSettings('/tmp/oc-autotest/datadir', $this->getUniqueID('user_')); $this->assertNotEquals('yes', $this->config->getAppValue('core', 'repairlegacystoragesdone')); - $this->repair->run(); - $this->assertEquals(1, count($output)); + $this->repair->run($this->outputMock); $this->assertEquals('yes', $this->config->getAppValue('core', 'repairlegacystoragesdone')); - $output = array(); - $this->repair->run(); - // no output which means it did not run - $this->assertEquals(0, count($output)); + $this->outputMock->expects($this->never())->method('info'); + $this->repair->run($this->outputMock); $this->assertEquals('yes', $this->config->getAppValue('core', 'repairlegacystoragesdone')); } } diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php index a9ebb7bc88a..d8ef95e9546 100644 --- a/tests/lib/repair/repairmimetypes.php +++ b/tests/lib/repair/repairmimetypes.php @@ -8,6 +8,12 @@ */ namespace Test\Repair; +use OC\Files\Storage\Temporary; +use OCP\Files\IMimeTypeLoader; +use OCP\IConfig; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; + /** * Tests for the converting of legacy storages to home storages. * @@ -17,17 +23,22 @@ namespace Test\Repair; */ class RepairMimeTypes extends \Test\TestCase { - /** @var \OC\RepairStep */ + /** @var IRepairStep */ private $repair; + /** @var Temporary */ private $storage; + /** @var IMimeTypeLoader */ + private $mimetypeLoader; + protected function setUp() { parent::setUp(); $this->savedMimetypeLoader = \OC::$server->getMimeTypeLoader(); $this->mimetypeLoader = \OC::$server->getMimeTypeLoader(); + /** @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config */ $config = $this->getMockBuilder('OCP\IConfig') ->disableOriginalConstructor() ->getMock(); @@ -96,7 +107,12 @@ class RepairMimeTypes extends \Test\TestCase { private function renameMimeTypes($currentMimeTypes, $fixedMimeTypes) { $this->addEntries($currentMimeTypes); - $this->repair->run(); + /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); + + $this->repair->run($outputMock); // force mimetype reload $this->mimetypeLoader->reset(); diff --git a/tests/lib/repair/repairsharepropagation.php b/tests/lib/repair/repairsharepropagation.php index 6ec8b98ec56..34b47397a53 100644 --- a/tests/lib/repair/repairsharepropagation.php +++ b/tests/lib/repair/repairsharepropagation.php @@ -9,6 +9,7 @@ namespace Test\Repair; use OC\Repair\SharePropagation; +use OCP\Migration\IOutput; class RepairSharePropagation extends \Test\TestCase { public function keyProvider() { @@ -40,8 +41,13 @@ class RepairSharePropagation extends \Test\TestCase { $removedKeys[] = $key; })); + /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); + $step = new SharePropagation($config); - $step->run(); + $step->run($outputMock); sort($expectedRemovedKeys); sort($removedKeys); diff --git a/tests/lib/repair/repairsqliteautoincrement.php b/tests/lib/repair/repairsqliteautoincrement.php index 6f0c2cb8d28..581857ebfc9 100644 --- a/tests/lib/repair/repairsqliteautoincrement.php +++ b/tests/lib/repair/repairsqliteautoincrement.php @@ -7,6 +7,7 @@ */ namespace Test\Repair; +use OCP\Migration\IOutput; /** * Tests for fixing the SQLite id recycling @@ -76,7 +77,12 @@ class RepairSqliteAutoincrement extends \Test\TestCase { public function testConvertIdColumn() { $this->assertFalse($this->checkAutoincrement()); - $this->repair->run(); + /** @var IOutput | \PHPUnit_Framework_MockObject_MockObject $outputMock */ + $outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') + ->disableOriginalConstructor() + ->getMock(); + + $this->repair->run($outputMock); $this->assertTrue($this->checkAutoincrement()); } diff --git a/tests/lib/repair/updateoutdatedocsids.php b/tests/lib/repair/updateoutdatedocsids.php index 3669a64371f..06e2cb1d610 100644 --- a/tests/lib/repair/updateoutdatedocsids.php +++ b/tests/lib/repair/updateoutdatedocsids.php @@ -30,7 +30,7 @@ use Test\TestCase; * @package Test\Repair */ class UpdateOutdatedOcsIds extends TestCase { - /** @var IConfig */ + /** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ private $config; /** @var \OC\Repair\UpdateOutdatedOcsIds */ private $updateOutdatedOcsIds; |
