diff options
Diffstat (limited to 'apps')
73 files changed, 292 insertions, 152 deletions
diff --git a/apps/comments/l10n/pt_BR.js b/apps/comments/l10n/pt_BR.js index 4fe8461b7db..7e23a2fb0fe 100644 --- a/apps/comments/l10n/pt_BR.js +++ b/apps/comments/l10n/pt_BR.js @@ -19,7 +19,7 @@ OC.L10N.register( "_%n unread comment_::_%n unread comments_" : ["%n comentários não lidos","%n comentários não lidos"], "Comment" : "Comentar", "You commented" : "Você comentou", - "%1$s commented" : "%1$s comentaram", + "%1$s commented" : "%1$s comentou", "{author} commented" : "{author} comentou", "You commented on %1$s" : "Você comentou em %1$s", "You commented on {file}" : "Você comentou sobre {file}", diff --git a/apps/comments/l10n/pt_BR.json b/apps/comments/l10n/pt_BR.json index 4ad90950735..9c8163b68cf 100644 --- a/apps/comments/l10n/pt_BR.json +++ b/apps/comments/l10n/pt_BR.json @@ -17,7 +17,7 @@ "_%n unread comment_::_%n unread comments_" : ["%n comentários não lidos","%n comentários não lidos"], "Comment" : "Comentar", "You commented" : "Você comentou", - "%1$s commented" : "%1$s comentaram", + "%1$s commented" : "%1$s comentou", "{author} commented" : "{author} comentou", "You commented on %1$s" : "Você comentou em %1$s", "You commented on {file}" : "Você comentou sobre {file}", diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php index 9c56398b14c..c03bf98ee38 100644 --- a/apps/dav/lib/CalDAV/Calendar.php +++ b/apps/dav/lib/CalDAV/Calendar.php @@ -122,7 +122,14 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable { 'principal' => $this->getOwner(), 'protected' => true, ]; + } else { + $acl[] = [ + 'privilege' => '{DAV:}write-properties', + 'principal' => $this->getOwner(), + 'protected' => true, + ]; } + if ($this->getOwner() !== parent::getOwner()) { $acl[] = [ 'privilege' => '{DAV:}read', diff --git a/apps/dav/lib/Connector/Sabre/BearerAuth.php b/apps/dav/lib/Connector/Sabre/BearerAuth.php index f0e0f389c33..b7fd9116f21 100644 --- a/apps/dav/lib/Connector/Sabre/BearerAuth.php +++ b/apps/dav/lib/Connector/Sabre/BearerAuth.php @@ -25,6 +25,8 @@ use OCP\IRequest; use OCP\ISession; use OCP\IUserSession; use Sabre\DAV\Auth\Backend\AbstractBearer; +use Sabre\HTTP\RequestInterface; +use Sabre\HTTP\ResponseInterface; class BearerAuth extends AbstractBearer { /** @var IUserSession */ @@ -77,4 +79,16 @@ class BearerAuth extends AbstractBearer { return false; } + + /** + * \Sabre\DAV\Auth\Backend\AbstractBearer::challenge sets an WWW-Authenticate + * header which some DAV clients can't handle. Thus we override this function + * and make it simply return a 401. + * + * @param RequestInterface $request + * @param ResponseInterface $response + */ + public function challenge(RequestInterface $request, ResponseInterface $response) { + $response->setStatus(401); + } } diff --git a/apps/dav/tests/unit/CalDAV/CalendarTest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php index cf295f01065..fd74da0214b 100644 --- a/apps/dav/tests/unit/CalDAV/CalendarTest.php +++ b/apps/dav/tests/unit/CalDAV/CalendarTest.php @@ -191,6 +191,10 @@ class CalendarTest extends TestCase { 'privilege' => '{DAV:}read', 'principal' => $hasOwnerSet ? 'user1' : 'user2', 'protected' => true + ], [ + 'privilege' => '{DAV:}write-properties', + 'principal' => $hasOwnerSet ? 'user1' : 'user2', + 'protected' => true ]]; } if ($hasOwnerSet) { diff --git a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php index 5eae75eb8e9..04bb035a635 100644 --- a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php @@ -21,9 +21,6 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre; -use OC\Authentication\TwoFactorAuth\Manager; -use OC\Security\Bruteforce\Throttler; -use OC\User\Session; use OCA\DAV\Connector\Sabre\BearerAuth; use OCP\IRequest; use OCP\ISession; @@ -85,4 +82,13 @@ class BearerAuthTest extends TestCase { $this->assertSame('principals/users/admin', $this->bearerAuth->validateBearerToken('Token')); } + + public function testChallenge() { + /** @var \PHPUnit_Framework_MockObject_MockObject|RequestInterface $request */ + $request = $this->createMock(RequestInterface::class); + /** @var \PHPUnit_Framework_MockObject_MockObject|ResponseInterface $response */ + $response = $this->createMock(ResponseInterface::class); + $result = $this->bearerAuth->challenge($request, $response); + $this->assertEmpty($result); + } } diff --git a/apps/federatedfilesharing/l10n/cs.js b/apps/federatedfilesharing/l10n/cs.js index 0b2586e37ea..afa508a5448 100644 --- a/apps/federatedfilesharing/l10n/cs.js +++ b/apps/federatedfilesharing/l10n/cs.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Upravte, jak mohou lidé mezi servery sdílet.", "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery", "Allow users on this server to receive shares from other servers" : "Povolit uživatelům na tomto serveru přijímat sdílení z jiných serverů", - "Search global and public address book for users and let local users publish their data" : "Hledat uživatele v globálním a veřejném adresáři a dovolit místním uživatelům publikovat jejich údaje", + "Search global and public address book for users" : "Hledat uživatele v globálním a veřejném adresáři", "Allow users to publish their data to a global and public address book" : "Povolit uživatelům publikování jejich dat do globálního a sdíleného adresáře", "Federated Cloud" : "Sdružený cloud", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Můžete sdílet s kýmkoliv, kdo používá Nextcloud, ownCloud, nebo Pydio! Jen zadejte jejich sdružené cloud ID do dialogu pro sdílení. Vypadá jako person@cloud.example.com", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Přidat na svou webovou stránku", "Share with me via Nextcloud" : "Sdíleno se mnou přes Nextcloud", "HTML Code:" : "HTML kód:", - "Search global and public address book for users" : "Hledat uživatele v globálním a veřejném adresáři", - "Share it:" : "Sdílet:" + "Share it:" : "Sdílet:", + "Search global and public address book for users and let local users publish their data" : "Hledat uživatele v globálním a veřejném adresáři a dovolit místním uživatelům publikovat jejich údaje" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/federatedfilesharing/l10n/cs.json b/apps/federatedfilesharing/l10n/cs.json index 6ec6f47bfb7..a59bd508d1c 100644 --- a/apps/federatedfilesharing/l10n/cs.json +++ b/apps/federatedfilesharing/l10n/cs.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Upravte, jak mohou lidé mezi servery sdílet.", "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery", "Allow users on this server to receive shares from other servers" : "Povolit uživatelům na tomto serveru přijímat sdílení z jiných serverů", - "Search global and public address book for users and let local users publish their data" : "Hledat uživatele v globálním a veřejném adresáři a dovolit místním uživatelům publikovat jejich údaje", + "Search global and public address book for users" : "Hledat uživatele v globálním a veřejném adresáři", "Allow users to publish their data to a global and public address book" : "Povolit uživatelům publikování jejich dat do globálního a sdíleného adresáře", "Federated Cloud" : "Sdružený cloud", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Můžete sdílet s kýmkoliv, kdo používá Nextcloud, ownCloud, nebo Pydio! Jen zadejte jejich sdružené cloud ID do dialogu pro sdílení. Vypadá jako person@cloud.example.com", @@ -50,7 +50,7 @@ "Add to your website" : "Přidat na svou webovou stránku", "Share with me via Nextcloud" : "Sdíleno se mnou přes Nextcloud", "HTML Code:" : "HTML kód:", - "Search global and public address book for users" : "Hledat uživatele v globálním a veřejném adresáři", - "Share it:" : "Sdílet:" + "Share it:" : "Sdílet:", + "Search global and public address book for users and let local users publish their data" : "Hledat uživatele v globálním a veřejném adresáři a dovolit místním uživatelům publikovat jejich údaje" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/de.js b/apps/federatedfilesharing/l10n/de.js index 9f089f77b8d..3ec6fb67b5e 100644 --- a/apps/federatedfilesharing/l10n/de.js +++ b/apps/federatedfilesharing/l10n/de.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Definiere wie die Benutzer Inhalte mit anderen Servern teilen können.", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Benutzern durchsuchen und lokale Benutzer ihre Daten veröffentlichen lassen", + "Search global and public address book for users" : "Globale Suche und ein öffentliches Adressbuch für Benutzer", "Allow users to publish their data to a global and public address book" : "Erlaube Benutzern ihre Daten an ein globales und öffentliches Adressbuch zu veröffentlichen", "Federated Cloud" : "Federated Cloud", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Du kannst mit allen Leuten teilen, welche Nextcloud, ownCloud oder Pydio nutzen! Gebe einfach deren Federated Cloud ID in den Teilen-Dialog ein. Diese sieht wie folgt aus person@cloud.example.com", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Zu deiner Webseite hinzufügen", "Share with me via Nextcloud" : "Teile mit mir über Nextcloud", "HTML Code:" : "HTML-Code:", - "Search global and public address book for users" : "Globale Suche und ein öffentliches Adressbuch für Benutzer", - "Share it:" : "Zum Teilen:" + "Share it:" : "Zum Teilen:", + "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Benutzern durchsuchen und lokale Benutzer ihre Daten veröffentlichen lassen" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/de.json b/apps/federatedfilesharing/l10n/de.json index cab22b6dbdd..4017d751575 100644 --- a/apps/federatedfilesharing/l10n/de.json +++ b/apps/federatedfilesharing/l10n/de.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Definiere wie die Benutzer Inhalte mit anderen Servern teilen können.", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Benutzern durchsuchen und lokale Benutzer ihre Daten veröffentlichen lassen", + "Search global and public address book for users" : "Globale Suche und ein öffentliches Adressbuch für Benutzer", "Allow users to publish their data to a global and public address book" : "Erlaube Benutzern ihre Daten an ein globales und öffentliches Adressbuch zu veröffentlichen", "Federated Cloud" : "Federated Cloud", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Du kannst mit allen Leuten teilen, welche Nextcloud, ownCloud oder Pydio nutzen! Gebe einfach deren Federated Cloud ID in den Teilen-Dialog ein. Diese sieht wie folgt aus person@cloud.example.com", @@ -50,7 +50,7 @@ "Add to your website" : "Zu deiner Webseite hinzufügen", "Share with me via Nextcloud" : "Teile mit mir über Nextcloud", "HTML Code:" : "HTML-Code:", - "Search global and public address book for users" : "Globale Suche und ein öffentliches Adressbuch für Benutzer", - "Share it:" : "Zum Teilen:" + "Share it:" : "Zum Teilen:", + "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Benutzern durchsuchen und lokale Benutzer ihre Daten veröffentlichen lassen" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/de_DE.js b/apps/federatedfilesharing/l10n/de_DE.js index 3f3c6a63c01..2614144ad63 100644 --- a/apps/federatedfilesharing/l10n/de_DE.js +++ b/apps/federatedfilesharing/l10n/de_DE.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Definiere wie die Benutzer Inhalte mit anderen Servern teilen können.", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Benutzern durchsuchen und lokale Benutzer ihre Daten veröffentlichen lassen", + "Search global and public address book for users" : "Durchsuche globales und öffentliches Adressbuch nach Nutzern", "Allow users to publish their data to a global and public address book" : "Erlaube Benutzern ihre Daten an ein globales und öffentliches Adressbuch zu veröffentlichen", "Federated Cloud" : "Federated Cloud", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Sie können mit allen Leuten teilen, welche Nextcloud, ownCloud oder Pydio nutzen! Geben Sie einfach deren Federated Cloud ID in den Teilen-Dialog ein. Diese sieht wie folgt aus person@cloud.example.com", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Zu Ihrer Web-Seite hinzufügen", "Share with me via Nextcloud" : "Teilen Sie mit mir über Nextcloud", "HTML Code:" : "HTML-Code:", - "Search global and public address book for users" : "Durchsuche globales und öffentliches Adressbuch nach Nutzern", - "Share it:" : "Teilen:" + "Share it:" : "Teilen:", + "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Benutzern durchsuchen und lokale Benutzer ihre Daten veröffentlichen lassen" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/de_DE.json b/apps/federatedfilesharing/l10n/de_DE.json index b512c3d07ce..72847aab8d6 100644 --- a/apps/federatedfilesharing/l10n/de_DE.json +++ b/apps/federatedfilesharing/l10n/de_DE.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Definiere wie die Benutzer Inhalte mit anderen Servern teilen können.", "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben", "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben", - "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Benutzern durchsuchen und lokale Benutzer ihre Daten veröffentlichen lassen", + "Search global and public address book for users" : "Durchsuche globales und öffentliches Adressbuch nach Nutzern", "Allow users to publish their data to a global and public address book" : "Erlaube Benutzern ihre Daten an ein globales und öffentliches Adressbuch zu veröffentlichen", "Federated Cloud" : "Federated Cloud", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Sie können mit allen Leuten teilen, welche Nextcloud, ownCloud oder Pydio nutzen! Geben Sie einfach deren Federated Cloud ID in den Teilen-Dialog ein. Diese sieht wie folgt aus person@cloud.example.com", @@ -50,7 +50,7 @@ "Add to your website" : "Zu Ihrer Web-Seite hinzufügen", "Share with me via Nextcloud" : "Teilen Sie mit mir über Nextcloud", "HTML Code:" : "HTML-Code:", - "Search global and public address book for users" : "Durchsuche globales und öffentliches Adressbuch nach Nutzern", - "Share it:" : "Teilen:" + "Share it:" : "Teilen:", + "Search global and public address book for users and let local users publish their data" : "Globales und öffentliches Adressbuch nach Benutzern durchsuchen und lokale Benutzer ihre Daten veröffentlichen lassen" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/en_GB.js b/apps/federatedfilesharing/l10n/en_GB.js index dacbeeabd5b..af1f700c544 100644 --- a/apps/federatedfilesharing/l10n/en_GB.js +++ b/apps/federatedfilesharing/l10n/en_GB.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Adjust how people can share between servers.", "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers", - "Search global and public address book for users and let local users publish their data" : "Search global and public address book for users and let local users publish their data", + "Search global and public address book for users" : "Search global and public address book for users", "Allow users to publish their data to a global and public address book" : "Allow users to publish their data to a global and public address book", "Federated Cloud" : "Federated Cloud", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Add to your website", "Share with me via Nextcloud" : "Share with me via Nextcloud", "HTML Code:" : "HTML Code:", - "Search global and public address book for users" : "Search global and public address book for users", - "Share it:" : "Share it:" + "Share it:" : "Share it:", + "Search global and public address book for users and let local users publish their data" : "Search global and public address book for users and let local users publish their data" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/en_GB.json b/apps/federatedfilesharing/l10n/en_GB.json index a168322f98e..fb990454ae3 100644 --- a/apps/federatedfilesharing/l10n/en_GB.json +++ b/apps/federatedfilesharing/l10n/en_GB.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Adjust how people can share between servers.", "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers", "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers", - "Search global and public address book for users and let local users publish their data" : "Search global and public address book for users and let local users publish their data", + "Search global and public address book for users" : "Search global and public address book for users", "Allow users to publish their data to a global and public address book" : "Allow users to publish their data to a global and public address book", "Federated Cloud" : "Federated Cloud", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com", @@ -50,7 +50,7 @@ "Add to your website" : "Add to your website", "Share with me via Nextcloud" : "Share with me via Nextcloud", "HTML Code:" : "HTML Code:", - "Search global and public address book for users" : "Search global and public address book for users", - "Share it:" : "Share it:" + "Share it:" : "Share it:", + "Search global and public address book for users and let local users publish their data" : "Search global and public address book for users and let local users publish their data" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/es.js b/apps/federatedfilesharing/l10n/es.js index 05a970d2632..fd8a64232bc 100644 --- a/apps/federatedfilesharing/l10n/es.js +++ b/apps/federatedfilesharing/l10n/es.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Ajusta cómo la gente puede compartir entre servidores.", "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores", - "Search global and public address book for users and let local users publish their data" : "Buscar libreta de direcciones global y pública para usuarios y permitir a los usuarios locales publicar su información", + "Search global and public address book for users" : "Buscar libretas de contactos globales y públicas para usuarios", "Allow users to publish their data to a global and public address book" : "Permitir a los usuarios publicar su información en la libreta de direcciones global y pública", "Federated Cloud" : "Nube Federada", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "¡Puedes compartir con cualquiera que use Nextcloud, ownCloud o Pydio! Simplemente, pon su ID de nube federada en el diálogo de compartir. Es algo como person@cloud.example.com", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Añadir a su sitio web", "Share with me via Nextcloud" : "Compartirlo conmigo vía Nextcloud", "HTML Code:" : "Código HTML:", - "Search global and public address book for users" : "Buscar libretas de contactos globales y públicas para usuarios", - "Share it:" : "Compartir:" + "Share it:" : "Compartir:", + "Search global and public address book for users and let local users publish their data" : "Buscar libreta de direcciones global y pública para usuarios y permitir a los usuarios locales publicar su información" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/es.json b/apps/federatedfilesharing/l10n/es.json index 1df8c8938c4..040b5d5ca47 100644 --- a/apps/federatedfilesharing/l10n/es.json +++ b/apps/federatedfilesharing/l10n/es.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Ajusta cómo la gente puede compartir entre servidores.", "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores", "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores", - "Search global and public address book for users and let local users publish their data" : "Buscar libreta de direcciones global y pública para usuarios y permitir a los usuarios locales publicar su información", + "Search global and public address book for users" : "Buscar libretas de contactos globales y públicas para usuarios", "Allow users to publish their data to a global and public address book" : "Permitir a los usuarios publicar su información en la libreta de direcciones global y pública", "Federated Cloud" : "Nube Federada", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "¡Puedes compartir con cualquiera que use Nextcloud, ownCloud o Pydio! Simplemente, pon su ID de nube federada en el diálogo de compartir. Es algo como person@cloud.example.com", @@ -50,7 +50,7 @@ "Add to your website" : "Añadir a su sitio web", "Share with me via Nextcloud" : "Compartirlo conmigo vía Nextcloud", "HTML Code:" : "Código HTML:", - "Search global and public address book for users" : "Buscar libretas de contactos globales y públicas para usuarios", - "Share it:" : "Compartir:" + "Share it:" : "Compartir:", + "Search global and public address book for users and let local users publish their data" : "Buscar libreta de direcciones global y pública para usuarios y permitir a los usuarios locales publicar su información" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/es_AR.js b/apps/federatedfilesharing/l10n/es_AR.js index 12bdf7c6274..3f963cd75c5 100644 --- a/apps/federatedfilesharing/l10n/es_AR.js +++ b/apps/federatedfilesharing/l10n/es_AR.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Ajustar cómo las personas pueden compartir entre servidores. ", "Allow users on this server to send shares to other servers" : "Permitirle a los usuarios de este servidor enviar elementos compartidos a otros servidores", "Allow users on this server to receive shares from other servers" : "Permitir que los usuarios de este servidor recibir elementos compartidos de otros servidores", - "Search global and public address book for users and let local users publish their data" : "Buscar una libreta de direcciones global y pública para los usuarios y permitir a los usuarios locales publicar sus datos", + "Search global and public address book for users" : "Buscar usuarios en las libretas de contactos globales y públicas", "Allow users to publish their data to a global and public address book" : "Permitir a los usuarios publicar sus datos a una libreta de direcciones global y pública", "Federated Cloud" : "Nube Federada", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "¡Puede compartir con cualquiera que use NextCloud, ownCloud o Pydio! Solo ingrese su ID de Nube Federada en ventana de diálogo de compartir. Se ve algo así como person@cloud.example.com", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Agregar a su sitio web", "Share with me via Nextcloud" : "Compartir conmigo vía Nextcloud", "HTML Code:" : "Código HTML:", - "Search global and public address book for users" : "Buscar usuarios en las libretas de contactos globales y públicas", - "Share it:" : "Compartirlo:" + "Share it:" : "Compartirlo:", + "Search global and public address book for users and let local users publish their data" : "Buscar una libreta de direcciones global y pública para los usuarios y permitir a los usuarios locales publicar sus datos" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/es_AR.json b/apps/federatedfilesharing/l10n/es_AR.json index 463af48b758..c971dc9c356 100644 --- a/apps/federatedfilesharing/l10n/es_AR.json +++ b/apps/federatedfilesharing/l10n/es_AR.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Ajustar cómo las personas pueden compartir entre servidores. ", "Allow users on this server to send shares to other servers" : "Permitirle a los usuarios de este servidor enviar elementos compartidos a otros servidores", "Allow users on this server to receive shares from other servers" : "Permitir que los usuarios de este servidor recibir elementos compartidos de otros servidores", - "Search global and public address book for users and let local users publish their data" : "Buscar una libreta de direcciones global y pública para los usuarios y permitir a los usuarios locales publicar sus datos", + "Search global and public address book for users" : "Buscar usuarios en las libretas de contactos globales y públicas", "Allow users to publish their data to a global and public address book" : "Permitir a los usuarios publicar sus datos a una libreta de direcciones global y pública", "Federated Cloud" : "Nube Federada", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "¡Puede compartir con cualquiera que use NextCloud, ownCloud o Pydio! Solo ingrese su ID de Nube Federada en ventana de diálogo de compartir. Se ve algo así como person@cloud.example.com", @@ -50,7 +50,7 @@ "Add to your website" : "Agregar a su sitio web", "Share with me via Nextcloud" : "Compartir conmigo vía Nextcloud", "HTML Code:" : "Código HTML:", - "Search global and public address book for users" : "Buscar usuarios en las libretas de contactos globales y públicas", - "Share it:" : "Compartirlo:" + "Share it:" : "Compartirlo:", + "Search global and public address book for users and let local users publish their data" : "Buscar una libreta de direcciones global y pública para los usuarios y permitir a los usuarios locales publicar sus datos" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/es_MX.js b/apps/federatedfilesharing/l10n/es_MX.js index 12bdf7c6274..3f963cd75c5 100644 --- a/apps/federatedfilesharing/l10n/es_MX.js +++ b/apps/federatedfilesharing/l10n/es_MX.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Ajustar cómo las personas pueden compartir entre servidores. ", "Allow users on this server to send shares to other servers" : "Permitirle a los usuarios de este servidor enviar elementos compartidos a otros servidores", "Allow users on this server to receive shares from other servers" : "Permitir que los usuarios de este servidor recibir elementos compartidos de otros servidores", - "Search global and public address book for users and let local users publish their data" : "Buscar una libreta de direcciones global y pública para los usuarios y permitir a los usuarios locales publicar sus datos", + "Search global and public address book for users" : "Buscar usuarios en las libretas de contactos globales y públicas", "Allow users to publish their data to a global and public address book" : "Permitir a los usuarios publicar sus datos a una libreta de direcciones global y pública", "Federated Cloud" : "Nube Federada", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "¡Puede compartir con cualquiera que use NextCloud, ownCloud o Pydio! Solo ingrese su ID de Nube Federada en ventana de diálogo de compartir. Se ve algo así como person@cloud.example.com", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Agregar a su sitio web", "Share with me via Nextcloud" : "Compartir conmigo vía Nextcloud", "HTML Code:" : "Código HTML:", - "Search global and public address book for users" : "Buscar usuarios en las libretas de contactos globales y públicas", - "Share it:" : "Compartirlo:" + "Share it:" : "Compartirlo:", + "Search global and public address book for users and let local users publish their data" : "Buscar una libreta de direcciones global y pública para los usuarios y permitir a los usuarios locales publicar sus datos" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/es_MX.json b/apps/federatedfilesharing/l10n/es_MX.json index 463af48b758..c971dc9c356 100644 --- a/apps/federatedfilesharing/l10n/es_MX.json +++ b/apps/federatedfilesharing/l10n/es_MX.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Ajustar cómo las personas pueden compartir entre servidores. ", "Allow users on this server to send shares to other servers" : "Permitirle a los usuarios de este servidor enviar elementos compartidos a otros servidores", "Allow users on this server to receive shares from other servers" : "Permitir que los usuarios de este servidor recibir elementos compartidos de otros servidores", - "Search global and public address book for users and let local users publish their data" : "Buscar una libreta de direcciones global y pública para los usuarios y permitir a los usuarios locales publicar sus datos", + "Search global and public address book for users" : "Buscar usuarios en las libretas de contactos globales y públicas", "Allow users to publish their data to a global and public address book" : "Permitir a los usuarios publicar sus datos a una libreta de direcciones global y pública", "Federated Cloud" : "Nube Federada", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "¡Puede compartir con cualquiera que use NextCloud, ownCloud o Pydio! Solo ingrese su ID de Nube Federada en ventana de diálogo de compartir. Se ve algo así como person@cloud.example.com", @@ -50,7 +50,7 @@ "Add to your website" : "Agregar a su sitio web", "Share with me via Nextcloud" : "Compartir conmigo vía Nextcloud", "HTML Code:" : "Código HTML:", - "Search global and public address book for users" : "Buscar usuarios en las libretas de contactos globales y públicas", - "Share it:" : "Compartirlo:" + "Share it:" : "Compartirlo:", + "Search global and public address book for users and let local users publish their data" : "Buscar una libreta de direcciones global y pública para los usuarios y permitir a los usuarios locales publicar sus datos" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/fi.js b/apps/federatedfilesharing/l10n/fi.js index b19e18330c9..c12bf07e307 100644 --- a/apps/federatedfilesharing/l10n/fi.js +++ b/apps/federatedfilesharing/l10n/fi.js @@ -41,7 +41,7 @@ OC.L10N.register( "Open documentation" : "Avaa dokumentaatio", "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta", - "Search global and public address book for users and let local users publish their data" : "Etsi käyttäjiä maailmanlaajuisesta ja julkisesta osoitekirjasta sekä salli paikallisten käyttäjien julkaista omia tietojaan", + "Search global and public address book for users" : "Etsi käyttäjiä maailmanlaajuisesta ja julkisesta osoitekirjasta", "Allow users to publish their data to a global and public address book" : "Salli käyttäjien julkaista tietojaan maailmanlaajuisessa ja julkisessa osoitekirjassa", "Federated Cloud" : "Federoitu pilvi", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Voit jakaa kenelle tahansa, joka käyttää Nextcloudia, ownCloudia tai Pydiota! Kirjoita heidän federoidun pilven tunniste jaon kohteeksi. Se on muodossa henkilö@cloud.esimerkki.fi", @@ -50,7 +50,7 @@ OC.L10N.register( "Add to your website" : "Lisää verkkosivuillesi", "Share with me via Nextcloud" : "Jaa kanssani Nextcloudin kautta", "HTML Code:" : "HTML-koodi:", - "Search global and public address book for users" : "Etsi käyttäjiä maailmanlaajuisesta ja julkisesta osoitekirjasta", - "Share it:" : "Jaa se:" + "Share it:" : "Jaa se:", + "Search global and public address book for users and let local users publish their data" : "Etsi käyttäjiä maailmanlaajuisesta ja julkisesta osoitekirjasta sekä salli paikallisten käyttäjien julkaista omia tietojaan" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/fi.json b/apps/federatedfilesharing/l10n/fi.json index 2e1648b2b04..d2438707e97 100644 --- a/apps/federatedfilesharing/l10n/fi.json +++ b/apps/federatedfilesharing/l10n/fi.json @@ -39,7 +39,7 @@ "Open documentation" : "Avaa dokumentaatio", "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille", "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta", - "Search global and public address book for users and let local users publish their data" : "Etsi käyttäjiä maailmanlaajuisesta ja julkisesta osoitekirjasta sekä salli paikallisten käyttäjien julkaista omia tietojaan", + "Search global and public address book for users" : "Etsi käyttäjiä maailmanlaajuisesta ja julkisesta osoitekirjasta", "Allow users to publish their data to a global and public address book" : "Salli käyttäjien julkaista tietojaan maailmanlaajuisessa ja julkisessa osoitekirjassa", "Federated Cloud" : "Federoitu pilvi", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Voit jakaa kenelle tahansa, joka käyttää Nextcloudia, ownCloudia tai Pydiota! Kirjoita heidän federoidun pilven tunniste jaon kohteeksi. Se on muodossa henkilö@cloud.esimerkki.fi", @@ -48,7 +48,7 @@ "Add to your website" : "Lisää verkkosivuillesi", "Share with me via Nextcloud" : "Jaa kanssani Nextcloudin kautta", "HTML Code:" : "HTML-koodi:", - "Search global and public address book for users" : "Etsi käyttäjiä maailmanlaajuisesta ja julkisesta osoitekirjasta", - "Share it:" : "Jaa se:" + "Share it:" : "Jaa se:", + "Search global and public address book for users and let local users publish their data" : "Etsi käyttäjiä maailmanlaajuisesta ja julkisesta osoitekirjasta sekä salli paikallisten käyttäjien julkaista omia tietojaan" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/fr.js b/apps/federatedfilesharing/l10n/fr.js index 35c65b84fae..230b4c4ca6d 100644 --- a/apps/federatedfilesharing/l10n/fr.js +++ b/apps/federatedfilesharing/l10n/fr.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Réglez comment les personnes peuvent partager entre les serveurs.", "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs", - "Search global and public address book for users and let local users publish their data" : "Rechercher dans le carnet d'adresse global et public pour les utilisateurs et laisser les utilisateurs publier leurs données", + "Search global and public address book for users" : "Rechercher dans le carnet d'adresse global et public pour les utilisateurs", "Allow users to publish their data to a global and public address book" : "Autoriser les utilisateurs à publier leurs données dans un carnet d'adresse global et public", "Federated Cloud" : "Federated Cloud", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Vous pouvez partager avec n'importe qui qui utilise Nextcloud, ownCloud ou Pydio ! Renseignez simplement leur Federated Cloud ID dans la boîte de dialogue de partage. Cela ressemble à person@cloud.example.com", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Ajouter à votre site web", "Share with me via Nextcloud" : "Partagez avec moi via Nextcloud", "HTML Code:" : "Code HTML :", - "Search global and public address book for users" : "Rechercher dans le carnet d'adresse global et public pour les utilisateurs", - "Share it:" : "Partager :" + "Share it:" : "Partager :", + "Search global and public address book for users and let local users publish their data" : "Rechercher dans le carnet d'adresse global et public pour les utilisateurs et laisser les utilisateurs publier leurs données" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federatedfilesharing/l10n/fr.json b/apps/federatedfilesharing/l10n/fr.json index eecd8ae00f4..fb493cb9698 100644 --- a/apps/federatedfilesharing/l10n/fr.json +++ b/apps/federatedfilesharing/l10n/fr.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Réglez comment les personnes peuvent partager entre les serveurs.", "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs", "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs", - "Search global and public address book for users and let local users publish their data" : "Rechercher dans le carnet d'adresse global et public pour les utilisateurs et laisser les utilisateurs publier leurs données", + "Search global and public address book for users" : "Rechercher dans le carnet d'adresse global et public pour les utilisateurs", "Allow users to publish their data to a global and public address book" : "Autoriser les utilisateurs à publier leurs données dans un carnet d'adresse global et public", "Federated Cloud" : "Federated Cloud", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Vous pouvez partager avec n'importe qui qui utilise Nextcloud, ownCloud ou Pydio ! Renseignez simplement leur Federated Cloud ID dans la boîte de dialogue de partage. Cela ressemble à person@cloud.example.com", @@ -50,7 +50,7 @@ "Add to your website" : "Ajouter à votre site web", "Share with me via Nextcloud" : "Partagez avec moi via Nextcloud", "HTML Code:" : "Code HTML :", - "Search global and public address book for users" : "Rechercher dans le carnet d'adresse global et public pour les utilisateurs", - "Share it:" : "Partager :" + "Share it:" : "Partager :", + "Search global and public address book for users and let local users publish their data" : "Rechercher dans le carnet d'adresse global et public pour les utilisateurs et laisser les utilisateurs publier leurs données" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/hu.js b/apps/federatedfilesharing/l10n/hu.js index ed692f70a7b..fbb225b63ad 100644 --- a/apps/federatedfilesharing/l10n/hu.js +++ b/apps/federatedfilesharing/l10n/hu.js @@ -41,12 +41,12 @@ OC.L10N.register( "Open documentation" : "Dokumentáció megnyitása", "Allow users on this server to send shares to other servers" : "Engedélyezze ezen szerver felhasználóinak, hogy fájlokat osszanak meg más szerverekkel.", "Allow users on this server to receive shares from other servers" : "Engedélyezze ezen szerver felhasználóinak, hogy megosztásokat fogadjanak más szerverektől", + "Search global and public address book for users" : "Felhasználók keresése a globális és a nyilvános névjegyekben", "Federated Cloud" : "Egyesített felhő", "Your Federated Cloud ID:" : "Egyesített felhő azonosító:", "Add to your website" : "Adja hozzá saját weboldalához", "Share with me via Nextcloud" : "Ossza meg velem Nextcloud-on keresztül", "HTML Code:" : "HTML kód:", - "Search global and public address book for users" : "Felhasználók keresése a globális és a nyilvános névjegyekben", "Share it:" : "Oszd meg:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/hu.json b/apps/federatedfilesharing/l10n/hu.json index 52621eb6785..dd92c7f9fcc 100644 --- a/apps/federatedfilesharing/l10n/hu.json +++ b/apps/federatedfilesharing/l10n/hu.json @@ -39,12 +39,12 @@ "Open documentation" : "Dokumentáció megnyitása", "Allow users on this server to send shares to other servers" : "Engedélyezze ezen szerver felhasználóinak, hogy fájlokat osszanak meg más szerverekkel.", "Allow users on this server to receive shares from other servers" : "Engedélyezze ezen szerver felhasználóinak, hogy megosztásokat fogadjanak más szerverektől", + "Search global and public address book for users" : "Felhasználók keresése a globális és a nyilvános névjegyekben", "Federated Cloud" : "Egyesített felhő", "Your Federated Cloud ID:" : "Egyesített felhő azonosító:", "Add to your website" : "Adja hozzá saját weboldalához", "Share with me via Nextcloud" : "Ossza meg velem Nextcloud-on keresztül", "HTML Code:" : "HTML kód:", - "Search global and public address book for users" : "Felhasználók keresése a globális és a nyilvános névjegyekben", "Share it:" : "Oszd meg:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/ia.js b/apps/federatedfilesharing/l10n/ia.js index c4843d69e08..df6da6fde4f 100644 --- a/apps/federatedfilesharing/l10n/ia.js +++ b/apps/federatedfilesharing/l10n/ia.js @@ -41,12 +41,12 @@ OC.L10N.register( "Open documentation" : "Documentation aperte", "Allow users on this server to send shares to other servers" : "Permitter usatores in iste servitor a inviar elementos compartite a altere servitores", "Allow users on this server to receive shares from other servers" : "Permitter usatores in iste servitor a reciper elementos compartite ex altere servitores", + "Search global and public address book for users" : "Cercar pro usatores in adressarios global e public", "Federated Cloud" : "Nube Federate", "Your Federated Cloud ID:" : "Tu ID de Nube Federate:", "Add to your website" : "Adde a tu sito web", "Share with me via Nextcloud" : "Comparti con me via Nextcloud", "HTML Code:" : "Codice HTML:", - "Search global and public address book for users" : "Cercar pro usatores in adressarios global e public", "Share it:" : "Comparti lo:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/ia.json b/apps/federatedfilesharing/l10n/ia.json index 88f1cd470f9..2476b0d8798 100644 --- a/apps/federatedfilesharing/l10n/ia.json +++ b/apps/federatedfilesharing/l10n/ia.json @@ -39,12 +39,12 @@ "Open documentation" : "Documentation aperte", "Allow users on this server to send shares to other servers" : "Permitter usatores in iste servitor a inviar elementos compartite a altere servitores", "Allow users on this server to receive shares from other servers" : "Permitter usatores in iste servitor a reciper elementos compartite ex altere servitores", + "Search global and public address book for users" : "Cercar pro usatores in adressarios global e public", "Federated Cloud" : "Nube Federate", "Your Federated Cloud ID:" : "Tu ID de Nube Federate:", "Add to your website" : "Adde a tu sito web", "Share with me via Nextcloud" : "Comparti con me via Nextcloud", "HTML Code:" : "Codice HTML:", - "Search global and public address book for users" : "Cercar pro usatores in adressarios global e public", "Share it:" : "Comparti lo:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/id.js b/apps/federatedfilesharing/l10n/id.js index 0f61b9fc8dc..1ac1b75b334 100644 --- a/apps/federatedfilesharing/l10n/id.js +++ b/apps/federatedfilesharing/l10n/id.js @@ -41,12 +41,12 @@ OC.L10N.register( "Open documentation" : "Buka dokumentasi", "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.", "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya.", + "Search global and public address book for users" : "Cari alamat buku global dan alamat publik untuk pengguna", "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Federated Cloud ID Anda:", "Add to your website" : "Tambahkan pada situs web Anda", "Share with me via Nextcloud" : "Dibagikan pada saya via Nextcloud", "HTML Code:" : "Kode HTML:", - "Search global and public address book for users" : "Cari alamat buku global dan alamat publik untuk pengguna", "Share it:" : "Bagikan:" }, "nplurals=1; plural=0;"); diff --git a/apps/federatedfilesharing/l10n/id.json b/apps/federatedfilesharing/l10n/id.json index ae8a103981d..806aca73b29 100644 --- a/apps/federatedfilesharing/l10n/id.json +++ b/apps/federatedfilesharing/l10n/id.json @@ -39,12 +39,12 @@ "Open documentation" : "Buka dokumentasi", "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.", "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya.", + "Search global and public address book for users" : "Cari alamat buku global dan alamat publik untuk pengguna", "Federated Cloud" : "Federated Cloud", "Your Federated Cloud ID:" : "Federated Cloud ID Anda:", "Add to your website" : "Tambahkan pada situs web Anda", "Share with me via Nextcloud" : "Dibagikan pada saya via Nextcloud", "HTML Code:" : "Kode HTML:", - "Search global and public address book for users" : "Cari alamat buku global dan alamat publik untuk pengguna", "Share it:" : "Bagikan:" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/is.js b/apps/federatedfilesharing/l10n/is.js index 5191af33c50..5b48ead0ce9 100644 --- a/apps/federatedfilesharing/l10n/is.js +++ b/apps/federatedfilesharing/l10n/is.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Stilltu hvernig fólk getur deilt á milli þjóna.", "Allow users on this server to send shares to other servers" : "Leyfa notendum á þessum þjóni að senda sameignir til annarra þjóna", "Allow users on this server to receive shares from other servers" : "Leyfa notendum á þessum þjóni að taka á móti sameignum frá öðrum þjónum", - "Search global and public address book for users and let local users publish their data" : "Leita að notendum í víðværri og opinberri vistfangaskrá og leyfa staðværum notendum að birta gögnin sín", + "Search global and public address book for users" : "Leita að notendum í víðværri og opinberri vistfangaskrá", "Allow users to publish their data to a global and public address book" : "Leifa notendum að birta gögnin sín í víðværri og opinberri vistfangaskrá", "Federated Cloud" : "Skýjasamband (federated)", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Þú getur deilt með hverjum þeim sem notar Nextcloud, ownCloud eða Pydio! Settu bara skýjasambandsauðkennið þeirra (Federated Cloud ID) inn í deilingargluggann. Það lítur út svipað og einstaklingur@tölvuský.dæmi.is", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Bæta við vefsvæðið þitt", "Share with me via Nextcloud" : "Deila með mér í gegnum Nextcloud", "HTML Code:" : "HTML-kóði:", - "Search global and public address book for users" : "Leita að notendum í víðværri og opinberri vistfangaskrá", - "Share it:" : "Deila því:" + "Share it:" : "Deila því:", + "Search global and public address book for users and let local users publish their data" : "Leita að notendum í víðværri og opinberri vistfangaskrá og leyfa staðværum notendum að birta gögnin sín" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/federatedfilesharing/l10n/is.json b/apps/federatedfilesharing/l10n/is.json index 3049e14cb05..e8a03738970 100644 --- a/apps/federatedfilesharing/l10n/is.json +++ b/apps/federatedfilesharing/l10n/is.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Stilltu hvernig fólk getur deilt á milli þjóna.", "Allow users on this server to send shares to other servers" : "Leyfa notendum á þessum þjóni að senda sameignir til annarra þjóna", "Allow users on this server to receive shares from other servers" : "Leyfa notendum á þessum þjóni að taka á móti sameignum frá öðrum þjónum", - "Search global and public address book for users and let local users publish their data" : "Leita að notendum í víðværri og opinberri vistfangaskrá og leyfa staðværum notendum að birta gögnin sín", + "Search global and public address book for users" : "Leita að notendum í víðværri og opinberri vistfangaskrá", "Allow users to publish their data to a global and public address book" : "Leifa notendum að birta gögnin sín í víðværri og opinberri vistfangaskrá", "Federated Cloud" : "Skýjasamband (federated)", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Þú getur deilt með hverjum þeim sem notar Nextcloud, ownCloud eða Pydio! Settu bara skýjasambandsauðkennið þeirra (Federated Cloud ID) inn í deilingargluggann. Það lítur út svipað og einstaklingur@tölvuský.dæmi.is", @@ -50,7 +50,7 @@ "Add to your website" : "Bæta við vefsvæðið þitt", "Share with me via Nextcloud" : "Deila með mér í gegnum Nextcloud", "HTML Code:" : "HTML-kóði:", - "Search global and public address book for users" : "Leita að notendum í víðværri og opinberri vistfangaskrá", - "Share it:" : "Deila því:" + "Share it:" : "Deila því:", + "Search global and public address book for users and let local users publish their data" : "Leita að notendum í víðværri og opinberri vistfangaskrá og leyfa staðværum notendum að birta gögnin sín" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/it.js b/apps/federatedfilesharing/l10n/it.js index 529acd303ca..bba8d8dd0e6 100644 --- a/apps/federatedfilesharing/l10n/it.js +++ b/apps/federatedfilesharing/l10n/it.js @@ -42,13 +42,13 @@ OC.L10N.register( "Open documentation" : "Apri la documentazione", "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server", + "Search global and public address book for users" : "Cerca gli utenti nella rubrica globale e pubblica", "Allow users to publish their data to a global and public address book" : "Consenti agli utenti di pubblicare i propri dati in una rubrica globale e pubblica", "Federated Cloud" : "Cloud federata", "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", "Add to your website" : "Aggiungi al tuo sito web", "Share with me via Nextcloud" : "Condividi con me tramite Nextcloud", "HTML Code:" : "Codice HTML:", - "Search global and public address book for users" : "Cerca gli utenti nella rubrica globale e pubblica", "Share it:" : "Condividilo:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/it.json b/apps/federatedfilesharing/l10n/it.json index b1e820d7d16..e2fffd3fded 100644 --- a/apps/federatedfilesharing/l10n/it.json +++ b/apps/federatedfilesharing/l10n/it.json @@ -40,13 +40,13 @@ "Open documentation" : "Apri la documentazione", "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server", "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server", + "Search global and public address book for users" : "Cerca gli utenti nella rubrica globale e pubblica", "Allow users to publish their data to a global and public address book" : "Consenti agli utenti di pubblicare i propri dati in una rubrica globale e pubblica", "Federated Cloud" : "Cloud federata", "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:", "Add to your website" : "Aggiungi al tuo sito web", "Share with me via Nextcloud" : "Condividi con me tramite Nextcloud", "HTML Code:" : "Codice HTML:", - "Search global and public address book for users" : "Cerca gli utenti nella rubrica globale e pubblica", "Share it:" : "Condividilo:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/ko.js b/apps/federatedfilesharing/l10n/ko.js index 142e6c2c535..351079453c4 100644 --- a/apps/federatedfilesharing/l10n/ko.js +++ b/apps/federatedfilesharing/l10n/ko.js @@ -42,7 +42,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "서버간 파일 공유를 설정합니다.", "Allow users on this server to send shares to other servers" : "이 서버의 사용자가 다른 서버와 공유할 수 있도록 허용", "Allow users on this server to receive shares from other servers" : "이 서버의 사용자가 다른 서버에서 공유한 파일을 받을 수 있도록 허용", - "Search global and public address book for users and let local users publish their data" : "전역 및 공개 주소록에서 검색하고 로컬 사용자가 정보를 공개할 수 있도록 허용", + "Search global and public address book for users" : "전역 및 공개 주소록에서 사용자 검색", "Allow users to publish their data to a global and public address book" : "사용자가 데이터를 전역 및 공개 주소록에 업로드할 수 있도록 허용", "Federated Cloud" : "연합 클라우드", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Nextcloud, ownCloud, Pydio를 사용하는 누구나와 공유할 수 있습니다! 공유 대화 상자에서 연합 클라우드 ID를 입력하십시오. person@cloud.example.com 형식입니다", @@ -51,7 +51,7 @@ OC.L10N.register( "Add to your website" : "내 웹 사이트에 추가", "Share with me via Nextcloud" : "Nextcloud로 나와 공유하기", "HTML Code:" : "HTML 코드:", - "Search global and public address book for users" : "전역 및 공개 주소록에서 사용자 검색", - "Share it:" : "공유하기:" + "Share it:" : "공유하기:", + "Search global and public address book for users and let local users publish their data" : "전역 및 공개 주소록에서 검색하고 로컬 사용자가 정보를 공개할 수 있도록 허용" }, "nplurals=1; plural=0;"); diff --git a/apps/federatedfilesharing/l10n/ko.json b/apps/federatedfilesharing/l10n/ko.json index 5c88ac92f19..a08dfeacac3 100644 --- a/apps/federatedfilesharing/l10n/ko.json +++ b/apps/federatedfilesharing/l10n/ko.json @@ -40,7 +40,7 @@ "Adjust how people can share between servers." : "서버간 파일 공유를 설정합니다.", "Allow users on this server to send shares to other servers" : "이 서버의 사용자가 다른 서버와 공유할 수 있도록 허용", "Allow users on this server to receive shares from other servers" : "이 서버의 사용자가 다른 서버에서 공유한 파일을 받을 수 있도록 허용", - "Search global and public address book for users and let local users publish their data" : "전역 및 공개 주소록에서 검색하고 로컬 사용자가 정보를 공개할 수 있도록 허용", + "Search global and public address book for users" : "전역 및 공개 주소록에서 사용자 검색", "Allow users to publish their data to a global and public address book" : "사용자가 데이터를 전역 및 공개 주소록에 업로드할 수 있도록 허용", "Federated Cloud" : "연합 클라우드", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Nextcloud, ownCloud, Pydio를 사용하는 누구나와 공유할 수 있습니다! 공유 대화 상자에서 연합 클라우드 ID를 입력하십시오. person@cloud.example.com 형식입니다", @@ -49,7 +49,7 @@ "Add to your website" : "내 웹 사이트에 추가", "Share with me via Nextcloud" : "Nextcloud로 나와 공유하기", "HTML Code:" : "HTML 코드:", - "Search global and public address book for users" : "전역 및 공개 주소록에서 사용자 검색", - "Share it:" : "공유하기:" + "Share it:" : "공유하기:", + "Search global and public address book for users and let local users publish their data" : "전역 및 공개 주소록에서 검색하고 로컬 사용자가 정보를 공개할 수 있도록 허용" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/nb.js b/apps/federatedfilesharing/l10n/nb.js index 9d4510fc442..489dce9fe22 100644 --- a/apps/federatedfilesharing/l10n/nb.js +++ b/apps/federatedfilesharing/l10n/nb.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Juster hvordan folk kan dele mellom tjenere.", "Allow users on this server to send shares to other servers" : "Tillat at brukere på denne tjeneren sender delinger til andre tjenere", "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne tjeneren mottar delinger fra andre tjenere", - "Search global and public address book for users and let local users publish their data" : "Søk i verdensomspennende og offentlig adressebok etter brukere og la lokale brukere offentliggjøre deres data", + "Search global and public address book for users" : "Søk global og offentlige adressebøker etter brukere", "Allow users to publish their data to a global and public address book" : "Tillat brukere å offentliggjøre deres data til en verdensomspennende og offentlig adressebok", "Federated Cloud" : "Sammenknyttet sky", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Du kan dele med alle som bruker Nextcloud, ownCloud eller Pydio! Bare putt deres federerte sky-ID i delingsdialogvinduet. Det ser ut som person.sky.eksempel.no", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Legg på nettsiden din", "Share with me via Nextcloud" : "Del med meg via Nextcloud", "HTML Code:" : "HTML-kode:", - "Search global and public address book for users" : "Søk global og offentlige adressebøker etter brukere", - "Share it:" : "Del den:" + "Share it:" : "Del den:", + "Search global and public address book for users and let local users publish their data" : "Søk i verdensomspennende og offentlig adressebok etter brukere og la lokale brukere offentliggjøre deres data" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/nb.json b/apps/federatedfilesharing/l10n/nb.json index 894075d536b..b2bf69c0dc6 100644 --- a/apps/federatedfilesharing/l10n/nb.json +++ b/apps/federatedfilesharing/l10n/nb.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Juster hvordan folk kan dele mellom tjenere.", "Allow users on this server to send shares to other servers" : "Tillat at brukere på denne tjeneren sender delinger til andre tjenere", "Allow users on this server to receive shares from other servers" : "Tillat at brukere på denne tjeneren mottar delinger fra andre tjenere", - "Search global and public address book for users and let local users publish their data" : "Søk i verdensomspennende og offentlig adressebok etter brukere og la lokale brukere offentliggjøre deres data", + "Search global and public address book for users" : "Søk global og offentlige adressebøker etter brukere", "Allow users to publish their data to a global and public address book" : "Tillat brukere å offentliggjøre deres data til en verdensomspennende og offentlig adressebok", "Federated Cloud" : "Sammenknyttet sky", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Du kan dele med alle som bruker Nextcloud, ownCloud eller Pydio! Bare putt deres federerte sky-ID i delingsdialogvinduet. Det ser ut som person.sky.eksempel.no", @@ -50,7 +50,7 @@ "Add to your website" : "Legg på nettsiden din", "Share with me via Nextcloud" : "Del med meg via Nextcloud", "HTML Code:" : "HTML-kode:", - "Search global and public address book for users" : "Søk global og offentlige adressebøker etter brukere", - "Share it:" : "Del den:" + "Share it:" : "Del den:", + "Search global and public address book for users and let local users publish their data" : "Søk i verdensomspennende og offentlig adressebok etter brukere og la lokale brukere offentliggjøre deres data" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/nl.js b/apps/federatedfilesharing/l10n/nl.js index 80a8da5dd05..a7f99406a02 100644 --- a/apps/federatedfilesharing/l10n/nl.js +++ b/apps/federatedfilesharing/l10n/nl.js @@ -43,7 +43,7 @@ OC.L10N.register( "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", - "Search global and public address book for users and let local users publish their data" : "Openbare adresboeken voor gebruikers doorzoeken en laat lokale gebruikers de data plubliceren", + "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", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Je kunt met iedereeen delen die Nextcloud, ownCloud of Pydio gebruikt! Gebruik gewoon hun federatieID in de deel-dialoog. Het ziet eruit als iemand@cloud.voorbeeld.com", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Toevoegen aan je website", "Share with me via Nextcloud" : "Deel met mij via Nextcloud", "HTML Code:" : "HTML Code:", - "Search global and public address book for users" : "Doorzoeken van openbare adresboeken voor gebruikers", - "Share it:" : "Deel het:" + "Share it:" : "Deel het:", + "Search global and public address book for users and let local users publish their data" : "Openbare adresboeken voor gebruikers doorzoeken en laat lokale gebruikers de data plubliceren" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/nl.json b/apps/federatedfilesharing/l10n/nl.json index 7cfc42629dc..5db918b7691 100644 --- a/apps/federatedfilesharing/l10n/nl.json +++ b/apps/federatedfilesharing/l10n/nl.json @@ -41,7 +41,7 @@ "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", - "Search global and public address book for users and let local users publish their data" : "Openbare adresboeken voor gebruikers doorzoeken en laat lokale gebruikers de data plubliceren", + "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", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Je kunt met iedereeen delen die Nextcloud, ownCloud of Pydio gebruikt! Gebruik gewoon hun federatieID in de deel-dialoog. Het ziet eruit als iemand@cloud.voorbeeld.com", @@ -50,7 +50,7 @@ "Add to your website" : "Toevoegen aan je website", "Share with me via Nextcloud" : "Deel met mij via Nextcloud", "HTML Code:" : "HTML Code:", - "Search global and public address book for users" : "Doorzoeken van openbare adresboeken voor gebruikers", - "Share it:" : "Deel het:" + "Share it:" : "Deel het:", + "Search global and public address book for users and let local users publish their data" : "Openbare adresboeken voor gebruikers doorzoeken en laat lokale gebruikers de data plubliceren" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/pl.js b/apps/federatedfilesharing/l10n/pl.js index c0f715ffc2e..c84b5ba4404 100644 --- a/apps/federatedfilesharing/l10n/pl.js +++ b/apps/federatedfilesharing/l10n/pl.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Dostosuj ustawienia współdzielenia między serwerami.", "Allow users on this server to send shares to other servers" : "Zezwalaj użytkownikom na tym serwerze wysłać udostępnienia do innych serwerów", "Allow users on this server to receive shares from other servers" : "Zezwalaj użytkownikom na tym serwerze do otrzymania udostępnień z innych serwerów", - "Search global and public address book for users and let local users publish their data" : "Szukaj użytkowników w globalnej i publicznej książce adresowej i pozwól lokalnym użytkownikom na publikowanie swoich danych", + "Search global and public address book for users" : "Szukaj użytkowników w globalnej i publicznej książce adresowej", "Allow users to publish their data to a global and public address book" : "Pozwól użytkownikom na publikację ich danych do globalnej i publicznej książki adresowej", "Federated Cloud" : "Stowarzyszona Chmura", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Możesz współdzielić z każdym kto używa Nextclouda, ownClouda lub Pydio. Wystarczy, że wpiszesz ich ID chmury stowarzyszonej w pole współdzielenia. Wygląda jak osoba@przyklad.chmury.com", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Dodaj do swojej strony", "Share with me via Nextcloud" : "Podziel się ze mną poprzez Nextcloud", "HTML Code:" : "Kod HTML:", - "Search global and public address book for users" : "Szukaj użytkowników w globalnej i publicznej książce adresowej", - "Share it:" : "Udostępnij to:" + "Share it:" : "Udostępnij to:", + "Search global and public address book for users and let local users publish their data" : "Szukaj użytkowników w globalnej i publicznej książce adresowej i pozwól lokalnym użytkownikom na publikowanie swoich danych" }, "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"); diff --git a/apps/federatedfilesharing/l10n/pl.json b/apps/federatedfilesharing/l10n/pl.json index 7e2d0ea763f..65f749a6b11 100644 --- a/apps/federatedfilesharing/l10n/pl.json +++ b/apps/federatedfilesharing/l10n/pl.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Dostosuj ustawienia współdzielenia między serwerami.", "Allow users on this server to send shares to other servers" : "Zezwalaj użytkownikom na tym serwerze wysłać udostępnienia do innych serwerów", "Allow users on this server to receive shares from other servers" : "Zezwalaj użytkownikom na tym serwerze do otrzymania udostępnień z innych serwerów", - "Search global and public address book for users and let local users publish their data" : "Szukaj użytkowników w globalnej i publicznej książce adresowej i pozwól lokalnym użytkownikom na publikowanie swoich danych", + "Search global and public address book for users" : "Szukaj użytkowników w globalnej i publicznej książce adresowej", "Allow users to publish their data to a global and public address book" : "Pozwól użytkownikom na publikację ich danych do globalnej i publicznej książki adresowej", "Federated Cloud" : "Stowarzyszona Chmura", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Możesz współdzielić z każdym kto używa Nextclouda, ownClouda lub Pydio. Wystarczy, że wpiszesz ich ID chmury stowarzyszonej w pole współdzielenia. Wygląda jak osoba@przyklad.chmury.com", @@ -50,7 +50,7 @@ "Add to your website" : "Dodaj do swojej strony", "Share with me via Nextcloud" : "Podziel się ze mną poprzez Nextcloud", "HTML Code:" : "Kod HTML:", - "Search global and public address book for users" : "Szukaj użytkowników w globalnej i publicznej książce adresowej", - "Share it:" : "Udostępnij to:" + "Share it:" : "Udostępnij to:", + "Search global and public address book for users and let local users publish their data" : "Szukaj użytkowników w globalnej i publicznej książce adresowej i pozwól lokalnym użytkownikom na publikowanie swoich danych" },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/pt_BR.js b/apps/federatedfilesharing/l10n/pt_BR.js index ae93cd0c776..88537bd3773 100644 --- a/apps/federatedfilesharing/l10n/pt_BR.js +++ b/apps/federatedfilesharing/l10n/pt_BR.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Como administrador, você pode ajustar como as pessoas podem compartilhar entre servidores.", "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", "Allow users on this server to receive shares from other servers" : "Permitir que os usuários deste servidor recebam compartilhamentos de outros servidores", - "Search global and public address book for users and let local users publish their data" : "Pesquise o catálogo de endereços global e público para usuários e deixe os usuários locais publicarem seus dados", + "Search global and public address book for users" : "Procurar por usuários em catálogo de endereços global e público", "Allow users to publish their data to a global and public address book" : "Permitir que os usuários publiquem seus dados em um catálogo de endereços global e público", "Federated Cloud" : "Nuvem Federada", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Você pode compartilhar com qualquer um que use Nextcloud, ownCloud ou Pydio! Apenas coloque a ID de Nuvem Federada no diálogo de compartilhamento. Isto é algo como person@cloud.example.com", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Adicione ao seu website", "Share with me via Nextcloud" : "Compartilhe comigo via Nextcloud", "HTML Code:" : "Código HTML:", - "Search global and public address book for users" : "Procurar por usuários em catálogo de endereços global e público", - "Share it:" : "Compartilhe-a:" + "Share it:" : "Compartilhe-a:", + "Search global and public address book for users and let local users publish their data" : "Pesquise o catálogo de endereços global e público para usuários e deixe os usuários locais publicarem seus dados" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federatedfilesharing/l10n/pt_BR.json b/apps/federatedfilesharing/l10n/pt_BR.json index 568c1c622c3..be785422525 100644 --- a/apps/federatedfilesharing/l10n/pt_BR.json +++ b/apps/federatedfilesharing/l10n/pt_BR.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Como administrador, você pode ajustar como as pessoas podem compartilhar entre servidores.", "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores", "Allow users on this server to receive shares from other servers" : "Permitir que os usuários deste servidor recebam compartilhamentos de outros servidores", - "Search global and public address book for users and let local users publish their data" : "Pesquise o catálogo de endereços global e público para usuários e deixe os usuários locais publicarem seus dados", + "Search global and public address book for users" : "Procurar por usuários em catálogo de endereços global e público", "Allow users to publish their data to a global and public address book" : "Permitir que os usuários publiquem seus dados em um catálogo de endereços global e público", "Federated Cloud" : "Nuvem Federada", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Você pode compartilhar com qualquer um que use Nextcloud, ownCloud ou Pydio! Apenas coloque a ID de Nuvem Federada no diálogo de compartilhamento. Isto é algo como person@cloud.example.com", @@ -50,7 +50,7 @@ "Add to your website" : "Adicione ao seu website", "Share with me via Nextcloud" : "Compartilhe comigo via Nextcloud", "HTML Code:" : "Código HTML:", - "Search global and public address book for users" : "Procurar por usuários em catálogo de endereços global e público", - "Share it:" : "Compartilhe-a:" + "Share it:" : "Compartilhe-a:", + "Search global and public address book for users and let local users publish their data" : "Pesquise o catálogo de endereços global e público para usuários e deixe os usuários locais publicarem seus dados" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/ru.js b/apps/federatedfilesharing/l10n/ru.js index dfbf06a755a..5e3ca19f0e3 100644 --- a/apps/federatedfilesharing/l10n/ru.js +++ b/apps/federatedfilesharing/l10n/ru.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Настройте общий доступ между серверами.", "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", - "Search global and public address book for users and let local users publish their data" : "Поиск пользователей в глобальной и общедоступной адресной книге и резрешение публикации своих данных локальным пользователям ", + "Search global and public address book for users" : "Искать пользователей в глобальной и открытой адресной книге", "Allow users to publish their data to a global and public address book" : "Резрешить пользователям публиковать свои данные в глобальной и общедосупной адресной книге", "Federated Cloud" : "Федерация облачных хранилищ", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Можно поделиться с любым пользователем Nextcloud, ownCloud или Pydio! Просто введите его идентификатор федеративного облачного хранилища в диалоге предоставления общего доступа. Идентификатор указывается в виде «person@cloud.example.com».", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Добавить к себе на сайт", "Share with me via Nextcloud" : "Поделитесь со мной через Nextcloud", "HTML Code:" : "HTML код:", - "Search global and public address book for users" : "Искать пользователей в глобальной и открытой адресной книге", - "Share it:" : "Поделиться:" + "Share it:" : "Поделиться:", + "Search global and public address book for users and let local users publish their data" : "Поиск пользователей в глобальной и общедоступной адресной книге и резрешение публикации своих данных локальным пользователям " }, "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/apps/federatedfilesharing/l10n/ru.json b/apps/federatedfilesharing/l10n/ru.json index adfa0a811c3..46019bfaf68 100644 --- a/apps/federatedfilesharing/l10n/ru.json +++ b/apps/federatedfilesharing/l10n/ru.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Настройте общий доступ между серверами.", "Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов", "Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов", - "Search global and public address book for users and let local users publish their data" : "Поиск пользователей в глобальной и общедоступной адресной книге и резрешение публикации своих данных локальным пользователям ", + "Search global and public address book for users" : "Искать пользователей в глобальной и открытой адресной книге", "Allow users to publish their data to a global and public address book" : "Резрешить пользователям публиковать свои данные в глобальной и общедосупной адресной книге", "Federated Cloud" : "Федерация облачных хранилищ", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Можно поделиться с любым пользователем Nextcloud, ownCloud или Pydio! Просто введите его идентификатор федеративного облачного хранилища в диалоге предоставления общего доступа. Идентификатор указывается в виде «person@cloud.example.com».", @@ -50,7 +50,7 @@ "Add to your website" : "Добавить к себе на сайт", "Share with me via Nextcloud" : "Поделитесь со мной через Nextcloud", "HTML Code:" : "HTML код:", - "Search global and public address book for users" : "Искать пользователей в глобальной и открытой адресной книге", - "Share it:" : "Поделиться:" + "Share it:" : "Поделиться:", + "Search global and public address book for users and let local users publish their data" : "Поиск пользователей в глобальной и общедоступной адресной книге и резрешение публикации своих данных локальным пользователям " },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/sv.js b/apps/federatedfilesharing/l10n/sv.js index 6921ab5d30d..3968f627a41 100644 --- a/apps/federatedfilesharing/l10n/sv.js +++ b/apps/federatedfilesharing/l10n/sv.js @@ -41,12 +41,12 @@ OC.L10N.register( "Open documentation" : "Öppna dokumentation", "Allow users on this server to send shares to other servers" : "Tillåt användare på denna server att skicka utdelningar till andra servrar", "Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar", + "Search global and public address book for users" : "Sök global och offentlig adressbok för användare", "Federated Cloud" : "Federerat Moln", "Your Federated Cloud ID:" : "Ditt Federerade Moln-ID:", "Add to your website" : "Lägg till på din hemsida", "Share with me via Nextcloud" : "Dela med mig via Nextcloud", "HTML Code:" : "HTML Kod:", - "Search global and public address book for users" : "Sök global och offentlig adressbok för användare", "Share it:" : "Dela detta:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/federatedfilesharing/l10n/sv.json b/apps/federatedfilesharing/l10n/sv.json index f4ebd245e16..d5f514f3fda 100644 --- a/apps/federatedfilesharing/l10n/sv.json +++ b/apps/federatedfilesharing/l10n/sv.json @@ -39,12 +39,12 @@ "Open documentation" : "Öppna dokumentation", "Allow users on this server to send shares to other servers" : "Tillåt användare på denna server att skicka utdelningar till andra servrar", "Allow users on this server to receive shares from other servers" : "Tillåt användare på denna servern att ta emot utdelningar från andra servrar", + "Search global and public address book for users" : "Sök global och offentlig adressbok för användare", "Federated Cloud" : "Federerat Moln", "Your Federated Cloud ID:" : "Ditt Federerade Moln-ID:", "Add to your website" : "Lägg till på din hemsida", "Share with me via Nextcloud" : "Dela med mig via Nextcloud", "HTML Code:" : "HTML Kod:", - "Search global and public address book for users" : "Sök global och offentlig adressbok för användare", "Share it:" : "Dela detta:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/tr.js b/apps/federatedfilesharing/l10n/tr.js index 623f8d3dc07..0d14b3b0471 100644 --- a/apps/federatedfilesharing/l10n/tr.js +++ b/apps/federatedfilesharing/l10n/tr.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "Kişilerin sunucular arasında nasıl paylaşım yapabileceğini ayarlayın.", "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcılar diğer sunuculara paylaşım gönderebilsin", "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcılar diğer sunuculardan paylaşım alabilsin", - "Search global and public address book for users and let local users publish their data" : "Genel ve herkese açık adres defterinde kullanıcı ara ve yerel kullanıcıların bilgilerini paylaşmasını sağla", + "Search global and public address book for users" : "Genel ve herkese açık adres defterinde kullanıcı ara", "Allow users to publish their data to a global and public address book" : "Kullanıcıların bilgilerini genel ve herkese açık bir adres defterinde paylaşabilsin", "Federated Cloud" : "Birleşmiş Bulut", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Nextcloud, ownCloud ya da Pydio kullanıcıları ile paylaşım yapılaiblir. Yalnızca paylaşım penceresine person@cloud.example.com gibi Birleşmiş Bulut kodunu yazın.", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "Web sitenize ekleyin", "Share with me via Nextcloud" : "Benimle Nextcloud üzerinden paylaşın", "HTML Code:" : "HTML Kodu:", - "Search global and public address book for users" : "Genel ve herkese açık adres defterinde kullanıcı ara", - "Share it:" : "Paylaşın:" + "Share it:" : "Paylaşın:", + "Search global and public address book for users and let local users publish their data" : "Genel ve herkese açık adres defterinde kullanıcı ara ve yerel kullanıcıların bilgilerini paylaşmasını sağla" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/federatedfilesharing/l10n/tr.json b/apps/federatedfilesharing/l10n/tr.json index e8c2f0cfe28..11ac0a8af41 100644 --- a/apps/federatedfilesharing/l10n/tr.json +++ b/apps/federatedfilesharing/l10n/tr.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "Kişilerin sunucular arasında nasıl paylaşım yapabileceğini ayarlayın.", "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcılar diğer sunuculara paylaşım gönderebilsin", "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcılar diğer sunuculardan paylaşım alabilsin", - "Search global and public address book for users and let local users publish their data" : "Genel ve herkese açık adres defterinde kullanıcı ara ve yerel kullanıcıların bilgilerini paylaşmasını sağla", + "Search global and public address book for users" : "Genel ve herkese açık adres defterinde kullanıcı ara", "Allow users to publish their data to a global and public address book" : "Kullanıcıların bilgilerini genel ve herkese açık bir adres defterinde paylaşabilsin", "Federated Cloud" : "Birleşmiş Bulut", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Nextcloud, ownCloud ya da Pydio kullanıcıları ile paylaşım yapılaiblir. Yalnızca paylaşım penceresine person@cloud.example.com gibi Birleşmiş Bulut kodunu yazın.", @@ -50,7 +50,7 @@ "Add to your website" : "Web sitenize ekleyin", "Share with me via Nextcloud" : "Benimle Nextcloud üzerinden paylaşın", "HTML Code:" : "HTML Kodu:", - "Search global and public address book for users" : "Genel ve herkese açık adres defterinde kullanıcı ara", - "Share it:" : "Paylaşın:" + "Share it:" : "Paylaşın:", + "Search global and public address book for users and let local users publish their data" : "Genel ve herkese açık adres defterinde kullanıcı ara ve yerel kullanıcıların bilgilerini paylaşmasını sağla" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/l10n/zh_CN.js b/apps/federatedfilesharing/l10n/zh_CN.js index 4eabd0cdbfa..96f9203fa44 100644 --- a/apps/federatedfilesharing/l10n/zh_CN.js +++ b/apps/federatedfilesharing/l10n/zh_CN.js @@ -43,7 +43,7 @@ OC.L10N.register( "Adjust how people can share between servers." : "调整人们如何在服务器之间共享。", "Allow users on this server to send shares to other servers" : "允许用户分享文件给其他服务器上的用户", "Allow users on this server to receive shares from other servers" : "允许用户从其他服务器接收分享", - "Search global and public address book for users and let local users publish their data" : "搜索用户的全球和公共通讯录，并让本地用户发布其数据", + "Search global and public address book for users" : "在全局和公开地址簿中寻找用户", "Allow users to publish their data to a global and public address book" : "允许用户将其数据发布到全球和公共通讯录", "Federated Cloud" : "联合云", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "您可以与任何使用Nextcloud，ownCloud或Pydio的人分享！ 只需将它们的联合云ID放在共享对话框中。 看起来像person@cloud.example.com", @@ -52,7 +52,7 @@ OC.L10N.register( "Add to your website" : "添加到您的网站", "Share with me via Nextcloud" : "通过联合云与我共享", "HTML Code:" : "HTML 代码:", - "Search global and public address book for users" : "在全局和公开地址簿中寻找用户", - "Share it:" : "分享它：" + "Share it:" : "分享它：", + "Search global and public address book for users and let local users publish their data" : "搜索用户的全球和公共通讯录，并让本地用户发布其数据" }, "nplurals=1; plural=0;"); diff --git a/apps/federatedfilesharing/l10n/zh_CN.json b/apps/federatedfilesharing/l10n/zh_CN.json index 14508ed998d..2d5cd063eb6 100644 --- a/apps/federatedfilesharing/l10n/zh_CN.json +++ b/apps/federatedfilesharing/l10n/zh_CN.json @@ -41,7 +41,7 @@ "Adjust how people can share between servers." : "调整人们如何在服务器之间共享。", "Allow users on this server to send shares to other servers" : "允许用户分享文件给其他服务器上的用户", "Allow users on this server to receive shares from other servers" : "允许用户从其他服务器接收分享", - "Search global and public address book for users and let local users publish their data" : "搜索用户的全球和公共通讯录，并让本地用户发布其数据", + "Search global and public address book for users" : "在全局和公开地址簿中寻找用户", "Allow users to publish their data to a global and public address book" : "允许用户将其数据发布到全球和公共通讯录", "Federated Cloud" : "联合云", "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "您可以与任何使用Nextcloud，ownCloud或Pydio的人分享！ 只需将它们的联合云ID放在共享对话框中。 看起来像person@cloud.example.com", @@ -50,7 +50,7 @@ "Add to your website" : "添加到您的网站", "Share with me via Nextcloud" : "通过联合云与我共享", "HTML Code:" : "HTML 代码:", - "Search global and public address book for users" : "在全局和公开地址簿中寻找用户", - "Share it:" : "分享它：" + "Share it:" : "分享它：", + "Search global and public address book for users and let local users publish their data" : "搜索用户的全球和公共通讯录，并让本地用户发布其数据" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/federatedfilesharing/templates/settings-admin.php b/apps/federatedfilesharing/templates/settings-admin.php index e106f1dc4e7..7fe1b5f62e6 100644 --- a/apps/federatedfilesharing/templates/settings-admin.php +++ b/apps/federatedfilesharing/templates/settings-admin.php @@ -32,7 +32,7 @@ script('federatedfilesharing', 'settings-admin'); <input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox" value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> /> <label for="lookupServerEnabled"> - <?php p($l->t('Search global and public address book for users and let local users publish their data'));?> + <?php p($l->t('Search global and public address book for users'));?> </label><br/> </p> <p> diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 579cf36e15b..5f32916650d 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -108,6 +108,10 @@ .nav-icon-trashbin { background-image: url('../img/delete.svg?v=1'); } +/* no icon for the quota bar */ +.nav-icon-quota { + padding-left: 15px !important; +} #app-navigation .nav-files a.nav-icon-files { width: auto; @@ -747,3 +751,37 @@ table.dragshadow td.size { #filestable tbody tr.canDrop { background-color: rgba(255, 255, 140, 1); } + + +#quota { + margin: 0 !important; + border: none; + border-radius: 0; + position: fixed !important; + bottom: 44px; + width: inherit !important; + background-color: #fff; + border-right: 1px solid #eee; + z-index:1; + + .quota-container { + height: 5px; + border-radius: 3px; + + div { + height: 100%; + background-color: $color-primary; + } + } +} + +/* increase the padding of the last item to not hide below the quota item */ +.app-files #app-navigation > ul li:nth-last-child(1) { + margin-bottom: 44px; +} + +#quotatext { + padding: 0; + height: 30px; + line-height: 30px; +} diff --git a/apps/files/js/app.js b/apps/files/js/app.js index d46a0b8f9df..47011d23f44 100644 --- a/apps/files/js/app.js +++ b/apps/files/js/app.js @@ -108,6 +108,10 @@ // trigger URL change event handlers this._onPopState(urlParams); + $('#quota.has-tooltip').tooltip({ + placement: 'top' + }); + this._debouncedPersistShowHiddenFilesState = _.debounce(this._persistShowHiddenFilesState, 1200); }, diff --git a/apps/files/js/files.js b/apps/files/js/files.js index a30194013e5..cdc2e27a612 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -363,7 +363,7 @@ var createDragShadow = function(event) { tbody.append(newtr); if (elem.type === 'dir') { newtr.find('td.filename') - .css('background-image', 'url(' + OC.imagePath('core', 'filetypes/folder.svg') + ')'); + .css('background-image', 'url(' + OC.MimeType.getIconUrl('folder') + ')'); } else { var path = dir + '/' + elem.name; Files.lazyLoadPreview(path, elem.mimetype, function(previewpath) { diff --git a/apps/files/js/navigation.js b/apps/files/js/navigation.js index 83cd556c89a..d213d0467b6 100644 --- a/apps/files/js/navigation.js +++ b/apps/files/js/navigation.js @@ -123,7 +123,9 @@ _onClickItem: function(ev) { var $target = $(ev.target); var itemId = $target.closest('li').attr('data-id'); - this.setActiveItem(itemId); + if (!_.isUndefined(itemId)) { + this.setActiveItem(itemId); + } ev.preventDefault(); } }; diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index f7a4318e595..bfeb2cafcf6 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -41,6 +41,7 @@ use OCP\IUserSession; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use OCP\Files\Folder; use OCP\App\IAppManager; +use Symfony\Component\EventDispatcher\GenericEvent; /** * Class ViewController @@ -174,6 +175,17 @@ class ViewController extends Controller { }); $nav->assign('navigationItems', $navItems); + + $nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used'])); + if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) { + $totalSpace = $this->l10n->t('Unlimited'); + } else { + $totalSpace = \OC_Helper::humanFileSize($storageInfo['total']); + } + $nav->assign('total_space', $totalSpace); + $nav->assign('quota', $storageInfo['quota']); + $nav->assign('usage_relative', $storageInfo['relative']); + $contentItems = []; // render the container content for every navigation item @@ -188,7 +200,8 @@ class ViewController extends Controller { $contentItems[] = $contentItem; } - $this->eventDispatcher->dispatch('OCA\Files::loadAdditionalScripts'); + $event = new GenericEvent(null, ['hiddenFields' => []]); + $this->eventDispatcher->dispatch('OCA\Files::loadAdditionalScripts', $event); $params = []; $params['usedSpacePercent'] = (int)$storageInfo['relative']; @@ -204,6 +217,7 @@ class ViewController extends Controller { $params['fileNotFound'] = $fileNotFound ? 1 : 0; $params['appNavigation'] = $nav; $params['appContents'] = $contentItems; + $params['hiddenFields'] = $event->getArgument('hiddenFields'); $response = new TemplateResponse( $this->appName, diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php index 9c79f806713..bbd78079d39 100644 --- a/apps/files/templates/appnavigation.php +++ b/apps/files/templates/appnavigation.php @@ -1,5 +1,23 @@ <div id="app-navigation"> <ul class="with-icon"> + <li id="quota" class="section <?php + if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) { + ?>has-tooltip" title="<?php p($_['usage_relative'] . '%'); + } ?>"> + <a href="#" class="nav-icon-quota svg"> + <p id="quotatext"><?php + if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) { + p($l->t('%s of %s used', [$_['usage'], $_['total_space']])); + } else { + p($l->t('%s used', [$_['usage']])); + } ?></p> + <div class="quota-container"> + <div style="width:<?php p($_['usage_relative']);?>%" + <?php if($_['usage_relative'] > 80): ?>class="quota-warning"<?php endif; ?>> + </div> + </div> + </a> + </li> <?php foreach ($_['navigationItems'] as $item) { ?> <li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?>"> <a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>" diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 1670ccfd138..b49684643bb 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -21,3 +21,7 @@ <input type="hidden" name="defaultFileSortingDirection" id="defaultFileSortingDirection" value="<?php p($_['defaultFileSortingDirection']) ?>" /> <input type="hidden" name="showHiddenFiles" id="showHiddenFiles" value="<?php p($_['showHiddenFiles']); ?>" /> <?php endif; + +foreach ($_['hiddenFields'] as $name => $value) {?> +<input type="hidden" name="<?php p($name) ?>" id="<?php p($name) ?>" value="<?php p($value) ?>" /> +<?php } diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index 2e497405a4d..db86e0037ef 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -107,6 +107,9 @@ class ViewControllerTest extends TestCase { ->expects($this->once()) ->method('getStorageInfo') ->will($this->returnValue([ + 'used' => 123, + 'quota' => 100, + 'total' => 100, 'relative' => 123, 'owner' => 'MyName', 'ownerDisplayName' => 'MyDisplayName', @@ -125,6 +128,10 @@ class ViewControllerTest extends TestCase { ->will($this->returnArgument(2)); $nav = new Template('files', 'appnavigation'); + $nav->assign('usage_relative', 123); + $nav->assign('usage', '123 B'); + $nav->assign('quota', 100); + $nav->assign('total_space', '100 B'); $nav->assign('navigationItems', [ [ 'id' => 'files', @@ -256,6 +263,7 @@ class ViewControllerTest extends TestCase { 'content' => null, ], ], + 'hiddenFields' => [], ] ); $policy = new Http\ContentSecurityPolicy(); diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index ad3ef856f23..1407737d007 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -259,7 +259,7 @@ OCA.Sharing.PublicApp = { $('.save-form').submit(function (event) { event.preventDefault(); - var remote = $(this).find('input[type="email"]').val(); + var remote = $(this).find('#remote_address').val(); var token = $('#sharingToken').val(); var owner = $('#save').data('owner'); var ownerDisplayName = $('#save').data('owner-display-name'); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index adbbd0f80e7..377e3902002 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -54,7 +54,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size); data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>"> <button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button> <form class="save-form hidden" action="#"> - <input type="email" id="remote_address" placeholder="user@yourNextcloud.org"/> + <input type="text" id="remote_address" placeholder="user@yourNextcloud.org"/> <button id="save-button-confirm" class="icon-confirm svg" disabled></button> </form> </span> diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css index f150e557231..f1096d5924c 100644 --- a/apps/files_trashbin/css/trash.css +++ b/apps/files_trashbin/css/trash.css @@ -20,20 +20,17 @@ display: none; } -#app-navigation > ul { - padding-bottom: 44px; -} - /* move Deleted Files to bottom of sidebar */ .nav-trashbin { position: fixed !important; - bottom: 44px; + bottom: 88px; width: inherit !important; background-color: #fff; border-right: 1px solid #eee; + margin-bottom: 0px !important; } /* double padding to account for Deleted files entry, issue with Firefox */ .app-files #app-navigation > ul li:nth-last-child(2) { - margin-bottom: 44px; + margin-bottom: 88px; } diff --git a/apps/oauth2/appinfo/info.xml b/apps/oauth2/appinfo/info.xml index fe8ce3a1289..ccddc9a8f71 100644 --- a/apps/oauth2/appinfo/info.xml +++ b/apps/oauth2/appinfo/info.xml @@ -15,10 +15,6 @@ <nextcloud min-version="13" max-version="13" /> </dependencies> - <dependencies> - <nextcloud min-version="12" max-version="12" /> - </dependencies> - <settings> <admin>OCA\OAuth2\Settings\Admin</admin> </settings> diff --git a/apps/sharebymail/l10n/pt_BR.js b/apps/sharebymail/l10n/pt_BR.js index 558107b0afa..173abe70dc4 100644 --- a/apps/sharebymail/l10n/pt_BR.js +++ b/apps/sharebymail/l10n/pt_BR.js @@ -18,7 +18,7 @@ OC.L10N.register( "Password to access {file} was sent to you" : "A senha para acesso {file} foi enviada para você", "Sharing %s failed, this item is already shared with %s" : "O compartilhamento %s falhou, pois este item já está compartilhado com %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Não pudemos enviar a você a senha auto-gerada. por favor defina um e-mail válido em sua configuração e tente novamente.", - "Failed to send share by email" : "Falha ao enviar compartilhamento por e-mail", + "Failed to send share by email" : "Falha ao enviar compartilhamento via e-mail", "%s shared »%s« with you" : "%s compartilhou »%s« com você", "%s shared »%s« with you." : "%s compartilhou »%s« com você.", "Click the button below to open it." : "Clique no botão abaixo para abrí-lo.", diff --git a/apps/sharebymail/l10n/pt_BR.json b/apps/sharebymail/l10n/pt_BR.json index f8a4bdd9328..8c2964ef257 100644 --- a/apps/sharebymail/l10n/pt_BR.json +++ b/apps/sharebymail/l10n/pt_BR.json @@ -16,7 +16,7 @@ "Password to access {file} was sent to you" : "A senha para acesso {file} foi enviada para você", "Sharing %s failed, this item is already shared with %s" : "O compartilhamento %s falhou, pois este item já está compartilhado com %s", "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Não pudemos enviar a você a senha auto-gerada. por favor defina um e-mail válido em sua configuração e tente novamente.", - "Failed to send share by email" : "Falha ao enviar compartilhamento por e-mail", + "Failed to send share by email" : "Falha ao enviar compartilhamento via e-mail", "%s shared »%s« with you" : "%s compartilhou »%s« com você", "%s shared »%s« with you." : "%s compartilhou »%s« com você.", "Click the button below to open it." : "Clique no botão abaixo para abrí-lo.", diff --git a/apps/twofactor_backupcodes/l10n/mn.js b/apps/twofactor_backupcodes/l10n/mn.js new file mode 100644 index 00000000000..24f476d65b8 --- /dev/null +++ b/apps/twofactor_backupcodes/l10n/mn.js @@ -0,0 +1,19 @@ +OC.L10N.register( + "twofactor_backupcodes", + { + "Generate backup codes" : "нөөц кодыг үүсгэх", + "Backup codes have been generated. {{used}} of {{total}} codes have been used." : "нөөц код үүссэн.{{Used}} {{total}} кодыг ашигласан.", + "These are your backup codes. Please save and/or print them as you will not be able to read the codes again later" : "Эдгээр нь таны нөөц код юм. Дараа нь дахин кодыг уншиж чадахгүй тул та тэдгээрийг хадгалах буюу хэвлэх боломжтой", + "Save backup codes" : "Нөөц кодыг хадгалах", + "Print backup codes" : "Нөөц кодыг хэвлэх", + "Regenerate backup codes" : "Нөөц кодыг дахин сэргээх", + "If you regenerate backup codes, you automatically invalidate old codes." : "хэрвээ нөөц кодыг дахин сэргээх бол, та хуучин кодыг автоматаар хүчингүй болгоно", + "An error occurred while generating your backup codes" : "Таны нөөц кодыг үүсгэх явцад алдаа гарлаа", + "Nextcloud backup codes" : "Nextcloud нөөц код", + "You created two-factor backup codes for your account" : "Та өөрийн аккаунтад хоёр хүчин зүйлийн нөөц код үүсгэсэн", + "Backup code" : "Нөөц код", + "Use backup code" : "Нөөц кодыг ашиглах", + "Two factor backup codes" : "Нөөц кодын хоёр хүчин зүйл", + "Second-factor backup codes" : "нөөц кодын хоёр дахь хүчин зүйл" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/apps/twofactor_backupcodes/l10n/mn.json b/apps/twofactor_backupcodes/l10n/mn.json new file mode 100644 index 00000000000..5e7f5ac8edf --- /dev/null +++ b/apps/twofactor_backupcodes/l10n/mn.json @@ -0,0 +1,17 @@ +{ "translations": { + "Generate backup codes" : "нөөц кодыг үүсгэх", + "Backup codes have been generated. {{used}} of {{total}} codes have been used." : "нөөц код үүссэн.{{Used}} {{total}} кодыг ашигласан.", + "These are your backup codes. Please save and/or print them as you will not be able to read the codes again later" : "Эдгээр нь таны нөөц код юм. Дараа нь дахин кодыг уншиж чадахгүй тул та тэдгээрийг хадгалах буюу хэвлэх боломжтой", + "Save backup codes" : "Нөөц кодыг хадгалах", + "Print backup codes" : "Нөөц кодыг хэвлэх", + "Regenerate backup codes" : "Нөөц кодыг дахин сэргээх", + "If you regenerate backup codes, you automatically invalidate old codes." : "хэрвээ нөөц кодыг дахин сэргээх бол, та хуучин кодыг автоматаар хүчингүй болгоно", + "An error occurred while generating your backup codes" : "Таны нөөц кодыг үүсгэх явцад алдаа гарлаа", + "Nextcloud backup codes" : "Nextcloud нөөц код", + "You created two-factor backup codes for your account" : "Та өөрийн аккаунтад хоёр хүчин зүйлийн нөөц код үүсгэсэн", + "Backup code" : "Нөөц код", + "Use backup code" : "Нөөц кодыг ашиглах", + "Two factor backup codes" : "Нөөц кодын хоёр хүчин зүйл", + "Second-factor backup codes" : "нөөц кодын хоёр дахь хүчин зүйл" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/apps/updatenotification/l10n/pt_BR.js b/apps/updatenotification/l10n/pt_BR.js index 4aada7f7712..23ade169a13 100644 --- a/apps/updatenotification/l10n/pt_BR.js +++ b/apps/updatenotification/l10n/pt_BR.js @@ -4,7 +4,7 @@ OC.L10N.register( "Update notifications" : "Notificações de atualização", "Could not start updater, please try the manual update" : "Não foi possível iniciar o atualizador, tente a atualização manual", "{version} is available. Get more information on how to update." : "{version} está disponível. Obtenha mais informações sobre como atualizar.", - "Channel updated" : "Versão atualizada", + "Channel updated" : "Canal atualizado", "The update server could not be reached since %d days to check for new updates." : "O servidor de atualização não foi encontrado já há %d dias para verificar por novas atualizações.", "Please check the Nextcloud and server log files for errors." : "Verifique se há erros nos arquivos de log do servidor e do Nextcloud ", "Update to %1$s is available." : "Atualização para %1$s está disponível.", diff --git a/apps/updatenotification/l10n/pt_BR.json b/apps/updatenotification/l10n/pt_BR.json index 0d619c6200f..7b803e021e8 100644 --- a/apps/updatenotification/l10n/pt_BR.json +++ b/apps/updatenotification/l10n/pt_BR.json @@ -2,7 +2,7 @@ "Update notifications" : "Notificações de atualização", "Could not start updater, please try the manual update" : "Não foi possível iniciar o atualizador, tente a atualização manual", "{version} is available. Get more information on how to update." : "{version} está disponível. Obtenha mais informações sobre como atualizar.", - "Channel updated" : "Versão atualizada", + "Channel updated" : "Canal atualizado", "The update server could not be reached since %d days to check for new updates." : "O servidor de atualização não foi encontrado já há %d dias para verificar por novas atualizações.", "Please check the Nextcloud and server log files for errors." : "Verifique se há erros nos arquivos de log do servidor e do Nextcloud ", "Update to %1$s is available." : "Atualização para %1$s está disponível.", diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index 70e505c18af..df08a2acd70 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -60,9 +60,3 @@ if(count($configPrefixes) > 0) { '\OCA\User_LDAP\Helper', 'loginName2UserName' ); - -if(OCP\App::isEnabled('user_webdavauth')) { - OCP\Util::writeLog('user_ldap', - 'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour', - OCP\Util::WARN); -} diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 58116b8c0e7..82e61cd5dcd 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -66,9 +66,7 @@ style('user_ldap', 'settings'); <li class="ldapSettingsTabs"><a href="#ldapSettings-2"><?php p($l->t('Expert'));?></a></li> <li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li> </ul> - <?php if(OCP\App::isEnabled('user_webdavauth')) { - print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'</p>'); - } + <?php if(!function_exists('ldap_connect')) { print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>'); } |