diff --git a/.drone.yml b/.drone.yml
index da877a95d50b9..2ac98e4523ff6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -562,6 +562,26 @@ pipeline:
when:
matrix:
TESTS: integration-ldap-features
+ integration-ldap-openldap-features:
+ image: nextcloudci/integration-php7.0:integration-php7.0-6
+ commands:
+ - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
+ - ./occ app:enable user_ldap
+ - cd build/integration
+ - ./run.sh ldap_features/ldap-openldap.feature
+ when:
+ matrix:
+ TESTS: integration-ldap-openldap-features
+ integration-ldap-openldap-uid-features:
+ image: nextcloudci/integration-php7.0:integration-php7.0-6
+ commands:
+ - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
+ - ./occ app:enable user_ldap
+ - cd build/integration
+ - ./run.sh ldap_features/openldap-uid-username.feature
+ when:
+ matrix:
+ TESTS: integration-ldap-openldap-uid-features
integration-trashbin:
image: nextcloudci/integration-php7.0:integration-php7.0-8
commands:
@@ -828,6 +848,10 @@ matrix:
- TESTS: integration-filesdrop-features
- TESTS: integration-transfer-ownership-features
- TESTS: integration-ldap-features
+ - TESTS: integration-ldap-openldap-features
+ ENABLE_OPENLDAP: true
+ - TESTS: integration-ldap-openldap-uid-features
+ ENABLE_OPENLDAP: true
- TESTS: integration-trashbin
- TESTS: integration-remote-api
- TESTS: integration-download
@@ -1007,5 +1031,15 @@ services:
when:
matrix:
TESTS: acceptance
+ openldap:
+ image: nextcloudci/openldap:openldap-4
+ environment:
+ - SLAPD_DOMAIN=nextcloud.ci
+ - SLAPD_ORGANIZATION=Nextcloud
+ - SLAPD_PASSWORD=admin
+ - SLAPD_ADDITIONAL_MODULES=memberof
+ when:
+ matrix:
+ ENABLE_OPENLDAP: true
branches: [ master, stable* ]
diff --git a/apps/accessibility/lib/Controller/AccessibilityController.php b/apps/accessibility/lib/Controller/AccessibilityController.php
index 4ee88b90a7a2c..0a1d091d1c50f 100644
--- a/apps/accessibility/lib/Controller/AccessibilityController.php
+++ b/apps/accessibility/lib/Controller/AccessibilityController.php
@@ -70,6 +70,12 @@ class AccessibilityController extends Controller {
/** @var IconsCacher */
protected $iconsCacher;
+ /** @var \OC_Defaults */
+ private $defaults;
+
+ /** @var null|string */
+ private $injectedVariables;
+
/**
* Account constructor.
*
@@ -82,6 +88,7 @@ class AccessibilityController extends Controller {
* @param ITimeFactory $timeFactory
* @param IUserSession $userSession
* @param IAppManager $appManager
+ * @param \OC_Defaults $defaults
*/
public function __construct(string $appName,
IRequest $request,
@@ -92,7 +99,8 @@ public function __construct(string $appName,
ITimeFactory $timeFactory,
IUserSession $userSession,
IAppManager $appManager,
- IconsCacher $iconsCacher) {
+ IconsCacher $iconsCacher,
+ \OC_Defaults $defaults) {
parent::__construct($appName, $request);
$this->appName = $appName;
$this->config = $config;
@@ -103,6 +111,7 @@ public function __construct(string $appName,
$this->userSession = $userSession;
$this->appManager = $appManager;
$this->iconsCacher = $iconsCacher;
+ $this->defaults = $defaults;
$this->serverRoot = \OC::$SERVERROOT;
$this->appRoot = $this->appManager->getAppPath($this->appName);
@@ -141,6 +150,7 @@ public function getCss(): DataDisplayResponse {
$css .= $scss->compile(
$imports .
'@import "variables.scss";' .
+ $this->getInjectedVariables() .
'@import "css-variables.scss";'
);
} catch (ParserException $e) {
@@ -220,4 +230,27 @@ private function rebaseUrls(string $css, string $webDir): string {
private function invertSvgIconsColor(string $css) {
return str_replace(['/000', '/fff', '/***'], ['/***', '/000', '/fff'], $css);
}
+
+ /**
+ * @return string SCSS code for variables from OC_Defaults
+ */
+ private function getInjectedVariables(): string {
+ if ($this->injectedVariables !== null) {
+ return $this->injectedVariables;
+ }
+ $variables = '';
+ foreach ($this->defaults->getScssVariables() as $key => $value) {
+ $variables .= '$' . $key . ': ' . $value . ';';
+ }
+
+ // check for valid variables / otherwise fall back to defaults
+ try {
+ $scss = new Compiler();
+ $scss->compile($variables);
+ $this->injectedVariables = $variables;
+ } catch (ParserException $e) {
+ $this->logger->error($e, ['app' => 'core']);
+ }
+ return $variables;
+ }
}
diff --git a/apps/admin_audit/composer/composer/ClassLoader.php b/apps/admin_audit/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/admin_audit/composer/composer/ClassLoader.php
+++ b/apps/admin_audit/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/admin_audit/lib/Actions/UserManagement.php b/apps/admin_audit/lib/Actions/UserManagement.php
index 5cf1494df6e94..1ad6ba4e20f83 100644
--- a/apps/admin_audit/lib/Actions/UserManagement.php
+++ b/apps/admin_audit/lib/Actions/UserManagement.php
@@ -97,14 +97,25 @@ public function unassign(string $uid) {
* @param array $params
*/
public function change(array $params) {
- if ($params['feature'] === 'enabled') {
- $this->log(
- $params['value'] === 'true' ? 'User enabled: "%s"' : 'User disabled: "%s"',
- ['user' => $params['user']->getUID()],
- [
- 'user',
- ]
- );
+ switch($params['feature']) {
+ case 'enabled':
+ $this->log(
+ $params['value'] === 'true' ? 'User enabled: "%s"' : 'User disabled: "%s"',
+ ['user' => $params['user']->getUID()],
+ [
+ 'user',
+ ]
+ );
+ break;
+ case 'eMailAddress':
+ $this->log(
+ 'Email address changed for user %s',
+ ['user' => $params['user']->getUID()],
+ [
+ 'user',
+ ]
+ );
+ break;
}
}
diff --git a/apps/comments/composer/composer/ClassLoader.php b/apps/comments/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/comments/composer/composer/ClassLoader.php
+++ b/apps/comments/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/comments/l10n/nl.js b/apps/comments/l10n/nl.js
index 91c3b209b8eab..1caa2a83e0447 100644
--- a/apps/comments/l10n/nl.js
+++ b/apps/comments/l10n/nl.js
@@ -29,6 +29,7 @@ OC.L10N.register(
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Je werd vermeld op \"{file}\" in een reactie door een sindsdien verwijderde gebruiker",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vermeldde jou in een reactie op “%2$s\"",
"{user} mentioned you in a comment on “{file}”" : "{user} heeft je vermeld in een reactie op “{file}\"",
+ "Files app plugin to add comments to files" : "Bestanden app plugin om reacties op bestanden toe te voegen",
"Unknown user" : "Onbekende gebruiker",
"A (now) deleted user mentioned you in a comment on “%s”" : "Een (nu) verwijderde gebruiker vermeldde je in een reactie op \"%s\"",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Een (nu) verwijderde gebruiker vermeldde je in een reactie op \"{file}\""
diff --git a/apps/comments/l10n/nl.json b/apps/comments/l10n/nl.json
index 5c91038f6cb7f..ca7698b625cf9 100644
--- a/apps/comments/l10n/nl.json
+++ b/apps/comments/l10n/nl.json
@@ -27,6 +27,7 @@
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Je werd vermeld op \"{file}\" in een reactie door een sindsdien verwijderde gebruiker",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vermeldde jou in een reactie op “%2$s\"",
"{user} mentioned you in a comment on “{file}”" : "{user} heeft je vermeld in een reactie op “{file}\"",
+ "Files app plugin to add comments to files" : "Bestanden app plugin om reacties op bestanden toe te voegen",
"Unknown user" : "Onbekende gebruiker",
"A (now) deleted user mentioned you in a comment on “%s”" : "Een (nu) verwijderde gebruiker vermeldde je in een reactie op \"%s\"",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Een (nu) verwijderde gebruiker vermeldde je in een reactie op \"{file}\""
diff --git a/apps/dav/composer/composer/ClassLoader.php b/apps/dav/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/dav/composer/composer/ClassLoader.php
+++ b/apps/dav/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/dav/l10n/nl.js b/apps/dav/l10n/nl.js
index bdf94dcf2f45d..46a1a456770ac 100644
--- a/apps/dav/l10n/nl.js
+++ b/apps/dav/l10n/nl.js
@@ -54,13 +54,23 @@ OC.L10N.register(
"Where:" : "Waar:",
"Description:" : "Omschrijving:",
"Link:" : "Link:",
+ "Accept" : "Accepteren",
+ "Decline" : "Afwijzen",
+ "More options …" : "Meer opties …",
+ "More options at %s" : "Meer opties op %s",
"Contacts" : "Contactpersonen",
"WebDAV" : "WebDAV",
"WebDAV endpoint" : "WebDAV endpoint",
"Technical details" : "Technische details",
"Remote Address: %s" : "Extern adres: %s",
"Request ID: %s" : "Aanvraag-ID: %s",
+ "There was an error updating your attendance status." : "Er trad een fout op bij het bijwerken van je deelnamestatus.",
+ "Please contact the organizer directly." : "Neem rechtstreeks contact op met de organisator.",
+ "Are you accepting the invitation?" : "Neem je de uitnodiging aan?",
+ "Tentative" : "Onder voorbehoud",
"Save" : "Opslaan",
+ "Your attendance was updated successfully." : "Je deelname is succesvol bijgewerkt.",
+ "Calendar server" : "Agendaserver",
"Send invitations to attendees" : "Verzend uitnodigingen naar deelnemers",
"Please make sure to properly set up the email settings above." : "Zorg ervoor dat je de bovenstaande e-mailinstellingen correct instelt.",
"Automatically generate a birthday calendar" : "Genereer verjaardagskalender automatisch",
diff --git a/apps/dav/l10n/nl.json b/apps/dav/l10n/nl.json
index 7373640fc4854..62a21d359afb6 100644
--- a/apps/dav/l10n/nl.json
+++ b/apps/dav/l10n/nl.json
@@ -52,13 +52,23 @@
"Where:" : "Waar:",
"Description:" : "Omschrijving:",
"Link:" : "Link:",
+ "Accept" : "Accepteren",
+ "Decline" : "Afwijzen",
+ "More options …" : "Meer opties …",
+ "More options at %s" : "Meer opties op %s",
"Contacts" : "Contactpersonen",
"WebDAV" : "WebDAV",
"WebDAV endpoint" : "WebDAV endpoint",
"Technical details" : "Technische details",
"Remote Address: %s" : "Extern adres: %s",
"Request ID: %s" : "Aanvraag-ID: %s",
+ "There was an error updating your attendance status." : "Er trad een fout op bij het bijwerken van je deelnamestatus.",
+ "Please contact the organizer directly." : "Neem rechtstreeks contact op met de organisator.",
+ "Are you accepting the invitation?" : "Neem je de uitnodiging aan?",
+ "Tentative" : "Onder voorbehoud",
"Save" : "Opslaan",
+ "Your attendance was updated successfully." : "Je deelname is succesvol bijgewerkt.",
+ "Calendar server" : "Agendaserver",
"Send invitations to attendees" : "Verzend uitnodigingen naar deelnemers",
"Please make sure to properly set up the email settings above." : "Zorg ervoor dat je de bovenstaande e-mailinstellingen correct instelt.",
"Automatically generate a birthday calendar" : "Genereer verjaardagskalender automatisch",
diff --git a/apps/dav/lib/CardDAV/SyncService.php b/apps/dav/lib/CardDAV/SyncService.php
index ee68a4a26ec68..5bd92015ad709 100644
--- a/apps/dav/lib/CardDAV/SyncService.php
+++ b/apps/dav/lib/CardDAV/SyncService.php
@@ -270,18 +270,22 @@ public function updateUser($user) {
$cardId = "$name:$userId.vcf";
$card = $this->backend->getCard($addressBookId, $cardId);
- if ($card === false) {
- $vCard = $converter->createCardFromUser($user);
- if ($vCard !== null) {
- $this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
- }
- } else {
- $vCard = $converter->createCardFromUser($user);
- if (is_null($vCard)) {
- $this->backend->deleteCard($addressBookId, $cardId);
+ if ($user->isEnabled()) {
+ if ($card === false) {
+ $vCard = $converter->createCardFromUser($user);
+ if ($vCard !== null) {
+ $this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
+ }
} else {
- $this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
+ $vCard = $converter->createCardFromUser($user);
+ if (is_null($vCard)) {
+ $this->backend->deleteCard($addressBookId, $cardId);
+ } else {
+ $this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
+ }
}
+ } else {
+ $this->backend->deleteCard($addressBookId, $cardId);
}
}
diff --git a/apps/dav/tests/unit/CardDAV/SyncServiceTest.php b/apps/dav/tests/unit/CardDAV/SyncServiceTest.php
index 1ca27d61ce482..7d444571fac8c 100644
--- a/apps/dav/tests/unit/CardDAV/SyncServiceTest.php
+++ b/apps/dav/tests/unit/CardDAV/SyncServiceTest.php
@@ -84,14 +84,30 @@ public function testEnsureSystemAddressBookExists() {
$ss->ensureSystemAddressBookExists('principals/users/adam', 'contacts', []);
}
- public function testUpdateAndDeleteUser() {
+ public function dataActivatedUsers() {
+ return [
+ [true, 1, 1, 1],
+ [false, 0, 0, 3],
+ ];
+ }
+
+ /**
+ * @dataProvider dataActivatedUsers
+ *
+ * @param boolean $activated
+ * @param integer $createCalls
+ * @param integer $updateCalls
+ * @param integer $deleteCalls
+ * @return void
+ */
+ public function testUpdateAndDeleteUser($activated, $createCalls, $updateCalls, $deleteCalls) {
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backend */
$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
$logger = $this->getMockBuilder(ILogger::class)->disableOriginalConstructor()->getMock();
- $backend->expects($this->once())->method('createCard');
- $backend->expects($this->once())->method('updateCard');
- $backend->expects($this->once())->method('deleteCard');
+ $backend->expects($this->exactly($createCalls))->method('createCard');
+ $backend->expects($this->exactly($updateCalls))->method('updateCard');
+ $backend->expects($this->exactly($deleteCalls))->method('deleteCard');
$backend->method('getCard')->willReturnOnConsecutiveCalls(false, [
'carddata' => "BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.8//EN\r\nUID:test-user\r\nFN:test-user\r\nN:test-user;;;;\r\nEND:VCARD\r\n\r\n"
@@ -106,6 +122,7 @@ public function testUpdateAndDeleteUser() {
$user->method('getUID')->willReturn('test-user');
$user->method('getCloudId')->willReturn('cloudId');
$user->method('getDisplayName')->willReturn('test-user');
+ $user->method('isEnabled')->willReturn($activated);
$accountManager = $this->getMockBuilder(AccountManager::class)->disableOriginalConstructor()->getMock();
$accountManager->expects($this->any())->method('getUser')
->willReturn([
diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml
index a0bf0fcf14ccd..04159890688f7 100644
--- a/apps/encryption/appinfo/info.xml
+++ b/apps/encryption/appinfo/info.xml
@@ -14,7 +14,7 @@
Please read the documentation to know all implications before you decide
to enable server-side encryption.
- 2.1.0
+ 2.2.0agplBjoern SchiessleClark Tomlinson
@@ -43,6 +43,7 @@
OCA\Encryption\Command\EnableMasterKeyOCA\Encryption\Command\DisableMasterKey
+ OCA\Encryption\Command\RecoverUser
diff --git a/apps/encryption/composer/composer/ClassLoader.php b/apps/encryption/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/encryption/composer/composer/ClassLoader.php
+++ b/apps/encryption/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/encryption/composer/composer/autoload_classmap.php b/apps/encryption/composer/composer/autoload_classmap.php
index 024f61bd6ce60..a071387a392c9 100644
--- a/apps/encryption/composer/composer/autoload_classmap.php
+++ b/apps/encryption/composer/composer/autoload_classmap.php
@@ -9,6 +9,7 @@
'OCA\\Encryption\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
'OCA\\Encryption\\Command\\DisableMasterKey' => $baseDir . '/../lib/Command/DisableMasterKey.php',
'OCA\\Encryption\\Command\\EnableMasterKey' => $baseDir . '/../lib/Command/EnableMasterKey.php',
+ 'OCA\\Encryption\\Command\\RecoverUser' => $baseDir . '/../lib/Command/RecoverUser.php',
'OCA\\Encryption\\Controller\\RecoveryController' => $baseDir . '/../lib/Controller/RecoveryController.php',
'OCA\\Encryption\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
'OCA\\Encryption\\Controller\\StatusController' => $baseDir . '/../lib/Controller/StatusController.php',
diff --git a/apps/encryption/composer/composer/autoload_static.php b/apps/encryption/composer/composer/autoload_static.php
index 3f0082a80c8fe..6ed6e72a87a0f 100644
--- a/apps/encryption/composer/composer/autoload_static.php
+++ b/apps/encryption/composer/composer/autoload_static.php
@@ -24,6 +24,7 @@ class ComposerStaticInitEncryption
'OCA\\Encryption\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
'OCA\\Encryption\\Command\\DisableMasterKey' => __DIR__ . '/..' . '/../lib/Command/DisableMasterKey.php',
'OCA\\Encryption\\Command\\EnableMasterKey' => __DIR__ . '/..' . '/../lib/Command/EnableMasterKey.php',
+ 'OCA\\Encryption\\Command\\RecoverUser' => __DIR__ . '/..' . '/../lib/Command/RecoverUser.php',
'OCA\\Encryption\\Controller\\RecoveryController' => __DIR__ . '/..' . '/../lib/Controller/RecoveryController.php',
'OCA\\Encryption\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
'OCA\\Encryption\\Controller\\StatusController' => __DIR__ . '/..' . '/../lib/Controller/StatusController.php',
diff --git a/apps/encryption/lib/Command/RecoverUser.php b/apps/encryption/lib/Command/RecoverUser.php
new file mode 100644
index 0000000000000..8de105b53824d
--- /dev/null
+++ b/apps/encryption/lib/Command/RecoverUser.php
@@ -0,0 +1,118 @@
+
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+namespace OCA\Encryption\Command;
+
+
+use OC\Files\Filesystem;
+use OC\User\NoUserException;
+use OCA\Encryption\Crypto\Crypt;
+use OCA\Encryption\KeyManager;
+use OCA\Encryption\Recovery;
+use OCA\Encryption\Util;
+use OCP\IConfig;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\Question;
+
+class RecoverUser extends Command {
+
+ /** @var Util */
+ protected $util;
+
+ /** @var IUserManager */
+ protected $userManager;
+
+ /** @var QuestionHelper */
+ protected $questionHelper;
+
+ /**
+ * @param Util $util
+ * @param IConfig $config
+ * @param IUserManager $userManager
+ * @param QuestionHelper $questionHelper
+ */
+ public function __construct(Util $util,
+ IConfig $config,
+ IUserManager $userManager,
+ QuestionHelper $questionHelper) {
+
+ $this->util = $util;
+ $this->questionHelper = $questionHelper;
+ $this->userManager = $userManager;
+ parent::__construct();
+ }
+
+ protected function configure() {
+ $this
+ ->setName('encryption:recover-user')
+ ->setDescription('Recover user data in case of password lost. This only works if the user enabled the recovery key.');
+
+ $this->addArgument(
+ 'user',
+ InputArgument::REQUIRED,
+ 'user which should be recovered'
+ );
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output) {
+
+ $isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
+
+ if($isMasterKeyEnabled) {
+ $output->writeln('You use the master key, no individual user recovery needed.');
+ return;
+ }
+
+ $uid = $input->getArgument('user');
+ $userExists = $this->userManager->userExists($uid);
+ if ($userExists === false) {
+ $output->writeln('User "' . $uid . '" unknown.');
+ return;
+ }
+
+ $recoveryKeyEnabled = $this->util->isRecoveryEnabledForUser($uid);
+ if($recoveryKeyEnabled === false) {
+ $output->writeln('Recovery key is not enabled for: ' . $uid);
+ return;
+ }
+
+ $question = new Question('Please enter the recovery key password: ');
+ $question->setHidden(true);
+ $question->setHiddenFallback(false);
+ $recoveryPassword = $this->questionHelper->ask($input, $output, $question);
+
+ $question = new Question('Please enter the new login password for the user: ');
+ $question->setHidden(true);
+ $question->setHiddenFallback(false);
+ $newLoginPassword = $this->questionHelper->ask($input, $output, $question);
+
+ $output->write('Start to recover users files... This can take some time...');
+ $this->userManager->get($uid)->setPassword($newLoginPassword, $recoveryPassword);
+ $output->writeln('Done.');
+
+ }
+
+}
diff --git a/apps/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php
index dc3a4d3c4285a..488158929005a 100644
--- a/apps/encryption/lib/Hooks/UserHooks.php
+++ b/apps/encryption/lib/Hooks/UserHooks.php
@@ -28,6 +28,7 @@
use OC\Files\Filesystem;
+use OCP\Encryption\Exceptions\GenericEncryptionException;
use OCP\IUserManager;
use OCP\Util as OCUtil;
use OCA\Encryption\Hooks\Contracts\IHook;
@@ -252,11 +253,12 @@ public function setPassphrase($params) {
}
// Get existing decrypted private key
- $privateKey = $this->session->getPrivateKey();
$user = $this->user->getUser();
// current logged in user changes his own password
- if ($user && $params['uid'] === $user->getUID() && $privateKey) {
+ if ($user && $params['uid'] === $user->getUID()) {
+
+ $privateKey = $this->session->getPrivateKey();
// Encrypt private key with new user pwd as passphrase
$encryptedPrivateKey = $this->crypt->encryptPrivateKey($privateKey, $params['password'], $params['uid']);
@@ -277,6 +279,18 @@ public function setPassphrase($params) {
$this->initMountPoints($user);
$recoveryPassword = isset($params['recoveryPassword']) ? $params['recoveryPassword'] : null;
+ $recoveryKeyId = $this->keyManager->getRecoveryKeyId();
+ $recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId);
+ try {
+ $decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $recoveryPassword);
+ } catch (\Exception $e) {
+ $decryptedRecoveryKey = false;
+ }
+ if ($decryptedRecoveryKey === false) {
+ $message = 'Can not decrypt the recovery key. Maybe you provided the wrong password. Try again.';
+ throw new GenericEncryptionException($message, $message);
+ }
+
// we generate new keys if...
// ...we have a recovery password and the user enabled the recovery key
// ...encryption was activated for the first time (no keys exists)
diff --git a/apps/encryption/tests/Hooks/UserHooksTest.php b/apps/encryption/tests/Hooks/UserHooksTest.php
index 91005e2746a2e..b14a1f6a559e8 100644
--- a/apps/encryption/tests/Hooks/UserHooksTest.php
+++ b/apps/encryption/tests/Hooks/UserHooksTest.php
@@ -210,9 +210,9 @@ public function dataTestPreSetPassphrase() {
}
public function testSetPassphrase() {
- $this->sessionMock->expects($this->exactly(4))
+ $this->sessionMock->expects($this->once())
->method('getPrivateKey')
- ->willReturnOnConsecutiveCalls(true, false);
+ ->willReturn(true);
$this->cryptMock->expects($this->exactly(4))
->method('encryptPrivateKey')
@@ -236,7 +236,7 @@ public function testSetPassphrase() {
$this->recoveryMock->expects($this->exactly(3))
->method('isRecoveryEnabledForUser')
- ->with('testUser')
+ ->with('testUser1')
->willReturnOnConsecutiveCalls(true, false);
@@ -257,13 +257,15 @@ public function testSetPassphrase() {
$this->instance->expects($this->exactly(3))->method('initMountPoints');
+ $this->params['uid'] = 'testUser1';
+
// Test first if statement
$this->assertNull($this->instance->setPassphrase($this->params));
// Test Second if conditional
$this->keyManagerMock->expects($this->exactly(2))
->method('userHasKeys')
- ->with('testUser')
+ ->with('testUser1')
->willReturn(true);
$this->assertNull($this->instance->setPassphrase($this->params));
@@ -271,7 +273,7 @@ public function testSetPassphrase() {
// Test third and final if condition
$this->utilMock->expects($this->once())
->method('userHasFiles')
- ->with('testUser')
+ ->with('testUser1')
->willReturn(false);
$this->cryptMock->expects($this->once())
@@ -282,7 +284,7 @@ public function testSetPassphrase() {
$this->recoveryMock->expects($this->once())
->method('recoverUsersFiles')
- ->with('password', 'testUser');
+ ->with('password', 'testUser1');
$this->assertNull($this->instance->setPassphrase($this->params));
}
@@ -297,9 +299,6 @@ public function testSetPassphraseResetUserMode() {
}
public function testSetPasswordNoUser() {
- $this->sessionMock->expects($this->once())
- ->method('getPrivateKey')
- ->willReturn(true);
$userSessionMock = $this->getMockBuilder(IUserSession::class)
->disableOriginalConstructor()
diff --git a/apps/federatedfilesharing/composer/composer/ClassLoader.php b/apps/federatedfilesharing/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/federatedfilesharing/composer/composer/ClassLoader.php
+++ b/apps/federatedfilesharing/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/federatedfilesharing/l10n/nl.js b/apps/federatedfilesharing/l10n/nl.js
index 2f536035cf194..802be9a3504cb 100644
--- a/apps/federatedfilesharing/l10n/nl.js
+++ b/apps/federatedfilesharing/l10n/nl.js
@@ -18,6 +18,7 @@ OC.L10N.register(
"Couldn't establish a federated share, maybe the password was wrong." : "Kon geen gefedereerde share tot stand brengen, misschien was het wachtwoord onjuist.",
"Federated Share request sent, you will receive an invitation. Check your notifications." : "De gefedereerde share aanvraag is verzonden, je ontvangt een uitnodiging. Controleer je meldingen.",
"Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Kon geen gefedereerde share tot stand brengen, waarschijnlijk was de federatieserver te oud (Nextcloud <=9).",
+ "It is not allowed to send federated group shares from this server." : "Het is niet toegestaan om gefedereerde groepsshares vanaf deze server te versturen.",
"Sharing %s failed, because this item is already shared with %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s",
"Not allowed to create a federated share with the same user" : "Het is niet toegestaan om een gefedereerde share met dezelfde gebruikersserver te maken",
"File is already shared with %s" : "Bestand is al gedeeld met %s",
@@ -33,11 +34,14 @@ OC.L10N.register(
"Share with me through my #Nextcloud Federated Cloud ID" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud ID",
"Sharing" : "Delen",
"Federated file sharing" : "Gefedereerd delen",
+ "Provide federated file sharing across servers" : "Maak gefedereerd bestanden delen mogelijk over servers heen.",
"Federated Cloud Sharing" : "Federated Cloud Sharing",
"Open documentation" : "Open documentatie",
"Adjust how people can share between servers." : "Aanpassen hoe mensen tussen servers kunnen delen.",
"Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers",
"Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers",
+ "Allow users on this server to send shares to groups on other servers" : "Sta gebruikers op deze server toe om shares naar groepen op andere servers te delen",
+ "Allow users on this server to receive group shares from other servers" : "Sta gebruikers op deze server toe om shares van groepen op andere servers te ontvangen",
"Search global and public address book for users" : "Doorzoeken van openbare adresboeken voor gebruikers",
"Allow users to publish their data to a global and public address book" : "Publiek maken van data met een openbaar adresboek toestaan",
"Federated Cloud" : "Gefedereerde Cloud",
diff --git a/apps/federatedfilesharing/l10n/nl.json b/apps/federatedfilesharing/l10n/nl.json
index 328087c4ece68..293c1ec956723 100644
--- a/apps/federatedfilesharing/l10n/nl.json
+++ b/apps/federatedfilesharing/l10n/nl.json
@@ -16,6 +16,7 @@
"Couldn't establish a federated share, maybe the password was wrong." : "Kon geen gefedereerde share tot stand brengen, misschien was het wachtwoord onjuist.",
"Federated Share request sent, you will receive an invitation. Check your notifications." : "De gefedereerde share aanvraag is verzonden, je ontvangt een uitnodiging. Controleer je meldingen.",
"Couldn't establish a federated share, it looks like the server to federate with is too old (Nextcloud <= 9)." : "Kon geen gefedereerde share tot stand brengen, waarschijnlijk was de federatieserver te oud (Nextcloud <=9).",
+ "It is not allowed to send federated group shares from this server." : "Het is niet toegestaan om gefedereerde groepsshares vanaf deze server te versturen.",
"Sharing %s failed, because this item is already shared with %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s",
"Not allowed to create a federated share with the same user" : "Het is niet toegestaan om een gefedereerde share met dezelfde gebruikersserver te maken",
"File is already shared with %s" : "Bestand is al gedeeld met %s",
@@ -31,11 +32,14 @@
"Share with me through my #Nextcloud Federated Cloud ID" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud ID",
"Sharing" : "Delen",
"Federated file sharing" : "Gefedereerd delen",
+ "Provide federated file sharing across servers" : "Maak gefedereerd bestanden delen mogelijk over servers heen.",
"Federated Cloud Sharing" : "Federated Cloud Sharing",
"Open documentation" : "Open documentatie",
"Adjust how people can share between servers." : "Aanpassen hoe mensen tussen servers kunnen delen.",
"Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers",
"Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers",
+ "Allow users on this server to send shares to groups on other servers" : "Sta gebruikers op deze server toe om shares naar groepen op andere servers te delen",
+ "Allow users on this server to receive group shares from other servers" : "Sta gebruikers op deze server toe om shares van groepen op andere servers te ontvangen",
"Search global and public address book for users" : "Doorzoeken van openbare adresboeken voor gebruikers",
"Allow users to publish their data to a global and public address book" : "Publiek maken van data met een openbaar adresboek toestaan",
"Federated Cloud" : "Gefedereerde Cloud",
diff --git a/apps/federation/composer/composer/ClassLoader.php b/apps/federation/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/federation/composer/composer/ClassLoader.php
+++ b/apps/federation/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/federation/l10n/nl.js b/apps/federation/l10n/nl.js
index ccf2007167493..ef290e928eebe 100644
--- a/apps/federation/l10n/nl.js
+++ b/apps/federation/l10n/nl.js
@@ -6,6 +6,7 @@ OC.L10N.register(
"No server to federate with found" : "Geen server gevonden om mee te federeren",
"Could not add server" : "Kon server niet toevoegen",
"Federation" : "Federatie",
+ "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federatie maakt het mogelijk om te verbinden met andere vertrouwde servers om de gebuikersadministratie te delen.",
"Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federatie maakt het mogelijk om te verbinden met vertrouwde servers en de gebuikersadministratie te delen. Zo kun je automatisch externe gebruikers toevoegen voor federatief delen.",
"Trusted servers" : "Vertrouwde servers",
"Add server automatically once a federated share was created successfully" : "Voeg server automatisch toe zodra een gefedereerde share succesvol gecreëerd is",
diff --git a/apps/federation/l10n/nl.json b/apps/federation/l10n/nl.json
index cb697c41ce91d..98d15e51213e1 100644
--- a/apps/federation/l10n/nl.json
+++ b/apps/federation/l10n/nl.json
@@ -4,6 +4,7 @@
"No server to federate with found" : "Geen server gevonden om mee te federeren",
"Could not add server" : "Kon server niet toevoegen",
"Federation" : "Federatie",
+ "Federation allows you to connect with other trusted servers to exchange the user directory." : "Federatie maakt het mogelijk om te verbinden met andere vertrouwde servers om de gebuikersadministratie te delen.",
"Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federatie maakt het mogelijk om te verbinden met vertrouwde servers en de gebuikersadministratie te delen. Zo kun je automatisch externe gebruikers toevoegen voor federatief delen.",
"Trusted servers" : "Vertrouwde servers",
"Add server automatically once a federated share was created successfully" : "Voeg server automatisch toe zodra een gefedereerde share succesvol gecreëerd is",
diff --git a/apps/files/composer/composer/ClassLoader.php b/apps/files/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/files/composer/composer/ClassLoader.php
+++ b/apps/files/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 3623663ed6c8e..8ce8eddb0b052 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -558,7 +558,27 @@
}
});
- this._renderMenuTrigger($tr, context);
+ function objectValues(obj) {
+ var res = [];
+ for (var i in obj) {
+ if (obj.hasOwnProperty(i)) {
+ res.push(obj[i]);
+ }
+ }
+ return res;
+ }
+ // polyfill
+ if (!Object.values) {
+ Object.values = objectValues;
+ }
+
+ var menuActions = Object.values(this.actions.all).filter(function (action) {
+ return action.type !== OCA.Files.FileActions.TYPE_INLINE;
+ });
+ // do not render the menu if nothing is in it
+ if (menuActions.length > 0) {
+ this._renderMenuTrigger($tr, context);
+ }
if (triggerEvent){
fileList.$fileList.trigger(jQuery.Event("fileActionsReady", {fileList: fileList, $files: $tr}));
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 8e7c60551a162..8fb8a02181127 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1738,7 +1738,7 @@
}
}
- if (persist) {
+ if (persist && OC.getCurrentUser().uid) {
$.post(OC.generateUrl('/apps/files/api/v1/sorting'), {
mode: sort,
direction: direction
diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
index 430341de265ee..e7151e29a1afb 100644
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@@ -11,7 +11,7 @@ OC.L10N.register(
"Move or copy" : "Mover o copiar",
"Download" : "Descargar",
"Delete" : "Eliminar",
- "Home" : "Particular",
+ "Home" : "Inicio",
"Close" : "Cerrar",
"Could not create folder \"{dir}\"" : "No se pudo crear la carpeta \"{dir}\"",
"Upload cancelled." : "Subida cancelada.",
@@ -22,13 +22,13 @@ OC.L10N.register(
"Uploading …" : "Subiendo...",
"…" : "...",
"{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
- "Uploading that item is not supported" : "Subir ese objeto no está soportado",
- "Target folder does not exist any more" : "La carpeta destino yano existe",
+ "Uploading that item is not supported" : "Subir este archivo no es compatible",
+ "Target folder does not exist any more" : "La carpeta destino ya no existe",
"Error when assembling chunks, status code {status}" : "Error al reunir las partes, código de estado {status}",
"Actions" : "Acciones",
"Rename" : "Renombrar",
"Copy" : "Copiar",
- "Target folder" : "Directorio destino",
+ "Target folder" : "Directorio de destino",
"Disconnect storage" : "Desconectar almacenamiento",
"Unshare" : "Dejar de compartir",
"Could not load info for file \"{file}\"" : "No se ha podido cargar información para el archivo \"{file}\"",
@@ -38,16 +38,16 @@ OC.L10N.register(
"Pending" : "Pendiente",
"Unable to determine date" : "No se ha podido determinar la fecha",
"This operation is forbidden" : "Esta operación está prohibida",
- "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contáctese con el administrador",
- "Could not move \"{file}\", target exists" : "No se pudo mover \"{file}\", destino ya existe",
+ "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contacte con el administrador",
+ "Could not move \"{file}\", target exists" : "No se pudo mover \"{file}\", ya existe",
"Could not move \"{file}\"" : "No se pudo mover \"{file}\"",
"Could not copy \"{file}\", target exists" : "No se ha podido copiar \"{file}\", ya existe el destino",
"Could not copy \"{file}\"" : "No se ha podido copiar \"{file}\"",
"Copied {origin} inside {destination}" : "Se ha copiado {origin} dentro de {destination}",
- "Copied {origin} and {nbfiles} other files inside {destination}" : "Se han copiado {origini} y {nbfiles} otros archivos dentro de {destination}",
+ "Copied {origin} and {nbfiles} other files inside {destination}" : "Se han copiado {origin} y {nbfiles} otros archivos dentro de {destination}",
"{newName} already exists" : "{newName} ya existe",
"Could not rename \"{fileName}\", it does not exist any more" : "No se pudo renombrar \"{fileName}\", ya no existe",
- "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "El nombre \"{targetName}\" ya se utiliza en la carpeta \"{dir}\". Por favor elija un nombre diferente.",
+ "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "El nombre \"{targetName}\" ya está en uso en la carpeta \"{dir}\". Por favor elija un nombre diferente.",
"Could not rename \"{fileName}\"" : "No se pudo renombrar \"{fileName}\"",
"Could not create file \"{file}\"" : "No se pudo crear archivo \"{file}\"",
"Could not create file \"{file}\" because it already exists" : "No se pudo crear archivo \"{file}\" porque ya existe",
@@ -68,12 +68,12 @@ OC.L10N.register(
"{used} used" : "{used} usados",
"\"{name}\" is an invalid file name." : "\"{name}\" es un nombre de archivo inválido.",
"File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
- "\"/\" is not allowed inside a file name." : "\"/\" no se permite dentro de un nombre de archivo.",
+ "\"/\" is not allowed inside a file name." : "\"/\" no se permite en un nombre de archivo.",
"\"{name}\" is not an allowed filetype" : "\"{name}\" no es un tipo de archivo permitido",
- "Storage of {owner} is full, files can not be updated or synced anymore!" : "El almacén de {owner} está repleto, ¡los archivos no se actualizarán ni sincronizarán más!",
- "Your storage is full, files can not be updated or synced anymore!" : "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
- "Storage of {owner} is almost full ({usedSpacePercent}%)" : "El almacén de {owner} está casi lleno en un ({usedSpacePercent}%)",
- "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
+ "Storage of {owner} is full, files can not be updated or synced anymore!" : "El espacio de {owner} está lleno, ¡no se subirán ni se sincronizarán más archivos!",
+ "Your storage is full, files can not be updated or synced anymore!" : "Tu espacio está lleno, ¡no se subirán ni se sincronizarán más archivos!",
+ "Storage of {owner} is almost full ({usedSpacePercent}%)" : "El espacio de {owner} está casi lleno en un ({usedSpacePercent}%)",
+ "Your storage is almost full ({usedSpacePercent}%)" : "Tu espacio está casi lleno, ({usedSpacePercent}%)",
"_matches '{filter}'_::_match '{filter}'_" : ["coincidencias '{filter}'","coincidencia '{filter}'"],
"View in folder" : "Ver en carpeta",
"Copied!" : "¡Copiado!",
@@ -84,17 +84,17 @@ OC.L10N.register(
"Favorite" : "Favorito",
"New folder" : "Nueva carpeta",
"Upload file" : "Subir archivo",
- "Not favorited" : "No marcado como favorito",
+ "Not favorited" : "Quitado como favorito",
"Remove from favorites" : "Eliminar de favoritos",
"Add to favorites" : "Añadir a favoritos",
"An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas",
"Added to favorites" : "Agregado a favoritos",
"Removed from favorites" : "Borrado de favoritos",
- "You added {file} to your favorites" : "Agregado {file} a tus favoritos",
- "You removed {file} from your favorites" : "Borrado {file} de tus favoritos",
+ "You added {file} to your favorites" : "Has agregado {file} a tus favoritos",
+ "You removed {file} from your favorites" : "Has borrado {file} de tus favoritos",
"File changes" : "Cambios del archivo",
"Created by {user}" : "Creado por {user}",
- "Changed by {user}" : "Cambiado por {user}",
+ "Changed by {user}" : "Modificado por {user}",
"Deleted by {user}" : "Borrado por {user}",
"Restored by {user}" : "Restaurado por {user}",
"Renamed by {user}" : "Renombrado por {user}",
@@ -105,34 +105,34 @@ OC.L10N.register(
"{user} created {file}" : "{user} ha creado {file}",
"{user} created an encrypted file in {file}" : "{user} ha creado un archivo cifrado en {file}",
"{file} was created in a public folder" : "{file} se ha creado en una carpeta pública",
- "You changed {file}" : "Usted ha cambiado {file}",
+ "You changed {file}" : "Has cambiado {file}",
"You changed an encrypted file in {file}" : "Has modificado un archivo cifrado en {file}",
"{user} changed {file}" : "{user} ha cambiado {file}",
"{user} changed an encrypted file in {file}" : "{user} ha modificado un archivo cifrado en {file}",
- "You deleted {file}" : "Usted ha borrado {file}",
+ "You deleted {file}" : "Has borrado {file}",
"You deleted an encrypted file in {file}" : "Has borrado un archivo cifrado en {file}",
"{user} deleted {file}" : "{user} eliminó {file}",
"{user} deleted an encrypted file in {file}" : "{user} ha borrado un archivo cifrado en {file}",
- "You restored {file}" : "Usted restauró {file}",
+ "You restored {file}" : "Has restaurado {file}",
"{user} restored {file}" : "{user} restauró {file}",
- "You renamed {oldfile} to {newfile}" : "Ha renombrado {oldfile} como {newfile}",
- "{user} renamed {oldfile} to {newfile}" : "{user} ha renombrado {oldfile } como {newfile}",
- "You moved {oldfile} to {newfile}" : "Ha movido {oldfile } a {newfile}",
+ "You renamed {oldfile} to {newfile}" : "Has renombrado {oldfile} como {newfile}",
+ "{user} renamed {oldfile} to {newfile}" : "{user} ha renombrado {oldfile} a {newfile}",
+ "You moved {oldfile} to {newfile}" : "Has movido {oldfile} a {newfile}",
"{user} moved {oldfile} to {newfile}" : "{user} movió {oldfile} a {newfile}",
"A file has been added to or removed from your favorites" : "Un archivo fue agregado o borrado de tus favoritos",
"A file or folder has been changed or renamed" : "Un archivo o carpeta ha sido cambiado o renombrado",
"A new file or folder has been created" : "Se ha creado un nuevo archivo o carpeta",
"A file or folder has been deleted" : "Un archivo o carpeta ha sido eliminado",
- "Limit notifications about creation and changes to your favorite files(Stream only)" : "Limitar las notificaciones acerca de la creación y cambios de sus archivos favoritos(solo flujos)",
+ "Limit notifications about creation and changes to your favorite files(Stream only)" : "Limitar las notificaciones sobre la creación y cambios en tus archivos favoritos(solo transmisión)",
"A file or folder has been restored" : "Un archivo o carpeta ha sido restaurado",
"Unlimited" : "Ilimitado",
"Upload (max. %s)" : "Subida (máx. %s)",
- "File Management" : "Manejo de archivos",
- "File handling" : "Administración de archivos",
- "Maximum upload size" : "Tamaño máximo de subida",
- "max. possible: " : "máx. posible:",
+ "File Management" : "Gestión de archivos",
+ "File handling" : "Manejo de archivos",
+ "Maximum upload size" : "Tamaño de subida máximo ",
+ "max. possible: " : "máx. posible: ",
"Save" : "Guardar",
- "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tardar 5 minutos para que se realicen los cambios.",
+ "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tardar hasta 5 minutos en realizarse los cambios.",
"Missing permissions to edit from here." : "Faltan permisos para poder editar desde aquí.",
"%s of %s used" : "%s de %s usado",
"%s used" : "usado %s",
@@ -148,16 +148,16 @@ OC.L10N.register(
"Upload too large" : "Subida demasido grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que está intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
"No favorites yet" : "Aún no hay favoritos",
- "Files and folders you mark as favorite will show up here" : "Aquí aparecerán los archivos y carpetas que usted marque como favoritos",
+ "Files and folders you mark as favorite will show up here" : "Aquí aparecerán los archivos y carpetas que has marcado como favoritos",
"Tags" : "Etiquetas",
"Deleted files" : "Archivos eliminados",
"Shares" : "Archivos compartidos",
"Shared with others" : "Compartido con otros",
- "Shared with you" : "Compartido contigo",
+ "Shared with you" : "Compartido conmigo",
"Shared by link" : "Compartido por enlace",
"Deleted shares" : "Recursos compartidos eliminados",
"Text file" : "Archivo de texto",
- "New text file.txt" : "Nuevo archivo de texto.txt",
+ "New text file.txt" : "Nuevo archivo.txt",
"Move" : "Mover",
"A new file or folder has been deleted" : "Se ha borrado un nuevo archivo o carpeta",
"A new file or folder has been restored" : "Se ha restaurado un nuevo archivo o carpeta",
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
index 3c0ac01154547..3491963af57ed 100644
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@@ -9,7 +9,7 @@
"Move or copy" : "Mover o copiar",
"Download" : "Descargar",
"Delete" : "Eliminar",
- "Home" : "Particular",
+ "Home" : "Inicio",
"Close" : "Cerrar",
"Could not create folder \"{dir}\"" : "No se pudo crear la carpeta \"{dir}\"",
"Upload cancelled." : "Subida cancelada.",
@@ -20,13 +20,13 @@
"Uploading …" : "Subiendo...",
"…" : "...",
"{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} de {totalSize} ({bitrate})",
- "Uploading that item is not supported" : "Subir ese objeto no está soportado",
- "Target folder does not exist any more" : "La carpeta destino yano existe",
+ "Uploading that item is not supported" : "Subir este archivo no es compatible",
+ "Target folder does not exist any more" : "La carpeta destino ya no existe",
"Error when assembling chunks, status code {status}" : "Error al reunir las partes, código de estado {status}",
"Actions" : "Acciones",
"Rename" : "Renombrar",
"Copy" : "Copiar",
- "Target folder" : "Directorio destino",
+ "Target folder" : "Directorio de destino",
"Disconnect storage" : "Desconectar almacenamiento",
"Unshare" : "Dejar de compartir",
"Could not load info for file \"{file}\"" : "No se ha podido cargar información para el archivo \"{file}\"",
@@ -36,16 +36,16 @@
"Pending" : "Pendiente",
"Unable to determine date" : "No se ha podido determinar la fecha",
"This operation is forbidden" : "Esta operación está prohibida",
- "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contáctese con el administrador",
- "Could not move \"{file}\", target exists" : "No se pudo mover \"{file}\", destino ya existe",
+ "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contacte con el administrador",
+ "Could not move \"{file}\", target exists" : "No se pudo mover \"{file}\", ya existe",
"Could not move \"{file}\"" : "No se pudo mover \"{file}\"",
"Could not copy \"{file}\", target exists" : "No se ha podido copiar \"{file}\", ya existe el destino",
"Could not copy \"{file}\"" : "No se ha podido copiar \"{file}\"",
"Copied {origin} inside {destination}" : "Se ha copiado {origin} dentro de {destination}",
- "Copied {origin} and {nbfiles} other files inside {destination}" : "Se han copiado {origini} y {nbfiles} otros archivos dentro de {destination}",
+ "Copied {origin} and {nbfiles} other files inside {destination}" : "Se han copiado {origin} y {nbfiles} otros archivos dentro de {destination}",
"{newName} already exists" : "{newName} ya existe",
"Could not rename \"{fileName}\", it does not exist any more" : "No se pudo renombrar \"{fileName}\", ya no existe",
- "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "El nombre \"{targetName}\" ya se utiliza en la carpeta \"{dir}\". Por favor elija un nombre diferente.",
+ "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "El nombre \"{targetName}\" ya está en uso en la carpeta \"{dir}\". Por favor elija un nombre diferente.",
"Could not rename \"{fileName}\"" : "No se pudo renombrar \"{fileName}\"",
"Could not create file \"{file}\"" : "No se pudo crear archivo \"{file}\"",
"Could not create file \"{file}\" because it already exists" : "No se pudo crear archivo \"{file}\" porque ya existe",
@@ -66,12 +66,12 @@
"{used} used" : "{used} usados",
"\"{name}\" is an invalid file name." : "\"{name}\" es un nombre de archivo inválido.",
"File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
- "\"/\" is not allowed inside a file name." : "\"/\" no se permite dentro de un nombre de archivo.",
+ "\"/\" is not allowed inside a file name." : "\"/\" no se permite en un nombre de archivo.",
"\"{name}\" is not an allowed filetype" : "\"{name}\" no es un tipo de archivo permitido",
- "Storage of {owner} is full, files can not be updated or synced anymore!" : "El almacén de {owner} está repleto, ¡los archivos no se actualizarán ni sincronizarán más!",
- "Your storage is full, files can not be updated or synced anymore!" : "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
- "Storage of {owner} is almost full ({usedSpacePercent}%)" : "El almacén de {owner} está casi lleno en un ({usedSpacePercent}%)",
- "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
+ "Storage of {owner} is full, files can not be updated or synced anymore!" : "El espacio de {owner} está lleno, ¡no se subirán ni se sincronizarán más archivos!",
+ "Your storage is full, files can not be updated or synced anymore!" : "Tu espacio está lleno, ¡no se subirán ni se sincronizarán más archivos!",
+ "Storage of {owner} is almost full ({usedSpacePercent}%)" : "El espacio de {owner} está casi lleno en un ({usedSpacePercent}%)",
+ "Your storage is almost full ({usedSpacePercent}%)" : "Tu espacio está casi lleno, ({usedSpacePercent}%)",
"_matches '{filter}'_::_match '{filter}'_" : ["coincidencias '{filter}'","coincidencia '{filter}'"],
"View in folder" : "Ver en carpeta",
"Copied!" : "¡Copiado!",
@@ -82,17 +82,17 @@
"Favorite" : "Favorito",
"New folder" : "Nueva carpeta",
"Upload file" : "Subir archivo",
- "Not favorited" : "No marcado como favorito",
+ "Not favorited" : "Quitado como favorito",
"Remove from favorites" : "Eliminar de favoritos",
"Add to favorites" : "Añadir a favoritos",
"An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas",
"Added to favorites" : "Agregado a favoritos",
"Removed from favorites" : "Borrado de favoritos",
- "You added {file} to your favorites" : "Agregado {file} a tus favoritos",
- "You removed {file} from your favorites" : "Borrado {file} de tus favoritos",
+ "You added {file} to your favorites" : "Has agregado {file} a tus favoritos",
+ "You removed {file} from your favorites" : "Has borrado {file} de tus favoritos",
"File changes" : "Cambios del archivo",
"Created by {user}" : "Creado por {user}",
- "Changed by {user}" : "Cambiado por {user}",
+ "Changed by {user}" : "Modificado por {user}",
"Deleted by {user}" : "Borrado por {user}",
"Restored by {user}" : "Restaurado por {user}",
"Renamed by {user}" : "Renombrado por {user}",
@@ -103,34 +103,34 @@
"{user} created {file}" : "{user} ha creado {file}",
"{user} created an encrypted file in {file}" : "{user} ha creado un archivo cifrado en {file}",
"{file} was created in a public folder" : "{file} se ha creado en una carpeta pública",
- "You changed {file}" : "Usted ha cambiado {file}",
+ "You changed {file}" : "Has cambiado {file}",
"You changed an encrypted file in {file}" : "Has modificado un archivo cifrado en {file}",
"{user} changed {file}" : "{user} ha cambiado {file}",
"{user} changed an encrypted file in {file}" : "{user} ha modificado un archivo cifrado en {file}",
- "You deleted {file}" : "Usted ha borrado {file}",
+ "You deleted {file}" : "Has borrado {file}",
"You deleted an encrypted file in {file}" : "Has borrado un archivo cifrado en {file}",
"{user} deleted {file}" : "{user} eliminó {file}",
"{user} deleted an encrypted file in {file}" : "{user} ha borrado un archivo cifrado en {file}",
- "You restored {file}" : "Usted restauró {file}",
+ "You restored {file}" : "Has restaurado {file}",
"{user} restored {file}" : "{user} restauró {file}",
- "You renamed {oldfile} to {newfile}" : "Ha renombrado {oldfile} como {newfile}",
- "{user} renamed {oldfile} to {newfile}" : "{user} ha renombrado {oldfile } como {newfile}",
- "You moved {oldfile} to {newfile}" : "Ha movido {oldfile } a {newfile}",
+ "You renamed {oldfile} to {newfile}" : "Has renombrado {oldfile} como {newfile}",
+ "{user} renamed {oldfile} to {newfile}" : "{user} ha renombrado {oldfile} a {newfile}",
+ "You moved {oldfile} to {newfile}" : "Has movido {oldfile} a {newfile}",
"{user} moved {oldfile} to {newfile}" : "{user} movió {oldfile} a {newfile}",
"A file has been added to or removed from your favorites" : "Un archivo fue agregado o borrado de tus favoritos",
"A file or folder has been changed or renamed" : "Un archivo o carpeta ha sido cambiado o renombrado",
"A new file or folder has been created" : "Se ha creado un nuevo archivo o carpeta",
"A file or folder has been deleted" : "Un archivo o carpeta ha sido eliminado",
- "Limit notifications about creation and changes to your favorite files(Stream only)" : "Limitar las notificaciones acerca de la creación y cambios de sus archivos favoritos(solo flujos)",
+ "Limit notifications about creation and changes to your favorite files(Stream only)" : "Limitar las notificaciones sobre la creación y cambios en tus archivos favoritos(solo transmisión)",
"A file or folder has been restored" : "Un archivo o carpeta ha sido restaurado",
"Unlimited" : "Ilimitado",
"Upload (max. %s)" : "Subida (máx. %s)",
- "File Management" : "Manejo de archivos",
- "File handling" : "Administración de archivos",
- "Maximum upload size" : "Tamaño máximo de subida",
- "max. possible: " : "máx. posible:",
+ "File Management" : "Gestión de archivos",
+ "File handling" : "Manejo de archivos",
+ "Maximum upload size" : "Tamaño de subida máximo ",
+ "max. possible: " : "máx. posible: ",
"Save" : "Guardar",
- "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tardar 5 minutos para que se realicen los cambios.",
+ "With PHP-FPM it might take 5 minutes for changes to be applied." : "Con PHP-FPM podría tardar hasta 5 minutos en realizarse los cambios.",
"Missing permissions to edit from here." : "Faltan permisos para poder editar desde aquí.",
"%s of %s used" : "%s de %s usado",
"%s used" : "usado %s",
@@ -146,16 +146,16 @@
"Upload too large" : "Subida demasido grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que está intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
"No favorites yet" : "Aún no hay favoritos",
- "Files and folders you mark as favorite will show up here" : "Aquí aparecerán los archivos y carpetas que usted marque como favoritos",
+ "Files and folders you mark as favorite will show up here" : "Aquí aparecerán los archivos y carpetas que has marcado como favoritos",
"Tags" : "Etiquetas",
"Deleted files" : "Archivos eliminados",
"Shares" : "Archivos compartidos",
"Shared with others" : "Compartido con otros",
- "Shared with you" : "Compartido contigo",
+ "Shared with you" : "Compartido conmigo",
"Shared by link" : "Compartido por enlace",
"Deleted shares" : "Recursos compartidos eliminados",
"Text file" : "Archivo de texto",
- "New text file.txt" : "Nuevo archivo de texto.txt",
+ "New text file.txt" : "Nuevo archivo.txt",
"Move" : "Mover",
"A new file or folder has been deleted" : "Se ha borrado un nuevo archivo o carpeta",
"A new file or folder has been restored" : "Se ha restaurado un nuevo archivo o carpeta",
diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js
index cac464a5ecbdf..0bc902fb11e05 100644
--- a/apps/files/l10n/nl.js
+++ b/apps/files/l10n/nl.js
@@ -22,6 +22,7 @@ OC.L10N.register(
"Uploading …" : "Uploaden …",
"…" : "...",
"{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} van {totalSize} ({bitrate})",
+ "Uploading that item is not supported" : "Uploaden van dat object is niet ondersteund",
"Target folder does not exist any more" : "Doelmap bestaat niet meer",
"Error when assembling chunks, status code {status}" : "Fout tijdens samenvoegen van brokken, status code {status}",
"Actions" : "Acties",
diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json
index 9e402aeb4bf06..54270cfdceccd 100644
--- a/apps/files/l10n/nl.json
+++ b/apps/files/l10n/nl.json
@@ -20,6 +20,7 @@
"Uploading …" : "Uploaden …",
"…" : "...",
"{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} van {totalSize} ({bitrate})",
+ "Uploading that item is not supported" : "Uploaden van dat object is niet ondersteund",
"Target folder does not exist any more" : "Doelmap bestaat niet meer",
"Error when assembling chunks, status code {status}" : "Fout tijdens samenvoegen van brokken, status code {status}",
"Actions" : "Acties",
diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js
index b8b6977d59109..d2e1665b85c19 100644
--- a/apps/files/l10n/zh_CN.js
+++ b/apps/files/l10n/zh_CN.js
@@ -1,7 +1,7 @@
OC.L10N.register(
"files",
{
- "Storage is temporarily not available" : "库文件 %s 不可用",
+ "Storage is temporarily not available" : "存储暂时不可用",
"Storage invalid" : "存储空间无效",
"Unknown error" : "未知错误",
"All files" : "全部文件",
@@ -22,6 +22,7 @@ OC.L10N.register(
"Uploading …" : "上传中…",
"…" : "…",
"{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} / {totalSize} ({bitrate})",
+ "Uploading that item is not supported" : "不支持上传此项目",
"Target folder does not exist any more" : "目标文件夹不存在",
"Error when assembling chunks, status code {status}" : "组装块时发生错误，状态码 {status}",
"Actions" : "操作",
@@ -122,6 +123,7 @@ OC.L10N.register(
"A file or folder has been restored" : "文件/文件夹已恢复",
"Unlimited" : "无限制",
"Upload (max. %s)" : "上传 (最大 %s)",
+ "File Management" : "文件管理",
"File handling" : "文件处理",
"Maximum upload size" : "最大上传大小",
"max. possible: " : "最大允许: ",
@@ -133,6 +135,7 @@ OC.L10N.register(
"Settings" : "设置",
"Show hidden files" : "显示隐藏文件",
"WebDAV" : "WebDAV",
+ "Use this address to access your Files via WebDAV" : "使用这个地址 通过 WebDAV 访问您的文件",
"Cancel upload" : "取消上传",
"No files in here" : "无文件",
"Upload some content or sync with your devices!" : "上传或从您的设备中同步!",
@@ -144,11 +147,14 @@ OC.L10N.register(
"Files and folders you mark as favorite will show up here" : "收藏的文件和文件夹会在这里显示",
"Tags" : "标签",
"Deleted files" : "已删除的文件",
+ "Shares" : "共享",
"Shared with others" : "与他人共享",
"Shared with you" : "与您共享",
"Shared by link" : "通过链接共享",
+ "Deleted shares" : "已删除的共享",
"Text file" : "文本文件",
"New text file.txt" : "新建文本文件.txt",
- "Move" : "移动"
+ "Move" : "移动",
+ "Use this address to access your Files via WebDAV" : "使用这个地址 通过 WebDAV 访问您的文件"
},
"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
index 3a68c373299a7..46b033cecd16c 100644
--- a/apps/files/l10n/zh_CN.json
+++ b/apps/files/l10n/zh_CN.json
@@ -1,5 +1,5 @@
{ "translations": {
- "Storage is temporarily not available" : "库文件 %s 不可用",
+ "Storage is temporarily not available" : "存储暂时不可用",
"Storage invalid" : "存储空间无效",
"Unknown error" : "未知错误",
"All files" : "全部文件",
@@ -20,6 +20,7 @@
"Uploading …" : "上传中…",
"…" : "…",
"{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} / {totalSize} ({bitrate})",
+ "Uploading that item is not supported" : "不支持上传此项目",
"Target folder does not exist any more" : "目标文件夹不存在",
"Error when assembling chunks, status code {status}" : "组装块时发生错误，状态码 {status}",
"Actions" : "操作",
@@ -120,6 +121,7 @@
"A file or folder has been restored" : "文件/文件夹已恢复",
"Unlimited" : "无限制",
"Upload (max. %s)" : "上传 (最大 %s)",
+ "File Management" : "文件管理",
"File handling" : "文件处理",
"Maximum upload size" : "最大上传大小",
"max. possible: " : "最大允许: ",
@@ -131,6 +133,7 @@
"Settings" : "设置",
"Show hidden files" : "显示隐藏文件",
"WebDAV" : "WebDAV",
+ "Use this address to access your Files via WebDAV" : "使用这个地址 通过 WebDAV 访问您的文件",
"Cancel upload" : "取消上传",
"No files in here" : "无文件",
"Upload some content or sync with your devices!" : "上传或从您的设备中同步!",
@@ -142,11 +145,14 @@
"Files and folders you mark as favorite will show up here" : "收藏的文件和文件夹会在这里显示",
"Tags" : "标签",
"Deleted files" : "已删除的文件",
+ "Shares" : "共享",
"Shared with others" : "与他人共享",
"Shared with you" : "与您共享",
"Shared by link" : "通过链接共享",
+ "Deleted shares" : "已删除的共享",
"Text file" : "文本文件",
"New text file.txt" : "新建文本文件.txt",
- "Move" : "移动"
+ "Move" : "移动",
+ "Use this address to access your Files via WebDAV" : "使用这个地址 通过 WebDAV 访问您的文件"
},"pluralForm" :"nplurals=1; plural=0;"
}
\ No newline at end of file
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 7947dd91f2d9b..50b336902b965 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -2614,6 +2614,20 @@ describe('OCA.Files.FileList tests', function() {
});
});
describe('Sorting files', function() {
+
+ var getCurrentUserStub;
+
+ beforeEach(function() {
+ getCurrentUserStub = sinon.stub(OC, 'getCurrentUser').returns({
+ uid: 1,
+ displayName: 'user1'
+ });
+ });
+
+ afterEach(function() {
+ getCurrentUserStub.restore();
+ });
+
it('Toggles the sort indicator when clicking on a column header', function() {
var ASC_CLASS = fileList.SORT_INDICATOR_ASC_CLASS;
var DESC_CLASS = fileList.SORT_INDICATOR_DESC_CLASS;
@@ -2739,6 +2753,23 @@ describe('OCA.Files.FileList tests', function() {
sortStub.restore();
});
+
+ describe('if no user logged in', function() {
+ beforeEach(function() {
+ getCurrentUserStub.returns({
+ uid: null,
+ displayName: 'Guest'
+ });
+ });
+
+ it('shouldn\'t send an update sort order request', function() {
+ OC.currentUser = false;
+ fileList.$el.find('.column-size .columntitle').click();
+ // check if there was no request
+ expect(fakeServer.requests.length).toEqual(0);
+ });
+ });
+
describe('with favorites', function() {
it('shows favorite files on top', function() {
testFiles.push(new FileInfo({
diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php
index 9c0e69103099f..6ed048455cc2c 100644
--- a/apps/files_external/lib/Lib/Storage/SMB.php
+++ b/apps/files_external/lib/Lib/Storage/SMB.php
@@ -78,6 +78,9 @@ class SMB extends Common implements INotifyStorage {
*/
protected $statCache;
+ /** @var ILogger */
+ protected $logger;
+
public function __construct($params) {
if (!isset($params['host'])) {
throw new \Exception('Invalid configuration, no host provided');
@@ -92,6 +95,12 @@ public function __construct($params) {
throw new \Exception('Invalid configuration, no credentials provided');
}
+ if (isset($params['logger'])) {
+ $this->logger = $params['logger'];
+ } else {
+ $this->logger = \OC::$server->getLogger();
+ }
+
$serverFactory = new ServerFactory();
$this->server = $serverFactory->createServer($params['host'], $auth);
$this->share = $this->server->getShare(trim($params['share'], '/'));
@@ -155,7 +164,7 @@ protected function getFileInfo($path) {
}
return $this->statCache[$path];
} catch (ConnectException $e) {
- \OC::$server->getLogger()->logException($e, ['message' => 'Error while getting file info']);
+ $this->logger->logException($e, ['message' => 'Error while getting file info']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
}
}
@@ -174,15 +183,20 @@ protected function getFolderContents($path) {
}
return array_filter($files, function (IFileInfo $file) {
try {
+ if ($file->isHidden()) {
+ $this->logger->debug('hiding hidden file ' . $file->getName());
+ }
return !$file->isHidden();
} catch (ForbiddenException $e) {
+ $this->logger->logException($e, ['level' => ILogger::DEBUG, 'message' => 'Hiding forbidden entry ' . $file->getName()]);
return false;
} catch (NotFoundException $e) {
+ $this->logger->logException($e, ['level' => ILogger::DEBUG, 'message' => 'Hiding not found entry ' . $file->getName()]);
return false;
}
});
} catch (ConnectException $e) {
- \OC::$server->getLogger()->logException($e, ['message' => 'Error while getting folder content']);
+ $this->logger->logException($e, ['message' => 'Error while getting folder content']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
}
}
@@ -225,7 +239,7 @@ public function rename($source, $target, $retry = true) {
$this->remove($target);
$result = $this->share->rename($absoluteSource, $absoluteTarget, false);
} else {
- \OC::$server->getLogger()->logException($e, ['level' => ILogger::WARN]);
+ $this->logger->logException($e, ['level' => ILogger::WARN]);
return false;
}
} catch (InvalidArgumentException $e) {
@@ -233,11 +247,11 @@ public function rename($source, $target, $retry = true) {
$this->remove($target);
$result = $this->share->rename($absoluteSource, $absoluteTarget, false);
} else {
- \OC::$server->getLogger()->logException($e, ['level' => ILogger::WARN]);
+ $this->logger->logException($e, ['level' => ILogger::WARN]);
return false;
}
} catch (\Exception $e) {
- \OC::$server->getLogger()->logException($e, ['level' => ILogger::WARN]);
+ $this->logger->logException($e, ['level' => ILogger::WARN]);
return false;
}
unset($this->statCache[$absoluteSource], $this->statCache[$absoluteTarget]);
@@ -320,7 +334,7 @@ public function unlink($path) {
} catch (ForbiddenException $e) {
return false;
} catch (ConnectException $e) {
- \OC::$server->getLogger()->logException($e, ['message' => 'Error while deleting file']);
+ $this->logger->logException($e, ['message' => 'Error while deleting file']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
}
}
@@ -405,7 +419,7 @@ public function fopen($path, $mode) {
} catch (ForbiddenException $e) {
return false;
} catch (ConnectException $e) {
- \OC::$server->getLogger()->logException($e, ['message' => 'Error while opening file']);
+ $this->logger->logException($e, ['message' => 'Error while opening file']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
}
}
@@ -432,7 +446,7 @@ public function rmdir($path) {
} catch (ForbiddenException $e) {
return false;
} catch (ConnectException $e) {
- \OC::$server->getLogger()->logException($e, ['message' => 'Error while removing folder']);
+ $this->logger->logException($e, ['message' => 'Error while removing folder']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
}
}
@@ -446,7 +460,7 @@ public function touch($path, $time = null) {
}
return false;
} catch (ConnectException $e) {
- \OC::$server->getLogger()->logException($e, ['message' => 'Error while creating file']);
+ $this->logger->logException($e, ['message' => 'Error while creating file']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
}
}
@@ -482,7 +496,7 @@ public function mkdir($path) {
$this->share->mkdir($path);
return true;
} catch (ConnectException $e) {
- \OC::$server->getLogger()->logException($e, ['message' => 'Error while creating folder']);
+ $this->logger->logException($e, ['message' => 'Error while creating folder']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
} catch (Exception $e) {
return false;
@@ -556,7 +570,7 @@ public function test() {
try {
return parent::test();
} catch (Exception $e) {
- \OC::$server->getLogger()->logException($e);
+ $this->logger->logException($e);
return false;
}
}
diff --git a/apps/files_sharing/composer/composer/ClassLoader.php b/apps/files_sharing/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/files_sharing/composer/composer/ClassLoader.php
+++ b/apps/files_sharing/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss
index 583912ad23614..3d6fc62ceba40 100644
--- a/apps/files_sharing/css/public.scss
+++ b/apps/files_sharing/css/public.scss
@@ -1,5 +1,5 @@
#preview {
- background: #fff;
+ background: var(--color-main-background);
text-align: center;
}
diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
index 83790c9ec4fec..14be956222834 100644
--- a/apps/files_sharing/css/sharetabview.scss
+++ b/apps/files_sharing/css/sharetabview.scss
@@ -168,6 +168,7 @@
margin-left: auto;
display: flex;
align-items: center;
+ white-space: nowrap;
// can edit label
> .shareOption > label {
padding: 13px;
@@ -179,8 +180,8 @@
display: block;
.icon-more {
padding: 14px;
- height: 16px;
- width: 16px;
+ height: 44px;
+ width: 44px;
opacity: .5;
display: block;
cursor: pointer;
@@ -196,12 +197,15 @@
}
.username {
padding: 0 8px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
}
.ui-autocomplete {
/* limit dropdown height to 4 1/2 entries */
- max-height: 200px;
+ max-height: calc(36px * 4.5);;
overflow-y: auto;
overflow-x: hidden;
z-index: 1550 !important;
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 0f8dc58a85e93..68529fd882fa4 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -42,14 +42,16 @@
var fileActions = fileList.fileActions;
var oldCreateRow = fileList._createRow;
fileList._createRow = function(fileData) {
+
+ var tr = oldCreateRow.apply(this, arguments);
+ var sharePermissions = OCA.Sharing.Util.getSharePermissions(fileData);
if (fileData.permissions === 0) {
// no permission, disabling sidebar
+ delete fileActions.actions.all.Comment;
delete fileActions.actions.all.Details;
+ delete fileActions.actions.all.Goto;
}
-
- var tr = oldCreateRow.apply(this, arguments);
- var sharePermissions = OCA.Sharing.Util.getSharePermissions(fileData);
tr.attr('data-share-permissions', sharePermissions);
if (fileData.shareOwner) {
tr.attr('data-share-owner', fileData.shareOwner);
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 5487ee07c98ff..d2debbbb3cfd2 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -18,7 +18,9 @@ OC.L10N.register(
"Shares will show up here" : "Freigaben werden hier angezeigt",
"Restore share" : "Freigabe wiederherstellen",
"Something happened. Unable to restore the share." : "Die Freigabe konnte nicht wiederhergestellt werden.",
+ "Move or copy" : "Verschieben oder kopieren",
"Download" : "Herunterladen",
+ "Delete" : " Löschen",
"You can upload into this folder" : "Du kannst in diesen Ordner hochladen",
"No compatible server found at {remote}" : "Keinen kompatiblen Server unter {remote} gefunden",
"Invalid server URL" : "Falsche Server-URL",
@@ -91,6 +93,7 @@ OC.L10N.register(
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "%s Freigeben: Senden des Passwortes über Nextcloud Talk gescheitert, da Nextcloud Talk nicht verfügbar ist",
"You cannot share to a Circle if the app is not enabled" : "Du kannst nichts mit einem Kreis teilen, wenn die App nicht aktiviert ist",
"Please specify a valid circle" : "Bitte einen gültigen Kreis angeben",
+ "Sharing %s failed because the back end does not support room shares" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe von Räumen nicht unterstützt",
"Unknown share type" : "Unbekannter Freigabetyp",
"Not a directory" : "Kein Verzeichnis",
"Could not lock path" : "Pfad konnte nicht gesperrt werden",
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index b0700cf32c486..ca8d470c950f6 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -16,7 +16,9 @@
"Shares will show up here" : "Freigaben werden hier angezeigt",
"Restore share" : "Freigabe wiederherstellen",
"Something happened. Unable to restore the share." : "Die Freigabe konnte nicht wiederhergestellt werden.",
+ "Move or copy" : "Verschieben oder kopieren",
"Download" : "Herunterladen",
+ "Delete" : " Löschen",
"You can upload into this folder" : "Du kannst in diesen Ordner hochladen",
"No compatible server found at {remote}" : "Keinen kompatiblen Server unter {remote} gefunden",
"Invalid server URL" : "Falsche Server-URL",
@@ -89,6 +91,7 @@
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "%s Freigeben: Senden des Passwortes über Nextcloud Talk gescheitert, da Nextcloud Talk nicht verfügbar ist",
"You cannot share to a Circle if the app is not enabled" : "Du kannst nichts mit einem Kreis teilen, wenn die App nicht aktiviert ist",
"Please specify a valid circle" : "Bitte einen gültigen Kreis angeben",
+ "Sharing %s failed because the back end does not support room shares" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe von Räumen nicht unterstützt",
"Unknown share type" : "Unbekannter Freigabetyp",
"Not a directory" : "Kein Verzeichnis",
"Could not lock path" : "Pfad konnte nicht gesperrt werden",
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index 9b726cb0b9148..c39e290eb4211 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -18,7 +18,9 @@ OC.L10N.register(
"Shares will show up here" : "Freigaben werden hier angezeigt",
"Restore share" : "Freigabe wiederherstellen",
"Something happened. Unable to restore the share." : "Die Freigabe konnte nicht wiederhergestellt werden.",
+ "Move or copy" : "Verschieben oder kopieren",
"Download" : "Herunterladen",
+ "Delete" : "Löschen",
"You can upload into this folder" : "Sie können in diesen Ordner hochladen",
"No compatible server found at {remote}" : "Keinen kompatiblen Server unter {remote} gefunden",
"Invalid server URL" : "Falsche Server-URL",
@@ -91,6 +93,7 @@ OC.L10N.register(
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "%s Freigeben: Senden des Passwortes über Nextcloud Talk gescheitert, da Nextcloud Talk nicht verfügbar ist",
"You cannot share to a Circle if the app is not enabled" : "Sie können nichts mit einem Kreis teilen, wenn die App nicht aktiviert ist",
"Please specify a valid circle" : "Bitte einen gültigen Kreis angeben",
+ "Sharing %s failed because the back end does not support room shares" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe von Räumen nicht unterstützt",
"Unknown share type" : "Unbekannter Freigabetyp",
"Not a directory" : "Kein Verzeichnis",
"Could not lock path" : "Pfad konnte nicht gesperrt werden",
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index ced4db51e3395..26ffaab92f60e 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -16,7 +16,9 @@
"Shares will show up here" : "Freigaben werden hier angezeigt",
"Restore share" : "Freigabe wiederherstellen",
"Something happened. Unable to restore the share." : "Die Freigabe konnte nicht wiederhergestellt werden.",
+ "Move or copy" : "Verschieben oder kopieren",
"Download" : "Herunterladen",
+ "Delete" : "Löschen",
"You can upload into this folder" : "Sie können in diesen Ordner hochladen",
"No compatible server found at {remote}" : "Keinen kompatiblen Server unter {remote} gefunden",
"Invalid server URL" : "Falsche Server-URL",
@@ -89,6 +91,7 @@
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "%s Freigeben: Senden des Passwortes über Nextcloud Talk gescheitert, da Nextcloud Talk nicht verfügbar ist",
"You cannot share to a Circle if the app is not enabled" : "Sie können nichts mit einem Kreis teilen, wenn die App nicht aktiviert ist",
"Please specify a valid circle" : "Bitte einen gültigen Kreis angeben",
+ "Sharing %s failed because the back end does not support room shares" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe von Räumen nicht unterstützt",
"Unknown share type" : "Unbekannter Freigabetyp",
"Not a directory" : "Kein Verzeichnis",
"Could not lock path" : "Pfad konnte nicht gesperrt werden",
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index 78fbcbd644ce7..317926f3a98a5 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -2,23 +2,25 @@ OC.L10N.register(
"files_sharing",
{
"Shared with others" : "Compartido con otros",
- "Shared with you" : "Compartido contigo",
+ "Shared with you" : "Compartido conmigo",
"Shared by link" : "Compartido por enlace",
"Deleted shares" : "Recursos compartidos eliminados",
"Shares" : "Compartidos",
- "Nothing shared with you yet" : "Todavía nada compartido contigo",
+ "Nothing shared with you yet" : "Aún no hay nada compartido contigo",
"Files and folders others share with you will show up here" : "Aquí aparecerán archivos y carpetas que otros compartan contigo",
"Nothing shared yet" : "Aún no hay nada compartido",
"Files and folders you share will show up here" : "Aquí aparecerán los archivos y carpetas que compartas con otros",
"No shared links" : "No hay enlaces compartidos",
"Files and folders you share by link will show up here" : "Aquí aparecerán los archivos y carpetas que compartas mediante un enlace",
- "No deleted shares" : "No hay recursos compartidos eliminados",
+ "No deleted shares" : "No hay archivos compartidos eliminados",
"Shares you deleted will show up here" : "Los recursos compartidos que elimines aparecerán aquí",
"No shares" : "No compartidos",
- "Shares will show up here" : "Aquí aparecerán los recursos que compartas",
+ "Shares will show up here" : "Los archivos que compartas aparecerán aquí",
"Restore share" : "Restaurar recurso compartido",
- "Something happened. Unable to restore the share." : "Algo ha sucedido. No se puede restaurar el recurso compartido.",
+ "Something happened. Unable to restore the share." : "Algo ha sucedido. No se pudo restaurar el recurso compartido.",
+ "Move or copy" : "Mover o copiar",
"Download" : "Descargar",
+ "Delete" : "Eliminar",
"You can upload into this folder" : "Puedes subir archivos en esta carpeta",
"No compatible server found at {remote}" : "No se ha encontrado un servidor compatible en {remote}",
"Invalid server URL" : "URL del servidor inválida",
@@ -32,17 +34,17 @@ OC.L10N.register(
"Downloaded by {email}" : "Descargado por {email}",
"{file} downloaded via public link" : "{file} descargado vía enlace público",
"{email} downloaded {file}" : "{email} descargó {file}",
- "Shared with group {group}" : "Compartido con el grupo {grupo}",
- "Removed share for group {group}" : "Eliminado el compartido para el grupo {group}",
+ "Shared with group {group}" : "Compartido con el grupo {group}",
+ "Removed share for group {group}" : "Eliminado el recurso compartido para el grupo {group}",
"{actor} shared with group {group}" : "{actor} compartió con el grupo {group}",
- "{actor} removed share for group {group}" : "{actor} eliminó el compartido para el grupo {group}",
+ "{actor} removed share for group {group}" : "{actor} eliminó el recurso compartido para el grupo {group}",
"You shared {file} with group {group}" : "Ha compartido {file} con el grupo {group}",
"You removed group {group} from {file}" : "Ha eliminado el grupo {group} del {file}",
"{actor} shared {file} with group {group}" : "{actor} compartió {file} con el grupo {group}",
"{actor} removed group {group} from {file}" : "{actor} eliminó grupo {group} de {file}",
"Shared as public link" : "Compartido como enlace público",
- "Removed public link" : "Eliminado enlace público",
- "Public link expired" : "El enlace público ha expirado",
+ "Removed public link" : "Enlace público eliminado",
+ "Public link expired" : "El enlace público ha caducado",
"{actor} shared as public link" : "{actor} compartió como enlace público",
"{actor} removed public link" : "{actor} eliminó el enlace público",
"Public link of {actor} expired" : "Enlace público de {actor} caducado",
@@ -85,35 +87,36 @@ OC.L10N.register(
"Please specify a valid group" : "Por favor, especifica un grupo válido",
"Public link sharing is disabled by the administrator" : "Compartir enlaces de forma pública está deshabilitado por el administrador",
"Public upload disabled by the administrator" : "La subida pública está deshabilitado por el administrador",
- "Public upload is only possible for publicly shared folders" : "La subida publica solo es posible poara las carpetas publicas compartidas",
+ "Public upload is only possible for publicly shared folders" : "La subida publica solo es posible para las carpetas publicas compartidas",
"Invalid date, date format must be YYYY-MM-DD" : "Fecha inválida, el formato de las fechas debe ser YYYY-MM-DD",
- "Sharing %s failed because the back end does not allow shares from type %s" : "Compartir %s ha fallado porque el repositorio no admite compartidos del tipo %s",
+ "Sharing %s failed because the back end does not allow shares from type %s" : "Compartir %s ha fallado porque el backend no admite recursos compartidos del tipo %s",
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Compartir %s enviando la contraseña por Nextcloud Talk ha falllado porque Nextcloud Talk no está activado",
"You cannot share to a Circle if the app is not enabled" : "No puede compartir a un Circulo si la aplicación no esta activada",
"Please specify a valid circle" : "Por favor especifique un circulo valido",
- "Unknown share type" : "Tipo desconocido de recurso compartido",
+ "Sharing %s failed because the back end does not support room shares" : "Compartir %s ha fallado porque el backend no soporta habitaciones compartidas",
+ "Unknown share type" : "Tipo de recurso compartido desconocido",
"Not a directory" : "No es un directorio",
"Could not lock path" : "No se ha podido bloquear la ruta",
"Wrong or no update parameter given" : "No se ha suministrado un parametro correcto",
"Can't change permissions for public share links" : "No se pueden cambiar los permisos para los enlaces de recursos compartidos públicos",
"Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Compartir enviando la contraseña por Nextcloud Talk ha fallado porque Nextcloud Talk no está activado",
- "Cannot increase permissions" : "No es posible aumentar permisos",
+ "Cannot increase permissions" : "No es posible aumentar los permisos",
"shared by %s" : "compartido por %s",
"Direct link" : "Enlace directo",
"Add to your Nextcloud" : "Añadir a tu Nextcloud",
"Share API is disabled" : "El API de compartir está deshabilitado",
"File sharing" : "Compartir archivos",
"This application enables users to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.\nTurning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation." : "Esta aplicación permite a los usuarios compartir archivos dentro de Nextcloud. Si se activa, el administrador puede elegir qué grupos pueden compartir archivos. Los usuarios aplicables pueden entonces compartir archivos y carpetas con otros usuarios y grupos dentro de Nextcloud. Además, si el administrador activa la característica de enlace compartido, se puede usar un enlace externo para compartir archivos con otros usuarios fuera de Nextcloud. Los administradores pueden obligar a usar contraseñas o fechas de expiración y activar el compartir de servidor a servidor vía enlaces compartidos, así como compartir desde dispositivos móviles.\nApagar esta característica elimina los archivos compartidos y las carpetas en el servidor, para todos los receptores, y también los clientes de sincronización y móviles. Más información disponible en la documentación de Nextcloud.",
- "No entries found in this folder" : "No hay entradas en esta carpeta",
+ "No entries found in this folder" : "No hay nada en esta carpeta",
"Name" : "Nombre",
"Share time" : "Compartido hace",
"Expiration date" : "Fecha de caducidad",
"Sorry, this link doesn’t seem to work anymore." : "Vaya, este enlace parece que no volverá a funcionar.",
- "Reasons might be:" : "Las causas podrían ser:",
+ "Reasons might be:" : "Las causas podrían ser: ",
"the item was removed" : "el elemento fue eliminado",
- "the link expired" : "el enlace expiró",
+ "the link expired" : "el enlace caducó",
"sharing is disabled" : "compartir está desactivado",
- "For more info, please ask the person who sent this link." : "Para mayor información, contacte a la persona que le envió el enlace.",
+ "For more info, please ask the person who sent this link." : "Para más información, pregunte a la persona que le envió el enlace.",
"Note:" : "Nota:",
"Download %s" : "Descargar %s",
"Upload files to %s" : "Subir archivos a %s",
@@ -122,8 +125,8 @@ OC.L10N.register(
"Uploaded files:" : "Archivos subidos:",
"{actor} removed you from {file}" : "{actor} lo ha eliminado de {file}",
"%s is publicly shared" : "%s está compartido públicamente",
- "This share is password-protected" : "Este elemento compartido está protegido por contraseña",
- "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.",
+ "This share is password-protected" : "Este recurso compartido está protegido por contraseña",
+ "The password is wrong. Try again." : "La contraseña no es correcta. Inténtelo de nuevo.",
"Password" : "Contraseña"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index 129e87a4ad9be..89e95570438e8 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -1,22 +1,24 @@
{ "translations": {
"Shared with others" : "Compartido con otros",
- "Shared with you" : "Compartido contigo",
+ "Shared with you" : "Compartido conmigo",
"Shared by link" : "Compartido por enlace",
"Deleted shares" : "Recursos compartidos eliminados",
"Shares" : "Compartidos",
- "Nothing shared with you yet" : "Todavía nada compartido contigo",
+ "Nothing shared with you yet" : "Aún no hay nada compartido contigo",
"Files and folders others share with you will show up here" : "Aquí aparecerán archivos y carpetas que otros compartan contigo",
"Nothing shared yet" : "Aún no hay nada compartido",
"Files and folders you share will show up here" : "Aquí aparecerán los archivos y carpetas que compartas con otros",
"No shared links" : "No hay enlaces compartidos",
"Files and folders you share by link will show up here" : "Aquí aparecerán los archivos y carpetas que compartas mediante un enlace",
- "No deleted shares" : "No hay recursos compartidos eliminados",
+ "No deleted shares" : "No hay archivos compartidos eliminados",
"Shares you deleted will show up here" : "Los recursos compartidos que elimines aparecerán aquí",
"No shares" : "No compartidos",
- "Shares will show up here" : "Aquí aparecerán los recursos que compartas",
+ "Shares will show up here" : "Los archivos que compartas aparecerán aquí",
"Restore share" : "Restaurar recurso compartido",
- "Something happened. Unable to restore the share." : "Algo ha sucedido. No se puede restaurar el recurso compartido.",
+ "Something happened. Unable to restore the share." : "Algo ha sucedido. No se pudo restaurar el recurso compartido.",
+ "Move or copy" : "Mover o copiar",
"Download" : "Descargar",
+ "Delete" : "Eliminar",
"You can upload into this folder" : "Puedes subir archivos en esta carpeta",
"No compatible server found at {remote}" : "No se ha encontrado un servidor compatible en {remote}",
"Invalid server URL" : "URL del servidor inválida",
@@ -30,17 +32,17 @@
"Downloaded by {email}" : "Descargado por {email}",
"{file} downloaded via public link" : "{file} descargado vía enlace público",
"{email} downloaded {file}" : "{email} descargó {file}",
- "Shared with group {group}" : "Compartido con el grupo {grupo}",
- "Removed share for group {group}" : "Eliminado el compartido para el grupo {group}",
+ "Shared with group {group}" : "Compartido con el grupo {group}",
+ "Removed share for group {group}" : "Eliminado el recurso compartido para el grupo {group}",
"{actor} shared with group {group}" : "{actor} compartió con el grupo {group}",
- "{actor} removed share for group {group}" : "{actor} eliminó el compartido para el grupo {group}",
+ "{actor} removed share for group {group}" : "{actor} eliminó el recurso compartido para el grupo {group}",
"You shared {file} with group {group}" : "Ha compartido {file} con el grupo {group}",
"You removed group {group} from {file}" : "Ha eliminado el grupo {group} del {file}",
"{actor} shared {file} with group {group}" : "{actor} compartió {file} con el grupo {group}",
"{actor} removed group {group} from {file}" : "{actor} eliminó grupo {group} de {file}",
"Shared as public link" : "Compartido como enlace público",
- "Removed public link" : "Eliminado enlace público",
- "Public link expired" : "El enlace público ha expirado",
+ "Removed public link" : "Enlace público eliminado",
+ "Public link expired" : "El enlace público ha caducado",
"{actor} shared as public link" : "{actor} compartió como enlace público",
"{actor} removed public link" : "{actor} eliminó el enlace público",
"Public link of {actor} expired" : "Enlace público de {actor} caducado",
@@ -83,35 +85,36 @@
"Please specify a valid group" : "Por favor, especifica un grupo válido",
"Public link sharing is disabled by the administrator" : "Compartir enlaces de forma pública está deshabilitado por el administrador",
"Public upload disabled by the administrator" : "La subida pública está deshabilitado por el administrador",
- "Public upload is only possible for publicly shared folders" : "La subida publica solo es posible poara las carpetas publicas compartidas",
+ "Public upload is only possible for publicly shared folders" : "La subida publica solo es posible para las carpetas publicas compartidas",
"Invalid date, date format must be YYYY-MM-DD" : "Fecha inválida, el formato de las fechas debe ser YYYY-MM-DD",
- "Sharing %s failed because the back end does not allow shares from type %s" : "Compartir %s ha fallado porque el repositorio no admite compartidos del tipo %s",
+ "Sharing %s failed because the back end does not allow shares from type %s" : "Compartir %s ha fallado porque el backend no admite recursos compartidos del tipo %s",
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Compartir %s enviando la contraseña por Nextcloud Talk ha falllado porque Nextcloud Talk no está activado",
"You cannot share to a Circle if the app is not enabled" : "No puede compartir a un Circulo si la aplicación no esta activada",
"Please specify a valid circle" : "Por favor especifique un circulo valido",
- "Unknown share type" : "Tipo desconocido de recurso compartido",
+ "Sharing %s failed because the back end does not support room shares" : "Compartir %s ha fallado porque el backend no soporta habitaciones compartidas",
+ "Unknown share type" : "Tipo de recurso compartido desconocido",
"Not a directory" : "No es un directorio",
"Could not lock path" : "No se ha podido bloquear la ruta",
"Wrong or no update parameter given" : "No se ha suministrado un parametro correcto",
"Can't change permissions for public share links" : "No se pueden cambiar los permisos para los enlaces de recursos compartidos públicos",
"Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Compartir enviando la contraseña por Nextcloud Talk ha fallado porque Nextcloud Talk no está activado",
- "Cannot increase permissions" : "No es posible aumentar permisos",
+ "Cannot increase permissions" : "No es posible aumentar los permisos",
"shared by %s" : "compartido por %s",
"Direct link" : "Enlace directo",
"Add to your Nextcloud" : "Añadir a tu Nextcloud",
"Share API is disabled" : "El API de compartir está deshabilitado",
"File sharing" : "Compartir archivos",
"This application enables users to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.\nTurning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation." : "Esta aplicación permite a los usuarios compartir archivos dentro de Nextcloud. Si se activa, el administrador puede elegir qué grupos pueden compartir archivos. Los usuarios aplicables pueden entonces compartir archivos y carpetas con otros usuarios y grupos dentro de Nextcloud. Además, si el administrador activa la característica de enlace compartido, se puede usar un enlace externo para compartir archivos con otros usuarios fuera de Nextcloud. Los administradores pueden obligar a usar contraseñas o fechas de expiración y activar el compartir de servidor a servidor vía enlaces compartidos, así como compartir desde dispositivos móviles.\nApagar esta característica elimina los archivos compartidos y las carpetas en el servidor, para todos los receptores, y también los clientes de sincronización y móviles. Más información disponible en la documentación de Nextcloud.",
- "No entries found in this folder" : "No hay entradas en esta carpeta",
+ "No entries found in this folder" : "No hay nada en esta carpeta",
"Name" : "Nombre",
"Share time" : "Compartido hace",
"Expiration date" : "Fecha de caducidad",
"Sorry, this link doesn’t seem to work anymore." : "Vaya, este enlace parece que no volverá a funcionar.",
- "Reasons might be:" : "Las causas podrían ser:",
+ "Reasons might be:" : "Las causas podrían ser: ",
"the item was removed" : "el elemento fue eliminado",
- "the link expired" : "el enlace expiró",
+ "the link expired" : "el enlace caducó",
"sharing is disabled" : "compartir está desactivado",
- "For more info, please ask the person who sent this link." : "Para mayor información, contacte a la persona que le envió el enlace.",
+ "For more info, please ask the person who sent this link." : "Para más información, pregunte a la persona que le envió el enlace.",
"Note:" : "Nota:",
"Download %s" : "Descargar %s",
"Upload files to %s" : "Subir archivos a %s",
@@ -120,8 +123,8 @@
"Uploaded files:" : "Archivos subidos:",
"{actor} removed you from {file}" : "{actor} lo ha eliminado de {file}",
"%s is publicly shared" : "%s está compartido públicamente",
- "This share is password-protected" : "Este elemento compartido está protegido por contraseña",
- "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.",
+ "This share is password-protected" : "Este recurso compartido está protegido por contraseña",
+ "The password is wrong. Try again." : "La contraseña no es correcta. Inténtelo de nuevo.",
"Password" : "Contraseña"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index 9ffdf36f33138..874560d2a057d 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -18,7 +18,9 @@ OC.L10N.register(
"Shares will show up here" : "Les partages seront affichés ici",
"Restore share" : "Restaurer le partage",
"Something happened. Unable to restore the share." : "Quelque chose s'est passé. Impossible de restaurer le partage.",
+ "Move or copy" : "Déplacer ou copier",
"Download" : "Télécharger",
+ "Delete" : "Supprimer",
"You can upload into this folder" : "Vous pouvez téléverser dans ce dossier",
"No compatible server found at {remote}" : "Aucun serveur compatible trouvé sur {remote}",
"Invalid server URL" : "URL serveur invalide",
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index f8f8e7e3e58e4..98d91cdb5b660 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -16,7 +16,9 @@
"Shares will show up here" : "Les partages seront affichés ici",
"Restore share" : "Restaurer le partage",
"Something happened. Unable to restore the share." : "Quelque chose s'est passé. Impossible de restaurer le partage.",
+ "Move or copy" : "Déplacer ou copier",
"Download" : "Télécharger",
+ "Delete" : "Supprimer",
"You can upload into this folder" : "Vous pouvez téléverser dans ce dossier",
"No compatible server found at {remote}" : "Aucun serveur compatible trouvé sur {remote}",
"Invalid server URL" : "URL serveur invalide",
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index fdc5f66489e24..73d47955e63c6 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -18,7 +18,9 @@ OC.L10N.register(
"Shares will show up here" : "Le condivisioni saranno mostrate qui",
"Restore share" : "Ripristina condivisione",
"Something happened. Unable to restore the share." : "Qualcosa non ha funzionato. Impossible ripristinare la condivisione.",
+ "Move or copy" : "Sposta o copia",
"Download" : "Scarica",
+ "Delete" : "Elimina",
"You can upload into this folder" : "Puoi caricare in questa cartella",
"No compatible server found at {remote}" : "Nessun server compatibile trovato su {remote}",
"Invalid server URL" : "URL del server non valido",
@@ -91,6 +93,7 @@ OC.L10N.register(
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "La condivisione di %s tramite invio della password da Nextcloud Talk non è riuscito poiché Nextcloud Talk non è abilitato",
"You cannot share to a Circle if the app is not enabled" : "Non puoi condividere con una cerchia se l'applicazione non è abilitata",
"Please specify a valid circle" : "Specifica una cerchia valida",
+ "Sharing %s failed because the back end does not support room shares" : "Condivisione di %s non riuscita poiché il motore non supporta condivisioni di stanza",
"Unknown share type" : "Tipo di condivisione sconosciuto",
"Not a directory" : "Non è una cartella",
"Could not lock path" : "Impossibile bloccare il percorso",
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index cca17f25aa05c..37e17fd55b5cc 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -16,7 +16,9 @@
"Shares will show up here" : "Le condivisioni saranno mostrate qui",
"Restore share" : "Ripristina condivisione",
"Something happened. Unable to restore the share." : "Qualcosa non ha funzionato. Impossible ripristinare la condivisione.",
+ "Move or copy" : "Sposta o copia",
"Download" : "Scarica",
+ "Delete" : "Elimina",
"You can upload into this folder" : "Puoi caricare in questa cartella",
"No compatible server found at {remote}" : "Nessun server compatibile trovato su {remote}",
"Invalid server URL" : "URL del server non valido",
@@ -89,6 +91,7 @@
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "La condivisione di %s tramite invio della password da Nextcloud Talk non è riuscito poiché Nextcloud Talk non è abilitato",
"You cannot share to a Circle if the app is not enabled" : "Non puoi condividere con una cerchia se l'applicazione non è abilitata",
"Please specify a valid circle" : "Specifica una cerchia valida",
+ "Sharing %s failed because the back end does not support room shares" : "Condivisione di %s non riuscita poiché il motore non supporta condivisioni di stanza",
"Unknown share type" : "Tipo di condivisione sconosciuto",
"Not a directory" : "Non è una cartella",
"Could not lock path" : "Impossibile bloccare il percorso",
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index 89a11bf775ad8..96a00b584fbb4 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -4,6 +4,7 @@ OC.L10N.register(
"Shared with others" : "Gedeeld met anderen",
"Shared with you" : "Met je gedeeld",
"Shared by link" : "Gedeeld via een link",
+ "Deleted shares" : "Verwijderde shares",
"Shares" : "Shares",
"Nothing shared with you yet" : "Nog niets met je gedeeld",
"Files and folders others share with you will show up here" : "Bestanden en mappen die anderen met je delen, worden hier getoond",
@@ -12,7 +13,9 @@ OC.L10N.register(
"No shared links" : "Geen gedeelde links",
"Files and folders you share by link will show up here" : "Bestanden en mappen die je via links deelt, worden hier getoond",
"No deleted shares" : "Geen verwijderde shares",
+ "Shares you deleted will show up here" : "Shares die je verwijderde, worden hier getoond",
"No shares" : "Geen shares",
+ "Move or copy" : "Verplaatsen of kopiëren",
"Download" : "Downloaden",
"You can upload into this folder" : "Je kunt uploaden naar deze map",
"No compatible server found at {remote}" : "Geen geschikte server gevonden op {remote}",
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index d6be0f282fc9d..f070d811fa7a8 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -2,6 +2,7 @@
"Shared with others" : "Gedeeld met anderen",
"Shared with you" : "Met je gedeeld",
"Shared by link" : "Gedeeld via een link",
+ "Deleted shares" : "Verwijderde shares",
"Shares" : "Shares",
"Nothing shared with you yet" : "Nog niets met je gedeeld",
"Files and folders others share with you will show up here" : "Bestanden en mappen die anderen met je delen, worden hier getoond",
@@ -10,7 +11,9 @@
"No shared links" : "Geen gedeelde links",
"Files and folders you share by link will show up here" : "Bestanden en mappen die je via links deelt, worden hier getoond",
"No deleted shares" : "Geen verwijderde shares",
+ "Shares you deleted will show up here" : "Shares die je verwijderde, worden hier getoond",
"No shares" : "Geen shares",
+ "Move or copy" : "Verplaatsen of kopiëren",
"Download" : "Downloaden",
"You can upload into this folder" : "Je kunt uploaden naar deze map",
"No compatible server found at {remote}" : "Geen geschikte server gevonden op {remote}",
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index 7201ea57dc28d..befab592019be 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -18,8 +18,10 @@ OC.L10N.register(
"Shares will show up here" : "Compartilhamentos serão mostrados aqui",
"Restore share" : "Restaurar compartilhamento",
"Something happened. Unable to restore the share." : "Algo aconteceu. Não foi possível restaurar o compartilhamento.",
+ "Move or copy" : "Mover ou copiar",
"Download" : "Baixar",
- "You can upload into this folder" : "Você não pode enviar arquivos para esta pasta",
+ "Delete" : "Excluir",
+ "You can upload into this folder" : "Você pode enviar arquivos para esta pasta",
"No compatible server found at {remote}" : "Nenhum servidor compativel encontrado em {remote}",
"Invalid server URL" : "URL do servidor inválida",
"Failed to add the public link to your Nextcloud" : "Ocorreu uma falha ao adicionar o link público ao seu Nextcloud",
@@ -91,6 +93,7 @@ OC.L10N.register(
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "O compartilhamento %s falhou ao enviar a senha ao Nextcloud Talk porque este não está ativado",
"You cannot share to a Circle if the app is not enabled" : "Você não pode compartilhar para um círculo se o aplicativo não está habilitado",
"Please specify a valid circle" : "Por favor especifique um círculo válido",
+ "Sharing %s failed because the back end does not support room shares" : "Falhou ao compartilhar %s porque o sistema não suporta compartilhamento de salas",
"Unknown share type" : "Tipo de compartilhamento desconhecido",
"Not a directory" : "Não é um diretório",
"Could not lock path" : "Não foi possível bloquear o caminho",
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index 5b96bb51b6d13..ea4e88f1d9eba 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -16,8 +16,10 @@
"Shares will show up here" : "Compartilhamentos serão mostrados aqui",
"Restore share" : "Restaurar compartilhamento",
"Something happened. Unable to restore the share." : "Algo aconteceu. Não foi possível restaurar o compartilhamento.",
+ "Move or copy" : "Mover ou copiar",
"Download" : "Baixar",
- "You can upload into this folder" : "Você não pode enviar arquivos para esta pasta",
+ "Delete" : "Excluir",
+ "You can upload into this folder" : "Você pode enviar arquivos para esta pasta",
"No compatible server found at {remote}" : "Nenhum servidor compativel encontrado em {remote}",
"Invalid server URL" : "URL do servidor inválida",
"Failed to add the public link to your Nextcloud" : "Ocorreu uma falha ao adicionar o link público ao seu Nextcloud",
@@ -89,6 +91,7 @@
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "O compartilhamento %s falhou ao enviar a senha ao Nextcloud Talk porque este não está ativado",
"You cannot share to a Circle if the app is not enabled" : "Você não pode compartilhar para um círculo se o aplicativo não está habilitado",
"Please specify a valid circle" : "Por favor especifique um círculo válido",
+ "Sharing %s failed because the back end does not support room shares" : "Falhou ao compartilhar %s porque o sistema não suporta compartilhamento de salas",
"Unknown share type" : "Tipo de compartilhamento desconhecido",
"Not a directory" : "Não é um diretório",
"Could not lock path" : "Não foi possível bloquear o caminho",
diff --git a/apps/files_sharing/l10n/sk.js b/apps/files_sharing/l10n/sk.js
index 34accfc62533d..30a235ed7c8b0 100644
--- a/apps/files_sharing/l10n/sk.js
+++ b/apps/files_sharing/l10n/sk.js
@@ -18,7 +18,9 @@ OC.L10N.register(
"Shares will show up here" : "Tu sa zobrazia sprístupnené položky",
"Restore share" : "Obnoviť sprístupnené položky",
"Something happened. Unable to restore the share." : "Niečo sa udialo. Nedarí sa obnoviť sprístupnenú položku.",
+ "Move or copy" : "Presunúť alebo kopírovať",
"Download" : "Sťahovanie",
+ "Delete" : "Zmazať",
"You can upload into this folder" : "Môžete nahrávať do tohto priečinka",
"No compatible server found at {remote}" : "Nebol nájdený kompatibilný server na adrese {remote}",
"Invalid server URL" : "Neplatná URL servera",
@@ -88,13 +90,16 @@ OC.L10N.register(
"Public upload is only possible for publicly shared folders" : "Verejné nahrávanie je možné len do verejne sprístupnených priečinkov",
"Invalid date, date format must be YYYY-MM-DD" : "Neplatný dátum, formát musí byť v tvare YYYY-MM-DD",
"Sharing %s failed because the back end does not allow shares from type %s" : "Sprístupnenie %s zlyhalo, backend nepodporuje typ sprístupnenia %s",
+ "Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Zdieľanie %s odoslaním hesla cez Nextcloud Talk zlyhalo, pretože Nextcloud Talk nie je zapnutý",
"You cannot share to a Circle if the app is not enabled" : "Ak aplikácia nie je povolená, nemôžete ju zdieľať s Kruhom",
"Please specify a valid circle" : "Zadajte platný kruh",
+ "Sharing %s failed because the back end does not support room shares" : "Zdieľanie %s sa nepodarilo, pretože backend nepodporuje zdieľanie miestností",
"Unknown share type" : "Neplatný typ sprístupnenia",
"Not a directory" : "Nie je priečinok",
"Could not lock path" : "Nie je možné uzamknúť cestu",
"Wrong or no update parameter given" : "Zlý alebo žiadny zadaný parameter aktualizácie",
"Can't change permissions for public share links" : "Nemožno zmeniť oprávnenia pre verejné sprístupnené odkazy",
+ "Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Zdieľanie odoslaním hesla cez Nextcloud Talk zlyhalo, pretože Nextcloud Talk nie je zapnutý",
"Cannot increase permissions" : "Nie je možné navýšiť oprávnenia",
"shared by %s" : "Sprístupnil %s",
"Direct link" : "Priama linka",
diff --git a/apps/files_sharing/l10n/sk.json b/apps/files_sharing/l10n/sk.json
index 28536793d14d2..9b7929ebbefc0 100644
--- a/apps/files_sharing/l10n/sk.json
+++ b/apps/files_sharing/l10n/sk.json
@@ -16,7 +16,9 @@
"Shares will show up here" : "Tu sa zobrazia sprístupnené položky",
"Restore share" : "Obnoviť sprístupnené položky",
"Something happened. Unable to restore the share." : "Niečo sa udialo. Nedarí sa obnoviť sprístupnenú položku.",
+ "Move or copy" : "Presunúť alebo kopírovať",
"Download" : "Sťahovanie",
+ "Delete" : "Zmazať",
"You can upload into this folder" : "Môžete nahrávať do tohto priečinka",
"No compatible server found at {remote}" : "Nebol nájdený kompatibilný server na adrese {remote}",
"Invalid server URL" : "Neplatná URL servera",
@@ -86,13 +88,16 @@
"Public upload is only possible for publicly shared folders" : "Verejné nahrávanie je možné len do verejne sprístupnených priečinkov",
"Invalid date, date format must be YYYY-MM-DD" : "Neplatný dátum, formát musí byť v tvare YYYY-MM-DD",
"Sharing %s failed because the back end does not allow shares from type %s" : "Sprístupnenie %s zlyhalo, backend nepodporuje typ sprístupnenia %s",
+ "Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Zdieľanie %s odoslaním hesla cez Nextcloud Talk zlyhalo, pretože Nextcloud Talk nie je zapnutý",
"You cannot share to a Circle if the app is not enabled" : "Ak aplikácia nie je povolená, nemôžete ju zdieľať s Kruhom",
"Please specify a valid circle" : "Zadajte platný kruh",
+ "Sharing %s failed because the back end does not support room shares" : "Zdieľanie %s sa nepodarilo, pretože backend nepodporuje zdieľanie miestností",
"Unknown share type" : "Neplatný typ sprístupnenia",
"Not a directory" : "Nie je priečinok",
"Could not lock path" : "Nie je možné uzamknúť cestu",
"Wrong or no update parameter given" : "Zlý alebo žiadny zadaný parameter aktualizácie",
"Can't change permissions for public share links" : "Nemožno zmeniť oprávnenia pre verejné sprístupnené odkazy",
+ "Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Zdieľanie odoslaním hesla cez Nextcloud Talk zlyhalo, pretože Nextcloud Talk nie je zapnutý",
"Cannot increase permissions" : "Nie je možné navýšiť oprávnenia",
"shared by %s" : "Sprístupnil %s",
"Direct link" : "Priama linka",
diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js
index aca368d9c3d17..0d96e7759eb73 100644
--- a/apps/files_sharing/l10n/sr.js
+++ b/apps/files_sharing/l10n/sr.js
@@ -18,7 +18,9 @@ OC.L10N.register(
"Shares will show up here" : "Дељења ће се појавити овде",
"Restore share" : "Поврати дељење",
"Something happened. Unable to restore the share." : "Нешто чудно се десило. Дељење не може да се поврати.",
+ "Move or copy" : "Помери или копирај",
"Download" : "Преузми",
+ "Delete" : "Избриши",
"You can upload into this folder" : "Можете да отпремате у ову фасциклу",
"No compatible server found at {remote}" : "Нема компатибилног сервера на {remote}",
"Invalid server URL" : "Неисправна адреса сервера",
@@ -91,6 +93,7 @@ OC.L10N.register(
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Дељење %s слањем лозинке преко Nextcloud Talk-а није успело пошто Nextcloud Talk није укључен",
"You cannot share to a Circle if the app is not enabled" : "Не можете делити са Круговима ако та апликација није укључена",
"Please specify a valid circle" : "Одаберите исправан круг",
+ "Sharing %s failed because the back end does not support room shares" : "Није успело дељење %s зато што позадински мотор дељења не подржава дељења у соби",
"Unknown share type" : "Непознат тип дељења",
"Not a directory" : "Није фасцикла",
"Could not lock path" : "Не могу да закључам путању",
diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json
index e2ec69eefafdf..544d847613215 100644
--- a/apps/files_sharing/l10n/sr.json
+++ b/apps/files_sharing/l10n/sr.json
@@ -16,7 +16,9 @@
"Shares will show up here" : "Дељења ће се појавити овде",
"Restore share" : "Поврати дељење",
"Something happened. Unable to restore the share." : "Нешто чудно се десило. Дељење не може да се поврати.",
+ "Move or copy" : "Помери или копирај",
"Download" : "Преузми",
+ "Delete" : "Избриши",
"You can upload into this folder" : "Можете да отпремате у ову фасциклу",
"No compatible server found at {remote}" : "Нема компатибилног сервера на {remote}",
"Invalid server URL" : "Неисправна адреса сервера",
@@ -89,6 +91,7 @@
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Дељење %s слањем лозинке преко Nextcloud Talk-а није успело пошто Nextcloud Talk није укључен",
"You cannot share to a Circle if the app is not enabled" : "Не можете делити са Круговима ако та апликација није укључена",
"Please specify a valid circle" : "Одаберите исправан круг",
+ "Sharing %s failed because the back end does not support room shares" : "Није успело дељење %s зато што позадински мотор дељења не подржава дељења у соби",
"Unknown share type" : "Непознат тип дељења",
"Not a directory" : "Није фасцикла",
"Could not lock path" : "Не могу да закључам путању",
diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js
index c105cc9d95a18..efe325ec75cf7 100644
--- a/apps/files_sharing/l10n/tr.js
+++ b/apps/files_sharing/l10n/tr.js
@@ -18,7 +18,9 @@ OC.L10N.register(
"Shares will show up here" : "Paylaşımlar burada görüntülenir",
"Restore share" : "Paylaşımı geri yükle",
"Something happened. Unable to restore the share." : "Bir sorun çıktı. Paylaşım geri yüklenemedi.",
+ "Move or copy" : "Taşı ya da kopyala",
"Download" : "İndir",
+ "Delete" : "Sil",
"You can upload into this folder" : "Bu klasöre yükleme yapabilirsiniz",
"No compatible server found at {remote}" : " {remote} konumunda uyumlu sunucu bulunamadı",
"Invalid server URL" : "Sunucu adresi geçersiz",
@@ -91,6 +93,7 @@ OC.L10N.register(
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Nextcloud Talk etkinleştirilmemiş olduğundan %sNextcloud Talk ile parola gönderilerek paylaşılamadı",
"You cannot share to a Circle if the app is not enabled" : "Uygulama etkinleştirilmemiş ise bir Çevre ile paylaşamazsınız",
"Please specify a valid circle" : "Lütfen geçerli bir çevre belirtin",
+ "Sharing %s failed because the back end does not support room shares" : "Arka uç oda paylaşımlarına izin vermediğinden %s paylaşılamadı",
"Unknown share type" : "Paylaşım türü bilinmiyor",
"Not a directory" : "Bir klasör değil",
"Could not lock path" : "Yol kilitlenemedi",
diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json
index 3fbcd62755bd5..4d658977584e7 100644
--- a/apps/files_sharing/l10n/tr.json
+++ b/apps/files_sharing/l10n/tr.json
@@ -16,7 +16,9 @@
"Shares will show up here" : "Paylaşımlar burada görüntülenir",
"Restore share" : "Paylaşımı geri yükle",
"Something happened. Unable to restore the share." : "Bir sorun çıktı. Paylaşım geri yüklenemedi.",
+ "Move or copy" : "Taşı ya da kopyala",
"Download" : "İndir",
+ "Delete" : "Sil",
"You can upload into this folder" : "Bu klasöre yükleme yapabilirsiniz",
"No compatible server found at {remote}" : " {remote} konumunda uyumlu sunucu bulunamadı",
"Invalid server URL" : "Sunucu adresi geçersiz",
@@ -89,6 +91,7 @@
"Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Nextcloud Talk etkinleştirilmemiş olduğundan %sNextcloud Talk ile parola gönderilerek paylaşılamadı",
"You cannot share to a Circle if the app is not enabled" : "Uygulama etkinleştirilmemiş ise bir Çevre ile paylaşamazsınız",
"Please specify a valid circle" : "Lütfen geçerli bir çevre belirtin",
+ "Sharing %s failed because the back end does not support room shares" : "Arka uç oda paylaşımlarına izin vermediğinden %s paylaşılamadı",
"Unknown share type" : "Paylaşım türü bilinmiyor",
"Not a directory" : "Bir klasör değil",
"Could not lock path" : "Yol kilitlenemedi",
diff --git a/apps/files_trashbin/composer/composer/ClassLoader.php b/apps/files_trashbin/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/files_trashbin/composer/composer/ClassLoader.php
+++ b/apps/files_trashbin/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
index 5c29c1232bb71..7cdc157fe4773 100644
--- a/apps/files_trashbin/js/app.js
+++ b/apps/files_trashbin/js/app.js
@@ -67,7 +67,6 @@ OCA.Trashbin.App = {
var tr = fileList.findFileEl(filename);
var deleteAction = tr.children("td.date").children(".action.delete");
deleteAction.removeClass('icon-delete').addClass('icon-loading-small');
- fileList.disableActions();
$.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), {
files: JSON.stringify([filename]),
dir: fileList.getCurrentDirectory()
@@ -96,7 +95,6 @@ OCA.Trashbin.App = {
var tr = fileList.findFileEl(filename);
var deleteAction = tr.children("td.date").children(".action.delete");
deleteAction.removeClass('icon-delete').addClass('icon-loading-small');
- fileList.disableActions();
$.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'), {
files: JSON.stringify([filename]),
dir: fileList.getCurrentDirectory()
diff --git a/apps/files_trashbin/l10n/es.js b/apps/files_trashbin/l10n/es.js
index 78b592909ca40..472628f5afcdf 100644
--- a/apps/files_trashbin/l10n/es.js
+++ b/apps/files_trashbin/l10n/es.js
@@ -9,13 +9,13 @@ OC.L10N.register(
"Delete permanently" : "Eliminar permanentemente",
"Error" : "Error",
"This operation is forbidden" : "Esta operación está prohibida",
- "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contáctese con el administrador",
+ "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contacte con el administrador",
"restored" : "recuperado",
"This application enables users to restore files that were deleted from the system." : "Esta app permite a los usuarios recuperar archivos borrados del sistema.",
- "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Esta aplicación permite a los usuarios recuperar archivos borrados del sistema. Muestra una lista de los archivos borrados en la interfaz web y tiene opciones para restaurar esos archivos borrados a los directorios del usuario o eliminarlos permanentemente del sistema. Restaurar un archivo también restaura las versiones del archivo relacionadas. Cuando un archivo se borra de una compartición, no se puede restaurar de la misma forma, pues ya no será compartido. Por defecto, estos archivos permanecen en la papelera de reciclaje durante 30 días.\nPara evitar que un usuario se quede sin espacio de disco, la app no utilizará más del 50% del espacio disponible a cada momento. Si los archivos borrados exceden este límite, la app borra los archivos más antiguos hasta volver a estar por debajo del límite. Más información disponible en la documentación de Archivos eliminados.",
- "No deleted files" : "No hay ningún archivo eliminado",
+ "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Esta aplicación permite a los usuarios recuperar archivos borrados del sistema. Muestra una lista de los archivos borrados en la interfaz web y tiene opciones para restaurar esos archivos borrados a los directorios del usuario o eliminarlos permanentemente del sistema. Restaurar un archivo también restaura las versiones del archivo relacionadas. Cuando un archivo se borra de una compartición, no se puede restaurar de la misma forma, pues ya no será compartido. Por defecto, estos archivos permanecen en la papelera de reciclaje durante 30 días.\nPara evitar que un usuario se quede sin espacio de disco, la app no utilizará más del 50% del espacio disponible a cada momento. Si los archivos borrados exceden este límite, la app borra los archivos más antiguos hasta volver a estar por debajo del límite. Más información disponible en la documentación de Archivos Eliminados.",
+ "No deleted files" : "No hay archivos eliminados",
"You will be able to recover deleted files from here" : "Desde aquí se podrán recuperar archivos eliminados",
- "No entries found in this folder" : "No hay entradas en esta carpeta",
+ "No entries found in this folder" : "No hay nada en esta carpeta",
"Select all" : "Seleccionar todo",
"Name" : "Nombre",
"Actions" : "Acciones",
diff --git a/apps/files_trashbin/l10n/es.json b/apps/files_trashbin/l10n/es.json
index 8bd5def36ddc0..5cb17f10da1ea 100644
--- a/apps/files_trashbin/l10n/es.json
+++ b/apps/files_trashbin/l10n/es.json
@@ -7,13 +7,13 @@
"Delete permanently" : "Eliminar permanentemente",
"Error" : "Error",
"This operation is forbidden" : "Esta operación está prohibida",
- "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contáctese con el administrador",
+ "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contacte con el administrador",
"restored" : "recuperado",
"This application enables users to restore files that were deleted from the system." : "Esta app permite a los usuarios recuperar archivos borrados del sistema.",
- "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Esta aplicación permite a los usuarios recuperar archivos borrados del sistema. Muestra una lista de los archivos borrados en la interfaz web y tiene opciones para restaurar esos archivos borrados a los directorios del usuario o eliminarlos permanentemente del sistema. Restaurar un archivo también restaura las versiones del archivo relacionadas. Cuando un archivo se borra de una compartición, no se puede restaurar de la misma forma, pues ya no será compartido. Por defecto, estos archivos permanecen en la papelera de reciclaje durante 30 días.\nPara evitar que un usuario se quede sin espacio de disco, la app no utilizará más del 50% del espacio disponible a cada momento. Si los archivos borrados exceden este límite, la app borra los archivos más antiguos hasta volver a estar por debajo del límite. Más información disponible en la documentación de Archivos eliminados.",
- "No deleted files" : "No hay ningún archivo eliminado",
+ "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Esta aplicación permite a los usuarios recuperar archivos borrados del sistema. Muestra una lista de los archivos borrados en la interfaz web y tiene opciones para restaurar esos archivos borrados a los directorios del usuario o eliminarlos permanentemente del sistema. Restaurar un archivo también restaura las versiones del archivo relacionadas. Cuando un archivo se borra de una compartición, no se puede restaurar de la misma forma, pues ya no será compartido. Por defecto, estos archivos permanecen en la papelera de reciclaje durante 30 días.\nPara evitar que un usuario se quede sin espacio de disco, la app no utilizará más del 50% del espacio disponible a cada momento. Si los archivos borrados exceden este límite, la app borra los archivos más antiguos hasta volver a estar por debajo del límite. Más información disponible en la documentación de Archivos Eliminados.",
+ "No deleted files" : "No hay archivos eliminados",
"You will be able to recover deleted files from here" : "Desde aquí se podrán recuperar archivos eliminados",
- "No entries found in this folder" : "No hay entradas en esta carpeta",
+ "No entries found in this folder" : "No hay nada en esta carpeta",
"Select all" : "Seleccionar todo",
"Name" : "Nombre",
"Actions" : "Acciones",
diff --git a/apps/files_trashbin/l10n/nl.js b/apps/files_trashbin/l10n/nl.js
index e5d4c0d846efd..08a17d0fb33e4 100644
--- a/apps/files_trashbin/l10n/nl.js
+++ b/apps/files_trashbin/l10n/nl.js
@@ -11,6 +11,7 @@ OC.L10N.register(
"This operation is forbidden" : "Deze taak is verboden",
"This directory is unavailable, please check the logs or contact the administrator" : "Deze map is niet beschikbaar. Verifieer de logs of neem contact op met de beheerder",
"restored" : "hersteld",
+ "This application enables users to restore files that were deleted from the system." : "Deze applicatie stelt gebruikers in staat om verwijderde bestanden te herstellen.",
"No deleted files" : "Geen verwijderde bestanden",
"You will be able to recover deleted files from here" : "Je kunt verwijderde bestanden hier vandaan weer terugzetten",
"No entries found in this folder" : "Niets gevonden in deze map",
diff --git a/apps/files_trashbin/l10n/nl.json b/apps/files_trashbin/l10n/nl.json
index eda32da6ee358..f28ba2aca1717 100644
--- a/apps/files_trashbin/l10n/nl.json
+++ b/apps/files_trashbin/l10n/nl.json
@@ -9,6 +9,7 @@
"This operation is forbidden" : "Deze taak is verboden",
"This directory is unavailable, please check the logs or contact the administrator" : "Deze map is niet beschikbaar. Verifieer de logs of neem contact op met de beheerder",
"restored" : "hersteld",
+ "This application enables users to restore files that were deleted from the system." : "Deze applicatie stelt gebruikers in staat om verwijderde bestanden te herstellen.",
"No deleted files" : "Geen verwijderde bestanden",
"You will be able to recover deleted files from here" : "Je kunt verwijderde bestanden hier vandaan weer terugzetten",
"No entries found in this folder" : "Niets gevonden in deze map",
diff --git a/apps/files_versions/composer/composer/ClassLoader.php b/apps/files_versions/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/files_versions/composer/composer/ClassLoader.php
+++ b/apps/files_versions/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/files_versions/l10n/es.js b/apps/files_versions/l10n/es.js
index 5025305535d4e..f456785e688a8 100644
--- a/apps/files_versions/l10n/es.js
+++ b/apps/files_versions/l10n/es.js
@@ -1,9 +1,9 @@
OC.L10N.register(
"files_versions",
{
- "Could not revert: %s" : "No se puede revertir: %s",
- "Versions" : "Revisiones",
- "Failed to revert {file} to revision {timestamp}." : "No se ha podido revertir {archivo} a revisión {timestamp}.",
+ "Could not revert: %s" : "No se puede restaurar: %s",
+ "Versions" : "Versiones",
+ "Failed to revert {file} to revision {timestamp}." : "No se ha podido restaurar {file} a versión {timestamp}.",
"_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
"Restore" : "Recuperar",
"No earlier versions available" : "No hay versiones previas disponibles",
diff --git a/apps/files_versions/l10n/es.json b/apps/files_versions/l10n/es.json
index 66fdd9bf3213e..3e30c5c6bbf63 100644
--- a/apps/files_versions/l10n/es.json
+++ b/apps/files_versions/l10n/es.json
@@ -1,7 +1,7 @@
{ "translations": {
- "Could not revert: %s" : "No se puede revertir: %s",
- "Versions" : "Revisiones",
- "Failed to revert {file} to revision {timestamp}." : "No se ha podido revertir {archivo} a revisión {timestamp}.",
+ "Could not revert: %s" : "No se puede restaurar: %s",
+ "Versions" : "Versiones",
+ "Failed to revert {file} to revision {timestamp}." : "No se ha podido restaurar {file} a versión {timestamp}.",
"_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
"Restore" : "Recuperar",
"No earlier versions available" : "No hay versiones previas disponibles",
diff --git a/apps/files_versions/l10n/nl.js b/apps/files_versions/l10n/nl.js
index 83f2de4b3657d..53566679ab834 100644
--- a/apps/files_versions/l10n/nl.js
+++ b/apps/files_versions/l10n/nl.js
@@ -7,6 +7,7 @@ OC.L10N.register(
"_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
"Restore" : "Herstellen",
"No earlier versions available" : "Geen oudere versies beschikbaar",
- "More versions …" : "Meer versies..."
+ "More versions …" : "Meer versies...",
+ "This application automatically maintains older versions of files that are changed." : "Deze applicatie handhaaft automatisch oudere versies van gewijzigde bestanden."
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/nl.json b/apps/files_versions/l10n/nl.json
index 59554c81316a1..1b93acc7b27e2 100644
--- a/apps/files_versions/l10n/nl.json
+++ b/apps/files_versions/l10n/nl.json
@@ -5,6 +5,7 @@
"_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
"Restore" : "Herstellen",
"No earlier versions available" : "Geen oudere versies beschikbaar",
- "More versions …" : "Meer versies..."
+ "More versions …" : "Meer versies...",
+ "This application automatically maintains older versions of files that are changed." : "Deze applicatie handhaaft automatisch oudere versies van gewijzigde bestanden."
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
\ No newline at end of file
diff --git a/apps/lookup_server_connector/composer/composer/ClassLoader.php b/apps/lookup_server_connector/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/lookup_server_connector/composer/composer/ClassLoader.php
+++ b/apps/lookup_server_connector/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/oauth2/composer/composer/ClassLoader.php b/apps/oauth2/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/oauth2/composer/composer/ClassLoader.php
+++ b/apps/oauth2/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/oauth2/l10n/nl.js b/apps/oauth2/l10n/nl.js
index a493ad06962ae..ed9c5a41930d4 100644
--- a/apps/oauth2/l10n/nl.js
+++ b/apps/oauth2/l10n/nl.js
@@ -1,7 +1,10 @@
OC.L10N.register(
"oauth2",
{
+ "Your redirect URL needs to be a full URL for example: https://yourdomain.com/path" : "Je doorverwijzings-URL moet een volledige URL zijn, bijvoorbeeld: https://jouwdomein.com/pad",
"OAuth 2.0" : "OAuth 2.0",
+ "Allows OAuth2 compatible authentication from other web applications." : "Staat OAuth2 compatible authenticatie vanaf andere web applicaties toe.",
+ "The OAuth2 app allows administrators to configure the built-in authentication workflow to also allow OAuth2 compatible authentication from other web applications." : "De OAuth2 app laat beheerders de ingebouwde inlog-workflow configureren om ook OAuth2 compatible authenticatie vanaf andere web applicaties mogelijk te maken.",
"OAuth 2.0 clients" : "OAuth 2.0 Clients",
"Name" : "Naam",
"Client Identifier" : "Client identificatie",
diff --git a/apps/oauth2/l10n/nl.json b/apps/oauth2/l10n/nl.json
index 18ffc60f7a9d9..64d44b4f13421 100644
--- a/apps/oauth2/l10n/nl.json
+++ b/apps/oauth2/l10n/nl.json
@@ -1,5 +1,8 @@
{ "translations": {
+ "Your redirect URL needs to be a full URL for example: https://yourdomain.com/path" : "Je doorverwijzings-URL moet een volledige URL zijn, bijvoorbeeld: https://jouwdomein.com/pad",
"OAuth 2.0" : "OAuth 2.0",
+ "Allows OAuth2 compatible authentication from other web applications." : "Staat OAuth2 compatible authenticatie vanaf andere web applicaties toe.",
+ "The OAuth2 app allows administrators to configure the built-in authentication workflow to also allow OAuth2 compatible authentication from other web applications." : "De OAuth2 app laat beheerders de ingebouwde inlog-workflow configureren om ook OAuth2 compatible authenticatie vanaf andere web applicaties mogelijk te maken.",
"OAuth 2.0 clients" : "OAuth 2.0 Clients",
"Name" : "Naam",
"Client Identifier" : "Client identificatie",
diff --git a/apps/provisioning_api/composer/composer/ClassLoader.php b/apps/provisioning_api/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/provisioning_api/composer/composer/ClassLoader.php
+++ b/apps/provisioning_api/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/sharebymail/composer/composer/ClassLoader.php b/apps/sharebymail/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/sharebymail/composer/composer/ClassLoader.php
+++ b/apps/sharebymail/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/sharebymail/l10n/nl.js b/apps/sharebymail/l10n/nl.js
index 8692aefd15a83..3adc9e797bc7e 100644
--- a/apps/sharebymail/l10n/nl.js
+++ b/apps/sharebymail/l10n/nl.js
@@ -29,6 +29,8 @@ OC.L10N.register(
"Password to access »%s« shared to you by %s" : "Toegangswachtwoord »%s« gedeeld met je door %s",
"Password to access »%s«" : "Wachtwoord om binnen te komen »%s«",
"It is protected with the following password: %s" : "Het is beveiligd met het volgende wachtwoord: %s",
+ "%1$s shared »%2$s« with you and wants to add:" : "%1$s deelde »%2$s« met jou en wil toevoegen:",
+ "%1$s shared »%2$s« with you and wants to add" : "%1$s deelde »%2$s« met jou en wil toevoegen",
"You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient." : "Je deelde »%s« met %s. De link is al gestuurd naar de geadresseerde. Vanwege de beveiligingsinstellingen, zoals ingesteld door de beheerder van %s, moet het delen worden beveiligd met een wachtwoord en is het niet toegestaan het wachtwoord rechtstreeks naar de ontvanger te versturen. Hierdoor moet je het wachtwoord zelf handmatig naar de ontvanger sturen.",
"Password to access »%s« shared with %s" : "Wachtwoord voor toegang »%s« gedeeld met %s",
"This is the password: %s" : "Dit is het wachtwoord: %s",
diff --git a/apps/sharebymail/l10n/nl.json b/apps/sharebymail/l10n/nl.json
index c304f3a9dbd03..33ce0439d3ff7 100644
--- a/apps/sharebymail/l10n/nl.json
+++ b/apps/sharebymail/l10n/nl.json
@@ -27,6 +27,8 @@
"Password to access »%s« shared to you by %s" : "Toegangswachtwoord »%s« gedeeld met je door %s",
"Password to access »%s«" : "Wachtwoord om binnen te komen »%s«",
"It is protected with the following password: %s" : "Het is beveiligd met het volgende wachtwoord: %s",
+ "%1$s shared »%2$s« with you and wants to add:" : "%1$s deelde »%2$s« met jou en wil toevoegen:",
+ "%1$s shared »%2$s« with you and wants to add" : "%1$s deelde »%2$s« met jou en wil toevoegen",
"You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient." : "Je deelde »%s« met %s. De link is al gestuurd naar de geadresseerde. Vanwege de beveiligingsinstellingen, zoals ingesteld door de beheerder van %s, moet het delen worden beveiligd met een wachtwoord en is het niet toegestaan het wachtwoord rechtstreeks naar de ontvanger te versturen. Hierdoor moet je het wachtwoord zelf handmatig naar de ontvanger sturen.",
"Password to access »%s« shared with %s" : "Wachtwoord voor toegang »%s« gedeeld met %s",
"This is the password: %s" : "Dit is het wachtwoord: %s",
diff --git a/apps/systemtags/composer/composer/ClassLoader.php b/apps/systemtags/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/systemtags/composer/composer/ClassLoader.php
+++ b/apps/systemtags/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/systemtags/l10n/nl.js b/apps/systemtags/l10n/nl.js
index 57bbf88f86200..bd481cdc8dc90 100644
--- a/apps/systemtags/l10n/nl.js
+++ b/apps/systemtags/l10n/nl.js
@@ -43,6 +43,7 @@ OC.L10N.register(
"System tags for a file have been modified" : "Systeemmarkeringen voor een bestand zijn gewijzigd",
"Collaborative tags" : "Systeemtags",
"Select tag …" : "Selecteer tag …",
+ "Create a new tag" : "Creëren nieuw tag",
"Name" : "Tag",
"Public" : "Standaard",
"Restricted" : "Beschermd",
diff --git a/apps/systemtags/l10n/nl.json b/apps/systemtags/l10n/nl.json
index d1a6e9210c0df..151e3783cb57c 100644
--- a/apps/systemtags/l10n/nl.json
+++ b/apps/systemtags/l10n/nl.json
@@ -41,6 +41,7 @@
"System tags for a file have been modified" : "Systeemmarkeringen voor een bestand zijn gewijzigd",
"Collaborative tags" : "Systeemtags",
"Select tag …" : "Selecteer tag …",
+ "Create a new tag" : "Creëren nieuw tag",
"Name" : "Tag",
"Public" : "Standaard",
"Restricted" : "Beschermd",
diff --git a/apps/testing/composer/composer/ClassLoader.php b/apps/testing/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/testing/composer/composer/ClassLoader.php
+++ b/apps/testing/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss
index c67d48d46fe2d..1915a953f4a68 100644
--- a/apps/theming/css/settings-admin.scss
+++ b/apps/theming/css/settings-admin.scss
@@ -26,6 +26,8 @@
vertical-align: top;
display: inline-block;
visibility: hidden;
+ height: 32px;
+ width: 32px;
}
form.uploadButton {
width: 411px;
diff --git a/apps/theming/l10n/nl.js b/apps/theming/l10n/nl.js
index 6ebd8bf7296c2..eaf268cf401df 100644
--- a/apps/theming/l10n/nl.js
+++ b/apps/theming/l10n/nl.js
@@ -8,6 +8,8 @@ OC.L10N.register(
"Name cannot be empty" : "Naam mag niet leeg zijn",
"The given name is too long" : "De opgegeven naam is te lang",
"The given web address is too long" : "Het opgegeven internetadres is te lang",
+ "The given legal notice address is too long" : "Het opgegeven adres voor de juridische melding is te lang",
+ "The given privacy policy address is too long" : "Het opgegeven adres met privacybeleid is te lang",
"The given slogan is too long" : "De opgegeven slagzin is te lang",
"The given color is invalid" : "De opgegeven kleur is ongeldig",
"The file was uploaded" : "Het bestand werd geüpload",
@@ -24,9 +26,11 @@ OC.L10N.register(
"Theming" : "Uiterlijk",
"Legal notice" : "Juridische bepalingen",
"Privacy policy" : "Privacybeleid",
+ "Adjust the Nextcloud theme" : "Nextcloud thema bijstellen",
"Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Thematiseren maakt het mogelijk om uiterlijk en gevoel van je systeem en ondersteunde clients aan te passen. Dit wordt zichtbaar voor alle gebruikers.",
"Name" : "Naam",
"Reset to default" : "Herstellen naar standaard",
+ "Web link" : "Weblink",
"https://…" : "https://…",
"Slogan" : "Slagzin",
"Color" : "Kleur",
@@ -36,6 +40,7 @@ OC.L10N.register(
"Upload new login background" : "Uploaden nieuwe inlog achtergrond",
"Remove background image" : "Achtergrond beeld verwijderen",
"Advanced options" : "Geavanceerde opties",
+ "Legal notice link" : "Link naar juridische bepalingen",
"Privacy policy link" : "Privacybeleid link",
"Header logo" : "Top logo",
"Upload new header logo" : "Upload een nieuwe top afbeelding",
diff --git a/apps/theming/l10n/nl.json b/apps/theming/l10n/nl.json
index 93d86329c696a..4e8306a8b1da9 100644
--- a/apps/theming/l10n/nl.json
+++ b/apps/theming/l10n/nl.json
@@ -6,6 +6,8 @@
"Name cannot be empty" : "Naam mag niet leeg zijn",
"The given name is too long" : "De opgegeven naam is te lang",
"The given web address is too long" : "Het opgegeven internetadres is te lang",
+ "The given legal notice address is too long" : "Het opgegeven adres voor de juridische melding is te lang",
+ "The given privacy policy address is too long" : "Het opgegeven adres met privacybeleid is te lang",
"The given slogan is too long" : "De opgegeven slagzin is te lang",
"The given color is invalid" : "De opgegeven kleur is ongeldig",
"The file was uploaded" : "Het bestand werd geüpload",
@@ -22,9 +24,11 @@
"Theming" : "Uiterlijk",
"Legal notice" : "Juridische bepalingen",
"Privacy policy" : "Privacybeleid",
+ "Adjust the Nextcloud theme" : "Nextcloud thema bijstellen",
"Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Thematiseren maakt het mogelijk om uiterlijk en gevoel van je systeem en ondersteunde clients aan te passen. Dit wordt zichtbaar voor alle gebruikers.",
"Name" : "Naam",
"Reset to default" : "Herstellen naar standaard",
+ "Web link" : "Weblink",
"https://…" : "https://…",
"Slogan" : "Slagzin",
"Color" : "Kleur",
@@ -34,6 +38,7 @@
"Upload new login background" : "Uploaden nieuwe inlog achtergrond",
"Remove background image" : "Achtergrond beeld verwijderen",
"Advanced options" : "Geavanceerde opties",
+ "Legal notice link" : "Link naar juridische bepalingen",
"Privacy policy link" : "Privacybeleid link",
"Header logo" : "Top logo",
"Upload new header logo" : "Upload een nieuwe top afbeelding",
diff --git a/apps/twofactor_backupcodes/composer/composer/ClassLoader.php b/apps/twofactor_backupcodes/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/twofactor_backupcodes/composer/composer/ClassLoader.php
+++ b/apps/twofactor_backupcodes/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/twofactor_backupcodes/l10n/nl.js b/apps/twofactor_backupcodes/l10n/nl.js
index 3bad60ac7cc3a..c2f796c099b3c 100644
--- a/apps/twofactor_backupcodes/l10n/nl.js
+++ b/apps/twofactor_backupcodes/l10n/nl.js
@@ -14,6 +14,7 @@ OC.L10N.register(
"Backup code" : "Backup code",
"Use backup code" : "Gebruik backup code",
"Two factor backup codes" : "Twee-factor backupcode",
+ "A two-factor auth backup codes provider" : "Een two-factor auth backup codes provider",
"Second-factor backup codes" : "Twee-factor backup code"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/twofactor_backupcodes/l10n/nl.json b/apps/twofactor_backupcodes/l10n/nl.json
index 02881d944b22d..151a340d118e6 100644
--- a/apps/twofactor_backupcodes/l10n/nl.json
+++ b/apps/twofactor_backupcodes/l10n/nl.json
@@ -12,6 +12,7 @@
"Backup code" : "Backup code",
"Use backup code" : "Gebruik backup code",
"Two factor backup codes" : "Twee-factor backupcode",
+ "A two-factor auth backup codes provider" : "Een two-factor auth backup codes provider",
"Second-factor backup codes" : "Twee-factor backup code"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
\ No newline at end of file
diff --git a/apps/updatenotification/composer/composer/ClassLoader.php b/apps/updatenotification/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/updatenotification/composer/composer/ClassLoader.php
+++ b/apps/updatenotification/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/updatenotification/l10n/nl.js b/apps/updatenotification/l10n/nl.js
index 4cd9a5c02c64f..3af01a6209729 100644
--- a/apps/updatenotification/l10n/nl.js
+++ b/apps/updatenotification/l10n/nl.js
@@ -10,6 +10,7 @@ OC.L10N.register(
"Update for %1$s to version %2$s is available." : "Update voor %1$s naar versie %2$s is beschikbaar.",
"Update for {app} to version %s is available." : "Update voor {app} naar versie %s is beschikbaar.",
"Update notification" : "Bijwerkmelding",
+ "Displays update notifications for Nextcloud and provides the SSO for the updater." : "Toont updatemeldingen voor Nextcloud en zorgt voor SSO voor de updater.",
"Apps with available updates" : "Apps met beschikbare updates",
"Open updater" : "Open updater",
"What's new?" : "Wat is nieuw?",
diff --git a/apps/updatenotification/l10n/nl.json b/apps/updatenotification/l10n/nl.json
index df965cbbdada4..8c381a259954f 100644
--- a/apps/updatenotification/l10n/nl.json
+++ b/apps/updatenotification/l10n/nl.json
@@ -8,6 +8,7 @@
"Update for %1$s to version %2$s is available." : "Update voor %1$s naar versie %2$s is beschikbaar.",
"Update for {app} to version %s is available." : "Update voor {app} naar versie %s is beschikbaar.",
"Update notification" : "Bijwerkmelding",
+ "Displays update notifications for Nextcloud and provides the SSO for the updater." : "Toont updatemeldingen voor Nextcloud en zorgt voor SSO voor de updater.",
"Apps with available updates" : "Apps met beschikbare updates",
"Open updater" : "Open updater",
"What's new?" : "Wat is nieuw?",
diff --git a/apps/updatenotification/l10n/zh_CN.js b/apps/updatenotification/l10n/zh_CN.js
index 948b37b8de568..962cdb9acba42 100644
--- a/apps/updatenotification/l10n/zh_CN.js
+++ b/apps/updatenotification/l10n/zh_CN.js
@@ -4,12 +4,13 @@ OC.L10N.register(
"{version} is available. Get more information on how to update." : "新版本 {version} 已可以使用。获取更多升级相关信息。",
"Update notifications" : "升级通知",
"Channel updated" : "更新通道",
- "The update server could not be reached since %d days to check for new updates." : "更新服务器自 1%d 天前起无法访问以检查更新。",
+ "The update server could not be reached since %d days to check for new updates." : "更新服务器自 %d 天前起无法访问以检查更新。",
"Please check the Nextcloud and server log files for errors." : "请检查 nextcloud 和服务器的日志中的错误。",
"Update to %1$s is available." : " 可以更新到 %1$s 。",
"Update for %1$s to version %2$s is available." : "可以从 %1$s 版本更新到 %2$s 版本。",
"Update for {app} to version %s is available." : "可以将您的 {app} 更新到版本 %s 。",
"Update notification" : "更新通知",
+ "Displays update notifications for Nextcloud and provides the SSO for the updater." : "显示 Nextcloud 的更新提示，并提供更新器的认证页面。",
"Apps with available updates" : "有可用更新的应用",
"Open updater" : "打开更新器",
"What's new?" : "有哪些更新？",
@@ -22,6 +23,7 @@ OC.L10N.register(
"Only notification for app updates are available." : "仅提醒应用更新就绪。",
"The selected update channel does not support updates of the server." : "选中的更新通道不支持服务器升级。",
"A new version is available: {newVersionString}" : "有可用的新版本： {newVersionString}",
+ "Checked on {lastCheckedDate}" : "检查时间 {lastCheckedDate}",
"Checking apps for compatible updates" : "检查应用以匹配更新",
"Please make sure your config.php does not set appstoreenabled to false." : "请确认 config.php 没有设置appstoreenabled 为 false.",
"Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore." : "无法连接到应用商店, 或者应用商店返回无可用更新。请手动搜索更新，或者是确认您的服务器能访问互联网，并能连接到应用商店。",
diff --git a/apps/updatenotification/l10n/zh_CN.json b/apps/updatenotification/l10n/zh_CN.json
index 5d5dac6c86b28..d33f6b9769397 100644
--- a/apps/updatenotification/l10n/zh_CN.json
+++ b/apps/updatenotification/l10n/zh_CN.json
@@ -2,12 +2,13 @@
"{version} is available. Get more information on how to update." : "新版本 {version} 已可以使用。获取更多升级相关信息。",
"Update notifications" : "升级通知",
"Channel updated" : "更新通道",
- "The update server could not be reached since %d days to check for new updates." : "更新服务器自 1%d 天前起无法访问以检查更新。",
+ "The update server could not be reached since %d days to check for new updates." : "更新服务器自 %d 天前起无法访问以检查更新。",
"Please check the Nextcloud and server log files for errors." : "请检查 nextcloud 和服务器的日志中的错误。",
"Update to %1$s is available." : " 可以更新到 %1$s 。",
"Update for %1$s to version %2$s is available." : "可以从 %1$s 版本更新到 %2$s 版本。",
"Update for {app} to version %s is available." : "可以将您的 {app} 更新到版本 %s 。",
"Update notification" : "更新通知",
+ "Displays update notifications for Nextcloud and provides the SSO for the updater." : "显示 Nextcloud 的更新提示，并提供更新器的认证页面。",
"Apps with available updates" : "有可用更新的应用",
"Open updater" : "打开更新器",
"What's new?" : "有哪些更新？",
@@ -20,6 +21,7 @@
"Only notification for app updates are available." : "仅提醒应用更新就绪。",
"The selected update channel does not support updates of the server." : "选中的更新通道不支持服务器升级。",
"A new version is available: {newVersionString}" : "有可用的新版本： {newVersionString}",
+ "Checked on {lastCheckedDate}" : "检查时间 {lastCheckedDate}",
"Checking apps for compatible updates" : "检查应用以匹配更新",
"Please make sure your config.php does not set appstoreenabled to false." : "请确认 config.php 没有设置appstoreenabled 为 false.",
"Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore." : "无法连接到应用商店, 或者应用商店返回无可用更新。请手动搜索更新，或者是确认您的服务器能访问互联网，并能连接到应用商店。",
diff --git a/apps/updatenotification/lib/Settings/Admin.php b/apps/updatenotification/lib/Settings/Admin.php
index cae62ee0a9f2e..54adf558224c9 100644
--- a/apps/updatenotification/lib/Settings/Admin.php
+++ b/apps/updatenotification/lib/Settings/Admin.php
@@ -114,7 +114,7 @@ public function getForm(): TemplateResponse {
return new TemplateResponse('updatenotification', 'admin', $params, '');
}
- protected function filterChanges(array $changes) {
+ protected function filterChanges(array $changes): array {
$filtered = [];
if(isset($changes['changelogURL'])) {
$filtered['changelogURL'] = $changes['changelogURL'];
@@ -127,7 +127,8 @@ protected function filterChanges(array $changes) {
do {
$lang = $iterator->current();
if(isset($changes['whatsNew'][$lang])) {
- return $filtered['whatsNew'][$lang];
+ $filtered['whatsNew'] = $changes['whatsNew'][$lang];
+ return $filtered;
}
$iterator->next();
} while($lang !== 'en' && $iterator->valid());
diff --git a/apps/updatenotification/tests/Settings/AdminTest.php b/apps/updatenotification/tests/Settings/AdminTest.php
index d0d53226490c7..d1f44367a1cea 100644
--- a/apps/updatenotification/tests/Settings/AdminTest.php
+++ b/apps/updatenotification/tests/Settings/AdminTest.php
@@ -34,6 +34,7 @@
use OCP\IGroupManager;
use OCP\IUserSession;
use OCP\L10N\IFactory;
+use OCP\L10N\ILanguageIterator;
use OCP\Util;
use Test\TestCase;
@@ -153,4 +154,78 @@ public function testGetSection() {
public function testGetPriority() {
$this->assertSame(11, $this->admin->getPriority());
}
+
+ public function changesProvider() {
+ return [
+ [ #0, all info, en
+ [
+ 'changelogURL' => 'https://go.to.changelog',
+ 'whatsNew' => [
+ 'en' => [
+ 'regular' => ['content'],
+ ],
+ 'de' => [
+ 'regular' => ['inhalt'],
+ ]
+ ],
+ ],
+ 'en',
+ [
+ 'changelogURL' => 'https://go.to.changelog',
+ 'whatsNew' => [
+ 'regular' => ['content'],
+ ],
+ ]
+ ],
+ [ #1, all info, de
+ [
+ 'changelogURL' => 'https://go.to.changelog',
+ 'whatsNew' => [
+ 'en' => [
+ 'regular' => ['content'],
+ ],
+ 'de' => [
+ 'regular' => ['inhalt'],
+ ]
+ ],
+ ],
+ 'de',
+ [
+ 'changelogURL' => 'https://go.to.changelog',
+ 'whatsNew' => [
+ 'regular' => ['inhalt'],
+ ]
+ ],
+ ],
+ [ #2, just changelog
+ [ 'changelogURL' => 'https://go.to.changelog' ],
+ 'en',
+ [ 'changelogURL' => 'https://go.to.changelog' ],
+ ],
+ [ #3 nothing
+ [],
+ 'ru',
+ []
+ ]
+ ];
+ }
+
+ /**
+ * @dataProvider changesProvider
+ */
+ public function testFilterChanges($changes, $userLang, $expectation) {
+ $iterator = $this->createMock(ILanguageIterator::class);
+ $iterator->expects($this->any())
+ ->method('current')
+ ->willReturnOnConsecutiveCalls('es', $userLang, 'it', 'en');
+ $iterator->expects($this->any())
+ ->method('valid')
+ ->willReturn(true);
+
+ $this->l10nFactory->expects($this->atMost(1))
+ ->method('getLanguageIterator')
+ ->willReturn($iterator);
+ $result = $this->invokePrivate($this->admin, 'filterChanges', [$changes]);
+ $this->assertSame($expectation, $result);
+ }
}
diff --git a/apps/user_ldap/composer/composer/ClassLoader.php b/apps/user_ldap/composer/composer/ClassLoader.php
index dc02dfb114fb6..95f7e0978bad1 100644
--- a/apps/user_ldap/composer/composer/ClassLoader.php
+++ b/apps/user_ldap/composer/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
- $search = $subPath.'\\';
+ $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/apps/user_ldap/l10n/he.js b/apps/user_ldap/l10n/he.js
index 8cae171d6750b..2be5d911e646a 100644
--- a/apps/user_ldap/l10n/he.js
+++ b/apps/user_ldap/l10n/he.js
@@ -45,6 +45,8 @@ OC.L10N.register(
"Mode switch" : "שינוי מצב",
"Select attributes" : "בחירת מאפיינים",
"User found and settings verified." : "משתמש אותר והגדרות אומתו.",
+ "Consider narrowing your search, as it encompassed many users, only the first one of whom will be able to log in." : "מוטב לשקול לצמצם את החיפוש שלך, כיוון שהוא מאגד בתוכו משתמשים רבים, רק הראשון מביניהם יוכל להיכנס.",
+ "An unspecified error occurred. Please check log and settings." : "אירעה שגיאה בלתי מוגדרת. נא לבדוק את יומן הרישום וההגדרות.",
"The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "סינון החיפוש אינו חוקי. ככל הנראה בשל שיאה תחבירית כגון מספר לא שווה של פתח-סוגריים וסגור-סוגריים. יש לתקן.",
"A connection error to LDAP / AD occurred, please check host, port and credentials." : "אירעה שגיאת חיבור ל- LDAP / AD, יש לבדוק את השרת, שער החיבור - פורט ופרטי הכניסה. ",
"Please provide a login name to test against" : "יש לספק שם משתמש לבדיקה מולו",
@@ -57,8 +59,10 @@ OC.L10N.register(
"LDAP / AD integration" : "שילוב של LDAP / AD",
"_%s group found_::_%s groups found_" : ["אותרה %s קבוצה","אותרו %s קבוצות","אותרו %s קבוצות","אותרו %s קבוצות"],
"_%s user found_::_%s users found_" : ["אותר %s משתמש","אותרו %s משתמשים","אותרו %s משתמשים","אותרו %s משתמשים"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced LDAP settings." : "לא ניתן לאתר את מאפיין שם תצוגת המשתמש. נא לציין אותו בעצמך בהגדרות ה־LDAP המתקדמות.",
"Could not find the desired feature" : "לא אותרה התכונה הרצויה",
"Invalid Host" : "מארח לא חוקי",
+ "This application enables administrators to connect Nextcloud to an LDAP-based user directory." : "יישומון זה מאפשר למנהלים להתחבר את Nextcloud לספריית משתמשים מבוססת LDAP.",
"Test Configuration" : "בדיקת הגדרות",
"Help" : "עזרה",
"Groups meeting these criteria are available in %s:" : "קבוצות העומדות בקריטריון זה זמינות ב- %s:",
@@ -146,6 +150,7 @@ OC.L10N.register(
"Nested Groups" : "קבוצות משנה",
"Paging chunksize" : "Paging chunksize",
"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize משמש לחיפושי paged LDAP שעלולים להחזיר תוצאות גסות כמו ספירת משתמש או קבוצה. (הגדרה כ- 0 מנטרל חיפושי paged LDAP במצבים אלה.)",
+ "Enable LDAP password changes per user" : "הפעלת החלפות ססמה ב־LDAP לפי משתמש",
"(New password is sent as plain text to LDAP)" : "(הססמה החדשה נשלחת כטקסט בלתי מוצפן ל־LDAP)",
"Special Attributes" : "מאפיינים מיוחדים",
"Quota Field" : "שדה מכסה",
diff --git a/apps/user_ldap/l10n/he.json b/apps/user_ldap/l10n/he.json
index 96c5164528dc0..234187eac50f6 100644
--- a/apps/user_ldap/l10n/he.json
+++ b/apps/user_ldap/l10n/he.json
@@ -43,6 +43,8 @@
"Mode switch" : "שינוי מצב",
"Select attributes" : "בחירת מאפיינים",
"User found and settings verified." : "משתמש אותר והגדרות אומתו.",
+ "Consider narrowing your search, as it encompassed many users, only the first one of whom will be able to log in." : "מוטב לשקול לצמצם את החיפוש שלך, כיוון שהוא מאגד בתוכו משתמשים רבים, רק הראשון מביניהם יוכל להיכנס.",
+ "An unspecified error occurred. Please check log and settings." : "אירעה שגיאה בלתי מוגדרת. נא לבדוק את יומן הרישום וההגדרות.",
"The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "סינון החיפוש אינו חוקי. ככל הנראה בשל שיאה תחבירית כגון מספר לא שווה של פתח-סוגריים וסגור-סוגריים. יש לתקן.",
"A connection error to LDAP / AD occurred, please check host, port and credentials." : "אירעה שגיאת חיבור ל- LDAP / AD, יש לבדוק את השרת, שער החיבור - פורט ופרטי הכניסה. ",
"Please provide a login name to test against" : "יש לספק שם משתמש לבדיקה מולו",
@@ -55,8 +57,10 @@
"LDAP / AD integration" : "שילוב של LDAP / AD",
"_%s group found_::_%s groups found_" : ["אותרה %s קבוצה","אותרו %s קבוצות","אותרו %s קבוצות","אותרו %s קבוצות"],
"_%s user found_::_%s users found_" : ["אותר %s משתמש","אותרו %s משתמשים","אותרו %s משתמשים","אותרו %s משתמשים"],
+ "Could not detect user display name attribute. Please specify it yourself in advanced LDAP settings." : "לא ניתן לאתר את מאפיין שם תצוגת המשתמש. נא לציין אותו בעצמך בהגדרות ה־LDAP המתקדמות.",
"Could not find the desired feature" : "לא אותרה התכונה הרצויה",
"Invalid Host" : "מארח לא חוקי",
+ "This application enables administrators to connect Nextcloud to an LDAP-based user directory." : "יישומון זה מאפשר למנהלים להתחבר את Nextcloud לספריית משתמשים מבוססת LDAP.",
"Test Configuration" : "בדיקת הגדרות",
"Help" : "עזרה",
"Groups meeting these criteria are available in %s:" : "קבוצות העומדות בקריטריון זה זמינות ב- %s:",
@@ -144,6 +148,7 @@
"Nested Groups" : "קבוצות משנה",
"Paging chunksize" : "Paging chunksize",
"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize משמש לחיפושי paged LDAP שעלולים להחזיר תוצאות גסות כמו ספירת משתמש או קבוצה. (הגדרה כ- 0 מנטרל חיפושי paged LDAP במצבים אלה.)",
+ "Enable LDAP password changes per user" : "הפעלת החלפות ססמה ב־LDAP לפי משתמש",
"(New password is sent as plain text to LDAP)" : "(הססמה החדשה נשלחת כטקסט בלתי מוצפן ל־LDAP)",
"Special Attributes" : "מאפיינים מיוחדים",
"Quota Field" : "שדה מכסה",
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index 91089e779a034..a03b4a4cb9c6a 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -609,23 +609,23 @@ public function dn2ocname($fdn, $ldapName = null, $isUser = true, &$newlyMapped
//NOTE: mind, disabling cache affects only this instance! Using it
// outside of core user management will still cache the user as non-existing.
$originalTTL = $this->connection->ldapCacheTTL;
- $this->connection->setConfiguration(array('ldapCacheTTL' => 0));
+ $this->connection->setConfiguration(['ldapCacheTTL' => 0]);
if(($isUser && $intName !== '' && !$this->ncUserManager->userExists($intName))
|| (!$isUser && !\OC::$server->getGroupManager()->groupExists($intName))) {
if($mapper->map($fdn, $intName, $uuid)) {
- $this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL));
- if($this->ncUserManager instanceof PublicEmitter) {
+ $this->connection->setConfiguration(['ldapCacheTTL' => $originalTTL]);
+ if($this->ncUserManager instanceof PublicEmitter && $isUser) {
$this->ncUserManager->emit('\OC\User', 'assignedUserId', [$intName]);
}
$newlyMapped = true;
return $intName;
}
}
- $this->connection->setConfiguration(array('ldapCacheTTL' => $originalTTL));
+ $this->connection->setConfiguration(['ldapCacheTTL' => $originalTTL]);
$altName = $this->createAltInternalOwnCloudName($intName, $isUser);
if(is_string($altName) && $mapper->map($fdn, $altName, $uuid)) {
- if($this->ncUserManager instanceof PublicEmitter) {
+ if($this->ncUserManager instanceof PublicEmitter && $isUser) {
$this->ncUserManager->emit('\OC\User', 'assignedUserId', [$intName]);
}
$newlyMapped = true;
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index ca7e0b304eae6..11ed02f47ab04 100644
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -318,11 +318,6 @@ public function userExistsOnLDAP($user) {
$dn = $user->getDN();
//check if user really still exists by reading its entry
if(!is_array($this->access->readAttribute($dn, '', $this->access->connection->ldapUserFilter))) {
- $lcr = $this->access->connection->getConnectionResource();
- if(is_null($lcr)) {
- throw new \Exception('No LDAP Connection to server ' . $this->access->connection->ldapHost);
- }
-
try {
$uuid = $this->access->getUserMapper()->getUUIDByDN($dn);
if (!$uuid) {
@@ -330,7 +325,7 @@ public function userExistsOnLDAP($user) {
}
$newDn = $this->access->getUserDnByUuid($uuid);
//check if renamed user is still valid by reapplying the ldap filter
- if (!is_array($this->access->readAttribute($newDn, '', $this->access->connection->ldapUserFilter))) {
+ if ($newDn === $dn || !is_array($this->access->readAttribute($newDn, '', $this->access->connection->ldapUserFilter))) {
return false;
}
$this->access->getUserMapper()->setDNbyUUID($newDn, $uuid);
@@ -376,9 +371,6 @@ public function userExists($uid) {
$result = $this->userExistsOnLDAP($user);
$this->access->connection->writeToCache('userExists'.$uid, $result);
- if($result === true) {
- $user->update();
- }
return $result;
}
diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php
deleted file mode 100644
index 87c2e408424d7..0000000000000
--- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestAccessGroupsMatchFilter.php
+++ /dev/null
@@ -1,127 +0,0 @@
-
- * @author Joas Schilling
- *
- * @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\User_LDAP\Tests\Integration\Lib;
-
-use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest;
-
-require_once __DIR__ . '/../Bootstrap.php';
-
-class IntegrationTestAccessGroupsMatchFilter extends AbstractIntegrationTest {
-
- /**
- * prepares the LDAP environment and sets up a test configuration for
- * the LDAP backend.
- */
- public function init() {
- require(__DIR__ . '/../setup-scripts/createExplicitUsers.php');
- require(__DIR__ . '/../setup-scripts/createExplicitGroups.php');
- require(__DIR__ . '/../setup-scripts/createExplicitGroupsDifferentOU.php');
- parent::init();
- }
-
- /**
- * tests whether the group filter works with one specific group, while the
- * input is the same.
- *
- * @return bool
- */
- protected function case1() {
- $this->connection->setConfiguration(['ldapGroupFilter' => 'cn=RedGroup']);
-
- $dns = ['cn=RedGroup,ou=Groups,' . $this->base];
- $result = $this->access->groupsMatchFilter($dns);
- return ($dns === $result);
- }
-
- /**
- * Tests whether a filter for limited groups is effective when more existing
- * groups were passed for validation.
- *
- * @return bool
- */
- protected function case2() {
- $this->connection->setConfiguration(['ldapGroupFilter' => '(|(cn=RedGroup)(cn=PurpleGroup))']);
-
- $dns = [
- 'cn=RedGroup,ou=Groups,' . $this->base,
- 'cn=BlueGroup,ou=Groups,' . $this->base,
- 'cn=PurpleGroup,ou=Groups,' . $this->base
- ];
- $result = $this->access->groupsMatchFilter($dns);
-
- $status =
- count($result) === 2
- && in_array('cn=RedGroup,ou=Groups,' . $this->base, $result)
- && in_array('cn=PurpleGroup,ou=Groups,' . $this->base, $result);
-
- return $status;
- }
-
- /**
- * Tests whether a filter for limited groups is effective when more existing
- * groups were passed for validation.
- *
- * @return bool
- */
- protected function case3() {
- $this->connection->setConfiguration(['ldapGroupFilter' => '(objectclass=groupOfNames)']);
-
- $dns = [
- 'cn=RedGroup,ou=Groups,' . $this->base,
- 'cn=PurpleGroup,ou=Groups,' . $this->base,
- 'cn=SquaredCircleGroup,ou=SpecialGroups,' . $this->base
- ];
- $result = $this->access->groupsMatchFilter($dns);
-
- $status =
- count($result) === 2
- && in_array('cn=RedGroup,ou=Groups,' . $this->base, $result)
- && in_array('cn=PurpleGroup,ou=Groups,' . $this->base, $result);
-
- return $status;
- }
-
- /**
- * sets up the LDAP configuration to be used for the test
- */
- protected function initConnection() {
- parent::initConnection();
- $this->connection->setConfiguration([
- 'ldapBaseGroups' => 'ou=Groups,' . $this->base,
- 'ldapUserFilter' => 'objectclass=inetOrgPerson',
- 'ldapUserDisplayName' => 'displayName',
- 'ldapGroupDisplayName' => 'cn',
- 'ldapLoginFilter' => 'uid=%uid',
- ]);
- }
-}
-
-/** @var string $host */
-/** @var int $port */
-/** @var string $adn */
-/** @var string $apwd */
-/** @var string $bdn */
-$test = new IntegrationTestAccessGroupsMatchFilter($host, $port, $adn, $apwd, $bdn);
-$test->init();
-$test->run();
diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php
deleted file mode 100644
index 0eef5507538e8..0000000000000
--- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php
+++ /dev/null
@@ -1,124 +0,0 @@
-
- * @author Joas Schilling
- *
- * @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\User_LDAP\Tests\Integration\Lib;
-
-use OC\ServerNotAvailableException;
-use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest;
-use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\User_LDAP\User_LDAP;
-
-require_once __DIR__ . '/../Bootstrap.php';
-
-class IntegrationTestBackupServer extends AbstractIntegrationTest {
- /** @var UserMapping */
- protected $mapping;
-
- /** @var User_LDAP */
- protected $backend;
-
- /**
- * sets up the LDAP configuration to be used for the test
- */
- protected function initConnection() {
- parent::initConnection();
- $originalHost = $this->connection->ldapHost;
- $originalPort = $this->connection->ldapPort;
- $this->connection->setConfiguration([
- 'ldapHost' => 'qwertz.uiop',
- 'ldapPort' => '32123',
- 'ldap_backup_host' => $originalHost,
- 'ldap_backup_port' => $originalPort,
- ]);
- }
-
- /**
- * tests that a backup connection is being used when the main LDAP server
- * is offline
- *
- * Beware: after starting docker, the LDAP host might not be ready yet, thus
- * causing a false positive. Retry in that case… or increase the sleep time
- * in run-test.sh
- *
- * @return bool
- */
- protected function case1() {
- try {
- $this->connection->getConnectionResource();
- } catch (ServerNotAvailableException $e) {
- return false;
- }
- return true;
- }
-
- /**
- * ensures that an exception is thrown if LDAP main server and LDAP backup
- * server are not available
- *
- * @return bool
- */
- protected function case2() {
- // reset possible LDAP connection
- $this->initConnection();
- try {
- $this->connection->setConfiguration([
- 'ldap_backup_host' => 'qwertz.uiop',
- 'ldap_backup_port' => '32123',
- ]);
- $this->connection->getConnectionResource();
- } catch (ServerNotAvailableException $e) {
- return true;
- }
- return false;
- }
-
- /**
- * ensures that an exception is thrown if main LDAP server is down and a
- * backup server is not given
- *
- * @return bool
- */
- protected function case3() {
- // reset possible LDAP connection
- $this->initConnection();
- try {
- $this->connection->setConfiguration([
- 'ldap_backup_host' => '',
- 'ldap_backup_port' => '',
- ]);
- $this->connection->getConnectionResource();
- } catch (ServerNotAvailableException $e) {
- return true;
- }
- return false;
- }
-}
-
-/** @var string $host */
-/** @var int $port */
-/** @var string $adn */
-/** @var string $apwd */
-/** @var string $bdn */
-$test = new IntegrationTestBackupServer($host, $port, $adn, $apwd, $bdn);
-$test->init();
-$test->run();
diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php
deleted file mode 100644
index 24476c9a8683c..0000000000000
--- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestBatchApplyUserAttributes.php
+++ /dev/null
@@ -1,81 +0,0 @@
-
- * @author Joas Schilling
- *
- * @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\User_LDAP\Tests\Integration\Lib;
-
-use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest;
-
-require_once __DIR__ . '/../Bootstrap.php';
-
-class IntegrationTestBatchApplyUserAttributes extends AbstractIntegrationTest {
- /** @var UserMapping */
- protected $mapping;
-
- /**
- * prepares the LDAP environment and sets up a test configuration for
- * the LDAP backend.
- */
- public function init() {
- require(__DIR__ . '/../setup-scripts/createExplicitUsers.php');
- require(__DIR__ . '/../setup-scripts/createUsersWithoutDisplayName.php');
- parent::init();
-
- $this->mapping = new UserMapping(\OC::$server->getDatabaseConnection());
- $this->mapping->clear();
- $this->access->setUserMapper($this->mapping);
- }
-
- /**
- * sets up the LDAP configuration to be used for the test
- */
- protected function initConnection() {
- parent::initConnection();
- $this->connection->setConfiguration([
- 'ldapUserDisplayName' => 'displayname',
- ]);
- }
-
- /**
- * indirectly tests whether batchApplyUserAttributes does it job properly,
- * when a user without display name is included in the result set from LDAP.
- *
- * @return bool
- */
- protected function case1() {
- $result = $this->access->fetchListOfUsers('objectclass=person', 'dn');
- // on the original issue, PHP would emit a fatal error
- // – cannot catch it here, but will render the test as unsuccessful
- return is_array($result) && !empty($result);
- }
-
-}
-
-/** @var string $host */
-/** @var int $port */
-/** @var string $adn */
-/** @var string $apwd */
-/** @var string $bdn */
-$test = new IntegrationTestBatchApplyUserAttributes($host, $port, $adn, $apwd, $bdn);
-$test->init();
-$test->run();
diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php
deleted file mode 100644
index f4fc0f189b419..0000000000000
--- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php
+++ /dev/null
@@ -1,172 +0,0 @@
-
- * @author Joas Schilling
- *
- * @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\User_LDAP\Tests\Integration\Lib;
-
-use OC\ServerNotAvailableException;
-use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest;
-use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\User_LDAP\User_LDAP;
-
-require_once __DIR__ . '/../Bootstrap.php';
-
-class IntegrationTestConnect extends AbstractIntegrationTest {
- /** @var UserMapping */
- protected $mapping;
-
- /** @var User_LDAP */
- protected $backend;
-
- /** @var string */
- protected $host;
-
- /** @var int */
- protected $port;
-
- public function __construct($host, $port, $bind, $pwd, $base) {
- // make sure host is a simple host name
- if(strpos($host, '://') !== false) {
- $host = substr_replace($host, '', 0, strpos($host, '://') + 3);
- }
- if(strpos($host, ':') !== false) {
- $host = substr_replace($host, '', strpos($host, ':'));
- }
- $this->host = $host;
- $this->port = $port;
- parent::__construct($host, $port, $bind, $pwd, $base);
- }
-
- /**
- * test that a faulty host will does not connect successfully
- *
- * @return bool
- */
- protected function case1() {
- // reset possible LDAP connection
- $this->initConnection();
- $this->connection->setConfiguration([
- 'ldapHost' => 'qwertz.uiop',
- ]);
- try {
- $this->connection->getConnectionResource();
- } catch (ServerNotAvailableException $e) {
- return true;
- }
- return false;
- }
-
- /**
- * tests that a connect succeeds when only a hostname is provided
- *
- * @return bool
- */
- protected function case2() {
- // reset possible LDAP connection
- $this->initConnection();
- $this->connection->setConfiguration([
- 'ldapHost' => $this->host,
- ]);
- try {
- $this->connection->getConnectionResource();
- } catch (ServerNotAvailableException $e) {
- return false;
- }
- return true;
- }
-
- /**
- * tests that a connect succeeds when an LDAP URL is provided
- *
- * @return bool
- */
- protected function case3() {
- // reset possible LDAP connection
- $this->initConnection();
- $this->connection->setConfiguration([
- 'ldapHost' => 'ldap://' . $this->host,
- ]);
- try {
- $this->connection->getConnectionResource();
- } catch (ServerNotAvailableException $e) {
- return false;
- }
- return true;
- }
-
- /**
- * tests that a connect succeeds when an LDAP URL with port is provided
- *
- * @return bool
- */
- protected function case4() {
- // reset possible LDAP connection
- $this->initConnection();
- $this->connection->setConfiguration([
- 'ldapHost' => 'ldap://' . $this->host . ':' . $this->port,
- ]);
- try {
- $this->connection->getConnectionResource();
- } catch (ServerNotAvailableException $e) {
- return false;
- }
- return true;
- }
-
- /**
- * tests that a connect succeeds when a hostname with port is provided
- *
- * @return bool
- */
- protected function case5() {
- // reset possible LDAP connection
- $this->initConnection();
- $this->connection->setConfiguration([
- 'ldapHost' => $this->host . ':' . $this->port,
- ]);
- try {
- $this->connection->getConnectionResource();
- } catch (ServerNotAvailableException $e) {
- return false;
- }
- return true;
- }
-
- /**
- * repeat case1, only to make sure that not a connection was reused by
- * accident.
- *
- * @return bool
- */
- protected function case6() {
- return $this->case1();
- }
-}
-
-/** @var string $host */
-/** @var int $port */
-/** @var string $adn */
-/** @var string $apwd */
-/** @var string $bdn */
-$test = new IntegrationTestConnect($host, $port, $adn, $apwd, $bdn);
-$test->init();
-$test->run();
diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php
index d54d001c4ad9e..fcb2e59b4a9c6 100644
--- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php
+++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestPaging.php
@@ -58,30 +58,12 @@ public function initConnection() {
]);
}
- /**
- * tests that paging works properly against a simple example (reading all
- * of few users in small steps)
- *
- * @return bool
- */
- protected function case1() {
- $filter = 'objectclass=inetorgperson';
- $attributes = ['cn', 'dn'];
-
- $result = $this->access->searchUsers($filter, $attributes);
- if(count($result) === 7) {
- return true;
- }
-
- return false;
- }
-
/**
* fetch first three, afterwards all users
*
* @return bool
*/
- protected function case2() {
+ protected function case1() {
$filter = 'objectclass=inetorgperson';
$attributes = ['cn', 'dn'];
@@ -102,23 +84,6 @@ protected function case2() {
return true;
}
-
- /**
- * reads all remaining users starting first page
- *
- * @return bool
- */
- protected function case3() {
- $filter = 'objectclass=inetorgperson';
- $attributes = ['cn', 'dn'];
-
- $result = $this->access->searchUsers($filter, $attributes, null, $this->pagingSize);
- if(count($result) === (7 - $this->pagingSize)) {
- return true;
- }
-
- return false;
- }
}
/** @var string $host */
diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php
deleted file mode 100644
index 9ee5a7efac204..0000000000000
--- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestUserHome.php
+++ /dev/null
@@ -1,186 +0,0 @@
-
- * @author Joas Schilling
- * @author Jörn Friedrich Dreyer
- * @author Morris Jobke
- * @author Vinicius Cubas Brand
- *
- * @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\User_LDAP\Tests\Integration\Lib;
-
-use OCA\User_LDAP\FilesystemHelper;
-use OCA\User_LDAP\LogWrapper;
-use OCA\User_LDAP\User\Manager as LDAPUserManager;
-use OCA\User_LDAP\Tests\Integration\AbstractIntegrationTest;
-use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\User_LDAP\User_LDAP;
-use OCP\Image;
-
-require_once __DIR__ . '/../Bootstrap.php';
-
-class IntegrationTestUserHome extends AbstractIntegrationTest {
- /** @var UserMapping */
- protected $mapping;
-
- /** @var User_LDAP */
- protected $backend;
-
- /**
- * prepares the LDAP environment and sets up a test configuration for
- * the LDAP backend.
- */
- public function init() {
- require(__DIR__ . '/../setup-scripts/createExplicitUsers.php');
- parent::init();
-
- $this->mapping = new UserMapping(\OC::$server->getDatabaseConnection());
- $this->mapping->clear();
- $this->access->setUserMapper($this->mapping);
- $this->backend = new User_LDAP($this->access, \OC::$server->getConfig(), \OC::$server->getNotificationManager(), \OC::$server->getUserSession(), \OC::$server->query('LDAPUserPluginManager'));
- }
-
- /**
- * sets up the LDAP configuration to be used for the test
- */
- protected function initConnection() {
- parent::initConnection();
- $this->connection->setConfiguration([
- 'homeFolderNamingRule' => 'homeDirectory',
- ]);
- }
-
- /**
- * initializes an LDAP user manager instance
- * @return LDAPUserManager
- */
- protected function initUserManager() {
- $this->userManager = new LDAPUserManager(
- \OC::$server->getConfig(),
- new FilesystemHelper(),
- new LogWrapper(),
- \OC::$server->getAvatarManager(),
- new Image(),
- \OC::$server->getDatabaseConnection(),
- \OC::$server->getUserManager(),
- \OC::$server->getNotificationManager()
- );
- }
-
- /**
- * homeDirectory on LDAP is empty. Return values of getHome should be
- * identical to user name, following Nextcloud default.
- *
- * @return bool
- */
- protected function case1() {
- \OC::$server->getConfig()->setAppValue('user_ldap', 'enforce_home_folder_naming_rule', false);
- $userManager = \OC::$server->getUserManager();
- $userManager->clearBackends();
- $userManager->registerBackend($this->backend);
- $users = $userManager->search('', 5, 0);
-
- foreach($users as $user) {
- $home = $user->getHome();
- $uid = $user->getUID();
- $posFound = strpos($home, '/' . $uid);
- $posExpected = strlen($home) - (strlen($uid) + 1);
- if($posFound === false || $posFound !== $posExpected) {
- print('"' . $user->getUID() . '" was not found in "' . $home . '" or does not end with it.' . PHP_EOL);
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * homeDirectory on LDAP is empty. Having the attributes set is enforced.
- *
- * @return bool
- */
- protected function case2() {
- \OC::$server->getConfig()->setAppValue('user_ldap', 'enforce_home_folder_naming_rule', true);
- $userManager = \OC::$server->getUserManager();
- // clearing backends is critical, otherwise the userManager will have
- // the user objects cached and the value from case1 returned
- $userManager->clearBackends();
- $userManager->registerBackend($this->backend);
- $users = $userManager->search('', 5, 0);
-
- try {
- foreach ($users as $user) {
- $user->getHome();
- print('User home was retrieved without throwing an Exception!' . PHP_EOL);
- return false;
- }
- } catch (\Exception $e) {
- if(strpos($e->getMessage(), 'Home dir attribute') === 0) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * homeDirectory on LDAP is set to "attr:" which is effectively empty.
- * Return values of getHome should be Nextcloud default.
- *
- * @return bool
- */
- protected function case3() {
- \OC::$server->getConfig()->setAppValue('user_ldap', 'enforce_home_folder_naming_rule', true);
- $this->connection->setConfiguration([
- 'homeFolderNamingRule' => 'attr:',
- ]);
- $userManager = \OC::$server->getUserManager();
- $userManager->clearBackends();
- $userManager->registerBackend($this->backend);
- $users = $userManager->search('', 5, 0);
-
- try {
- foreach ($users as $user) {
- $home = $user->getHome();
- $uid = $user->getUID();
- $posFound = strpos($home, '/' . $uid);
- $posExpected = strlen($home) - (strlen($uid) + 1);
- if ($posFound === false || $posFound !== $posExpected) {
- print('"' . $user->getUID() . '" was not found in "' . $home . '" or does not end with it.' . PHP_EOL);
- return false;
- }
- }
- } catch (\Exception $e) {
- print("Unexpected Exception: " . $e->getMessage() . PHP_EOL);
- return false;
- }
-
- return true;
- }
-}
-
-/** @var string $host */
-/** @var int $port */
-/** @var string $adn */
-/** @var string $apwd */
-/** @var string $bdn */
-$test = new IntegrationTestUserHome($host, $port, $adn, $apwd, $bdn);
-$test->init();
-$test->run();
diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php
index 447b91decffa6..693159dc72b15 100644
--- a/apps/user_ldap/tests/User_LDAPTest.php
+++ b/apps/user_ldap/tests/User_LDAPTest.php
@@ -515,13 +515,16 @@ public function testUserExists() {
$this->assertTrue($result);
}
- /**
- * @expectedException \Exception
- */
public function testUserExistsForDeleted() {
$backend = new UserLDAP($this->access, $this->config, $this->notificationManager, $this->session, $this->pluginManager);
$this->prepareMockForUserExists();
+ $mapper = $this->createMock(UserMapping::class);
+ $mapper->expects($this->any())
+ ->method('getUUIDByDN')
+ ->with('dnOfFormerUser,dc=test')
+ ->willReturn('45673458748');
+
$this->access->expects($this->any())
->method('readAttribute')
->will($this->returnCallback(function($dn) {
@@ -530,13 +533,24 @@ public function testUserExistsForDeleted() {
}
return false;
}));
+ $this->access->expects($this->any())
+ ->method('getUserMapper')
+ ->willReturn($mapper);
+ $this->access->expects($this->once())
+ ->method('getUserDnByUuid')
+ ->willThrowException(new \Exception());
+
+ $user = $this->createMock(User::class);
+ $user->expects($this->any())
+ ->method('getDN')
+ ->willReturn('dnOfFormerUser,dc=test');
$this->userManager->expects($this->atLeastOnce())
->method('get')
- ->willReturn($this->createMock(User::class));
+ ->willReturn($user);
//test for deleted user
- $backend->userExists('formerUser');
+ $this->assertFalse($backend->userExists('formerUser'));
}
public function testUserExistsForNeverExisting() {
@@ -588,14 +602,17 @@ public function testUserExistsPublicAPI() {
$this->assertTrue($result);
}
- /**
- * @expectedException \Exception
- */
public function testUserExistsPublicAPIForDeleted() {
$backend = new UserLDAP($this->access, $this->config, $this->notificationManager, $this->session, $this->pluginManager);
$this->prepareMockForUserExists();
\OC_User::useBackend($backend);
+ $mapper = $this->createMock(UserMapping::class);
+ $mapper->expects($this->any())
+ ->method('getUUIDByDN')
+ ->with('dnOfFormerUser,dc=test')
+ ->willReturn('45673458748');
+
$this->access->expects($this->any())
->method('readAttribute')
->will($this->returnCallback(function($dn) {
@@ -604,12 +621,24 @@ public function testUserExistsPublicAPIForDeleted() {
}
return false;
}));
+ $this->access->expects($this->any())
+ ->method('getUserMapper')
+ ->willReturn($mapper);
+ $this->access->expects($this->once())
+ ->method('getUserDnByUuid')
+ ->willThrowException(new \Exception());
+
+ $user = $this->createMock(User::class);
+ $user->expects($this->any())
+ ->method('getDN')
+ ->willReturn('dnOfFormerUser,dc=test');
+
$this->userManager->expects($this->atLeastOnce())
->method('get')
- ->willReturn($this->createMock(User::class));
+ ->willReturn($user);
//test for deleted user
- \OC::$server->getUserManager()->userExists('formerUser');
+ $this->assertFalse(\OC::$server->getUserManager()->userExists('formerUser'));
}
public function testUserExistsPublicAPIForNeverExisting() {
@@ -762,6 +791,14 @@ public function testGetHomeNoPath() {
return false;
}
}));
+ $this->access->connection->expects($this->any())
+ ->method('getFromCache')
+ ->willReturnCallback(function($key) {
+ if($key === 'userExistsnewyorker') {
+ return true;
+ }
+ return null;
+ });
$user = $this->createMock(User::class);
$user->expects($this->any())
diff --git a/apps/workflowengine/l10n/de.js b/apps/workflowengine/l10n/de.js
index dbd27d5768823..eeadc9350461b 100644
--- a/apps/workflowengine/l10n/de.js
+++ b/apps/workflowengine/l10n/de.js
@@ -39,6 +39,7 @@ OC.L10N.register(
"Android client" : "Android-Client",
"iOS client" : "iOS-Client",
"Desktop client" : "Desktop-Client",
+ "Thunderbird & Outlook addons" : "Thunderbird & Outlook addons",
"User group membership" : "Benutzergruppen-Mitgliedschaft",
"is member of" : "ist Mitglied von",
"is not member of" : "ist kein Mitglied von",
diff --git a/apps/workflowengine/l10n/de.json b/apps/workflowengine/l10n/de.json
index 44082676c9de4..b96ec7dfdb518 100644
--- a/apps/workflowengine/l10n/de.json
+++ b/apps/workflowengine/l10n/de.json
@@ -37,6 +37,7 @@
"Android client" : "Android-Client",
"iOS client" : "iOS-Client",
"Desktop client" : "Desktop-Client",
+ "Thunderbird & Outlook addons" : "Thunderbird & Outlook addons",
"User group membership" : "Benutzergruppen-Mitgliedschaft",
"is member of" : "ist Mitglied von",
"is not member of" : "ist kein Mitglied von",
diff --git a/apps/workflowengine/l10n/de_DE.js b/apps/workflowengine/l10n/de_DE.js
index 7c5d57348dc1f..79aee9a0b15f6 100644
--- a/apps/workflowengine/l10n/de_DE.js
+++ b/apps/workflowengine/l10n/de_DE.js
@@ -39,6 +39,7 @@ OC.L10N.register(
"Android client" : "Android-Client",
"iOS client" : "iOS-Client",
"Desktop client" : "Desktop-Client",
+ "Thunderbird & Outlook addons" : "Thunderbird & Outlook addons",
"User group membership" : "Benutzergruppen-Mitgliedschaft",
"is member of" : "Ist Mitglied von",
"is not member of" : "Ist kein Mitglied von",
diff --git a/apps/workflowengine/l10n/de_DE.json b/apps/workflowengine/l10n/de_DE.json
index 67ad8a30f6323..ad870bf4ec50a 100644
--- a/apps/workflowengine/l10n/de_DE.json
+++ b/apps/workflowengine/l10n/de_DE.json
@@ -37,6 +37,7 @@
"Android client" : "Android-Client",
"iOS client" : "iOS-Client",
"Desktop client" : "Desktop-Client",
+ "Thunderbird & Outlook addons" : "Thunderbird & Outlook addons",
"User group membership" : "Benutzergruppen-Mitgliedschaft",
"is member of" : "Ist Mitglied von",
"is not member of" : "Ist kein Mitglied von",
diff --git a/apps/workflowengine/l10n/es.js b/apps/workflowengine/l10n/es.js
index 3ea757d731319..4f8b7980e6d7d 100644
--- a/apps/workflowengine/l10n/es.js
+++ b/apps/workflowengine/l10n/es.js
@@ -39,6 +39,7 @@ OC.L10N.register(
"Android client" : "Cliente Android",
"iOS client" : "Cliente iOS",
"Desktop client" : "Cliente de escritorio",
+ "Thunderbird & Outlook addons" : "Complementos de Thunderbird y Outlook",
"User group membership" : "Pertenencia a un grupo de usuarios",
"is member of" : "es miembro de",
"is not member of" : "no es miembro de",
diff --git a/apps/workflowengine/l10n/es.json b/apps/workflowengine/l10n/es.json
index 11e14dc1371cc..6745845832690 100644
--- a/apps/workflowengine/l10n/es.json
+++ b/apps/workflowengine/l10n/es.json
@@ -37,6 +37,7 @@
"Android client" : "Cliente Android",
"iOS client" : "Cliente iOS",
"Desktop client" : "Cliente de escritorio",
+ "Thunderbird & Outlook addons" : "Complementos de Thunderbird y Outlook",
"User group membership" : "Pertenencia a un grupo de usuarios",
"is member of" : "es miembro de",
"is not member of" : "no es miembro de",
diff --git a/apps/workflowengine/l10n/fr.js b/apps/workflowengine/l10n/fr.js
index 2e3af87bb7e63..4130141d7560c 100644
--- a/apps/workflowengine/l10n/fr.js
+++ b/apps/workflowengine/l10n/fr.js
@@ -39,6 +39,7 @@ OC.L10N.register(
"Android client" : "Client Android",
"iOS client" : "Client iOS",
"Desktop client" : "Client de bureau",
+ "Thunderbird & Outlook addons" : "Modules complémentaires Thunderbird & Outlook",
"User group membership" : "Membre du groupe d'utilisateur",
"is member of" : "est membre de",
"is not member of" : "n'est pas membre de",
diff --git a/apps/workflowengine/l10n/fr.json b/apps/workflowengine/l10n/fr.json
index bc8cad7661f55..55a659259f358 100644
--- a/apps/workflowengine/l10n/fr.json
+++ b/apps/workflowengine/l10n/fr.json
@@ -37,6 +37,7 @@
"Android client" : "Client Android",
"iOS client" : "Client iOS",
"Desktop client" : "Client de bureau",
+ "Thunderbird & Outlook addons" : "Modules complémentaires Thunderbird & Outlook",
"User group membership" : "Membre du groupe d'utilisateur",
"is member of" : "est membre de",
"is not member of" : "n'est pas membre de",
diff --git a/apps/workflowengine/l10n/it.js b/apps/workflowengine/l10n/it.js
index 7a620f7e44fb0..5b9fa8dde490f 100644
--- a/apps/workflowengine/l10n/it.js
+++ b/apps/workflowengine/l10n/it.js
@@ -39,6 +39,7 @@ OC.L10N.register(
"Android client" : "Client Android",
"iOS client" : "Client iOS",
"Desktop client" : "Client desktop",
+ "Thunderbird & Outlook addons" : "Componenti aggiuntivi di Outlook e Thunderbird",
"User group membership" : "Appartenenza ai gruppi degli utenti",
"is member of" : "è membro di",
"is not member of" : "non è membro di",
diff --git a/apps/workflowengine/l10n/it.json b/apps/workflowengine/l10n/it.json
index 7ab3c9ce9c555..5730aa7f97408 100644
--- a/apps/workflowengine/l10n/it.json
+++ b/apps/workflowengine/l10n/it.json
@@ -37,6 +37,7 @@
"Android client" : "Client Android",
"iOS client" : "Client iOS",
"Desktop client" : "Client desktop",
+ "Thunderbird & Outlook addons" : "Componenti aggiuntivi di Outlook e Thunderbird",
"User group membership" : "Appartenenza ai gruppi degli utenti",
"is member of" : "è membro di",
"is not member of" : "non è membro di",
diff --git a/apps/workflowengine/l10n/nl.js b/apps/workflowengine/l10n/nl.js
index 0215ec524734f..5922b7aed7024 100644
--- a/apps/workflowengine/l10n/nl.js
+++ b/apps/workflowengine/l10n/nl.js
@@ -1,6 +1,7 @@
OC.L10N.register(
"workflowengine",
{
+ "Group list is empty" : "Groepenlijst is leeg",
"Unable to retrieve the group list" : "Kan groepsoverzicht niet ophalen",
"Saved" : "Bewaard",
"Saving failed:" : "Opslaan mislukt:",
@@ -38,6 +39,7 @@ OC.L10N.register(
"Android client" : "Android client",
"iOS client" : "iOS client",
"Desktop client" : "Desktop client",
+ "Thunderbird & Outlook addons" : "Thunderbird & Outlook addons",
"User group membership" : "Gebruikersgroep lidmaatschap",
"is member of" : "is lid van",
"is not member of" : "is geen lid van",
diff --git a/apps/workflowengine/l10n/nl.json b/apps/workflowengine/l10n/nl.json
index 6d739bc8bf42e..1340a6b371c10 100644
--- a/apps/workflowengine/l10n/nl.json
+++ b/apps/workflowengine/l10n/nl.json
@@ -1,4 +1,5 @@
{ "translations": {
+ "Group list is empty" : "Groepenlijst is leeg",
"Unable to retrieve the group list" : "Kan groepsoverzicht niet ophalen",
"Saved" : "Bewaard",
"Saving failed:" : "Opslaan mislukt:",
@@ -36,6 +37,7 @@
"Android client" : "Android client",
"iOS client" : "iOS client",
"Desktop client" : "Desktop client",
+ "Thunderbird & Outlook addons" : "Thunderbird & Outlook addons",
"User group membership" : "Gebruikersgroep lidmaatschap",
"is member of" : "is lid van",
"is not member of" : "is geen lid van",
diff --git a/apps/workflowengine/l10n/pl.js b/apps/workflowengine/l10n/pl.js
index 375f6a882682c..22b1693a177f3 100644
--- a/apps/workflowengine/l10n/pl.js
+++ b/apps/workflowengine/l10n/pl.js
@@ -39,6 +39,7 @@ OC.L10N.register(
"Android client" : "Klient Android",
"iOS client" : "Klient iOS",
"Desktop client" : "Klient na komputer",
+ "Thunderbird & Outlook addons" : "Dodatki Thunderbird i Outlook",
"User group membership" : "Członkostwo grupy użytkownika",
"is member of" : "jest członkiem w",
"is not member of" : "nie jest członkiem w",
diff --git a/apps/workflowengine/l10n/pl.json b/apps/workflowengine/l10n/pl.json
index 735d712da4a0f..d80b7ee3d87a6 100644
--- a/apps/workflowengine/l10n/pl.json
+++ b/apps/workflowengine/l10n/pl.json
@@ -37,6 +37,7 @@
"Android client" : "Klient Android",
"iOS client" : "Klient iOS",
"Desktop client" : "Klient na komputer",
+ "Thunderbird & Outlook addons" : "Dodatki Thunderbird i Outlook",
"User group membership" : "Członkostwo grupy użytkownika",
"is member of" : "jest członkiem w",
"is not member of" : "nie jest członkiem w",
diff --git a/apps/workflowengine/l10n/pt_BR.js b/apps/workflowengine/l10n/pt_BR.js
index b7e50112f40f4..f8dcb1f19728e 100644
--- a/apps/workflowengine/l10n/pt_BR.js
+++ b/apps/workflowengine/l10n/pt_BR.js
@@ -39,6 +39,7 @@ OC.L10N.register(
"Android client" : "Cliente Android",
"iOS client" : "Cliente iOS",
"Desktop client" : "Cliente de Desktop",
+ "Thunderbird & Outlook addons" : "Extensões para Thunderbird & Outlook",
"User group membership" : "Adesão de grupo de usuário",
"is member of" : "é membro de",
"is not member of" : "não é membro de",
diff --git a/apps/workflowengine/l10n/pt_BR.json b/apps/workflowengine/l10n/pt_BR.json
index 9d476397ed339..a43e7ef29eed2 100644
--- a/apps/workflowengine/l10n/pt_BR.json
+++ b/apps/workflowengine/l10n/pt_BR.json
@@ -37,6 +37,7 @@
"Android client" : "Cliente Android",
"iOS client" : "Cliente iOS",
"Desktop client" : "Cliente de Desktop",
+ "Thunderbird & Outlook addons" : "Extensões para Thunderbird & Outlook",
"User group membership" : "Adesão de grupo de usuário",
"is member of" : "é membro de",
"is not member of" : "não é membro de",
diff --git a/apps/workflowengine/l10n/sr.js b/apps/workflowengine/l10n/sr.js
index 9e89a23d3b6c4..f9832e936c58e 100644
--- a/apps/workflowengine/l10n/sr.js
+++ b/apps/workflowengine/l10n/sr.js
@@ -39,6 +39,7 @@ OC.L10N.register(
"Android client" : "Андроид клијент",
"iOS client" : "iOS клијент",
"Desktop client" : "Десктоп клијент",
+ "Thunderbird & Outlook addons" : "Додаци за Thunderbird & Outlook",
"User group membership" : "Припадност групи",
"is member of" : "је члан групе",
"is not member of" : "није члан групе",
diff --git a/apps/workflowengine/l10n/sr.json b/apps/workflowengine/l10n/sr.json
index 9fdd4bd2cf04f..ae93b8f64e705 100644
--- a/apps/workflowengine/l10n/sr.json
+++ b/apps/workflowengine/l10n/sr.json
@@ -37,6 +37,7 @@
"Android client" : "Андроид клијент",
"iOS client" : "iOS клијент",
"Desktop client" : "Десктоп клијент",
+ "Thunderbird & Outlook addons" : "Додаци за Thunderbird & Outlook",
"User group membership" : "Припадност групи",
"is member of" : "је члан групе",
"is not member of" : "није члан групе",
diff --git a/apps/workflowengine/l10n/tr.js b/apps/workflowengine/l10n/tr.js
index d4b2ccfa1dc4e..d09238621cb68 100644
--- a/apps/workflowengine/l10n/tr.js
+++ b/apps/workflowengine/l10n/tr.js
@@ -39,6 +39,7 @@ OC.L10N.register(
"Android client" : "Android istemcisi",
"iOS client" : "iOS istemcisi",
"Desktop client" : "Masaüstü istemcisi",
+ "Thunderbird & Outlook addons" : "Thunderbird ve Outlook eklentileri",
"User group membership" : "Kullanıcı grubu üyeliği",
"is member of" : "şunun üyesi olan",
"is not member of" : "şunun üyesi olmayan",
diff --git a/apps/workflowengine/l10n/tr.json b/apps/workflowengine/l10n/tr.json
index e47333e5fa2ef..988f7a37f181e 100644
--- a/apps/workflowengine/l10n/tr.json
+++ b/apps/workflowengine/l10n/tr.json
@@ -37,6 +37,7 @@
"Android client" : "Android istemcisi",
"iOS client" : "iOS istemcisi",
"Desktop client" : "Masaüstü istemcisi",
+ "Thunderbird & Outlook addons" : "Thunderbird ve Outlook eklentileri",
"User group membership" : "Kullanıcı grubu üyeliği",
"is member of" : "şunun üyesi olan",
"is not member of" : "şunun üyesi olmayan",
diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
index 32e02bad2a329..f6c93aa5174d6 100644
--- a/build/integration/features/bootstrap/BasicStructure.php
+++ b/build/integration/features/bootstrap/BasicStructure.php
@@ -497,4 +497,11 @@ public static function removeFilesFromLocalStorageAfter() {
$file->isDir() ? rmdir($file) : unlink($file);
}
}
+
+ /**
+ * @Given /^cookies are reset$/
+ */
+ public function cookiesAreReset() {
+ $this->cookieJar = new CookieJar();
+ }
}
diff --git a/build/integration/features/bootstrap/LDAPContext.php b/build/integration/features/bootstrap/LDAPContext.php
index e2b3001151527..ee7acab6f5f7a 100644
--- a/build/integration/features/bootstrap/LDAPContext.php
+++ b/build/integration/features/bootstrap/LDAPContext.php
@@ -32,6 +32,14 @@ class LDAPContext implements Context {
protected $apiUrl;
+ /** @AfterScenario */
+ public function teardown() {
+ if($this->configID === null) {
+ return;
+ }
+ $this->sendingTo('DELETE', $this->apiUrl . '/' . $this->configID);
+ }
+
/**
* @Given /^the response should contain a tag "([^"]*)"$/
*/
@@ -82,4 +90,110 @@ public function gettingTheLDAPConfigurationWithShowPassword($showPassword) {
public function settingTheLDAPConfigurationTo(TableNode $configData) {
$this->sendingToWith('PUT', $this->apiUrl . '/' . $this->configID, $configData);
}
+
+ /**
+ * @Given /^having a valid LDAP configuration$/
+ */
+ public function havingAValidLDAPConfiguration() {
+ $this->asAn('admin');
+ $this->creatingAnLDAPConfigurationAt('/apps/user_ldap/api/v1/config');
+ $data = new TableNode([
+ ['configData[ldapHost]', 'openldap'],
+ ['configData[ldapPort]', '389'],
+ ['configData[ldapBase]', 'dc=nextcloud,dc=ci'],
+ ['configData[ldapAgentName]', 'cn=admin,dc=nextcloud,dc=ci'],
+ ['configData[ldapAgentPassword]', 'admin'],
+ ['configData[ldapUserFilter]', '(&(objectclass=inetorgperson))'],
+ ['configData[ldapLoginFilter]', '(&(objectclass=inetorgperson)(uid=%uid))'],
+ ['configData[ldapUserDisplayName]', 'displayname'],
+ ['configData[ldapGroupDisplayName]', 'cn'],
+ ['configData[ldapEmailAttribute]', 'mail'],
+ ['configData[ldapConfigurationActive]', '1'],
+ ]);
+ $this->settingTheLDAPConfigurationTo($data);
+ $this->asAn('');
+ }
+
+ /**
+ * @Given /^looking up details for the first result matches expectations$/
+ * @param TableNode $expectations
+ */
+ public function lookingUpDetailsForTheFirstResult(TableNode $expectations) {
+ $userResultElements = simplexml_load_string($this->response->getBody())->data[0]->users[0]->element;
+ $userResults = json_decode(json_encode($userResultElements), 1);
+ $userId = array_shift($userResults);
+
+ $this->sendingTo('GET', '/cloud/users/' . $userId);
+ $this->theRecordFieldsShouldMatch($expectations);
+ }
+
+ /**
+ * @Given /^modify LDAP configuration$/
+ */
+ public function modifyLDAPConfiguration(TableNode $table) {
+ $originalAsAn = $this->currentUser;
+ $this->asAn('admin');
+ $configData = $table->getRows();
+ foreach($configData as &$row) {
+ $row[0] = 'configData[' . $row[0] . ']';
+ }
+ $this->settingTheLDAPConfigurationTo(new TableNode($configData));
+ $this->asAn($originalAsAn);
+ }
+
+ /**
+ * @Given /^the "([^"]*)" result should match$/
+ */
+ public function theGroupResultShouldMatch(string $type, TableNode $expectations) {
+ $listReturnedElements = simplexml_load_string($this->response->getBody())->data[0]->$type[0]->element;
+ $extractedIDsArray = json_decode(json_encode($listReturnedElements), 1);
+ foreach($expectations->getRows() as $expectation) {
+ if((int)$expectation[1] === 1) {
+ Assert::assertContains($expectation[0], $extractedIDsArray);
+ } else {
+ Assert::assertNotContains($expectation[0], $extractedIDsArray);
+ }
+ }
+ }
+
+ /**
+ * @Given /^Expect ServerException on failed web login as "([^"]*)"$/
+ */
+ public function expectServerExceptionOnFailedWebLoginAs($login) {
+ try {
+ $this->loggingInUsingWebAs($login);
+ } catch (\GuzzleHttp\Exception\ServerException $e) {
+ Assert::assertEquals(500, $e->getResponse()->getStatusCode());
+ return;
+ }
+ Assert::assertTrue(false, 'expected Exception not received');
+ }
+
+ /**
+ * @Given /^the "([^"]*)" result should contain "([^"]*)" of$/
+ */
+ public function theResultShouldContainOf($type, $expectedCount, TableNode $expectations) {
+ $listReturnedElements = simplexml_load_string($this->response->getBody())->data[0]->$type[0]->element;
+ $extractedIDsArray = json_decode(json_encode($listReturnedElements), 1);
+ $uidsFound = 0;
+ foreach($expectations->getRows() as $expectation) {
+ if(in_array($expectation[0], $extractedIDsArray)) {
+ $uidsFound++;
+ }
+ }
+ Assert::assertSame((int)$expectedCount, $uidsFound);
+ }
+
+ /**
+ * @Given /^the record's fields should match$/
+ */
+ public function theRecordFieldsShouldMatch(TableNode $expectations) {
+ foreach($expectations->getRowsHash() as $k => $v) {
+ $value = (string)simplexml_load_string($this->response->getBody())->data[0]->$k;
+ Assert::assertEquals($v, $value, "got $value");
+ }
+
+ $backend = (string)simplexml_load_string($this->response->getBody())->data[0]->backend;
+ Assert::assertEquals('LDAP', $backend);
+ }
}
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 8e65f4c1a0ea6..10b4c1bc005ee 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -342,6 +342,7 @@ Feature: provisioning
| theming |
| twofactor_backupcodes |
| updatenotification |
+ | user_ldap |
| workflowengine |
| files_external |
| oauth2 |
diff --git a/build/integration/ldap_features/ldap-openldap.feature b/build/integration/ldap_features/ldap-openldap.feature
new file mode 100644
index 0000000000000..4c507e7459598
--- /dev/null
+++ b/build/integration/ldap_features/ldap-openldap.feature
@@ -0,0 +1,104 @@
+Feature: LDAP
+ Background:
+ Given using api version "2"
+ And having a valid LDAP configuration
+
+ Scenario: Test valid configuration by logging in
+ Given Logging in using web as "alice"
+ And Sending a "GET" to "/remote.php/webdav/welcome.txt" with requesttoken
+ Then the HTTP status code should be "200"
+
+ Scenario: Test valid configuration with port in the hostname by logging in
+ Given modify LDAP configuration
+ | ldapHost | openldap:389 |
+ And cookies are reset
+ And Logging in using web as "alice"
+ And Sending a "GET" to "/remote.php/webdav/welcome.txt" with requesttoken
+ Then the HTTP status code should be "200"
+
+ Scenario: Test valid configuration with LDAP protocol by logging in
+ Given modify LDAP configuration
+ | ldapHost | ldap://openldap |
+ And cookies are reset
+ And Logging in using web as "alice"
+ And Sending a "GET" to "/remote.php/webdav/welcome.txt" with requesttoken
+ Then the HTTP status code should be "200"
+
+ Scenario: Test valid configuration with LDAP protoccol and port by logging in
+ Given modify LDAP configuration
+ | ldapHost | ldap://openldap:389 |
+ And cookies are reset
+ And Logging in using web as "alice"
+ And Sending a "GET" to "/remote.php/webdav/welcome.txt" with requesttoken
+ Then the HTTP status code should be "200"
+
+ Scenario: Look for a known LDAP user
+ Given As an "admin"
+ And sending "GET" to "/cloud/users?search=alice"
+ Then the OCS status code should be "200"
+ And looking up details for the first result matches expectations
+ | email | alice@nextcloud.ci |
+ | displayname | Alice |
+
+ Scenario: Test group filter with one specific group
+ Given modify LDAP configuration
+ | ldapGroupFilter | cn=RedGroup |
+ | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci |
+ And As an "admin"
+ And sending "GET" to "/cloud/groups"
+ Then the OCS status code should be "200"
+ And the "groups" result should match
+ | RedGroup | 1 |
+ | GreenGroup | 0 |
+ | BlueGroup | 0 |
+ | PurpleGroup | 0 |
+
+ Scenario: Test group filter with two specific groups
+ Given modify LDAP configuration
+ | ldapGroupFilter | (\|(cn=RedGroup)(cn=GreenGroup)) |
+ | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci |
+ And As an "admin"
+ And sending "GET" to "/cloud/groups"
+ Then the OCS status code should be "200"
+ And the "groups" result should match
+ | RedGroup | 1 |
+ | GreenGroup | 1 |
+ | BlueGroup | 0 |
+ | PurpleGroup | 0 |
+
+ Scenario: Test group filter ruling out a group from a different base
+ Given modify LDAP configuration
+ | ldapGroupFilter | (objectClass=groupOfNames) |
+ | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci |
+ And As an "admin"
+ And sending "GET" to "/cloud/groups"
+ Then the OCS status code should be "200"
+ And the "groups" result should match
+ | RedGroup | 1 |
+ | GreenGroup | 1 |
+ | BlueGroup | 1 |
+ | PurpleGroup | 1 |
+ | SquareGroup | 0 |
+
+ Scenario: Test backup server
+ Given modify LDAP configuration
+ | ldapBackupHost | openldap |
+ | ldapBackupPort | 389 |
+ | ldapHost | foo.bar |
+ | ldapPort | 2456 |
+ And Logging in using web as "alice"
+ Then the HTTP status code should be "200"
+
+ Scenario: Test backup server offline
+ Given modify LDAP configuration
+ | ldapBackupHost | off.line |
+ | ldapBackupPort | 3892 |
+ | ldapHost | foo.bar |
+ | ldapPort | 2456 |
+ Then Expect ServerException on failed web login as "alice"
+
+ Scenario: Test LDAP server offline, no backup server
+ Given modify LDAP configuration
+ | ldapHost | foo.bar |
+ | ldapPort | 2456 |
+ Then Expect ServerException on failed web login as "alice"
diff --git a/build/integration/ldap_features/openldap-uid-username.feature b/build/integration/ldap_features/openldap-uid-username.feature
new file mode 100644
index 0000000000000..d267870ca26f8
--- /dev/null
+++ b/build/integration/ldap_features/openldap-uid-username.feature
@@ -0,0 +1,88 @@
+Feature: LDAP
+ Background:
+ Given using api version "2"
+ And having a valid LDAP configuration
+ And modify LDAP configuration
+ | ldapExpertUsernameAttr | uid |
+
+ Scenario: Look for a expected LDAP users
+ Given As an "admin"
+ And sending "GET" to "/cloud/users"
+ Then the OCS status code should be "200"
+ And the "users" result should match
+ | alice | 1 |
+ | elisa | 1 |
+ | ghost | 0 |
+
+ Scenario: check default home of an LDAP user
+ Given As an "admin"
+ And sending "GET" to "/cloud/users/alice"
+ Then the OCS status code should be "200"
+ And the record's fields should match
+ | storageLocation | /dev/shm/nc_int/alice |
+
+ Scenario: check custom relative home of an LDAP user
+ Given modify LDAP configuration
+ | homeFolderNamingRule | sn |
+ And As an "admin"
+ And sending "GET" to "/cloud/users/alice"
+ Then the OCS status code should be "200"
+ And the record's fields should match
+ | storageLocation | /dev/shm/nc_int/Alfgeirdottir |
+
+ Scenario: check custom absolute home of an LDAP user
+ Given modify LDAP configuration
+ | homeFolderNamingRule | roomNumber |
+ And As an "admin"
+ And sending "GET" to "/cloud/users/elisa"
+ Then the OCS status code should be "200"
+ And the record's fields should match
+ | storageLocation | /dev/shm/elisa-data |
+
+ Scenario: Fetch all users, invoking pagination
+ Given modify LDAP configuration
+ | ldapBaseUsers | ou=PagingTest,dc=nextcloud,dc=ci |
+ | ldapPagingSize | 2 |
+ And As an "admin"
+ And sending "GET" to "/cloud/users"
+ Then the OCS status code should be "200"
+ And the "users" result should match
+ | ebba | 1 |
+ | eindis | 1 |
+ | fjolnir | 1 |
+ | gunna | 1 |
+ | juliana | 1 |
+ | leo | 1 |
+ | stigur | 1 |
+
+ Scenario: Fetch all users, invoking pagination
+ Given modify LDAP configuration
+ | ldapBaseUsers | ou=PagingTest,dc=nextcloud,dc=ci |
+ | ldapPagingSize | 2 |
+ And As an "admin"
+ And sending "GET" to "/cloud/users?limit=10"
+ Then the OCS status code should be "200"
+ And the "users" result should match
+ | ebba | 1 |
+ | eindis | 1 |
+ | fjolnir | 1 |
+ | gunna | 1 |
+ | juliana | 1 |
+ | leo | 1 |
+ | stigur | 1 |
+
+ Scenario: Fetch from second batch of all users, invoking pagination
+ Given modify LDAP configuration
+ | ldapBaseUsers | ou=PagingTest,dc=nextcloud,dc=ci |
+ | ldapPagingSize | 2 |
+ And As an "admin"
+ And sending "GET" to "/cloud/users?limit=10&offset=2"
+ Then the OCS status code should be "200"
+ And the "users" result should contain "5" of
+ | ebba |
+ | eindis |
+ | fjolnir |
+ | gunna |
+ | juliana |
+ | leo |
+ | stigur |
diff --git a/build/integration/run.sh b/build/integration/run.sh
index b747bb52c6bfb..56f4ee7b07d31 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -22,6 +22,7 @@ else
exit 1
fi
fi
+NC_DATADIR=$($OCC config:system:get datadirectory)
composer install
@@ -48,6 +49,7 @@ if [ "$INSTALLED" == "true" ]; then
#Enable external storage app
$OCC app:enable files_external
+ $OCC app:enable user_ldap
mkdir -p work/local_storage
OUTPUT_CREATE_STORAGE=`$OCC files_external:create local_storage local null::null -c datadir=$PWD/work/local_storage`
@@ -70,10 +72,11 @@ if [ "$INSTALLED" == "true" ]; then
#Disable external storage app
$OCC app:disable files_external
+ $OCC app:disable user_ldap
fi
if [ -z $HIDE_OC_LOGS ]; then
- tail "${OC_PATH}/data/nextcloud.log"
+ tail "${NC_DATADIR}/nextcloud.log"
fi
echo "runsh: Exit code: $RESULT"
diff --git a/build/signed-off-checker.php b/build/signed-off-checker.php
index f21854a83d1bc..32deceb47b7d0 100644
--- a/build/signed-off-checker.php
+++ b/build/signed-off-checker.php
@@ -60,9 +60,9 @@
$ch = curl_init();
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-curl_setopt($ch, CURLOPT_URL, 'https://api.github.com/repos/'.$repoOwner.'/'.$repoName.'/pulls/'.$pullRequestNumber.'/commits');
+curl_setopt($ch, CURLOPT_URL, 'https://api.github.com/repos/' . $repoOwner . '/' . $repoName . '/pulls/' . $pullRequestNumber . '/commits');
curl_setopt($ch, CURLOPT_USERAGENT, 'CI for Nextcloud (https://github.com/nextcloud/server)');
-curl_setopt($ch, CURLOPT_HTTPHEADER, 'Authorization: token ' . $githubToken);
+curl_setopt($ch, CURLOPT_HTTPHEADER, ['Authorization: token ' . $githubToken]);
$response = curl_exec($ch);
curl_close($ch);
diff --git a/config/config.sample.php b/config/config.sample.php
index 2dddd5a7da823..09b5c18504119 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -811,11 +811,11 @@
* This section is for configuring the download links for Nextcloud clients, as
* seen in the first-run wizard and on Personal pages.
*
- * Defaults to
- * * Desktop client: ``https://nextcloud.com/install/#install-clients``
- * * Android client: ``https://play.google.com/store/apps/details?id=com.nextcloud.client``
- * * iOS client: ``https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8``
- * *iOS client app id: ``1125420102``
+ * Defaults to:
+ * - Desktop client: ``https://nextcloud.com/install/#install-clients``
+ * - Android client: ``https://play.google.com/store/apps/details?id=com.nextcloud.client``
+ * - iOS client: ``https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8``
+ * - iOS client app id: ``1125420102``
*/
'customclient_desktop' =>
'https://nextcloud.com/install/#install-clients',
@@ -1059,7 +1059,6 @@
* * ``\OC\Memcache\ArrayCache`` In-memory array-based backend (not recommended)
* * ``\OC\Memcache\Memcached`` Memcached backend
* * ``\OC\Memcache\Redis`` Redis backend
- * * ``\OC\Memcache\XCache`` XCache backend
*
* Advice on choosing between the various backends:
*
diff --git a/console.php b/console.php
index 67856a17b3b0d..1d5021edef0e2 100644
--- a/console.php
+++ b/console.php
@@ -85,7 +85,13 @@ function exceptionHandler($exception) {
echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see http://php.net/manual/en/book.pcntl.php" . PHP_EOL;
}
- $application = new Application(\OC::$server->getConfig(), \OC::$server->getEventDispatcher(), \OC::$server->getRequest(), \OC::$server->getLogger());
+ $application = new Application(
+ \OC::$server->getConfig(),
+ \OC::$server->getEventDispatcher(),
+ \OC::$server->getRequest(),
+ \OC::$server->getLogger(),
+ \OC::$server->query(\OC\MemoryInfo::class)
+ );
$application->loadCommands(new ArgvInput(), new ConsoleOutput());
$application->run();
} catch (Exception $ex) {
diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
index d0ed432f03fe6..eacd5847c6c15 100644
--- a/core/Controller/LostController.php
+++ b/core/Controller/LostController.php
@@ -37,6 +37,7 @@
use \OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Defaults;
+use OCP\Encryption\IEncryptionModule;
use OCP\Encryption\IManager;
use \OCP\IURLGenerator;
use \OCP\IRequest;
@@ -260,7 +261,15 @@ public function setPassword($token, $userId, $password, $proceed) {
}
if ($this->encryptionManager->isEnabled() && !$proceed) {
- return $this->error('', array('encryption' => true));
+ $encryptionModules = $this->encryptionManager->getEncryptionModules();
+ foreach ($encryptionModules as $module) {
+ /** @var IEncryptionModule $instance */
+ $instance = call_user_func($module['callback']);
+ // this way we can find out whether per-user keys are used or a system wide encryption key
+ if ($instance->needDetailedAccessList()) {
+ return $this->error('', array('encryption' => true));
+ }
+ }
}
try {
diff --git a/core/css/apps.scss b/core/css/apps.scss
index d17cf9140c8f8..1120459230af5 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -639,7 +639,7 @@ kbd {
min-width: $sidebar-min-width;
max-width: $sidebar-max-width;
display: block;
- position: sticky;
+ @include position('sticky');
top: $header-height;
right:0;
overflow-y: auto;
@@ -879,6 +879,10 @@ $popovericon-size: 16px;
display: block;
}
+ &.contactsmenu-popover {
+ margin: 0;
+ }
+
ul {
/* Overwrite #app-navigation > ul ul */
display: flex !important;
@@ -1042,7 +1046,7 @@ $popovericon-size: 16px;
/* CONTENT LIST ------------------------------------------------------------ */
.app-content-list {
width: 300px;
- position: sticky;
+ @include position('sticky');
top: $header-height;
border-right: 1px solid var(--color-border);
display: flex;
diff --git a/core/css/functions.scss b/core/css/functions.scss
index 30075df7f589e..0815ba29ab656 100644
--- a/core/css/functions.scss
+++ b/core/css/functions.scss
@@ -59,4 +59,13 @@
.icon-#{$icon}.icon-white {
@include icon-color($icon, $dir, $color-white, $version, $core);
}
-}
\ No newline at end of file
+}
+
+@mixin position($value) {
+ @if $value == 'sticky' {
+ position: -webkit-sticky; // Safari support
+ position: sticky;
+ } @else {
+ position: $value;
+ }
+}
diff --git a/core/css/header.scss b/core/css/header.scss
index 28aae342c6a64..41ee0a63fbe15 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -70,7 +70,8 @@
#header {
/* Header menu */
- .menu {
+ .header-left > nav > .menu,
+ .header-right > div > .menu {
background-color: var(--color-main-background);
filter: drop-shadow(0 1px 5px var(--color-box-shadow));
border-radius: 0 0 3px 3px;
@@ -152,6 +153,8 @@
#header-right, .header-right {
justify-content: flex-end;
+ flex-basis: 210px;
+ flex-shrink: 1;
}
/* Right header standard */
@@ -226,6 +229,7 @@ nav[role='navigation'] {
width: $header-height;
height: $header-height;
margin-left: -$header-height;
+ position: relative;
}
.header-left #navigation {
@@ -396,13 +400,14 @@ nav[role='navigation'] {
display: block;
}
}
+
+ #expanddiv:after {
+ right: 22px;
+ }
}
/* Settings menu */
#expanddiv {
- &.menu {
- right: 17px;
- }
a {
display: inline-flex;
align-items: center;
@@ -452,6 +457,7 @@ nav[role='navigation'] {
opacity: .6;
}
}
+
.app-loading {
> svg {
display: none;
@@ -552,6 +558,10 @@ nav[role='navigation'] {
li.hidden {
display: none;
}
+
+ #more-apps {
+ z-index: 2;
+ }
}
/* Skip navigation links – show only on keyboard focus */
diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss
index 8ee7412af3c51..e30beee44e5c1 100644
--- a/core/css/jquery-ui-fixes.scss
+++ b/core/css/jquery-ui-fixes.scss
@@ -173,6 +173,7 @@
.ui-menu-item a {
&.ui-state-focus, &.ui-state-active {
font-weight: inherit;
+ box-shadow: inset 4px 0 var(--color-primary);
}
}
}
@@ -184,15 +185,25 @@
&.ui-corner-all {
border-radius: 0;
- border-bottom-left-radius: 3px;
- border-bottom-right-radius: 3px;
+ border-bottom-left-radius: var(--border-radius);
+ border-bottom-right-radius: var(--border-radius);
}
- .ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
+ .ui-state-hover, .ui-widget-content .ui-state-hover,
+ .ui-widget-header .ui-state-hover,
+ .ui-state-focus,
+ .ui-widget-content .ui-state-focus,
+ .ui-widget-header .ui-state-focus {
border: 1px solid transparent;
background: inherit;
color: var(--color-primary-element);
}
+
+ .ui-menu-item {
+ a {
+ border-radius: 0 !important;
+ }
+ }
}
.ui-button.primary {
diff --git a/core/css/jquery.ocdialog.scss b/core/css/jquery.ocdialog.scss
index 0a6e99ddb4fd3..0a0222497bcf5 100644
--- a/core/css/jquery.ocdialog.scss
+++ b/core/css/jquery.ocdialog.scss
@@ -21,7 +21,7 @@
}
.oc-dialog-buttonrow {
position: relative;
- display: block;
+ display: flex;
background: transparent;
right: 0;
bottom: 0;
@@ -32,24 +32,15 @@
background-image: linear-gradient(rgba(255, 255, 255, 0.0), var(--color-main-background));
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
- clear: both;
- button {
- display: inline-block;
+
+ &.twobuttons {
+ justify-content: space-between;
}
-}
-/* align primary button to right, other buttons to left */
-.oc-dialog-buttonrow.twobuttons button:nth-child(1) {
- float: left;
-}
-.oc-dialog-buttonrow.twobuttons.aside button:nth-child(1) {
- float: none;
-}
-.oc-dialog-buttonrow.twobuttons button:nth-child(2) {
- float: right;
-}
-.oc-dialog-buttonrow.onebutton button {
- float: right;
+ &.onebutton,
+ &.twobuttons.aside {
+ justify-content: flex-end;
+ }
}
.oc-dialog-close {
diff --git a/core/css/public.scss b/core/css/public.scss
index 0c04b07ab090f..a4e7ed579b9f7 100644
--- a/core/css/public.scss
+++ b/core/css/public.scss
@@ -1,3 +1,5 @@
+$footer-height: 60px;
+
#body-public {
.header-right {
@@ -36,8 +38,9 @@
}
#content {
- height: initial;
- min-height: calc(100vh - 160px);
+ // 100% - footer
+ min-height: calc(100% - #{$footer-height});
+
}
/** don't apply content header padding on the base layout */
@@ -64,4 +67,22 @@
form input[type='checkbox']+label {
text-align: center;
}
+
+ /* public footer */
+ footer {
+ position: relative;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: $footer-height;
+ p {
+ color: var(--color-text-lighter);
+ a {
+ color: var(--color-text-lighter);
+ font-weight: 600;
+ padding: 13px;
+ margin: -13px;
+ }
+ }
+ }
}
diff --git a/core/css/styles.scss b/core/css/styles.scss
index ad82a7acbf79f..6a72df0e177e5 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -163,8 +163,7 @@ body {
#controls {
box-sizing: border-box;
- position: -webkit-sticky;
- position: sticky;
+ @include position('sticky');
height: 44px;
padding: 0;
margin: 0;
@@ -601,6 +600,7 @@ code {
margin-top: 10px !important;
width: auto !important;
border-radius: var(--border-radius);
+ z-index: 1600 !important;
.ui-widget-content {
border: none !important;
@@ -1049,25 +1049,6 @@ div.crumb {
}
}
-/* public footer */
-
-#body-public footer {
- position: relative;
- text-align: center;
- .info {
- color: var(--color-text-lighter);
- text-align: center;
- margin: 0 auto;
- padding: 20px 0;
- a {
- color: var(--color-text-lighter);
- font-weight: 600;
- padding: 13px;
- margin: -13px;
- }
- }
-}
-
/* LEGACY FIX only - do not use fieldsets for settings */
fieldset {
diff --git a/core/css/whatsnew.scss b/core/css/whatsnew.scss
index e13cdf86256ce..99d99ded69143 100644
--- a/core/css/whatsnew.scss
+++ b/core/css/whatsnew.scss
@@ -9,6 +9,7 @@
bottom: 35px !important;
left: 15px !important;
width: 270px;
+ z-index: 700;
}
.whatsNewPopover p {
diff --git a/core/js/jquery.contactsmenu.js b/core/js/jquery.contactsmenu.js
index 1ea9f732f798c..e3f24dfff5241 100644
--- a/core/js/jquery.contactsmenu.js
+++ b/core/js/jquery.contactsmenu.js
@@ -15,7 +15,7 @@
+ '';
var LIST = ''
- + '
');
});
});
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index e22fb35102ecb..66c84f52bc90b 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -170,7 +170,8 @@ describe('OC.SetupChecks tests', function() {
cronErrors: [],
cronInfo: {
diffInSeconds: 0
- }
+ },
+ isMemoryLimitSufficient: true
})
);
@@ -217,7 +218,8 @@ describe('OC.SetupChecks tests', function() {
cronErrors: [],
cronInfo: {
diffInSeconds: 0
- }
+ },
+ isMemoryLimitSufficient: true
})
);
@@ -265,7 +267,8 @@ describe('OC.SetupChecks tests', function() {
cronErrors: [],
cronInfo: {
diffInSeconds: 0
- }
+ },
+ isMemoryLimitSufficient: true
})
);
@@ -311,7 +314,8 @@ describe('OC.SetupChecks tests', function() {
cronErrors: [],
cronInfo: {
diffInSeconds: 0
- }
+ },
+ isMemoryLimitSufficient: true
})
);
@@ -355,7 +359,8 @@ describe('OC.SetupChecks tests', function() {
cronErrors: [],
cronInfo: {
diffInSeconds: 0
- }
+ },
+ isMemoryLimitSufficient: true
})
);
@@ -399,7 +404,8 @@ describe('OC.SetupChecks tests', function() {
cronErrors: [],
cronInfo: {
diffInSeconds: 0
- }
+ },
+ isMemoryLimitSufficient: true
})
);
@@ -443,7 +449,8 @@ describe('OC.SetupChecks tests', function() {
cronErrors: [],
cronInfo: {
diffInSeconds: 0
- }
+ },
+ isMemoryLimitSufficient: true
})
);
@@ -456,6 +463,51 @@ describe('OC.SetupChecks tests', function() {
});
});
+ it('should return a warning if the memory limit is below the recommended value', function(done) {
+ var async = OC.SetupChecks.checkSetup();
+
+ suite.server.requests[0].respond(
+ 200,
+ {
+ 'Content-Type': 'application/json',
+ },
+ JSON.stringify({
+ hasFileinfoInstalled: true,
+ isGetenvServerWorking: true,
+ isReadOnlyConfig: false,
+ hasWorkingFileLocking: true,
+ hasValidTransactionIsolationLevel: true,
+ suggestedOverwriteCliURL: '',
+ isUrandomAvailable: true,
+ serverHasInternetConnection: true,
+ isMemcacheConfigured: true,
+ forwardedForHeadersWorking: true,
+ reverseProxyDocs: 'https://docs.owncloud.org/foo/bar.html',
+ isCorrectMemcachedPHPModuleInstalled: true,
+ hasPassedCodeIntegrityCheck: true,
+ isOpcacheProperlySetup: true,
+ hasOpcacheLoaded: true,
+ isSettimelimitAvailable: true,
+ hasFreeTypeSupport: true,
+ missingIndexes: [],
+ outdatedCaches: [],
+ cronErrors: [],
+ cronInfo: {
+ diffInSeconds: 0
+ },
+ isMemoryLimitSufficient: false
+ })
+ );
+
+ async.done(function( data, s, x ){
+ expect(data).toEqual([{
+ msg: 'The PHP memory limit is below the recommended value of 512MB.',
+ type: OC.SetupChecks.MESSAGE_TYPE_WARNING
+ }]);
+ done();
+ });
+ });
+
it('should return an error if the response has no statuscode 200', function(done) {
var async = OC.SetupChecks.checkSetup();
@@ -508,7 +560,8 @@ describe('OC.SetupChecks tests', function() {
cronErrors: [],
cronInfo: {
diffInSeconds: 0
- }
+ },
+ isMemoryLimitSufficient: true
})
);
@@ -553,7 +606,8 @@ describe('OC.SetupChecks tests', function() {
cronErrors: [],
cronInfo: {
diffInSeconds: 0
- }
+ },
+ isMemoryLimitSufficient: true
})
);
@@ -598,7 +652,8 @@ describe('OC.SetupChecks tests', function() {
cronErrors: [],
cronInfo: {
diffInSeconds: 0
- }
+ },
+ isMemoryLimitSufficient: true
})
);
@@ -643,7 +698,8 @@ describe('OC.SetupChecks tests', function() {
cronErrors: [],
cronInfo: {
diffInSeconds: 0
- }
+ },
+ isMemoryLimitSufficient: true
})
);
diff --git a/core/l10n/de.js b/core/l10n/de.js
index c27529b2f238d..ac2758a783b06 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -139,7 +139,7 @@ OC.L10N.register(
"The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. Enabling this function is strongly recommended." : "Die PHP-Funktion \"set_time_limit\" ist nicht verfügbar. Dies kann in angehaltenen Scripten oder einer fehlerhaften Installation resultieren. Es wird dringend empfohlen, diese Funktion zu aktivieren.",
"Your PHP does not have FreeType support, resulting in breakage of profile pictures and the settings interface." : "Dein PHP unterstützt Freetype nicht. Dies wird defekte Profilbilder und eine defekte Anzeige der Einstellungen verursachen.",
"Missing index \"{indexName}\" in table \"{tableName}\"." : "Fehlender Index \"{indexName}\" in der Tabelle \"{tableName}\".",
- "The database is missing some indexes. Due to the fact that adding indexes on big tables could take some time they were not added automatically. By running \"occ db:add-missing-indices\" those missing indexes could be added manually while the instance keeps running. Once the indexes are added queries to those tables are usually much faster." : "In der Datenbank fehlen einige Indizes. Auf Grund der Tatsache, dass das hinzufügen von Indizes in großen Tabellen einige Zeit in Anspruch nehmen wird, wurden diese nicht automatisch erzeugt. Durch das Ausführen von \"ooc db:add-missing-indices\" können die fehlenden Indizes manuell hinzugefügt werden, während die Instanz weiter läuft. Nachdem die Indizes hinzugefügt wurden, sind Anfragen auf die Tabellen normalerweise schneller.",
+ "The database is missing some indexes. Due to the fact that adding indexes on big tables could take some time they were not added automatically. By running \"occ db:add-missing-indices\" those missing indexes could be added manually while the instance keeps running. Once the indexes are added queries to those tables are usually much faster." : "In der Datenbank fehlen einige Indizes. Auf Grund der Tatsache, dass das hinzufügen von Indizes in großen Tabellen einige Zeit in Anspruch nehmen wird, wurden diese nicht automatisch erzeugt. Durch das Ausführen von \"occ db:add-missing-indices\" können die fehlenden Indizes manuell hinzugefügt werden, während die Instanz weiter läuft. Nachdem die Indizes hinzugefügt wurden, sind Anfragen auf die Tabellen normalerweise schneller.",
"SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
"This is particularly recommended when using the desktop client for file synchronisation." : "Dies wird insbesondere bei der Benutzung des Desktop-Clients zur Synchronisierung empfohlen.",
"To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die Dokumentation ↗ schauen.",
@@ -179,6 +179,7 @@ OC.L10N.register(
"Enable" : "Aktivieren",
"Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
"Shared with you and {circle} by {owner}" : "Von {owner} mit Dir und {circle} geteilt",
+ "Shared with you and the conversation {conversation} by {owner}" : "Von {owner} mit Ihnen und der Unterhaltung {conversation} geteilt",
"Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
"Choose a password for the mail share" : "Wähle ein Passwort für das Teilen via E-Mail",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} mittels Link geteilt",
@@ -186,6 +187,7 @@ OC.L10N.register(
"remote" : "Entfernte Freigabe",
"remote group" : "Externe Gruppe",
"email" : "E-Mail",
+ "conversation" : "Unterhaltung",
"shared by {sharer}" : "Geteilt von {sharer}",
"Unshare" : "Freigabe aufheben",
"Can reshare" : "kann weiterteilen",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 4dfa297526786..5b3967168809b 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -137,7 +137,7 @@
"The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. Enabling this function is strongly recommended." : "Die PHP-Funktion \"set_time_limit\" ist nicht verfügbar. Dies kann in angehaltenen Scripten oder einer fehlerhaften Installation resultieren. Es wird dringend empfohlen, diese Funktion zu aktivieren.",
"Your PHP does not have FreeType support, resulting in breakage of profile pictures and the settings interface." : "Dein PHP unterstützt Freetype nicht. Dies wird defekte Profilbilder und eine defekte Anzeige der Einstellungen verursachen.",
"Missing index \"{indexName}\" in table \"{tableName}\"." : "Fehlender Index \"{indexName}\" in der Tabelle \"{tableName}\".",
- "The database is missing some indexes. Due to the fact that adding indexes on big tables could take some time they were not added automatically. By running \"occ db:add-missing-indices\" those missing indexes could be added manually while the instance keeps running. Once the indexes are added queries to those tables are usually much faster." : "In der Datenbank fehlen einige Indizes. Auf Grund der Tatsache, dass das hinzufügen von Indizes in großen Tabellen einige Zeit in Anspruch nehmen wird, wurden diese nicht automatisch erzeugt. Durch das Ausführen von \"ooc db:add-missing-indices\" können die fehlenden Indizes manuell hinzugefügt werden, während die Instanz weiter läuft. Nachdem die Indizes hinzugefügt wurden, sind Anfragen auf die Tabellen normalerweise schneller.",
+ "The database is missing some indexes. Due to the fact that adding indexes on big tables could take some time they were not added automatically. By running \"occ db:add-missing-indices\" those missing indexes could be added manually while the instance keeps running. Once the indexes are added queries to those tables are usually much faster." : "In der Datenbank fehlen einige Indizes. Auf Grund der Tatsache, dass das hinzufügen von Indizes in großen Tabellen einige Zeit in Anspruch nehmen wird, wurden diese nicht automatisch erzeugt. Durch das Ausführen von \"occ db:add-missing-indices\" können die fehlenden Indizes manuell hinzugefügt werden, während die Instanz weiter läuft. Nachdem die Indizes hinzugefügt wurden, sind Anfragen auf die Tabellen normalerweise schneller.",
"SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
"This is particularly recommended when using the desktop client for file synchronisation." : "Dies wird insbesondere bei der Benutzung des Desktop-Clients zur Synchronisierung empfohlen.",
"To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die Dokumentation ↗ schauen.",
@@ -177,6 +177,7 @@
"Enable" : "Aktivieren",
"Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
"Shared with you and {circle} by {owner}" : "Von {owner} mit Dir und {circle} geteilt",
+ "Shared with you and the conversation {conversation} by {owner}" : "Von {owner} mit Ihnen und der Unterhaltung {conversation} geteilt",
"Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
"Choose a password for the mail share" : "Wähle ein Passwort für das Teilen via E-Mail",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} mittels Link geteilt",
@@ -184,6 +185,7 @@
"remote" : "Entfernte Freigabe",
"remote group" : "Externe Gruppe",
"email" : "E-Mail",
+ "conversation" : "Unterhaltung",
"shared by {sharer}" : "Geteilt von {sharer}",
"Unshare" : "Freigabe aufheben",
"Can reshare" : "kann weiterteilen",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index ccaee632a0be7..6ee937b802801 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -179,6 +179,7 @@ OC.L10N.register(
"Enable" : "Aktivieren",
"Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
"Shared with you and {circle} by {owner}" : "Von {owner} mit Ihnen und {circle} geteilt",
+ "Shared with you and the conversation {conversation} by {owner}" : "Von {owner} mit Ihnen und der Unterhaltung {conversation} geteilt",
"Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
"Choose a password for the mail share" : "Wählen Sie ein Passwort für das Teilen via E-Mail",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} mittels Link geteilt",
@@ -186,6 +187,7 @@ OC.L10N.register(
"remote" : "Entfernte Freigabe",
"remote group" : "Externe Gruppe",
"email" : "E-Mail",
+ "conversation" : "Unterhaltung",
"shared by {sharer}" : "Geteilt von {sharer}",
"Unshare" : "Freigabe aufheben",
"Can reshare" : "kann weiterteilen",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 2200baf03cfce..c9f5de9f2ac0d 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -177,6 +177,7 @@
"Enable" : "Aktivieren",
"Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
"Shared with you and {circle} by {owner}" : "Von {owner} mit Ihnen und {circle} geteilt",
+ "Shared with you and the conversation {conversation} by {owner}" : "Von {owner} mit Ihnen und der Unterhaltung {conversation} geteilt",
"Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
"Choose a password for the mail share" : "Wählen Sie ein Passwort für das Teilen via E-Mail",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} mittels Link geteilt",
@@ -184,6 +185,7 @@
"remote" : "Entfernte Freigabe",
"remote group" : "Externe Gruppe",
"email" : "E-Mail",
+ "conversation" : "Unterhaltung",
"shared by {sharer}" : "Geteilt von {sharer}",
"Unshare" : "Freigabe aufheben",
"Can reshare" : "kann weiterteilen",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index 65436ded67711..0ee10c102d65b 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -179,6 +179,7 @@ OC.L10N.register(
"Enable" : "Habilitar",
"Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
"Shared with you and {circle} by {owner}" : "Compartido contigo y {circle} por {owner}",
+ "Shared with you and the conversation {conversation} by {owner}" : "Compartido contigo y con la conversación {conversation} por {owner}",
"Shared with you by {owner}" : "Compartido contigo por {owner}",
"Choose a password for the mail share" : "Elija una contraseña para compartir por correo electrónico",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} compartido por medio de un link",
@@ -186,6 +187,7 @@ OC.L10N.register(
"remote" : "remoto",
"remote group" : "grupo remoto",
"email" : "email",
+ "conversation" : "conversación",
"shared by {sharer}" : "compartido por {sharer}",
"Unshare" : "Dejar de compartir",
"Can reshare" : "Puede compartir",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 30ba2decda4a1..40fc621750aad 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -177,6 +177,7 @@
"Enable" : "Habilitar",
"Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
"Shared with you and {circle} by {owner}" : "Compartido contigo y {circle} por {owner}",
+ "Shared with you and the conversation {conversation} by {owner}" : "Compartido contigo y con la conversación {conversation} por {owner}",
"Shared with you by {owner}" : "Compartido contigo por {owner}",
"Choose a password for the mail share" : "Elija una contraseña para compartir por correo electrónico",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} compartido por medio de un link",
@@ -184,6 +185,7 @@
"remote" : "remoto",
"remote group" : "grupo remoto",
"email" : "email",
+ "conversation" : "conversación",
"shared by {sharer}" : "compartido por {sharer}",
"Unshare" : "Dejar de compartir",
"Can reshare" : "Puede compartir",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 15dc0502dc3fd..7fefd3c0f87fd 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -179,6 +179,7 @@ OC.L10N.register(
"Enable" : "Activer",
"Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}",
"Shared with you and {circle} by {owner}" : "Partagé avec vous et {circle} par {owner}",
+ "Shared with you and the conversation {conversation} by {owner}" : "Partagé avec vous et la conversation {conversation} par {owner}",
"Shared with you by {owner}" : "Partagé avec vous par {owner}",
"Choose a password for the mail share" : "Choisissez un mot de passe pour le partage par email",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} a partagé via un lien",
@@ -186,6 +187,7 @@ OC.L10N.register(
"remote" : "distant",
"remote group" : "groupe distant",
"email" : "Adresse de courriel",
+ "conversation" : "conversation",
"shared by {sharer}" : "partagé par {sharer}",
"Unshare" : "Ne plus partager",
"Can reshare" : "Peut repartager",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 891e3e813b773..45cffe3d5575d 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -177,6 +177,7 @@
"Enable" : "Activer",
"Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}",
"Shared with you and {circle} by {owner}" : "Partagé avec vous et {circle} par {owner}",
+ "Shared with you and the conversation {conversation} by {owner}" : "Partagé avec vous et la conversation {conversation} par {owner}",
"Shared with you by {owner}" : "Partagé avec vous par {owner}",
"Choose a password for the mail share" : "Choisissez un mot de passe pour le partage par email",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} a partagé via un lien",
@@ -184,6 +185,7 @@
"remote" : "distant",
"remote group" : "groupe distant",
"email" : "Adresse de courriel",
+ "conversation" : "conversation",
"shared by {sharer}" : "partagé par {sharer}",
"Unshare" : "Ne plus partager",
"Can reshare" : "Peut repartager",
diff --git a/core/l10n/he.js b/core/l10n/he.js
index 9ba59625725ba..3ef4002f42426 100644
--- a/core/l10n/he.js
+++ b/core/l10n/he.js
@@ -84,6 +84,7 @@ OC.L10N.register(
"No" : "לא",
"Yes" : "כן",
"No files in here" : "אין כאן קבצים",
+ "No more subfolders in here" : "אין כאן עוד תת־תיקיות",
"Choose" : "בחירה",
"Copy" : "העתקה",
"Move" : "העברה",
@@ -105,6 +106,8 @@ OC.L10N.register(
"Pending" : "בהמתנה",
"Copy to {folder}" : "העתקה אל {folder}",
"Move to {folder}" : "העברה אל {folder}",
+ "New in" : "חדש ב־",
+ "View changelog" : "הצגת יומן שינויים",
"Very weak password" : "ססמה מאוד חלשה",
"Weak password" : "ססמה חלשה",
"So-so password" : "ססמה בינונית",
@@ -158,6 +161,7 @@ OC.L10N.register(
"Press Ctrl-C to copy." : "יש להקיש Ctrl-C כדי להעתיק.",
"Resharing is not allowed" : "אסור לעשות שיתוף מחדש",
"Share to {name}" : "שיתוף עם {name}",
+ "Copy URL" : "העתקת כתובת",
"Link" : "קישור",
"Password protect" : "הגנה בססמה",
"Allow editing" : "אישור עריכה",
@@ -297,6 +301,7 @@ OC.L10N.register(
"Username or email" : "שם משתמש או דואר אלקטרוני",
"Log in" : "כניסה",
"Wrong password." : "ססמה שגויה.",
+ "User disabled" : "משתמש מושבת",
"We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "זיהינו מספר ניסיונות כניסה שגויים מכתובת ה־IP שלך. לכן, ניסיון הכניסה הבא יתאפשר עבורך רק בעוד 30 שניות.",
"Forgot password?" : "שכחת ססמה?",
"Back to login" : "חזרה לכניסה",
diff --git a/core/l10n/he.json b/core/l10n/he.json
index 9f5b50ad78991..ca851aaa2a2df 100644
--- a/core/l10n/he.json
+++ b/core/l10n/he.json
@@ -82,6 +82,7 @@
"No" : "לא",
"Yes" : "כן",
"No files in here" : "אין כאן קבצים",
+ "No more subfolders in here" : "אין כאן עוד תת־תיקיות",
"Choose" : "בחירה",
"Copy" : "העתקה",
"Move" : "העברה",
@@ -103,6 +104,8 @@
"Pending" : "בהמתנה",
"Copy to {folder}" : "העתקה אל {folder}",
"Move to {folder}" : "העברה אל {folder}",
+ "New in" : "חדש ב־",
+ "View changelog" : "הצגת יומן שינויים",
"Very weak password" : "ססמה מאוד חלשה",
"Weak password" : "ססמה חלשה",
"So-so password" : "ססמה בינונית",
@@ -156,6 +159,7 @@
"Press Ctrl-C to copy." : "יש להקיש Ctrl-C כדי להעתיק.",
"Resharing is not allowed" : "אסור לעשות שיתוף מחדש",
"Share to {name}" : "שיתוף עם {name}",
+ "Copy URL" : "העתקת כתובת",
"Link" : "קישור",
"Password protect" : "הגנה בססמה",
"Allow editing" : "אישור עריכה",
@@ -295,6 +299,7 @@
"Username or email" : "שם משתמש או דואר אלקטרוני",
"Log in" : "כניסה",
"Wrong password." : "ססמה שגויה.",
+ "User disabled" : "משתמש מושבת",
"We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "זיהינו מספר ניסיונות כניסה שגויים מכתובת ה־IP שלך. לכן, ניסיון הכניסה הבא יתאפשר עבורך רק בעוד 30 שניות.",
"Forgot password?" : "שכחת ססמה?",
"Back to login" : "חזרה לכניסה",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index d489881a50938..f6d05902c9f10 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -179,6 +179,7 @@ OC.L10N.register(
"Enable" : "Abilita",
"Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}",
"Shared with you and {circle} by {owner}" : "Condiviso con te e {circle} da {owner}",
+ "Shared with you and the conversation {conversation} by {owner}" : "Condiviso con te e con la conversazione {conversation} da {owner}",
"Shared with you by {owner}" : "Condiviso con te da {owner}",
"Choose a password for the mail share" : "Scegli una password per la condivisione tramite posta",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} ha condiviso tramite collegamento",
@@ -186,6 +187,7 @@ OC.L10N.register(
"remote" : "remota",
"remote group" : "gruppo remoto",
"email" : "email",
+ "conversation" : "conversazione",
"shared by {sharer}" : "condiviso da {sharer}",
"Unshare" : "Rimuovi condivisione",
"Can reshare" : "Può ri-condividere",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 4bf66ba3504b8..d4efb3857967a 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -177,6 +177,7 @@
"Enable" : "Abilita",
"Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}",
"Shared with you and {circle} by {owner}" : "Condiviso con te e {circle} da {owner}",
+ "Shared with you and the conversation {conversation} by {owner}" : "Condiviso con te e con la conversazione {conversation} da {owner}",
"Shared with you by {owner}" : "Condiviso con te da {owner}",
"Choose a password for the mail share" : "Scegli una password per la condivisione tramite posta",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} ha condiviso tramite collegamento",
@@ -184,6 +185,7 @@
"remote" : "remota",
"remote group" : "gruppo remoto",
"email" : "email",
+ "conversation" : "conversazione",
"shared by {sharer}" : "condiviso da {sharer}",
"Unshare" : "Rimuovi condivisione",
"Can reshare" : "Può ri-condividere",
diff --git a/core/l10n/nb.js b/core/l10n/nb.js
index 5aff62d7d3897..1115410b9496a 100644
--- a/core/l10n/nb.js
+++ b/core/l10n/nb.js
@@ -127,7 +127,7 @@ OC.L10N.register(
"Last background job execution ran {relativeTime}. Something seems wrong." : "Den siste bakgrunsjobben brukte {relativeTime}. Noe virker galt.",
"Check the background job settings" : "Kontroller instillinger for bakgrunnsjobb",
"This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. Establish a connection from this server to the Internet to enjoy all features." : "Denne tjeneren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjepartsprogrammer ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Det anbefales å aktivere en internett-forbindelse for denne tjeneren hvis du vil ha full funksjonalitet.",
- "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the documentation." : "Inget hurtigminne har blitt satt opp. For å øke ytelsen bør du sette opp et hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i dokumentasjonen.",
+ "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the documentation." : "Hurtigminne er ikke satt opp. For bedre ytelse bør du sette opp hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i dokumentasjonen.",
"/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in the documentation." : "/dev/urandom er ikke lesbar for PHP, noe som frarådes av sikkerhetsgrunner. Mer informasjon finnes i dokumentasjonen.",
"You are currently running PHP {version}. Upgrade your PHP version to take advantage of performance and security updates provided by the PHP Group as soon as your distribution supports it." : "Du bruker PHP-{version}. Oppgrader PHP-versjonen for å utnytte ytelsen og sikkerhetsoppdateringene som tilbys av PHP Groupdocumentation." : "Din vevtjener er ikke satt opp korrekt for å hente \"{url}\". Mer informasjon finner du i vår dokumentasjon.",
"This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne tjeneren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjepartsprogrammer ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne tjeneren hvis du vil ha full funksjonalitet.",
- "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our documentation." : "Inget hurtigminne har blitt satt opp. For å øke ytelsen bør du sette opp et hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i vår dokumentasjon.",
+ "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our documentation." : "Hurtigminne er ikke satt opp. For bedre ytelse bør du sette opp hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i dokumentasjonen.",
"/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our documentation." : "/dev/urandom er ikke lesbar for PHP, noe som frarådes av sikkerhetsgrunner. Mer informasjon finnes i vår dokumentasjon.",
"You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by the PHP Group as soon as your distribution supports it." : "Du bruker PHP-{version}. Vi anbefaler deg å oppgradere PHP versjonen for å utnytte ytelse og sikkerhetsoppdateringer som tilbys av PHP Group, så fort din distribusjon støtter det.",
"The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our documentation." : "De omvendte mellomtjener-hodene er ikke satt opp rett, eller du kobler til Nextcloud fra en betrodd mellomtjener. Hvis du ikke kobler til Nextcloud fra en betrodd mellomtjener, er dette et sikkerhetsproblem, og kan tillate en angriper å forfalske deres IP-adresse slik den er synlig for Nextcloud. Ytterligere informasjon er å finne i dokumentasjonen.",
@@ -366,7 +368,7 @@ OC.L10N.register(
"The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP-funksjonen \"set_time_limit\" er ikke tilgjengelig. Dette kan resultere i at skript blir stoppet midt i kjøring, noe som knekker installasjonen din. Det anbefales sterkt å skru på denne funksjonen.",
"Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Det anbefales sterkt at du setter opp vev-tjeneren slik at datamappen ikke kan nås eller at du flytter datamappen ut av vev-tjenerens dokumentrot.",
"The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke satt opp lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.",
- "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our security tips." : "\"Strict-Transport-Security\"- (Streng transportsikkerhet) HTTP-hodet er ikke satt opp til minst \"{seconds}\" sekunder. For forbedret sikkerhet anbefales det å skru på HSTS som beskrevet i våre sikkerhetstips.",
+ "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our security tips." : "HTTP innledning \"Strict-Transport-Security\" angir styrke på transportsikkerhet og er ikke satt opp med minst \"{seconds}\" sekunder. For bedre sikkerhet anbefales det å skru på HSTS som beskrevet i våre sikkerhetstips.",
"You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our security tips." : "Du besøker denne nettsiden via HTTP. Vi anbefaler på det sterkeste at du konfigurerer tjeneren til å kreve HTTPS i stedet, som beskrevet i sikkerhetstips.",
"Shared with {recipients}" : "Delt med {recipients}",
"Error setting expiration date" : "Kan ikke sette utløpsdato",
@@ -389,7 +391,7 @@ OC.L10N.register(
"Add \"%s\" as trusted domain" : "Legg til \"%s\" som et klarert domene",
"For help, see the documentation." : "For hjelp, se i dokumentasjonen.",
"Your PHP does not have freetype support. This will result in broken profile pictures and settings interface." : "Din PHP-installasjon har ikke FreeType-støtte. Dette fører til knekte profilbilder og skadelidende innstillingsgrensesnitt.",
- "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the security tips." : "\"Strict-Transport-Security\"- (Streng transportsikkerhet) HTTP-hodet er ikke satt opp til minst \"{seconds}\" sekunder. For bedret sikkerhet anbefales det å skru på HSTS som beskrevet i sikkerhetstipsene.",
+ "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the security tips." : "HTTP innledning \"Strict-Transport-Security\" angir styrke på transportsikkerhet og er ikke satt opp med minst \"{seconds}\" sekunder. For bedre sikkerhet anbefales det å skru på HSTS som beskrevet i sikkerhetstipsene.",
"Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the security tips." : "Du besøker denne nettsiden via HTTP. Det anbefales sterkt at du setter opp tjeneren til å kreve HTTPS i stedet, som beskrevet i sikkerhetstipsene.",
"Back to log in" : "Tilbake til innlogging",
"Depending on your configuration, this button could also work to trust the domain:" : "Avhengig av ditt oppsett, kan denne knappen også betro domenet."
diff --git a/core/l10n/nb.json b/core/l10n/nb.json
index 67d4c77feb52d..3f374cd0c4a8d 100644
--- a/core/l10n/nb.json
+++ b/core/l10n/nb.json
@@ -125,7 +125,7 @@
"Last background job execution ran {relativeTime}. Something seems wrong." : "Den siste bakgrunsjobben brukte {relativeTime}. Noe virker galt.",
"Check the background job settings" : "Kontroller instillinger for bakgrunnsjobb",
"This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. Establish a connection from this server to the Internet to enjoy all features." : "Denne tjeneren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjepartsprogrammer ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Det anbefales å aktivere en internett-forbindelse for denne tjeneren hvis du vil ha full funksjonalitet.",
- "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the documentation." : "Inget hurtigminne har blitt satt opp. For å øke ytelsen bør du sette opp et hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i dokumentasjonen.",
+ "No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the documentation." : "Hurtigminne er ikke satt opp. For bedre ytelse bør du sette opp hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i dokumentasjonen.",
"/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in the documentation." : "/dev/urandom er ikke lesbar for PHP, noe som frarådes av sikkerhetsgrunner. Mer informasjon finnes i dokumentasjonen.",
"You are currently running PHP {version}. Upgrade your PHP version to take advantage of performance and security updates provided by the PHP Group as soon as your distribution supports it." : "Du bruker PHP-{version}. Oppgrader PHP-versjonen for å utnytte ytelsen og sikkerhetsoppdateringene som tilbys av PHP Groupdocumentation." : "Din vevtjener er ikke satt opp korrekt for å hente \"{url}\". Mer informasjon finner du i vår dokumentasjon.",
"This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Denne tjeneren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjepartsprogrammer ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne tjeneren hvis du vil ha full funksjonalitet.",
- "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our documentation." : "Inget hurtigminne har blitt satt opp. For å øke ytelsen bør du sette opp et hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i vår dokumentasjon.",
+ "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our documentation." : "Hurtigminne er ikke satt opp. For bedre ytelse bør du sette opp hurtigminne hvis det er tilgjengelig. Mer informasjon finnes i dokumentasjonen.",
"/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our documentation." : "/dev/urandom er ikke lesbar for PHP, noe som frarådes av sikkerhetsgrunner. Mer informasjon finnes i vår dokumentasjon.",
"You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by the PHP Group as soon as your distribution supports it." : "Du bruker PHP-{version}. Vi anbefaler deg å oppgradere PHP versjonen for å utnytte ytelse og sikkerhetsoppdateringer som tilbys av PHP Group, så fort din distribusjon støtter det.",
"The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our documentation." : "De omvendte mellomtjener-hodene er ikke satt opp rett, eller du kobler til Nextcloud fra en betrodd mellomtjener. Hvis du ikke kobler til Nextcloud fra en betrodd mellomtjener, er dette et sikkerhetsproblem, og kan tillate en angriper å forfalske deres IP-adresse slik den er synlig for Nextcloud. Ytterligere informasjon er å finne i dokumentasjonen.",
@@ -364,7 +366,7 @@
"The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP-funksjonen \"set_time_limit\" er ikke tilgjengelig. Dette kan resultere i at skript blir stoppet midt i kjøring, noe som knekker installasjonen din. Det anbefales sterkt å skru på denne funksjonen.",
"Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Det anbefales sterkt at du setter opp vev-tjeneren slik at datamappen ikke kan nås eller at du flytter datamappen ut av vev-tjenerens dokumentrot.",
"The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke satt opp lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.",
- "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our security tips." : "\"Strict-Transport-Security\"- (Streng transportsikkerhet) HTTP-hodet er ikke satt opp til minst \"{seconds}\" sekunder. For forbedret sikkerhet anbefales det å skru på HSTS som beskrevet i våre sikkerhetstips.",
+ "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our security tips." : "HTTP innledning \"Strict-Transport-Security\" angir styrke på transportsikkerhet og er ikke satt opp med minst \"{seconds}\" sekunder. For bedre sikkerhet anbefales det å skru på HSTS som beskrevet i våre sikkerhetstips.",
"You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our security tips." : "Du besøker denne nettsiden via HTTP. Vi anbefaler på det sterkeste at du konfigurerer tjeneren til å kreve HTTPS i stedet, som beskrevet i sikkerhetstips.",
"Shared with {recipients}" : "Delt med {recipients}",
"Error setting expiration date" : "Kan ikke sette utløpsdato",
@@ -387,7 +389,7 @@
"Add \"%s\" as trusted domain" : "Legg til \"%s\" som et klarert domene",
"For help, see the documentation." : "For hjelp, se i dokumentasjonen.",
"Your PHP does not have freetype support. This will result in broken profile pictures and settings interface." : "Din PHP-installasjon har ikke FreeType-støtte. Dette fører til knekte profilbilder og skadelidende innstillingsgrensesnitt.",
- "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the security tips." : "\"Strict-Transport-Security\"- (Streng transportsikkerhet) HTTP-hodet er ikke satt opp til minst \"{seconds}\" sekunder. For bedret sikkerhet anbefales det å skru på HSTS som beskrevet i sikkerhetstipsene.",
+ "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the security tips." : "HTTP innledning \"Strict-Transport-Security\" angir styrke på transportsikkerhet og er ikke satt opp med minst \"{seconds}\" sekunder. For bedre sikkerhet anbefales det å skru på HSTS som beskrevet i sikkerhetstipsene.",
"Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the security tips." : "Du besøker denne nettsiden via HTTP. Det anbefales sterkt at du setter opp tjeneren til å kreve HTTPS i stedet, som beskrevet i sikkerhetstipsene.",
"Back to log in" : "Tilbake til innlogging",
"Depending on your configuration, this button could also work to trust the domain:" : "Avhengig av ditt oppsett, kan denne knappen også betro domenet."
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index cfd2ffae64bcd..5e2de96d02573 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -35,6 +35,7 @@ OC.L10N.register(
"Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld",
"Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld",
"Maintenance mode is kept active" : "Onderhoudsmodus blijft actief",
+ "Waiting for cron to finish (checks again in 5 seconds) …" : "Wachten op gereedmelding cron (over 5 seconden nieuwe check) …",
"Updating database schema" : "Databaseschema aan het bijwerken",
"Updated database" : "Database bijgewerkt",
"Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Controleert of het databaseschema geüpdatet kan worden (dit kan lang duren afhankelijk van de grootte van de de database)",
@@ -83,6 +84,7 @@ OC.L10N.register(
"No" : "Nee",
"Yes" : "Ja",
"No files in here" : "Hier geen bestanden",
+ "No more subfolders in here" : "Hier niet meer submappen",
"Choose" : "Kies",
"Copy" : "Kopiëren",
"Move" : "Verplaats",
@@ -105,6 +107,7 @@ OC.L10N.register(
"Copy to {folder}" : "Kopieer naar {folder}",
"Move to {folder}" : "Verplaats naar {folder}",
"New in" : "Nieuw in",
+ "View changelog" : "Bekijk wijzigingsoverzicht",
"Very weak password" : "Zeer zwak wachtwoord",
"Weak password" : "Zwak wachtwoord",
"So-so password" : "Matig wachtwoord",
@@ -112,6 +115,17 @@ OC.L10N.register(
"Strong password" : "Sterk wachtwoord",
"Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Je webserver is nog niet goed ingesteld voor bestandssynchronisatie, omdat de WebDAV interface niet goed lijkt te werken.",
"Your web server is not properly set up to resolve \"{url}\". Further information can be found in the documentation." : "Je webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze documentatie.",
+ "PHP does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP lijkt niet goed te zijn ingesteld voor opvragen systeemomgevingsvariabelen. De test met getenv(\"PATH\") gaf een leeg resultaat.",
+ "Please check the installation documentation ↗ for PHP configuration notes and the PHP configuration of your server, especially when using php-fpm." : "Controleer de installatiedocumentatie ↗ voor php configuratienotities en de php configuratie van je server, zeker bij gebruik van php-fpm.",
+ "The read-only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De alleen-lezen config is ingeschakeld. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.",
+ "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Je database draait niet met \"READ COMMITTED\" transactie-isolatie niveau. Dit kan problemen opleveren als er meerdere acties tegelijkertijd worden uitgevoerd.",
+ "The PHP module \"fileinfo\" is missing. It is strongly recommended to enable this module to get the best results with MIME type detection." : "De PHP module \"fileinfo\" ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor MIME-type detectie.",
+ "{name} below version {version} is installed, for stability and performance reasons it is recommended to update to a newer {name} version." : "{name} lager dan {version} is geïnstalleerd, voor stabiliteits- en prestatieredenen wodt geadviseerd om naar een recentere {name} versie bij te werken.",
+ "Transactional file locking is disabled, this might lead to issues with race conditions. Enable \"filelocking.enabled\" in config.php to avoid these problems. See the documentation ↗ for more information." : "Transactionele bestandlocking is uitgeschakeld, dat zou namelijk kunnen leiden tot versiebeheerproblemen. Schakel \"filelocking enabled\" in config.php in om deze problemen te voorkomen. Zie de documentatie ↗ voor meer informatie.",
+ "If your installation is not installed at the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (suggestion: \"{suggestedOverwriteCliURL}\")" : "Als je installatie niet in de hoofddirectory van het domein staat, maar wel systeem cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou je de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van je installatie (aanbevolen:\"{suggestedOverwriteCliURL}\")",
+ "It was not possible to execute the cron job via CLI. The following technical errors have appeared:" : "Het was niet mogelijk om de systeem cron via CLI uit te voeren. De volgende technische problemen traden op:",
+ "Last background job execution ran {relativeTime}. Something seems wrong." : "Laatst uitgevoerde achtergrondtaak {relativeTime}. Er lijkt iets fout gegaan.",
+ "Check the background job settings" : "Controleer de achtergrondtaak instellingen",
"This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. Establish a connection from this server to the Internet to enjoy all features." : "Deze server heeft geen werkende internetverbinding: meerdere endpoints kunnen niet worden bereikt. Dat betekent dat sommige functies, zoals het gebruik van externe opslag, notificaties over updates of installatie van apps van derde partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als je alle functies wilt gebruiken.",
"No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the documentation." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kun je een geheugencache configureren als die beschikbaar is. Meer informatie vind je in onze documentatie.",
"/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in the documentation." : "/dev/urandom is niet leesbaar voor PHP, het geen sterk wordt afgeraden om veiligheidsredenen. Meer informatie in onze documentatie.",
@@ -120,13 +134,23 @@ OC.L10N.register(
"The reverse proxy header configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If not, this is a security issue and can allow an attacker to spoof their IP address as visible to the Nextcloud. Further information can be found in the documentation." : "De reverse proxy headerconfiguratie is onjuist, of je hebt toegang tot Nextcloud via een vertrouwde proxy. Als je Nextcloud niet via een vertrouwde proxy benadert, dan levert dat een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat Nextcloud ziet kan vervalsen. Meer informatie is te vinden in onze documentatie.",
"Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the memcached wiki about both modules." : "Memcached is geconfigureerd als gedistribueerde cache, maar de verkeerde PHP module \"memcache\" is geïnstalleerd. \\OC\\Memcache\\Memcached ondersteunt alleen \"memcached\" en niet \"memcache\". Zie de memcached wiki over beide modules.",
"Some files have not passed the integrity check. Further information on how to resolve this issue can be found in the documentation. (List of invalid files… / Rescan…)" : "Sommige bestanden kwamen niet door de betrouwbaarheidscontrole. Meer informatie over het oplossen van dit probleem kan worden gevonden in onze documentatie. (Lijst met ongeldige bestanden… / Opnieuw…)",
+ "The PHP OPcache module is not loaded. For better performance it is recommended to load it into your PHP installation." : "De PHP OPcache is niet correct geladen. Voor betere prestaties adviseren we die te laden in je php.ini instellingen.",
"The PHP OPcache is not properly configured. For better performance it is recommended to use the following settings in the php.ini:" : "De PHP OPcache is niet correct geconfigureerd. Voor betere prestaties adviseren we de volgende php.ini instellingen te gebruiken:",
"The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. Enabling this function is strongly recommended." : "De PHP functie \"set_time_limit\" is niet beschikbaar. Dit kan erin resulteren dat de scripts halverwege stoppen, waardoor de installatie ontregeld raakt. We adviseren sterk om deze functie in te schakelen.",
"Your PHP does not have FreeType support, resulting in breakage of profile pictures and the settings interface." : "Je PHP heeft geen FreeType ondersteuning. Dit zal leiden tot verminkte profielafbeeldingen en instellingeninterface.",
+ "Missing index \"{indexName}\" in table \"{tableName}\"." : "Ontbrekende index \"{indexName}\" in tabel \"{tableName}\".",
+ "The database is missing some indexes. Due to the fact that adding indexes on big tables could take some time they were not added automatically. By running \"occ db:add-missing-indices\" those missing indexes could be added manually while the instance keeps running. Once the indexes are added queries to those tables are usually much faster." : "De database mist een paar indexen. Omdat het toevoegen van indexen op grote tabellen veel tijd kan kosten, zijn ze niet automatisch gecreëerd. Door het draaien van \"occ db:add-missing-indices\" kunnen deze indexen handmatig worden toegevoegd terwijl de server blijft draaien. Als de indexe zijn toegevoegd, zullen opvragingen op die tabellen veel sneller plaatsvinden.",
+ "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite wordt momenteel gebruikt als backend database. Voor grotere installaties adviseren we dat je omschakelt naar een andere database backend.",
+ "This is particularly recommended when using the desktop client for file synchronisation." : "Dit wordt vooral aanbevolen als de desktop client wordt gebruikt voor bestandssynchronisatie.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Om te migreren naar een andere database moet je de commandoregel tool gebruiken: 'occ db:convert-type'; zie de documentatie ↗.",
+ "Use of the the built in php mailer is no longer supported. Please update your email server settings ↗." : "D ingebouwde php mailer wordt niet langer ondersteund. Werk je mailserverinstellingen bij ↗.",
"Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie",
"Your data directory and files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server so that the data directory is no longer accessible, or move the data directory outside the web server document root." : "Je datamap en je bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om je webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om je datadirectory te verplaatsen naar een locatie buiten de document-root van de webserver.",
"The \"{header}\" HTTP header is not set to \"{expected}\". This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly." : "De \"{header}\" HTTP header is niet ingesteld als \"{expected}\". Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.",
"The \"{header}\" HTTP header is not set to \"{expected}\". Some features might not work correctly, as it is recommended to adjust this setting accordingly." : "De \"{header}\" HTTP header is ingesteld als \"{expected}\". Sommige functies werken mogelijk niet zoals bedoeld en we adviseren om deze instelling te wijzigen.",
+ "The \"{header}\" HTTP header is not set to \"{val1}\", \"{val2}\", \"{val3}\" or \"{val4}\". This can leak referer information. See the W3C Recommendation ↗." : "De \"{header}\" HTTP header is niet ingesteld op \"{val1}\", \"{val2}\", \"{val3}\" of \"{val4}\". Hierdoor kan refer informatie uitlekken. Zie de W3C aanbeveling ↗.",
+ "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the security tips ↗." : "De \"Strict-Transport-Security\" HTTP header is niet ingesteld als minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in de security tips ↗.",
+ "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the security tips ↗." : "De site is onveilig verbonden over HTTP. We adviseren je dringend om je server zo te configureren dat HTTPS wordt vereist, zoals beschreven in de security tips ↗.",
"Shared" : "Gedeeld",
"Shared with" : "Gedeeld met",
"Shared by" : "Gedeeld door",
@@ -138,6 +162,7 @@ OC.L10N.register(
"Press Ctrl-C to copy." : "Druk op Ctrl-C om te kopiëren.",
"Resharing is not allowed" : "Verder delen is niet toegestaan",
"Share to {name}" : "Delen naar {name}",
+ "Copy URL" : "Kopiëren URL",
"Link" : "Link",
"Password protect" : "Wachtwoord beveiligd",
"Allow editing" : "Bewerken toestaan",
@@ -149,14 +174,20 @@ OC.L10N.register(
"Set expiration date" : "Stel vervaldatum in",
"Expiration" : "Vervaltermijn",
"Expiration date" : "Vervaldatum",
+ "Note to recipient" : "Notitie voor ontvanger",
"Share link" : "Deellink",
+ "Enable" : "Inschakelen",
"Shared with you and the group {group} by {owner}" : "Met jou en de groep {group} gedeeld door {owner}",
+ "Shared with you and {circle} by {owner}" : "Gedeeld met jou en {circle} door {owner}",
+ "Shared with you and the conversation {conversation} by {owner}" : "Gedeeld met jou en gesprek {conversation} door {owner}",
"Shared with you by {owner}" : "Met je gedeeld door {owner}",
"Choose a password for the mail share" : "Kies een wachtwoord om gedeelde te mailen",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} delen via link",
"group" : "groep",
"remote" : "extern",
+ "remote group" : "externe groep",
"email" : "email",
+ "conversation" : "gesprek",
"shared by {sharer}" : "Gedeeld door {eigenaar}",
"Unshare" : "Delen stoppen",
"Can reshare" : "Kan doordelen",
@@ -164,6 +195,7 @@ OC.L10N.register(
"Can create" : "Kan creëren",
"Can change" : "Kan wijzigen",
"Can delete" : "Kan verwijderen",
+ "Password protect by Talk" : "Wachtwoord beveiligd door Talk",
"Access control" : "Toegangscontrole",
"Could not unshare" : "Kon delen niet ongedaan maken",
"Error while sharing" : "Fout tijdens het delen",
@@ -176,6 +208,7 @@ OC.L10N.register(
"An error occurred. Please try again" : "Er trad een fout op. Probeer het opnieuw",
"{sharee} (group)" : "{sharee} (groep)",
"{sharee} (remote)" : "{sharee} (extern)",
+ "{sharee} (remote group)" : "{sharee} (remote group)",
"{sharee} (email)" : "{sharee} (email)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Delen",
@@ -260,9 +293,14 @@ OC.L10N.register(
"Need help?" : "Hulp nodig?",
"See the documentation" : "Zie de documentatie",
"This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Deze applicatie heeft JavaScript nodig. {linkstart}Activeer JavaScript{linkend} en ververs deze pagina.",
+ "Skip to main content" : "Ga naar hoofdinhoud",
+ "Skip to navigation of app" : "Ga naar navigatie van app",
"More apps" : "Meer apps",
+ "More apps menu" : "Meer apps menu",
"Search" : "Zoeken",
"Reset search" : "Zoekopdracht wissen",
+ "Contacts" : "Contactpersonen",
+ "Contacts menu" : "Contacten menu",
"Settings menu" : "Instellingenmenu",
"Confirm your password" : "Bevestig je wachtwoord",
"Server side authentication failed!" : "Authenticatie bij de server mislukt!",
@@ -272,6 +310,7 @@ OC.L10N.register(
"Username or email" : "Gebruikersnaam of email",
"Log in" : "Inloggen",
"Wrong password." : "Onjuist wachtwoord.",
+ "User disabled" : "Gebruiker gedeactiveerd",
"We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "We hebben meerdere foutieve inlogverzoeken van jouw IP gedetecteerd. Hierdoor wordt je volgende inlogverzoek 30 seconden uitgesteld.",
"Forgot password?" : "Wachtwoord vergeten?",
"Back to login" : "Terug naar inloggen",
@@ -285,8 +324,11 @@ OC.L10N.register(
"Redirecting …" : "Omleiding ...",
"New password" : "Nieuw wachtwoord",
"New Password" : "Nieuw wachtwoord",
+ "This share is password-protected" : "Deze share is wachtwoordbeveiligd",
+ "The password is wrong. Try again." : "Het wachtwoord is onjuist. Probeer opnieuw.",
"Two-factor authentication" : "Tweefactor authenticatie",
"Enhanced security is enabled for your account. Please authenticate using a second factor." : "Aanvullende beveiliging is ingeschakeld voor je account. Log in met een tweede factor.",
+ "Could not load at least one of your enabled two-factor auth methods. Please contact your admin." : "Kon niet minimaal één an jouw ingeschakelde two-factor auth methoden laden. Neem contact op met je beheerder.",
"Cancel log in" : "Inloggen annuleren",
"Use backup code" : "Gebruik back-upcode",
"Error while validating your second factor" : "Fout bij het verifiëren van je tweede factor",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index 77f8206b0f3c2..5dae1bf1568e9 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -33,6 +33,7 @@
"Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld",
"Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld",
"Maintenance mode is kept active" : "Onderhoudsmodus blijft actief",
+ "Waiting for cron to finish (checks again in 5 seconds) …" : "Wachten op gereedmelding cron (over 5 seconden nieuwe check) …",
"Updating database schema" : "Databaseschema aan het bijwerken",
"Updated database" : "Database bijgewerkt",
"Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Controleert of het databaseschema geüpdatet kan worden (dit kan lang duren afhankelijk van de grootte van de de database)",
@@ -81,6 +82,7 @@
"No" : "Nee",
"Yes" : "Ja",
"No files in here" : "Hier geen bestanden",
+ "No more subfolders in here" : "Hier niet meer submappen",
"Choose" : "Kies",
"Copy" : "Kopiëren",
"Move" : "Verplaats",
@@ -103,6 +105,7 @@
"Copy to {folder}" : "Kopieer naar {folder}",
"Move to {folder}" : "Verplaats naar {folder}",
"New in" : "Nieuw in",
+ "View changelog" : "Bekijk wijzigingsoverzicht",
"Very weak password" : "Zeer zwak wachtwoord",
"Weak password" : "Zwak wachtwoord",
"So-so password" : "Matig wachtwoord",
@@ -110,6 +113,17 @@
"Strong password" : "Sterk wachtwoord",
"Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Je webserver is nog niet goed ingesteld voor bestandssynchronisatie, omdat de WebDAV interface niet goed lijkt te werken.",
"Your web server is not properly set up to resolve \"{url}\". Further information can be found in the documentation." : "Je webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze documentatie.",
+ "PHP does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP lijkt niet goed te zijn ingesteld voor opvragen systeemomgevingsvariabelen. De test met getenv(\"PATH\") gaf een leeg resultaat.",
+ "Please check the installation documentation ↗ for PHP configuration notes and the PHP configuration of your server, especially when using php-fpm." : "Controleer de installatiedocumentatie ↗ voor php configuratienotities en de php configuratie van je server, zeker bij gebruik van php-fpm.",
+ "The read-only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De alleen-lezen config is ingeschakeld. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.",
+ "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Je database draait niet met \"READ COMMITTED\" transactie-isolatie niveau. Dit kan problemen opleveren als er meerdere acties tegelijkertijd worden uitgevoerd.",
+ "The PHP module \"fileinfo\" is missing. It is strongly recommended to enable this module to get the best results with MIME type detection." : "De PHP module \"fileinfo\" ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor MIME-type detectie.",
+ "{name} below version {version} is installed, for stability and performance reasons it is recommended to update to a newer {name} version." : "{name} lager dan {version} is geïnstalleerd, voor stabiliteits- en prestatieredenen wodt geadviseerd om naar een recentere {name} versie bij te werken.",
+ "Transactional file locking is disabled, this might lead to issues with race conditions. Enable \"filelocking.enabled\" in config.php to avoid these problems. See the documentation ↗ for more information." : "Transactionele bestandlocking is uitgeschakeld, dat zou namelijk kunnen leiden tot versiebeheerproblemen. Schakel \"filelocking enabled\" in config.php in om deze problemen te voorkomen. Zie de documentatie ↗ voor meer informatie.",
+ "If your installation is not installed at the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (suggestion: \"{suggestedOverwriteCliURL}\")" : "Als je installatie niet in de hoofddirectory van het domein staat, maar wel systeem cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou je de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van je installatie (aanbevolen:\"{suggestedOverwriteCliURL}\")",
+ "It was not possible to execute the cron job via CLI. The following technical errors have appeared:" : "Het was niet mogelijk om de systeem cron via CLI uit te voeren. De volgende technische problemen traden op:",
+ "Last background job execution ran {relativeTime}. Something seems wrong." : "Laatst uitgevoerde achtergrondtaak {relativeTime}. Er lijkt iets fout gegaan.",
+ "Check the background job settings" : "Controleer de achtergrondtaak instellingen",
"This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. Establish a connection from this server to the Internet to enjoy all features." : "Deze server heeft geen werkende internetverbinding: meerdere endpoints kunnen niet worden bereikt. Dat betekent dat sommige functies, zoals het gebruik van externe opslag, notificaties over updates of installatie van apps van derde partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als je alle functies wilt gebruiken.",
"No memory cache has been configured. To enhance performance, please configure a memcache, if available. Further information can be found in the documentation." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kun je een geheugencache configureren als die beschikbaar is. Meer informatie vind je in onze documentatie.",
"/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in the documentation." : "/dev/urandom is niet leesbaar voor PHP, het geen sterk wordt afgeraden om veiligheidsredenen. Meer informatie in onze documentatie.",
@@ -118,13 +132,23 @@
"The reverse proxy header configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If not, this is a security issue and can allow an attacker to spoof their IP address as visible to the Nextcloud. Further information can be found in the documentation." : "De reverse proxy headerconfiguratie is onjuist, of je hebt toegang tot Nextcloud via een vertrouwde proxy. Als je Nextcloud niet via een vertrouwde proxy benadert, dan levert dat een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat Nextcloud ziet kan vervalsen. Meer informatie is te vinden in onze documentatie.",
"Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the memcached wiki about both modules." : "Memcached is geconfigureerd als gedistribueerde cache, maar de verkeerde PHP module \"memcache\" is geïnstalleerd. \\OC\\Memcache\\Memcached ondersteunt alleen \"memcached\" en niet \"memcache\". Zie de memcached wiki over beide modules.",
"Some files have not passed the integrity check. Further information on how to resolve this issue can be found in the documentation. (List of invalid files… / Rescan…)" : "Sommige bestanden kwamen niet door de betrouwbaarheidscontrole. Meer informatie over het oplossen van dit probleem kan worden gevonden in onze documentatie. (Lijst met ongeldige bestanden… / Opnieuw…)",
+ "The PHP OPcache module is not loaded. For better performance it is recommended to load it into your PHP installation." : "De PHP OPcache is niet correct geladen. Voor betere prestaties adviseren we die te laden in je php.ini instellingen.",
"The PHP OPcache is not properly configured. For better performance it is recommended to use the following settings in the php.ini:" : "De PHP OPcache is niet correct geconfigureerd. Voor betere prestaties adviseren we de volgende php.ini instellingen te gebruiken:",
"The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. Enabling this function is strongly recommended." : "De PHP functie \"set_time_limit\" is niet beschikbaar. Dit kan erin resulteren dat de scripts halverwege stoppen, waardoor de installatie ontregeld raakt. We adviseren sterk om deze functie in te schakelen.",
"Your PHP does not have FreeType support, resulting in breakage of profile pictures and the settings interface." : "Je PHP heeft geen FreeType ondersteuning. Dit zal leiden tot verminkte profielafbeeldingen en instellingeninterface.",
+ "Missing index \"{indexName}\" in table \"{tableName}\"." : "Ontbrekende index \"{indexName}\" in tabel \"{tableName}\".",
+ "The database is missing some indexes. Due to the fact that adding indexes on big tables could take some time they were not added automatically. By running \"occ db:add-missing-indices\" those missing indexes could be added manually while the instance keeps running. Once the indexes are added queries to those tables are usually much faster." : "De database mist een paar indexen. Omdat het toevoegen van indexen op grote tabellen veel tijd kan kosten, zijn ze niet automatisch gecreëerd. Door het draaien van \"occ db:add-missing-indices\" kunnen deze indexen handmatig worden toegevoegd terwijl de server blijft draaien. Als de indexe zijn toegevoegd, zullen opvragingen op die tabellen veel sneller plaatsvinden.",
+ "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite wordt momenteel gebruikt als backend database. Voor grotere installaties adviseren we dat je omschakelt naar een andere database backend.",
+ "This is particularly recommended when using the desktop client for file synchronisation." : "Dit wordt vooral aanbevolen als de desktop client wordt gebruikt voor bestandssynchronisatie.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type', or see the documentation ↗." : "Om te migreren naar een andere database moet je de commandoregel tool gebruiken: 'occ db:convert-type'; zie de documentatie ↗.",
+ "Use of the the built in php mailer is no longer supported. Please update your email server settings ↗." : "D ingebouwde php mailer wordt niet langer ondersteund. Werk je mailserverinstellingen bij ↗.",
"Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie",
"Your data directory and files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server so that the data directory is no longer accessible, or move the data directory outside the web server document root." : "Je datamap en je bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om je webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om je datadirectory te verplaatsen naar een locatie buiten de document-root van de webserver.",
"The \"{header}\" HTTP header is not set to \"{expected}\". This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly." : "De \"{header}\" HTTP header is niet ingesteld als \"{expected}\". Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.",
"The \"{header}\" HTTP header is not set to \"{expected}\". Some features might not work correctly, as it is recommended to adjust this setting accordingly." : "De \"{header}\" HTTP header is ingesteld als \"{expected}\". Sommige functies werken mogelijk niet zoals bedoeld en we adviseren om deze instelling te wijzigen.",
+ "The \"{header}\" HTTP header is not set to \"{val1}\", \"{val2}\", \"{val3}\" or \"{val4}\". This can leak referer information. See the W3C Recommendation ↗." : "De \"{header}\" HTTP header is niet ingesteld op \"{val1}\", \"{val2}\", \"{val3}\" of \"{val4}\". Hierdoor kan refer informatie uitlekken. Zie de W3C aanbeveling ↗.",
+ "The \"Strict-Transport-Security\" HTTP header is not set to at least \"{seconds}\" seconds. For enhanced security, it is recommended to enable HSTS as described in the security tips ↗." : "De \"Strict-Transport-Security\" HTTP header is niet ingesteld als minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in de security tips ↗.",
+ "Accessing site insecurely via HTTP. You are strongly adviced to set up your server to require HTTPS instead, as described in the security tips ↗." : "De site is onveilig verbonden over HTTP. We adviseren je dringend om je server zo te configureren dat HTTPS wordt vereist, zoals beschreven in de security tips ↗.",
"Shared" : "Gedeeld",
"Shared with" : "Gedeeld met",
"Shared by" : "Gedeeld door",
@@ -136,6 +160,7 @@
"Press Ctrl-C to copy." : "Druk op Ctrl-C om te kopiëren.",
"Resharing is not allowed" : "Verder delen is niet toegestaan",
"Share to {name}" : "Delen naar {name}",
+ "Copy URL" : "Kopiëren URL",
"Link" : "Link",
"Password protect" : "Wachtwoord beveiligd",
"Allow editing" : "Bewerken toestaan",
@@ -147,14 +172,20 @@
"Set expiration date" : "Stel vervaldatum in",
"Expiration" : "Vervaltermijn",
"Expiration date" : "Vervaldatum",
+ "Note to recipient" : "Notitie voor ontvanger",
"Share link" : "Deellink",
+ "Enable" : "Inschakelen",
"Shared with you and the group {group} by {owner}" : "Met jou en de groep {group} gedeeld door {owner}",
+ "Shared with you and {circle} by {owner}" : "Gedeeld met jou en {circle} door {owner}",
+ "Shared with you and the conversation {conversation} by {owner}" : "Gedeeld met jou en gesprek {conversation} door {owner}",
"Shared with you by {owner}" : "Met je gedeeld door {owner}",
"Choose a password for the mail share" : "Kies een wachtwoord om gedeelde te mailen",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} delen via link",
"group" : "groep",
"remote" : "extern",
+ "remote group" : "externe groep",
"email" : "email",
+ "conversation" : "gesprek",
"shared by {sharer}" : "Gedeeld door {eigenaar}",
"Unshare" : "Delen stoppen",
"Can reshare" : "Kan doordelen",
@@ -162,6 +193,7 @@
"Can create" : "Kan creëren",
"Can change" : "Kan wijzigen",
"Can delete" : "Kan verwijderen",
+ "Password protect by Talk" : "Wachtwoord beveiligd door Talk",
"Access control" : "Toegangscontrole",
"Could not unshare" : "Kon delen niet ongedaan maken",
"Error while sharing" : "Fout tijdens het delen",
@@ -174,6 +206,7 @@
"An error occurred. Please try again" : "Er trad een fout op. Probeer het opnieuw",
"{sharee} (group)" : "{sharee} (groep)",
"{sharee} (remote)" : "{sharee} (extern)",
+ "{sharee} (remote group)" : "{sharee} (remote group)",
"{sharee} (email)" : "{sharee} (email)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Delen",
@@ -258,9 +291,14 @@
"Need help?" : "Hulp nodig?",
"See the documentation" : "Zie de documentatie",
"This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Deze applicatie heeft JavaScript nodig. {linkstart}Activeer JavaScript{linkend} en ververs deze pagina.",
+ "Skip to main content" : "Ga naar hoofdinhoud",
+ "Skip to navigation of app" : "Ga naar navigatie van app",
"More apps" : "Meer apps",
+ "More apps menu" : "Meer apps menu",
"Search" : "Zoeken",
"Reset search" : "Zoekopdracht wissen",
+ "Contacts" : "Contactpersonen",
+ "Contacts menu" : "Contacten menu",
"Settings menu" : "Instellingenmenu",
"Confirm your password" : "Bevestig je wachtwoord",
"Server side authentication failed!" : "Authenticatie bij de server mislukt!",
@@ -270,6 +308,7 @@
"Username or email" : "Gebruikersnaam of email",
"Log in" : "Inloggen",
"Wrong password." : "Onjuist wachtwoord.",
+ "User disabled" : "Gebruiker gedeactiveerd",
"We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "We hebben meerdere foutieve inlogverzoeken van jouw IP gedetecteerd. Hierdoor wordt je volgende inlogverzoek 30 seconden uitgesteld.",
"Forgot password?" : "Wachtwoord vergeten?",
"Back to login" : "Terug naar inloggen",
@@ -283,8 +322,11 @@
"Redirecting …" : "Omleiding ...",
"New password" : "Nieuw wachtwoord",
"New Password" : "Nieuw wachtwoord",
+ "This share is password-protected" : "Deze share is wachtwoordbeveiligd",
+ "The password is wrong. Try again." : "Het wachtwoord is onjuist. Probeer opnieuw.",
"Two-factor authentication" : "Tweefactor authenticatie",
"Enhanced security is enabled for your account. Please authenticate using a second factor." : "Aanvullende beveiliging is ingeschakeld voor je account. Log in met een tweede factor.",
+ "Could not load at least one of your enabled two-factor auth methods. Please contact your admin." : "Kon niet minimaal één an jouw ingeschakelde two-factor auth methoden laden. Neem contact op met je beheerder.",
"Cancel log in" : "Inloggen annuleren",
"Use backup code" : "Gebruik back-upcode",
"Error while validating your second factor" : "Fout bij het verifiëren van je tweede factor",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 00b589953739f..32511e7364066 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -179,6 +179,7 @@ OC.L10N.register(
"Enable" : "Ativar",
"Shared with you and the group {group} by {owner}" : "Compartilhado com você e com o grupo {group} por {owner}",
"Shared with you and {circle} by {owner}" : "Compartilhado com você e {circle} por {owner}",
+ "Shared with you and the conversation {conversation} by {owner}" : "Compartilhado com você e a conversa {conversation} por {owner}",
"Shared with you by {owner}" : "Compartilhado com você por {owner}",
"Choose a password for the mail share" : "Escolha uma senha para o compartilhamento de e-mail",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatiorDisplayName}} compartilhou via link",
@@ -186,6 +187,7 @@ OC.L10N.register(
"remote" : "remoto",
"remote group" : "grupo remoto",
"email" : "e-mail",
+ "conversation" : "Conversa",
"shared by {sharer}" : "compartilhado por {sharer}",
"Unshare" : "Descompartilhar",
"Can reshare" : "Pode compartilhar novamente",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 3ee90f539f3ee..5d6f853eb4349 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -177,6 +177,7 @@
"Enable" : "Ativar",
"Shared with you and the group {group} by {owner}" : "Compartilhado com você e com o grupo {group} por {owner}",
"Shared with you and {circle} by {owner}" : "Compartilhado com você e {circle} por {owner}",
+ "Shared with you and the conversation {conversation} by {owner}" : "Compartilhado com você e a conversa {conversation} por {owner}",
"Shared with you by {owner}" : "Compartilhado com você por {owner}",
"Choose a password for the mail share" : "Escolha uma senha para o compartilhamento de e-mail",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatiorDisplayName}} compartilhou via link",
@@ -184,6 +185,7 @@
"remote" : "remoto",
"remote group" : "grupo remoto",
"email" : "e-mail",
+ "conversation" : "Conversa",
"shared by {sharer}" : "compartilhado por {sharer}",
"Unshare" : "Descompartilhar",
"Can reshare" : "Pode compartilhar novamente",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index 8c4c569e4821c..53a2324364b42 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -179,6 +179,7 @@ OC.L10N.register(
"Enable" : "Укључи",
"Shared with you and the group {group} by {owner}" : "{owner} дели са вама и са групом {group}.",
"Shared with you and {circle} by {owner}" : "Дељемп са Вама и кругом {circle} од стране корисника {owner}",
+ "Shared with you and the conversation {conversation} by {owner}" : "{owner} поделио са Вама и у разговору {conversation}",
"Shared with you by {owner}" : "{owner} дели са вама",
"Choose a password for the mail share" : "Изаберите лозинку за дељење е-поштом",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} је поделио преко везе",
@@ -186,6 +187,7 @@ OC.L10N.register(
"remote" : "удаљени",
"remote group" : "удаљена група",
"email" : "е-пошта",
+ "conversation" : "разговор",
"shared by {sharer}" : "поделио је {sharer}",
"Unshare" : "Укини дељење",
"Can reshare" : "Може да дели даље",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index f8a8832f41511..7c4870e639e8b 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -177,6 +177,7 @@
"Enable" : "Укључи",
"Shared with you and the group {group} by {owner}" : "{owner} дели са вама и са групом {group}.",
"Shared with you and {circle} by {owner}" : "Дељемп са Вама и кругом {circle} од стране корисника {owner}",
+ "Shared with you and the conversation {conversation} by {owner}" : "{owner} поделио са Вама и у разговору {conversation}",
"Shared with you by {owner}" : "{owner} дели са вама",
"Choose a password for the mail share" : "Изаберите лозинку за дељење е-поштом",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} је поделио преко везе",
@@ -184,6 +185,7 @@
"remote" : "удаљени",
"remote group" : "удаљена група",
"email" : "е-пошта",
+ "conversation" : "разговор",
"shared by {sharer}" : "поделио је {sharer}",
"Unshare" : "Укини дељење",
"Can reshare" : "Може да дели даље",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index 1c66337ad814f..6ffc48dae9ea9 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -179,6 +179,7 @@ OC.L10N.register(
"Enable" : "Etkinleştir",
"Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaşılmış",
"Shared with you and {circle} by {owner}" : "{owner} tarafından sizinle ve {circle} ile paylaşılmış",
+ "Shared with you and the conversation {conversation} by {owner}" : "{owner} tarafından sizinle ve {conversation} görüşmesi ile paylaştırılmış",
"Shared with you by {owner}" : "{owner} tarafından sizinle paylaşılmış",
"Choose a password for the mail share" : "E-posta ile paylaşmak için bir parola seçin",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} bağlantı ile paylaşılmış",
@@ -186,6 +187,7 @@ OC.L10N.register(
"remote" : "uzak",
"remote group" : "uzak grup",
"email" : "e-posta",
+ "conversation" : "görüşme",
"shared by {sharer}" : "{sharer} tarafından paylaşıldı",
"Unshare" : "Paylaşımdan Kaldır",
"Can reshare" : "Yeniden paylaşabilir",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index a621ebbfa63c5..7c3ef0711649a 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -177,6 +177,7 @@
"Enable" : "Etkinleştir",
"Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaşılmış",
"Shared with you and {circle} by {owner}" : "{owner} tarafından sizinle ve {circle} ile paylaşılmış",
+ "Shared with you and the conversation {conversation} by {owner}" : "{owner} tarafından sizinle ve {conversation} görüşmesi ile paylaştırılmış",
"Shared with you by {owner}" : "{owner} tarafından sizinle paylaşılmış",
"Choose a password for the mail share" : "E-posta ile paylaşmak için bir parola seçin",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} bağlantı ile paylaşılmış",
@@ -184,6 +185,7 @@
"remote" : "uzak",
"remote group" : "uzak grup",
"email" : "e-posta",
+ "conversation" : "görüşme",
"shared by {sharer}" : "{sharer} tarafından paylaşıldı",
"Unshare" : "Paylaşımdan Kaldır",
"Can reshare" : "Yeniden paylaşabilir",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index f7c2d6db7bf11..b686138898792 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -138,6 +138,7 @@ OC.L10N.register(
"Press Ctrl-C to copy." : "按 Ctrl + C 进行复制.",
"Resharing is not allowed" : "不允许二次共享",
"Share to {name}" : "分享给{name}",
+ "Copy URL" : "复制 URL",
"Link" : "链接",
"Password protect" : "密码保护",
"Allow editing" : "允许编辑",
@@ -151,6 +152,8 @@ OC.L10N.register(
"Expiration date" : "过期日期",
"Share link" : "分享链接",
"Shared with you and the group {group} by {owner}" : "{owner} 分享给您及 {group} 分组",
+ "Shared with you and {circle} by {owner}" : "{owner} 共享给您及 {circle}",
+ "Shared with you and the conversation {conversation} by {owner}" : "{owner} 共享给您及对话 {conversation}",
"Shared with you by {owner}" : "{owner} 分享给您",
"Choose a password for the mail share" : "为电子邮件分享选择一个密码",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} 通过链接分享",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 9c2bf3f8a0a64..2a6e7f0391ce7 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -136,6 +136,7 @@
"Press Ctrl-C to copy." : "按 Ctrl + C 进行复制.",
"Resharing is not allowed" : "不允许二次共享",
"Share to {name}" : "分享给{name}",
+ "Copy URL" : "复制 URL",
"Link" : "链接",
"Password protect" : "密码保护",
"Allow editing" : "允许编辑",
@@ -149,6 +150,8 @@
"Expiration date" : "过期日期",
"Share link" : "分享链接",
"Shared with you and the group {group} by {owner}" : "{owner} 分享给您及 {group} 分组",
+ "Shared with you and {circle} by {owner}" : "{owner} 共享给您及 {circle}",
+ "Shared with you and the conversation {conversation} by {owner}" : "{owner} 共享给您及对话 {conversation}",
"Shared with you by {owner}" : "{owner} 分享给您",
"Choose a password for the mail share" : "为电子邮件分享选择一个密码",
"{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} 通过链接分享",
diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
index 74ce43d4f8884..13baf19401083 100644
--- a/core/templates/layout.public.php
+++ b/core/templates/layout.public.php
@@ -78,7 +78,7 @@
