From 81145ee57cab576ede2127f9a2aaf346ba822bce Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Wed, 8 Jun 2016 16:46:26 +0200
Subject: THIS IS NEXTCLOUD! adjusting the design
---
settings/img/admin.png | Bin 113 -> 113 bytes
settings/img/admin.svg | 4 ++--
settings/img/help.png | Bin 318 -> 324 bytes
settings/img/help.svg | 4 ++--
settings/img/personal.png | Bin 336 -> 360 bytes
settings/img/personal.svg | 4 ++--
settings/img/users.png | Bin 323 -> 336 bytes
settings/img/users.svg | 4 ++--
8 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'settings')
diff --git a/settings/img/admin.png b/settings/img/admin.png
index 9cd69def9cd..2a1f1eb257b 100644
Binary files a/settings/img/admin.png and b/settings/img/admin.png differ
diff --git a/settings/img/admin.svg b/settings/img/admin.svg
index 46ee7f1b46f..89517d6ff95 100644
--- a/settings/img/admin.svg
+++ b/settings/img/admin.svg
@@ -1,5 +1,5 @@
-
+
-
+
diff --git a/settings/img/help.png b/settings/img/help.png
index 3c9cfed40fc..69cb269d91b 100644
Binary files a/settings/img/help.png and b/settings/img/help.png differ
diff --git a/settings/img/help.svg b/settings/img/help.svg
index b49998bb9ee..9f4a636bd17 100644
--- a/settings/img/help.svg
+++ b/settings/img/help.svg
@@ -1,5 +1,5 @@
-
+
-
+
diff --git a/settings/img/personal.png b/settings/img/personal.png
index a3fce59edb1..10e502faa9f 100644
Binary files a/settings/img/personal.png and b/settings/img/personal.png differ
diff --git a/settings/img/personal.svg b/settings/img/personal.svg
index 413716e28ba..ee3d971dac9 100644
--- a/settings/img/personal.svg
+++ b/settings/img/personal.svg
@@ -1,5 +1,5 @@
-
+
-
+
diff --git a/settings/img/users.png b/settings/img/users.png
index fac2e6f3ea5..14a0d5d03c2 100644
Binary files a/settings/img/users.png and b/settings/img/users.png differ
diff --git a/settings/img/users.svg b/settings/img/users.svg
index e2834402b1d..a04ee457bc8 100644
--- a/settings/img/users.svg
+++ b/settings/img/users.svg
@@ -1,5 +1,5 @@
-
+
-
+
--
cgit v1.2.3
From 75870c943c3c5dc255b8eb751265ecdcb0fb5fca Mon Sep 17 00:00:00 2001
From: Jörn Friedrich Dreyer
Date: Tue, 7 Jun 2016 11:40:04 +0200
Subject: decrease initial users to load to 50
Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994
Workaround for https://github.com/owncloud/core/issues/24734
---
settings/js/users/users.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'settings')
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 03f471bc3b4..e0fccbd9539 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -14,7 +14,7 @@ var UserList = {
availableGroups: [],
offset: 0,
usersToLoad: 10, //So many users will be loaded when user scrolls down
- initialUsersToLoad: 250, //initial number of users to load
+ initialUsersToLoad: 50, //initial number of users to load
currentGid: '',
filter: '',
--
cgit v1.2.3
From 51fd2602a77d8d885c53d24ebb8f72be62dc52ce Mon Sep 17 00:00:00 2001
From: blizzz
Date: Thu, 9 Jun 2016 17:41:57 +0200
Subject: Revert "Downstream 2016-06-08"
---
apps/dav/lib/Connector/Sabre/Directory.php | 2 -
apps/dav/lib/Connector/Sabre/FilesPlugin.php | 9 ++--
apps/dav/lib/Connector/Sabre/Node.php | 4 --
apps/dav/lib/Connector/Sabre/ObjectTree.php | 2 -
.../tests/unit/Connector/Sabre/FilesPluginTest.php | 60 ++++++++-------------
.../Connector/Sabre/RequestTest/DeleteTest.php | 59 ---------------------
apps/federatedfilesharing/l10n/ar.js | 6 ---
apps/federatedfilesharing/l10n/ar.json | 4 --
apps/files/js/app.js | 3 --
apps/files/l10n/da.js | 6 ---
apps/files/l10n/da.json | 6 ---
apps/files/lib/Controller/ViewController.php | 61 +++++++++++-----------
apps/files/templates/index.php | 1 -
apps/files/tests/Controller/ViewControllerTest.php | 13 ++---
apps/files_external/l10n/pt_PT.js | 14 ++---
apps/files_external/l10n/pt_PT.json | 14 ++---
apps/files_external/lib/Lib/Storage/Google.php | 16 +-----
apps/files_external/tests/Storage/GoogleTest.php | 9 ----
apps/files_sharing/lib/Cache.php | 2 +-
apps/files_sharing/lib/sharedstorage.php | 18 -------
apps/systemtags/l10n/fr.js | 22 ++++----
apps/systemtags/l10n/fr.json | 22 ++++----
.../features/bootstrap/BasicStructure.php | 11 ----
.../features/bootstrap/FederationContext.php | 2 +-
.../federation_features/federated.feature | 61 ----------------------
core/Application.php | 3 +-
core/Command/Encryption/DecryptAll.php | 14 +----
core/Controller/TokenController.php | 36 ++++---------
core/Controller/TwoFactorChallengeController.php | 9 ----
core/Middleware/TwoFactorMiddleware.php | 5 --
core/css/styles.css | 4 --
core/templates/twofactorselectchallenge.php | 3 +-
core/templates/twofactorshowchallenge.php | 1 -
lib/l10n/ar.js | 39 --------------
lib/l10n/ar.json | 39 --------------
lib/l10n/ro.js | 5 --
lib/l10n/ro.json | 5 --
lib/private/AllConfig.php | 9 +---
lib/private/AppConfig.php | 2 +-
.../Token/DefaultTokenCleanupJob.php | 1 -
lib/private/Encryption/DecryptAll.php | 4 +-
lib/private/Files/Cache/Scanner.php | 7 +--
lib/private/Files/Cache/Updater.php | 5 +-
lib/private/Files/Storage/Common.php | 3 --
lib/private/Files/Storage/Local.php | 36 ++-----------
lib/private/Files/View.php | 45 ++++++----------
lib/private/legacy/helper.php | 4 +-
lib/public/IAppConfig.php | 2 +-
lib/public/IConfig.php | 3 +-
settings/js/users/users.js | 2 +-
tests/Core/Controller/TokenControllerTest.php | 40 +++-----------
.../TwoFactorChallengeControllerTest.php | 21 ++------
tests/lib/AllConfigTest.php | 19 -------
tests/lib/Encryption/DecryptAllTest.php | 35 +++++--------
tests/lib/Files/Storage/LocalTest.php | 31 -----------
tests/lib/Files/ViewTest.php | 51 +-----------------
version.php | 4 +-
57 files changed, 171 insertions(+), 743 deletions(-)
delete mode 100644 apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php
delete mode 100644 apps/federatedfilesharing/l10n/ar.js
delete mode 100644 apps/federatedfilesharing/l10n/ar.json
(limited to 'settings')
diff --git a/apps/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php
index ddab34605f3..e7226b58196 100644
--- a/apps/dav/lib/Connector/Sabre/Directory.php
+++ b/apps/dav/lib/Connector/Sabre/Directory.php
@@ -196,8 +196,6 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node
throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
} catch (\OCP\Files\InvalidPathException $ex) {
throw new InvalidPath($ex->getMessage());
- } catch (ForbiddenException $e) {
- throw new \Sabre\DAV\Exception\Forbidden();
}
}
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
index dc47416cca8..a4e13709559 100644
--- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -168,19 +168,20 @@ class FilesPlugin extends ServerPlugin {
*/
function checkMove($source, $destination) {
$sourceNode = $this->tree->getNodeForPath($source);
- if (!$sourceNode instanceof Node) {
+ if ($sourceNode instanceof FutureFile) {
return;
}
list($sourceDir,) = \Sabre\HTTP\URLUtil::splitPath($source);
list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destination);
if ($sourceDir !== $destinationDir) {
- $sourceNodeFileInfo = $sourceNode->getFileInfo();
- if (is_null($sourceNodeFileInfo)) {
+ $sourceFileInfo = $this->fileView->getFileInfo($source);
+
+ if ($sourceFileInfo === false) {
throw new NotFound($source . ' does not exist');
}
- if (!$sourceNodeFileInfo->isDeletable()) {
+ if (!$sourceFileInfo->isDeletable()) {
throw new Forbidden($source . " cannot be deleted");
}
}
diff --git a/apps/dav/lib/Connector/Sabre/Node.php b/apps/dav/lib/Connector/Sabre/Node.php
index c41b5137fde..04640bbde4f 100644
--- a/apps/dav/lib/Connector/Sabre/Node.php
+++ b/apps/dav/lib/Connector/Sabre/Node.php
@@ -347,8 +347,4 @@ abstract class Node implements \Sabre\DAV\INode {
public function changeLock($type) {
$this->fileView->changeLock($this->path, $type);
}
-
- public function getFileInfo() {
- return $this->info;
- }
}
diff --git a/apps/dav/lib/Connector/Sabre/ObjectTree.php b/apps/dav/lib/Connector/Sabre/ObjectTree.php
index 9e7d876187d..599f3fdfd0e 100644
--- a/apps/dav/lib/Connector/Sabre/ObjectTree.php
+++ b/apps/dav/lib/Connector/Sabre/ObjectTree.php
@@ -161,8 +161,6 @@ class ObjectTree extends \Sabre\DAV\Tree {
throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid');
} catch (LockedException $e) {
throw new \Sabre\DAV\Exception\Locked();
- } catch (ForbiddenException $e) {
- throw new \Sabre\DAV\Exception\Forbidden();
}
}
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
index 80f284e470e..87fec17bf6b 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
@@ -24,7 +24,6 @@
*/
namespace OCA\DAV\Tests\unit\Connector\Sabre;
-use OCA\DAV\Connector\Sabre\FilesPlugin;
use OCP\Files\StorageNotAvailableException;
use Sabre\DAV\PropFind;
use Sabre\DAV\PropPatch;
@@ -37,16 +36,16 @@ use Test\TestCase;
* See the COPYING-README file.
*/
class FilesPluginTest extends TestCase {
- const GETETAG_PROPERTYNAME = FilesPlugin::GETETAG_PROPERTYNAME;
- const FILEID_PROPERTYNAME = FilesPlugin::FILEID_PROPERTYNAME;
- const INTERNAL_FILEID_PROPERTYNAME = FilesPlugin::INTERNAL_FILEID_PROPERTYNAME;
- const SIZE_PROPERTYNAME = FilesPlugin::SIZE_PROPERTYNAME;
- const PERMISSIONS_PROPERTYNAME = FilesPlugin::PERMISSIONS_PROPERTYNAME;
- const LASTMODIFIED_PROPERTYNAME = FilesPlugin::LASTMODIFIED_PROPERTYNAME;
- const DOWNLOADURL_PROPERTYNAME = FilesPlugin::DOWNLOADURL_PROPERTYNAME;
- const OWNER_ID_PROPERTYNAME = FilesPlugin::OWNER_ID_PROPERTYNAME;
- const OWNER_DISPLAY_NAME_PROPERTYNAME = FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME;
- const DATA_FINGERPRINT_PROPERTYNAME = FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME;
+ const GETETAG_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::GETETAG_PROPERTYNAME;
+ const FILEID_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::FILEID_PROPERTYNAME;
+ const INTERNAL_FILEID_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::INTERNAL_FILEID_PROPERTYNAME;
+ const SIZE_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::SIZE_PROPERTYNAME;
+ const PERMISSIONS_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::PERMISSIONS_PROPERTYNAME;
+ const LASTMODIFIED_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::LASTMODIFIED_PROPERTYNAME;
+ const DOWNLOADURL_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::DOWNLOADURL_PROPERTYNAME;
+ const OWNER_ID_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::OWNER_ID_PROPERTYNAME;
+ const OWNER_DISPLAY_NAME_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::OWNER_DISPLAY_NAME_PROPERTYNAME;
+ const DATA_FINGERPRINT_PROPERTYNAME = \OCA\DAV\Connector\Sabre\FilesPlugin::DATA_FINGERPRINT_PROPERTYNAME;
/**
* @var \Sabre\DAV\Server | \PHPUnit_Framework_MockObject_MockObject
@@ -59,7 +58,7 @@ class FilesPluginTest extends TestCase {
private $tree;
/**
- * @var FilesPlugin
+ * @var \OCA\DAV\Connector\Sabre\FilesPlugin
*/
private $plugin;
@@ -85,11 +84,11 @@ class FilesPluginTest extends TestCase {
->disableOriginalConstructor()
->getMock();
$this->config = $this->getMock('\OCP\IConfig');
- $this->config->expects($this->any())->method('getSystemValue')
+ $this->config->method('getSystemValue')
->with($this->equalTo('data-fingerprint'), $this->equalTo(''))
->willReturn('my_fingerprint');
- $this->plugin = new FilesPlugin(
+ $this->plugin = new \OCA\DAV\Connector\Sabre\FilesPlugin(
$this->tree,
$this->view,
$this->config
@@ -264,7 +263,7 @@ class FilesPluginTest extends TestCase {
}
public function testGetPublicPermissions() {
- $this->plugin = new FilesPlugin(
+ $this->plugin = new \OCA\DAV\Connector\Sabre\FilesPlugin(
$this->tree,
$this->view,
$this->config,
@@ -332,7 +331,7 @@ class FilesPluginTest extends TestCase {
$node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Directory')
->disableOriginalConstructor()
->getMock();
- $node->expects($this->any())->method('getPath')->willReturn('/');
+ $node->method('getPath')->willReturn('/');
$propFind = new PropFind(
'/',
@@ -433,16 +432,11 @@ class FilesPluginTest extends TestCase {
->method('isDeletable')
->willReturn(false);
- $node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Node')
- ->disableOriginalConstructor()
- ->getMock();
- $node->expects($this->once())
+ $this->view->expects($this->once())
->method('getFileInfo')
+ ->with('FolderA/test.txt')
->willReturn($fileInfoFolderATestTXT);
- $this->tree->expects($this->once())->method('getNodeForPath')
- ->willReturn($node);
-
$this->plugin->checkMove('FolderA/test.txt', 'test.txt');
}
@@ -454,16 +448,11 @@ class FilesPluginTest extends TestCase {
->method('isDeletable')
->willReturn(true);
- $node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Node')
- ->disableOriginalConstructor()
- ->getMock();
- $node->expects($this->once())
+ $this->view->expects($this->once())
->method('getFileInfo')
+ ->with('FolderA/test.txt')
->willReturn($fileInfoFolderATestTXT);
- $this->tree->expects($this->once())->method('getNodeForPath')
- ->willReturn($node);
-
$this->plugin->checkMove('FolderA/test.txt', 'test.txt');
}
@@ -472,15 +461,10 @@ class FilesPluginTest extends TestCase {
* @expectedExceptionMessage FolderA/test.txt does not exist
*/
public function testMoveSrcNotExist() {
- $node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Node')
- ->disableOriginalConstructor()
- ->getMock();
- $node->expects($this->once())
+ $this->view->expects($this->once())
->method('getFileInfo')
- ->willReturn(null);
-
- $this->tree->expects($this->once())->method('getNodeForPath')
- ->willReturn($node);
+ ->with('FolderA/test.txt')
+ ->willReturn(false);
$this->plugin->checkMove('FolderA/test.txt', 'test.txt');
}
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php
deleted file mode 100644
index 4f481cba557..00000000000
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- * @author Robin Appelman
- * @author Thomas Müller
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see
- *
- */
-
-namespace OCA\DAV\Tests\unit\Connector\Sabre\RequestTest;
-
-use OC\Connector\Sabre\Exception\FileLocked;
-use OCP\AppFramework\Http;
-use OCP\Lock\ILockingProvider;
-
-/**
- * Class DeleteTest
- *
- * @group DB
- *
- * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest
- */
-class DeleteTest extends RequestTest {
- public function testBasicUpload() {
- $user = $this->getUniqueID();
- $view = $this->setupUser($user, 'pass');
-
- $view->file_put_contents('foo.txt', 'asd');
- $mount = $view->getMount('foo.txt');
- $internalPath = $view->getAbsolutePath();
-
- // create a ghost file
- $mount->getStorage()->unlink($mount->getInternalPath($internalPath));
-
- // cache entry still exists
- $this->assertInstanceOf('\OCP\Files\FileInfo', $view->getFileInfo('foo.txt'));
-
- $response = $this->request($view, $user, 'pass', 'DELETE', '/foo.txt');
-
- $this->assertEquals(Http::STATUS_NO_CONTENT, $response->getStatus());
-
- // no longer in the cache
- $this->assertFalse($view->getFileInfo('foo.txt'));
- }
-}
diff --git a/apps/federatedfilesharing/l10n/ar.js b/apps/federatedfilesharing/l10n/ar.js
deleted file mode 100644
index 451663a7b6b..00000000000
--- a/apps/federatedfilesharing/l10n/ar.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
- "federatedfilesharing",
- {
- "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح"
-},
-"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/federatedfilesharing/l10n/ar.json b/apps/federatedfilesharing/l10n/ar.json
deleted file mode 100644
index 630ab95f64b..00000000000
--- a/apps/federatedfilesharing/l10n/ar.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
- "Invalid Federated Cloud ID" : "معرّف السحابة المتحدة غير صالح"
-},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
-}
\ No newline at end of file
diff --git a/apps/files/js/app.js b/apps/files/js/app.js
index fbfa510e07e..7a3d78f9663 100644
--- a/apps/files/js/app.js
+++ b/apps/files/js/app.js
@@ -53,9 +53,6 @@
this.$showHiddenFiles = $('input#showhiddenfilesToggle');
var showHidden = $('#showHiddenFiles').val() === "1";
this.$showHiddenFiles.prop('checked', showHidden);
- if ($('#fileNotFound').val() === "1") {
- OC.Notification.showTemporary(t('files', 'File could not be found'));
- }
this._filesConfig = new OC.Backbone.Model({
showhidden: showHidden
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index e585ccacc1c..e1013bcafbb 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -32,8 +32,6 @@ OC.L10N.register(
"Could not get result from server." : "Kunne ikke hente resultat fra server.",
"Uploading..." : "Uploader...",
"..." : "...",
- "Any moment now..." : "Når som helst...",
- "Soon..." : "Snart...",
"File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
"Actions" : "Handlinger",
"Download" : "Download",
@@ -49,8 +47,6 @@ OC.L10N.register(
"This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig, tjek venligst loggene eller kontakt administratoren",
"Could not move \"{file}\", target exists" : "Kunne ikke flytte \"{file}\" - der findes allerede en fil med dette navn",
"Could not move \"{file}\"" : "Kunne ikke flytte \"{file}\"",
- "{newName} already exists" : "{newName} eksistere allerede",
- "Error deleting file \"{fileName}\"." : "Fejl under sletning af filen \"{fileName}\"",
"No entries in this folder match '{filter}'" : "Der er ingen poster i denne mappe, der matcher '{filter}'",
"Name" : "Navn",
"Size" : "Størrelse",
@@ -72,7 +68,6 @@ OC.L10N.register(
"_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
"Favorited" : "Gjort til foretrukken",
"Favorite" : "Foretrukken",
- "Local link" : "Lokalt link",
"Folder" : "Mappe",
"New folder" : "Ny Mappe",
"{newname} already exists" : "{newname} eksistere allerede",
@@ -102,7 +97,6 @@ OC.L10N.register(
"Save" : "Gem",
"Missing permissions to edit from here." : "Rettighed mangler til at redigere på dette sted",
"Settings" : "Indstillinger",
- "Show hidden files" : "Vis skjulte filer",
"WebDAV" : "WebDAV",
"No files in here" : "Her er ingen filer",
"Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!",
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index 499533d77ba..3162770cc40 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -30,8 +30,6 @@
"Could not get result from server." : "Kunne ikke hente resultat fra server.",
"Uploading..." : "Uploader...",
"..." : "...",
- "Any moment now..." : "Når som helst...",
- "Soon..." : "Snart...",
"File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
"Actions" : "Handlinger",
"Download" : "Download",
@@ -47,8 +45,6 @@
"This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig, tjek venligst loggene eller kontakt administratoren",
"Could not move \"{file}\", target exists" : "Kunne ikke flytte \"{file}\" - der findes allerede en fil med dette navn",
"Could not move \"{file}\"" : "Kunne ikke flytte \"{file}\"",
- "{newName} already exists" : "{newName} eksistere allerede",
- "Error deleting file \"{fileName}\"." : "Fejl under sletning af filen \"{fileName}\"",
"No entries in this folder match '{filter}'" : "Der er ingen poster i denne mappe, der matcher '{filter}'",
"Name" : "Navn",
"Size" : "Størrelse",
@@ -70,7 +66,6 @@
"_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
"Favorited" : "Gjort til foretrukken",
"Favorite" : "Foretrukken",
- "Local link" : "Lokalt link",
"Folder" : "Mappe",
"New folder" : "Ny Mappe",
"{newname} already exists" : "{newname} eksistere allerede",
@@ -100,7 +95,6 @@
"Save" : "Gem",
"Missing permissions to edit from here." : "Rettighed mangler til at redigere på dette sted",
"Settings" : "Indstillinger",
- "Show hidden files" : "Vis skjulte filer",
"WebDAV" : "WebDAV",
"No files in here" : "Her er ingen filer",
"Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!",
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 18b6cf719c5..1b0903b41d3 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -27,9 +27,9 @@ namespace OCA\Files\Controller;
use OC\AppFramework\Http\Request;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\ContentSecurityPolicy;
+use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\TemplateResponse;
-use OCP\Files\NotFoundException;
use OCP\IConfig;
use OCP\IL10N;
use OCP\INavigationManager;
@@ -37,6 +37,7 @@ use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUserSession;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use OCP\AppFramework\Http\NotFoundResponse;
use OCP\Files\Folder;
use OCP\App\IAppManager;
@@ -141,15 +142,11 @@ class ViewController extends Controller {
* @param string $view
* @param string $fileid
* @return TemplateResponse
+ * @throws \OCP\Files\NotFoundException
*/
public function index($dir = '', $view = '', $fileid = null) {
- $fileNotFound = false;
if ($fileid !== null) {
- try {
- return $this->showFile($fileid);
- } catch (NotFoundException $e) {
- $fileNotFound = true;
- }
+ return $this->showFile($fileid);
}
$nav = new \OCP\Template('files', 'appnavigation', '');
@@ -248,7 +245,6 @@ class ViewController extends Controller {
$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
$showHidden = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
$params['showHiddenFiles'] = $showHidden ? 1 : 0;
- $params['fileNotFound'] = $fileNotFound ? 1 : 0;
$params['appNavigation'] = $nav;
$params['appContents'] = $contentItems;
$this->navigationManager->setActiveEntry('files_index');
@@ -269,37 +265,40 @@ class ViewController extends Controller {
* Redirects to the file list and highlight the given file id
*
* @param string $fileId file id to show
- * @return RedirectResponse redirect response or not found response
- * @throws \OCP\Files\NotFoundException
+ * @return Response redirect response or not found response
*
* @NoCSRFRequired
* @NoAdminRequired
*/
public function showFile($fileId) {
- $uid = $this->userSession->getUser()->getUID();
- $baseFolder = $this->rootFolder->get($uid . '/files/');
- $files = $baseFolder->getById($fileId);
- $params = [];
-
- if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
- $baseFolder = $this->rootFolder->get($uid . '/files_trashbin/files/');
+ try {
+ $uid = $this->userSession->getUser()->getUID();
+ $baseFolder = $this->rootFolder->get($uid . '/files/');
$files = $baseFolder->getById($fileId);
- $params['view'] = 'trashbin';
- }
+ $params = [];
+
+ if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
+ $baseFolder = $this->rootFolder->get($uid . '/files_trashbin/files/');
+ $files = $baseFolder->getById($fileId);
+ $params['view'] = 'trashbin';
+ }
- if (!empty($files)) {
- $file = current($files);
- if ($file instanceof Folder) {
- // set the full path to enter the folder
- $params['dir'] = $baseFolder->getRelativePath($file->getPath());
- } else {
- // set parent path as dir
- $params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath());
- // and scroll to the entry
- $params['scrollto'] = $file->getName();
+ if (!empty($files)) {
+ $file = current($files);
+ if ($file instanceof Folder) {
+ // set the full path to enter the folder
+ $params['dir'] = $baseFolder->getRelativePath($file->getPath());
+ } else {
+ // set parent path as dir
+ $params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath());
+ // and scroll to the entry
+ $params['scrollto'] = $file->getName();
+ }
+ return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
}
- return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
+ } catch (\OCP\Files\NotFoundException $e) {
+ return new NotFoundResponse();
}
- throw new \OCP\Files\NotFoundException();
+ return new NotFoundResponse();
}
}
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 42ce941a4a5..7281edd3aec 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -14,7 +14,6 @@
-
diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
index 34c40ecea5c..049f44fc0af 100644
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -26,7 +26,6 @@ namespace OCA\Files\Tests\Controller;
use OCA\Files\Controller\ViewController;
use OCP\AppFramework\Http;
-use OCP\Files\NotFoundException;
use OCP\IUser;
use OCP\Template;
use Test\TestCase;
@@ -260,8 +259,7 @@ class ViewControllerTest extends TestCase {
'isPublic' => false,
'defaultFileSorting' => 'name',
'defaultFileSortingDirection' => 'asc',
- 'showHiddenFiles' => 0,
- 'fileNotFound' => 0,
+ 'showHiddenFiles' => false,
'mailNotificationEnabled' => 'no',
'mailPublicNotificationEnabled' => 'no',
'allowShareWithLink' => 'yes',
@@ -412,14 +410,11 @@ class ViewControllerTest extends TestCase {
->with(123)
->will($this->returnValue([]));
+ $expected = new Http\NotFoundResponse();
if ($useShowFile) {
- $this->setExpectedException('OCP\Files\NotFoundException');
- $this->viewController->showFile(123);
+ $this->assertEquals($expected, $this->viewController->showFile(123));
} else {
- $response = $this->viewController->index('MyDir', 'MyView', '123');
- $this->assertInstanceOf('OCP\AppFramework\Http\TemplateResponse', $response);
- $params = $response->getParams();
- $this->assertEquals(1, $params['fileNotFound']);
+ $this->assertEquals($expected, $this->viewController->index('/whatever', '', '123'));
}
}
diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js
index 68f183a36b3..9d3998d903b 100644
--- a/apps/files_external/l10n/pt_PT.js
+++ b/apps/files_external/l10n/pt_PT.js
@@ -7,13 +7,13 @@ OC.L10N.register(
"Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
"Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
"External storage" : "Armazenamento Externo",
- "Dropbox App Configuration" : "Configuração da aplicação Dropbox",
- "Google Drive App Configuration" : "Configuração da aplicação Google Drive",
+ "Dropbox App Configuration" : "Configuração da app Dropbox",
+ "Google Drive App Configuration" : "Configuração da app Google Drive",
"Personal" : "Pessoal",
"System" : "Sistema",
"Grant access" : "Conceder acesso",
- "Error configuring OAuth1" : "Erro ao configurar OAuth1",
- "Error configuring OAuth2" : "Erro ao configurar OAuth2",
+ "Error configuring OAuth1" : "Erro de configuração OAuth1",
+ "Error configuring OAuth2" : "Erro de configuração OAuth2",
"Generate keys" : "Gerar chaves",
"Error generating key pair" : "Erro ao gerar chave par",
"All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
@@ -27,14 +27,14 @@ OC.L10N.register(
"Couldn't get the list of external mount points: {type}" : "Não foi possível conseguir a lista de pontos de montagem externos: {type}",
"There was an error with message: " : "Houve um erro com a mensagem:",
"External mount error" : "Erro de montagem externa",
- "external-storage" : "armazenamento externo",
+ "external-storage" : "Armazenamento Externo",
"Couldn't get the list of Windows network drive mount points: empty response from the server" : "Não foi possível conseguir a lista de pontos de montagem Windows na rede: resposta vazia do servidor",
"Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Alguns dos pontos de montagem externos configurados não estão conectados. Por favor, clique na fila vermelha para mais informação",
"Please enter the credentials for the {mount} mount" : "Por favor, introduza as credenciais para {mount}",
"Username" : "Nome de utilizador",
"Password" : "Palavra-passe",
"Credentials saved" : "Credenciais guardadas",
- "Credentials saving failed" : "Falha ao guardar as credenciais",
+ "Credentials saving failed" : "Falha ao salvar credenciais",
"Credentials required" : "Credenciais necessárias",
"Save" : "Guardar",
"Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"",
@@ -49,7 +49,7 @@ OC.L10N.register(
"Insufficient data: %s" : "Dados insuficientes: %s",
"%s" : "%s",
"Storage with id \"%i\" is not user editable" : "Armazenamento com id \"%i\" não é editável pelo utilizador",
- "Access key" : "Chave de acesso",
+ "Access key" : "Código de acesso",
"Secret key" : "Código secreto",
"Builtin" : "Integrado",
"None" : "Nenhum",
diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json
index 93922c67762..fab0f05a830 100644
--- a/apps/files_external/l10n/pt_PT.json
+++ b/apps/files_external/l10n/pt_PT.json
@@ -5,13 +5,13 @@
"Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
"Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
"External storage" : "Armazenamento Externo",
- "Dropbox App Configuration" : "Configuração da aplicação Dropbox",
- "Google Drive App Configuration" : "Configuração da aplicação Google Drive",
+ "Dropbox App Configuration" : "Configuração da app Dropbox",
+ "Google Drive App Configuration" : "Configuração da app Google Drive",
"Personal" : "Pessoal",
"System" : "Sistema",
"Grant access" : "Conceder acesso",
- "Error configuring OAuth1" : "Erro ao configurar OAuth1",
- "Error configuring OAuth2" : "Erro ao configurar OAuth2",
+ "Error configuring OAuth1" : "Erro de configuração OAuth1",
+ "Error configuring OAuth2" : "Erro de configuração OAuth2",
"Generate keys" : "Gerar chaves",
"Error generating key pair" : "Erro ao gerar chave par",
"All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
@@ -25,14 +25,14 @@
"Couldn't get the list of external mount points: {type}" : "Não foi possível conseguir a lista de pontos de montagem externos: {type}",
"There was an error with message: " : "Houve um erro com a mensagem:",
"External mount error" : "Erro de montagem externa",
- "external-storage" : "armazenamento externo",
+ "external-storage" : "Armazenamento Externo",
"Couldn't get the list of Windows network drive mount points: empty response from the server" : "Não foi possível conseguir a lista de pontos de montagem Windows na rede: resposta vazia do servidor",
"Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Alguns dos pontos de montagem externos configurados não estão conectados. Por favor, clique na fila vermelha para mais informação",
"Please enter the credentials for the {mount} mount" : "Por favor, introduza as credenciais para {mount}",
"Username" : "Nome de utilizador",
"Password" : "Palavra-passe",
"Credentials saved" : "Credenciais guardadas",
- "Credentials saving failed" : "Falha ao guardar as credenciais",
+ "Credentials saving failed" : "Falha ao salvar credenciais",
"Credentials required" : "Credenciais necessárias",
"Save" : "Guardar",
"Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"",
@@ -47,7 +47,7 @@
"Insufficient data: %s" : "Dados insuficientes: %s",
"%s" : "%s",
"Storage with id \"%i\" is not user editable" : "Armazenamento com id \"%i\" não é editável pelo utilizador",
- "Access key" : "Chave de acesso",
+ "Access key" : "Código de acesso",
"Secret key" : "Código secreto",
"Builtin" : "Integrado",
"None" : "Nenhum",
diff --git a/apps/files_external/lib/Lib/Storage/Google.php b/apps/files_external/lib/Lib/Storage/Google.php
index 49fde7d066f..2a1ff768e2c 100644
--- a/apps/files_external/lib/Lib/Storage/Google.php
+++ b/apps/files_external/lib/Lib/Storage/Google.php
@@ -97,9 +97,6 @@ class Google extends \OC\Files\Storage\Common {
private function getDriveFile($path) {
// Remove leading and trailing slashes
$path = trim($path, '/');
- if ($path === '.') {
- $path = '';
- }
if (isset($this->driveFiles[$path])) {
return $this->driveFiles[$path];
} else if ($path === '') {
@@ -141,7 +138,7 @@ class Google extends \OC\Files\Storage\Common {
if ($pos !== false) {
$pathWithoutExt = substr($path, 0, $pos);
$file = $this->getDriveFile($pathWithoutExt);
- if ($file && $this->isGoogleDocFile($file)) {
+ if ($file) {
// Switch cached Google_Service_Drive_DriveFile to the correct index
unset($this->driveFiles[$pathWithoutExt]);
$this->driveFiles[$path] = $file;
@@ -211,17 +208,6 @@ class Google extends \OC\Files\Storage\Common {
}
}
- /**
- * Returns whether the given drive file is a Google Doc file
- *
- * @param \Google_Service_Drive_DriveFile
- *
- * @return true if the file is a Google Doc file, false otherwise
- */
- private function isGoogleDocFile($file) {
- return $this->getGoogleDocExtension($file->getMimeType()) !== '';
- }
-
public function mkdir($path) {
if (!$this->is_dir($path)) {
$parentFolder = $this->getDriveFile(dirname($path));
diff --git a/apps/files_external/tests/Storage/GoogleTest.php b/apps/files_external/tests/Storage/GoogleTest.php
index eb19cc463b1..7684fec8429 100644
--- a/apps/files_external/tests/Storage/GoogleTest.php
+++ b/apps/files_external/tests/Storage/GoogleTest.php
@@ -60,13 +60,4 @@ class GoogleTest extends \Test\Files\Storage\Storage {
parent::tearDown();
}
-
- public function testSameNameAsFolderWithExtension() {
- $this->assertTrue($this->instance->mkdir('testsamename'));
- $this->assertEquals(13, $this->instance->file_put_contents('testsamename.txt', 'some contents'));
- $this->assertEquals('some contents', $this->instance->file_get_contents('testsamename.txt'));
- $this->assertTrue($this->instance->is_dir('testsamename'));
- $this->assertTrue($this->instance->unlink('testsamename.txt'));
- $this->assertTrue($this->instance->rmdir('testsamename'));
- }
}
diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php
index a0519cadbaa..82d885a8ef3 100644
--- a/apps/files_sharing/lib/Cache.php
+++ b/apps/files_sharing/lib/Cache.php
@@ -81,7 +81,7 @@ class Cache extends CacheJail {
}
protected function formatCacheEntry($entry) {
- $path = isset($entry['path']) ? $entry['path'] : '';
+ $path = $entry['path'];
$entry = parent::formatCacheEntry($entry);
$sharePermissions = $this->storage->getPermissions($path);
if (isset($entry['permissions'])) {
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index b5b5e416884..965c4d36cad 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -415,22 +415,4 @@ class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage {
return $this->sourceStorage;
}
- public function file_get_contents($path) {
- $info = [
- 'target' => $this->getMountPoint() . '/' . $path,
- 'source' => $this->getSourcePath($path),
- ];
- \OCP\Util::emitHook('\OC\Files\Storage\Shared', 'file_get_contents', $info);
- return parent::file_get_contents($path);
- }
-
- public function file_put_contents($path, $data) {
- $info = [
- 'target' => $this->getMountPoint() . '/' . $path,
- 'source' => $this->getSourcePath($path),
- ];
- \OCP\Util::emitHook('\OC\Files\Storage\Shared', 'file_put_contents', $info);
- return parent::file_put_contents($path, $data);
- }
-
}
diff --git a/apps/systemtags/l10n/fr.js b/apps/systemtags/l10n/fr.js
index 387bc45643c..93c7d364b24 100644
--- a/apps/systemtags/l10n/fr.js
+++ b/apps/systemtags/l10n/fr.js
@@ -7,20 +7,20 @@ OC.L10N.register(
"Please select tags to filter by" : "Veuillez sélectionner les étiquettes par lesquelles filtrer",
"No files found for the selected tags" : "Aucun fichier pour les étiquettes sélectionnées",
"System tags for a file have been modified" : "Les étiquettes systèmes pour un fichier ont été modifiées",
- "You assigned system tag %3$s" : "Vous avez attribué l'étiquette collaborative %3$s",
+ "You assigned system tag %3$s" : "Vous avez attribué l'étiquette système %3$s",
"%1$s assigned system tag %3$s" : "%1$s a attribué l'étiquette système %3$s",
- "You unassigned system tag %3$s" : "Vous avez retiré l'étiquette collaborative %3$s",
+ "You unassigned system tag %3$s" : "Vous avez retiré l'étiquette système %3$s",
"%1$s unassigned system tag %3$s" : "%1$s a retiré l'étiquette système %3$s",
- "You created system tag %2$s" : "Vous avez créé l'étiquette collaborative %2$s",
+ "You created system tag %2$s" : "Vous avez créé l'étiquette système %2$s",
"%1$s created system tag %2$s" : "%1$s a créé l'étiquette système %2$s",
- "You deleted system tag %2$s" : "Vous avez supprimé l'étiquette collaborative %2$s",
- "%1$s deleted system tag %2$s" : "%1$s a supprimé l'étiquette collaborative %2$s",
- "You updated system tag %3$s to %2$s" : "Vous avez renommé l'étiquette collaborative %3$s en %2$s",
- "%1$s updated system tag %3$s to %2$s" : "%1$s a renommé l'étiquette collaborative %3$s en %2$s",
- "You assigned system tag %3$s to %2$s" : "Vous avez attribué l'étiquette collaborative %3$s à %2$s",
- "%1$s assigned system tag %3$s to %2$s" : "%1$s a attribué l'étiquette collaborative %3$s à %2$s",
- "You unassigned system tag %3$s from %2$s" : "Vous avez retiré l'étiquette collaborative %3$s à %2$s",
- "%1$s unassigned system tag %3$s from %2$s" : "%1$s a retiré l'étiquette collaborative %3$s à %2$s",
+ "You deleted system tag %2$s" : "Vous avez supprimé l'étiquette système %2$s",
+ "%1$s deleted system tag %2$s" : "%1$s a supprimé l'étiquette système %2$s",
+ "You updated system tag %3$s to %2$s" : "Vous avez renommé l'étiquette système %3$s en %2$s",
+ "%1$s updated system tag %3$s to %2$s" : "%1$s a renommé l'étiquette système %3$s en %2$s",
+ "You assigned system tag %3$s to %2$s" : "Vous avez attribué l'étiquette système %3$s à %2$s",
+ "%1$s assigned system tag %3$s to %2$s" : "%1$s a attribué l'étiquette système %3$s à %2$s",
+ "You unassigned system tag %3$s from %2$s" : "Vous avez retiré l'étiquette système %3$s de %2$s",
+ "%1$s unassigned system tag %3$s from %2$s" : "%1$s a retiré l'étiquette système %3$s à %2$s",
"%s (restricted)" : "%s (restreint)",
"%s (invisible)" : "%s (invisible)",
"No files in here" : "Aucun fichier",
diff --git a/apps/systemtags/l10n/fr.json b/apps/systemtags/l10n/fr.json
index 66b4d246dac..94254c93ab0 100644
--- a/apps/systemtags/l10n/fr.json
+++ b/apps/systemtags/l10n/fr.json
@@ -5,20 +5,20 @@
"Please select tags to filter by" : "Veuillez sélectionner les étiquettes par lesquelles filtrer",
"No files found for the selected tags" : "Aucun fichier pour les étiquettes sélectionnées",
"System tags for a file have been modified" : "Les étiquettes systèmes pour un fichier ont été modifiées",
- "You assigned system tag %3$s" : "Vous avez attribué l'étiquette collaborative %3$s",
+ "You assigned system tag %3$s" : "Vous avez attribué l'étiquette système %3$s",
"%1$s assigned system tag %3$s" : "%1$s a attribué l'étiquette système %3$s",
- "You unassigned system tag %3$s" : "Vous avez retiré l'étiquette collaborative %3$s",
+ "You unassigned system tag %3$s" : "Vous avez retiré l'étiquette système %3$s",
"%1$s unassigned system tag %3$s" : "%1$s a retiré l'étiquette système %3$s",
- "You created system tag %2$s" : "Vous avez créé l'étiquette collaborative %2$s",
+ "You created system tag %2$s" : "Vous avez créé l'étiquette système %2$s",
"%1$s created system tag %2$s" : "%1$s a créé l'étiquette système %2$s",
- "You deleted system tag %2$s" : "Vous avez supprimé l'étiquette collaborative %2$s",
- "%1$s deleted system tag %2$s" : "%1$s a supprimé l'étiquette collaborative %2$s",
- "You updated system tag %3$s to %2$s" : "Vous avez renommé l'étiquette collaborative %3$s en %2$s",
- "%1$s updated system tag %3$s to %2$s" : "%1$s a renommé l'étiquette collaborative %3$s en %2$s",
- "You assigned system tag %3$s to %2$s" : "Vous avez attribué l'étiquette collaborative %3$s à %2$s",
- "%1$s assigned system tag %3$s to %2$s" : "%1$s a attribué l'étiquette collaborative %3$s à %2$s",
- "You unassigned system tag %3$s from %2$s" : "Vous avez retiré l'étiquette collaborative %3$s à %2$s",
- "%1$s unassigned system tag %3$s from %2$s" : "%1$s a retiré l'étiquette collaborative %3$s à %2$s",
+ "You deleted system tag %2$s" : "Vous avez supprimé l'étiquette système %2$s",
+ "%1$s deleted system tag %2$s" : "%1$s a supprimé l'étiquette système %2$s",
+ "You updated system tag %3$s to %2$s" : "Vous avez renommé l'étiquette système %3$s en %2$s",
+ "%1$s updated system tag %3$s to %2$s" : "%1$s a renommé l'étiquette système %3$s en %2$s",
+ "You assigned system tag %3$s to %2$s" : "Vous avez attribué l'étiquette système %3$s à %2$s",
+ "%1$s assigned system tag %3$s to %2$s" : "%1$s a attribué l'étiquette système %3$s à %2$s",
+ "You unassigned system tag %3$s from %2$s" : "Vous avez retiré l'étiquette système %3$s de %2$s",
+ "%1$s unassigned system tag %3$s from %2$s" : "%1$s a retiré l'étiquette système %3$s à %2$s",
"%s (restricted)" : "%s (restreint)",
"%s (invisible)" : "%s (invisible)",
"No files in here" : "Aucun fichier",
diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
index 9248b2cd252..b8fb516fada 100644
--- a/build/integration/features/bootstrap/BasicStructure.php
+++ b/build/integration/features/bootstrap/BasicStructure.php
@@ -260,17 +260,6 @@ trait BasicStructure {
}
}
- /**
- * @Given User :user modifies text of :filename with text :text
- * @param string $user
- * @param string $filename
- * @param string $text
- */
- public function modifyTextOfFile($user, $filename, $text) {
- self::removeFile("../../data/$user/files", "$filename");
- file_put_contents("../../data/$user/files" . "$filename", "$text");
- }
-
/**
* @BeforeSuite
*/
diff --git a/build/integration/features/bootstrap/FederationContext.php b/build/integration/features/bootstrap/FederationContext.php
index 55f3a55da0d..2809c6974fa 100644
--- a/build/integration/features/bootstrap/FederationContext.php
+++ b/build/integration/features/bootstrap/FederationContext.php
@@ -12,7 +12,7 @@ require __DIR__ . '/../../vendor/autoload.php';
*/
class FederationContext implements Context, SnippetAcceptingContext {
- use WebDav;
+ use Sharing;
/**
* @Given /^User "([^"]*)" from server "(LOCAL|REMOTE)" shares "([^"]*)" with user "([^"]*)" from server "(LOCAL|REMOTE)"$/
diff --git a/build/integration/federation_features/federated.feature b/build/integration/federation_features/federated.feature
index 8bf8e921b0f..acd1f91e908 100644
--- a/build/integration/federation_features/federated.feature
+++ b/build/integration/federation_features/federated.feature
@@ -120,67 +120,6 @@ Feature: federated
| share_with | user2 |
| share_with_displayname | user2 |
- Scenario: Overwrite a federated shared file as recipient
- Given Using server "REMOTE"
- And user "user1" exists
- And user "user2" exists
- And Using server "LOCAL"
- And user "user0" exists
- And User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE"
- And User "user1" from server "REMOTE" accepts last pending share
- And Using server "REMOTE"
- And As an "user1"
- And User "user1" modifies text of "/textfile0.txt" with text "BLABLABLA"
- When User "user1" uploads file "../../data/user1/files/textfile0.txt" to "/textfile0 (2).txt"
- And Downloading file "/textfile0 (2).txt" with range "bytes=0-8"
- Then Downloaded content should be "BLABLABLA"
-
- Scenario: Overwrite a federated shared folder as recipient
- Given Using server "REMOTE"
- And user "user1" exists
- And user "user2" exists
- And Using server "LOCAL"
- And user "user0" exists
- And User "user0" from server "LOCAL" shares "/PARENT" with user "user1" from server "REMOTE"
- And User "user1" from server "REMOTE" accepts last pending share
- And Using server "REMOTE"
- And As an "user1"
- And User "user1" modifies text of "/textfile0.txt" with text "BLABLABLA"
- When User "user1" uploads file "../../data/user1/files/textfile0.txt" to "/PARENT (2)/textfile0.txt"
- And Downloading file "/PARENT (2)/textfile0.txt" with range "bytes=0-8"
- Then Downloaded content should be "BLABLABLA"
-
- Scenario: Overwrite a federated shared file as recipient using old chunking
- Given Using server "REMOTE"
- And user "user1" exists
- And user "user2" exists
- And Using server "LOCAL"
- And user "user0" exists
- And User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE"
- And User "user1" from server "REMOTE" accepts last pending share
- And Using server "REMOTE"
- And As an "user1"
- And user "user1" uploads chunk file "1" of "3" with "AAAAA" to "/textfile0 (2).txt"
- And user "user1" uploads chunk file "2" of "3" with "BBBBB" to "/textfile0 (2).txt"
- And user "user1" uploads chunk file "3" of "3" with "CCCCC" to "/textfile0 (2).txt"
- When Downloading file "/textfile0 (2).txt" with range "bytes=0-4"
- Then Downloaded content should be "AAAAA"
-
- Scenario: Overwrite a federated shared folder as recipient using old chunking
- Given Using server "REMOTE"
- And user "user1" exists
- And user "user2" exists
- And Using server "LOCAL"
- And user "user0" exists
- And User "user0" from server "LOCAL" shares "/PARENT" with user "user1" from server "REMOTE"
- And User "user1" from server "REMOTE" accepts last pending share
- And Using server "REMOTE"
- And As an "user1"
- And user "user1" uploads chunk file "1" of "3" with "AAAAA" to "/PARENT (2)/textfile0.txt"
- And user "user1" uploads chunk file "2" of "3" with "BBBBB" to "/PARENT (2)/textfile0.txt"
- And user "user1" uploads chunk file "3" of "3" with "CCCCC" to "/PARENT (2)/textfile0.txt"
- When Downloading file "/PARENT (2)/textfile0.txt" with range "bytes=3-13"
- Then Downloaded content should be "AABBBBBCCCC"
diff --git a/core/Application.php b/core/Application.php
index a87917b626a..25e2fa76273 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -120,8 +120,7 @@ class Application extends App {
$c->query('AppName'),
$c->query('Request'),
$c->query('UserManager'),
- $c->query('ServerContainer')->query('OC\Authentication\Token\IProvider'),
- $c->query('TwoFactorAuthManager'),
+ $c->query('OC\Authentication\Token\DefaultTokenProvider'),
$c->query('SecureRandom')
);
});
diff --git a/core/Command/Encryption/DecryptAll.php b/core/Command/Encryption/DecryptAll.php
index d060918a506..8d7d26f3d23 100644
--- a/core/Command/Encryption/DecryptAll.php
+++ b/core/Command/Encryption/DecryptAll.php
@@ -111,8 +111,7 @@ class DecryptAll extends Command {
$this->addArgument(
'user',
InputArgument::OPTIONAL,
- 'user for which you want to decrypt all files (optional)',
- ''
+ 'user for which you want to decrypt all files (optional)'
);
}
@@ -128,16 +127,8 @@ class DecryptAll extends Command {
return;
}
- $uid = $input->getArgument('user');
- //FIXME WHEN https://github.com/owncloud/core/issues/24994 is fixed
- if ($uid === null) {
- $message = 'your ownCloud';
- } else {
- $message = "$uid's account";
- }
-
$output->writeln("\n");
- $output->writeln("You are about to start to decrypt all files stored in $message.");
+ $output->writeln('You are about to start to decrypt all files stored in your ownCloud.');
$output->writeln('It will depend on the encryption module and your setup if this is possible.');
$output->writeln('Depending on the number and size of your files this can take some time');
$output->writeln('Please make sure that no user access his files during this process!');
@@ -149,7 +140,6 @@ class DecryptAll extends Command {
$result = $this->decryptAll->decryptAll($input, $output, $user);
if ($result === false) {
$output->writeln(' aborted.');
- $output->writeln('Server side encryption remains enabled');
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
}
$this->resetSingleUserAndTrashbin();
diff --git a/core/Controller/TokenController.php b/core/Controller/TokenController.php
index 13b1db9044a..42cc29bad10 100644
--- a/core/Controller/TokenController.php
+++ b/core/Controller/TokenController.php
@@ -1,5 +1,4 @@
*
@@ -24,27 +23,22 @@ namespace OC\Core\Controller;
use OC\AppFramework\Http;
use OC\Authentication\Token\DefaultTokenProvider;
-use OC\Authentication\Token\IProvider;
use OC\Authentication\Token\IToken;
-use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager;
-use OC\User\Manager as UserManager;
-use OCA\User_LDAP\User\Manager;
+use OC\User\Manager;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\Response;
use OCP\IRequest;
use OCP\Security\ISecureRandom;
class TokenController extends Controller {
- /** @var UserManager */
+ /** @var Manager */
private $userManager;
- /** @var IProvider */
+ /** @var DefaultTokenProvider */
private $tokenProvider;
- /** @var TwoFactorAuthManager */
- private $twoFactorAuthManager;
-
/** @var ISecureRandom */
private $secureRandom;
@@ -55,12 +49,12 @@ class TokenController extends Controller {
* @param DefaultTokenProvider $tokenProvider
* @param ISecureRandom $secureRandom
*/
- public function __construct($appName, IRequest $request, UserManager $userManager, IProvider $tokenProvider, TwoFactorAuthManager $twoFactorAuthManager, ISecureRandom $secureRandom) {
+ public function __construct($appName, IRequest $request, Manager $userManager, DefaultTokenProvider $tokenProvider,
+ ISecureRandom $secureRandom) {
parent::__construct($appName, $request);
$this->userManager = $userManager;
$this->tokenProvider = $tokenProvider;
$this->secureRandom = $secureRandom;
- $this->twoFactorAuthManager = $twoFactorAuthManager;
}
/**
@@ -76,26 +70,18 @@ class TokenController extends Controller {
*/
public function generateToken($user, $password, $name = 'unknown client') {
if (is_null($user) || is_null($password)) {
- $response = new JSONResponse();
+ $response = new Response();
$response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY);
return $response;
}
- $loginName = $user;
- $user = $this->userManager->checkPassword($loginName, $password);
- if ($user === false) {
- $response = new JSONResponse();
+ $loginResult = $this->userManager->checkPassword($user, $password);
+ if ($loginResult === false) {
+ $response = new Response();
$response->setStatus(Http::STATUS_UNAUTHORIZED);
return $response;
}
-
- if ($this->twoFactorAuthManager->isTwoFactorAuthenticated($user)) {
- $resp = new JSONResponse();
- $resp->setStatus(Http::STATUS_UNAUTHORIZED);
- return $resp;
- }
-
$token = $this->secureRandom->generate(128);
- $this->tokenProvider->generateToken($token, $user->getUID(), $loginName, $password, $name, IToken::PERMANENT_TOKEN);
+ $this->tokenProvider->generateToken($token, $loginResult->getUID(), $user, $password, $name, IToken::PERMANENT_TOKEN);
return [
'token' => $token,
];
diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php
index edaf3378cd8..499898de3bc 100644
--- a/core/Controller/TwoFactorChallengeController.php
+++ b/core/Controller/TwoFactorChallengeController.php
@@ -61,13 +61,6 @@ class TwoFactorChallengeController extends Controller {
$this->urlGenerator = $urlGenerator;
}
- /**
- * @return string
- */
- protected function getLogoutAttribute() {
- return \OC_User::getLogoutAttribute();
- }
-
/**
* @NoAdminRequired
* @NoCSRFRequired
@@ -82,7 +75,6 @@ class TwoFactorChallengeController extends Controller {
$data = [
'providers' => $providers,
'redirect_url' => $redirect_url,
- 'logout_attribute' => $this->getLogoutAttribute(),
];
return new TemplateResponse($this->appName, 'twofactorselectchallenge', $data, 'guest');
}
@@ -114,7 +106,6 @@ class TwoFactorChallengeController extends Controller {
$data = [
'error' => $error,
'provider' => $provider,
- 'logout_attribute' => $this->getLogoutAttribute(),
'template' => $tmpl->fetchPage(),
];
return new TemplateResponse($this->appName, 'twofactorshowchallenge', $data, 'guest');
diff --git a/core/Middleware/TwoFactorMiddleware.php b/core/Middleware/TwoFactorMiddleware.php
index 0bad8a2c40f..aa82897ad46 100644
--- a/core/Middleware/TwoFactorMiddleware.php
+++ b/core/Middleware/TwoFactorMiddleware.php
@@ -82,11 +82,6 @@ class TwoFactorMiddleware extends Middleware {
return;
}
- if ($controller instanceof \OC\Core\Controller\LoginController && $methodName === 'logout') {
- // Don't block the logout page, to allow canceling the 2FA
- return;
- }
-
if ($this->userSession->isLoggedIn()) {
$user = $this->userSession->getUser();
diff --git a/core/css/styles.css b/core/css/styles.css
index 475c4fa3fb3..df9509baa19 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -38,10 +38,6 @@ body {
display: inline-block;
}
-a.two-factor-cancel {
- color: #fff;
-}
-
.float-spinner {
height: 32px;
display: none;
diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php
index 4209beac4e6..14d599aab3e 100644
--- a/core/templates/twofactorselectchallenge.php
+++ b/core/templates/twofactorselectchallenge.php
@@ -18,5 +18,4 @@
-
->t('Cancel login')) ?>
+
\ No newline at end of file
diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php
index c5ee9aca4b4..66f5ed312ec 100644
--- a/core/templates/twofactorshowchallenge.php
+++ b/core/templates/twofactorshowchallenge.php
@@ -17,4 +17,3 @@ $template = $_['template'];
t('An error occured while verifying the token')); ?>
->t('Cancel login')) ?>
diff --git a/lib/l10n/ar.js b/lib/l10n/ar.js
index a7a3e4e4c31..21a67883ac3 100644
--- a/lib/l10n/ar.js
+++ b/lib/l10n/ar.js
@@ -1,46 +1,18 @@
OC.L10N.register(
"lib",
{
- "Cannot write into \"config\" directory!" : "الكتابة في مجلد \"config\" غير ممكنة!",
- "This can usually be fixed by giving the webserver write access to the config directory" : "يمكن حل هذا عادة بإعطاء خادم الوب صلاحية الكتابة في مجلد config",
- "See %s" : "أنظر %s",
- "Sample configuration detected" : "تم اكتشاف إعدادات عيّنة",
- "PHP %s or higher is required." : "إصدار PHP %s أو أحدث منه مطلوب.",
- "PHP with a version lower than %s is required." : "PHP الإصدار %s أو أقل مطلوب.",
- "%sbit or higher PHP required." : "مكتبات PHP ذات %s بت أو أعلى مطلوبة.",
- "Following databases are supported: %s" : "قواعد البيانات التالية مدعومة: %s",
- "The command line tool %s could not be found" : "لم يتم العثور على أداة سطر الأوامر %s",
- "The library %s is not available." : "مكتبة %s غير متوفرة.",
"Unknown filetype" : "نوع الملف غير معروف",
"Invalid image" : "الصورة غير صالحة",
"today" : "اليوم",
"yesterday" : "يوم أمس",
- "_%n day ago_::_%n days ago_" : ["قبل ساعات","قبل يوم","قبل يومين","قبل %n يوماً","قبل %n يوماً","قبل %n يوماً"],
"last month" : "الشهر الماضي",
- "_%n month ago_::_%n months ago_" : ["قبل عدة أيام","قبل شهر","قبل شهرين","قبل %n شهراً","قبل %n شهراً","قبل %n شهراً"],
"last year" : "السنةالماضية",
"seconds ago" : "منذ ثواني",
- "Empty filename is not allowed" : "لا يسمح بأسماء فارغة للملفات",
- "4-byte characters are not supported in file names" : "المحارف ذات 4 بايت غير مسموح بها في أسماء الملفات",
- "File name is a reserved word" : "اسم الملف كلمة محجوزة",
- "File name contains at least one invalid character" : "اسم الملف به ، على الأقل ، حرف غير صالح",
- "File name is too long" : "اسم الملف طويل جداً",
"App directory already exists" : "مجلد التطبيق موجود مسبقا",
"Can't create app folder. Please fix permissions. %s" : "لا يمكن إنشاء مجلد التطبيق. يرجى تعديل الصلاحيات. %s",
- "Archive does not contain a directory named %s" : "الأرشيف لا يحتوي مجلداً اسمه %s",
"No source specified when installing app" : "لم يتم تحديد المصدر عن تثبيت البرنامج",
- "No href specified when installing app from http" : "لم يتم تحديد href عند تثبيت التطبيق من http",
- "No path specified when installing app from local file" : "لم يتم تحديد مسار عند تثبيت التطبيق من ملف محلّي",
"Archives of type %s are not supported" : "الأرشيفات من نوع %s غير مدعومة",
- "Failed to open archive when installing app" : "فشل فتح الأرشيف أثناء تثبيت التطبيق",
"App does not provide an info.xml file" : "التطبيق لا يتوفر على ملف info.xml",
- "App cannot be installed because appinfo file cannot be read." : "لا يمكن تثبيت التطبيق لأن ملف appinfo غير ممكنة قراءته.",
- "Signature could not get checked. Please contact the app developer and check your admin screen." : "لم يتم التحقق من التوقيع. فضلاً اتصل بمطوّر التطبيق و تحقق من شاشة الإدارة في حسابك.",
- "App can't be installed because of not allowed code in the App" : "لم يتم تثبيت التطبيق لوجود شفرة غير مسموح بها في التطبيق",
- "App can't be installed because it is not compatible with this version of ownCloud" : "لم يتم تثبيت التطبيق لأنه غير متوافق مع هذا الإصدار من ownCloud",
- "App can't be installed because it contains the true tag which is not allowed for non shipped apps" : "لم يتم تثبيت التطبيق لأن به علامة true التي لايسمح بها في التطبيقات غير المشحونة",
- "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "لم يتم تثبيت التطبيق لأن الإصدار في info.xml مختلف عن الإصدار المذكور في متجر التطبيقات",
- "%s enter the database username and name." : "%s أدخِل اسم قاعدة البيانات واسم مستخدمها.",
"%s enter the database username." : "%s ادخل اسم المستخدم الخاص بقاعدة البيانات.",
"%s enter the database name." : "%s ادخل اسم فاعدة البيانات",
"%s you may not use dots in the database name" : "%s لا يسمح لك باستخدام نقطه (.) في اسم قاعدة البيانات",
@@ -51,20 +23,9 @@ OC.L10N.register(
"You need to enter either an existing account or the administrator." : "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير.",
"Offending command was: \"%s\", name: %s, password: %s" : "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s",
"PostgreSQL username and/or password not valid" : "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
- "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "نظام ماك الإصدار X غير مدعوم و %s لن يعمل بشكل صحيح على هذه المنصة. استخدمه على مسؤوليتك!",
- "For the best results, please consider using a GNU/Linux server instead." : "فضلاً ضع في الاعتبار استخدام نظام GNU/Linux بدل الأنظمة الأخرى للحصول على أفضل النتائج.",
- "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "فضلاً إحذف إعداد open_basedir من ملف php.ini لديك أو حوّل إلى PHP إصدار 64 بت.",
"Set an admin username." : "اعداد اسم مستخدم للمدير",
"Set an admin password." : "اعداد كلمة مرور للمدير",
- "Can't create or write into the data directory %s" : "لا يمكن الإنشاء أو الكتابة في مجلد البيانات %s",
- "Invalid Federated Cloud ID" : "معرّف سحابة الاتحاد غير صالح",
"%s shared »%s« with you" : "%s شارك »%s« معك",
- "%s via %s" : "%s عبر %s",
- "Sharing %s failed, because the file does not exist" : "فشلت مشاركة %s فالملف غير موجود",
- "You are not allowed to share %s" : "أنت غير مسموح لك أن تشارك %s",
- "Sharing %s failed, because you can not share with yourself" : "فشلت مشاركة %s لأنك لايمكنك المشاركة مع نفسك",
- "Sharing %s failed, because the user %s does not exist" : "فشلت مشاركة %s لأن المستخدم %s غير موجود",
- "Share type %s is not valid for %s" : "مشاركة النوع %s غير صالحة لـ %s",
"Could not find category \"%s\"" : "تعذر العثور على المجلد \"%s\"",
"Apps" : "التطبيقات",
"A valid username must be provided" : "يجب ادخال اسم مستخدم صحيح",
diff --git a/lib/l10n/ar.json b/lib/l10n/ar.json
index 86284a03538..eb91606bb52 100644
--- a/lib/l10n/ar.json
+++ b/lib/l10n/ar.json
@@ -1,44 +1,16 @@
{ "translations": {
- "Cannot write into \"config\" directory!" : "الكتابة في مجلد \"config\" غير ممكنة!",
- "This can usually be fixed by giving the webserver write access to the config directory" : "يمكن حل هذا عادة بإعطاء خادم الوب صلاحية الكتابة في مجلد config",
- "See %s" : "أنظر %s",
- "Sample configuration detected" : "تم اكتشاف إعدادات عيّنة",
- "PHP %s or higher is required." : "إصدار PHP %s أو أحدث منه مطلوب.",
- "PHP with a version lower than %s is required." : "PHP الإصدار %s أو أقل مطلوب.",
- "%sbit or higher PHP required." : "مكتبات PHP ذات %s بت أو أعلى مطلوبة.",
- "Following databases are supported: %s" : "قواعد البيانات التالية مدعومة: %s",
- "The command line tool %s could not be found" : "لم يتم العثور على أداة سطر الأوامر %s",
- "The library %s is not available." : "مكتبة %s غير متوفرة.",
"Unknown filetype" : "نوع الملف غير معروف",
"Invalid image" : "الصورة غير صالحة",
"today" : "اليوم",
"yesterday" : "يوم أمس",
- "_%n day ago_::_%n days ago_" : ["قبل ساعات","قبل يوم","قبل يومين","قبل %n يوماً","قبل %n يوماً","قبل %n يوماً"],
"last month" : "الشهر الماضي",
- "_%n month ago_::_%n months ago_" : ["قبل عدة أيام","قبل شهر","قبل شهرين","قبل %n شهراً","قبل %n شهراً","قبل %n شهراً"],
"last year" : "السنةالماضية",
"seconds ago" : "منذ ثواني",
- "Empty filename is not allowed" : "لا يسمح بأسماء فارغة للملفات",
- "4-byte characters are not supported in file names" : "المحارف ذات 4 بايت غير مسموح بها في أسماء الملفات",
- "File name is a reserved word" : "اسم الملف كلمة محجوزة",
- "File name contains at least one invalid character" : "اسم الملف به ، على الأقل ، حرف غير صالح",
- "File name is too long" : "اسم الملف طويل جداً",
"App directory already exists" : "مجلد التطبيق موجود مسبقا",
"Can't create app folder. Please fix permissions. %s" : "لا يمكن إنشاء مجلد التطبيق. يرجى تعديل الصلاحيات. %s",
- "Archive does not contain a directory named %s" : "الأرشيف لا يحتوي مجلداً اسمه %s",
"No source specified when installing app" : "لم يتم تحديد المصدر عن تثبيت البرنامج",
- "No href specified when installing app from http" : "لم يتم تحديد href عند تثبيت التطبيق من http",
- "No path specified when installing app from local file" : "لم يتم تحديد مسار عند تثبيت التطبيق من ملف محلّي",
"Archives of type %s are not supported" : "الأرشيفات من نوع %s غير مدعومة",
- "Failed to open archive when installing app" : "فشل فتح الأرشيف أثناء تثبيت التطبيق",
"App does not provide an info.xml file" : "التطبيق لا يتوفر على ملف info.xml",
- "App cannot be installed because appinfo file cannot be read." : "لا يمكن تثبيت التطبيق لأن ملف appinfo غير ممكنة قراءته.",
- "Signature could not get checked. Please contact the app developer and check your admin screen." : "لم يتم التحقق من التوقيع. فضلاً اتصل بمطوّر التطبيق و تحقق من شاشة الإدارة في حسابك.",
- "App can't be installed because of not allowed code in the App" : "لم يتم تثبيت التطبيق لوجود شفرة غير مسموح بها في التطبيق",
- "App can't be installed because it is not compatible with this version of ownCloud" : "لم يتم تثبيت التطبيق لأنه غير متوافق مع هذا الإصدار من ownCloud",
- "App can't be installed because it contains the true tag which is not allowed for non shipped apps" : "لم يتم تثبيت التطبيق لأن به علامة true التي لايسمح بها في التطبيقات غير المشحونة",
- "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "لم يتم تثبيت التطبيق لأن الإصدار في info.xml مختلف عن الإصدار المذكور في متجر التطبيقات",
- "%s enter the database username and name." : "%s أدخِل اسم قاعدة البيانات واسم مستخدمها.",
"%s enter the database username." : "%s ادخل اسم المستخدم الخاص بقاعدة البيانات.",
"%s enter the database name." : "%s ادخل اسم فاعدة البيانات",
"%s you may not use dots in the database name" : "%s لا يسمح لك باستخدام نقطه (.) في اسم قاعدة البيانات",
@@ -49,20 +21,9 @@
"You need to enter either an existing account or the administrator." : "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير.",
"Offending command was: \"%s\", name: %s, password: %s" : "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s",
"PostgreSQL username and/or password not valid" : "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
- "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "نظام ماك الإصدار X غير مدعوم و %s لن يعمل بشكل صحيح على هذه المنصة. استخدمه على مسؤوليتك!",
- "For the best results, please consider using a GNU/Linux server instead." : "فضلاً ضع في الاعتبار استخدام نظام GNU/Linux بدل الأنظمة الأخرى للحصول على أفضل النتائج.",
- "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "فضلاً إحذف إعداد open_basedir من ملف php.ini لديك أو حوّل إلى PHP إصدار 64 بت.",
"Set an admin username." : "اعداد اسم مستخدم للمدير",
"Set an admin password." : "اعداد كلمة مرور للمدير",
- "Can't create or write into the data directory %s" : "لا يمكن الإنشاء أو الكتابة في مجلد البيانات %s",
- "Invalid Federated Cloud ID" : "معرّف سحابة الاتحاد غير صالح",
"%s shared »%s« with you" : "%s شارك »%s« معك",
- "%s via %s" : "%s عبر %s",
- "Sharing %s failed, because the file does not exist" : "فشلت مشاركة %s فالملف غير موجود",
- "You are not allowed to share %s" : "أنت غير مسموح لك أن تشارك %s",
- "Sharing %s failed, because you can not share with yourself" : "فشلت مشاركة %s لأنك لايمكنك المشاركة مع نفسك",
- "Sharing %s failed, because the user %s does not exist" : "فشلت مشاركة %s لأن المستخدم %s غير موجود",
- "Share type %s is not valid for %s" : "مشاركة النوع %s غير صالحة لـ %s",
"Could not find category \"%s\"" : "تعذر العثور على المجلد \"%s\"",
"Apps" : "التطبيقات",
"A valid username must be provided" : "يجب ادخال اسم مستخدم صحيح",
diff --git a/lib/l10n/ro.js b/lib/l10n/ro.js
index de13cd796d6..5c5b7844cf7 100644
--- a/lib/l10n/ro.js
+++ b/lib/l10n/ro.js
@@ -29,7 +29,6 @@ OC.L10N.register(
"Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulul cu id-ul %s nu există. Activează-l în setările tale de aplicație sau contactează-ți administratorul.",
"Empty filename is not allowed" : "Nu este permis fișier fără nume",
"Dot files are not allowed" : "Fișierele care încep cu caracterul punct nu sunt permise",
- "4-byte characters are not supported in file names" : "Caracterele stocate în 4 octeți nu sunt suportate în denumirile fișierelor",
"File name is a reserved word" : "Numele fișierului este un cuvânt rezervat",
"File name contains at least one invalid character" : "Numele fișierului conține măcar un caracter invalid",
"File name is too long" : "Numele fișierului este prea lung",
@@ -37,8 +36,6 @@ OC.L10N.register(
"Can't create app folder. Please fix permissions. %s" : "Nu se poate crea directorul de aplicație. Repară permisiunile. %s",
"Archive does not contain a directory named %s" : "Arhiva nu conține vreun director cu numele %s",
"No source specified when installing app" : "Nu a fost specificată vreo sursă la instalarea aplicației",
- "No href specified when installing app from http" : "Nu s-a specificat adresa la instalarea aplicației dintr-o sursă de pe Internet",
- "No path specified when installing app from local file" : "Nu s-a specificat vreo cale la instalarea aplicației de pe un fișier local",
"Archives of type %s are not supported" : "Arhivele de tip %s nu sunt suportate",
"Failed to open archive when installing app" : "Deschiderea arhivei a eșuat în timpul instalării aplicației",
"App does not provide an info.xml file" : "Aplicația nu furnizează un fișier info.xml",
@@ -54,12 +51,10 @@ OC.L10N.register(
"DB Error: \"%s\"" : "Eroare Bază de Date: \"%s\"",
"Offending command was: \"%s\"" : "Comanda cauză a fost: \"%s\"",
"PostgreSQL username and/or password not valid" : "Nume utilizator și/sau parolă PostgreSQL greșită",
- "For the best results, please consider using a GNU/Linux server instead." : "Pentru cele mai bune rezultate, ia în calcul folosirea unui server care rulează un sistem de operare GNU/Linux.",
"Set an admin username." : "Setează un nume de administrator.",
"Set an admin password." : "Setează o parolă de administrator.",
"Invalid Federated Cloud ID" : "ID invalid cloud federalizat",
"%s shared »%s« with you" : "%s Partajat »%s« cu tine de",
- "%s via %s" : "%s via %s",
"You are not allowed to share %s" : "Nu există permisiunea de partajare %s",
"Sharing %s failed, because this item is already shared with %s" : "Partajarea %s a eșuat deoarece acest element este deja partajat cu %s",
"Not allowed to create a federated share with the same user" : "Nu este permisă crearea unei partajări federalizate cu acelaşi utilizator",
diff --git a/lib/l10n/ro.json b/lib/l10n/ro.json
index 9149650a015..566f6d01123 100644
--- a/lib/l10n/ro.json
+++ b/lib/l10n/ro.json
@@ -27,7 +27,6 @@
"Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulul cu id-ul %s nu există. Activează-l în setările tale de aplicație sau contactează-ți administratorul.",
"Empty filename is not allowed" : "Nu este permis fișier fără nume",
"Dot files are not allowed" : "Fișierele care încep cu caracterul punct nu sunt permise",
- "4-byte characters are not supported in file names" : "Caracterele stocate în 4 octeți nu sunt suportate în denumirile fișierelor",
"File name is a reserved word" : "Numele fișierului este un cuvânt rezervat",
"File name contains at least one invalid character" : "Numele fișierului conține măcar un caracter invalid",
"File name is too long" : "Numele fișierului este prea lung",
@@ -35,8 +34,6 @@
"Can't create app folder. Please fix permissions. %s" : "Nu se poate crea directorul de aplicație. Repară permisiunile. %s",
"Archive does not contain a directory named %s" : "Arhiva nu conține vreun director cu numele %s",
"No source specified when installing app" : "Nu a fost specificată vreo sursă la instalarea aplicației",
- "No href specified when installing app from http" : "Nu s-a specificat adresa la instalarea aplicației dintr-o sursă de pe Internet",
- "No path specified when installing app from local file" : "Nu s-a specificat vreo cale la instalarea aplicației de pe un fișier local",
"Archives of type %s are not supported" : "Arhivele de tip %s nu sunt suportate",
"Failed to open archive when installing app" : "Deschiderea arhivei a eșuat în timpul instalării aplicației",
"App does not provide an info.xml file" : "Aplicația nu furnizează un fișier info.xml",
@@ -52,12 +49,10 @@
"DB Error: \"%s\"" : "Eroare Bază de Date: \"%s\"",
"Offending command was: \"%s\"" : "Comanda cauză a fost: \"%s\"",
"PostgreSQL username and/or password not valid" : "Nume utilizator și/sau parolă PostgreSQL greșită",
- "For the best results, please consider using a GNU/Linux server instead." : "Pentru cele mai bune rezultate, ia în calcul folosirea unui server care rulează un sistem de operare GNU/Linux.",
"Set an admin username." : "Setează un nume de administrator.",
"Set an admin password." : "Setează o parolă de administrator.",
"Invalid Federated Cloud ID" : "ID invalid cloud federalizat",
"%s shared »%s« with you" : "%s Partajat »%s« cu tine de",
- "%s via %s" : "%s via %s",
"You are not allowed to share %s" : "Nu există permisiunea de partajare %s",
"Sharing %s failed, because this item is already shared with %s" : "Partajarea %s a eșuat deoarece acest element este deja partajat cu %s",
"Not allowed to create a federated share with the same user" : "Nu este permisă crearea unei partajări federalizate cu acelaşi utilizator",
diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php
index e082cea3305..6e99e1ac268 100644
--- a/lib/private/AllConfig.php
+++ b/lib/private/AllConfig.php
@@ -154,7 +154,7 @@ class AllConfig implements \OCP\IConfig {
*
* @param string $appName the appName that we want to store the value under
* @param string $key the key of the value, under which will be saved
- * @param string|float|int $value the value that should be stored
+ * @param string $value the value that should be stored
*/
public function setAppValue($appName, $key, $value) {
\OC::$server->getAppConfig()->setValue($appName, $key, $value);
@@ -198,16 +198,11 @@ class AllConfig implements \OCP\IConfig {
* @param string $userId the userId of the user that we want to store the value under
* @param string $appName the appName that we want to store the value under
* @param string $key the key under which the value is being stored
- * @param string|float|int $value the value that you want to store
+ * @param string $value the value that you want to store
* @param string $preCondition only update if the config value was previously the value passed as $preCondition
* @throws \OCP\PreConditionNotMetException if a precondition is specified and is not met
- * @throws \UnexpectedValueException when trying to store an unexpected value
*/
public function setUserValue($userId, $appName, $key, $value, $preCondition = null) {
- if (!is_int($value) && !is_float($value) && !is_string($value)) {
- throw new \UnexpectedValueException('Only integers, floats and strings are allowed as value');
- }
-
// TODO - FIXME
$this->fixDIInit();
diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php
index f84c8a41f17..24542152ffc 100644
--- a/lib/private/AppConfig.php
+++ b/lib/private/AppConfig.php
@@ -143,7 +143,7 @@ class AppConfig implements IAppConfig {
*
* @param string $app app
* @param string $key key
- * @param string|float|int $value value
+ * @param string $value value
* @return bool True if the value was inserted or updated, false if the value was the same
*/
public function setValue($app, $key, $value) {
diff --git a/lib/private/Authentication/Token/DefaultTokenCleanupJob.php b/lib/private/Authentication/Token/DefaultTokenCleanupJob.php
index 7746d6be915..04b98c6c5a0 100644
--- a/lib/private/Authentication/Token/DefaultTokenCleanupJob.php
+++ b/lib/private/Authentication/Token/DefaultTokenCleanupJob.php
@@ -28,7 +28,6 @@ class DefaultTokenCleanupJob extends Job {
protected function run($argument) {
/* @var $provider DefaultTokenProvider */
- // TODO: add OC\Authentication\Token\IProvider::invalidateOldTokens and query interface
$provider = OC::$server->query('OC\Authentication\Token\DefaultTokenProvider');
$provider->invalidateOldTokens();
}
diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php
index 34a3e1bff91..8676bc09575 100644
--- a/lib/private/Encryption/DecryptAll.php
+++ b/lib/private/Encryption/DecryptAll.php
@@ -80,7 +80,7 @@ class DecryptAll {
$this->input = $input;
$this->output = $output;
- if ($user !== '' && $this->userManager->userExists($user) === false) {
+ if (!empty($user) && $this->userManager->userExists($user) === false) {
$this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again');
return false;
}
@@ -141,7 +141,7 @@ class DecryptAll {
$this->output->writeln("\n");
$userList = [];
- if ($user === '') {
+ if (empty($user)) {
$fetchUsersProgress = new ProgressBar($this->output);
$fetchUsersProgress->setFormat(" %message% \n [%bar%]");
diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php
index c17f9bfd51b..e6bd118d5a5 100644
--- a/lib/private/Files/Cache/Scanner.php
+++ b/lib/private/Files/Cache/Scanner.php
@@ -38,7 +38,6 @@ use OC\Files\Filesystem;
use OC\Hooks\BasicEmitter;
use OCP\Config;
use OCP\Files\Cache\IScanner;
-use OCP\Files\ForbiddenException;
use OCP\Files\Storage\ILockingStorage;
use OCP\Lock\ILockingProvider;
@@ -141,11 +140,7 @@ class Scanner extends BasicEmitter implements IScanner {
}
}
- try {
- $data = $this->getData($file);
- } catch (ForbiddenException $e) {
- return null;
- }
+ $data = $this->getData($file);
if ($data) {
diff --git a/lib/private/Files/Cache/Updater.php b/lib/private/Files/Cache/Updater.php
index 4e17c4d778d..820941abae1 100644
--- a/lib/private/Files/Cache/Updater.php
+++ b/lib/private/Files/Cache/Updater.php
@@ -231,10 +231,7 @@ class Updater implements IUpdater {
$parentId = $this->cache->getParentId($internalPath);
$parent = dirname($internalPath);
if ($parentId != -1) {
- $mtime = $this->storage->filemtime($parent);
- if ($mtime !== false) {
- $this->cache->update($parentId, array('storage_mtime' => $mtime));
- }
+ $this->cache->update($parentId, array('storage_mtime' => $this->storage->filemtime($parent)));
}
}
}
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index 0c1b69108d4..cec6a42a2c0 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -643,9 +643,6 @@ abstract class Common implements Storage, ILockingStorage {
$data = [];
$data['mimetype'] = $this->getMimeType($path);
$data['mtime'] = $this->filemtime($path);
- if ($data['mtime'] === false) {
- $data['mtime'] = time();
- }
if ($data['mimetype'] == 'httpd/unix-directory') {
$data['size'] = -1; //unknown
} else {
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
index 005b5f9ab91..b07e26a3358 100644
--- a/lib/private/Files/Storage/Local.php
+++ b/lib/private/Files/Storage/Local.php
@@ -33,31 +33,20 @@
*/
namespace OC\Files\Storage;
-
-use OCP\Files\ForbiddenException;
-
/**
* for local filestore, we only have to map the paths
*/
class Local extends \OC\Files\Storage\Common {
protected $datadir;
- protected $dataDirLength;
-
- protected $allowSymlinks = false;
-
- protected $realDataDir;
-
public function __construct($arguments) {
if (!isset($arguments['datadir']) || !is_string($arguments['datadir'])) {
throw new \InvalidArgumentException('No data directory set for local storage');
}
$this->datadir = $arguments['datadir'];
- $this->realDataDir = rtrim(realpath($this->datadir), '/') . '/';
if (substr($this->datadir, -1) !== '/') {
$this->datadir .= '/';
}
- $this->dataDirLength = strlen($this->realDataDir);
}
public function __destruct() {
@@ -168,7 +157,7 @@ class Local extends \OC\Files\Storage\Common {
public function filemtime($path) {
clearstatcache($this->getSourcePath($path));
- return $this->file_exists($path) ? filemtime($this->getSourcePath($path)) : false;
+ return filemtime($this->getSourcePath($path));
}
public function touch($path, $mtime = null) {
@@ -199,7 +188,7 @@ class Local extends \OC\Files\Storage\Common {
return '';
}
- $handle = fopen($fileName, 'rb');
+ $handle = fopen($fileName,'rb');
$content = fread($handle, $fileSize);
fclose($handle);
return $content;
@@ -348,27 +337,10 @@ class Local extends \OC\Files\Storage\Common {
*
* @param string $path
* @return string
- * @throws ForbiddenException
*/
public function getSourcePath($path) {
$fullPath = $this->datadir . $path;
- if ($this->allowSymlinks || $path === '') {
- return $fullPath;
- }
- $pathToResolve = $fullPath;
- $realPath = realpath($pathToResolve);
- while ($realPath === false) { // for non existing files check the parent directory
- $pathToResolve = dirname($pathToResolve);
- $realPath = realpath($pathToResolve);
- }
- if ($realPath) {
- $realPath = $realPath . '/';
- }
- if (substr($realPath, 0, $this->dataDirLength) === $this->realDataDir) {
- return $fullPath;
- } else {
- throw new ForbiddenException("Following symlinks is not allowed ('$fullPath' -> '$realPath' not inside '{$this->realDataDir}')", false);
- }
+ return $fullPath;
}
/**
@@ -405,7 +377,7 @@ class Local extends \OC\Files\Storage\Common {
* @return bool
*/
public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
- if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Local')) {
+ if($sourceStorage->instanceOfStorage('\OC\Files\Storage\Local')){
/**
* @var \OC\Files\Storage\Local $sourceStorage
*/
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index e9daa123470..f738542ea8c 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -337,17 +337,10 @@ class View {
return $this->removeMount($mount, $absolutePath);
}
if ($this->is_dir($path)) {
- $result = $this->basicOperation('rmdir', $path, array('delete'));
+ return $this->basicOperation('rmdir', $path, array('delete'));
} else {
- $result = false;
- }
-
- if (!$result && !$this->file_exists($path)) { //clear ghost files from the cache on delete
- $storage = $mount->getStorage();
- $internalPath = $mount->getInternalPath($absolutePath);
- $storage->getUpdater()->remove($internalPath);
+ return false;
}
- return $result;
}
/**
@@ -436,7 +429,7 @@ class View {
/**
* @param string $path
- * @param int $from
+ * @param int $from
* @param int $to
* @return bool|mixed
* @throws \OCP\Files\InvalidPathException
@@ -448,18 +441,18 @@ class View {
$handle = $this->fopen($path, 'rb');
if ($handle) {
if (fseek($handle, $from) === 0) {
- $chunkSize = 8192; // 8 kB chunks
- $end = $to + 1;
- while (!feof($handle) && ftell($handle) < $end) {
- $len = $end - ftell($handle);
- if ($len > $chunkSize) {
- $len = $chunkSize;
- }
- echo fread($handle, $len);
- flush();
+ $chunkSize = 8192; // 8 kB chunks
+ $end = $to + 1;
+ while (!feof($handle) && ftell($handle) < $end) {
+ $len = $end-ftell($handle);
+ if ($len > $chunkSize) {
+ $len = $chunkSize;
}
- $size = ftell($handle) - $from;
- return $size;
+ echo fread($handle, $len);
+ flush();
+ }
+ $size = ftell($handle) - $from;
+ return $size;
}
throw new \OCP\Files\UnseekableException('fseek error');
@@ -686,15 +679,7 @@ class View {
if ($mount and $mount->getInternalPath($absolutePath) === '') {
return $this->removeMount($mount, $absolutePath);
}
- $result = $this->basicOperation('unlink', $path, array('delete'));
- if (!$result && !$this->file_exists($path)) { //clear ghost files from the cache on delete
- $storage = $mount->getStorage();
- $internalPath = $mount->getInternalPath($absolutePath);
- $storage->getUpdater()->remove($internalPath);
- return true;
- } else {
- return $result;
- }
+ return $this->basicOperation('unlink', $path, array('delete'));
}
/**
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php
index 21fb3cbc5ab..f107d47faf7 100644
--- a/lib/private/legacy/helper.php
+++ b/lib/private/legacy/helper.php
@@ -206,9 +206,7 @@ class OC_Helper {
foreach ($files as $fileInfo) {
/** @var SplFileInfo $fileInfo */
- if ($fileInfo->isLink()) {
- unlink($fileInfo->getPathname());
- } else if ($fileInfo->isDir()) {
+ if ($fileInfo->isDir()) {
rmdir($fileInfo->getRealPath());
} else {
unlink($fileInfo->getRealPath());
diff --git a/lib/public/IAppConfig.php b/lib/public/IAppConfig.php
index 22fcdbbb205..1406e8a56d6 100644
--- a/lib/public/IAppConfig.php
+++ b/lib/public/IAppConfig.php
@@ -88,7 +88,7 @@ interface IAppConfig {
* sets a value in the appconfig
* @param string $app app
* @param string $key key
- * @param string|float|int $value value
+ * @param string $value value
* @deprecated 8.0.0 use method setAppValue of \OCP\IConfig
*
* Sets a value. If the key did not exist before it will be created.
diff --git a/lib/public/IConfig.php b/lib/public/IConfig.php
index 05158e9063e..9e5024545b3 100644
--- a/lib/public/IConfig.php
+++ b/lib/public/IConfig.php
@@ -104,7 +104,7 @@ interface IConfig {
* Writes a new app wide value
*
* @param string $appName the appName that we want to store the value under
- * @param string|float|int $key the key of the value, under which will be saved
+ * @param string $key the key of the value, under which will be saved
* @param string $value the value that should be stored
* @return void
* @since 6.0.0
@@ -149,7 +149,6 @@ interface IConfig {
* @param string $value the value that you want to store
* @param string $preCondition only update if the config value was previously the value passed as $preCondition
* @throws \OCP\PreConditionNotMetException if a precondition is specified and is not met
- * @throws \UnexpectedValueException when trying to store an unexpected value
* @since 6.0.0 - parameter $precondition was added in 8.0.0
*/
public function setUserValue($userId, $appName, $key, $value, $preCondition = null);
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index e0fccbd9539..03f471bc3b4 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -14,7 +14,7 @@ var UserList = {
availableGroups: [],
offset: 0,
usersToLoad: 10, //So many users will be loaded when user scrolls down
- initialUsersToLoad: 50, //initial number of users to load
+ initialUsersToLoad: 250, //initial number of users to load
currentGid: '',
filter: '',
diff --git a/tests/Core/Controller/TokenControllerTest.php b/tests/Core/Controller/TokenControllerTest.php
index b6b54b14fad..386140a8a4f 100644
--- a/tests/Core/Controller/TokenControllerTest.php
+++ b/tests/Core/Controller/TokenControllerTest.php
@@ -23,9 +23,8 @@
namespace Tests\Core\Controller;
use OC\AppFramework\Http;
-use OC\Authentication\Token\IToken;
use OC\Core\Controller\TokenController;
-use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\Response;
use Test\TestCase;
class TokenControllerTest extends TestCase {
@@ -35,7 +34,6 @@ class TokenControllerTest extends TestCase {
private $request;
private $userManager;
private $tokenProvider;
- private $twoFactorAuthManager;
private $secureRandom;
protected function setUp() {
@@ -45,17 +43,17 @@ class TokenControllerTest extends TestCase {
$this->userManager = $this->getMockBuilder('\OC\User\Manager')
->disableOriginalConstructor()
->getMock();
- $this->tokenProvider = $this->getMock('\OC\Authentication\Token\IProvider');
- $this->twoFactorAuthManager = $this->getMockBuilder('\OC\Authentication\TwoFactorAuth\Manager')
+ $this->tokenProvider = $this->getMockBuilder('\OC\Authentication\Token\DefaultTokenProvider')
->disableOriginalConstructor()
->getMock();
$this->secureRandom = $this->getMock('\OCP\Security\ISecureRandom');
- $this->tokenController = new TokenController('core', $this->request, $this->userManager, $this->tokenProvider, $this->twoFactorAuthManager, $this->secureRandom);
+ $this->tokenController = new TokenController('core', $this->request, $this->userManager, $this->tokenProvider,
+ $this->secureRandom);
}
public function testWithoutCredentials() {
- $expected = new JSONResponse();
+ $expected = new Response();
$expected->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY);
$actual = $this->tokenController->generateToken(null, null);
@@ -68,7 +66,7 @@ class TokenControllerTest extends TestCase {
->method('checkPassword')
->with('john', 'passme')
->will($this->returnValue(false));
- $expected = new JSONResponse();
+ $expected = new Response();
$expected->setStatus(Http::STATUS_UNAUTHORIZED);
$actual = $this->tokenController->generateToken('john', 'passme');
@@ -85,17 +83,13 @@ class TokenControllerTest extends TestCase {
$user->expects($this->once())
->method('getUID')
->will($this->returnValue('john'));
- $this->twoFactorAuthManager->expects($this->once())
- ->method('isTwoFactorAuthenticated')
- ->with($user)
- ->will($this->returnValue(false));
$this->secureRandom->expects($this->once())
->method('generate')
->with(128)
->will($this->returnValue('verysecurerandomtoken'));
$this->tokenProvider->expects($this->once())
->method('generateToken')
- ->with('verysecurerandomtoken', 'john', 'john', '123456', 'unknown client', IToken::PERMANENT_TOKEN);
+ ->with('verysecurerandomtoken', 'john', 'john', '123456', 'unknown client', \OC\Authentication\Token\IToken::PERMANENT_TOKEN);
$expected = [
'token' => 'verysecurerandomtoken'
];
@@ -105,24 +99,4 @@ class TokenControllerTest extends TestCase {
$this->assertEquals($expected, $actual);
}
- public function testWithValidCredentialsBut2faEnabled() {
- $user = $this->getMock('\OCP\IUser');
- $this->userManager->expects($this->once())
- ->method('checkPassword')
- ->with('john', '123456')
- ->will($this->returnValue($user));
- $this->twoFactorAuthManager->expects($this->once())
- ->method('isTwoFactorAuthenticated')
- ->with($user)
- ->will($this->returnValue(true));
- $this->secureRandom->expects($this->never())
- ->method('generate');
- $expected = new JSONResponse();
- $expected->setStatus(Http::STATUS_UNAUTHORIZED);
-
- $actual = $this->tokenController->generateToken('john', '123456');
-
- $this->assertEquals($expected, $actual);
- }
-
}
diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
index 08d8dd1452c..2da6dcd52ac 100644
--- a/tests/Core/Controller/TwoFactorChallengeControllerTest.php
+++ b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
@@ -33,7 +33,7 @@ class TwoFactorChallengeControllerTest extends TestCase {
private $session;
private $urlGenerator;
- /** @var TwoFactorChallengeController|\PHPUnit_Framework_MockObject_MockObject */
+ /** TwoFactorChallengeController */
private $controller;
protected function setUp() {
@@ -47,20 +47,9 @@ class TwoFactorChallengeControllerTest extends TestCase {
$this->session = $this->getMock('\OCP\ISession');
$this->urlGenerator = $this->getMock('\OCP\IURLGenerator');
- $this->controller = $this->getMockBuilder('OC\Core\Controller\TwoFactorChallengeController')
- ->setConstructorArgs([
- 'core',
- $this->request,
- $this->twoFactorManager,
- $this->userSession,
- $this->session,
- $this->urlGenerator,
- ])
- ->setMethods(['getLogoutAttribute'])
- ->getMock();
- $this->controller->expects($this->any())
- ->method('getLogoutAttribute')
- ->willReturn('logoutAttribute');
+ $this->controller = new TwoFactorChallengeController(
+ 'core', $this->request, $this->twoFactorManager, $this->userSession, $this->session, $this->urlGenerator
+ );
}
public function testSelectChallenge() {
@@ -81,7 +70,6 @@ class TwoFactorChallengeControllerTest extends TestCase {
$expected = new \OCP\AppFramework\Http\TemplateResponse('core', 'twofactorselectchallenge', [
'providers' => $providers,
'redirect_url' => '/some/url',
- 'logout_attribute' => 'logoutAttribute',
], 'guest');
$this->assertEquals($expected, $this->controller->selectChallenge('/some/url'));
@@ -122,7 +110,6 @@ class TwoFactorChallengeControllerTest extends TestCase {
$expected = new \OCP\AppFramework\Http\TemplateResponse('core', 'twofactorshowchallenge', [
'error' => true,
'provider' => $provider,
- 'logout_attribute' => 'logoutAttribute',
'template' => ' ',
], 'guest');
diff --git a/tests/lib/AllConfigTest.php b/tests/lib/AllConfigTest.php
index 3d0a9cb0827..4f8b0658b80 100644
--- a/tests/lib/AllConfigTest.php
+++ b/tests/lib/AllConfigTest.php
@@ -123,25 +123,6 @@ class AllConfigTest extends \Test\TestCase {
$config->deleteUserValue('userPreCond', 'appPreCond', 'keyPreCond');
}
- public function dataSetUserValueUnexpectedValue() {
- return [
- [true],
- [false],
- [null],
- [new \stdClass()],
- ];
- }
-
- /**
- * @dataProvider dataSetUserValueUnexpectedValue
- * @param mixed $value
- * @expectedException \UnexpectedValueException
- */
- public function testSetUserValueUnexpectedValue($value) {
- $config = $this->getConfig();
- $config->setUserValue('userSetBool', 'appSetBool', 'keySetBool', $value);
- }
-
/**
* @expectedException \OCP\PreConditionNotMetException
*/
diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php
index d7cf2fb7baf..ffcbbc74a99 100644
--- a/tests/lib/Encryption/DecryptAllTest.php
+++ b/tests/lib/Encryption/DecryptAllTest.php
@@ -86,25 +86,13 @@ class DecryptAllTest extends TestCase {
$this->invokePrivate($this->instance, 'output', [$this->outputInterface]);
}
- public function dataDecryptAll() {
- return [
- [true, 'user1', true],
- [false, 'user1', true],
- [true, '0', true],
- [false, '0', true],
- [true, '', false],
- ];
- }
-
/**
- * @dataProvider dataDecryptAll
+ * @dataProvider dataTrueFalse
* @param bool $prepareResult
- * @param string $user
- * @param bool $userExistsChecked
*/
- public function testDecryptAll($prepareResult, $user, $userExistsChecked) {
+ public function testDecryptAll($prepareResult, $user) {
- if ($userExistsChecked) {
+ if (!empty($user)) {
$this->userManager->expects($this->once())->method('userExists')->willReturn(true);
} else {
$this->userManager->expects($this->never())->method('userExists');
@@ -137,6 +125,15 @@ class DecryptAllTest extends TestCase {
$instance->decryptAll($this->inputInterface, $this->outputInterface, $user);
}
+ public function dataTrueFalse() {
+ return [
+ [true, 'user1'],
+ [false, 'user1'],
+ [true, ''],
+ [true, null]
+ ];
+ }
+
/**
* test decrypt all call with a user who doesn't exists
*/
@@ -150,16 +147,8 @@ class DecryptAllTest extends TestCase {
);
}
- public function dataTrueFalse() {
- return [
- [true],
- [false],
- ];
- }
-
/**
* @dataProvider dataTrueFalse
- * @param bool $success
*/
public function testPrepareEncryptionModules($success) {
diff --git a/tests/lib/Files/Storage/LocalTest.php b/tests/lib/Files/Storage/LocalTest.php
index cca4d6a6676..7b8ae6a24b2 100644
--- a/tests/lib/Files/Storage/LocalTest.php
+++ b/tests/lib/Files/Storage/LocalTest.php
@@ -84,36 +84,5 @@ class LocalTest extends Storage {
public function testInvalidArgumentsNoArray() {
new \OC\Files\Storage\Local(null);
}
-
- /**
- * @expectedException \OCP\Files\ForbiddenException
- */
- public function testDisallowSymlinksOutsideDatadir() {
- $subDir1 = $this->tmpDir . 'sub1';
- $subDir2 = $this->tmpDir . 'sub2';
- $sym = $this->tmpDir . 'sub1/sym';
- mkdir($subDir1);
- mkdir($subDir2);
-
- symlink($subDir2, $sym);
-
- $storage = new \OC\Files\Storage\Local(['datadir' => $subDir1]);
-
- $storage->file_put_contents('sym/foo', 'bar');
- }
-
- public function testDisallowSymlinksInsideDatadir() {
- $subDir1 = $this->tmpDir . 'sub1';
- $subDir2 = $this->tmpDir . 'sub1/sub2';
- $sym = $this->tmpDir . 'sub1/sym';
- mkdir($subDir1);
- mkdir($subDir2);
-
- symlink($subDir2, $sym);
-
- $storage = new \OC\Files\Storage\Local(['datadir' => $subDir1]);
-
- $storage->file_put_contents('sym/foo', 'bar');
- }
}
diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
index 59b17b83958..2c27bb64a70 100644
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@@ -2417,7 +2417,7 @@ class ViewTest extends \Test\TestCase {
$content = $view->getDirectoryContent('', $filter);
- $files = array_map(function (FileInfo $info) {
+ $files = array_map(function(FileInfo $info) {
return $info->getName();
}, $content);
sort($files);
@@ -2444,53 +2444,4 @@ class ViewTest extends \Test\TestCase {
$data = $view->getFileInfo('.');
$this->assertEquals('', $data->getChecksum());
}
-
- public function testDeleteGhostFile() {
- $storage = new Temporary(array());
- $scanner = $storage->getScanner();
- $cache = $storage->getCache();
- $storage->file_put_contents('foo.txt', 'bar');
- \OC\Files\Filesystem::mount($storage, array(), '/test/');
- $scanner->scan('');
-
- $storage->unlink('foo.txt');
-
- $this->assertTrue($cache->inCache('foo.txt'));
-
- $view = new \OC\Files\View('/test');
- $rootInfo = $view->getFileInfo('');
- $this->assertEquals(3, $rootInfo->getSize());
- $view->unlink('foo.txt');
- $newInfo = $view->getFileInfo('');
-
- $this->assertFalse($cache->inCache('foo.txt'));
- $this->assertNotEquals($rootInfo->getEtag(), $newInfo->getEtag());
- $this->assertEquals(0, $newInfo->getSize());
- }
-
- public function testDeleteGhostFolder() {
- $storage = new Temporary(array());
- $scanner = $storage->getScanner();
- $cache = $storage->getCache();
- $storage->mkdir('foo');
- $storage->file_put_contents('foo/foo.txt', 'bar');
- \OC\Files\Filesystem::mount($storage, array(), '/test/');
- $scanner->scan('');
-
- $storage->rmdir('foo');
-
- $this->assertTrue($cache->inCache('foo'));
- $this->assertTrue($cache->inCache('foo/foo.txt'));
-
- $view = new \OC\Files\View('/test');
- $rootInfo = $view->getFileInfo('');
- $this->assertEquals(3, $rootInfo->getSize());
- $view->rmdir('foo');
- $newInfo = $view->getFileInfo('');
-
- $this->assertFalse($cache->inCache('foo'));
- $this->assertFalse($cache->inCache('foo/foo.txt'));
- $this->assertNotEquals($rootInfo->getEtag(), $newInfo->getEtag());
- $this->assertEquals(0, $newInfo->getSize());
- }
}
diff --git a/version.php b/version.php
index 698636a2196..967f2690276 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
-$OC_Version = array(9, 1, 0, 8);
+$OC_Version = array(9, 1, 0, 7);
// The human readable string
-$OC_VersionString = '9.1.0 beta 2';
+$OC_VersionString = '9.1.0 beta 1';
$OC_VersionCanBeUpgradedFrom = array(9, 0);
--
cgit v1.2.3
From edf62eb41a338319488eb0b71134da2d38d0a7bd Mon Sep 17 00:00:00 2001
From: Lukas Reschke
Date: Wed, 8 Jun 2016 10:41:30 +0200
Subject: Add user ID to log entries in admin page
---
settings/js/log.js | 5 +++++
settings/templates/admin.php | 1 +
2 files changed, 6 insertions(+)
(limited to 'settings')
diff --git a/settings/js/log.js b/settings/js/log.js
index 43ef561f7ee..a1ad29d72e7 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -64,6 +64,11 @@ OC.Log = {
timeTd.text(formatDate(entry.time * 1000));
}
row.append(timeTd);
+
+ var userTd = $(' ');
+ userTd.text(entry.user);
+ row.append(userTd);
+
$('#log').append(row);
}
OC.Log.loaded += entries.length;
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 0cdefe10083..b5c5b2510b6 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -519,6 +519,7 @@ if ($_['cronErrors']) {
p($entry->time);
}?>
+ user) ? p($entry->user) : p('--') ?>
--
cgit v1.2.3
From ea25be51dac20ad42a813276794b9df3044b62f5 Mon Sep 17 00:00:00 2001
From: Morris Jobke
Date: Wed, 15 Jun 2016 15:27:07 +0200
Subject: fix strengthify in personal settings
---
settings/css/settings.css | 4 ++--
settings/js/personal.js | 3 ++-
settings/templates/personal.php | 1 -
3 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'settings')
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 5fc96343502..0460db929c9 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -529,9 +529,9 @@ span.indeterminate {
}
/* PASSWORD */
-.strengthify-wrapper {
+#passwordform .strengthify-wrapper {
position: absolute;
- left: 189px;
+ left: 186px;
width: 131px;
margin-top: -7px;
}
diff --git a/settings/js/personal.js b/settings/js/personal.js
index aea2400e999..d270a49f3ad 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -343,7 +343,8 @@ $(document).ready(function () {
t('core', 'So-so password'),
t('core', 'Good password'),
t('core', 'Strong password')
- ]
+ ],
+ drawTitles: true,
});
// does the user have a custom avatar? if he does show #removeavatar
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index ced76fc3bf6..83a44234b94 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -133,7 +133,6 @@ if($_['passwordChangeSupported']) {
-
Date: Wed, 15 Jun 2016 15:30:23 +0200
Subject: Drop useless IE8 rules
---
settings/css/settings.css | 12 ------------
settings/templates/personal.php | 2 --
2 files changed, 14 deletions(-)
(limited to 'settings')
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 5fc96343502..13b289ea182 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -536,18 +536,6 @@ span.indeterminate {
margin-top: -7px;
}
-.ie8 .strengthify-wrapper {
- left: 389px;
-}
-
-.onlyInIE8 {
- display: none;
-}
-
-.ie8 .onlyInIE8 {
- display: inline;
-}
-
/* OPERA hack for strengthify*/
doesnotexist:-o-prefocus, .strengthify-wrapper {
left: 185px;
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index ced76fc3bf6..19bba537181 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -121,11 +121,9 @@ if($_['passwordChangeSupported']) {
t('Unable to change your password'));?>
- t('Current password');?>:
- t('New password');?>:
Date: Wed, 15 Jun 2016 23:25:06 +0200
Subject: Re-add labels for password inputs for usability
* ref https://github.com/nextcloud/server/pull/112#discussion_r67245286
---
settings/templates/personal.php | 2 ++
1 file changed, 2 insertions(+)
(limited to 'settings')
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index b4ff5db5c7c..4f3bca63a4e 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -121,9 +121,11 @@ if($_['passwordChangeSupported']) {
t('Unable to change your password'));?>
+ t('Current password');?>:
+ t('New password');?>:
Date: Thu, 16 Jun 2016 13:09:55 +0200
Subject: Use blue as approved color in app management
* only changing the color - based on #53
---
settings/css/settings.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'settings')
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 5e31a60cc9d..78d37e0b876 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -327,7 +327,7 @@ span.version {
padding-left: 25px;
}
.app-level .approved {
- border-color: #e8c805;
+ border-color: #0082c9;
}
.app-level .experimental {
background-color: #ce3702;
--
cgit v1.2.3
From 205e9363702de39a352734514d8ae3f7cb74dbd3 Mon Sep 17 00:00:00 2001
From: Timo Witte
Date: Mon, 20 Jun 2016 01:58:39 +0200
Subject: rename owncloud to nextcloud in Official apps button popup
---
settings/js/apps.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'settings')
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 015236f957d..56c9022aa72 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -121,7 +121,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
$('.enable.needs-download').tipsy({fallback: t('settings', 'The app will be downloaded from the app store')});
- $('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use.')});
+ $('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use.')});
$('.app-level .approved').tipsy({fallback: t('settings', '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.')});
$('.app-level .experimental').tipsy({fallback: t('settings', 'This app is not checked for security issues and is new or known to be unstable. Install at your own risk.')});
},
--
cgit v1.2.3
From 7a09b3daffd09b19a3093fa7ae1ae93de66e1aab Mon Sep 17 00:00:00 2001
From: Morris Jobke
Date: Mon, 20 Jun 2016 08:28:54 +0200
Subject: fix translations
---
settings/l10n/cs_CZ.js | 2 +-
settings/l10n/cs_CZ.json | 2 +-
settings/l10n/da.js | 2 +-
settings/l10n/da.json | 2 +-
settings/l10n/de.js | 2 +-
settings/l10n/de.json | 2 +-
settings/l10n/de_DE.js | 2 +-
settings/l10n/de_DE.json | 2 +-
settings/l10n/el.js | 2 +-
settings/l10n/el.json | 2 +-
settings/l10n/en_GB.js | 2 +-
settings/l10n/en_GB.json | 2 +-
settings/l10n/es.js | 2 +-
settings/l10n/es.json | 2 +-
settings/l10n/fi_FI.js | 2 +-
settings/l10n/fi_FI.json | 2 +-
settings/l10n/fr.js | 2 +-
settings/l10n/fr.json | 2 +-
settings/l10n/gl.js | 2 +-
settings/l10n/gl.json | 2 +-
settings/l10n/he.js | 2 +-
settings/l10n/he.json | 2 +-
settings/l10n/hu_HU.js | 2 +-
settings/l10n/hu_HU.json | 2 +-
settings/l10n/id.js | 2 +-
settings/l10n/id.json | 2 +-
settings/l10n/is.js | 2 +-
settings/l10n/is.json | 2 +-
settings/l10n/it.js | 2 +-
settings/l10n/it.json | 2 +-
settings/l10n/ja.js | 2 +-
settings/l10n/ja.json | 2 +-
settings/l10n/ko.js | 2 +-
settings/l10n/ko.json | 2 +-
settings/l10n/nb_NO.js | 2 +-
settings/l10n/nb_NO.json | 2 +-
settings/l10n/nl.js | 2 +-
settings/l10n/nl.json | 2 +-
settings/l10n/oc.js | 2 +-
settings/l10n/oc.json | 2 +-
settings/l10n/pt_BR.js | 2 +-
settings/l10n/pt_BR.json | 2 +-
settings/l10n/pt_PT.js | 2 +-
settings/l10n/pt_PT.json | 2 +-
settings/l10n/ru.js | 2 +-
settings/l10n/ru.json | 2 +-
settings/l10n/sq.js | 2 +-
settings/l10n/sq.json | 2 +-
settings/l10n/sv.js | 2 +-
settings/l10n/sv.json | 2 +-
settings/l10n/th_TH.js | 2 +-
settings/l10n/th_TH.json | 2 +-
settings/l10n/tr.js | 2 +-
settings/l10n/tr.json | 2 +-
settings/l10n/uk.js | 2 +-
settings/l10n/uk.json | 2 +-
settings/l10n/zh_CN.js | 2 +-
settings/l10n/zh_CN.json | 2 +-
settings/l10n/zh_TW.js | 2 +-
settings/l10n/zh_TW.json | 2 +-
60 files changed, 60 insertions(+), 60 deletions(-)
(limited to 'settings')
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 708686d8ac1..c987fc21a40 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Vše",
"No apps found for your version" : "Nebyly nalezeny aplikace pro vaši verzi",
"The app will be downloaded from the app store" : "Aplikace bude stažena z obchodu aplikací",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Oficiální aplikace jsou vyvíjeny komunitou ownCloud. Nabízejí funkce důležité pro ownCloud a jsou připraveny pro nasazení v produkčním prostředí.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Oficiální aplikace jsou vyvíjeny komunitou Nextcloud. Nabízejí funkce důležité pro Nextcloud a jsou připraveny pro nasazení v produkčním prostředí.",
"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." : "Schválené aplikace jsou vyvíjeny důvěryhodnými vývojáři a prošly zběžným bezpečnostním prověřením. Jsou aktivně udržovány v repozitáři s otevřeným kódem a jejich správci je považují za stabilní pro občasné až normální použití.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "U této aplikace nebyla provedena kontrola na bezpečnostní problémy. Aplikace je nová nebo nestabilní. Instalujte pouze na vlastní nebezpečí.",
"Update to %s" : "Aktualizovat na %s",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 7d341e04991..20a2e6a7f47 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -62,7 +62,7 @@
"All" : "Vše",
"No apps found for your version" : "Nebyly nalezeny aplikace pro vaši verzi",
"The app will be downloaded from the app store" : "Aplikace bude stažena z obchodu aplikací",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Oficiální aplikace jsou vyvíjeny komunitou ownCloud. Nabízejí funkce důležité pro ownCloud a jsou připraveny pro nasazení v produkčním prostředí.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Oficiální aplikace jsou vyvíjeny komunitou Nextcloud. Nabízejí funkce důležité pro Nextcloud a jsou připraveny pro nasazení v produkčním prostředí.",
"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." : "Schválené aplikace jsou vyvíjeny důvěryhodnými vývojáři a prošly zběžným bezpečnostním prověřením. Jsou aktivně udržovány v repozitáři s otevřeným kódem a jejich správci je považují za stabilní pro občasné až normální použití.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "U této aplikace nebyla provedena kontrola na bezpečnostní problémy. Aplikace je nová nebo nestabilní. Instalujte pouze na vlastní nebezpečí.",
"Update to %s" : "Aktualizovat na %s",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index be7ec743cac..d00e2408483 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -63,7 +63,7 @@ OC.L10N.register(
"Experimental" : "Eksperimentel",
"All" : "Alle",
"No apps found for your version" : "Ingen apps fundet til din verion",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officielt program er udviklet af ownCloud fællesskabet. Funktionerne spiller en central rolle i ownCloud og kan bruges i produktionsmiljøer.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Officielt program er udviklet af Nextcloud fællesskabet. Funktionerne spiller en central rolle i Nextcloud og kan bruges i produktionsmiljøer.",
"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." : "Godkendte programmer er udviklet af betroet udviklere som har bestået en let sikkerheds gennemgang. De er aktivt vedligeholdt i et åben kode lager og udviklerne vurdere programmet til at være stabilt for normalt brug.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Dette program er ikke kontrolleret for sikkerhedsproblemer, og er nyt eller kendt for at være ustabilt. Installer på eget ansvar.",
"Update to %s" : "Opdatér til %s",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index b663d730264..2504fc439d7 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -61,7 +61,7 @@
"Experimental" : "Eksperimentel",
"All" : "Alle",
"No apps found for your version" : "Ingen apps fundet til din verion",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officielt program er udviklet af ownCloud fællesskabet. Funktionerne spiller en central rolle i ownCloud og kan bruges i produktionsmiljøer.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Officielt program er udviklet af Nextcloud fællesskabet. Funktionerne spiller en central rolle i Nextcloud og kan bruges i produktionsmiljøer.",
"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." : "Godkendte programmer er udviklet af betroet udviklere som har bestået en let sikkerheds gennemgang. De er aktivt vedligeholdt i et åben kode lager og udviklerne vurdere programmet til at være stabilt for normalt brug.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Dette program er ikke kontrolleret for sikkerhedsproblemer, og er nyt eller kendt for at være ustabilt. Installer på eget ansvar.",
"Update to %s" : "Opdatér til %s",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 9c42f190e05..37f107eddf5 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Alle",
"No apps found for your version" : "Es wurden keine Apps für Deine Version gefunden",
"The app will be downloaded from the app store" : "Die App wird aus dem App-Store heruntergeladen",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der Nextcloud-Community entwickelt. Sie stellen zentrale Funktionen von Nextcloud bereit und sind auf den Produktiveinsatz vorbereitet.",
"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." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.",
"Update to %s" : "Aktualisierung auf %s",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index c8f55690af8..1e9def0a309 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -62,7 +62,7 @@
"All" : "Alle",
"No apps found for your version" : "Es wurden keine Apps für Deine Version gefunden",
"The app will be downloaded from the app store" : "Die App wird aus dem App-Store heruntergeladen",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der Nextcloud-Community entwickelt. Sie stellen zentrale Funktionen von Nextcloud bereit und sind auf den Produktiveinsatz vorbereitet.",
"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." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.",
"Update to %s" : "Aktualisierung auf %s",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index e5447564a43..03b0db0ff55 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Alle",
"No apps found for your version" : "Es wurden keine Apps für Ihre Version gefunden",
"The app will be downloaded from the app store" : "Die App wird aus dem App-Store heruntergeladen",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der Nextcloud-Community entwickelt. Sie stellen zentrale Funktionen von Nextcloud bereit und sind auf den Produktiveinsatz vorbereitet.",
"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." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.",
"Update to %s" : "Aktualisierung auf %s",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 65a129eed75..03391b7ee11 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -62,7 +62,7 @@
"All" : "Alle",
"No apps found for your version" : "Es wurden keine Apps für Ihre Version gefunden",
"The app will be downloaded from the app store" : "Die App wird aus dem App-Store heruntergeladen",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der ownCloud-Community entwickelt. Sie stellen zentrale Funktionen von ownCloud bereit und sind auf den Produktiveinsatz vorbereitet.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der Nextcloud-Community entwickelt. Sie stellen zentrale Funktionen von Nextcloud bereit und sind auf den Produktiveinsatz vorbereitet.",
"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." : "Geprüfte Apps werden von vertrauenswürdigen Entwicklern entwickelt und haben eine oberflächliche Sicherheitsprüfung durchlaufen. Sie werden innerhalb eines offenen Code-Repositorys aktiv gepflegt und ihre Betreuer erachten sie als stabil genug für für den gelegentlichen bis normalen Einsatz.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Diese App ist nicht auf Sicherheitsprobleme hin überprüft und ist neu oder bekanntermaßen instabil. Die Installation erfolgt auf eigenes Risiko.",
"Update to %s" : "Aktualisierung auf %s",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 5a793c1e686..8bd3f1a435e 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -63,7 +63,7 @@ OC.L10N.register(
"Experimental" : "Πειραματικό",
"All" : "Όλες",
"No apps found for your version" : "Δεν βρέθηκαν εφαρμογές για αυτή την έκδοση",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Οι επίσημες εφαρμογές αναπτύσσονται από την κοινότητα ownCloud. Προσφέρουν λειτουργικότητα κοντά στο ownCloud και είναι έτοιμες για χρήση.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Οι επίσημες εφαρμογές αναπτύσσονται από την κοινότητα Nextcloud. Προσφέρουν λειτουργικότητα κοντά στο Nextcloud και είναι έτοιμες για χρήση.",
"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." : "Οι εγκεκριμένες εφαρμογές αναπτύχθηκαν από αξιόπιστους προγραμματιστές και έχουν περάσει έναν συνοπτικό έλεγχο ασφαλείας. Διατηρούνται ενεργά σε ένα αποθετήριο ανοιχτού κώδικα και οι συντηρητές θεωρούν οτι είναι σταθερές για κανονική χρήση.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Η εφαρμογή αυτή δεν ελέγχεται για θέματα ασφάλειας και είναι νέα ή είναι γνωστό ότι είναι ασταθής. Η εγκατάσταση γίνεται με δική σας ευθύνη.",
"Update to %s" : "Ενημέρωση σε %s",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 77a308bd105..25cbbc73e7b 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -61,7 +61,7 @@
"Experimental" : "Πειραματικό",
"All" : "Όλες",
"No apps found for your version" : "Δεν βρέθηκαν εφαρμογές για αυτή την έκδοση",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Οι επίσημες εφαρμογές αναπτύσσονται από την κοινότητα ownCloud. Προσφέρουν λειτουργικότητα κοντά στο ownCloud και είναι έτοιμες για χρήση.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Οι επίσημες εφαρμογές αναπτύσσονται από την κοινότητα Nextcloud. Προσφέρουν λειτουργικότητα κοντά στο Nextcloud και είναι έτοιμες για χρήση.",
"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." : "Οι εγκεκριμένες εφαρμογές αναπτύχθηκαν από αξιόπιστους προγραμματιστές και έχουν περάσει έναν συνοπτικό έλεγχο ασφαλείας. Διατηρούνται ενεργά σε ένα αποθετήριο ανοιχτού κώδικα και οι συντηρητές θεωρούν οτι είναι σταθερές για κανονική χρήση.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Η εφαρμογή αυτή δεν ελέγχεται για θέματα ασφάλειας και είναι νέα ή είναι γνωστό ότι είναι ασταθής. Η εγκατάσταση γίνεται με δική σας ευθύνη.",
"Update to %s" : "Ενημέρωση σε %s",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 5690b237ace..94ddadf854b 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "All",
"No apps found for your version" : "No apps found for your version",
"The app will be downloaded from the app store" : "The app will be downloaded from the app store",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use.",
"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." : "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.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "This app is not checked for security issues and is new or known to be unstable. Install at your own risk.",
"Update to %s" : "Update to %s",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index 3fa88ef35e3..9b9380ef1f3 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -62,7 +62,7 @@
"All" : "All",
"No apps found for your version" : "No apps found for your version",
"The app will be downloaded from the app store" : "The app will be downloaded from the app store",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use.",
"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." : "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.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "This app is not checked for security issues and is new or known to be unstable. Install at your own risk.",
"Update to %s" : "Update to %s",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index e169a7a1b62..65325f0fc22 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Todos",
"No apps found for your version" : "No se han encontrado aplicaciones para su versión",
"The app will be downloaded from the app store" : "La app debe ser descargada desde una app store",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicaciones oficiales se desarrollan por y dentro de la comunidad ownCloud. Estas ofrecen una funcionalidad crucial en ownCloud y están listas para su uso en producción. ",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Las aplicaciones oficiales se desarrollan por y dentro de la comunidad Nextcloud. Estas ofrecen una funcionalidad crucial en Nextcloud y están listas para su uso en producción. ",
"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." : "Las aplicaciones aprobadas las desarrollan desarrolladores de confianza y han pasado un control de seguridad superficial. Estas se mantienen activamente en un repositorio de código abierto y sus encargados las consideran estables para un uso normal.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicación no está verificada por problemas de seguridad además de ser reciente o conocida por ser inestable. Instálela bajo su propio riesgo.",
"Update to %s" : "Actualizar a %s",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 3fb92525887..982556abc9c 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -62,7 +62,7 @@
"All" : "Todos",
"No apps found for your version" : "No se han encontrado aplicaciones para su versión",
"The app will be downloaded from the app store" : "La app debe ser descargada desde una app store",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicaciones oficiales se desarrollan por y dentro de la comunidad ownCloud. Estas ofrecen una funcionalidad crucial en ownCloud y están listas para su uso en producción. ",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Las aplicaciones oficiales se desarrollan por y dentro de la comunidad Nextcloud. Estas ofrecen una funcionalidad crucial en Nextcloud y están listas para su uso en producción. ",
"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." : "Las aplicaciones aprobadas las desarrollan desarrolladores de confianza y han pasado un control de seguridad superficial. Estas se mantienen activamente en un repositorio de código abierto y sus encargados las consideran estables para un uso normal.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicación no está verificada por problemas de seguridad además de ser reciente o conocida por ser inestable. Instálela bajo su propio riesgo.",
"Update to %s" : "Actualizar a %s",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index c05e2376461..0b3a1fe3a79 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -63,7 +63,7 @@ OC.L10N.register(
"All" : "Kaikki",
"No apps found for your version" : "Sovelluksia ei löytynyt versiollesi",
"The app will be downloaded from the app store" : "Sovellus ladataan sovelluskaupasta",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Viralliset sovellukset kehitetään ownCloud-yhteisön toimesta. Sovellukset tarjoavat lisäominaisuuksia ownCloudin keskeisiin toimintoihin liittyen ja ovat valmiita tuotantokäyttöön.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Viralliset sovellukset kehitetään Nextcloud-yhteisön toimesta. Sovellukset tarjoavat lisäominaisuuksia Nextcloudin keskeisiin toimintoihin liittyen ja ovat valmiita tuotantokäyttöön.",
"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." : "Hyväksytyt sovellukset on kehitetty luotettujen kehittäjien toimesta. Hyväksytyille sovelluksille on suoritettu pintapuolinen turvallisuustarkastus. Sovelluksia ylläpidetään avoimen koodin tietovarastoissa. Sovellusten kehittäjät mieltävät sovellukset vakaiksi ja valmiiksi tavalliseen käyttöön.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Tätä sovellusta ei ole tarkistettu tietoturvauhkien varalta. Sovellus on uusi ja mahdollisesti tiedostettu epävakaaksi. Asenna omalla vastuulla.",
"Update to %s" : "Päivitä versioon %s",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 618e413f533..3b808944443 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -61,7 +61,7 @@
"All" : "Kaikki",
"No apps found for your version" : "Sovelluksia ei löytynyt versiollesi",
"The app will be downloaded from the app store" : "Sovellus ladataan sovelluskaupasta",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Viralliset sovellukset kehitetään ownCloud-yhteisön toimesta. Sovellukset tarjoavat lisäominaisuuksia ownCloudin keskeisiin toimintoihin liittyen ja ovat valmiita tuotantokäyttöön.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Viralliset sovellukset kehitetään Nextcloud-yhteisön toimesta. Sovellukset tarjoavat lisäominaisuuksia Nextcloudin keskeisiin toimintoihin liittyen ja ovat valmiita tuotantokäyttöön.",
"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." : "Hyväksytyt sovellukset on kehitetty luotettujen kehittäjien toimesta. Hyväksytyille sovelluksille on suoritettu pintapuolinen turvallisuustarkastus. Sovelluksia ylläpidetään avoimen koodin tietovarastoissa. Sovellusten kehittäjät mieltävät sovellukset vakaiksi ja valmiiksi tavalliseen käyttöön.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Tätä sovellusta ei ole tarkistettu tietoturvauhkien varalta. Sovellus on uusi ja mahdollisesti tiedostettu epävakaaksi. Asenna omalla vastuulla.",
"Update to %s" : "Päivitä versioon %s",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 9313e18f48f..9d9b9ed4692 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Tous",
"No apps found for your version" : "Pas d'application trouvée pour votre version",
"The app will be downloaded from the app store" : "Cette application va être téléchargée depuis l'app store",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Les applications officielles sont développées par et avec la communauté ownCloud. Elles permettent à ownCloud d'offrir ses fonctionnalités principales et sont prêtes pour une utilisation en environnement de production. ",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Les applications officielles sont développées par et avec la communauté Nextcloud. Elles permettent à Nextcloud d'offrir ses fonctionnalités principales et sont prêtes pour une utilisation en environnement de production. ",
"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." : "Les applications approuvées sont créées par des développeurs de confiance et ont passé les tests de sécurité. Elles sont activement maintenues et leur code source est ouvert. Leurs développeurs les considèrent stables pour une utilisation normale.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Cette application est nouvelle ou instable, et sa sécurité n'a pas été vérifiée. Installez-la à vos risques et périls!",
"Update to %s" : "Mettre à niveau vers la version %s",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 5531aeaf9d4..2d5d305f551 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -62,7 +62,7 @@
"All" : "Tous",
"No apps found for your version" : "Pas d'application trouvée pour votre version",
"The app will be downloaded from the app store" : "Cette application va être téléchargée depuis l'app store",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Les applications officielles sont développées par et avec la communauté ownCloud. Elles permettent à ownCloud d'offrir ses fonctionnalités principales et sont prêtes pour une utilisation en environnement de production. ",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Les applications officielles sont développées par et avec la communauté Nextcloud. Elles permettent à Nextcloud d'offrir ses fonctionnalités principales et sont prêtes pour une utilisation en environnement de production. ",
"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." : "Les applications approuvées sont créées par des développeurs de confiance et ont passé les tests de sécurité. Elles sont activement maintenues et leur code source est ouvert. Leurs développeurs les considèrent stables pour une utilisation normale.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Cette application est nouvelle ou instable, et sa sécurité n'a pas été vérifiée. Installez-la à vos risques et périls!",
"Update to %s" : "Mettre à niveau vers la version %s",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index fe21e8e143a..205405dc1cb 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -63,7 +63,7 @@ OC.L10N.register(
"Experimental" : "Experimental",
"All" : "Todo",
"No apps found for your version" : "Non se atoparon aplicativos para esta versión",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As aplicacións oficiais son desenvolvidas pola comunidade dentro de ownCloud. Ofrecen una funcionalidade central para ownCloud e están preparadas para o seu uso en produción.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "As aplicacións oficiais son desenvolvidas pola comunidade dentro de Nextcloud. Ofrecen una funcionalidade central para Nextcloud e están preparadas para o seu uso en produción.",
"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." : "As aplicacións aprobadas son desenvolvidas por desenvolvedores de confianza e pasaron un control de seguridade superficial. Mantéñense activamente nun repositorio de código aberto e os seus mantedores consideran que son estábeis para uso casual normal.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "A esta aplicación non se lle fixeron comprobacións de seguridade, ademais é nova ou coñecida por ser inestábel. Instálea baixo a súa responsabilidade.",
"Update to %s" : "Actualizar a %s",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index 92f0788ba43..904cca1bb5d 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -61,7 +61,7 @@
"Experimental" : "Experimental",
"All" : "Todo",
"No apps found for your version" : "Non se atoparon aplicativos para esta versión",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As aplicacións oficiais son desenvolvidas pola comunidade dentro de ownCloud. Ofrecen una funcionalidade central para ownCloud e están preparadas para o seu uso en produción.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "As aplicacións oficiais son desenvolvidas pola comunidade dentro de Nextcloud. Ofrecen una funcionalidade central para Nextcloud e están preparadas para o seu uso en produción.",
"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." : "As aplicacións aprobadas son desenvolvidas por desenvolvedores de confianza e pasaron un control de seguridade superficial. Mantéñense activamente nun repositorio de código aberto e os seus mantedores consideran que son estábeis para uso casual normal.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "A esta aplicación non se lle fixeron comprobacións de seguridade, ademais é nova ou coñecida por ser inestábel. Instálea baixo a súa responsabilidade.",
"Update to %s" : "Actualizar a %s",
diff --git a/settings/l10n/he.js b/settings/l10n/he.js
index a9ef2b3642c..976d5b7c81f 100644
--- a/settings/l10n/he.js
+++ b/settings/l10n/he.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "הכל",
"No apps found for your version" : "לא נמצאו יישומים לגרסה שלך",
"The app will be downloaded from the app store" : "היישום ירד מחנות היישומים",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "יישומים רישמיים מפותחים על ידי קהילת ownCloud. הם מציעים פונקיונאליות, התאמה ל- ownCloud ומוכנים לשימוש כבד.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "יישומים רישמיים מפותחים על ידי קהילת Nextcloud. הם מציעים פונקיונאליות, התאמה ל- Nextcloud ומוכנים לשימוש כבד.",
"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." : "יישומים מאושרים מפותחים על ידי מפתחים מהימנים ועברו בדיקת הבטחה ראשונית. הם נשמרים באופן פעיל במאגר קוד פתוח והמתזקים שלהם מייעדים אותם לשימוש מזדמן ורגיל.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "יישום זה לא נבדק לבעיות אבטחה והוא חדש או ידוע כלא יציב. התקנת יישום זה הנה על אחריותך בלבד.",
"Update to %s" : "עדכון ל- %s",
diff --git a/settings/l10n/he.json b/settings/l10n/he.json
index cda70c972dd..518da4bea59 100644
--- a/settings/l10n/he.json
+++ b/settings/l10n/he.json
@@ -62,7 +62,7 @@
"All" : "הכל",
"No apps found for your version" : "לא נמצאו יישומים לגרסה שלך",
"The app will be downloaded from the app store" : "היישום ירד מחנות היישומים",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "יישומים רישמיים מפותחים על ידי קהילת ownCloud. הם מציעים פונקיונאליות, התאמה ל- ownCloud ומוכנים לשימוש כבד.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "יישומים רישמיים מפותחים על ידי קהילת Nextcloud. הם מציעים פונקיונאליות, התאמה ל- Nextcloud ומוכנים לשימוש כבד.",
"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." : "יישומים מאושרים מפותחים על ידי מפתחים מהימנים ועברו בדיקת הבטחה ראשונית. הם נשמרים באופן פעיל במאגר קוד פתוח והמתזקים שלהם מייעדים אותם לשימוש מזדמן ורגיל.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "יישום זה לא נבדק לבעיות אבטחה והוא חדש או ידוע כלא יציב. התקנת יישום זה הנה על אחריותך בלבד.",
"Update to %s" : "עדכון ל- %s",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index cc1b2b322fc..3f339c6238f 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Mind",
"No apps found for your version" : "Nem található alkalmazás a verziód számára",
"The app will be downloaded from the app store" : "Az alkalmazás letöltésre kerül az alkalmazástárból",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "A hivatalos alkalmazásokat az ownCloud közösségen belül fejlesztik. \nAz általuk nyújtott központi ownCloud funkciók készen állnak a produktív használatra.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "A hivatalos alkalmazásokat az Nextcloud közösségen belül fejlesztik. \nAz általuk nyújtott központi Nextcloud funkciók készen állnak a produktív használatra.",
"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." : "A jóváhagyott alkalmazásokat megbízható fejlesztők készítik, amik megfelelnek a felületes biztonsági ellenőrzésnek. Nyílt forráskódú tárolóban aktívan karbantartják és biztosítják a stabil használatot.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ez az alkalmazás még nincs biztonságilag ellenőrizve és vagy új, vagy ismert instabil. Telepítés csak saját felelősségre!",
"Update to %s" : "Frissítés erre: %s",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index 8e4e8595ba1..d02ce1be6b9 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -62,7 +62,7 @@
"All" : "Mind",
"No apps found for your version" : "Nem található alkalmazás a verziód számára",
"The app will be downloaded from the app store" : "Az alkalmazás letöltésre kerül az alkalmazástárból",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "A hivatalos alkalmazásokat az ownCloud közösségen belül fejlesztik. \nAz általuk nyújtott központi ownCloud funkciók készen állnak a produktív használatra.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "A hivatalos alkalmazásokat az Nextcloud közösségen belül fejlesztik. \nAz általuk nyújtott központi Nextcloud funkciók készen állnak a produktív használatra.",
"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." : "A jóváhagyott alkalmazásokat megbízható fejlesztők készítik, amik megfelelnek a felületes biztonsági ellenőrzésnek. Nyílt forráskódú tárolóban aktívan karbantartják és biztosítják a stabil használatot.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ez az alkalmazás még nincs biztonságilag ellenőrizve és vagy új, vagy ismert instabil. Telepítés csak saját felelősségre!",
"Update to %s" : "Frissítés erre: %s",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index e978b49dbaa..6abd73732b0 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -63,7 +63,7 @@ OC.L10N.register(
"Experimental" : "Uji Coba",
"All" : "Semua",
"No apps found for your version" : "Aplikasi tidak ditemukan untuk versi ini.",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplikasi resmi dikembangkan oleh komunitas ownCloud. Mereka menawarkan fitur pusat bagi ownCloud dan siap digunakan untuk penggunaan produksi.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Aplikasi resmi dikembangkan oleh komunitas Nextcloud. Mereka menawarkan fitur pusat bagi Nextcloud dan siap digunakan untuk penggunaan produksi.",
"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." : "Aplikasi tersetujui dikembangkan oleh pengembang terpercaya dan telah lulus pemeriksaan keamanan. Mereka secara aktif dipelihara direpositori kode terbuka dan pemelihara sudah memastikan mereka stabil untuk penggunaan normal.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Apl ini belum diperiksa masalah keamanannya dan masih baru atau biasanya tidak stabil. Instal dengan resiko Anda sendiri.",
"Update to %s" : "Perbarui ke %s",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 336a1c22938..502697cc8b1 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -61,7 +61,7 @@
"Experimental" : "Uji Coba",
"All" : "Semua",
"No apps found for your version" : "Aplikasi tidak ditemukan untuk versi ini.",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplikasi resmi dikembangkan oleh komunitas ownCloud. Mereka menawarkan fitur pusat bagi ownCloud dan siap digunakan untuk penggunaan produksi.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Aplikasi resmi dikembangkan oleh komunitas Nextcloud. Mereka menawarkan fitur pusat bagi Nextcloud dan siap digunakan untuk penggunaan produksi.",
"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." : "Aplikasi tersetujui dikembangkan oleh pengembang terpercaya dan telah lulus pemeriksaan keamanan. Mereka secara aktif dipelihara direpositori kode terbuka dan pemelihara sudah memastikan mereka stabil untuk penggunaan normal.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Apl ini belum diperiksa masalah keamanannya dan masih baru atau biasanya tidak stabil. Instal dengan resiko Anda sendiri.",
"Update to %s" : "Perbarui ke %s",
diff --git a/settings/l10n/is.js b/settings/l10n/is.js
index 55f8ad6ec13..2a4c8cb4cb9 100644
--- a/settings/l10n/is.js
+++ b/settings/l10n/is.js
@@ -63,7 +63,7 @@ OC.L10N.register(
"Experimental" : "Á tilraunastigi",
"All" : "Allt",
"No apps found for your version" : "Engin forrit fundust fyrir útgáfuna þína",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Opinber forrit eru þróuð af og innan ownCloud samfélagsins. Þau virka með kjarnaeiginleikum ownCloud og eru tilbúin til notkunar í raunvinnslu.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Opinber forrit eru þróuð af og innan Nextcloud samfélagsins. Þau virka með kjarnaeiginleikum Nextcloud 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",
diff --git a/settings/l10n/is.json b/settings/l10n/is.json
index 8933e593452..d2cf8430267 100644
--- a/settings/l10n/is.json
+++ b/settings/l10n/is.json
@@ -61,7 +61,7 @@
"Experimental" : "Á tilraunastigi",
"All" : "Allt",
"No apps found for your version" : "Engin forrit fundust fyrir útgáfuna þína",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Opinber forrit eru þróuð af og innan ownCloud samfélagsins. Þau virka með kjarnaeiginleikum ownCloud og eru tilbúin til notkunar í raunvinnslu.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Opinber forrit eru þróuð af og innan Nextcloud samfélagsins. Þau virka með kjarnaeiginleikum Nextcloud 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",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 489309255d6..4e4efbf1100 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Tutti",
"No apps found for your version" : "Nessuna applicazione trovata per la tua versione",
"The app will be downloaded from the app store" : "L'applicazione sarà scaricata dallo store delle applicazioni",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Le applicazioni ufficiali sono sviluppate da e con la comunità di ownCloud. Offrono le funzioni fondamentali di ownCloud e sono pronte per l'utilizzo in produzione.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Le applicazioni ufficiali sono sviluppate da e con la comunità di Nextcloud. Offrono le funzioni fondamentali di Nextcloud e sono pronte per l'utilizzo in produzione.",
"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." : "Le applicazioni approvate sono sviluppate da sviluppatori affidabili e hanno passato un rapido controllo di sicurezza. Sono attivamente mantenute in un deposito aperto del codice e i loro responsabili le ritengono pronte sia per un utilizzo casuale che per un utilizzo continuativo.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Questa applicazione non è stata sottoposta a controlli di sicurezza, è nuova o notoriamente instabile. Installala a tuo rischio.",
"Update to %s" : "Aggiornato a %s",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index acdee58008e..02cec21158e 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -62,7 +62,7 @@
"All" : "Tutti",
"No apps found for your version" : "Nessuna applicazione trovata per la tua versione",
"The app will be downloaded from the app store" : "L'applicazione sarà scaricata dallo store delle applicazioni",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Le applicazioni ufficiali sono sviluppate da e con la comunità di ownCloud. Offrono le funzioni fondamentali di ownCloud e sono pronte per l'utilizzo in produzione.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Le applicazioni ufficiali sono sviluppate da e con la comunità di Nextcloud. Offrono le funzioni fondamentali di Nextcloud e sono pronte per l'utilizzo in produzione.",
"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." : "Le applicazioni approvate sono sviluppate da sviluppatori affidabili e hanno passato un rapido controllo di sicurezza. Sono attivamente mantenute in un deposito aperto del codice e i loro responsabili le ritengono pronte sia per un utilizzo casuale che per un utilizzo continuativo.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Questa applicazione non è stata sottoposta a controlli di sicurezza, è nuova o notoriamente instabile. Installala a tuo rischio.",
"Update to %s" : "Aggiornato a %s",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 2e138c4348f..f294ac64f97 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "すべて",
"No apps found for your version" : "現在のバージョンに対応するアプリはありません",
"The app will be downloaded from the app store" : "このアプリは、アプリストアからダウンロードできます。",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "公式アプリは ownCloud コミュニティにより開発されています。コミュニティは ownCloud の中心機能を提供し、製品としての使用の準備ができています。",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "公式アプリは Nextcloud コミュニティにより開発されています。コミュニティは Nextcloud の中心機能を提供し、製品としての使用の準備ができています。",
"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." : "承認されたアプリは信頼された開発者により開発され、大まかなセキュリティチェックに合格しています。アプリは積極的にオープンソースコードレポジトリでメンテナンスされ、メンテナは通常の用途では安定していると考えます。",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "このアプリはセキュリティチェックされていません、新規アプリか安定性が確認されていないアプリです。自己責任でインストールしてください。",
"Update to %s" : "%sにアップデート",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 310637d7873..43b0d8a7da8 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -62,7 +62,7 @@
"All" : "すべて",
"No apps found for your version" : "現在のバージョンに対応するアプリはありません",
"The app will be downloaded from the app store" : "このアプリは、アプリストアからダウンロードできます。",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "公式アプリは ownCloud コミュニティにより開発されています。コミュニティは ownCloud の中心機能を提供し、製品としての使用の準備ができています。",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "公式アプリは Nextcloud コミュニティにより開発されています。コミュニティは Nextcloud の中心機能を提供し、製品としての使用の準備ができています。",
"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." : "承認されたアプリは信頼された開発者により開発され、大まかなセキュリティチェックに合格しています。アプリは積極的にオープンソースコードレポジトリでメンテナンスされ、メンテナは通常の用途では安定していると考えます。",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "このアプリはセキュリティチェックされていません、新規アプリか安定性が確認されていないアプリです。自己責任でインストールしてください。",
"Update to %s" : "%sにアップデート",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index d7727b0adde..0f29e5b9db1 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -63,7 +63,7 @@ OC.L10N.register(
"Experimental" : "실험적",
"All" : "모두",
"No apps found for your version" : "설치된 버전에 대한 앱 없음",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "공식 앱은 ownCloud 커뮤니티 내에서 개발됩니다. ownCloud의 주요 기능을 제공하며 상용 환경에서 사용 가능합니다.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "공식 앱은 Nextcloud 커뮤니티 내에서 개발됩니다. Nextcloud의 주요 기능을 제공하며 상용 환경에서 사용 가능합니다.",
"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." : "승인된 앱은 신뢰할 수 있는 개발자가 개발하며 보안 검사를 통과했습니다. 열린 코드 저장소에서 관리되며 일반적인 환경에서 사용할 수 있는 수준으로 관리됩니다.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "이 앱의 보안 문제가 점검되지 않았고, 출시된 지 얼마 지나지 않았거나 아직 불안정합니다. 본인 책임 하에 설치하십시오.",
"Update to %s" : "%s(으)로 업데이트",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 4b096f6697f..41a7173ebf7 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -61,7 +61,7 @@
"Experimental" : "실험적",
"All" : "모두",
"No apps found for your version" : "설치된 버전에 대한 앱 없음",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "공식 앱은 ownCloud 커뮤니티 내에서 개발됩니다. ownCloud의 주요 기능을 제공하며 상용 환경에서 사용 가능합니다.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "공식 앱은 Nextcloud 커뮤니티 내에서 개발됩니다. Nextcloud의 주요 기능을 제공하며 상용 환경에서 사용 가능합니다.",
"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." : "승인된 앱은 신뢰할 수 있는 개발자가 개발하며 보안 검사를 통과했습니다. 열린 코드 저장소에서 관리되며 일반적인 환경에서 사용할 수 있는 수준으로 관리됩니다.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "이 앱의 보안 문제가 점검되지 않았고, 출시된 지 얼마 지나지 않았거나 아직 불안정합니다. 본인 책임 하에 설치하십시오.",
"Update to %s" : "%s(으)로 업데이트",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 7fdadca911e..1f45d814963 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -63,7 +63,7 @@ OC.L10N.register(
"Experimental" : "Eksperimentell",
"All" : "Alle",
"No apps found for your version" : "Ingen apper funnet for din versjon",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offisielle apper utvikles av og innenfor ownCloud-fellesskapet. De tilbyr funksjonalitet som er sentral for ownCloud og er forberedt for produksjonsbruk.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offisielle apper utvikles av og innenfor Nextcloud-fellesskapet. De tilbyr funksjonalitet som er sentral for Nextcloud og er forberedt for produksjonsbruk.",
"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." : "Godkjente apper er utviklet av tiltrodde utviklere og har gjennomgått en rask sikkerhetssjekk. De vedlikeholdes aktivt i et åpent kode-depot og utviklerne anser dem for å være stabile for tidvis eller normal bruk.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Denne appen er ikke sjekket for sikkerhetsproblemer og er ny eller ansett for å være ustabil. Installer på egen risiko.",
"Update to %s" : "Oppdater til %s",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 6a4052810a9..e8218be13e9 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -61,7 +61,7 @@
"Experimental" : "Eksperimentell",
"All" : "Alle",
"No apps found for your version" : "Ingen apper funnet for din versjon",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Offisielle apper utvikles av og innenfor ownCloud-fellesskapet. De tilbyr funksjonalitet som er sentral for ownCloud og er forberedt for produksjonsbruk.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offisielle apper utvikles av og innenfor Nextcloud-fellesskapet. De tilbyr funksjonalitet som er sentral for Nextcloud og er forberedt for produksjonsbruk.",
"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." : "Godkjente apper er utviklet av tiltrodde utviklere og har gjennomgått en rask sikkerhetssjekk. De vedlikeholdes aktivt i et åpent kode-depot og utviklerne anser dem for å være stabile for tidvis eller normal bruk.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Denne appen er ikke sjekket for sikkerhetsproblemer og er ny eller ansett for å være ustabil. Installer på egen risiko.",
"Update to %s" : "Oppdater til %s",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 6fe8d296b82..14208db3e99 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Alle",
"No apps found for your version" : "Geen apps gevonden voor uw versie",
"The app will be downloaded from the app store" : "De app zal worden gedownload van de app store",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiële apps zijn ontwikkeld door en binnen de ownCloud community. Ze bieden functionaliteit binnen ownCloud en zijn klaar voor gebruik in een productie omgeving.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Officiële apps zijn ontwikkeld door en binnen de Nextcloud community. Ze bieden functionaliteit binnen Nextcloud en zijn klaar voor gebruik in een productie omgeving.",
"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." : "Goedgekeurde apps zijn ontwikkeld door vertrouwde ontwikkelaars en hebben een beveiligingscontrole ondergaan. Ze worden actief onderhouden in een open code repository en hun ontwikkelaars vinden ze stabiel genoeg voor informeel of normaal gebruik.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Deze app is niet gecontroleerd op beveiligingsproblemen en is nieuw is is bekend als onstabiel. Installeren op eigen risico.",
"Update to %s" : "Bijgewerkt naar %s",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 56a765e7efa..e70a1db8b8d 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -62,7 +62,7 @@
"All" : "Alle",
"No apps found for your version" : "Geen apps gevonden voor uw versie",
"The app will be downloaded from the app store" : "De app zal worden gedownload van de app store",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiële apps zijn ontwikkeld door en binnen de ownCloud community. Ze bieden functionaliteit binnen ownCloud en zijn klaar voor gebruik in een productie omgeving.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Officiële apps zijn ontwikkeld door en binnen de Nextcloud community. Ze bieden functionaliteit binnen Nextcloud en zijn klaar voor gebruik in een productie omgeving.",
"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." : "Goedgekeurde apps zijn ontwikkeld door vertrouwde ontwikkelaars en hebben een beveiligingscontrole ondergaan. Ze worden actief onderhouden in een open code repository en hun ontwikkelaars vinden ze stabiel genoeg voor informeel of normaal gebruik.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Deze app is niet gecontroleerd op beveiligingsproblemen en is nieuw is is bekend als onstabiel. Installeren op eigen risico.",
"Update to %s" : "Bijgewerkt naar %s",
diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js
index a795f448063..a349a258414 100644
--- a/settings/l10n/oc.js
+++ b/settings/l10n/oc.js
@@ -63,7 +63,7 @@ OC.L10N.register(
"Experimental" : "Experimental",
"All" : "Totes",
"No apps found for your version" : "Pas d'aplicacion trobada per vòstra version",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicacions oficialas son desvolopadas per e amb la comunautat ownCloud. Ofrisson sas foncionalitats principalas a ownCloud e son prèstas per una utilizacion en produccion. ",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Las aplicacions oficialas son desvolopadas per e amb la comunautat Nextcloud. Ofrisson sas foncionalitats principalas a Nextcloud e son prèstas per una utilizacion en produccion. ",
"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." : "Las aplicacions aprovadas son creadas per de desvolopaires de fisança e an passat los tèst de seguretat. Son activament mantengudas dins un depaus dobèrt e lors desvolopaires pensan que son establas per una utilizacion normala.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Aquesta aplicacion es novèla o instabla, e sa seguretat es pas estada verificada. Installatz-la a vòstras riscas e perilhs !",
"Update to %s" : "Metre a nivèl cap a la version %s",
diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json
index cdd0583f073..0b43042a397 100644
--- a/settings/l10n/oc.json
+++ b/settings/l10n/oc.json
@@ -61,7 +61,7 @@
"Experimental" : "Experimental",
"All" : "Totes",
"No apps found for your version" : "Pas d'aplicacion trobada per vòstra version",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicacions oficialas son desvolopadas per e amb la comunautat ownCloud. Ofrisson sas foncionalitats principalas a ownCloud e son prèstas per una utilizacion en produccion. ",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Las aplicacions oficialas son desvolopadas per e amb la comunautat Nextcloud. Ofrisson sas foncionalitats principalas a Nextcloud e son prèstas per una utilizacion en produccion. ",
"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." : "Las aplicacions aprovadas son creadas per de desvolopaires de fisança e an passat los tèst de seguretat. Son activament mantengudas dins un depaus dobèrt e lors desvolopaires pensan que son establas per una utilizacion normala.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Aquesta aplicacion es novèla o instabla, e sa seguretat es pas estada verificada. Installatz-la a vòstras riscas e perilhs !",
"Update to %s" : "Metre a nivèl cap a la version %s",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 1f015bb9f20..64fd998218c 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Todos",
"No apps found for your version" : "Nenhum aplicativo encontrados para a sua versão",
"The app will be downloaded from the app store" : "O aplicativo será baixado na App Store",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicativos oficiais são desenvolvidos por e dentro da comunidade ownCloud. Eles oferecem funcionalidade central para ownCloud e estão prontos para uso em produção.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Aplicativos oficiais são desenvolvidos por e dentro da comunidade Nextcloud. Eles oferecem funcionalidade central para Nextcloud e estão prontos para uso em produção.",
"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." : "Aplicativos aprovados são desenvolvidos pelos desenvolvedores confiáveis e passaram por uma verificação de segurança superficial. Eles são ativamente mantidos em um repositório de código aberto e seus mantenedores consideram que eles para sejam estáveis para um casual uso normal.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Este aplicativo não foi verificado para as questões de segurança e é novo ou conhecido por ser instável. Instale por seu próprio risco.",
"Update to %s" : "Atualizado para %s",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 9396d801f07..9bd110996e7 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -62,7 +62,7 @@
"All" : "Todos",
"No apps found for your version" : "Nenhum aplicativo encontrados para a sua versão",
"The app will be downloaded from the app store" : "O aplicativo será baixado na App Store",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplicativos oficiais são desenvolvidos por e dentro da comunidade ownCloud. Eles oferecem funcionalidade central para ownCloud e estão prontos para uso em produção.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Aplicativos oficiais são desenvolvidos por e dentro da comunidade Nextcloud. Eles oferecem funcionalidade central para Nextcloud e estão prontos para uso em produção.",
"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." : "Aplicativos aprovados são desenvolvidos pelos desenvolvedores confiáveis e passaram por uma verificação de segurança superficial. Eles são ativamente mantidos em um repositório de código aberto e seus mantenedores consideram que eles para sejam estáveis para um casual uso normal.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Este aplicativo não foi verificado para as questões de segurança e é novo ou conhecido por ser instável. Instale por seu próprio risco.",
"Update to %s" : "Atualizado para %s",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 2269cf13419..8e3b02a2c5b 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Todos",
"No apps found for your version" : "Nenhuma aplicação encontrada para a sua versão",
"The app will be downloaded from the app store" : "A aplicação será descarregada da loja de aplicações",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As apps oficiais são desenvolvidas por e na comunidade da ownCloud. Elas oferecem funcionalidade central para a ownCloud e está pronta para uma utilização na produção.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "As apps oficiais são desenvolvidas por e na comunidade da Nextcloud. Elas oferecem funcionalidade central para a Nextcloud e está pronta para uma utilização na produção.",
"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." : "As aplicações aprovadas são desenvolvidas por developers de confiança e passaram numa verificação de segurança. São mantidas ativamente num repositório de código aberto e quem as mantém considera-as estáveis para uso casual a normal.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicação não foi verificada por problemas de segurança e é nova ou conhecida por ser instável. Instale-a por sua conta e risco.",
"Update to %s" : "Actualizar para %s",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 74c8728f617..713448bafe3 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -62,7 +62,7 @@
"All" : "Todos",
"No apps found for your version" : "Nenhuma aplicação encontrada para a sua versão",
"The app will be downloaded from the app store" : "A aplicação será descarregada da loja de aplicações",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As apps oficiais são desenvolvidas por e na comunidade da ownCloud. Elas oferecem funcionalidade central para a ownCloud e está pronta para uma utilização na produção.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "As apps oficiais são desenvolvidas por e na comunidade da Nextcloud. Elas oferecem funcionalidade central para a Nextcloud e está pronta para uma utilização na produção.",
"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." : "As aplicações aprovadas são desenvolvidas por developers de confiança e passaram numa verificação de segurança. São mantidas ativamente num repositório de código aberto e quem as mantém considera-as estáveis para uso casual a normal.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Esta aplicação não foi verificada por problemas de segurança e é nova ou conhecida por ser instável. Instale-a por sua conta e risco.",
"Update to %s" : "Actualizar para %s",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index edc3f1f759b..b215de42429 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Все",
"No apps found for your version" : "Не найдено приложений для вашей версии",
"The app will be downloaded from the app store" : "Приложение будет скачано из магазина приложений",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Официальные приложения разработаны силами сообщества ownCloud. Они составляют основу возможностей ownCloud и готовы к эксплуатации.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Официальные приложения разработаны силами сообщества Nextcloud. Они составляют основу возможностей Nextcloud и готовы к эксплуатации.",
"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." : "Подтвержденные приложения разработаны доверенными разработчиками и прошли краткую проверку на наличие проблем с безопасностью. Они активно поддерживаются в открытых репозиториях и сопровождающие их разработчики подтверждают, что приложения достаточно стабильны для нормальной работы.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Это приложение не проверялось на наличие проблем с безопасностью, также оно может работать нестабильно. Устанавливайте на свой страх и риск.",
"Update to %s" : "Обновить до %s",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 76978fdbb10..adec4aa9fce 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -62,7 +62,7 @@
"All" : "Все",
"No apps found for your version" : "Не найдено приложений для вашей версии",
"The app will be downloaded from the app store" : "Приложение будет скачано из магазина приложений",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Официальные приложения разработаны силами сообщества ownCloud. Они составляют основу возможностей ownCloud и готовы к эксплуатации.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Официальные приложения разработаны силами сообщества Nextcloud. Они составляют основу возможностей Nextcloud и готовы к эксплуатации.",
"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." : "Подтвержденные приложения разработаны доверенными разработчиками и прошли краткую проверку на наличие проблем с безопасностью. Они активно поддерживаются в открытых репозиториях и сопровождающие их разработчики подтверждают, что приложения достаточно стабильны для нормальной работы.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Это приложение не проверялось на наличие проблем с безопасностью, также оно может работать нестабильно. Устанавливайте на свой страх и риск.",
"Update to %s" : "Обновить до %s",
diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js
index 67f0881efbf..76033f082af 100644
--- a/settings/l10n/sq.js
+++ b/settings/l10n/sq.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Krejt",
"No apps found for your version" : "S’u gjetën aplikacione për versionin tuaj",
"The app will be downloaded from the app store" : "Aplikacioni do të shkarkohet nga shitorja e aplikacioneve",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplikacionet zyrtare ndërtohen brenda bashkësisë ownCloud. Ato ofrojnë funksione qendrore për ownCloud dhe janë gati për t’u përdorur në prodhim.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Aplikacionet zyrtare ndërtohen brenda bashkësisë Nextcloud. Ato ofrojnë funksione qendrore për Nextcloud dhe janë gati për t’u përdorur në prodhim.",
"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." : "Aplikacionet e miratuara ndërtohen nga zhvillues të besuar dhe kanë kaluar një kontroll të përciptë sigurie. Mirëmbahen aktivisht në një depo të hapur kodi dhe mirëmbajtësit e tyre i konsiderojnë të qëndrueshme për përdorime nga të rastit deri në ato normale.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ky aplikacion s’është kontrolluar për probleme sigurie dhe është i ri ose i njohur si i paqëndrueshëm. Instalojeni duke e mbajtur vetë përgjegjësinë.",
"Update to %s" : "Përditësoje me %s",
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
index 1ad565b3ab1..914639ad0e6 100644
--- a/settings/l10n/sq.json
+++ b/settings/l10n/sq.json
@@ -62,7 +62,7 @@
"All" : "Krejt",
"No apps found for your version" : "S’u gjetën aplikacione për versionin tuaj",
"The app will be downloaded from the app store" : "Aplikacioni do të shkarkohet nga shitorja e aplikacioneve",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Aplikacionet zyrtare ndërtohen brenda bashkësisë ownCloud. Ato ofrojnë funksione qendrore për ownCloud dhe janë gati për t’u përdorur në prodhim.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Aplikacionet zyrtare ndërtohen brenda bashkësisë Nextcloud. Ato ofrojnë funksione qendrore për Nextcloud dhe janë gati për t’u përdorur në prodhim.",
"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." : "Aplikacionet e miratuara ndërtohen nga zhvillues të besuar dhe kanë kaluar një kontroll të përciptë sigurie. Mirëmbahen aktivisht në një depo të hapur kodi dhe mirëmbajtësit e tyre i konsiderojnë të qëndrueshme për përdorime nga të rastit deri në ato normale.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ky aplikacion s’është kontrolluar për probleme sigurie dhe është i ri ose i njohur si i paqëndrueshëm. Instalojeni duke e mbajtur vetë përgjegjësinë.",
"Update to %s" : "Përditësoje me %s",
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index aa5e3a8ef48..91a2dcc6a3c 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Alla",
"No apps found for your version" : "Inga appar funna för din version",
"The app will be downloaded from the app store" : "Appen kommer hämtas från appstore",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiella appar är utvecklade av Owncloud's community. De erbjuder funtionalitet som är centralt för owncloud och redo för användning i produktion.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Officiella appar är utvecklade av Nextcloud's community. De erbjuder funtionalitet som är centralt för Nextcloud och redo för användning i produktion.",
"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." : "Godkända appar är utvecklade av betrodda utvecklare och har genomgått enklare säkerhetstester. De är aktivt utvecklade i ett öppet kodbibliotek och deras underhållare anser dom stabila nog för enklare till normalt användande.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Denna applikation är ej kontrollerad för säkerhetsbrister och är ny eller känd att orsaka instabilitetsproblem. Installera på egen risk.",
"Update to %s" : "Uppdatera till %s",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index 0cf69401b31..f471a5318cd 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -62,7 +62,7 @@
"All" : "Alla",
"No apps found for your version" : "Inga appar funna för din version",
"The app will be downloaded from the app store" : "Appen kommer hämtas från appstore",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officiella appar är utvecklade av Owncloud's community. De erbjuder funtionalitet som är centralt för owncloud och redo för användning i produktion.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Officiella appar är utvecklade av Nextcloud's community. De erbjuder funtionalitet som är centralt för Nextcloud och redo för användning i produktion.",
"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." : "Godkända appar är utvecklade av betrodda utvecklare och har genomgått enklare säkerhetstester. De är aktivt utvecklade i ett öppet kodbibliotek och deras underhållare anser dom stabila nog för enklare till normalt användande.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Denna applikation är ej kontrollerad för säkerhetsbrister och är ny eller känd att orsaka instabilitetsproblem. Installera på egen risk.",
"Update to %s" : "Uppdatera till %s",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index 4607c1df4fd..f2d58d720ce 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "ทั้งหมด",
"No apps found for your version" : "ไม่พบแอพพลิเคชันสำหรับรุ่นของคุณ",
"The app will be downloaded from the app store" : "แอพฯจะดาวน์โหลดได้จากแอพสโตร์",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "แอพพลิเคชันมีการพัฒนาอย่างเป็นทางการภายในชุมชน ownCloud พวกเขามีการทำงานเป็นศูนย์กลางของ ownCloud และพร้อมสำหรับการใช้งานผลิตภัณฑ์",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "แอพพลิเคชันมีการพัฒนาอย่างเป็นทางการภายในชุมชน Nextcloud พวกเขามีการทำงานเป็นศูนย์กลางของ Nextcloud และพร้อมสำหรับการใช้งานผลิตภัณฑ์",
"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." : "แอพพลิเคชันได้รับการอนุมัติและพัฒนาโดยนักพัฒนาที่น่าเชื่อถือและได้ผ่านการตรวจสอบความปลอดภัยคร่าวๆ พวกเขาจะได้รับการบำรุงรักษาอย่างดีในการเก็บข้อมูลรหัสเปิด มันอาจยังไม่เสถียรพอสำหรับการเปิดใช้งานปกติ",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "แอพฯ นี้ไม่ได้ตรวจสอบปัญหาด้านความปลอดภัยและเป็นแอพฯใหม่หรือที่รู้จักกันคือจะไม่เสถียร ติดตั้งบนความเสี่ยงของคุณเอง",
"Update to %s" : "อัพเดทไปยัง %s",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index e40da57a999..db80cc6f4c8 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -62,7 +62,7 @@
"All" : "ทั้งหมด",
"No apps found for your version" : "ไม่พบแอพพลิเคชันสำหรับรุ่นของคุณ",
"The app will be downloaded from the app store" : "แอพฯจะดาวน์โหลดได้จากแอพสโตร์",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "แอพพลิเคชันมีการพัฒนาอย่างเป็นทางการภายในชุมชน ownCloud พวกเขามีการทำงานเป็นศูนย์กลางของ ownCloud และพร้อมสำหรับการใช้งานผลิตภัณฑ์",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "แอพพลิเคชันมีการพัฒนาอย่างเป็นทางการภายในชุมชน Nextcloud พวกเขามีการทำงานเป็นศูนย์กลางของ Nextcloud และพร้อมสำหรับการใช้งานผลิตภัณฑ์",
"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." : "แอพพลิเคชันได้รับการอนุมัติและพัฒนาโดยนักพัฒนาที่น่าเชื่อถือและได้ผ่านการตรวจสอบความปลอดภัยคร่าวๆ พวกเขาจะได้รับการบำรุงรักษาอย่างดีในการเก็บข้อมูลรหัสเปิด มันอาจยังไม่เสถียรพอสำหรับการเปิดใช้งานปกติ",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "แอพฯ นี้ไม่ได้ตรวจสอบปัญหาด้านความปลอดภัยและเป็นแอพฯใหม่หรือที่รู้จักกันคือจะไม่เสถียร ติดตั้งบนความเสี่ยงของคุณเอง",
"Update to %s" : "อัพเดทไปยัง %s",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 220cf7282bc..a0e6d10dcca 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"All" : "Tümü",
"No apps found for your version" : "Sürümünüz için uygulama bulunamadı",
"The app will be downloaded from the app store" : "uygulama uygulama dükkanından indirilebilecek",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Resmi uygulamalar ownCloud topluluğu tarafından geliştirilir. ownCloud'a işlevsellik merkezli olarak hazırlanırlar ve günlük kullanıma hazırdırlar.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Resmi uygulamalar Nextcloud topluluğu tarafından geliştirilir. Nextcloud'a işlevsellik merkezli olarak hazırlanırlar ve günlük kullanıma hazırdırlar.",
"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." : "Onaylanan uygulamalar güvenilir geliştiriciler tarafından geliştirilir ve detaylı olmayan bir güvenlik kontrolünden geçirilir. Bunlar açık kaynak kod deposunda bulunmakta ve normal kullanım için kararlı oldukları varsayılmaktadır.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Bu uygulama güvenlik kontrolünden geçmedi veya yeni ya da kararsız olarak bilinmektedir. Kendiniz bu riski alarak yükleyebilirsiniz.",
"Update to %s" : "%s sürümüne güncelle",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 789b283aed2..2d8b69b2606 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -62,7 +62,7 @@
"All" : "Tümü",
"No apps found for your version" : "Sürümünüz için uygulama bulunamadı",
"The app will be downloaded from the app store" : "uygulama uygulama dükkanından indirilebilecek",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Resmi uygulamalar ownCloud topluluğu tarafından geliştirilir. ownCloud'a işlevsellik merkezli olarak hazırlanırlar ve günlük kullanıma hazırdırlar.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Resmi uygulamalar Nextcloud topluluğu tarafından geliştirilir. Nextcloud'a işlevsellik merkezli olarak hazırlanırlar ve günlük kullanıma hazırdırlar.",
"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." : "Onaylanan uygulamalar güvenilir geliştiriciler tarafından geliştirilir ve detaylı olmayan bir güvenlik kontrolünden geçirilir. Bunlar açık kaynak kod deposunda bulunmakta ve normal kullanım için kararlı oldukları varsayılmaktadır.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Bu uygulama güvenlik kontrolünden geçmedi veya yeni ya da kararsız olarak bilinmektedir. Kendiniz bu riski alarak yükleyebilirsiniz.",
"Update to %s" : "%s sürümüne güncelle",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index 77b6a0d34eb..1dd65c9b97b 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -62,7 +62,7 @@ OC.L10N.register(
"Experimental" : "Експериментальні",
"All" : "Всі",
"No apps found for your version" : "Немає застосунків для вашої версії",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Офіційні додатки розроблені спільнотою ownCloud. Вони реалізують основні можливості ownCloud і готові до використання в продакшені.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Офіційні додатки розроблені спільнотою Nextcloud. Вони реалізують основні можливості Nextcloud і готові до використання в продакшені.",
"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." : "Схвалені додатки розроблені довіреними розробниками і пройшли незалежну перевірку безпеки. Їх активно супроводжують у репозиторії з відкритим кодом, а їх розробники стежать, щоб вони були стабільні й прийнятні для повсякденного використання.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ця програма не перевірена на вразливості безпеки і є новою або нестабільною. Встановлюйте її на власний ризик.",
"Update to %s" : "Оновити до %s",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index f8f1c655ff6..463f3c8d314 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -60,7 +60,7 @@
"Experimental" : "Експериментальні",
"All" : "Всі",
"No apps found for your version" : "Немає застосунків для вашої версії",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Офіційні додатки розроблені спільнотою ownCloud. Вони реалізують основні можливості ownCloud і готові до використання в продакшені.",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Офіційні додатки розроблені спільнотою Nextcloud. Вони реалізують основні можливості Nextcloud і готові до використання в продакшені.",
"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." : "Схвалені додатки розроблені довіреними розробниками і пройшли незалежну перевірку безпеки. Їх активно супроводжують у репозиторії з відкритим кодом, а їх розробники стежать, щоб вони були стабільні й прийнятні для повсякденного використання.",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ця програма не перевірена на вразливості безпеки і є новою або нестабільною. Встановлюйте її на власний ризик.",
"Update to %s" : "Оновити до %s",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index 05db4eba3c7..471b38e1ec4 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -63,7 +63,7 @@ OC.L10N.register(
"Experimental" : "实验",
"All" : "全部",
"No apps found for your version" : "未找到适合当前版本的应用",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "官方应用是由 ownCloud 社区开发。他们提供 ownCloud 的功能核心并准备用于生产。",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "官方应用是由 Nextcloud 社区开发。他们提供 Nextcloud 的功能核心并准备用于生产。",
"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." : "已认可的应用是由值得信赖的开发商开发,并已通过了一个粗略的安全检查。他们放在一个开放的代码库并且维护人员认为他们是稳定的差不多可以正常使用。",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "此应用未检查安全问题,它是新的或已知是不稳定的。安装风险自担。",
"Update to %s" : "更新为 %s",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 7298dfe1b0f..37ddc31729e 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -61,7 +61,7 @@
"Experimental" : "实验",
"All" : "全部",
"No apps found for your version" : "未找到适合当前版本的应用",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "官方应用是由 ownCloud 社区开发。他们提供 ownCloud 的功能核心并准备用于生产。",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "官方应用是由 Nextcloud 社区开发。他们提供 Nextcloud 的功能核心并准备用于生产。",
"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." : "已认可的应用是由值得信赖的开发商开发,并已通过了一个粗略的安全检查。他们放在一个开放的代码库并且维护人员认为他们是稳定的差不多可以正常使用。",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "此应用未检查安全问题,它是新的或已知是不稳定的。安装风险自担。",
"Update to %s" : "更新为 %s",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index 0d5d8337948..e5184f3a09d 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -63,7 +63,7 @@ OC.L10N.register(
"Experimental" : "實驗性質",
"All" : "所有",
"No apps found for your version" : "沒有找到適合您的版本的應用程式",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "官方應用程式由 ownCloud 社群開發,他們提供 ownCloud 的主要功能,並確保穩定性足供正式使用",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "官方應用程式由 Nextcloud 社群開發,他們提供 Nextcloud 的主要功能,並確保穩定性足供正式使用",
"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." : "審查通過的應用程式經由可信任的開發人員所設計,並且經過一連串的安全測試,他們在開放的程式庫中維護這些應用程式,而且確保這些應用程式能穩定運作",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "這個新應用程式並沒有經過安全檢測,可能會是不穩定的,如果您要安裝的話,風險自行負責。",
"Update to %s" : "更新到 %s",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index e58097097a6..e8e9b42b93a 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -61,7 +61,7 @@
"Experimental" : "實驗性質",
"All" : "所有",
"No apps found for your version" : "沒有找到適合您的版本的應用程式",
- "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "官方應用程式由 ownCloud 社群開發,他們提供 ownCloud 的主要功能,並確保穩定性足供正式使用",
+ "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "官方應用程式由 Nextcloud 社群開發,他們提供 Nextcloud 的主要功能,並確保穩定性足供正式使用",
"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." : "審查通過的應用程式經由可信任的開發人員所設計,並且經過一連串的安全測試,他們在開放的程式庫中維護這些應用程式,而且確保這些應用程式能穩定運作",
"This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "這個新應用程式並沒有經過安全檢測,可能會是不穩定的,如果您要安裝的話,風險自行負責。",
"Update to %s" : "更新到 %s",
--
cgit v1.2.3
From 19b531fd1412407d401f8433b05f005465ffb96c Mon Sep 17 00:00:00 2001
From: Morris Jobke
Date: Mon, 20 Jun 2016 10:38:37 +0200
Subject: fix more strings
---
apps/updatenotification/lib/Notification/Notifier.php | 2 +-
apps/updatenotification/templates/admin.php | 2 +-
settings/js/apps.js | 2 +-
settings/templates/admin.php | 2 +-
settings/templates/apps.php | 4 ++--
settings/templates/personal.php | 10 +++++-----
settings/templates/settings.development.notice.php | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'settings')
diff --git a/apps/updatenotification/lib/Notification/Notifier.php b/apps/updatenotification/lib/Notification/Notifier.php
index 50505ef13f6..bd89c11d62d 100644
--- a/apps/updatenotification/lib/Notification/Notifier.php
+++ b/apps/updatenotification/lib/Notification/Notifier.php
@@ -64,7 +64,7 @@ class Notifier implements INotifier {
$l = $this->l10NFactory->get('updatenotification', $languageCode);
if ($notification->getObjectType() === 'core') {
- $appName = $l->t('ownCloud core');
+ $appName = $l->t('Nextcloud core');
$this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
} else {
diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php
index 5974b106f72..0be070cac30 100644
--- a/apps/updatenotification/templates/admin.php
+++ b/apps/updatenotification/templates/admin.php
@@ -47,7 +47,7 @@
- t('Only notification for app updates are available, because the selected update channel for ownCloud itself does not allow notifications.')); ?>
+ t('Only notification for app updates are available, because the selected update channel for the server itself does not allow notifications.')); ?>
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 56c9022aa72..525a34d9067 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -121,7 +121,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
$('.enable.needs-download').tipsy({fallback: t('settings', 'The app will be downloaded from the app store')});
- $('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use.')});
+ $('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the community. They offer central functionality and are ready for production use.')});
$('.app-level .approved').tipsy({fallback: t('settings', '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.')});
$('.app-level .experimental').tipsy({fallback: t('settings', 'This app is not checked for security issues and is new or known to be unstable. Install at your own risk.')});
},
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index b5c5b2510b6..c0a7424cf67 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -362,7 +362,7 @@ if ($_['cronErrors']) {
t('Please read carefully before activating server-side encryption: ')); ?>
t('Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met.')); ?>
- t('Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases.')); ?>
+ t('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.')); ?>
t('Be aware that encryption always increases the file size.')); ?>
t('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.')); ?>
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index d3c14332693..2edbf1530eb 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -117,12 +117,12 @@ script(
{{#if missingMinOwnCloudVersion}}
-
t('This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?>
+
t('This app has no minimum Nextcloud version assigned. This will be an error in the future.')); ?>
{{else}}
{{#if missingMaxOwnCloudVersion}}
-
t('This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?>
+
t('This app has no maximum Nextcloud version assigned. This will be an error in the future.')); ?>
{{/if}}
{{/if}}
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index b4ff5db5c7c..45f61310b30 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -138,7 +138,7 @@ if($_['passwordChangeSupported']) {
t('Sessions'));?>
-
t('These are the web, desktop and mobile clients currently logged in to your ownCloud.'));?>
+
t('These are the web, desktop and mobile clients currently logged in to your account.'));?>
-
t('A device password is a passcode that gives an app or device permissions to access your ownCloud account.'));?>
+
t('A device password is a passcode that gives an app or device permissions to access your account.'));?>