diff options
99 files changed, 299 insertions, 165 deletions
diff --git a/3rdparty b/3rdparty -Subproject a8699fbb8505278c23b74f123236b77bbe1aec0 +Subproject 35a8125ac1dc2325da8da5529f50b3881e1b240 diff --git a/apps/dav/lib/connector/sabre/objecttree.php b/apps/dav/lib/connector/sabre/objecttree.php index 505a42d4746..f38dfe679c7 100644 --- a/apps/dav/lib/connector/sabre/objecttree.php +++ b/apps/dav/lib/connector/sabre/objecttree.php @@ -102,9 +102,11 @@ class ObjectTree extends \Sabre\DAV\Tree { * Returns the INode object for the requested path * * @param string $path - * @throws \Sabre\DAV\Exception\ServiceUnavailable - * @throws \Sabre\DAV\Exception\NotFound * @return \Sabre\DAV\INode + * @throws InvalidPath + * @throws \Sabre\DAV\Exception\Locked + * @throws \Sabre\DAV\Exception\NotFound + * @throws \Sabre\DAV\Exception\ServiceUnavailable */ public function getNodeForPath($path) { if (!$this->fileView) { diff --git a/apps/dav/lib/connector/sabre/serverfactory.php b/apps/dav/lib/connector/sabre/serverfactory.php index 8158db3e92a..cab7a85d19f 100644 --- a/apps/dav/lib/connector/sabre/serverfactory.php +++ b/apps/dav/lib/connector/sabre/serverfactory.php @@ -26,6 +26,7 @@ namespace OCA\DAV\Connector\Sabre; +use OCA\DAV\Files\BrowserErrorPagePlugin; use OCP\Files\Mount\IMountManager; use OCP\IConfig; use OCP\IDBConnection; @@ -115,6 +116,10 @@ class ServerFactory { $server->addPlugin(new \OCA\DAV\Connector\Sabre\FakeLockerPlugin()); } + if (BrowserErrorPagePlugin::isBrowserRequest($this->request)) { + $server->addPlugin(new BrowserErrorPagePlugin()); + } + // wait with registering these until auth is handled and the filesystem is setup $server->on('beforeMethod', function () use ($server, $objectTree, $viewCallBack) { // ensure the skeleton is copied diff --git a/apps/dav/lib/files/browsererrorpageplugin.php b/apps/dav/lib/files/browsererrorpageplugin.php new file mode 100644 index 00000000000..37a4166efef --- /dev/null +++ b/apps/dav/lib/files/browsererrorpageplugin.php @@ -0,0 +1,116 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OCA\DAV\Files; + +use OC\AppFramework\Http\Request; +use OC_Template; +use OCP\IRequest; +use Sabre\DAV\Exception; +use Sabre\DAV\Server; +use Sabre\DAV\ServerPlugin; + +class BrowserErrorPagePlugin extends ServerPlugin { + + /** @var Server */ + private $server; + + /** + * This initializes the plugin. + * + * This function is called by Sabre\DAV\Server, after + * addPlugin is called. + * + * This method should set up the required event subscriptions. + * + * @param Server $server + * @return void + */ + function initialize(Server $server) { + $this->server = $server; + $server->on('exception', array($this, 'logException'), 1000); + } + + /** + * @param IRequest $request + * @return bool + */ + public static function isBrowserRequest(IRequest $request) { + if ($request->getMethod() !== 'GET') { + return false; + } + return $request->isUserAgent([ + Request::USER_AGENT_IE, + Request::USER_AGENT_MS_EDGE, + Request::USER_AGENT_CHROME, + Request::USER_AGENT_FIREFOX, + Request::USER_AGENT_SAFARI, + ]); + } + + /** + * @param \Exception $ex + */ + public function logException(\Exception $ex) { + if ($ex instanceof Exception) { + $httpCode = $ex->getHTTPCode(); + $headers = $ex->getHTTPHeaders($this->server); + } else { + $httpCode = 500; + $headers = []; + } + $this->server->httpResponse->addHeaders($headers); + $this->server->httpResponse->setStatus($httpCode); + $body = $this->generateBody($ex); + $this->server->httpResponse->setBody($body); + $this->sendResponse(); + } + + /** + * @codeCoverageIgnore + * @param \Exception $ex + * @param int $httpCode + * @return bool|string + */ + public function generateBody(\Exception $exception) { + $request = \OC::$server->getRequest(); + $content = new OC_Template('dav', 'exception', 'guest'); + $content->assign('title', $this->server->httpResponse->getStatusText()); + $content->assign('message', $exception->getMessage()); + $content->assign('errorClass', get_class($exception)); + $content->assign('errorMsg', $exception->getMessage()); + $content->assign('errorCode', $exception->getCode()); + $content->assign('file', $exception->getFile()); + $content->assign('line', $exception->getLine()); + $content->assign('trace', $exception->getTraceAsString()); + $content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false)); + $content->assign('remoteAddr', $request->getRemoteAddress()); + $content->assign('requestID', $request->getId()); + return $content->fetchPage(); + } + + /* + * @codeCoverageIgnore + */ + public function sendResponse() { + $this->server->sapi->sendResponse($this->server->httpResponse); + } +} diff --git a/apps/dav/lib/server.php b/apps/dav/lib/server.php index e74292282a7..5336c82dfb8 100644 --- a/apps/dav/lib/server.php +++ b/apps/dav/lib/server.php @@ -30,6 +30,7 @@ use OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin; use OCA\DAV\Connector\Sabre\DavAclPlugin; use OCA\DAV\Connector\Sabre\DummyGetResponsePlugin; use OCA\DAV\Connector\Sabre\FilesPlugin; +use OCA\DAV\Files\BrowserErrorPagePlugin; use OCA\DAV\Files\CustomPropertiesBackend; use OCP\IRequest; use OCP\SabrePluginEvent; @@ -119,6 +120,10 @@ class Server { $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\FakeLockerPlugin()); } + if (BrowserErrorPagePlugin::isBrowserRequest($request)) { + $this->server->addPlugin(new BrowserErrorPagePlugin()); + } + // wait with registering these until auth is handled and the filesystem is setup $this->server->on('beforeMethod', function () { // custom properties plugin must be the last one diff --git a/apps/dav/templates/exception.php b/apps/dav/templates/exception.php new file mode 100644 index 00000000000..01c4eea4b5a --- /dev/null +++ b/apps/dav/templates/exception.php @@ -0,0 +1,30 @@ +<?php + /** @var array $_ */ + /** @var OC_L10N $l */ + +style('core', ['styles', 'header']); +?> +<span class="error error-wide"> + <h2><strong><?php p($_['title']) ?></strong></h2> + <p><?php p($_['message']) ?></p> + <br> + + <h2><strong><?php p($l->t('Technical details')) ?></strong></h2> + <ul> + <li><?php p($l->t('Remote Address: %s', $_['remoteAddr'])) ?></li> + <li><?php p($l->t('Request ID: %s', $_['requestID'])) ?></li> + <?php if($_['debugMode']): ?> + <li><?php p($l->t('Type: %s', $_['errorClass'])) ?></li> + <li><?php p($l->t('Code: %s', $_['errorCode'])) ?></li> + <li><?php p($l->t('Message: %s', $_['errorMsg'])) ?></li> + <li><?php p($l->t('File: %s', $_['file'])) ?></li> + <li><?php p($l->t('Line: %s', $_['line'])) ?></li> + <?php endif; ?> + </ul> + + <?php if($_['debugMode']): ?> + <br /> + <h2><strong><?php p($l->t('Trace')) ?></strong></h2> + <pre><?php p($_['trace']) ?></pre> + <?php endif; ?> +</span> diff --git a/apps/dav/tests/unit/dav/browsererrorpageplugintest.php b/apps/dav/tests/unit/dav/browsererrorpageplugintest.php new file mode 100644 index 00000000000..aeae0e1b152 --- /dev/null +++ b/apps/dav/tests/unit/dav/browsererrorpageplugintest.php @@ -0,0 +1,57 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ +namespace OCA\DAV\Tests\Unit\DAV; + +use OCA\DAV\Files\BrowserErrorPagePlugin; +use PHPUnit_Framework_MockObject_MockObject; +use Sabre\DAV\Exception\NotFound; + +class BrowserErrorPagePluginTest extends \Test\TestCase { + + /** + * @dataProvider providesExceptions + * @param $expectedCode + * @param $exception + */ + public function test($expectedCode, $exception) { + /** @var BrowserErrorPagePlugin | PHPUnit_Framework_MockObject_MockObject $plugin */ + $plugin = $this->getMockBuilder('OCA\DAV\Files\BrowserErrorPagePlugin')->setMethods(['sendResponse', 'generateBody'])->getMock(); + $plugin->expects($this->once())->method('generateBody')->willReturn(':boom:'); + $plugin->expects($this->once())->method('sendResponse'); + /** @var \Sabre\DAV\Server | PHPUnit_Framework_MockObject_MockObject $server */ + $server = $this->getMockBuilder('Sabre\DAV\Server')->disableOriginalConstructor()->getMock(); + $server->expects($this->once())->method('on'); + $httpResponse = $this->getMockBuilder('Sabre\HTTP\Response')->disableOriginalConstructor()->getMock(); + $httpResponse->expects($this->once())->method('addHeaders'); + $httpResponse->expects($this->once())->method('setStatus')->with($expectedCode); + $httpResponse->expects($this->once())->method('setBody')->with(':boom:'); + $server->httpResponse = $httpResponse; + $plugin->initialize($server); + $plugin->logException($exception); + } + + public function providesExceptions() { + return [ + [ 404, new NotFound()], + [ 500, new \RuntimeException()], + ]; + } +} diff --git a/apps/files_sharing/lib/capabilities.php b/apps/files_sharing/lib/capabilities.php index 913f248b174..5ec540ad4e0 100644 --- a/apps/files_sharing/lib/capabilities.php +++ b/apps/files_sharing/lib/capabilities.php @@ -74,6 +74,8 @@ class Capabilities implements ICapability { $res['user']['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_mail_notification', 'no') === 'yes'; $res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes'; + + $res['group_sharing'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes'; } //Federated sharing diff --git a/apps/files_sharing/tests/capabilities.php b/apps/files_sharing/tests/capabilities.php index 7572f5c84aa..0e17811be03 100644 --- a/apps/files_sharing/tests/capabilities.php +++ b/apps/files_sharing/tests/capabilities.php @@ -243,6 +243,24 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase { $this->assertFalse($result['public']['upload']); } + public function testNoGroupSharing() { + $map = [ + ['core', 'shareapi_enabled', 'yes', 'yes'], + ['core', 'shareapi_allow_group_sharing', 'yes', 'no'], + ]; + $result = $this->getResults($map); + $this->assertFalse($result['group_sharing']); + } + + public function testGroupSharing() { + $map = [ + ['core', 'shareapi_enabled', 'yes', 'yes'], + ['core', 'shareapi_allow_group_sharing', 'yes', 'yes'], + ]; + $result = $this->getResults($map); + $this->assertTrue($result['group_sharing']); + } + public function testFederatedSharingIncomming() { $map = [ ['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'yes'], diff --git a/build/integration/capabilities_features/capabilities.feature b/build/integration/capabilities_features/capabilities.feature index 3c1eb025ec7..500ea0297a6 100644 --- a/build/integration/capabilities_features/capabilities.feature +++ b/build/integration/capabilities_features/capabilities.feature @@ -16,6 +16,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -35,6 +36,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -73,6 +75,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -92,6 +95,7 @@ Feature: capabilities | files_sharing | resharing | EMPTY | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -111,6 +115,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | EMPTY | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -130,6 +135,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | EMPTY | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -150,6 +156,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -170,6 +177,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -190,6 +198,7 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | @@ -212,6 +221,27 @@ Feature: capabilities | files_sharing | resharing | 1 | | files_sharing | federation@@@outgoing | 1 | | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | 1 | + | files | bigfilechunking | 1 | + | files | undelete | 1 | + | files | versioning | 1 | + + Scenario: Changing group sharing allowed + Given As an "admin" + And parameter "shareapi_allow_group_sharing" of app "core" is set to "no" + When sending "GET" to "/cloud/capabilities" + Then the HTTP status code should be "200" + And fields of capabilities match with + | capability | path_to_element | value | + | core | pollinterval | 60 | + | core | webdav-root | remote.php/webdav | + | files_sharing | api_enabled | 1 | + | files_sharing | public@@@enabled | 1 | + | files_sharing | public@@@upload | 1 | + | files_sharing | resharing | 1 | + | files_sharing | federation@@@outgoing | 1 | + | files_sharing | federation@@@incoming | 1 | + | files_sharing | group_sharing | EMPTY | | files | bigfilechunking | 1 | | files | undelete | 1 | | files | versioning | 1 | diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php index 91a4265504c..57db3555790 100644 --- a/build/integration/features/bootstrap/CapabilitiesContext.php +++ b/build/integration/features/bootstrap/CapabilitiesContext.php @@ -51,5 +51,6 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext { $this->modifyServerConfig('core', 'shareapi_allow_public_notification', 'no'); $this->modifyServerConfig('core', 'shareapi_default_expire_date', 'no'); $this->modifyServerConfig('core', 'shareapi_enforce_expire_date', 'no'); + $this->modifyServerConfig('core', 'shareapi_allow_group_sharing', 'yes'); } } diff --git a/core/l10n/ast.js b/core/l10n/ast.js index 9d51f8bb639..606444d1542 100644 --- a/core/l10n/ast.js +++ b/core/l10n/ast.js @@ -118,7 +118,6 @@ OC.L10N.register( "change" : "camudar", "delete" : "desaniciar", "access control" : "control d'accesu", - "An error occured. Please try again" : "Hebo un fallu. Por favor, inténtalo dempués. ", "Share" : "Compartir", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir con xente d'otros ownClouds usando la sintaxis usuariu@exemplu.com/owncloud", "Warning" : "Avisu", diff --git a/core/l10n/ast.json b/core/l10n/ast.json index df5ccdb1ae3..8c7fff23b13 100644 --- a/core/l10n/ast.json +++ b/core/l10n/ast.json @@ -116,7 +116,6 @@ "change" : "camudar", "delete" : "desaniciar", "access control" : "control d'accesu", - "An error occured. Please try again" : "Hebo un fallu. Por favor, inténtalo dempués. ", "Share" : "Compartir", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir con xente d'otros ownClouds usando la sintaxis usuariu@exemplu.com/owncloud", "Warning" : "Avisu", diff --git a/core/l10n/ca.js b/core/l10n/ca.js index 1ea6bcce1b3..59072473df9 100644 --- a/core/l10n/ca.js +++ b/core/l10n/ca.js @@ -141,7 +141,6 @@ OC.L10N.register( "change" : "canvi", "delete" : "elimina", "access control" : "control d'accés", - "An error occured. Please try again" : "Va ocórrer un error. Per favor, intenta-ho de nou", "Share" : "Comparteix", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir amb la gent en altres ownClouds utilitzant la sintaxi username@example.com/owncloud", "Warning" : "Avís", @@ -226,7 +225,6 @@ OC.L10N.register( "Search" : "Cerca", "Server side authentication failed!" : "L'autenticació del servidor ha fallat!", "Please contact your administrator." : "Contacteu amb l'administrador.", - "An internal error occured." : "S'ha produït un error intern.", "Please try again or contact your administrator." : "Intenti-ho de nou o posi's en contacte amb el seu administrador.", "Log in" : "Inici de sessió", "Wrong password. Reset it?" : "Contrasenya incorrecta. Voleu restablir-la?", diff --git a/core/l10n/ca.json b/core/l10n/ca.json index 8101cc326c4..12928bc5478 100644 --- a/core/l10n/ca.json +++ b/core/l10n/ca.json @@ -139,7 +139,6 @@ "change" : "canvi", "delete" : "elimina", "access control" : "control d'accés", - "An error occured. Please try again" : "Va ocórrer un error. Per favor, intenta-ho de nou", "Share" : "Comparteix", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir amb la gent en altres ownClouds utilitzant la sintaxi username@example.com/owncloud", "Warning" : "Avís", @@ -224,7 +223,6 @@ "Search" : "Cerca", "Server side authentication failed!" : "L'autenticació del servidor ha fallat!", "Please contact your administrator." : "Contacteu amb l'administrador.", - "An internal error occured." : "S'ha produït un error intern.", "Please try again or contact your administrator." : "Intenti-ho de nou o posi's en contacte amb el seu administrador.", "Log in" : "Inici de sessió", "Wrong password. Reset it?" : "Contrasenya incorrecta. Voleu restablir-la?", diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js index 51affff4034..6afbfea6455 100644 --- a/core/l10n/cs_CZ.js +++ b/core/l10n/cs_CZ.js @@ -169,7 +169,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Detaily sdílení pro tuto položku nelze načíst.", "No users or groups found for {search}" : "Nebyli nalezeni žádní členové ani skupiny pro {search}", "No users found for {search}" : "Nebyli nalezeni žádní uživatelé pro {search}", - "An error occured. Please try again" : "Nastala chyba. Prosím zkuste to znovu", "{sharee} (group)" : "{sharee} (skupina)", "{sharee} (at {server})" : "{sharee} (v {server})", "{sharee} (remote)" : "{sharee} (vzdálený)", @@ -275,7 +274,6 @@ OC.L10N.register( "Search" : "Hledat", "Server side authentication failed!" : "Autentizace na serveru selhala!", "Please contact your administrator." : "Kontaktujte prosím svého správce systému.", - "An internal error occured." : "Nastala vnitřní chyba.", "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.", "Log in" : "Přihlásit", "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?", diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json index 6c5312672e5..8229ecb0d30 100644 --- a/core/l10n/cs_CZ.json +++ b/core/l10n/cs_CZ.json @@ -167,7 +167,6 @@ "Share details could not be loaded for this item." : "Detaily sdílení pro tuto položku nelze načíst.", "No users or groups found for {search}" : "Nebyli nalezeni žádní členové ani skupiny pro {search}", "No users found for {search}" : "Nebyli nalezeni žádní uživatelé pro {search}", - "An error occured. Please try again" : "Nastala chyba. Prosím zkuste to znovu", "{sharee} (group)" : "{sharee} (skupina)", "{sharee} (at {server})" : "{sharee} (v {server})", "{sharee} (remote)" : "{sharee} (vzdálený)", @@ -273,7 +272,6 @@ "Search" : "Hledat", "Server side authentication failed!" : "Autentizace na serveru selhala!", "Please contact your administrator." : "Kontaktujte prosím svého správce systému.", - "An internal error occured." : "Nastala vnitřní chyba.", "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.", "Log in" : "Přihlásit", "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?", diff --git a/core/l10n/da.js b/core/l10n/da.js index b0d3c76286c..a8e24a33672 100644 --- a/core/l10n/da.js +++ b/core/l10n/da.js @@ -157,7 +157,6 @@ OC.L10N.register( "delete" : "slet", "access control" : "Adgangskontrol", "Share details could not be loaded for this item." : "Detaljer for deling kunne ikke indlæses for dette element.", - "An error occured. Please try again" : "Der skete en fejl. Prøv venligst igen", "Share" : "Del", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud", "Error removing share" : "Fejl ved fjernelse af deling", @@ -250,7 +249,6 @@ OC.L10N.register( "Search" : "Søg", "Server side authentication failed!" : "Server side godkendelse mislykkedes!", "Please contact your administrator." : "Kontakt venligst din administrator", - "An internal error occured." : "Der skete en intern fejl.", "Please try again or contact your administrator." : "Kontakt venligst din administrator.", "Log in" : "Log ind", "Wrong password. Reset it?" : "Forkert kodeord. Skal det nulstilles?", diff --git a/core/l10n/da.json b/core/l10n/da.json index deee7188d3b..89ca987e7bc 100644 --- a/core/l10n/da.json +++ b/core/l10n/da.json @@ -155,7 +155,6 @@ "delete" : "slet", "access control" : "Adgangskontrol", "Share details could not be loaded for this item." : "Detaljer for deling kunne ikke indlæses for dette element.", - "An error occured. Please try again" : "Der skete en fejl. Prøv venligst igen", "Share" : "Del", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud", "Error removing share" : "Fejl ved fjernelse af deling", @@ -248,7 +247,6 @@ "Search" : "Søg", "Server side authentication failed!" : "Server side godkendelse mislykkedes!", "Please contact your administrator." : "Kontakt venligst din administrator", - "An internal error occured." : "Der skete en intern fejl.", "Please try again or contact your administrator." : "Kontakt venligst din administrator.", "Log in" : "Log ind", "Wrong password. Reset it?" : "Forkert kodeord. Skal det nulstilles?", diff --git a/core/l10n/de.js b/core/l10n/de.js index 15c2db38b81..ebc4ed05c96 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -169,7 +169,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Details der geteilten Freigabe konnten nicht geladen werden zu diesem Eintrag.", "No users or groups found for {search}" : "Kein Benutzer oder Gruppen gefunden für {search}", "No users found for {search}" : "Kein Benutzer gefunden für {search}", - "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (at {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -275,7 +274,6 @@ OC.L10N.register( "Search" : "Suche", "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!", "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.", - "An internal error occured." : "Es ist ein interner Fehler aufgetreten.", "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.", "Log in" : "Anmelden", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", diff --git a/core/l10n/de.json b/core/l10n/de.json index 8c6ace191b6..22247c29a28 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -167,7 +167,6 @@ "Share details could not be loaded for this item." : "Details der geteilten Freigabe konnten nicht geladen werden zu diesem Eintrag.", "No users or groups found for {search}" : "Kein Benutzer oder Gruppen gefunden für {search}", "No users found for {search}" : "Kein Benutzer gefunden für {search}", - "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (at {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -273,7 +272,6 @@ "Search" : "Suche", "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!", "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.", - "An internal error occured." : "Es ist ein interner Fehler aufgetreten.", "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.", "Log in" : "Anmelden", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index 8bdb086714a..5e6e4851b52 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -169,7 +169,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Die Freigabedetails konnten für dieses Element nicht geladen werden.", "No users or groups found for {search}" : "Keine Benutzer oder Gruppen für {search} gefunden", "No users found for {search}" : "Keine Benutzer für {search} gefunden", - "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal", "{sharee} (group)" : "{sharee} (Gruppe)", "{sharee} (at {server})" : "{sharee} (über {server})", "{sharee} (remote)" : "{sharee} (entfernt)", @@ -275,7 +274,6 @@ OC.L10N.register( "Search" : "Suche", "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!", "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.", - "An internal error occured." : "Es ist ein interner Fehler aufgetreten.", "Please try again or contact your administrator." : "Bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator.", "Log in" : "Einloggen", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index afe31bceff7..b60ec64b8ea 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -167,7 +167,6 @@ "Share details could not be loaded for this item." : "Die Freigabedetails konnten für dieses Element nicht geladen werden.", "No users or groups found for {search}" : "Keine Benutzer oder Gruppen für {search} gefunden", "No users found for {search}" : "Keine Benutzer für {search} gefunden", - "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal", "{sharee} (group)" : "{sharee} (Gruppe)", "{sharee} (at {server})" : "{sharee} (über {server})", "{sharee} (remote)" : "{sharee} (entfernt)", @@ -273,7 +272,6 @@ "Search" : "Suche", "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!", "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.", - "An internal error occured." : "Es ist ein interner Fehler aufgetreten.", "Please try again or contact your administrator." : "Bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator.", "Log in" : "Einloggen", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", diff --git a/core/l10n/el.js b/core/l10n/el.js index 819d97aaa2b..8557dec2916 100644 --- a/core/l10n/el.js +++ b/core/l10n/el.js @@ -152,7 +152,6 @@ OC.L10N.register( "delete" : "διαγραφή", "access control" : "έλεγχος πρόσβασης", "Share details could not be loaded for this item." : "Αδυναμία φόρτωσης λεπτομερειών διαμοιρασμού για αυτό το αντικείμενο.", - "An error occured. Please try again" : "Ένα σφάλμα προέκυψε. Παρακαλώ προσπαθήστε ξανά", "Share" : "Διαμοιρασμός", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud", "Warning" : "Προειδοποίηση", @@ -242,7 +241,6 @@ OC.L10N.register( "Search" : "Αναζήτηση", "Server side authentication failed!" : "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!", "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.", - "An internal error occured." : "Παρουσιάστηκε εσωτερικό σφάλμα.", "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.", "Log in" : "Είσοδος", "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;", diff --git a/core/l10n/el.json b/core/l10n/el.json index 533ac71cffa..4c42e5fec94 100644 --- a/core/l10n/el.json +++ b/core/l10n/el.json @@ -150,7 +150,6 @@ "delete" : "διαγραφή", "access control" : "έλεγχος πρόσβασης", "Share details could not be loaded for this item." : "Αδυναμία φόρτωσης λεπτομερειών διαμοιρασμού για αυτό το αντικείμενο.", - "An error occured. Please try again" : "Ένα σφάλμα προέκυψε. Παρακαλώ προσπαθήστε ξανά", "Share" : "Διαμοιρασμός", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud", "Warning" : "Προειδοποίηση", @@ -240,7 +239,6 @@ "Search" : "Αναζήτηση", "Server side authentication failed!" : "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!", "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.", - "An internal error occured." : "Παρουσιάστηκε εσωτερικό σφάλμα.", "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.", "Log in" : "Είσοδος", "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;", diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js index 685bca68822..c067795d840 100644 --- a/core/l10n/en_GB.js +++ b/core/l10n/en_GB.js @@ -160,7 +160,6 @@ OC.L10N.register( "Could not unshare" : "Could not unshare", "Share details could not be loaded for this item." : "Share details could not be loaded for this item.", "No users or groups found for {search}" : "No users or groups found for {search}", - "An error occured. Please try again" : "An error occured. Please try again", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (at {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -261,7 +260,6 @@ OC.L10N.register( "Search" : "Search", "Server side authentication failed!" : "Server side authentication failed!", "Please contact your administrator." : "Please contact your administrator.", - "An internal error occured." : "An internal error occured.", "Please try again or contact your administrator." : "Please try again or contact your administrator.", "Log in" : "Log in", "Wrong password. Reset it?" : "Wrong password. Reset it?", diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json index 58bde73515f..c964a1cb15d 100644 --- a/core/l10n/en_GB.json +++ b/core/l10n/en_GB.json @@ -158,7 +158,6 @@ "Could not unshare" : "Could not unshare", "Share details could not be loaded for this item." : "Share details could not be loaded for this item.", "No users or groups found for {search}" : "No users or groups found for {search}", - "An error occured. Please try again" : "An error occured. Please try again", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (at {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -259,7 +258,6 @@ "Search" : "Search", "Server side authentication failed!" : "Server side authentication failed!", "Please contact your administrator." : "Please contact your administrator.", - "An internal error occured." : "An internal error occured.", "Please try again or contact your administrator." : "Please try again or contact your administrator.", "Log in" : "Log in", "Wrong password. Reset it?" : "Wrong password. Reset it?", diff --git a/core/l10n/eo.js b/core/l10n/eo.js index 0f3901993c4..35daba35a41 100644 --- a/core/l10n/eo.js +++ b/core/l10n/eo.js @@ -118,7 +118,6 @@ OC.L10N.register( "Could not unshare" : "Ne malkunhaveblas", "Share details could not be loaded for this item." : "Kunhavaj detaloj ne ŝargeblis por ĉi tiu ero.", "No users or groups found for {search}" : "Neniu uzanto aŭ grupo troviĝis por {search}", - "An error occured. Please try again" : "Eraro okazis, Bonvolu provi ree.", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (ĉe {server})", "{sharee} (remote)" : "{sharee} (fora)", @@ -196,7 +195,6 @@ OC.L10N.register( "Log out" : "Elsaluti", "Search" : "Serĉi", "Please contact your administrator." : "Bonvolu kontakti vian administranton.", - "An internal error occured." : "Ena eraro okazis.", "Please try again or contact your administrator." : "Bonvolu provi ree aŭ kontakti vian administranton.", "Log in" : "Ensaluti", "Wrong password." : "Malĝusta pasvorto.", diff --git a/core/l10n/eo.json b/core/l10n/eo.json index 6c29a78da12..a1c7bd51dba 100644 --- a/core/l10n/eo.json +++ b/core/l10n/eo.json @@ -116,7 +116,6 @@ "Could not unshare" : "Ne malkunhaveblas", "Share details could not be loaded for this item." : "Kunhavaj detaloj ne ŝargeblis por ĉi tiu ero.", "No users or groups found for {search}" : "Neniu uzanto aŭ grupo troviĝis por {search}", - "An error occured. Please try again" : "Eraro okazis, Bonvolu provi ree.", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (ĉe {server})", "{sharee} (remote)" : "{sharee} (fora)", @@ -194,7 +193,6 @@ "Log out" : "Elsaluti", "Search" : "Serĉi", "Please contact your administrator." : "Bonvolu kontakti vian administranton.", - "An internal error occured." : "Ena eraro okazis.", "Please try again or contact your administrator." : "Bonvolu provi ree aŭ kontakti vian administranton.", "Log in" : "Ensaluti", "Wrong password." : "Malĝusta pasvorto.", diff --git a/core/l10n/es.js b/core/l10n/es.js index d13da491e2b..f5fc456dd91 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -160,12 +160,16 @@ OC.L10N.register( "Could not unshare" : "No se puede quitar el comparto", "Share details could not be loaded for this item." : "No se han podido cargar los detalles de compartición para este elemento.", "No users or groups found for {search}" : "No se han encontrado usuarios ni grupos para {search}", - "An error occured. Please try again" : "Un error ocurrió. Por favor reinténtelo nuevamente.", + "No users found for {search}" : "No se han encontrado usuarios para {search}", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (en {server})", "{sharee} (remote)" : "{sharee} (remoto)", "Share" : "Compartir", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud", + "Share with users…" : "Compartir con usuarios...", + "Share with users, groups or remote users…" : "Compartir con usuarios, grupos o usuarios remotos...", + "Share with users or groups…" : "Compartir con usuarios o grupos...", + "Share with users or remote users…" : "Compartir con usuarios o usuarios remotos...", "Error removing share" : "Error quitando el comparto", "Warning" : "Precaución", "Error while sending notification" : "Error mientras se enviaba la notificación", @@ -261,7 +265,6 @@ OC.L10N.register( "Search" : "Buscar", "Server side authentication failed!" : "La autenticación a fallado en el servidor.", "Please contact your administrator." : "Por favor, contacte con el administrador.", - "An internal error occured." : "Un error interno ocurrió.", "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.", "Log in" : "Ingresar", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?", diff --git a/core/l10n/es.json b/core/l10n/es.json index e3ec5a883ef..5cb3c5e5f4b 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -158,12 +158,16 @@ "Could not unshare" : "No se puede quitar el comparto", "Share details could not be loaded for this item." : "No se han podido cargar los detalles de compartición para este elemento.", "No users or groups found for {search}" : "No se han encontrado usuarios ni grupos para {search}", - "An error occured. Please try again" : "Un error ocurrió. Por favor reinténtelo nuevamente.", + "No users found for {search}" : "No se han encontrado usuarios para {search}", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (en {server})", "{sharee} (remote)" : "{sharee} (remoto)", "Share" : "Compartir", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud", + "Share with users…" : "Compartir con usuarios...", + "Share with users, groups or remote users…" : "Compartir con usuarios, grupos o usuarios remotos...", + "Share with users or groups…" : "Compartir con usuarios o grupos...", + "Share with users or remote users…" : "Compartir con usuarios o usuarios remotos...", "Error removing share" : "Error quitando el comparto", "Warning" : "Precaución", "Error while sending notification" : "Error mientras se enviaba la notificación", @@ -259,7 +263,6 @@ "Search" : "Buscar", "Server side authentication failed!" : "La autenticación a fallado en el servidor.", "Please contact your administrator." : "Por favor, contacte con el administrador.", - "An internal error occured." : "Un error interno ocurrió.", "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.", "Log in" : "Ingresar", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?", diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js index 36028879841..20756248c32 100644 --- a/core/l10n/et_EE.js +++ b/core/l10n/et_EE.js @@ -140,7 +140,6 @@ OC.L10N.register( "delete" : "kustuta", "access control" : "ligipääsukontroll", "Could not unshare" : "Jagamise lõpetamine ebaõnnestus", - "An error occured. Please try again" : "Tekkis tõrge. Palun proovi uuesti", "Share" : "Jaga", "Warning" : "Hoiatus", "Error while sending notification" : "Tõrge teavituse saatmisel", @@ -225,7 +224,6 @@ OC.L10N.register( "Search" : "Otsi", "Server side authentication failed!" : "Serveripoolne autentimine ebaõnnestus!", "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.", - "An internal error occured." : "Tekkis sisemine tõrge.", "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.", "Log in" : "Logi sisse", "Wrong password. Reset it?" : "Vale parool. Kas vajad parooli taastamist?", diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json index b5060fb4a33..774bbe9e3cf 100644 --- a/core/l10n/et_EE.json +++ b/core/l10n/et_EE.json @@ -138,7 +138,6 @@ "delete" : "kustuta", "access control" : "ligipääsukontroll", "Could not unshare" : "Jagamise lõpetamine ebaõnnestus", - "An error occured. Please try again" : "Tekkis tõrge. Palun proovi uuesti", "Share" : "Jaga", "Warning" : "Hoiatus", "Error while sending notification" : "Tõrge teavituse saatmisel", @@ -223,7 +222,6 @@ "Search" : "Otsi", "Server side authentication failed!" : "Serveripoolne autentimine ebaõnnestus!", "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.", - "An internal error occured." : "Tekkis sisemine tõrge.", "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.", "Log in" : "Logi sisse", "Wrong password. Reset it?" : "Vale parool. Kas vajad parooli taastamist?", diff --git a/core/l10n/fa.js b/core/l10n/fa.js index feea09c8ce1..9eed188ab39 100644 --- a/core/l10n/fa.js +++ b/core/l10n/fa.js @@ -129,7 +129,6 @@ OC.L10N.register( "change" : "تغییر", "delete" : "پاک کردن", "access control" : "کنترل دسترسی", - "An error occured. Please try again" : "یک خطا رخ داده است، لطفا مجددا تلاش کنید", "Share" : "اشتراکگذاری", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "اشتراکگذاری با دیگر افراد بر روی ownClouds بصورت username@example.com/owncloud", "Warning" : "اخطار", @@ -205,7 +204,6 @@ OC.L10N.register( "Log out" : "خروج", "Search" : "جستوجو", "Please contact your administrator." : "لطفا با مدیر وبسایت تماس بگیرید.", - "An internal error occured." : "یک خطای داخلی رخ دادهاست.", "Please try again or contact your administrator." : "لطفا مجددا تلاش کنید یا با مدیر سیستم تماس بگیرید.", "Log in" : "ورود", "Alternative Logins" : "ورود متناوب", diff --git a/core/l10n/fa.json b/core/l10n/fa.json index e294bd86a96..07d5411a296 100644 --- a/core/l10n/fa.json +++ b/core/l10n/fa.json @@ -127,7 +127,6 @@ "change" : "تغییر", "delete" : "پاک کردن", "access control" : "کنترل دسترسی", - "An error occured. Please try again" : "یک خطا رخ داده است، لطفا مجددا تلاش کنید", "Share" : "اشتراکگذاری", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "اشتراکگذاری با دیگر افراد بر روی ownClouds بصورت username@example.com/owncloud", "Warning" : "اخطار", @@ -203,7 +202,6 @@ "Log out" : "خروج", "Search" : "جستوجو", "Please contact your administrator." : "لطفا با مدیر وبسایت تماس بگیرید.", - "An internal error occured." : "یک خطای داخلی رخ دادهاست.", "Please try again or contact your administrator." : "لطفا مجددا تلاش کنید یا با مدیر سیستم تماس بگیرید.", "Log in" : "ورود", "Alternative Logins" : "ورود متناوب", diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js index 727a64ed871..7a0a2278feb 100644 --- a/core/l10n/fi_FI.js +++ b/core/l10n/fi_FI.js @@ -161,7 +161,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Tämän kohteen jakamistietoja ei voitu ladata.", "No users or groups found for {search}" : "Haulla {search} ei löytynyt käyttäjiä tai ryhmiä", "No users found for {search}" : "Haulla {search} ei löytynyt käyttäjiä", - "An error occured. Please try again" : "Tapahtui virhe. Yritä myöhemmin uudestaan", "{sharee} (group)" : "{sharee} (ryhmä)", "{sharee} (at {server})" : "{sharee} (palvelimella {server})", "{sharee} (remote)" : "{sharee} (etä)", @@ -266,7 +265,6 @@ OC.L10N.register( "Search" : "Etsi", "Server side authentication failed!" : "Palvelimen puoleinen tunnistautuminen epäonnistui!", "Please contact your administrator." : "Ota yhteys ylläpitäjään.", - "An internal error occured." : "Tapahtui sisäinen virhe.", "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.", "Log in" : "Kirjaudu sisään", "Wrong password. Reset it?" : "Väärä salasana. Haluatko palauttaa salasanan?", diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json index afac7060118..42291d69e59 100644 --- a/core/l10n/fi_FI.json +++ b/core/l10n/fi_FI.json @@ -159,7 +159,6 @@ "Share details could not be loaded for this item." : "Tämän kohteen jakamistietoja ei voitu ladata.", "No users or groups found for {search}" : "Haulla {search} ei löytynyt käyttäjiä tai ryhmiä", "No users found for {search}" : "Haulla {search} ei löytynyt käyttäjiä", - "An error occured. Please try again" : "Tapahtui virhe. Yritä myöhemmin uudestaan", "{sharee} (group)" : "{sharee} (ryhmä)", "{sharee} (at {server})" : "{sharee} (palvelimella {server})", "{sharee} (remote)" : "{sharee} (etä)", @@ -264,7 +263,6 @@ "Search" : "Etsi", "Server side authentication failed!" : "Palvelimen puoleinen tunnistautuminen epäonnistui!", "Please contact your administrator." : "Ota yhteys ylläpitäjään.", - "An internal error occured." : "Tapahtui sisäinen virhe.", "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.", "Log in" : "Kirjaudu sisään", "Wrong password. Reset it?" : "Väärä salasana. Haluatko palauttaa salasanan?", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 5eec2c1329e..6bd18785802 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -169,7 +169,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Les informations de partage n'ont pu être chargées pour cet élément.", "No users or groups found for {search}" : "Pas d'utilisateur ou de groupe trouvé pour {search}", "No users found for {search}" : "Aucun utilisateur trouvé pour {search}", - "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer", "{sharee} (group)" : "{sharee} (groupe)", "{sharee} (at {server})" : "{sharee} (sur {server})", "{sharee} (remote)" : "{sharee} (distant)", @@ -275,7 +274,6 @@ OC.L10N.register( "Search" : "Rechercher", "Server side authentication failed!" : "L'authentification sur le serveur a échoué !", "Please contact your administrator." : "Veuillez contacter votre administrateur.", - "An internal error occured." : "Une erreur interne est survenue.", "Please try again or contact your administrator." : "Veuillez réessayer ou contacter votre administrateur.", "Log in" : "Se connecter", "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 9e1cc88a906..4fbc2a2fd5f 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -167,7 +167,6 @@ "Share details could not be loaded for this item." : "Les informations de partage n'ont pu être chargées pour cet élément.", "No users or groups found for {search}" : "Pas d'utilisateur ou de groupe trouvé pour {search}", "No users found for {search}" : "Aucun utilisateur trouvé pour {search}", - "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer", "{sharee} (group)" : "{sharee} (groupe)", "{sharee} (at {server})" : "{sharee} (sur {server})", "{sharee} (remote)" : "{sharee} (distant)", @@ -273,7 +272,6 @@ "Search" : "Rechercher", "Server side authentication failed!" : "L'authentification sur le serveur a échoué !", "Please contact your administrator." : "Veuillez contacter votre administrateur.", - "An internal error occured." : "Une erreur interne est survenue.", "Please try again or contact your administrator." : "Veuillez réessayer ou contacter votre administrateur.", "Log in" : "Se connecter", "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?", diff --git a/core/l10n/gl.js b/core/l10n/gl.js index dc718fd6814..a439984a473 100644 --- a/core/l10n/gl.js +++ b/core/l10n/gl.js @@ -140,7 +140,6 @@ OC.L10N.register( "change" : "cambio", "delete" : "eliminar", "access control" : "control de acceso", - "An error occured. Please try again" : "Produciuse un erro, ténteo de novo", "Share" : "Compartir", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con outra xente ou con outros ownClouds empregando a sintaxe «nomeusuario@exemplo.com/ouwncloud»", "Warning" : "Aviso", @@ -225,7 +224,6 @@ OC.L10N.register( "Search" : "Buscar", "Server side authentication failed!" : "A autenticación fracasou do lado do servidor!", "Please contact your administrator." : "Contacte co administrador.", - "An internal error occured." : "Produciuse un erro interno.", "Please try again or contact your administrator." : "Ténteo de novo ou póñase en contacto co administrador.", "Log in" : "Acceder", "Alternative Logins" : "Accesos alternativos", diff --git a/core/l10n/gl.json b/core/l10n/gl.json index 9ef26278e30..90e466aaa02 100644 --- a/core/l10n/gl.json +++ b/core/l10n/gl.json @@ -138,7 +138,6 @@ "change" : "cambio", "delete" : "eliminar", "access control" : "control de acceso", - "An error occured. Please try again" : "Produciuse un erro, ténteo de novo", "Share" : "Compartir", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con outra xente ou con outros ownClouds empregando a sintaxe «nomeusuario@exemplo.com/ouwncloud»", "Warning" : "Aviso", @@ -223,7 +222,6 @@ "Search" : "Buscar", "Server side authentication failed!" : "A autenticación fracasou do lado do servidor!", "Please contact your administrator." : "Contacte co administrador.", - "An internal error occured." : "Produciuse un erro interno.", "Please try again or contact your administrator." : "Ténteo de novo ou póñase en contacto co administrador.", "Log in" : "Acceder", "Alternative Logins" : "Accesos alternativos", diff --git a/core/l10n/he.js b/core/l10n/he.js index 95e330cd42d..c20d3778ca1 100644 --- a/core/l10n/he.js +++ b/core/l10n/he.js @@ -161,7 +161,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "לא ניתן היה לטעון מידע שיתוף לפריט זה", "No users or groups found for {search}" : "לא אותרו משתמשים או קבוצות עבור {search}", "No users found for {search}" : "לא אותרו משתמשים עבור {search}", - "An error occured. Please try again" : "אירעה שגיאה. יש לנסות בבקשה שוב", "{sharee} (group)" : "{sharee} (קבוצה)", "{sharee} (at {server})" : "{sharee} (ב- {server})", "{sharee} (remote)" : "{sharee} (מרוחק)", @@ -267,7 +266,6 @@ OC.L10N.register( "Search" : "חיפוש", "Server side authentication failed!" : "אימות לצד שרת נכשל!", "Please contact your administrator." : "יש ליצור קשר עם המנהל.", - "An internal error occured." : "שגיאה פנימית אירעה.", "Please try again or contact your administrator." : "יש לנסות שוב ליצור קשר עם המנהל שלך.", "Log in" : "כניסה", "Wrong password. Reset it?" : "סיסמא שגוייה. האם לאפס אותה?", diff --git a/core/l10n/he.json b/core/l10n/he.json index 3c09caf1293..1561a8bfd2b 100644 --- a/core/l10n/he.json +++ b/core/l10n/he.json @@ -159,7 +159,6 @@ "Share details could not be loaded for this item." : "לא ניתן היה לטעון מידע שיתוף לפריט זה", "No users or groups found for {search}" : "לא אותרו משתמשים או קבוצות עבור {search}", "No users found for {search}" : "לא אותרו משתמשים עבור {search}", - "An error occured. Please try again" : "אירעה שגיאה. יש לנסות בבקשה שוב", "{sharee} (group)" : "{sharee} (קבוצה)", "{sharee} (at {server})" : "{sharee} (ב- {server})", "{sharee} (remote)" : "{sharee} (מרוחק)", @@ -265,7 +264,6 @@ "Search" : "חיפוש", "Server side authentication failed!" : "אימות לצד שרת נכשל!", "Please contact your administrator." : "יש ליצור קשר עם המנהל.", - "An internal error occured." : "שגיאה פנימית אירעה.", "Please try again or contact your administrator." : "יש לנסות שוב ליצור קשר עם המנהל שלך.", "Log in" : "כניסה", "Wrong password. Reset it?" : "סיסמא שגוייה. האם לאפס אותה?", diff --git a/core/l10n/hr.js b/core/l10n/hr.js index 28f2aab5ec5..bef16426a62 100644 --- a/core/l10n/hr.js +++ b/core/l10n/hr.js @@ -120,7 +120,6 @@ OC.L10N.register( "change" : "promijeni", "delete" : "Izbrišite", "access control" : "Kontrola pristupa", - "An error occured. Please try again" : "Dogodila se pogreška. Molimo Vas, pokušajte ponovno. ", "Share" : "Podijelite", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Podijelite sa korisnicima drugoga ownClouda koristeći format korisnickoime@primjer.com/owncloud", "Warning" : "Upozorenje", diff --git a/core/l10n/hr.json b/core/l10n/hr.json index ee3111aa419..cfc01ba05c3 100644 --- a/core/l10n/hr.json +++ b/core/l10n/hr.json @@ -118,7 +118,6 @@ "change" : "promijeni", "delete" : "Izbrišite", "access control" : "Kontrola pristupa", - "An error occured. Please try again" : "Dogodila se pogreška. Molimo Vas, pokušajte ponovno. ", "Share" : "Podijelite", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Podijelite sa korisnicima drugoga ownClouda koristeći format korisnickoime@primjer.com/owncloud", "Warning" : "Upozorenje", diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js index 91c069baf66..7970f7329a0 100644 --- a/core/l10n/hu_HU.js +++ b/core/l10n/hu_HU.js @@ -159,7 +159,6 @@ OC.L10N.register( "Could not unshare" : "Nem sikerült visszavonni a megosztást", "Share details could not be loaded for this item." : "A megosztás részletei nem lehet betölteni ehhez az elemhez.", "No users or groups found for {search}" : "{search} keresésre nem található felhasználó vagy csoport", - "An error occured. Please try again" : "Hiba történt. Kérjük, próbáld újra!", "{sharee} (group)" : "{sharee} (csoport)", "{sharee} (at {server})" : "{sharee} ({server} szerveren)", "{sharee} (remote)" : "{sharee} (távoli)", @@ -259,7 +258,6 @@ OC.L10N.register( "Search" : "Keresés", "Server side authentication failed!" : "A szerveroldali hitelesítés sikertelen!", "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.", - "An internal error occured." : "Belső hiba történt.", "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.", "Log in" : "Bejelentkezés", "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?", diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json index d58601c54dd..de7fbc677a2 100644 --- a/core/l10n/hu_HU.json +++ b/core/l10n/hu_HU.json @@ -157,7 +157,6 @@ "Could not unshare" : "Nem sikerült visszavonni a megosztást", "Share details could not be loaded for this item." : "A megosztás részletei nem lehet betölteni ehhez az elemhez.", "No users or groups found for {search}" : "{search} keresésre nem található felhasználó vagy csoport", - "An error occured. Please try again" : "Hiba történt. Kérjük, próbáld újra!", "{sharee} (group)" : "{sharee} (csoport)", "{sharee} (at {server})" : "{sharee} ({server} szerveren)", "{sharee} (remote)" : "{sharee} (távoli)", @@ -257,7 +256,6 @@ "Search" : "Keresés", "Server side authentication failed!" : "A szerveroldali hitelesítés sikertelen!", "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.", - "An internal error occured." : "Belső hiba történt.", "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.", "Log in" : "Bejelentkezés", "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?", diff --git a/core/l10n/id.js b/core/l10n/id.js index e9262f22c2a..67ac5ed90b7 100644 --- a/core/l10n/id.js +++ b/core/l10n/id.js @@ -151,7 +151,6 @@ OC.L10N.register( "delete" : "hapus", "access control" : "kontrol akses", "Share details could not be loaded for this item." : "Rincian berbagi tidak dapat dimuat untuk item ini.", - "An error occured. Please try again" : "Terjadi masalah. Mohon coba kembali", "Share" : "Bagikan", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud", "Warning" : "Peringatan", @@ -241,7 +240,6 @@ OC.L10N.register( "Search" : "Cari", "Server side authentication failed!" : "Otentikasi dari sisi server gagal!", "Please contact your administrator." : "Silahkan hubungi administrator anda.", - "An internal error occured." : "Terjadi kesalahan internal.", "Please try again or contact your administrator." : "Mohon coba lagi atau hubungi administrator Anda.", "Log in" : "Masuk", "Wrong password. Reset it?" : "Sandi salah. Atur ulang?", diff --git a/core/l10n/id.json b/core/l10n/id.json index 3e6be0a632e..9742ea1e0b1 100644 --- a/core/l10n/id.json +++ b/core/l10n/id.json @@ -149,7 +149,6 @@ "delete" : "hapus", "access control" : "kontrol akses", "Share details could not be loaded for this item." : "Rincian berbagi tidak dapat dimuat untuk item ini.", - "An error occured. Please try again" : "Terjadi masalah. Mohon coba kembali", "Share" : "Bagikan", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud", "Warning" : "Peringatan", @@ -239,7 +238,6 @@ "Search" : "Cari", "Server side authentication failed!" : "Otentikasi dari sisi server gagal!", "Please contact your administrator." : "Silahkan hubungi administrator anda.", - "An internal error occured." : "Terjadi kesalahan internal.", "Please try again or contact your administrator." : "Mohon coba lagi atau hubungi administrator Anda.", "Log in" : "Masuk", "Wrong password. Reset it?" : "Sandi salah. Atur ulang?", diff --git a/core/l10n/is.js b/core/l10n/is.js index 04ba2851364..17099e03973 100644 --- a/core/l10n/is.js +++ b/core/l10n/is.js @@ -161,7 +161,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Ekki tókst að hlaða inn upplýsingum um sameign varðandi þetta atriði.", "No users or groups found for {search}" : "Engir notendur eða hópar fundust í {search}", "No users found for {search}" : "Engir notendur fundust með {search}", - "An error occured. Please try again" : "Villa kom upp. Endilega reyndu aftur", "{sharee} (group)" : "{sharee} (hópur)", "{sharee} (at {server})" : "{sharee} (á {server})", "{sharee} (remote)" : "{sharee} (fjartengdur)", @@ -266,7 +265,6 @@ OC.L10N.register( "Search" : "Leita", "Server side authentication failed!" : "Auðkenning af hálfu þjóns tókst ekki!", "Please contact your administrator." : "Hafðu samband við kerfisstjóra.", - "An internal error occured." : "Innri villa kom upp.", "Please try again or contact your administrator." : "Reyndu aftur eða hafðu samband við kerfisstjóra.", "Log in" : "Skrá inn", "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?", diff --git a/core/l10n/is.json b/core/l10n/is.json index 49a0a22dceb..9c23e966dc8 100644 --- a/core/l10n/is.json +++ b/core/l10n/is.json @@ -159,7 +159,6 @@ "Share details could not be loaded for this item." : "Ekki tókst að hlaða inn upplýsingum um sameign varðandi þetta atriði.", "No users or groups found for {search}" : "Engir notendur eða hópar fundust í {search}", "No users found for {search}" : "Engir notendur fundust með {search}", - "An error occured. Please try again" : "Villa kom upp. Endilega reyndu aftur", "{sharee} (group)" : "{sharee} (hópur)", "{sharee} (at {server})" : "{sharee} (á {server})", "{sharee} (remote)" : "{sharee} (fjartengdur)", @@ -264,7 +263,6 @@ "Search" : "Leita", "Server side authentication failed!" : "Auðkenning af hálfu þjóns tókst ekki!", "Please contact your administrator." : "Hafðu samband við kerfisstjóra.", - "An internal error occured." : "Innri villa kom upp.", "Please try again or contact your administrator." : "Reyndu aftur eða hafðu samband við kerfisstjóra.", "Log in" : "Skrá inn", "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?", diff --git a/core/l10n/it.js b/core/l10n/it.js index 4cf2917d82b..29da8d0c740 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -169,7 +169,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "I dettagli della condivisione non possono essere caricati per questo elemento.", "No users or groups found for {search}" : "Nessun utente o gruppo trovato per {search}", "No users found for {search}" : "Nessun utente trovato per {search}", - "An error occured. Please try again" : "Si è verificato un errore. Prova ancora", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (su {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -275,7 +274,6 @@ OC.L10N.register( "Search" : "Cerca", "Server side authentication failed!" : "Autenticazione lato server non riuscita!", "Please contact your administrator." : "Contatta il tuo amministratore di sistema.", - "An internal error occured." : "Si è verificato un errore interno.", "Please try again or contact your administrator." : "Prova ancora o contatta il tuo amministratore.", "Log in" : "Accedi", "Wrong password. Reset it?" : "Password errata. Vuoi reimpostarla?", diff --git a/core/l10n/it.json b/core/l10n/it.json index a65e39289f5..993ff136ba9 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -167,7 +167,6 @@ "Share details could not be loaded for this item." : "I dettagli della condivisione non possono essere caricati per questo elemento.", "No users or groups found for {search}" : "Nessun utente o gruppo trovato per {search}", "No users found for {search}" : "Nessun utente trovato per {search}", - "An error occured. Please try again" : "Si è verificato un errore. Prova ancora", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (su {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -273,7 +272,6 @@ "Search" : "Cerca", "Server side authentication failed!" : "Autenticazione lato server non riuscita!", "Please contact your administrator." : "Contatta il tuo amministratore di sistema.", - "An internal error occured." : "Si è verificato un errore interno.", "Please try again or contact your administrator." : "Prova ancora o contatta il tuo amministratore.", "Log in" : "Accedi", "Wrong password. Reset it?" : "Password errata. Vuoi reimpostarla?", diff --git a/core/l10n/ja.js b/core/l10n/ja.js index b9cb8b7154c..a70def8dc37 100644 --- a/core/l10n/ja.js +++ b/core/l10n/ja.js @@ -160,7 +160,6 @@ OC.L10N.register( "Could not unshare" : "共有の解除ができませんでした", "Share details could not be loaded for this item." : "共有の詳細はこのアイテムによりロードできませんでした。", "No users or groups found for {search}" : "{search} の検索でユーザー、グループが見つかりません", - "An error occured. Please try again" : "エラーが発生しました。もう一度トライしてください。", "{sharee} (group)" : "{sharee} (グループ)", "{sharee} (at {server})" : "{sharee} ({server} で)", "{sharee} (remote)" : "{sharee} (リモート)", @@ -260,7 +259,6 @@ OC.L10N.register( "Search" : "検索", "Server side authentication failed!" : "サーバーサイドの認証に失敗しました！", "Please contact your administrator." : "管理者に問い合わせてください。", - "An internal error occured." : "内部エラーが発生しました。", "Please try again or contact your administrator." : "もう一度試してみるか、管理者に問い合わせてください。", "Log in" : "ログイン", "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？", diff --git a/core/l10n/ja.json b/core/l10n/ja.json index 60e0942afbd..6d21d751ad6 100644 --- a/core/l10n/ja.json +++ b/core/l10n/ja.json @@ -158,7 +158,6 @@ "Could not unshare" : "共有の解除ができませんでした", "Share details could not be loaded for this item." : "共有の詳細はこのアイテムによりロードできませんでした。", "No users or groups found for {search}" : "{search} の検索でユーザー、グループが見つかりません", - "An error occured. Please try again" : "エラーが発生しました。もう一度トライしてください。", "{sharee} (group)" : "{sharee} (グループ)", "{sharee} (at {server})" : "{sharee} ({server} で)", "{sharee} (remote)" : "{sharee} (リモート)", @@ -258,7 +257,6 @@ "Search" : "検索", "Server side authentication failed!" : "サーバーサイドの認証に失敗しました！", "Please contact your administrator." : "管理者に問い合わせてください。", - "An internal error occured." : "内部エラーが発生しました。", "Please try again or contact your administrator." : "もう一度試してみるか、管理者に問い合わせてください。", "Log in" : "ログイン", "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？", diff --git a/core/l10n/ko.js b/core/l10n/ko.js index 0410b541cc6..c44f3aeee76 100644 --- a/core/l10n/ko.js +++ b/core/l10n/ko.js @@ -160,7 +160,6 @@ OC.L10N.register( "Could not unshare" : "공유 해제할 수 없음", "Share details could not be loaded for this item." : "이 항목의 공유 정보를 불러올 수 없습니다.", "No users or groups found for {search}" : "{search}에 해당하는 사용자나 그룹을 찾을 수 없음", - "An error occured. Please try again" : "오류가 발생했습니다. 다시 시도하십시오.", "{sharee} (group)" : "{sharee}(그룹)", "{sharee} (at {server})" : "{sharee}({server}에 있음)", "{sharee} (remote)" : "{sharee}(원격)", @@ -261,7 +260,6 @@ OC.L10N.register( "Search" : "검색", "Server side authentication failed!" : "서버 인증 실패!", "Please contact your administrator." : "관리자에게 문의하십시오.", - "An internal error occured." : "내부 오류가 발생했습니다.", "Please try again or contact your administrator." : "다시 시도하거나 관리자에게 연락하십시오.", "Log in" : "로그인", "Wrong password. Reset it?" : "암호가 잘못되었습니다. 다시 설정하시겠습니까?", diff --git a/core/l10n/ko.json b/core/l10n/ko.json index 3977af2e565..b60b53811f6 100644 --- a/core/l10n/ko.json +++ b/core/l10n/ko.json @@ -158,7 +158,6 @@ "Could not unshare" : "공유 해제할 수 없음", "Share details could not be loaded for this item." : "이 항목의 공유 정보를 불러올 수 없습니다.", "No users or groups found for {search}" : "{search}에 해당하는 사용자나 그룹을 찾을 수 없음", - "An error occured. Please try again" : "오류가 발생했습니다. 다시 시도하십시오.", "{sharee} (group)" : "{sharee}(그룹)", "{sharee} (at {server})" : "{sharee}({server}에 있음)", "{sharee} (remote)" : "{sharee}(원격)", @@ -259,7 +258,6 @@ "Search" : "검색", "Server side authentication failed!" : "서버 인증 실패!", "Please contact your administrator." : "관리자에게 문의하십시오.", - "An internal error occured." : "내부 오류가 발생했습니다.", "Please try again or contact your administrator." : "다시 시도하거나 관리자에게 연락하십시오.", "Log in" : "로그인", "Wrong password. Reset it?" : "암호가 잘못되었습니다. 다시 설정하시겠습니까?", diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js index f529399379c..4edb055f8b9 100644 --- a/core/l10n/lt_LT.js +++ b/core/l10n/lt_LT.js @@ -129,7 +129,6 @@ OC.L10N.register( "change" : "keisti", "delete" : "ištrinti", "access control" : "priėjimo kontrolė", - "An error occured. Please try again" : "Klaida, prašau bandyti dar kartą.", "Share" : "Dalintis", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Dalintis su vartotoju kitame ownCloud debesyje, sintaksė vartotojas@example.com/owncloud", "Warning" : "Įspėjimas", diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json index abd9d3b2a97..372bbe3c529 100644 --- a/core/l10n/lt_LT.json +++ b/core/l10n/lt_LT.json @@ -127,7 +127,6 @@ "change" : "keisti", "delete" : "ištrinti", "access control" : "priėjimo kontrolė", - "An error occured. Please try again" : "Klaida, prašau bandyti dar kartą.", "Share" : "Dalintis", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Dalintis su vartotoju kitame ownCloud debesyje, sintaksė vartotojas@example.com/owncloud", "Warning" : "Įspėjimas", diff --git a/core/l10n/mk.js b/core/l10n/mk.js index c01acfc0c92..054f74f6be3 100644 --- a/core/l10n/mk.js +++ b/core/l10n/mk.js @@ -138,7 +138,6 @@ OC.L10N.register( "change" : "промени", "delete" : "избриши", "access control" : "контрола на пристап", - "An error occured. Please try again" : "Се случи грешка. Обиди се повторно", "Share" : "Сподели", "Warning" : "Предупредување", "not assignable" : "не може да се додаде", @@ -201,7 +200,6 @@ OC.L10N.register( "Search" : "Барај", "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!", "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.", - "An internal error occured." : "Се случи интерна грешка", "Log in" : "Најава", "Wrong password. Reset it?" : "Погрешна лозинка. Да ја ресетирам?", "Wrong password." : "Погрешна лозинка.", diff --git a/core/l10n/mk.json b/core/l10n/mk.json index 632472c5034..bacbdee226c 100644 --- a/core/l10n/mk.json +++ b/core/l10n/mk.json @@ -136,7 +136,6 @@ "change" : "промени", "delete" : "избриши", "access control" : "контрола на пристап", - "An error occured. Please try again" : "Се случи грешка. Обиди се повторно", "Share" : "Сподели", "Warning" : "Предупредување", "not assignable" : "не може да се додаде", @@ -199,7 +198,6 @@ "Search" : "Барај", "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!", "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.", - "An internal error occured." : "Се случи интерна грешка", "Log in" : "Најава", "Wrong password. Reset it?" : "Погрешна лозинка. Да ја ресетирам?", "Wrong password." : "Погрешна лозинка.", diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js index 39513e71926..7e617b8e948 100644 --- a/core/l10n/nb_NO.js +++ b/core/l10n/nb_NO.js @@ -160,7 +160,6 @@ OC.L10N.register( "Could not unshare" : "Kunne ikke avslutte deling", "Share details could not be loaded for this item." : "Klarte ikke å laste inn detaljer om deling for dette elementet.", "No users or groups found for {search}" : "Ingen brukere eller grupper funnet for {search}", - "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen", "{sharee} (group)" : "{sharee} (gruppe)", "{sharee} (at {server})" : "{sharee} (på {server})", "{sharee} (remote)" : "{sharee} (ekstern)", @@ -261,7 +260,6 @@ OC.L10N.register( "Search" : "Søk", "Server side authentication failed!" : "Autentisering feilet på serveren!", "Please contact your administrator." : "Vennligst kontakt administratoren din.", - "An internal error occured." : "Det oppstod en intern feil.", "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.", "Log in" : "Logg inn", "Wrong password. Reset it?" : "Feil passord. Nullstille det?", diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json index 2585d9203c2..a5d494b68ee 100644 --- a/core/l10n/nb_NO.json +++ b/core/l10n/nb_NO.json @@ -158,7 +158,6 @@ "Could not unshare" : "Kunne ikke avslutte deling", "Share details could not be loaded for this item." : "Klarte ikke å laste inn detaljer om deling for dette elementet.", "No users or groups found for {search}" : "Ingen brukere eller grupper funnet for {search}", - "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen", "{sharee} (group)" : "{sharee} (gruppe)", "{sharee} (at {server})" : "{sharee} (på {server})", "{sharee} (remote)" : "{sharee} (ekstern)", @@ -259,7 +258,6 @@ "Search" : "Søk", "Server side authentication failed!" : "Autentisering feilet på serveren!", "Please contact your administrator." : "Vennligst kontakt administratoren din.", - "An internal error occured." : "Det oppstod en intern feil.", "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.", "Log in" : "Logg inn", "Wrong password. Reset it?" : "Feil passord. Nullstille det?", diff --git a/core/l10n/nl.js b/core/l10n/nl.js index 8fdb88440e7..e8b822e78f4 100644 --- a/core/l10n/nl.js +++ b/core/l10n/nl.js @@ -169,7 +169,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Details van shares voor dit object konden niet worden geladen.", "No users or groups found for {search}" : "Geen gebruikers of groepen gevonden voor {search}", "No users found for {search}" : "Geen gebruikers gevonden voor {search}", - "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw", "{sharee} (group)" : "{sharee} (groep)", "{sharee} (at {server})" : "{sharee} (op {server})", "{sharee} (remote)" : "{sharee} (extern)", @@ -275,7 +274,6 @@ OC.L10N.register( "Search" : "Zoeken", "Server side authentication failed!" : "Authenticatie bij de server mislukte!", "Please contact your administrator." : "Neem contact op met uw systeembeheerder.", - "An internal error occured." : "Er heeft zich een interne fout voorgedaan.", "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met uw beheerder.", "Log in" : "Meld u aan", "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?", diff --git a/core/l10n/nl.json b/core/l10n/nl.json index 9588e4f27dc..348c303d61e 100644 --- a/core/l10n/nl.json +++ b/core/l10n/nl.json @@ -167,7 +167,6 @@ "Share details could not be loaded for this item." : "Details van shares voor dit object konden niet worden geladen.", "No users or groups found for {search}" : "Geen gebruikers of groepen gevonden voor {search}", "No users found for {search}" : "Geen gebruikers gevonden voor {search}", - "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw", "{sharee} (group)" : "{sharee} (groep)", "{sharee} (at {server})" : "{sharee} (op {server})", "{sharee} (remote)" : "{sharee} (extern)", @@ -273,7 +272,6 @@ "Search" : "Zoeken", "Server side authentication failed!" : "Authenticatie bij de server mislukte!", "Please contact your administrator." : "Neem contact op met uw systeembeheerder.", - "An internal error occured." : "Er heeft zich een interne fout voorgedaan.", "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met uw beheerder.", "Log in" : "Meld u aan", "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?", diff --git a/core/l10n/oc.js b/core/l10n/oc.js index 48036d3110d..90a661ac282 100644 --- a/core/l10n/oc.js +++ b/core/l10n/oc.js @@ -151,7 +151,6 @@ OC.L10N.register( "delete" : "suprimir", "access control" : "contraròtle d'accès", "Share details could not be loaded for this item." : "Las informacions de partiment an pas pogut èsser cargadas per aqueste element.", - "An error occured. Please try again" : "Una error s'es produsida. Mercé d'ensajar tornamai", "Share" : "Partejar", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partejatz amb de personas sus d'autres ownClouds en utilizant la sintaxi utilizaire@exemple.com/owncloud", "Warning" : "Atencion", @@ -241,7 +240,6 @@ OC.L10N.register( "Search" : "Recercar", "Server side authentication failed!" : "L'autentificacion sul servidor a fracassat !", "Please contact your administrator." : "Contactatz vòstre administrator.", - "An internal error occured." : "Una error intèrna s'es produsida.", "Please try again or contact your administrator." : "Reensajatz o contactatz vòstre administrator.", "Log in" : "Connexion", "Wrong password. Reset it?" : "Senhal incorrècte. Reïnicializar ?", diff --git a/core/l10n/oc.json b/core/l10n/oc.json index 4610829bccd..008c95c67ea 100644 --- a/core/l10n/oc.json +++ b/core/l10n/oc.json @@ -149,7 +149,6 @@ "delete" : "suprimir", "access control" : "contraròtle d'accès", "Share details could not be loaded for this item." : "Las informacions de partiment an pas pogut èsser cargadas per aqueste element.", - "An error occured. Please try again" : "Una error s'es produsida. Mercé d'ensajar tornamai", "Share" : "Partejar", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partejatz amb de personas sus d'autres ownClouds en utilizant la sintaxi utilizaire@exemple.com/owncloud", "Warning" : "Atencion", @@ -239,7 +238,6 @@ "Search" : "Recercar", "Server side authentication failed!" : "L'autentificacion sul servidor a fracassat !", "Please contact your administrator." : "Contactatz vòstre administrator.", - "An internal error occured." : "Una error intèrna s'es produsida.", "Please try again or contact your administrator." : "Reensajatz o contactatz vòstre administrator.", "Log in" : "Connexion", "Wrong password. Reset it?" : "Senhal incorrècte. Reïnicializar ?", diff --git a/core/l10n/pl.js b/core/l10n/pl.js index df04e2d8122..df4a05737aa 100644 --- a/core/l10n/pl.js +++ b/core/l10n/pl.js @@ -149,7 +149,6 @@ OC.L10N.register( "change" : "zmiany", "delete" : "usuń", "access control" : "kontrola dostępu", - "An error occured. Please try again" : "Wystąpił błąd. Proszę spróbować ponownie.", "Share" : "Udostępnij", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Współdziel z użytkownikami innych chmur ownCloud używając wzorca uzytkownik@example.com/owncloud", "Warning" : "Ostrzeżenie", diff --git a/core/l10n/pl.json b/core/l10n/pl.json index 421eae9ebde..6d4fcb836ec 100644 --- a/core/l10n/pl.json +++ b/core/l10n/pl.json @@ -147,7 +147,6 @@ "change" : "zmiany", "delete" : "usuń", "access control" : "kontrola dostępu", - "An error occured. Please try again" : "Wystąpił błąd. Proszę spróbować ponownie.", "Share" : "Udostępnij", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Współdziel z użytkownikami innych chmur ownCloud używając wzorca uzytkownik@example.com/owncloud", "Warning" : "Ostrzeżenie", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index 1bb7b60652b..2803e552f4b 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -169,7 +169,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Detalhes de compartilhamento não puderam ser carregados para este item.", "No users or groups found for {search}" : "Nenhum usuário grupo encontrado para {search}", "No users found for {search}" : "Nenhum usuário encontrado para {search}", - "An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (no {server})", "{sharee} (remote)" : "{sharee} (remoto)", @@ -275,7 +274,6 @@ OC.L10N.register( "Search" : "Perquisar", "Server side authentication failed!" : "Autenticação do servidor falhou!", "Please contact your administrator." : "Por favor, contate o administrador.", - "An internal error occured." : "Ocorreu um erro interno.", "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.", "Log in" : "Entrar", "Wrong password. Reset it?" : "Senha incorreta. Redefini-la?", diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index e7e06828e75..36c509a9f24 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -167,7 +167,6 @@ "Share details could not be loaded for this item." : "Detalhes de compartilhamento não puderam ser carregados para este item.", "No users or groups found for {search}" : "Nenhum usuário grupo encontrado para {search}", "No users found for {search}" : "Nenhum usuário encontrado para {search}", - "An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (no {server})", "{sharee} (remote)" : "{sharee} (remoto)", @@ -273,7 +272,6 @@ "Search" : "Perquisar", "Server side authentication failed!" : "Autenticação do servidor falhou!", "Please contact your administrator." : "Por favor, contate o administrador.", - "An internal error occured." : "Ocorreu um erro interno.", "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.", "Log in" : "Entrar", "Wrong password. Reset it?" : "Senha incorreta. Redefini-la?", diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js index 74ca2c94da0..d834a341fe4 100644 --- a/core/l10n/pt_PT.js +++ b/core/l10n/pt_PT.js @@ -169,7 +169,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Não foi possível carregar os detalhes de partilha para este item.", "No users or groups found for {search}" : "Nenhuns utilizadores ou grupos encontrados para {search}", "No users found for {search}" : "Nenhum utilizador encontrado para {search}", - "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (em {server})", "{sharee} (remote)" : "{sharee} (remoto)", @@ -275,7 +274,6 @@ OC.L10N.register( "Search" : "Procurar", "Server side authentication failed!" : "Autenticação do lado do servidor falhou!", "Please contact your administrator." : "Por favor contacte o administrador.", - "An internal error occured." : "Ocorreu um erro interno.", "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.", "Log in" : "Iniciar Sessão", "Wrong password. Reset it?" : "Senha errada. Repô-la?", diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json index 798b3f228ab..862601cf00a 100644 --- a/core/l10n/pt_PT.json +++ b/core/l10n/pt_PT.json @@ -167,7 +167,6 @@ "Share details could not be loaded for this item." : "Não foi possível carregar os detalhes de partilha para este item.", "No users or groups found for {search}" : "Nenhuns utilizadores ou grupos encontrados para {search}", "No users found for {search}" : "Nenhum utilizador encontrado para {search}", - "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo", "{sharee} (group)" : "{sharee} (grupo)", "{sharee} (at {server})" : "{sharee} (em {server})", "{sharee} (remote)" : "{sharee} (remoto)", @@ -273,7 +272,6 @@ "Search" : "Procurar", "Server side authentication failed!" : "Autenticação do lado do servidor falhou!", "Please contact your administrator." : "Por favor contacte o administrador.", - "An internal error occured." : "Ocorreu um erro interno.", "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.", "Log in" : "Iniciar Sessão", "Wrong password. Reset it?" : "Senha errada. Repô-la?", diff --git a/core/l10n/ru.js b/core/l10n/ru.js index 1a0359f0981..4396ad52bd6 100644 --- a/core/l10n/ru.js +++ b/core/l10n/ru.js @@ -162,7 +162,6 @@ OC.L10N.register( "Could not unshare" : "Не удается отменить доступ", "Share details could not be loaded for this item." : "Не удалось загрузить информацию об общем доступе для этого элемента.", "No users or groups found for {search}" : "Не найдено пользователей или групп по запросу {search}", - "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз", "{sharee} (group)" : "{sharee} (группа)", "{sharee} (at {server})" : "{sharee} (на {server})", "{sharee} (remote)" : "{sharee} (удалённо)", @@ -262,7 +261,6 @@ OC.L10N.register( "Search" : "Найти", "Server side authentication failed!" : "Ошибка аутентификации на стороне сервера!", "Please contact your administrator." : "Пожалуйста, обратитесь к администратору.", - "An internal error occured." : "Произошла внутренняя ошибка.", "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором", "Log in" : "Войти", "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?", diff --git a/core/l10n/ru.json b/core/l10n/ru.json index d571bc4c399..3214caabdeb 100644 --- a/core/l10n/ru.json +++ b/core/l10n/ru.json @@ -160,7 +160,6 @@ "Could not unshare" : "Не удается отменить доступ", "Share details could not be loaded for this item." : "Не удалось загрузить информацию об общем доступе для этого элемента.", "No users or groups found for {search}" : "Не найдено пользователей или групп по запросу {search}", - "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз", "{sharee} (group)" : "{sharee} (группа)", "{sharee} (at {server})" : "{sharee} (на {server})", "{sharee} (remote)" : "{sharee} (удалённо)", @@ -260,7 +259,6 @@ "Search" : "Найти", "Server side authentication failed!" : "Ошибка аутентификации на стороне сервера!", "Please contact your administrator." : "Пожалуйста, обратитесь к администратору.", - "An internal error occured." : "Произошла внутренняя ошибка.", "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором", "Log in" : "Войти", "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?", diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js index a9b485559a6..55fa8bfaf5f 100644 --- a/core/l10n/sk_SK.js +++ b/core/l10n/sk_SK.js @@ -149,7 +149,6 @@ OC.L10N.register( "delete" : "vymazať", "access control" : "prístupové práva", "Share details could not be loaded for this item." : "Nebolo možné načítať údaje o zdieľaní tejto položky.", - "An error occured. Please try again" : "Nastala chyba. Skúste to znovu", "Share" : "Zdieľať", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Zdieľať s ľuďmi na iných serveroch ownClouds pomocou syntaxe používateľ@doména.com/owncloud", "Warning" : "Varovanie", @@ -239,7 +238,6 @@ OC.L10N.register( "Search" : "Hľadať", "Server side authentication failed!" : "Autentifikácia na serveri zlyhala!", "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.", - "An internal error occured." : "Vyskytla sa vnútorná chyba.", "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.", "Log in" : "Prihlásiť sa", "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?", diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json index cb9a2f11b09..f0fbc5737a0 100644 --- a/core/l10n/sk_SK.json +++ b/core/l10n/sk_SK.json @@ -147,7 +147,6 @@ "delete" : "vymazať", "access control" : "prístupové práva", "Share details could not be loaded for this item." : "Nebolo možné načítať údaje o zdieľaní tejto položky.", - "An error occured. Please try again" : "Nastala chyba. Skúste to znovu", "Share" : "Zdieľať", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Zdieľať s ľuďmi na iných serveroch ownClouds pomocou syntaxe používateľ@doména.com/owncloud", "Warning" : "Varovanie", @@ -237,7 +236,6 @@ "Search" : "Hľadať", "Server side authentication failed!" : "Autentifikácia na serveri zlyhala!", "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.", - "An internal error occured." : "Vyskytla sa vnútorná chyba.", "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.", "Log in" : "Prihlásiť sa", "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?", diff --git a/core/l10n/sl.js b/core/l10n/sl.js index df55281d9ec..1903fe39a0e 100644 --- a/core/l10n/sl.js +++ b/core/l10n/sl.js @@ -154,7 +154,6 @@ OC.L10N.register( "Could not unshare" : "Ni mogoče prekiniti souporabe", "Share details could not be loaded for this item." : "Podrobnosti souporabe za te predmet ni mogoče naložiti.", "No users or groups found for {search}" : "Ni najdenih uporabnikov ali skupin za {search}", - "An error occured. Please try again" : "Prišlo je do napake. Poskusite znova.", "{sharee} (group)" : "{sharee} (skupina)", "{sharee} (at {server})" : "{sharee} (na {server})", "{sharee} (remote)" : "{sharee} (oddaljeno)", @@ -251,7 +250,6 @@ OC.L10N.register( "Search" : "Poišči", "Server side authentication failed!" : "Overitev s strežnika je spodletela!", "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.", - "An internal error occured." : "Prišlo je do notranje napake.", "Please try again or contact your administrator." : "Poskusite znova ali pa stopite v stik s skrbnikom sistema.", "Log in" : "Prijava", "Wrong password. Reset it?" : "Napačno geslo. Ali ga želite ponastaviti?", diff --git a/core/l10n/sl.json b/core/l10n/sl.json index 92f21431ef2..b7f797bd464 100644 --- a/core/l10n/sl.json +++ b/core/l10n/sl.json @@ -152,7 +152,6 @@ "Could not unshare" : "Ni mogoče prekiniti souporabe", "Share details could not be loaded for this item." : "Podrobnosti souporabe za te predmet ni mogoče naložiti.", "No users or groups found for {search}" : "Ni najdenih uporabnikov ali skupin za {search}", - "An error occured. Please try again" : "Prišlo je do napake. Poskusite znova.", "{sharee} (group)" : "{sharee} (skupina)", "{sharee} (at {server})" : "{sharee} (na {server})", "{sharee} (remote)" : "{sharee} (oddaljeno)", @@ -249,7 +248,6 @@ "Search" : "Poišči", "Server side authentication failed!" : "Overitev s strežnika je spodletela!", "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.", - "An internal error occured." : "Prišlo je do notranje napake.", "Please try again or contact your administrator." : "Poskusite znova ali pa stopite v stik s skrbnikom sistema.", "Log in" : "Prijava", "Wrong password. Reset it?" : "Napačno geslo. Ali ga želite ponastaviti?", diff --git a/core/l10n/sq.js b/core/l10n/sq.js index c69215105a8..673cd405ffe 100644 --- a/core/l10n/sq.js +++ b/core/l10n/sq.js @@ -167,7 +167,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Për këtë objekt s’u ngarkuan dot hollësi ndarjeje.", "No users or groups found for {search}" : "S’u gjetën përdorues ose grupe për {search}", "No users found for {search}" : "S’u gjet përdorues për {search}", - "An error occured. Please try again" : "Ndodhi një gabim. Ju lutemi, riprovoni", "{sharee} (group)" : "{sharee} (grup)", "{sharee} (at {server})" : "{sharee} (në {server})", "{sharee} (remote)" : "{sharee} (i largët)", @@ -272,7 +271,6 @@ OC.L10N.register( "Search" : "Kërko", "Server side authentication failed!" : "Mirëfilltësimi më anë të shërbyesit dështoi!", "Please contact your administrator." : "Ju lutemi, lidhuni me përgjegjësin tuaj.", - "An internal error occured." : "Ndodhi një gabim i brendshëm.", "Please try again or contact your administrator." : "Ju lutemi, riprovoni ose lidhuni me përgjegjësin tuaj.", "Log in" : "Hyni", "Wrong password. Reset it?" : "Fjalëkalim i gabuar. Të ricaktohet?", diff --git a/core/l10n/sq.json b/core/l10n/sq.json index 5ed2a3d6c0f..7c29b6d3770 100644 --- a/core/l10n/sq.json +++ b/core/l10n/sq.json @@ -165,7 +165,6 @@ "Share details could not be loaded for this item." : "Për këtë objekt s’u ngarkuan dot hollësi ndarjeje.", "No users or groups found for {search}" : "S’u gjetën përdorues ose grupe për {search}", "No users found for {search}" : "S’u gjet përdorues për {search}", - "An error occured. Please try again" : "Ndodhi një gabim. Ju lutemi, riprovoni", "{sharee} (group)" : "{sharee} (grup)", "{sharee} (at {server})" : "{sharee} (në {server})", "{sharee} (remote)" : "{sharee} (i largët)", @@ -270,7 +269,6 @@ "Search" : "Kërko", "Server side authentication failed!" : "Mirëfilltësimi më anë të shërbyesit dështoi!", "Please contact your administrator." : "Ju lutemi, lidhuni me përgjegjësin tuaj.", - "An internal error occured." : "Ndodhi një gabim i brendshëm.", "Please try again or contact your administrator." : "Ju lutemi, riprovoni ose lidhuni me përgjegjësin tuaj.", "Log in" : "Hyni", "Wrong password. Reset it?" : "Fjalëkalim i gabuar. Të ricaktohet?", diff --git a/core/l10n/sr.js b/core/l10n/sr.js index 76f5e00a890..4c0b0ee8b61 100644 --- a/core/l10n/sr.js +++ b/core/l10n/sr.js @@ -140,7 +140,6 @@ OC.L10N.register( "change" : "измени", "delete" : "обриши", "access control" : "права приступа", - "An error occured. Please try again" : "Дошло је до грешке. Покушајте поново", "Share" : "Дели", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделите са људима у другим облацима користећи синтаксу корисничкоиме@сервер.com/owncloud", "Warning" : "Упозорење", @@ -225,7 +224,6 @@ OC.L10N.register( "Search" : "Претражи", "Server side authentication failed!" : "Аутентификација на серверу није успела!", "Please contact your administrator." : "Контактирајте вашег администратора.", - "An internal error occured." : "Дошло је до интерне грешке.", "Please try again or contact your administrator." : "Покушајте поново или контактирајте вашег администратора.", "Log in" : "Пријава", "Alternative Logins" : "Алтернативне пријаве", diff --git a/core/l10n/sr.json b/core/l10n/sr.json index cc1b50d87f8..85970980940 100644 --- a/core/l10n/sr.json +++ b/core/l10n/sr.json @@ -138,7 +138,6 @@ "change" : "измени", "delete" : "обриши", "access control" : "права приступа", - "An error occured. Please try again" : "Дошло је до грешке. Покушајте поново", "Share" : "Дели", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделите са људима у другим облацима користећи синтаксу корисничкоиме@сервер.com/owncloud", "Warning" : "Упозорење", @@ -223,7 +222,6 @@ "Search" : "Претражи", "Server side authentication failed!" : "Аутентификација на серверу није успела!", "Please contact your administrator." : "Контактирајте вашег администратора.", - "An internal error occured." : "Дошло је до интерне грешке.", "Please try again or contact your administrator." : "Покушајте поново или контактирајте вашег администратора.", "Log in" : "Пријава", "Alternative Logins" : "Алтернативне пријаве", diff --git a/core/l10n/sv.js b/core/l10n/sv.js index 6f4fbb9c9e5..9733fb3bff2 100644 --- a/core/l10n/sv.js +++ b/core/l10n/sv.js @@ -169,7 +169,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "Delningsdetaljer kunde inte laddas för detta objekt.", "No users or groups found for {search}" : "Inga användare eller grupper funna för {search}", "No users found for {search}" : "Inga användare funna för {search}", - "An error occured. Please try again" : "Ett fel uppstod. Var god försök igen", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (at {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -275,7 +274,6 @@ OC.L10N.register( "Search" : "Sök", "Server side authentication failed!" : "Servern misslyckades med autentisering!", "Please contact your administrator." : "Kontakta din administratör.", - "An internal error occured." : "Ett internt fel inträffade.", "Please try again or contact your administrator." : "Vänligen försök igen eller kontakta din administratör.", "Log in" : "Logga in", "Wrong password. Reset it?" : "Fel lösenord. Vill du återställa?", diff --git a/core/l10n/sv.json b/core/l10n/sv.json index adc6a1a82f9..a8976327bbc 100644 --- a/core/l10n/sv.json +++ b/core/l10n/sv.json @@ -167,7 +167,6 @@ "Share details could not be loaded for this item." : "Delningsdetaljer kunde inte laddas för detta objekt.", "No users or groups found for {search}" : "Inga användare eller grupper funna för {search}", "No users found for {search}" : "Inga användare funna för {search}", - "An error occured. Please try again" : "Ett fel uppstod. Var god försök igen", "{sharee} (group)" : "{sharee} (group)", "{sharee} (at {server})" : "{sharee} (at {server})", "{sharee} (remote)" : "{sharee} (remote)", @@ -273,7 +272,6 @@ "Search" : "Sök", "Server side authentication failed!" : "Servern misslyckades med autentisering!", "Please contact your administrator." : "Kontakta din administratör.", - "An internal error occured." : "Ett internt fel inträffade.", "Please try again or contact your administrator." : "Vänligen försök igen eller kontakta din administratör.", "Log in" : "Logga in", "Wrong password. Reset it?" : "Fel lösenord. Vill du återställa?", diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js index 49f1bf0fd57..3ec0a4d707c 100644 --- a/core/l10n/th_TH.js +++ b/core/l10n/th_TH.js @@ -159,7 +159,6 @@ OC.L10N.register( "access control" : "ควบคุมการเข้าถึง", "Could not unshare" : "ไม่สามารถยกเลิกการแชร์ได้", "Share details could not be loaded for this item." : "รายละเอียดการแชร์ไม่สามารถโหลดสำหรับรายการนี้", - "An error occured. Please try again" : "เกิดข้อผิดพลาด กรุณาลองอีกครั้ง", "Share" : "แชร์", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ", "Error removing share" : "พบข้อผิดพลาดในรายการที่แชร์ออก", @@ -254,7 +253,6 @@ OC.L10N.register( "Search" : "ค้นหา", "Server side authentication failed!" : "การรับรองความถูกต้องจากเซิร์ฟเวอร์ล้มเหลว!", "Please contact your administrator." : "กรุณาติดต่อผู้ดูแลระบบ", - "An internal error occured." : "เกิดข้อผิดพลาดภายใน", "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ", "Log in" : "เข้าสู่ระบบ", "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?", diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json index 6605a715d15..1a0c0661fa0 100644 --- a/core/l10n/th_TH.json +++ b/core/l10n/th_TH.json @@ -157,7 +157,6 @@ "access control" : "ควบคุมการเข้าถึง", "Could not unshare" : "ไม่สามารถยกเลิกการแชร์ได้", "Share details could not be loaded for this item." : "รายละเอียดการแชร์ไม่สามารถโหลดสำหรับรายการนี้", - "An error occured. Please try again" : "เกิดข้อผิดพลาด กรุณาลองอีกครั้ง", "Share" : "แชร์", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ", "Error removing share" : "พบข้อผิดพลาดในรายการที่แชร์ออก", @@ -252,7 +251,6 @@ "Search" : "ค้นหา", "Server side authentication failed!" : "การรับรองความถูกต้องจากเซิร์ฟเวอร์ล้มเหลว!", "Please contact your administrator." : "กรุณาติดต่อผู้ดูแลระบบ", - "An internal error occured." : "เกิดข้อผิดพลาดภายใน", "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ", "Log in" : "เข้าสู่ระบบ", "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?", diff --git a/core/l10n/tr.js b/core/l10n/tr.js index cb919befef8..b42a19e787e 100644 --- a/core/l10n/tr.js +++ b/core/l10n/tr.js @@ -160,7 +160,6 @@ OC.L10N.register( "Could not unshare" : "Paylaşım kaldırılamadı", "Share details could not be loaded for this item." : "Bu öge için paylaşma ayrıntıları yüklenemedi.", "No users or groups found for {search}" : "{search} için kullanıcı veya grup bulunamadı", - "An error occured. Please try again" : "Bir hata oluştu. Lütfen yeniden deneyin", "Share" : "Paylaş", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "kullanıcı@example.com/owncloud şeklinde diğer ownCloud kullanan diğer kullanıcılarla paylaş", "Error removing share" : "Paylaşım kaldırılırken hata", @@ -256,7 +255,6 @@ OC.L10N.register( "Search" : "Ara", "Server side authentication failed!" : "Sunucu taraflı yetkilendirme başarısız!", "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.", - "An internal error occured." : "Dahili bir hata oluştu.", "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.", "Log in" : "Giriş yap", "Wrong password. Reset it?" : "Hatalı parola. Sıfırlansın mı?", diff --git a/core/l10n/tr.json b/core/l10n/tr.json index 5b82fa9751e..210fc6a25bc 100644 --- a/core/l10n/tr.json +++ b/core/l10n/tr.json @@ -158,7 +158,6 @@ "Could not unshare" : "Paylaşım kaldırılamadı", "Share details could not be loaded for this item." : "Bu öge için paylaşma ayrıntıları yüklenemedi.", "No users or groups found for {search}" : "{search} için kullanıcı veya grup bulunamadı", - "An error occured. Please try again" : "Bir hata oluştu. Lütfen yeniden deneyin", "Share" : "Paylaş", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "kullanıcı@example.com/owncloud şeklinde diğer ownCloud kullanan diğer kullanıcılarla paylaş", "Error removing share" : "Paylaşım kaldırılırken hata", @@ -254,7 +253,6 @@ "Search" : "Ara", "Server side authentication failed!" : "Sunucu taraflı yetkilendirme başarısız!", "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.", - "An internal error occured." : "Dahili bir hata oluştu.", "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.", "Log in" : "Giriş yap", "Wrong password. Reset it?" : "Hatalı parola. Sıfırlansın mı?", diff --git a/core/l10n/uk.js b/core/l10n/uk.js index 12960ced47d..180895f3d50 100644 --- a/core/l10n/uk.js +++ b/core/l10n/uk.js @@ -153,7 +153,6 @@ OC.L10N.register( "delete" : "видалити", "access control" : "контроль доступу", "No users or groups found for {search}" : "Не знайдено груп або користувачів за пошуком {search}", - "An error occured. Please try again" : "Виникла помилка. Будь ласка, спробуйте ще раз", "{sharee} (group)" : "{sharee} (група)", "Share" : "Поділитися", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud", @@ -245,7 +244,6 @@ OC.L10N.register( "Search" : "Пошук", "Server side authentication failed!" : "Невдала аутентифікація з сервером!", "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.", - "An internal error occured." : "Виникла внутрішня помилка.", "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.", "Log in" : "Увійти", "Wrong password. Reset it?" : "Невірний пароль. Скинути його?", diff --git a/core/l10n/uk.json b/core/l10n/uk.json index 9d29ce15b7b..c0d194fbdb0 100644 --- a/core/l10n/uk.json +++ b/core/l10n/uk.json @@ -151,7 +151,6 @@ "delete" : "видалити", "access control" : "контроль доступу", "No users or groups found for {search}" : "Не знайдено груп або користувачів за пошуком {search}", - "An error occured. Please try again" : "Виникла помилка. Будь ласка, спробуйте ще раз", "{sharee} (group)" : "{sharee} (група)", "Share" : "Поділитися", "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud", @@ -243,7 +242,6 @@ "Search" : "Пошук", "Server side authentication failed!" : "Невдала аутентифікація з сервером!", "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.", - "An internal error occured." : "Виникла внутрішня помилка.", "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.", "Log in" : "Увійти", "Wrong password. Reset it?" : "Невірний пароль. Скинути його?", diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js index 1ebb7bfcbf2..ec47e5eb861 100644 --- a/core/l10n/zh_CN.js +++ b/core/l10n/zh_CN.js @@ -160,7 +160,6 @@ OC.L10N.register( "Could not unshare" : "无法共享", "Share details could not be loaded for this item." : "无法加载这个项目的分享详情", "No users or groups found for {search}" : "{search} 条件下没有找到用户或用户组", - "An error occured. Please try again" : "发生了一个错误请重新尝试", "{sharee} (group)" : "{sharee} (组)", "{sharee} (at {server})" : "{sharee} (位于 {server})", "{sharee} (remote)" : "{sharee} (远程)", @@ -261,7 +260,6 @@ OC.L10N.register( "Search" : "搜索", "Server side authentication failed!" : "服务端验证失败！", "Please contact your administrator." : "请联系你的管理员。", - "An internal error occured." : "发生了内部错误。", "Please try again or contact your administrator." : "请重试或联系管理员。", "Log in" : "登录", "Wrong password. Reset it?" : "密码错误。要重置么？", diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json index 56466547372..e118c337c8c 100644 --- a/core/l10n/zh_CN.json +++ b/core/l10n/zh_CN.json @@ -158,7 +158,6 @@ "Could not unshare" : "无法共享", "Share details could not be loaded for this item." : "无法加载这个项目的分享详情", "No users or groups found for {search}" : "{search} 条件下没有找到用户或用户组", - "An error occured. Please try again" : "发生了一个错误请重新尝试", "{sharee} (group)" : "{sharee} (组)", "{sharee} (at {server})" : "{sharee} (位于 {server})", "{sharee} (remote)" : "{sharee} (远程)", @@ -259,7 +258,6 @@ "Search" : "搜索", "Server side authentication failed!" : "服务端验证失败！", "Please contact your administrator." : "请联系你的管理员。", - "An internal error occured." : "发生了内部错误。", "Please try again or contact your administrator." : "请重试或联系管理员。", "Log in" : "登录", "Wrong password. Reset it?" : "密码错误。要重置么？", diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js index 87784dd896a..8fe6767b2c7 100644 --- a/core/l10n/zh_TW.js +++ b/core/l10n/zh_TW.js @@ -160,7 +160,6 @@ OC.L10N.register( "Share details could not be loaded for this item." : "無法載入分享細節", "No users or groups found for {search}" : "沒有群組或使用者符合 {search}", "No users found for {search}" : "沒有使用者符合 {search}", - "An error occured. Please try again" : "發生錯誤，請重試", "{sharee} (group)" : "{sharee} （群組）", "{sharee} (at {server})" : "{sharee} （在 {server}）", "{sharee} (remote)" : "{sharee} （遠端）", @@ -265,7 +264,6 @@ OC.L10N.register( "Search" : "搜尋", "Server side authentication failed!" : "伺服器端認證失敗！", "Please contact your administrator." : "請聯絡系統管理員", - "An internal error occured." : "發生內部錯誤", "Please try again or contact your administrator." : "請重試或聯絡系統管理員", "Log in" : "登入", "Wrong password. Reset it?" : "密碼錯誤，重設密碼？", diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json index 8d2d03b5c50..65877937a6e 100644 --- a/core/l10n/zh_TW.json +++ b/core/l10n/zh_TW.json @@ -158,7 +158,6 @@ "Share details could not be loaded for this item." : "無法載入分享細節", "No users or groups found for {search}" : "沒有群組或使用者符合 {search}", "No users found for {search}" : "沒有使用者符合 {search}", - "An error occured. Please try again" : "發生錯誤，請重試", "{sharee} (group)" : "{sharee} （群組）", "{sharee} (at {server})" : "{sharee} （在 {server}）", "{sharee} (remote)" : "{sharee} （遠端）", @@ -263,7 +262,6 @@ "Search" : "搜尋", "Server side authentication failed!" : "伺服器端認證失敗！", "Please contact your administrator." : "請聯絡系統管理員", - "An internal error occured." : "發生內部錯誤", "Please try again or contact your administrator." : "請重試或聯絡系統管理員", "Log in" : "登入", "Wrong password. Reset it?" : "密碼錯誤，重設密碼？", diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php index f4cbb6384ba..c8525d1d141 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/appframework/http/request.php @@ -56,6 +56,14 @@ class Request implements \ArrayAccess, \Countable, IRequest { const USER_AGENT_IE = '/(MSIE)|(Trident)/'; const USER_AGENT_IE_8 = '/MSIE 8.0/'; + // Microsoft Edge User Agent from https://msdn.microsoft.com/en-us/library/hh869301(v=vs.85).aspx + const USER_AGENT_MS_EDGE = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Chrome\/[0-9.]+ (Mobile Safari|Safari)\/[0-9.]+ Edge\/[0-9.]+$/'; + // Firefox User Agent from https://developer.mozilla.org/en-US/docs/Web/HTTP/Gecko_user_agent_string_reference + const USER_AGENT_FIREFOX = '/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/[0-9.]+$/'; + // Chrome User Agent from https://developer.chrome.com/multidevice/user-agent + const USER_AGENT_CHROME = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Chrome\/[0-9.]+ (Mobile Safari|Safari)\/[0-9.]+$/'; + // Safari User Agent from http://www.useragentstring.com/pages/Safari/ + const USER_AGENT_SAFARI = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/[0-9.]+ Safari\/[0-9.A-Z]+$/'; // Android Chrome user agent: https://developers.google.com/chrome/mobile/docs/user-agent const USER_AGENT_ANDROID_MOBILE_CHROME = '#Android.*Chrome/[.0-9]*#'; const USER_AGENT_FREEBOX = '#^Mozilla/5\.0$#'; diff --git a/lib/private/filechunking.php b/lib/private/filechunking.php index 604a607336c..f2cef275458 100644 --- a/lib/private/filechunking.php +++ b/lib/private/filechunking.php @@ -90,7 +90,7 @@ class OC_FileChunking { * Assembles the chunks into the file specified by the path. * Chunks are deleted afterwards. * - * @param string $f target path + * @param resource $f target path * * @return integer assembled file size * @@ -106,6 +106,8 @@ class OC_FileChunking { // remove after reading to directly save space $cache->remove($prefix.$i); $count += fwrite($f, $chunk); + // let php release the memory to work around memory exhausted error with php 5.6 + $chunk = null; } return $count; diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index f6f5a8cc130..b6d0ec3fb34 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/files/storage/local.php @@ -176,7 +176,12 @@ class Local extends \OC\Files\Storage\Common { } public function file_get_contents($path) { - return file_get_contents($this->getSourcePath($path)); + // file_get_contents() has a memory leak: https://bugs.php.net/bug.php?id=61961 + $filename = $this->getSourcePath($path); + $handle = fopen($filename,'rb'); + $content = fread($handle, filesize($filename)); + fclose($handle); + return $content; } public function file_put_contents($path, $data) { diff --git a/lib/private/template.php b/lib/private/template.php index bc706e29344..2653ae6086a 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -333,7 +333,7 @@ class OC_Template extends \OC\Template\Base { * print error page using Exception details * @param Exception $exception */ - public static function printExceptionErrorPage($exception) { + public static function printExceptionErrorPage($exception, $fetchPage = false) { try { $request = \OC::$server->getRequest(); $content = new \OC_Template('', 'exception', 'error', false); @@ -346,6 +346,9 @@ class OC_Template extends \OC\Template\Base { $content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false)); $content->assign('remoteAddr', $request->getRemoteAddress()); $content->assign('requestID', $request->getId()); + if ($fetchPage) { + return $content->fetchPage(); + } $content->printPage(); } catch (\Exception $e) { $logger = \OC::$server->getLogger(); |