From 5c343464799346a1caf0cd6540e7d6510df255c6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 22 Jul 2016 14:44:00 +0200 Subject: [PATCH 01/29] Allow downgrades of maintenance accross vendors --- lib/private/Updater.php | 29 ++++++++++++++++++++++++++++- lib/private/legacy/app.php | 2 +- tests/lib/UpdaterTest.php | 13 ++++++++++++- version.php | 2 ++ 4 files changed, 43 insertions(+), 3 deletions(-) diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 0a6d9c9a31..609e965bfa 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -183,6 +183,18 @@ class Updater extends BasicEmitter { return implode('.', $OC_VersionCanBeUpgradedFrom); } + /** + * Return vendor from which this version was published + * + * @return string Get the vendor + */ + private function getVendor() { + // this should really be a JSON file + require \OC::$SERVERROOT . '/version.php'; + /** @var string $vendor */ + return (string) $vendor; + } + /** * Whether an upgrade to a specified version is possible * @param string $oldVersion @@ -191,8 +203,22 @@ class Updater extends BasicEmitter { * @return bool */ public function isUpgradePossible($oldVersion, $newVersion, $allowedPreviousVersion) { - return (version_compare($allowedPreviousVersion, $oldVersion, '<=') + $allowedUpgrade = (version_compare($allowedPreviousVersion, $oldVersion, '<=') && (version_compare($oldVersion, $newVersion, '<=') || $this->config->getSystemValue('debug', false))); + + if ($allowedUpgrade) { + return $allowedUpgrade; + } + + // Upgrade not allowed, someone switching vendor? + if ($this->getVendor() !== $this->config->getAppValue('core', 'vendor', '')) { + $oldVersion = explode('.', $oldVersion); + $newVersion = explode('.', $newVersion); + + return $oldVersion[0] === $newVersion[0] && $oldVersion[1] === $newVersion[1]; + } + + return false; } /** @@ -279,6 +305,7 @@ class Updater extends BasicEmitter { // only set the final version if everything went well $this->config->setSystemValue('version', implode('.', \OCP\Util::getVersion())); + $this->config->setAppValue('core', 'vendor', $this->getVendor()); } } diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 4cfa68cff2..b0f28498ff 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -989,7 +989,7 @@ class OC_App { $currentVersion = OC_App::getAppVersion($app); if ($currentVersion && isset($versions[$app])) { $installedVersion = $versions[$app]; - if (version_compare($currentVersion, $installedVersion, '>')) { + if (!version_compare($currentVersion, $installedVersion, '=')) { return true; } } diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php index 643a18cc71..e45a9f0824 100644 --- a/tests/lib/UpdaterTest.php +++ b/tests/lib/UpdaterTest.php @@ -137,6 +137,12 @@ class UpdaterTest extends \Test\TestCase { ['8.1.0.0', '8.2.0.0', '8.1', true, true], ['8.2.0.1', '8.2.0.1', '8.1', true, true], ['8.3.0.0', '8.2.0.0', '8.1', true, true], + + // Downgrade of maintenance + ['9.0.53.0', '9.0.4.0', '8.1', false, false, 'nextcloud'], + // with vendor switch + ['9.0.53.0', '9.0.4.0', '8.1', true, false, ''], + ['9.0.53.0', '9.0.4.0', '8.1', true, false, 'owncloud'], ]; } @@ -148,12 +154,17 @@ class UpdaterTest extends \Test\TestCase { * @param string $allowedVersion * @param bool $result * @param bool $debug + * @param string $vendor */ - public function testIsUpgradePossible($oldVersion, $newVersion, $allowedVersion, $result, $debug = false) { + public function testIsUpgradePossible($oldVersion, $newVersion, $allowedVersion, $result, $debug = false, $vendor = 'nextcloud') { $this->config->expects($this->any()) ->method('getSystemValue') ->with('debug', false) ->willReturn($debug); + $this->config->expects($this->any()) + ->method('getAppValue') + ->with('core', 'vendor', '') + ->willReturn($vendor); $this->assertSame($result, $this->updater->isUpgradePossible($oldVersion, $newVersion, $allowedVersion)); } diff --git a/version.php b/version.php index 562dda0a79..62adec076b 100644 --- a/version.php +++ b/version.php @@ -38,3 +38,5 @@ $OC_Channel = 'git'; // The build number $OC_Build = ''; +// Vendor of this package +$vendor = 'nextcloud'; From 6b807af619cd3b531213bc312749f46a82bc5075 Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Sun, 31 Jul 2016 11:57:03 +0200 Subject: [PATCH 02/29] Fix closing app menu on mobile --- core/js/js.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/js/js.js b/core/js/js.js index d2bbbae636..4e8d3a0141 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1574,6 +1574,10 @@ function initCore() { $target.closest('.app-navigation-noclose').length) { return; } + if($target.is('.app-navigation-entry-utils-menu-button') || + $target.closest('.app-navigation-entry-utils-menu-button').length) { + return; + } if($target.is('.add-new') || $target.closest('.add-new').length) { return; From 63f6d2d558f4b999f3851482122f3e3589ce4cfc Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 1 Aug 2016 16:37:48 +0200 Subject: [PATCH 03/29] Allow ocs/v2.php/cloud/... routes One of the possibilities of the old OCS API is that you can define the url yourself. This PR makes this possible again by adding an optional root elemenet to the route. Routes are thus: .../ocs/v2.php// By default = apps/ This will allow for example the provisioning API etc to be in ../ovs/v2/php/cloud/users --- lib/private/AppFramework/Routing/RouteConfig.php | 8 +++++++- lib/private/Route/Router.php | 2 +- tests/lib/AppFramework/Routing/RoutingTest.php | 14 +++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/private/AppFramework/Routing/RouteConfig.php b/lib/private/AppFramework/Routing/RouteConfig.php index 066c0da113..e94f2e50c1 100644 --- a/lib/private/AppFramework/Routing/RouteConfig.php +++ b/lib/private/AppFramework/Routing/RouteConfig.php @@ -86,7 +86,13 @@ class RouteConfig { $postfix = $ocsRoute['postfix']; } - $url = $ocsRoute['url']; + if (isset($ocsRoute['root'])) { + $root = $ocsRoute['root']; + } else { + $root = '/apps/'.$this->appName; + } + + $url = $root . $ocsRoute['url']; $verb = isset($ocsRoute['verb']) ? strtoupper($ocsRoute['verb']) : 'GET'; $split = explode('#', $name, 2); diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php index ac42c4025c..9df7418444 100644 --- a/lib/private/Route/Router.php +++ b/lib/private/Route/Router.php @@ -154,7 +154,7 @@ class Router implements IRouter { // Also add the OCS collection $collection = $this->getCollection($app.'.ocs'); - $collection->addPrefix('/ocsapp/apps/' . $app); + $collection->addPrefix('/ocsapp'); $this->root->addCollection($collection); } } diff --git a/tests/lib/AppFramework/Routing/RoutingTest.php b/tests/lib/AppFramework/Routing/RoutingTest.php index 6c8b0f4013..d395584d01 100644 --- a/tests/lib/AppFramework/Routing/RoutingTest.php +++ b/tests/lib/AppFramework/Routing/RoutingTest.php @@ -24,7 +24,7 @@ class RoutingTest extends \Test\TestCase ] ]; - $this->assertSimpleOCSRoute($routes, 'folders.open', 'GET', '/folders/{folderId}/open', 'FoldersController', 'open'); + $this->assertSimpleOCSRoute($routes, 'folders.open', 'GET', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open'); } public function testSimpleRouteWithMissingVerb() @@ -42,7 +42,7 @@ class RoutingTest extends \Test\TestCase ] ]; - $this->assertSimpleOCSRoute($routes, 'folders.open', 'GET', '/folders/{folderId}/open', 'FoldersController', 'open'); + $this->assertSimpleOCSRoute($routes, 'folders.open', 'GET', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open'); } public function testSimpleRouteWithLowercaseVerb() @@ -60,7 +60,7 @@ class RoutingTest extends \Test\TestCase ] ]; - $this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open'); + $this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open'); } public function testSimpleRouteWithRequirements() @@ -78,7 +78,7 @@ class RoutingTest extends \Test\TestCase ] ]; - $this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open', ['something']); + $this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', ['something']); } public function testSimpleRouteWithDefaults() @@ -97,7 +97,7 @@ class RoutingTest extends \Test\TestCase ] ]; - $this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open', [], ['param' => 'foobar']); + $this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', [], ['param' => 'foobar']); } public function testSimpleRouteWithPostfix() @@ -115,7 +115,7 @@ class RoutingTest extends \Test\TestCase ] ]; - $this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open', [], [], '_something'); + $this->assertSimpleOCSRoute($routes, 'folders.open', 'DELETE', '/apps/app1/folders/{folderId}/open', 'FoldersController', 'open', [], [], '_something'); } /** @@ -175,7 +175,7 @@ class RoutingTest extends \Test\TestCase ['name' => 'admin_folders#open_current', 'url' => '/folders/{folderId}/open', 'verb' => 'delete'] ]]; - $this->assertSimpleOCSRoute($routes, 'admin_folders.open_current', 'DELETE', '/folders/{folderId}/open', 'AdminFoldersController', 'openCurrent'); + $this->assertSimpleOCSRoute($routes, 'admin_folders.open_current', 'DELETE', '/apps/app1/folders/{folderId}/open', 'AdminFoldersController', 'openCurrent'); } public function testResource() From 3f859d8a3825168a286b7a9dd9ba3b915800d81a Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 9 Aug 2016 13:37:25 +0200 Subject: [PATCH 04/29] Remove AGPL title --- settings/templates/settings.development.notice.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php index 4e6bbd8db9..a96661e5de 100644 --- a/settings/templates/settings.development.notice.php +++ b/settings/templates/settings.development.notice.php @@ -1,4 +1,6 @@ - +

', '', ], - $l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.') + $l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.') )); ?>

From e783006fe26ef8752637bc3f57082acbe90a93a0 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 9 Aug 2016 13:46:41 +0200 Subject: [PATCH 05/29] make disabled apps more clear during upgrade --- core/Command/Upgrade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index 77d67534c6..69354272de 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -250,10 +250,10 @@ class Upgrade extends Command { $output->writeln('Checked database schema update'); }); $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use($output) { - $output->writeln('Disabled incompatible app: ' . $app . ''); + $output->writeln('Disabled incompatible app: ' . $app . ''); }); $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) { - $output->writeln('Disabled 3rd-party app: ' . $app . ''); + $output->writeln('Disabled 3rd-party app: ' . $app . ''); }); $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($output) { $output->writeln('Update 3rd-party app: ' . $app . ''); From 81b45d0c90616f035a62cdcc742bcca2dc61ecfd Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 9 Aug 2016 14:12:39 +0200 Subject: [PATCH 06/29] Admin setting PHP and SMTP casing --- settings/templates/admin.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 74fe585962..730e60cfad 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -39,14 +39,14 @@ $mail_smtpsecure = [ ]; $mail_smtpmode = [ - 'php', - 'smtp', + ['php', 'PHP'], + ['smtp', 'SMTP'], ]; if ($_['sendmail_is_available']) { - $mail_smtpmode[] = 'sendmail'; + $mail_smtpmode[] = ['sendmail', 'Sendmail']; } if ($_['mail_smtpmode'] == 'qmail') { - $mail_smtpmode[] = 'qmail'; + $mail_smtpmode[] = ['qmail', 'qmail']; } ?> @@ -414,10 +414,10 @@ if ($_['cronErrors']) { From a999420c7561791a30ac05ac389876f45aa6c11b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 9 Aug 2016 15:52:13 +0200 Subject: [PATCH 07/29] get shared storage storage id without setting up the storage --- apps/files_sharing/lib/SharedMount.php | 13 +++++++++++++ lib/private/Files/Config/LazyStorageMountInfo.php | 6 +----- lib/private/Files/Mount/MountPoint.php | 7 +++++++ lib/public/Files/Mount/IMountPoint.php | 8 ++++++++ 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php index 57610db907..d160eb2422 100644 --- a/apps/files_sharing/lib/SharedMount.php +++ b/apps/files_sharing/lib/SharedMount.php @@ -235,4 +235,17 @@ class SharedMount extends MountPoint implements MoveableMount { public function getStorageRootId() { return $this->getShare()->getNodeId(); } + + /** + * @return int + */ + public function getNumericStorageId() { + $builder = \OC::$server->getDatabaseConnection()->getQueryBuilder(); + + $query = $builder->select('storage') + ->from('filecache') + ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getShare()->getNodeId()))); + + return $query->execute()->fetchColumn(); + } } diff --git a/lib/private/Files/Config/LazyStorageMountInfo.php b/lib/private/Files/Config/LazyStorageMountInfo.php index 2e9639f5f0..4df813d57d 100644 --- a/lib/private/Files/Config/LazyStorageMountInfo.php +++ b/lib/private/Files/Config/LazyStorageMountInfo.php @@ -48,11 +48,7 @@ class LazyStorageMountInfo extends CachedMountInfo { */ public function getStorageId() { if (!$this->storageId) { - $storage = $this->mount->getStorage(); - if (!$storage) { - return -1; - } - $this->storageId = $storage->getStorageCache()->getNumericId(); + $this->storageId = $this->mount->getNumericStorageId(); } return parent::getStorageId(); } diff --git a/lib/private/Files/Mount/MountPoint.php b/lib/private/Files/Mount/MountPoint.php index d6a6a5565a..8b8f0574ae 100644 --- a/lib/private/Files/Mount/MountPoint.php +++ b/lib/private/Files/Mount/MountPoint.php @@ -191,6 +191,13 @@ class MountPoint implements IMountPoint { return $this->storageId; } + /** + * @return int + */ + public function getNumericStorageId() { + return $this->getStorage()->getStorageCache()->getNumericId(); + } + /** * @param string $path * @return string diff --git a/lib/public/Files/Mount/IMountPoint.php b/lib/public/Files/Mount/IMountPoint.php index f9a00af7cb..0876d8b11d 100644 --- a/lib/public/Files/Mount/IMountPoint.php +++ b/lib/public/Files/Mount/IMountPoint.php @@ -61,6 +61,14 @@ interface IMountPoint { */ public function getStorageId(); + /** + * Get the id of the storages + * + * @return int + * @since 9.1.0 + */ + public function getNumericStorageId(); + /** * Get the path relative to the mountpoint * From 7a4e5d8f40f3a893078272018443ab44caea0154 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 9 Aug 2016 19:55:58 +0200 Subject: [PATCH 08/29] Open exiration date picker directly on toggle --- core/js/sharedialogexpirationview.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js index fa5c0c0098..1770bdd5a7 100644 --- a/core/js/sharedialogexpirationview.js +++ b/core/js/sharedialogexpirationview.js @@ -96,6 +96,8 @@ this.model.saveLinkShare({ expireDate: '' }); + } else { + this.$el.find('#expirationDate').focus(); } }, From 575875e8d03e1396bcdb1fac75a7c6076fd92287 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 9 Aug 2016 10:21:20 +0200 Subject: [PATCH 09/29] Allow OCS routes in Core and Settings --- core/Controller/OCSController.php | 44 +++++++++++++++++++++++++++++++ lib/private/Route/Router.php | 5 ++++ 2 files changed, 49 insertions(+) create mode 100644 core/Controller/OCSController.php diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php new file mode 100644 index 0000000000..278a16186b --- /dev/null +++ b/core/Controller/OCSController.php @@ -0,0 +1,44 @@ +capabilitiesManager = $capabilitiesManager; + } + + public function getCapabilities() { + $result = []; + list($major, $minor, $micro) = \OCP\Util::getVersion(); + $result['version'] = array( + 'major' => $major, + 'minor' => $minor, + 'micro' => $micro, + 'string' => \OC_Util::getVersionString(), + 'edition' => \OC_Util::getEditionString(), + ); + + $result['capabilities'] = $this->capabilitiesManager->getCapabilities(); + + return new DataResponse(['data' => $result]); + } +} \ No newline at end of file diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php index 9df7418444..59f403d66e 100644 --- a/lib/private/Route/Router.php +++ b/lib/private/Route/Router.php @@ -163,6 +163,11 @@ class Router implements IRouter { $this->useCollection('root'); require_once __DIR__ . '/../../../settings/routes.php'; require_once __DIR__ . '/../../../core/routes.php'; + + // Also add the OCS collection + $collection = $this->getCollection('root.ocs'); + $collection->addPrefix('/ocsapp'); + $this->root->addCollection($collection); } if ($this->loaded) { // include ocs routes, must be loaded last for /ocs prefix From 02449c83365fae8d5a47b001b18605478122bd86 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 9 Aug 2016 10:21:51 +0200 Subject: [PATCH 10/29] Move getCapabilities over to Core --- core/Application.php | 3 +++ core/Controller/OCSController.php | 27 +++++++++++++++++++++++++-- core/routes.php | 3 +++ lib/private/OCS/Cloud.php | 16 ---------------- ocs/routes.php | 7 ------- 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/core/Application.php b/core/Application.php index a0deaff2b9..e8c924432d 100644 --- a/core/Application.php +++ b/core/Application.php @@ -186,6 +186,9 @@ class Application extends App { $container->registerService('TwoFactorAuthManager', function(SimpleContainer $c) { return $c->query('ServerContainer')->getTwoFactorAuthManager(); }); + $container->registerService('OC\CapabilitiesManager', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getCapabilitiesManager(); + }); } } diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php index 278a16186b..750ab37eb8 100644 --- a/core/Controller/OCSController.php +++ b/core/Controller/OCSController.php @@ -1,5 +1,24 @@ + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ namespace OC\Core\Controller; use OC\CapabilitiesManager; @@ -26,6 +45,10 @@ class OCSController extends \OCP\AppFramework\OCSController { $this->capabilitiesManager = $capabilitiesManager; } + /** + * @NoAdminRequired + * @return DataResponse + */ public function getCapabilities() { $result = []; list($major, $minor, $micro) = \OCP\Util::getVersion(); @@ -41,4 +64,4 @@ class OCSController extends \OCP\AppFramework\OCSController { return new DataResponse(['data' => $result]); } -} \ No newline at end of file +} diff --git a/core/routes.php b/core/routes.php index 98454946d4..92ce4440ec 100644 --- a/core/routes.php +++ b/core/routes.php @@ -53,6 +53,9 @@ $application->registerRoutes($this, [ ['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'], ['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'], ], + 'ocs' => [ + ['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'], + ], ]); // Post installation check diff --git a/lib/private/OCS/Cloud.php b/lib/private/OCS/Cloud.php index 84fcfe6e51..3a00fa3756 100644 --- a/lib/private/OCS/Cloud.php +++ b/lib/private/OCS/Cloud.php @@ -27,22 +27,6 @@ namespace OC\OCS; class Cloud { - public static function getCapabilities() { - $result = array(); - list($major, $minor, $micro) = \OCP\Util::getVersion(); - $result['version'] = array( - 'major' => $major, - 'minor' => $minor, - 'micro' => $micro, - 'string' => \OC_Util::getVersionString(), - 'edition' => \OC_Util::getEditionString(), - ); - - $result['capabilities'] = \OC::$server->getCapabilitiesManager()->getCapabilities(); - - return new Result($result); - } - public static function getCurrentUser() { $userObject = \OC::$server->getUserManager()->get(\OC_User::getUser()); $data = array( diff --git a/ocs/routes.php b/ocs/routes.php index 0606fe3e30..bb24c79eba 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -84,13 +84,6 @@ API::register( API::USER_AUTH ); // cloud -API::register( - 'get', - '/cloud/capabilities', - array('OC_OCS_Cloud', 'getCapabilities'), - 'core', - API::USER_AUTH - ); API::register( 'get', '/cloud/user', From 69da896785cf3baab583577b119310c1a2938a64 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 9 Aug 2016 11:27:55 +0200 Subject: [PATCH 11/29] Move /cloud/user to Core app --- core/Controller/OCSController.php | 23 ++++++++++++++++++++++- core/routes.php | 1 + ocs/routes.php | 8 -------- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php index 750ab37eb8..d5783ae32e 100644 --- a/core/Controller/OCSController.php +++ b/core/Controller/OCSController.php @@ -24,25 +24,32 @@ namespace OC\Core\Controller; use OC\CapabilitiesManager; use OCP\AppFramework\Http\DataResponse; use OCP\IRequest; +use OCP\IUserSession; class OCSController extends \OCP\AppFramework\OCSController { /** @var CapabilitiesManager */ private $capabilitiesManager; + /** @var IUserSession */ + private $userSession; + /** * OCSController constructor. * * @param string $appName * @param IRequest $request * @param CapabilitiesManager $capabilitiesManager + * @param IUserSession $userSession */ public function __construct($appName, IRequest $request, - CapabilitiesManager $capabilitiesManager) { + CapabilitiesManager $capabilitiesManager, + IUserSession $userSession) { parent::__construct($appName, $request); $this->capabilitiesManager = $capabilitiesManager; + $this->userSession = $userSession; } /** @@ -64,4 +71,18 @@ class OCSController extends \OCP\AppFramework\OCSController { return new DataResponse(['data' => $result]); } + + /** + * @NoAdminRequired + * @return DataResponse + */ + public function getCurrentUser() { + $userObject = $this->userSession->getUser(); + $data = [ + 'id' => $userObject->getUID(), + 'display-name' => $userObject->getDisplayName(), + 'email' => $userObject->getEMailAddress(), + ]; + return new DataResponse(['data' => $data]); + } } diff --git a/core/routes.php b/core/routes.php index 92ce4440ec..b4868c14cf 100644 --- a/core/routes.php +++ b/core/routes.php @@ -55,6 +55,7 @@ $application->registerRoutes($this, [ ], 'ocs' => [ ['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'], + ['root' => '/cloud', 'name' => 'OCS#getCurrentUser', 'url' => '/user', 'verb' => 'GET'], ], ]); diff --git a/ocs/routes.php b/ocs/routes.php index bb24c79eba..ae2ef05adc 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -83,14 +83,6 @@ API::register( 'core', API::USER_AUTH ); -// cloud -API::register( - 'get', - '/cloud/user', - array('OC_OCS_Cloud', 'getCurrentUser'), - 'core', - API::USER_AUTH -); // Server-to-Server Sharing if (\OC::$server->getAppManager()->isEnabledForUser('files_sharing')) { From e2f54559d663667554394f2ddaedad5c9114ec76 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 9 Aug 2016 11:29:54 +0200 Subject: [PATCH 12/29] Remove OC_OCS_Cloud and OC\OCS\Cloud --- lib/private/OCS/Cloud.php | 39 -------------------------------- lib/private/legacy/ocs/cloud.php | 28 ----------------------- 2 files changed, 67 deletions(-) delete mode 100644 lib/private/OCS/Cloud.php delete mode 100644 lib/private/legacy/ocs/cloud.php diff --git a/lib/private/OCS/Cloud.php b/lib/private/OCS/Cloud.php deleted file mode 100644 index 3a00fa3756..0000000000 --- a/lib/private/OCS/Cloud.php +++ /dev/null @@ -1,39 +0,0 @@ - - * @author Roeland Jago Douma - * @author Thomas Müller - * @author Tom Needham - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see - * - */ - -namespace OC\OCS; - -class Cloud { - - public static function getCurrentUser() { - $userObject = \OC::$server->getUserManager()->get(\OC_User::getUser()); - $data = array( - 'id' => $userObject->getUID(), - 'display-name' => $userObject->getDisplayName(), - 'email' => $userObject->getEMailAddress(), - ); - return new Result($data); - } -} diff --git a/lib/private/legacy/ocs/cloud.php b/lib/private/legacy/ocs/cloud.php deleted file mode 100644 index 1115295830..0000000000 --- a/lib/private/legacy/ocs/cloud.php +++ /dev/null @@ -1,28 +0,0 @@ - - * @author Thomas Müller - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see - * - */ - -/** - * @deprecated Since 9.1.0 use \OC\OCS\Cloud - */ -class OC_OCS_Cloud extends \OC\OCS\Cloud { -} From ef17f8b3baf143b907ab4193f46221e39f84d381 Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Tue, 9 Aug 2016 22:54:25 +0200 Subject: [PATCH 13/29] Add css classes to allow app developers using the theming colors --- apps/theming/lib/Controller/ThemingController.php | 5 +++++ .../tests/Controller/ThemingControllerTest.php | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php index 8d9869b84a..07bbee4323 100644 --- a/apps/theming/lib/Controller/ThemingController.php +++ b/apps/theming/lib/Controller/ThemingController.php @@ -294,6 +294,8 @@ class ThemingController extends Controller { color: ' . $color . '; } '; + $responseCss .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color); + $responseCss .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color); } $logo = $this->config->getAppValue($this->appName, 'logoMime'); @@ -325,6 +327,9 @@ class ThemingController extends Controller { $responseCss .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n"; $responseCss .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n"; $responseCss .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . "\n"; + $responseCss .= '.nc-theming-contrast {color: #000000}' . "\n"; + } else { + $responseCss .= '.nc-theming-contrast {color: #ffffff}' . "\n"; } $response = new DataDownloadResponse($responseCss, 'style', 'text/css'); diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index 82eb8259af..1129baafe4 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -392,6 +392,9 @@ class ThemingControllerTest extends TestCase { color: ' . $color . '; } '; + $expectedData .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color); + $expectedData .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color); + $expectedData .= '.nc-theming-contrast {color: #ffffff}' . "\n"; $expected = new Http\DataDownloadResponse($expectedData, 'style', 'text/css'); @@ -448,10 +451,13 @@ class ThemingControllerTest extends TestCase { color: ' . $color . '; } '; + $expectedData .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color); + $expectedData .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color); $expectedData .= '#header .header-appname, #expandDisplayName { color: #000000; }' . "\n"; $expectedData .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n"; $expectedData .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n"; $expectedData .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . "\n"; + $expectedData .= '.nc-theming-contrast {color: #000000}' . "\n"; $expected = new Http\DataDownloadResponse($expectedData, 'style', 'text/css'); @@ -495,6 +501,7 @@ class ThemingControllerTest extends TestCase { 'background-image: url(\'./logo?v=0\');' . 'background-size: contain;' . '}' . "\n"; + $expectedData .= '.nc-theming-contrast {color: #ffffff}' . "\n"; $expected = new Http\DataDownloadResponse($expectedData, 'style', 'text/css'); @@ -529,6 +536,7 @@ class ThemingControllerTest extends TestCase { $expectedData .= '#firstrunwizard .firstrunwizard-header {' . 'background-image: url(\'./loginbackground?v=0\');' . '}' . "\n"; + $expectedData .= '.nc-theming-contrast {color: #ffffff}' . "\n"; $expected = new Http\DataDownloadResponse($expectedData, 'style', 'text/css'); @@ -585,6 +593,8 @@ class ThemingControllerTest extends TestCase { color: ' . $color . '; } '; + $expectedData .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color); + $expectedData .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color); $expectedData .= sprintf( '#header .logo {' . 'background-image: url(\'./logo?v=0\');' . @@ -603,6 +613,7 @@ class ThemingControllerTest extends TestCase { $expectedData .= '#firstrunwizard .firstrunwizard-header {' . 'background-image: url(\'./loginbackground?v=0\');' . '}' . "\n"; + $expectedData .= '.nc-theming-contrast {color: #ffffff}' . "\n"; $expected = new Http\DataDownloadResponse($expectedData, 'style', 'text/css'); $expected->cacheFor(3600); @@ -658,6 +669,8 @@ class ThemingControllerTest extends TestCase { color: ' . $color . '; } '; + $expectedData .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color); + $expectedData .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color); $expectedData .= sprintf( '#header .logo {' . 'background-image: url(\'./logo?v=0\');' . @@ -680,6 +693,7 @@ class ThemingControllerTest extends TestCase { $expectedData .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n"; $expectedData .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n"; $expectedData .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . "\n"; + $expectedData .= '.nc-theming-contrast {color: #000000}' . "\n"; $expected = new Http\DataDownloadResponse($expectedData, 'style', 'text/css'); $expected->cacheFor(3600); From d6bee61131d9702483830d39819e6204588eb800 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Wed, 10 Aug 2016 00:09:59 +0000 Subject: [PATCH 14/29] [tx-robot] updated from transifex --- apps/federatedfilesharing/l10n/is.js | 19 ++++++++++++- apps/federatedfilesharing/l10n/is.json | 19 ++++++++++++- apps/federation/l10n/cs_CZ.js | 1 - apps/federation/l10n/cs_CZ.json | 1 - apps/federation/l10n/de.js | 1 - apps/federation/l10n/de.json | 1 - apps/federation/l10n/de_DE.js | 1 - apps/federation/l10n/de_DE.json | 1 - apps/federation/l10n/es.js | 1 - apps/federation/l10n/es.json | 1 - apps/federation/l10n/fr.js | 1 - apps/federation/l10n/fr.json | 1 - apps/federation/l10n/id.js | 1 - apps/federation/l10n/id.json | 1 - apps/federation/l10n/is.js | 1 - apps/federation/l10n/is.json | 1 - apps/federation/l10n/it.js | 1 - apps/federation/l10n/it.json | 1 - apps/federation/l10n/nl.js | 1 - apps/federation/l10n/nl.json | 1 - apps/federation/l10n/pt_BR.js | 1 - apps/federation/l10n/pt_BR.json | 1 - apps/federation/l10n/ru.js | 1 - apps/federation/l10n/ru.json | 1 - apps/federation/l10n/tr.js | 1 - apps/federation/l10n/tr.json | 1 - apps/files_sharing/l10n/is.js | 18 ++++++++++++ apps/files_sharing/l10n/is.json | 18 ++++++++++++ apps/systemtags/l10n/is.js | 9 ++++++ apps/systemtags/l10n/is.json | 9 ++++++ apps/updatenotification/l10n/is.js | 5 +++- apps/updatenotification/l10n/is.json | 5 +++- core/l10n/is.js | 3 ++ core/l10n/is.json | 3 ++ settings/l10n/cs_CZ.js | 1 - settings/l10n/cs_CZ.json | 1 - settings/l10n/de.js | 1 - settings/l10n/de.json | 1 - settings/l10n/de_DE.js | 1 - settings/l10n/de_DE.json | 1 - settings/l10n/en_GB.js | 1 - settings/l10n/en_GB.json | 1 - settings/l10n/es.js | 1 - settings/l10n/es.json | 1 - settings/l10n/fr.js | 1 - settings/l10n/fr.json | 1 - settings/l10n/hu_HU.js | 1 - settings/l10n/hu_HU.json | 1 - settings/l10n/id.js | 1 - settings/l10n/id.json | 1 - settings/l10n/is.js | 39 ++++++++++++++++++++++++++ settings/l10n/is.json | 39 ++++++++++++++++++++++++++ settings/l10n/it.js | 1 - settings/l10n/it.json | 1 - settings/l10n/ja.js | 1 - settings/l10n/ja.json | 1 - settings/l10n/nl.js | 1 - settings/l10n/nl.json | 1 - settings/l10n/pt_BR.js | 1 - settings/l10n/pt_BR.json | 1 - settings/l10n/ru.js | 1 - settings/l10n/ru.json | 1 - settings/l10n/tr.js | 1 - settings/l10n/tr.json | 1 - 64 files changed, 182 insertions(+), 56 deletions(-) diff --git a/apps/federatedfilesharing/l10n/is.js b/apps/federatedfilesharing/l10n/is.js index 58bfa4e8f4..c214078753 100644 --- a/apps/federatedfilesharing/l10n/is.js +++ b/apps/federatedfilesharing/l10n/is.js @@ -1,12 +1,29 @@ OC.L10N.register( "federatedfilesharing", { - "Federated sharing" : "Deiling milli þjóna", + "Federated sharing" : "Deiling milli þjóna (skýjasambandssameign)", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "Viltu bæta við fjartengdri sameign {name} frá {owner}@{remote}?", + "Remote share" : "Fjartengd sameign", + "Remote share password" : "Lykilorð fjartengdrar sameignar", + "Cancel" : "Hætta við", + "Add remote share" : "Bæta við fjartengdri sameign", "Invalid Federated Cloud ID" : "Ógilt skýjasambandsauðkenni (Federated Cloud ID)", + "Server to server sharing is not enabled on this server" : "Deiling frá þjóni til þjóns er ekki virk á þessum þjóni", + "Couldn't establish a federated share." : "Gat ekki bætt við skýjasambandssameign.", + "Couldn't establish a federated share, maybe the password was wrong." : "Gat ekki bætt við skýjasambandssameign, hugsanlega var lykilorðið ekki rétt.", + "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Beiðni um skýjasambandssameign tókst, þú munt fá boðskort. Athugaður skilaboð til þín.", + "The mountpoint name contains invalid characters." : "Heiti tengipunktsins inniheldur ógilda stafi.", + "Not allowed to create a federated share with the owner." : "Ekki er heimilt að búa til skýjasambandssameign með eigandanum.", + "Invalid or untrusted SSL certificate" : "Ógilt eða vantreyst SSL-skilríki", + "Could not authenticate to remote share, password might be wrong" : "Gat ekki auðkennt á fjartengdri sameign, lykilorð gæti verið rangt", + "Storage not valid" : "Geymslan er ekki gild", + "Federated Share successfully added" : "Tókst að bæta við skýjasambandssameign", + "Couldn't add remote share" : "Gat ekki bætt við fjartengdri sameign", "Sharing %s failed, because this item is already shared with %s" : "Deiling %s mistókst, því þessu atriði er þegar deilt með %s", "Not allowed to create a federated share with the same user" : "Ekki er heimilt að búa til skýjasambandssameign með sama notanda", "File is already shared with %s" : "Skránni er þegar deilt með %s", "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.", + "Could not find share" : "Gat ekki fundið sameign", "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Þú tókst við \"/%3$s\" sem fjartengdri sameign frá %1$s (fyrir hönd %2$s)", "You received \"/%3$s\" as a remote share from %1$s" : "Þú tókst við \"/%3$s\" sem fjartengdri sameign frá %1$s", "Accept" : "Samþykkja", diff --git a/apps/federatedfilesharing/l10n/is.json b/apps/federatedfilesharing/l10n/is.json index dabc08d600..bd5af8d462 100644 --- a/apps/federatedfilesharing/l10n/is.json +++ b/apps/federatedfilesharing/l10n/is.json @@ -1,10 +1,27 @@ { "translations": { - "Federated sharing" : "Deiling milli þjóna", + "Federated sharing" : "Deiling milli þjóna (skýjasambandssameign)", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "Viltu bæta við fjartengdri sameign {name} frá {owner}@{remote}?", + "Remote share" : "Fjartengd sameign", + "Remote share password" : "Lykilorð fjartengdrar sameignar", + "Cancel" : "Hætta við", + "Add remote share" : "Bæta við fjartengdri sameign", "Invalid Federated Cloud ID" : "Ógilt skýjasambandsauðkenni (Federated Cloud ID)", + "Server to server sharing is not enabled on this server" : "Deiling frá þjóni til þjóns er ekki virk á þessum þjóni", + "Couldn't establish a federated share." : "Gat ekki bætt við skýjasambandssameign.", + "Couldn't establish a federated share, maybe the password was wrong." : "Gat ekki bætt við skýjasambandssameign, hugsanlega var lykilorðið ekki rétt.", + "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Beiðni um skýjasambandssameign tókst, þú munt fá boðskort. Athugaður skilaboð til þín.", + "The mountpoint name contains invalid characters." : "Heiti tengipunktsins inniheldur ógilda stafi.", + "Not allowed to create a federated share with the owner." : "Ekki er heimilt að búa til skýjasambandssameign með eigandanum.", + "Invalid or untrusted SSL certificate" : "Ógilt eða vantreyst SSL-skilríki", + "Could not authenticate to remote share, password might be wrong" : "Gat ekki auðkennt á fjartengdri sameign, lykilorð gæti verið rangt", + "Storage not valid" : "Geymslan er ekki gild", + "Federated Share successfully added" : "Tókst að bæta við skýjasambandssameign", + "Couldn't add remote share" : "Gat ekki bætt við fjartengdri sameign", "Sharing %s failed, because this item is already shared with %s" : "Deiling %s mistókst, því þessu atriði er þegar deilt með %s", "Not allowed to create a federated share with the same user" : "Ekki er heimilt að búa til skýjasambandssameign með sama notanda", "File is already shared with %s" : "Skránni er þegar deilt með %s", "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.", + "Could not find share" : "Gat ekki fundið sameign", "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Þú tókst við \"/%3$s\" sem fjartengdri sameign frá %1$s (fyrir hönd %2$s)", "You received \"/%3$s\" as a remote share from %1$s" : "Þú tókst við \"/%3$s\" sem fjartengdri sameign frá %1$s", "Accept" : "Samþykkja", diff --git a/apps/federation/l10n/cs_CZ.js b/apps/federation/l10n/cs_CZ.js index 1aa8b18aea..09d3bcf360 100644 --- a/apps/federation/l10n/cs_CZ.js +++ b/apps/federation/l10n/cs_CZ.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Přidán na seznam důvěryhodných serverů.", "Server is already in the list of trusted servers." : "Server je již přidán na seznam důvěryhodných serverů.", - "No server to federate found" : "Nenalezen žádný server ke sdružování", "Could not add server" : "Nepodařilo se přidat server", "Federation" : "Sdružování", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Sdružování vám umožňuje se připojit k dalším důvěryhodným serverům za účelem výměny uživatelských adresářů. Používá se to např. pro automatické doplňování uživatelů při sdruženém sdílení.", diff --git a/apps/federation/l10n/cs_CZ.json b/apps/federation/l10n/cs_CZ.json index 36d7726e0e..84b227e21d 100644 --- a/apps/federation/l10n/cs_CZ.json +++ b/apps/federation/l10n/cs_CZ.json @@ -1,7 +1,6 @@ { "translations": { "Added to the list of trusted servers" : "Přidán na seznam důvěryhodných serverů.", "Server is already in the list of trusted servers." : "Server je již přidán na seznam důvěryhodných serverů.", - "No server to federate found" : "Nenalezen žádný server ke sdružování", "Could not add server" : "Nepodařilo se přidat server", "Federation" : "Sdružování", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Sdružování vám umožňuje se připojit k dalším důvěryhodným serverům za účelem výměny uživatelských adresářů. Používá se to např. pro automatické doplňování uživatelů při sdruženém sdílení.", diff --git a/apps/federation/l10n/de.js b/apps/federation/l10n/de.js index f53f4ebd1b..cb9b63d105 100644 --- a/apps/federation/l10n/de.js +++ b/apps/federation/l10n/de.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Der Liste der vertrauenswürdigen Server hinzugefügt", "Server is already in the list of trusted servers." : "Server ist bereits in der Liste der vertrauenswürdigen Servern.", - "No server to federate found" : "Keinen Server gefunden, der sich verbinden ließe.", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation erlaubt es Dir, dich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Diese Funktion wird beispielsweise für die Autovervollständigung externer Benutzer genutzt und ermöglicht das Teilen von Inhalten mit ihnen (\"federated sharing\").", diff --git a/apps/federation/l10n/de.json b/apps/federation/l10n/de.json index 3b925240fc..d77e452613 100644 --- a/apps/federation/l10n/de.json +++ b/apps/federation/l10n/de.json @@ -1,7 +1,6 @@ { "translations": { "Added to the list of trusted servers" : "Der Liste der vertrauenswürdigen Server hinzugefügt", "Server is already in the list of trusted servers." : "Server ist bereits in der Liste der vertrauenswürdigen Servern.", - "No server to federate found" : "Keinen Server gefunden, der sich verbinden ließe.", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation erlaubt es Dir, dich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Diese Funktion wird beispielsweise für die Autovervollständigung externer Benutzer genutzt und ermöglicht das Teilen von Inhalten mit ihnen (\"federated sharing\").", diff --git a/apps/federation/l10n/de_DE.js b/apps/federation/l10n/de_DE.js index 9d175ae276..a46095be51 100644 --- a/apps/federation/l10n/de_DE.js +++ b/apps/federation/l10n/de_DE.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Der Liste der vertrauenswürdigen Server hinzugefügt", "Server is already in the list of trusted servers." : "Server ist bereits in der Liste der vertrauenswürdigen Servern.", - "No server to federate found" : "Keinen Server gefunden, der sich verbinden ließe.", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation erlaubt es Ihnen sich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Diese Funktion wird beispielsweise für die Autovervollständigung externer Benutzer genutzt und ermöglicht das Teilen von Inhalten mit ihnen (\"federated sharing\").", diff --git a/apps/federation/l10n/de_DE.json b/apps/federation/l10n/de_DE.json index b18b46c70f..6455536410 100644 --- a/apps/federation/l10n/de_DE.json +++ b/apps/federation/l10n/de_DE.json @@ -1,7 +1,6 @@ { "translations": { "Added to the list of trusted servers" : "Der Liste der vertrauenswürdigen Server hinzugefügt", "Server is already in the list of trusted servers." : "Server ist bereits in der Liste der vertrauenswürdigen Servern.", - "No server to federate found" : "Keinen Server gefunden, der sich verbinden ließe.", "Could not add server" : "Konnte Server nicht hinzufügen", "Federation" : "Federation", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation erlaubt es Ihnen sich mit anderen vertrauenswürdigen Servern zu verbinden um das Benutzerverzeichnis auszutauschen. Diese Funktion wird beispielsweise für die Autovervollständigung externer Benutzer genutzt und ermöglicht das Teilen von Inhalten mit ihnen (\"federated sharing\").", diff --git a/apps/federation/l10n/es.js b/apps/federation/l10n/es.js index d2b98ba657..153ada9513 100644 --- a/apps/federation/l10n/es.js +++ b/apps/federation/l10n/es.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Añadido a la lista de servidores de confianza", "Server is already in the list of trusted servers." : "El servidor ya está en la lista de servidores en los que se confía.", - "No server to federate found" : "No se han encontrado servidores para federar", "Could not add server" : "No se ha podido añadir el servidor", "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar directorios. Por ejemplo, ésto se usará para autocompletar la selección usuarios externos al compartir en federación. ", diff --git a/apps/federation/l10n/es.json b/apps/federation/l10n/es.json index b3ddc86e43..d4d474b927 100644 --- a/apps/federation/l10n/es.json +++ b/apps/federation/l10n/es.json @@ -1,7 +1,6 @@ { "translations": { "Added to the list of trusted servers" : "Añadido a la lista de servidores de confianza", "Server is already in the list of trusted servers." : "El servidor ya está en la lista de servidores en los que se confía.", - "No server to federate found" : "No se han encontrado servidores para federar", "Could not add server" : "No se ha podido añadir el servidor", "Federation" : "Federación", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federación te permite conectarte con otros servidores de confianza para intercambiar directorios. Por ejemplo, ésto se usará para autocompletar la selección usuarios externos al compartir en federación. ", diff --git a/apps/federation/l10n/fr.js b/apps/federation/l10n/fr.js index 9113e44017..0953edf829 100644 --- a/apps/federation/l10n/fr.js +++ b/apps/federation/l10n/fr.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Ajouté à la liste des serveurs de confiance", "Server is already in the list of trusted servers." : "Le serveur est déjà dans la liste des serveurs de confiance.", - "No server to federate found" : "Aucun serveur à fédérer n'a été trouvé", "Could not add server" : "Impossible d'ajouter le serveur", "Federation" : "Fédération", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La « fédération » vous permet de vous connecter avec d'autres serveurs de confiance pour échanger la liste des utilisateurs. Par exemple, ce sera utilisé pour auto-compléter les utilisateurs externes lors du partage fédéré.", diff --git a/apps/federation/l10n/fr.json b/apps/federation/l10n/fr.json index 8866733693..bec0ac47df 100644 --- a/apps/federation/l10n/fr.json +++ b/apps/federation/l10n/fr.json @@ -1,7 +1,6 @@ { "translations": { "Added to the list of trusted servers" : "Ajouté à la liste des serveurs de confiance", "Server is already in the list of trusted servers." : "Le serveur est déjà dans la liste des serveurs de confiance.", - "No server to federate found" : "Aucun serveur à fédérer n'a été trouvé", "Could not add server" : "Impossible d'ajouter le serveur", "Federation" : "Fédération", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La « fédération » vous permet de vous connecter avec d'autres serveurs de confiance pour échanger la liste des utilisateurs. Par exemple, ce sera utilisé pour auto-compléter les utilisateurs externes lors du partage fédéré.", diff --git a/apps/federation/l10n/id.js b/apps/federation/l10n/id.js index 99c1caa7df..c4725768ab 100644 --- a/apps/federation/l10n/id.js +++ b/apps/federation/l10n/id.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Server telah ditambahkan pada daftar server terpercaya", "Server is already in the list of trusted servers." : "Server sudah ada pada daftar server terpercaya", - "No server to federate found" : "Tidak ada server yang bisa difederasikan", "Could not add server" : "Tidak dapat menambahkan server", "Federation" : "Federasi", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federasi memungkinkan Anda untuk terhubung dengan server lainnya yang terpercaya untuk menukar direktori pengguna. Contohnya, ini akan digunakan untuk pengisian-otomatis untuk pengguna eksternal untuk pembagian terfederasi.", diff --git a/apps/federation/l10n/id.json b/apps/federation/l10n/id.json index 466396e190..7d8a0c37a9 100644 --- a/apps/federation/l10n/id.json +++ b/apps/federation/l10n/id.json @@ -1,7 +1,6 @@ { "translations": { "Added to the list of trusted servers" : "Server telah ditambahkan pada daftar server terpercaya", "Server is already in the list of trusted servers." : "Server sudah ada pada daftar server terpercaya", - "No server to federate found" : "Tidak ada server yang bisa difederasikan", "Could not add server" : "Tidak dapat menambahkan server", "Federation" : "Federasi", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federasi memungkinkan Anda untuk terhubung dengan server lainnya yang terpercaya untuk menukar direktori pengguna. Contohnya, ini akan digunakan untuk pengisian-otomatis untuk pengguna eksternal untuk pembagian terfederasi.", diff --git a/apps/federation/l10n/is.js b/apps/federation/l10n/is.js index e7016e9b15..88c83aad4a 100644 --- a/apps/federation/l10n/is.js +++ b/apps/federation/l10n/is.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Bætt á lista yfir treysta þjóna", "Server is already in the list of trusted servers." : "Þjónninn er nú þegar á listanum yfir treysta þjóna.", - "No server to federate found" : "Enginn sambandsþjónn fannst", "Could not add server" : "Gat ekki bætt við þjóni", "Federation" : "Samband", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrumtreystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.", diff --git a/apps/federation/l10n/is.json b/apps/federation/l10n/is.json index 4f61cb1258..5277841fe0 100644 --- a/apps/federation/l10n/is.json +++ b/apps/federation/l10n/is.json @@ -1,7 +1,6 @@ { "translations": { "Added to the list of trusted servers" : "Bætt á lista yfir treysta þjóna", "Server is already in the list of trusted servers." : "Þjónninn er nú þegar á listanum yfir treysta þjóna.", - "No server to federate found" : "Enginn sambandsþjónn fannst", "Could not add server" : "Gat ekki bætt við þjóni", "Federation" : "Samband", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrumtreystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.", diff --git a/apps/federation/l10n/it.js b/apps/federation/l10n/it.js index 25b63e62ce..00204dd9f0 100644 --- a/apps/federation/l10n/it.js +++ b/apps/federation/l10n/it.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Aggiunto alla lista dei server affidabili", "Server is already in the list of trusted servers." : "Il server è già nell'elenco dei server affidabili.", - "No server to federate found" : "Non ho trovato alcun server per la federazione", "Could not add server" : "Impossibile aggiungere il server", "Federation" : "Federazione", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione consente di connettersi ad altri server affidabili per accedere alla cartella utente. Ad esempio, può essere utilizzata per il completamento automatico di utenti esterni per la condivisione federata.", diff --git a/apps/federation/l10n/it.json b/apps/federation/l10n/it.json index 46f6aaaf3b..8a57121c74 100644 --- a/apps/federation/l10n/it.json +++ b/apps/federation/l10n/it.json @@ -1,7 +1,6 @@ { "translations": { "Added to the list of trusted servers" : "Aggiunto alla lista dei server affidabili", "Server is already in the list of trusted servers." : "Il server è già nell'elenco dei server affidabili.", - "No server to federate found" : "Non ho trovato alcun server per la federazione", "Could not add server" : "Impossibile aggiungere il server", "Federation" : "Federazione", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "La federazione consente di connettersi ad altri server affidabili per accedere alla cartella utente. Ad esempio, può essere utilizzata per il completamento automatico di utenti esterni per la condivisione federata.", diff --git a/apps/federation/l10n/nl.js b/apps/federation/l10n/nl.js index 1f54a86af0..484fe26b2b 100644 --- a/apps/federation/l10n/nl.js +++ b/apps/federation/l10n/nl.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Toegevoegd aan de lijst met vertrouwde servers", "Server is already in the list of trusted servers." : "Server bestaat reeds in de lijst van vertrouwde servers.", - "No server to federate found" : "Geen server gevonden om mee te federeren", "Could not add server" : "Kon server niet toevoegen", "Federation" : "Federatie", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federatie maakt het mogelijk om te verbinden met vertrouwde servers en de gebuikersadministratie te delen. Zo kun je automatisch externe gebruikers toevoegen voor federatief delen.", diff --git a/apps/federation/l10n/nl.json b/apps/federation/l10n/nl.json index a413e8dac0..81d76eef0a 100644 --- a/apps/federation/l10n/nl.json +++ b/apps/federation/l10n/nl.json @@ -1,7 +1,6 @@ { "translations": { "Added to the list of trusted servers" : "Toegevoegd aan de lijst met vertrouwde servers", "Server is already in the list of trusted servers." : "Server bestaat reeds in de lijst van vertrouwde servers.", - "No server to federate found" : "Geen server gevonden om mee te federeren", "Could not add server" : "Kon server niet toevoegen", "Federation" : "Federatie", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federatie maakt het mogelijk om te verbinden met vertrouwde servers en de gebuikersadministratie te delen. Zo kun je automatisch externe gebruikers toevoegen voor federatief delen.", diff --git a/apps/federation/l10n/pt_BR.js b/apps/federation/l10n/pt_BR.js index 3ed5852cd7..32af43f221 100644 --- a/apps/federation/l10n/pt_BR.js +++ b/apps/federation/l10n/pt_BR.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Adicionado a lista de servidores confiáveis.", "Server is already in the list of trusted servers." : "O servidor já está na lista de servidores confiáveis.", - "No server to federate found" : "Nenhum servidor encontrado para federar", "Could not add server" : "Não foi possível adicionar servidor", "Federation" : "Associação", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federação permite que você conecte com outros servidores confiáveis para trocar o diretório do usuário. Por exemplo, este atributo será usado para completar automaticamente usuários externos para compartilhamento federado.", diff --git a/apps/federation/l10n/pt_BR.json b/apps/federation/l10n/pt_BR.json index 1568c94240..0543231e9c 100644 --- a/apps/federation/l10n/pt_BR.json +++ b/apps/federation/l10n/pt_BR.json @@ -1,7 +1,6 @@ { "translations": { "Added to the list of trusted servers" : "Adicionado a lista de servidores confiáveis.", "Server is already in the list of trusted servers." : "O servidor já está na lista de servidores confiáveis.", - "No server to federate found" : "Nenhum servidor encontrado para federar", "Could not add server" : "Não foi possível adicionar servidor", "Federation" : "Associação", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federação permite que você conecte com outros servidores confiáveis para trocar o diretório do usuário. Por exemplo, este atributo será usado para completar automaticamente usuários externos para compartilhamento federado.", diff --git a/apps/federation/l10n/ru.js b/apps/federation/l10n/ru.js index e585cd3c39..d3b1fa294e 100644 --- a/apps/federation/l10n/ru.js +++ b/apps/federation/l10n/ru.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Добавлено в список доверенных серверов", "Server is already in the list of trusted servers." : "Сервер уже в списке доверенных серверов.", - "No server to federate found" : "Сервер для объединения не найден", "Could not add server" : "Не удалось добавить сервер", "Federation" : "Объединение", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Объединение серверов позволит Вам подключиться к другим доверенным серверам для обмена каталогами пользователей. Это будет использовано, например, для автоматического завершения внешних пользователей при объединенном общем доступе.", diff --git a/apps/federation/l10n/ru.json b/apps/federation/l10n/ru.json index bdc9958b44..e24e5f1a95 100644 --- a/apps/federation/l10n/ru.json +++ b/apps/federation/l10n/ru.json @@ -1,7 +1,6 @@ { "translations": { "Added to the list of trusted servers" : "Добавлено в список доверенных серверов", "Server is already in the list of trusted servers." : "Сервер уже в списке доверенных серверов.", - "No server to federate found" : "Сервер для объединения не найден", "Could not add server" : "Не удалось добавить сервер", "Federation" : "Объединение", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Объединение серверов позволит Вам подключиться к другим доверенным серверам для обмена каталогами пользователей. Это будет использовано, например, для автоматического завершения внешних пользователей при объединенном общем доступе.", diff --git a/apps/federation/l10n/tr.js b/apps/federation/l10n/tr.js index 93dbe723dd..df93aab9e0 100644 --- a/apps/federation/l10n/tr.js +++ b/apps/federation/l10n/tr.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Added to the list of trusted servers" : "Güvenilir sunucular listesine eklendi", "Server is already in the list of trusted servers." : "Sunucu zaten güvenilen sunucu listesine eklenmiş.", - "No server to federate found" : "Birleşim sunucusu bulunamadı", "Could not add server" : "Sunucu eklenemedi", "Federation" : "Birleşim", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Birleşim, diğer güvenilir sunucularla dosya/klasör paylaşımı yapmanıza izin verir. \nÖrneğin, harici kullanıcıların klasörleri, otomatik tamamlama için kullanılacaktır.", diff --git a/apps/federation/l10n/tr.json b/apps/federation/l10n/tr.json index 45072b5c9e..cf8f55e452 100644 --- a/apps/federation/l10n/tr.json +++ b/apps/federation/l10n/tr.json @@ -1,7 +1,6 @@ { "translations": { "Added to the list of trusted servers" : "Güvenilir sunucular listesine eklendi", "Server is already in the list of trusted servers." : "Sunucu zaten güvenilen sunucu listesine eklenmiş.", - "No server to federate found" : "Birleşim sunucusu bulunamadı", "Could not add server" : "Sunucu eklenemedi", "Federation" : "Birleşim", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Birleşim, diğer güvenilir sunucularla dosya/klasör paylaşımı yapmanıza izin verir. \nÖrneğin, harici kullanıcıların klasörleri, otomatik tamamlama için kullanılacaktır.", diff --git a/apps/files_sharing/l10n/is.js b/apps/files_sharing/l10n/is.js index edd18ec47b..5ec2391e2f 100644 --- a/apps/files_sharing/l10n/is.js +++ b/apps/files_sharing/l10n/is.js @@ -11,16 +11,33 @@ OC.L10N.register( "No shared links" : "Engir sameignartenglar", "Files and folders you share by link will show up here" : "Skrár og möppur sem þú deilir með tenglum birtast hér", "You can upload into this folder" : "Þú getur sent inn skrár í þessa möppu", + "No compatible server found at {remote}" : "Enginn samhæfður vefþjónn fannst á {remote}", + "Invalid server URL" : "Ógild URI-slóð vefþjóns", + "Failed to add the public link to your Nextcloud" : "Mistókst að bæta opinberum tengli í þitt eigið Nextcloud", + "No expiration date set" : "Engin dagsetning fyrir gildistíma er sett", "Shared by" : "Deilt af", "Sharing" : "Deiling", + "Wrong share ID, share doesn't exist" : "Rangt auðkenni sameignar, sameign er ekki til", + "could not delete share" : "tókst ekki að eyða sameign", "Could not delete share" : "Tókst ekki að eyða sameign", "Please specify a file or folder path" : "Tiltaktu skrá eða slóð á möppu", + "Wrong path, file/folder doesn't exist" : "Röng slóð, skrá/mappa er ekki til", + "Could not create share" : "Ekki tókst að búa til sameign", + "invalid permissions" : "Ógildar aðgangsheimildir", "Please specify a valid user" : "Settu inn gilt notandanafn", "Group sharing is disabled by the administrator" : "Deiling innan hóps hefur verið gerð óvirk af kerfisstjóra.", "Please specify a valid group" : "Settu inn gildan hóp", + "Public link sharing is disabled by the administrator" : "Deiling opinberra sameignartengla hefur verið gerð óvirk af kerfisstjóra.", + "Public upload disabled by the administrator" : "Opinber innsending hefur verið gerð óvirk af kerfisstjóra.", + "Public upload is only possible for publicly shared folders" : "Opinber innsending er einungis möguleg í möppur sem er deilt opinberlega", "Invalid date, date format must be YYYY-MM-DD" : "Ógild dagsetning, dagsetningasniðið verður að vera ÁÁÁÁ-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "Deiling %s mistókst, því bakvinnslukerfið leyfir ekki sameignir af gerðinni %s", "Unknown share type" : "Óþekkt tegund sameignar", "Not a directory" : "Er ekki mappa", + "Could not lock path" : "Gat ekki læst slóð", + "Wrong or no update parameter given" : "Rangt eða ekkert uppfærsluviðfang gefið", + "Can't change permissions for public share links" : "Ekki tókst að breyta aðgangsheimildum fyrir opinbera deilingartengla", + "Cannot increase permissions" : "Get ekki aukið aðgangsheimildir", "A file or folder has been shared" : "Skjali eða möppu hefur verið deilt", "A file or folder was shared from another server" : "Skjali eð möppu hefur verið deilt frá öðrum þjóni", "A public shared file or folder was downloaded" : "Skrá eða mappa í almenningsaðgangi var sótt", @@ -64,6 +81,7 @@ OC.L10N.register( "Public link of %2$s expired" : "Almenningstengill %2$s er útrunninn", "Shared by %2$s" : "Deilt af %2$s", "Shares" : "Sameignir", + "Share API is disabled" : "Deilingar-API er óvirkt", "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ð", diff --git a/apps/files_sharing/l10n/is.json b/apps/files_sharing/l10n/is.json index 6a64dd5f29..e6d72bab0e 100644 --- a/apps/files_sharing/l10n/is.json +++ b/apps/files_sharing/l10n/is.json @@ -9,16 +9,33 @@ "No shared links" : "Engir sameignartenglar", "Files and folders you share by link will show up here" : "Skrár og möppur sem þú deilir með tenglum birtast hér", "You can upload into this folder" : "Þú getur sent inn skrár í þessa möppu", + "No compatible server found at {remote}" : "Enginn samhæfður vefþjónn fannst á {remote}", + "Invalid server URL" : "Ógild URI-slóð vefþjóns", + "Failed to add the public link to your Nextcloud" : "Mistókst að bæta opinberum tengli í þitt eigið Nextcloud", + "No expiration date set" : "Engin dagsetning fyrir gildistíma er sett", "Shared by" : "Deilt af", "Sharing" : "Deiling", + "Wrong share ID, share doesn't exist" : "Rangt auðkenni sameignar, sameign er ekki til", + "could not delete share" : "tókst ekki að eyða sameign", "Could not delete share" : "Tókst ekki að eyða sameign", "Please specify a file or folder path" : "Tiltaktu skrá eða slóð á möppu", + "Wrong path, file/folder doesn't exist" : "Röng slóð, skrá/mappa er ekki til", + "Could not create share" : "Ekki tókst að búa til sameign", + "invalid permissions" : "Ógildar aðgangsheimildir", "Please specify a valid user" : "Settu inn gilt notandanafn", "Group sharing is disabled by the administrator" : "Deiling innan hóps hefur verið gerð óvirk af kerfisstjóra.", "Please specify a valid group" : "Settu inn gildan hóp", + "Public link sharing is disabled by the administrator" : "Deiling opinberra sameignartengla hefur verið gerð óvirk af kerfisstjóra.", + "Public upload disabled by the administrator" : "Opinber innsending hefur verið gerð óvirk af kerfisstjóra.", + "Public upload is only possible for publicly shared folders" : "Opinber innsending er einungis möguleg í möppur sem er deilt opinberlega", "Invalid date, date format must be YYYY-MM-DD" : "Ógild dagsetning, dagsetningasniðið verður að vera ÁÁÁÁ-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "Deiling %s mistókst, því bakvinnslukerfið leyfir ekki sameignir af gerðinni %s", "Unknown share type" : "Óþekkt tegund sameignar", "Not a directory" : "Er ekki mappa", + "Could not lock path" : "Gat ekki læst slóð", + "Wrong or no update parameter given" : "Rangt eða ekkert uppfærsluviðfang gefið", + "Can't change permissions for public share links" : "Ekki tókst að breyta aðgangsheimildum fyrir opinbera deilingartengla", + "Cannot increase permissions" : "Get ekki aukið aðgangsheimildir", "A file or folder has been shared" : "Skjali eða möppu hefur verið deilt", "A file or folder was shared from another server" : "Skjali eð möppu hefur verið deilt frá öðrum þjóni", "A public shared file or folder was downloaded" : "Skrá eða mappa í almenningsaðgangi var sótt", @@ -62,6 +79,7 @@ "Public link of %2$s expired" : "Almenningstengill %2$s er útrunninn", "Shared by %2$s" : "Deilt af %2$s", "Shares" : "Sameignir", + "Share API is disabled" : "Deilingar-API er óvirkt", "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ð", diff --git a/apps/systemtags/l10n/is.js b/apps/systemtags/l10n/is.js index efdeb28fc8..c9a89c81f9 100644 --- a/apps/systemtags/l10n/is.js +++ b/apps/systemtags/l10n/is.js @@ -2,6 +2,9 @@ OC.L10N.register( "systemtags", { "Tags" : "Merki", + "Update" : "Uppfæra", + "Create" : "Búa til", + "Select tag…" : "Veldu merki...", "Tagged files" : "Merktar skrár", "Select tags to filter by" : "Veldu merki til að sía eftir", "Please select tags to filter by" : "Veldu merki til að sía eftir", @@ -23,7 +26,13 @@ OC.L10N.register( "%1$s unassigned system tag %3$s from %2$s" : "%1$s tók kerfismerki %3$s af %2$s", "%s (restricted)" : "%s (takmarkaður aðgangur)", "%s (invisible)" : "%s (ósýnilegt)", + "Collaborative tags" : "Samstarfsmerkingar", "Name" : "Heiti", + "Delete" : "Eyða", + "Public" : "Opinbert", + "Restricted" : "Takmarkað", + "Invisible" : "Ósýnilegt", + "Reset" : "Endurstilla", "No files in here" : "Engar skrár hér", "No entries found in this folder" : "Engar skrár fundust í þessari möppu", "Size" : "Stærð", diff --git a/apps/systemtags/l10n/is.json b/apps/systemtags/l10n/is.json index d47891dabd..2b7c626f05 100644 --- a/apps/systemtags/l10n/is.json +++ b/apps/systemtags/l10n/is.json @@ -1,5 +1,8 @@ { "translations": { "Tags" : "Merki", + "Update" : "Uppfæra", + "Create" : "Búa til", + "Select tag…" : "Veldu merki...", "Tagged files" : "Merktar skrár", "Select tags to filter by" : "Veldu merki til að sía eftir", "Please select tags to filter by" : "Veldu merki til að sía eftir", @@ -21,7 +24,13 @@ "%1$s unassigned system tag %3$s from %2$s" : "%1$s tók kerfismerki %3$s af %2$s", "%s (restricted)" : "%s (takmarkaður aðgangur)", "%s (invisible)" : "%s (ósýnilegt)", + "Collaborative tags" : "Samstarfsmerkingar", "Name" : "Heiti", + "Delete" : "Eyða", + "Public" : "Opinbert", + "Restricted" : "Takmarkað", + "Invisible" : "Ósýnilegt", + "Reset" : "Endurstilla", "No files in here" : "Engar skrár hér", "No entries found in this folder" : "Engar skrár fundust í þessari möppu", "Size" : "Stærð", diff --git a/apps/updatenotification/l10n/is.js b/apps/updatenotification/l10n/is.js index c1961755c7..62560873d6 100644 --- a/apps/updatenotification/l10n/is.js +++ b/apps/updatenotification/l10n/is.js @@ -13,6 +13,9 @@ OC.L10N.register( "Checked on %s" : "Athugað þann %s", "Update channel:" : "Uppfærslurás:", "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Þú getur alltaf uppfært í nýrri útgáfu eða tilraunaútgáfurás. En þú getur aldrei niðurfært í stöðugri rás.", - "Notify members of the following groups about available updates:" : "Tilkynna meðlimum eftirfarandi hópa um tiltækar uppfærslur:" + "Notify members of the following groups about available updates:" : "Tilkynna meðlimum eftirfarandi hópa um tiltækar uppfærslur:", + "Only notification for app updates are available." : "Eingöngu eru eru tiltækar tilkynningar fyrir uppfærslur forrita.", + "The selected update channel makes dedicated notifications for the server obsolete." : "Valda uppfærslurásin gerir úreltar sértækar tilkynningar fyrir vefþjóninn.", + "The selected update channel does not support updates of the server." : "Valda uppfærslurásin styður ekki uppfærslur fyrir vefþjóninn." }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/updatenotification/l10n/is.json b/apps/updatenotification/l10n/is.json index 044131460f..c99e683705 100644 --- a/apps/updatenotification/l10n/is.json +++ b/apps/updatenotification/l10n/is.json @@ -11,6 +11,9 @@ "Checked on %s" : "Athugað þann %s", "Update channel:" : "Uppfærslurás:", "You can always update to a newer version / experimental channel. But you can never downgrade to a more stable channel." : "Þú getur alltaf uppfært í nýrri útgáfu eða tilraunaútgáfurás. En þú getur aldrei niðurfært í stöðugri rás.", - "Notify members of the following groups about available updates:" : "Tilkynna meðlimum eftirfarandi hópa um tiltækar uppfærslur:" + "Notify members of the following groups about available updates:" : "Tilkynna meðlimum eftirfarandi hópa um tiltækar uppfærslur:", + "Only notification for app updates are available." : "Eingöngu eru eru tiltækar tilkynningar fyrir uppfærslur forrita.", + "The selected update channel makes dedicated notifications for the server obsolete." : "Valda uppfærslurásin gerir úreltar sértækar tilkynningar fyrir vefþjóninn.", + "The selected update channel does not support updates of the server." : "Valda uppfærslurásin styður ekki uppfærslur fyrir vefþjóninn." },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" } \ No newline at end of file diff --git a/core/l10n/is.js b/core/l10n/is.js index 5d678bb125..d1fc61a3ce 100644 --- a/core/l10n/is.js +++ b/core/l10n/is.js @@ -218,10 +218,13 @@ OC.L10N.register( "Hello {name}" : "Halló {name}", "new" : "nýtt", "_download %n file_::_download %n files_" : ["sækja %n skrá","sækja %n skrár"], + "The update is in progress, leaving this page might interrupt the process in some environments." : "Uppfærslan er í gangi, ef farið er af þessari síðu gæti það truflað ferlið á sumum kerfum.", + "Update to {version}" : "Uppfæra í {version}", "An error occurred." : "Villa átti sér stað.", "Please reload the page." : "Þú ættir að hlaða síðunni aftur inn.", "The update was unsuccessful. For more information check our forum post covering this issue." : "Uppfærslan tókst ekki. Til að fá frekari upplýsingar skoðaðu færslu á spjallsvæðinu okkar sem fjallar um þetta mál.", "The update was unsuccessful. Please report this issue to the Nextcloud community." : "Uppfærslan tókst ekki. Skoðaðu annálana á kerfisstjórnunarsíðunni og sendu inn tilkynningu um vandamálið til Nextcloud samfélagsins.", + "Continue to Nextcloud" : "Halda áfram í Nextcloud", "The update was successful. Redirecting you to Nextcloud now." : "Uppfærslan heppnaðist. Beini þér til Nextcloud nú.", "Searching other places" : "Leitað á öðrum stöðum", "No search results in other folders" : "Engar leitarniðurstöður í öðrum möppum", diff --git a/core/l10n/is.json b/core/l10n/is.json index 79943968eb..5236bb0faa 100644 --- a/core/l10n/is.json +++ b/core/l10n/is.json @@ -216,10 +216,13 @@ "Hello {name}" : "Halló {name}", "new" : "nýtt", "_download %n file_::_download %n files_" : ["sækja %n skrá","sækja %n skrár"], + "The update is in progress, leaving this page might interrupt the process in some environments." : "Uppfærslan er í gangi, ef farið er af þessari síðu gæti það truflað ferlið á sumum kerfum.", + "Update to {version}" : "Uppfæra í {version}", "An error occurred." : "Villa átti sér stað.", "Please reload the page." : "Þú ættir að hlaða síðunni aftur inn.", "The update was unsuccessful. For more information check our forum post covering this issue." : "Uppfærslan tókst ekki. Til að fá frekari upplýsingar skoðaðu færslu á spjallsvæðinu okkar sem fjallar um þetta mál.", "The update was unsuccessful. Please report this issue to the Nextcloud community." : "Uppfærslan tókst ekki. Skoðaðu annálana á kerfisstjórnunarsíðunni og sendu inn tilkynningu um vandamálið til Nextcloud samfélagsins.", + "Continue to Nextcloud" : "Halda áfram í Nextcloud", "The update was successful. Redirecting you to Nextcloud now." : "Uppfærslan heppnaðist. Beini þér til Nextcloud nú.", "Searching other places" : "Leitað á öðrum stöðum", "No search results in other folders" : "Engar leitarniðurstöður í öðrum möppum", diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index 114e3d1fe7..ffb3ff5c63 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -296,7 +296,6 @@ OC.L10N.register( "iOS app" : "iOS aplikace", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Chcete-li projekt podpořit\n\t\tpřipojte se k vývoji\n\t\tnebo\n\t\tšiřte informace dál!", "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Vyvíjeno {communityopen}komunitou Nextcloudu{linkclose}, {githubopen}zdrojový kód{linkclose} je licencován pod {licenseopen}AGPL{linkclose}.", "Show storage location" : "Cesta k datům", "Show last log in" : "Poslední přihlášení", "Show user backend" : "Zobrazit uživatelskou podpůrnou vrstvu", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index e026e0b5e1..8aa42cc2dd 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -294,7 +294,6 @@ "iOS app" : "iOS aplikace", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Chcete-li projekt podpořit\n\t\tpřipojte se k vývoji\n\t\tnebo\n\t\tšiřte informace dál!", "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Vyvíjeno {communityopen}komunitou Nextcloudu{linkclose}, {githubopen}zdrojový kód{linkclose} je licencován pod {licenseopen}AGPL{linkclose}.", "Show storage location" : "Cesta k datům", "Show last log in" : "Poslední přihlášení", "Show user backend" : "Zobrazit uživatelskou podpůrnou vrstvu", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index 76ea414a09..e4c357c897 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -297,7 +297,6 @@ OC.L10N.register( "iOS app" : "iOS-App", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Wenn du das Projekt unterstützen möchtest\n⇥⇥hilf uns bei der Weiterentwicklung\n⇥⇥oder\n⇥⇥empfehle es weiter!", "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Entwickelt von der {communityopen}Nextcloud Community{linkclose}. Der {githubopen}Quellcode{linkclose} ist unter {licenseopen}AGPL{linkclose} verfügbar.", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", "Show user backend" : "Benutzer-Backend anzeigen", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index 8e40adaa26..cf83adb2b2 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -295,7 +295,6 @@ "iOS app" : "iOS-App", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Wenn du das Projekt unterstützen möchtest\n⇥⇥hilf uns bei der Weiterentwicklung\n⇥⇥oder\n⇥⇥empfehle es weiter!", "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Entwickelt von der {communityopen}Nextcloud Community{linkclose}. Der {githubopen}Quellcode{linkclose} ist unter {licenseopen}AGPL{linkclose} verfügbar.", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", "Show user backend" : "Benutzer-Backend anzeigen", diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index 4474c11a04..1187ac1452 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -297,7 +297,6 @@ OC.L10N.register( "iOS app" : "iOS-App", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Wenn Sie das Projekt unterstützen möchten\n⇥⇥helfen Sie bei der Weiterentwicklung\n⇥⇥oder\n⇥⇥empfehlen Sie es weiter!", "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Entwickelt von der {communityopen}Nextcloud Community{linkclose}. Der {githubopen}Quellcode{linkclose} ist unter {licenseopen}AGPL{linkclose} verfügbar.", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", "Show user backend" : "Benutzer-Backend anzeigen", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index 030f3f1cea..cc7ab7b79f 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -295,7 +295,6 @@ "iOS app" : "iOS-App", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Wenn Sie das Projekt unterstützen möchten\n⇥⇥helfen Sie bei der Weiterentwicklung\n⇥⇥oder\n⇥⇥empfehlen Sie es weiter!", "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Entwickelt von der {communityopen}Nextcloud Community{linkclose}. Der {githubopen}Quellcode{linkclose} ist unter {licenseopen}AGPL{linkclose} verfügbar.", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", "Show user backend" : "Benutzer-Backend anzeigen", diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js index 452d2d2265..a5d06cd12a 100644 --- a/settings/l10n/en_GB.js +++ b/settings/l10n/en_GB.js @@ -279,7 +279,6 @@ OC.L10N.register( "iOS app" : "iOS app", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "To support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!", "Show First Run Wizard again" : "Show First Run Wizard again", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.", "Show storage location" : "Show storage location", "Show last log in" : "Show last log in", "Show user backend" : "Show user backend", diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index f425beccc1..083441b2a4 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -277,7 +277,6 @@ "iOS app" : "iOS app", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "To support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!", "Show First Run Wizard again" : "Show First Run Wizard again", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.", "Show storage location" : "Show storage location", "Show last log in" : "Show last log in", "Show user backend" : "Show user backend", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index 5356732695..e25e9ac887 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -297,7 +297,6 @@ OC.L10N.register( "iOS app" : "La aplicación de iOS", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Si quiere apoyar el proyecto\n⇥⇥únase a su desarrollo\n⇥⇥o\n⇥⇥'difunda la palabra!!", "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Desarrollado por la {communityopen}comunidad Nextcloud[linkclose}, el {githubopen}código fuente{linkclose} está bajo la licencia {licenseopen}AGPL{linkclose}.", "Show storage location" : "Mostrar la ubicación del almacenamiento", "Show last log in" : "Mostrar el último inicio de sesión", "Show user backend" : "Mostrar motor de usuario", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index 766fffb15f..977023a8f1 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -295,7 +295,6 @@ "iOS app" : "La aplicación de iOS", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Si quiere apoyar el proyecto\n⇥⇥únase a su desarrollo\n⇥⇥o\n⇥⇥'difunda la palabra!!", "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Desarrollado por la {communityopen}comunidad Nextcloud[linkclose}, el {githubopen}código fuente{linkclose} está bajo la licencia {licenseopen}AGPL{linkclose}.", "Show storage location" : "Mostrar la ubicación del almacenamiento", "Show last log in" : "Mostrar el último inicio de sesión", "Show user backend" : "Mostrar motor de usuario", diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index c3db9933a4..4a4a920b42 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -297,7 +297,6 @@ OC.L10N.register( "iOS app" : "Application iOS", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Si vous voulez supporter le projet rejoindre le développement ou promouvoir !", "Show First Run Wizard again" : "Revoir la fenêtre d'accueil affichée lors de votre première connexion", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Développé par la {communityopen}communauté Nextcloud{linkclose}, le {githubopen}code source{linkclose} est sous licence {licenseopen}AGPL{linkclose}.", "Show storage location" : "Afficher l'emplacement du stockage", "Show last log in" : "Montrer la dernière connexion", "Show user backend" : "Montrer la source de l'identifiant", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index 05bfeb89a7..05c363babb 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -295,7 +295,6 @@ "iOS app" : "Application iOS", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Si vous voulez supporter le projet rejoindre le développement ou promouvoir !", "Show First Run Wizard again" : "Revoir la fenêtre d'accueil affichée lors de votre première connexion", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Développé par la {communityopen}communauté Nextcloud{linkclose}, le {githubopen}code source{linkclose} est sous licence {licenseopen}AGPL{linkclose}.", "Show storage location" : "Afficher l'emplacement du stockage", "Show last log in" : "Montrer la dernière connexion", "Show user backend" : "Montrer la source de l'identifiant", diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js index f0df2d87a6..ab6b128304 100644 --- a/settings/l10n/hu_HU.js +++ b/settings/l10n/hu_HU.js @@ -278,7 +278,6 @@ OC.L10N.register( "iOS app" : "IOS applikáció", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Ha támogatni szeretnéd a projektet \n\t\tcsatlakozz a fejlesztéshez\n\t\tvagy\n\t\thírdesd!", "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Fejlesztve a {communityopen}Nextcloud közösség{linkclose} által, a {githubopen}forráskód{linkclose} az {licenseopen}AGPL{linkclose} licensz alá tartozik.", "Show storage location" : "Háttértároló helyének mutatása", "Show last log in" : "Utolsó bejelentkezés megjelenítése", "Show user backend" : "Felhasználói háttér mutatása", diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json index 738345cf9b..c8880024a0 100644 --- a/settings/l10n/hu_HU.json +++ b/settings/l10n/hu_HU.json @@ -276,7 +276,6 @@ "iOS app" : "IOS applikáció", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Ha támogatni szeretnéd a projektet \n\t\tcsatlakozz a fejlesztéshez\n\t\tvagy\n\t\thírdesd!", "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Fejlesztve a {communityopen}Nextcloud közösség{linkclose} által, a {githubopen}forráskód{linkclose} az {licenseopen}AGPL{linkclose} licensz alá tartozik.", "Show storage location" : "Háttértároló helyének mutatása", "Show last log in" : "Utolsó bejelentkezés megjelenítése", "Show user backend" : "Felhasználói háttér mutatása", diff --git a/settings/l10n/id.js b/settings/l10n/id.js index 4d64d5a1b8..c509f9ffd1 100644 --- a/settings/l10n/id.js +++ b/settings/l10n/id.js @@ -297,7 +297,6 @@ OC.L10N.register( "iOS app" : "Aplikasi iOS", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Apabila Anda ingin mendukung proyek ini\n\t\tikuti pengembangannya\n\t\tatau\n\t\tsebarkan!", "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Dikembangkan oleh {commmunityopen}komunitas Nextcloud{linkclose}, {githubopen}sumber kode{linkclose} dilisensikan dibawah {licenseopen}AGPL{linkclose}.", "Show storage location" : "Tampilkan kolasi penyimpanan", "Show last log in" : "Tampilkan masuk terakhir", "Show user backend" : "Tampilkan pengguna backend", diff --git a/settings/l10n/id.json b/settings/l10n/id.json index 2e62d42040..9f18f3c50a 100644 --- a/settings/l10n/id.json +++ b/settings/l10n/id.json @@ -295,7 +295,6 @@ "iOS app" : "Aplikasi iOS", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Apabila Anda ingin mendukung proyek ini\n\t\tikuti pengembangannya\n\t\tatau\n\t\tsebarkan!", "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Dikembangkan oleh {commmunityopen}komunitas Nextcloud{linkclose}, {githubopen}sumber kode{linkclose} dilisensikan dibawah {licenseopen}AGPL{linkclose}.", "Show storage location" : "Tampilkan kolasi penyimpanan", "Show last log in" : "Tampilkan masuk terakhir", "Show user backend" : "Tampilkan pengguna backend", diff --git a/settings/l10n/is.js b/settings/l10n/is.js index 7e1e775029..2356a21c1e 100644 --- a/settings/l10n/is.js +++ b/settings/l10n/is.js @@ -63,6 +63,8 @@ OC.L10N.register( "Experimental" : "Á tilraunastigi", "All" : "Allt", "No apps found for your version" : "Engin forrit fundust fyrir útgáfuna þína", + "The app will be downloaded from the app store" : "Forritinu verður hlaðið niður úr forritabúðinni", + "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Opinber forrit eru þróuð af og innan samfélagsins. Þau bjóða upp á ýmsa kjarnaeiginleika og eru tilbúin til notkunar í raunvinnslu.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Samþykkt forrit eru þróuð af treystum forriturum og hafa gengist undir lauslegar öryggisprófanir. Þau eru í virku viðhaldi í opnum hugbúnaðarsöfnum og umsjónarmenn þeirra dæma þau nógu stöðug til notkunar í allri venjulegri vinnslu.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Þetta forrit hefur ekki verið öryggisprófað, er nýtt erða þekkt fyrir ótöðugleika við vissar aðstæður. Uppsetning er á þína ábyrgð.", "Update to %s" : "Uppfæra í %s", @@ -83,6 +85,20 @@ OC.L10N.register( "Uninstall" : "Henda út", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Forritið hefur verið virkjað, en það þarf að uppfæra það. Þú verður áframsendur á uppfærslusíðuna eftir 5 sekúndur.", "App update" : "Uppfærsla forrits", + "No apps found for {query}" : "Engin forrit fundust fyrir \"{query}", + "Disconnect" : "Aftengjast", + "Internet Explorer" : "Internet Explorer", + "Edge" : "Edge", + "Firefox" : "Firefox", + "Google Chrome" : "Google Chrome", + "Safari" : "Safari", + "Google Chrome for Android" : "Google Chrome fyrir Android", + "iPhone" : "iPhone", + "iOS Client" : "iOS-biðlari", + "Android Client" : "Android-biðlari", + "Sync client - {os}" : "Samstilla bilara - {os}", + "This session" : "Þessa setu", + "Error while deleting the token" : "Villa kom upp við að eyða teikninu", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Villa kom upp. Sendu inn ASCII-kóðað PEM-skilríki.", "Valid until {date}" : "Gildir til {date}", "Delete" : "Eyða", @@ -99,8 +115,11 @@ OC.L10N.register( "A valid group name must be provided" : "Skráðu inn gilt heiti á hópi", "deleted {groupName}" : "eyddi {groupName}", "undo" : "afturkalla", + "No group" : "Enginn hópur", "never" : "aldrei", "deleted {userName}" : "eyddi {userName}", + "Add group" : "Bæta við hópi", + "Invalid quota value \"{val}\"" : "Óleyfilegt gildi kvóta \"{val}\"", "Changing the password will result in data loss, because data recovery is not available for this user" : "Breyting á þessu lykilorði mun valda gagnatapi, þar sem gagnaendurheimt er ekki tiltæk fyrir þennan notanda", "A valid username must be provided" : "Skráðu inn gilt notandanafn", "Error creating user: {message}" : "Villa við að búa til notanda: {message}", @@ -109,6 +128,8 @@ OC.L10N.register( "__language_name__" : "Íslenska", "Unlimited" : "Ótakmarkað", "Personal info" : "Persónulegar upplýsingar", + "Sessions" : "Setur", + "App passwords" : "Lykilorð forrita", "Sync clients" : "Samstilla biðlara", "Everything (fatal issues, errors, warnings, info, debug)" : "Allt (aflúsun, upplýsingar, viðvaranir, villur og alvarlegar aðvaranir)", "Info, warnings, errors and fatal issues" : "Upplýsingar, viðvaranir, villur og alvarlegar aðvaranir", @@ -148,6 +169,7 @@ OC.L10N.register( "Use system's cron service to call the cron.php file every 15 minutes." : "Nota cron-þjónustu kerfisins til að kalla á cron.php skrána á 15 mínútna fresti.", "Enable server-side encryption" : "Virkja dulritun á þjóni", "Please read carefully before activating server-side encryption: " : "Lestu eftirfarandi gaumgæfilega áður en þú virkjar dulritun á þjóni: ", + "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Dulritun ein og sér tryggir ekki öryggi kerfisins. Endilega skoðaðu hjálparskjölin um hvernig dulritunarforritið virkar, og dæmi um hvaða uppsetningar eru studdar.", "Be aware that encryption always increases the file size." : "Hafðu í huga að dulritun eykur alltaf skráastærð.", "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Það er góður siður að taka regluleg öryggisafrit af gögnunum þínum; ef um dulrituð gögn er að ræða, gakktu úr skugga um að einnig sé tekið öryggisafrit af dulritunarlyklum ásamt gögnunum.", "This is the final warning: Do you really want to enable encryption?" : "Þetta er lokaaðvörun: Viltu örugglega virkja dulritun?", @@ -179,6 +201,7 @@ OC.L10N.register( "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Annállinn er stærri en 100 MB.Þetta gæti tekið nokkra stund!", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite er notað sem gagnagrunnur. Fyrir stærri uppsetningar mælum við með að velja annan gagnagrunnsbakenda.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Sérstaklega þegar tölvu forrit er notað til samræmingar þá er ekki mælt með notkunn SQLite.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Til að yfirfæra í annan gagnagrunn skaltu nota skipanalínutólið: 'occ db:convert-type', eða lesa hjálparskjölin ↗.", "How to do backups" : "Hvernig á að taka öryggisafrit", "Advanced monitoring" : "Ítarleg vöktun", "Performance tuning" : "Fínstilling afkasta", @@ -194,9 +217,13 @@ OC.L10N.register( "Documentation:" : "Hjálparskjöl:", "User documentation" : "Hjálparskjöl notenda", "Admin documentation" : "Hjálparskjöl kerfisstjóra", + "Visit website" : "Heimsækja vefsvæðið", + "Report a bug" : "Tilkynna um villu", "Show description …" : "Birta lýsingu …", "Hide description …" : "Fela lýsingu …", "This app has an update available." : "Uppfærsla er tiltæk fyrir þetta forrit.", + "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Þetta vorrit er ekki með tiltekna neina lágmarksútgáfu Nextcloud. Þetta mun gefa villu í framtíðinni.", + "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Þetta vorrit er ekki með tiltekna neina hámarksútgáfu Nextcloud. Þetta mun gefa villu í framtíðinni.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Ekki var hægt að setja upp forritið þar sem eftirfarandi kerfiskröfur eru ekki uppfylltar:", "Enable only for specific groups" : "Einungis fyrir sérstaka hópa", "Uninstall App" : "Fjarlægja/Henda út forriti", @@ -237,12 +264,19 @@ OC.L10N.register( "Change password" : "Breyta lykilorði", "Language" : "Tungumál", "Help translate" : "Hjálpa við þýðingu", + "Web, desktop and mobile clients currently logged in to your account." : "Veftól, tölvur og símar sem núna eru skráð inn á aðganginn þinn.", + "Device" : "Tæki", + "Last activity" : "Síðasta virkni", "Name" : "Heiti", + "App name" : "Heiti forrits", + "Create new app password" : "Búa til nýtt lykilorð forrits", "Username" : "Notandanafn", + "Done" : "Lokið", "Get the apps to sync your files" : "Náðu í forrit til að samstilla skrárnar þínar", "Desktop client" : "Skjáborðsforrit", "Android app" : "Android-forrit", "iOS app" : "iOS-forrit", + "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Ef þú vilt styðja við verkefnið\n\t\ttaktu þátt í þróuninni\n\t\teða\n\t\tláttu orð út ganga!", "Show First Run Wizard again" : "Birta Fyrsta-skiptis-leiðarvísinn aftur", "Show storage location" : "Birta staðsetningu gagnageymslu", "Show last log in" : "Birta síðustu innskráningu", @@ -256,9 +290,14 @@ OC.L10N.register( "Group" : "Hópur", "Everyone" : "Allir", "Admins" : "Kerfisstjórar", + "Default quota" : "Sjálfgefinn kvóti", "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Settu inn geymslukvóta (t.d.: \"512 MB\" eða \"12 GB\")", "Other" : "Annað", + "Group admin for" : "Hópstjóri fyrir", "Quota" : "Kvóti", + "Storage location" : "Staðsetning gagnageymslu", + "User backend" : "Bakendi notanda", + "Last login" : "Síðasta innskráning", "change full name" : "breyta fullu nafni", "set new password" : "setja nýtt lykilorð", "change email address" : "breyta tölvupóstfangi", diff --git a/settings/l10n/is.json b/settings/l10n/is.json index 43f8e85d50..0ab0bf40f0 100644 --- a/settings/l10n/is.json +++ b/settings/l10n/is.json @@ -61,6 +61,8 @@ "Experimental" : "Á tilraunastigi", "All" : "Allt", "No apps found for your version" : "Engin forrit fundust fyrir útgáfuna þína", + "The app will be downloaded from the app store" : "Forritinu verður hlaðið niður úr forritabúðinni", + "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Opinber forrit eru þróuð af og innan samfélagsins. Þau bjóða upp á ýmsa kjarnaeiginleika og eru tilbúin til notkunar í raunvinnslu.", "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Samþykkt forrit eru þróuð af treystum forriturum og hafa gengist undir lauslegar öryggisprófanir. Þau eru í virku viðhaldi í opnum hugbúnaðarsöfnum og umsjónarmenn þeirra dæma þau nógu stöðug til notkunar í allri venjulegri vinnslu.", "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Þetta forrit hefur ekki verið öryggisprófað, er nýtt erða þekkt fyrir ótöðugleika við vissar aðstæður. Uppsetning er á þína ábyrgð.", "Update to %s" : "Uppfæra í %s", @@ -81,6 +83,20 @@ "Uninstall" : "Henda út", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Forritið hefur verið virkjað, en það þarf að uppfæra það. Þú verður áframsendur á uppfærslusíðuna eftir 5 sekúndur.", "App update" : "Uppfærsla forrits", + "No apps found for {query}" : "Engin forrit fundust fyrir \"{query}", + "Disconnect" : "Aftengjast", + "Internet Explorer" : "Internet Explorer", + "Edge" : "Edge", + "Firefox" : "Firefox", + "Google Chrome" : "Google Chrome", + "Safari" : "Safari", + "Google Chrome for Android" : "Google Chrome fyrir Android", + "iPhone" : "iPhone", + "iOS Client" : "iOS-biðlari", + "Android Client" : "Android-biðlari", + "Sync client - {os}" : "Samstilla bilara - {os}", + "This session" : "Þessa setu", + "Error while deleting the token" : "Villa kom upp við að eyða teikninu", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Villa kom upp. Sendu inn ASCII-kóðað PEM-skilríki.", "Valid until {date}" : "Gildir til {date}", "Delete" : "Eyða", @@ -97,8 +113,11 @@ "A valid group name must be provided" : "Skráðu inn gilt heiti á hópi", "deleted {groupName}" : "eyddi {groupName}", "undo" : "afturkalla", + "No group" : "Enginn hópur", "never" : "aldrei", "deleted {userName}" : "eyddi {userName}", + "Add group" : "Bæta við hópi", + "Invalid quota value \"{val}\"" : "Óleyfilegt gildi kvóta \"{val}\"", "Changing the password will result in data loss, because data recovery is not available for this user" : "Breyting á þessu lykilorði mun valda gagnatapi, þar sem gagnaendurheimt er ekki tiltæk fyrir þennan notanda", "A valid username must be provided" : "Skráðu inn gilt notandanafn", "Error creating user: {message}" : "Villa við að búa til notanda: {message}", @@ -107,6 +126,8 @@ "__language_name__" : "Íslenska", "Unlimited" : "Ótakmarkað", "Personal info" : "Persónulegar upplýsingar", + "Sessions" : "Setur", + "App passwords" : "Lykilorð forrita", "Sync clients" : "Samstilla biðlara", "Everything (fatal issues, errors, warnings, info, debug)" : "Allt (aflúsun, upplýsingar, viðvaranir, villur og alvarlegar aðvaranir)", "Info, warnings, errors and fatal issues" : "Upplýsingar, viðvaranir, villur og alvarlegar aðvaranir", @@ -146,6 +167,7 @@ "Use system's cron service to call the cron.php file every 15 minutes." : "Nota cron-þjónustu kerfisins til að kalla á cron.php skrána á 15 mínútna fresti.", "Enable server-side encryption" : "Virkja dulritun á þjóni", "Please read carefully before activating server-side encryption: " : "Lestu eftirfarandi gaumgæfilega áður en þú virkjar dulritun á þjóni: ", + "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Dulritun ein og sér tryggir ekki öryggi kerfisins. Endilega skoðaðu hjálparskjölin um hvernig dulritunarforritið virkar, og dæmi um hvaða uppsetningar eru studdar.", "Be aware that encryption always increases the file size." : "Hafðu í huga að dulritun eykur alltaf skráastærð.", "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Það er góður siður að taka regluleg öryggisafrit af gögnunum þínum; ef um dulrituð gögn er að ræða, gakktu úr skugga um að einnig sé tekið öryggisafrit af dulritunarlyklum ásamt gögnunum.", "This is the final warning: Do you really want to enable encryption?" : "Þetta er lokaaðvörun: Viltu örugglega virkja dulritun?", @@ -177,6 +199,7 @@ "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Annállinn er stærri en 100 MB.Þetta gæti tekið nokkra stund!", "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite er notað sem gagnagrunnur. Fyrir stærri uppsetningar mælum við með að velja annan gagnagrunnsbakenda.", "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Sérstaklega þegar tölvu forrit er notað til samræmingar þá er ekki mælt með notkunn SQLite.", + "To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Til að yfirfæra í annan gagnagrunn skaltu nota skipanalínutólið: 'occ db:convert-type', eða lesa hjálparskjölin ↗.", "How to do backups" : "Hvernig á að taka öryggisafrit", "Advanced monitoring" : "Ítarleg vöktun", "Performance tuning" : "Fínstilling afkasta", @@ -192,9 +215,13 @@ "Documentation:" : "Hjálparskjöl:", "User documentation" : "Hjálparskjöl notenda", "Admin documentation" : "Hjálparskjöl kerfisstjóra", + "Visit website" : "Heimsækja vefsvæðið", + "Report a bug" : "Tilkynna um villu", "Show description …" : "Birta lýsingu …", "Hide description …" : "Fela lýsingu …", "This app has an update available." : "Uppfærsla er tiltæk fyrir þetta forrit.", + "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Þetta vorrit er ekki með tiltekna neina lágmarksútgáfu Nextcloud. Þetta mun gefa villu í framtíðinni.", + "This app has no maximum Nextcloud version assigned. This will be an error in the future." : "Þetta vorrit er ekki með tiltekna neina hámarksútgáfu Nextcloud. Þetta mun gefa villu í framtíðinni.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Ekki var hægt að setja upp forritið þar sem eftirfarandi kerfiskröfur eru ekki uppfylltar:", "Enable only for specific groups" : "Einungis fyrir sérstaka hópa", "Uninstall App" : "Fjarlægja/Henda út forriti", @@ -235,12 +262,19 @@ "Change password" : "Breyta lykilorði", "Language" : "Tungumál", "Help translate" : "Hjálpa við þýðingu", + "Web, desktop and mobile clients currently logged in to your account." : "Veftól, tölvur og símar sem núna eru skráð inn á aðganginn þinn.", + "Device" : "Tæki", + "Last activity" : "Síðasta virkni", "Name" : "Heiti", + "App name" : "Heiti forrits", + "Create new app password" : "Búa til nýtt lykilorð forrits", "Username" : "Notandanafn", + "Done" : "Lokið", "Get the apps to sync your files" : "Náðu í forrit til að samstilla skrárnar þínar", "Desktop client" : "Skjáborðsforrit", "Android app" : "Android-forrit", "iOS app" : "iOS-forrit", + "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Ef þú vilt styðja við verkefnið\n\t\ttaktu þátt í þróuninni\n\t\teða\n\t\tláttu orð út ganga!", "Show First Run Wizard again" : "Birta Fyrsta-skiptis-leiðarvísinn aftur", "Show storage location" : "Birta staðsetningu gagnageymslu", "Show last log in" : "Birta síðustu innskráningu", @@ -254,9 +288,14 @@ "Group" : "Hópur", "Everyone" : "Allir", "Admins" : "Kerfisstjórar", + "Default quota" : "Sjálfgefinn kvóti", "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Settu inn geymslukvóta (t.d.: \"512 MB\" eða \"12 GB\")", "Other" : "Annað", + "Group admin for" : "Hópstjóri fyrir", "Quota" : "Kvóti", + "Storage location" : "Staðsetning gagnageymslu", + "User backend" : "Bakendi notanda", + "Last login" : "Síðasta innskráning", "change full name" : "breyta fullu nafni", "set new password" : "setja nýtt lykilorð", "change email address" : "breyta tölvupóstfangi", diff --git a/settings/l10n/it.js b/settings/l10n/it.js index 7448f92cbf..d6ad5c743d 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -297,7 +297,6 @@ OC.L10N.register( "iOS app" : "Applicazione iOS", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Se desideri supportare il progetto\n\t\tcontribuisci allo sviluppo\n\t\to\n\t\tdiffondi il verbo!", "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Sviluppato dalla {communityopen}comunità di Nextcloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}AGPL{linkclose}.", "Show storage location" : "Mostra posizione di archiviazione", "Show last log in" : "Mostra ultimo accesso", "Show user backend" : "Mostra il motore utente", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index f23e662f72..dc52be1947 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -295,7 +295,6 @@ "iOS app" : "Applicazione iOS", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Se desideri supportare il progetto\n\t\tcontribuisci allo sviluppo\n\t\to\n\t\tdiffondi il verbo!", "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Sviluppato dalla {communityopen}comunità di Nextcloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}AGPL{linkclose}.", "Show storage location" : "Mostra posizione di archiviazione", "Show last log in" : "Mostra ultimo accesso", "Show user backend" : "Mostra il motore utente", diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js index 8d3dd80304..3c7dbde76b 100644 --- a/settings/l10n/ja.js +++ b/settings/l10n/ja.js @@ -279,7 +279,6 @@ OC.L10N.register( "iOS app" : "iOSアプリ", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "このプロジェクトを応援するには、\n\t\t開発に参加\n\t\tもしくは、\n\t\t世界に拡散!\nしてください。", "Show First Run Wizard again" : "初回ウィザードを再表示する", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "{communityopen}Nextcloud community{linkclose} による開発されています。{githubopen}source code{linkclose} は、 {licenseopen}AGPL{linkclose} ライセンスで提供されています。", "Show storage location" : "データの保存場所を表示", "Show last log in" : "最終ログインを表示", "Show user backend" : "ユーザーバックエンドを表示", diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json index 67007d97fd..37f5853f3c 100644 --- a/settings/l10n/ja.json +++ b/settings/l10n/ja.json @@ -277,7 +277,6 @@ "iOS app" : "iOSアプリ", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "このプロジェクトを応援するには、\n\t\t開発に参加\n\t\tもしくは、\n\t\t世界に拡散!\nしてください。", "Show First Run Wizard again" : "初回ウィザードを再表示する", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "{communityopen}Nextcloud community{linkclose} による開発されています。{githubopen}source code{linkclose} は、 {licenseopen}AGPL{linkclose} ライセンスで提供されています。", "Show storage location" : "データの保存場所を表示", "Show last log in" : "最終ログインを表示", "Show user backend" : "ユーザーバックエンドを表示", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index 9747c2d399..c4790276f2 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -297,7 +297,6 @@ OC.L10N.register( "iOS app" : "iOS app", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Ondersteun het project\n\t\tontwikkel het mee\n\t\tof\n\t\tverkondig het woord!", "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Ontwikkeld door de {communityopen}Nextcloud community{linkclose}, de {githubopen}broncode{linkclose} is gelicenseerd onder de {licenseopen}AGPL{linkclose}.", "Show storage location" : "Toon opslaglocatie", "Show last log in" : "Toon laatste inlog", "Show user backend" : "Toon backend gebruiker", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index e5cb8d1102..2b22fec9ac 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -295,7 +295,6 @@ "iOS app" : "iOS app", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Ondersteun het project\n\t\tontwikkel het mee\n\t\tof\n\t\tverkondig het woord!", "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Ontwikkeld door de {communityopen}Nextcloud community{linkclose}, de {githubopen}broncode{linkclose} is gelicenseerd onder de {licenseopen}AGPL{linkclose}.", "Show storage location" : "Toon opslaglocatie", "Show last log in" : "Toon laatste inlog", "Show user backend" : "Toon backend gebruiker", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index 1ef37d471f..023664ff89 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -297,7 +297,6 @@ OC.L10N.register( "iOS app" : "App iOS", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Se você deseja apoiar o projeto,\n\t\tjuntar-se ao desenvolvimento\n\t\tou\n\t\tcontar para todo mundo!", "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Desenvolvido pela {communityopen}comunidade Nextcloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado sob {licenseopen}AGPL{linkclose}.", "Show storage location" : "Mostrar localização de armazenamento", "Show last log in" : "Mostrar o último acesso", "Show user backend" : "Mostrar administrador do usuário", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index 09f609fa78..bed74bae58 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -295,7 +295,6 @@ "iOS app" : "App iOS", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Se você deseja apoiar o projeto,\n\t\tjuntar-se ao desenvolvimento\n\t\tou\n\t\tcontar para todo mundo!", "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Desenvolvido pela {communityopen}comunidade Nextcloud{linkclose}, o {githubopen}código fonte{linkclose} está licenciado sob {licenseopen}AGPL{linkclose}.", "Show storage location" : "Mostrar localização de armazenamento", "Show last log in" : "Mostrar o último acesso", "Show user backend" : "Mostrar administrador do usuário", diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js index 0b8d8bdaea..c8e1b811ae 100644 --- a/settings/l10n/ru.js +++ b/settings/l10n/ru.js @@ -297,7 +297,6 @@ OC.L10N.register( "iOS app" : "iOS приложение", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Если Вы хотите поддержать проект\n\t\tприсоединяйтесь к разработке\n\t\tили\n\t\tрасскажите о нас!", "Show First Run Wizard again" : "Показать помощник настройки снова", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Разработано {communityopen}сообществом Nextcloud{linkclose}, {githubopen}исходный код{linkclose} лицензируется в соответствии с {licenseopen}AGPL{linkclose}.", "Show storage location" : "Показать местонахождение хранилища", "Show last log in" : "Показать последний вход в систему", "Show user backend" : "Показать механизм учёта пользователей", diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json index 5e33c1689a..6708e1b12f 100644 --- a/settings/l10n/ru.json +++ b/settings/l10n/ru.json @@ -295,7 +295,6 @@ "iOS app" : "iOS приложение", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Если Вы хотите поддержать проект\n\t\tприсоединяйтесь к разработке\n\t\tили\n\t\tрасскажите о нас!", "Show First Run Wizard again" : "Показать помощник настройки снова", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Разработано {communityopen}сообществом Nextcloud{linkclose}, {githubopen}исходный код{linkclose} лицензируется в соответствии с {licenseopen}AGPL{linkclose}.", "Show storage location" : "Показать местонахождение хранилища", "Show last log in" : "Показать последний вход в систему", "Show user backend" : "Показать механизм учёта пользователей", diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js index ee70f99e35..b3ef46cb41 100644 --- a/settings/l10n/tr.js +++ b/settings/l10n/tr.js @@ -297,7 +297,6 @@ OC.L10N.register( "iOS app" : "iOS uygulaması", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Projeyi desteklemek isterseniz\n\t\tgelişimine katılın\n\t\tya da\n\t\tdünyaya duyurun!", "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "{communityopen}Nextcloud topluluğu tarafından geliştirilmiştir{linkclose}, {githubopen}kaynak kod{linkclose} {licenseopen}AGPL{linkclose} ile lisanslanmıştır.", "Show storage location" : "Depolama konumunu göster", "Show last log in" : "Son oturum açılma zamanını göster", "Show user backend" : "Kullanıcı arka ucunu göster", diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json index 401fdb3e1c..6aa7e16459 100644 --- a/settings/l10n/tr.json +++ b/settings/l10n/tr.json @@ -295,7 +295,6 @@ "iOS app" : "iOS uygulaması", "If you want to support the project\n\t\tjoin development\n\t\tor\n\t\tspread the word!" : "Projeyi desteklemek isterseniz\n\t\tgelişimine katılın\n\t\tya da\n\t\tdünyaya duyurun!", "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "{communityopen}Nextcloud topluluğu tarafından geliştirilmiştir{linkclose}, {githubopen}kaynak kod{linkclose} {licenseopen}AGPL{linkclose} ile lisanslanmıştır.", "Show storage location" : "Depolama konumunu göster", "Show last log in" : "Son oturum açılma zamanını göster", "Show user backend" : "Kullanıcı arka ucunu göster", From 3bf609cd31b6e93eb78681b6ecc1dbb5cd35439f Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 10 Aug 2016 08:58:41 +0200 Subject: [PATCH 15/29] Add note password is only shown once --- settings/templates/personal.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 890bfd1bbe..182fc3c658 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -200,7 +200,10 @@ if($_['passwordChangeSupported']) {