diff options
Diffstat (limited to 'lib')
191 files changed, 1032 insertions, 756 deletions
diff --git a/lib/base.php b/lib/base.php index 558be6b570f..8d3baab752e 100644 --- a/lib/base.php +++ b/lib/base.php @@ -100,7 +100,18 @@ class OC { OC_Config::$object = new \OC\Config(self::$configDir); OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT))); - $scriptName = OC_Request::scriptName(); + /** + * FIXME: The following line is required because of a cyclic dependency + * on IRequest. + */ + $params = [ + 'server' => [ + 'SCRIPT_NAME' => $_SERVER['SCRIPT_NAME'], + 'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'], + ], + ]; + $fakeRequest = new \OC\AppFramework\Http\Request($params, null, new \OC\AllConfig(new \OC\SystemConfig())); + $scriptName = $fakeRequest->getScriptName(); if (substr($scriptName, -1) == '/') { $scriptName .= 'index.php'; //make sure suburi follows the same rules as scriptName @@ -230,6 +241,8 @@ class OC { } public static function checkSSL() { + $request = \OC::$server->getRequest(); + // redirect to https site if configured if (\OC::$server->getSystemConfig()->getValue('forcessl', false)) { // Default HSTS policy @@ -240,15 +253,16 @@ class OC { $header .= '; includeSubDomains'; } header($header); - ini_set('session.cookie_secure', 'on'); - if (OC_Request::serverProtocol() <> 'https' and !OC::$CLI) { - $url = 'https://' . OC_Request::serverHost() . OC_Request::requestUri(); + ini_set('session.cookie_secure', true); + + if ($request->getServerProtocol() <> 'https' && !OC::$CLI) { + $url = 'https://' . $request->getServerHost() . $request->getRequestUri(); header("Location: $url"); exit(); } } else { // Invalidate HSTS headers - if (OC_Request::serverProtocol() === 'https') { + if ($request->getServerProtocol() === 'https') { header('Strict-Transport-Security: max-age=0'); } } @@ -391,7 +405,7 @@ class OC { public static function initSession() { // prevents javascript from accessing php session cookies - ini_set('session.cookie_httponly', '1;'); + ini_set('session.cookie_httponly', true); // set the cookie path to the ownCloud directory $cookie_path = OC::$WEBROOT ? : '/'; @@ -478,7 +492,10 @@ class OC { require_once $vendorAutoLoad; } else { OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE); - OC_Template::printErrorPage('Composer autoloader not found, unable to continue.'); + // we can't use the template error page here, because this needs the + // DI container which isn't available yet + print('Composer autoloader not found, unable to continue. Check the folder "3rdparty".'); + exit(); } // setup the basic server @@ -609,18 +626,24 @@ class OC { return; } - $host = OC_Request::insecureServerHost(); - // if the host passed in headers isn't trusted + $request = \OC::$server->getRequest(); + $host = $request->getInsecureServerHost(); + /** + * if the host passed in headers isn't trusted + * FIXME: Should not be in here at all :see_no_evil: + */ if (!OC::$CLI - // overwritehost is always trusted - && OC_Request::getOverwriteHost() === null - && !OC_Request::isTrustedDomain($host) + // overwritehost is always trusted, workaround to not have to make + // \OC\AppFramework\Http\Request::getOverwriteHost public + && self::$server->getConfig()->getSystemValue('overwritehost') === '' + && !\OC::$server->getTrustedDomainHelper()->isTrustedDomain($host) + && self::$server->getConfig()->getSystemValue('installed', false) ) { header('HTTP/1.1 400 Bad Request'); header('Status: 400 Bad Request'); $tmpl = new OCP\Template('core', 'untrustedDomain', 'guest'); - $tmpl->assign('domain', $_SERVER['SERVER_NAME']); + $tmpl->assign('domain', $request->server['SERVER_NAME']); $tmpl->printPage(); exit(); @@ -716,6 +739,7 @@ class OC { * Handle the request */ public static function handleRequest() { + \OC::$server->getEventLogger()->start('handle_request', 'Handle request'); $systemConfig = \OC::$server->getSystemConfig(); // load all the classpaths from the enabled apps so they are available @@ -730,7 +754,7 @@ class OC { exit(); } - $request = OC_Request::getPathInfo(); + $request = \OC::$server->getRequest()->getPathInfo(); if (substr($request, -3) !== '.js') { // we need these files during the upgrade self::checkMaintenanceMode(); self::checkUpgrade(); @@ -760,7 +784,7 @@ class OC { } self::checkSingleUserMode(); OC_Util::setupFS(); - OC::$server->getRouter()->match(OC_Request::getRawPathInfo()); + OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo()); return; } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) { //header('HTTP/1.0 404 Not Found'); @@ -891,7 +915,7 @@ class OC { // if return is true we are logged in -> redirect to the default page if ($return === true) { - $_REQUEST['redirect_url'] = \OC_Request::requestUri(); + $_REQUEST['redirect_url'] = \OC::$server->getRequest()->getRequestUri(); OC_Util::redirectToDefaultPage(); exit; } diff --git a/lib/l10n/af_ZA.js b/lib/l10n/af_ZA.js index 953186be7fe..74f22e6ac46 100644 --- a/lib/l10n/af_ZA.js +++ b/lib/l10n/af_ZA.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Hulp", "Personal" : "Persoonlik", - "Settings" : "Instellings", "Users" : "Gebruikers", "Admin" : "Admin", "Unknown filetype" : "Onbekende leertipe", diff --git a/lib/l10n/af_ZA.json b/lib/l10n/af_ZA.json index 7dd4d1ef718..91f70c2bef0 100644 --- a/lib/l10n/af_ZA.json +++ b/lib/l10n/af_ZA.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Hulp", "Personal" : "Persoonlik", - "Settings" : "Instellings", "Users" : "Gebruikers", "Admin" : "Admin", "Unknown filetype" : "Onbekende leertipe", diff --git a/lib/l10n/ar.js b/lib/l10n/ar.js index 246bffb979c..731b59cfef0 100644 --- a/lib/l10n/ar.js +++ b/lib/l10n/ar.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "المساعدة", "Personal" : "شخصي", - "Settings" : "إعدادات", "Users" : "المستخدمين", "Admin" : "المدير", "No app name specified" : "لا يوجد برنامج بهذا الاسم", diff --git a/lib/l10n/ar.json b/lib/l10n/ar.json index e2eb4272c3e..7055154384c 100644 --- a/lib/l10n/ar.json +++ b/lib/l10n/ar.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "المساعدة", "Personal" : "شخصي", - "Settings" : "إعدادات", "Users" : "المستخدمين", "Admin" : "المدير", "No app name specified" : "لا يوجد برنامج بهذا الاسم", diff --git a/lib/l10n/ast.js b/lib/l10n/ast.js index e7a11ccfe22..7278e0c2418 100644 --- a/lib/l10n/ast.js +++ b/lib/l10n/ast.js @@ -10,7 +10,6 @@ OC.L10N.register( "PHP %s or higher is required." : "Necesítase PHP %s o superior", "Help" : "Ayuda", "Personal" : "Personal", - "Settings" : "Axustes", "Users" : "Usuarios", "Admin" : "Almin", "Recommended" : "Recomendáu", @@ -94,12 +93,12 @@ OC.L10N.register( "A valid password must be provided" : "Tien d'apurrise una contraseña válida", "The username is already being used" : "El nome d'usuariu yá ta usándose", "No database drivers (sqlite, mysql, or postgresql) installed." : "Nun hai controladores de bases de datos (sqlite, mysql, o postgresql)", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Davezu los permisos puen iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu raigañu%s.", "Cannot write into \"config\" directory" : "Nun pue escribise nel direutoriu \"config\"", "Cannot write into \"apps\" directory" : "Nun pue escribise nel direutoriu \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Esto pue iguase %sdando permisos d'escritura al sirvidor Web nel direutoriu%s d'apps o deshabilitando la tienda d'apps nel ficheru de configuración.", "Cannot create \"data\" directory (%s)" : "Nun pue crease'l direutoriu \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Esto pue iguase davezu <a href=\"%s\" target=\"_blank\">dándo-y accesu d'escritura al direutoriu raigañu</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Davezu los permisos puen iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu raigañu%s.", "Setting locale to %s failed" : "Falló l'activación del idioma %s", "Please install one of these locales on your system and restart your webserver." : "Instala ún d'estos locales nel to sistema y reanicia'l sirvidor web", "Please ask your server administrator to install the module." : "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.", diff --git a/lib/l10n/ast.json b/lib/l10n/ast.json index b8fce475855..8ec7d2536b1 100644 --- a/lib/l10n/ast.json +++ b/lib/l10n/ast.json @@ -8,7 +8,6 @@ "PHP %s or higher is required." : "Necesítase PHP %s o superior", "Help" : "Ayuda", "Personal" : "Personal", - "Settings" : "Axustes", "Users" : "Usuarios", "Admin" : "Almin", "Recommended" : "Recomendáu", @@ -92,12 +91,12 @@ "A valid password must be provided" : "Tien d'apurrise una contraseña válida", "The username is already being used" : "El nome d'usuariu yá ta usándose", "No database drivers (sqlite, mysql, or postgresql) installed." : "Nun hai controladores de bases de datos (sqlite, mysql, o postgresql)", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Davezu los permisos puen iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu raigañu%s.", "Cannot write into \"config\" directory" : "Nun pue escribise nel direutoriu \"config\"", "Cannot write into \"apps\" directory" : "Nun pue escribise nel direutoriu \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Esto pue iguase %sdando permisos d'escritura al sirvidor Web nel direutoriu%s d'apps o deshabilitando la tienda d'apps nel ficheru de configuración.", "Cannot create \"data\" directory (%s)" : "Nun pue crease'l direutoriu \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Esto pue iguase davezu <a href=\"%s\" target=\"_blank\">dándo-y accesu d'escritura al direutoriu raigañu</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Davezu los permisos puen iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu raigañu%s.", "Setting locale to %s failed" : "Falló l'activación del idioma %s", "Please install one of these locales on your system and restart your webserver." : "Instala ún d'estos locales nel to sistema y reanicia'l sirvidor web", "Please ask your server administrator to install the module." : "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.", diff --git a/lib/l10n/az.js b/lib/l10n/az.js index c9eb5ee2b3a..9598d4b62ff 100644 --- a/lib/l10n/az.js +++ b/lib/l10n/az.js @@ -8,7 +8,6 @@ OC.L10N.register( "Sample configuration detected" : "Konfiqurasiya nüsxəsi təyin edildi", "Help" : "Kömək", "Personal" : "Şəxsi", - "Settings" : "Quraşdırmalar", "Users" : "İstifadəçilər", "Admin" : "İnzibatçı", "No app name specified" : "Proqram adı təyin edilməyib", diff --git a/lib/l10n/az.json b/lib/l10n/az.json index d9b3e95e08b..2d54f5df9ad 100644 --- a/lib/l10n/az.json +++ b/lib/l10n/az.json @@ -6,7 +6,6 @@ "Sample configuration detected" : "Konfiqurasiya nüsxəsi təyin edildi", "Help" : "Kömək", "Personal" : "Şəxsi", - "Settings" : "Quraşdırmalar", "Users" : "İstifadəçilər", "Admin" : "İnzibatçı", "No app name specified" : "Proqram adı təyin edilməyib", diff --git a/lib/l10n/be.js b/lib/l10n/be.js index f34545ade21..9e8bfb415e4 100644 --- a/lib/l10n/be.js +++ b/lib/l10n/be.js @@ -1,7 +1,6 @@ OC.L10N.register( "lib", { - "Settings" : "Налады", "today" : "Сёння", "yesterday" : "Ўчора", "_%n day ago_::_%n days ago_" : ["","","",""], diff --git a/lib/l10n/be.json b/lib/l10n/be.json index 91f99445d7a..93db93a7e91 100644 --- a/lib/l10n/be.json +++ b/lib/l10n/be.json @@ -1,5 +1,4 @@ { "translations": { - "Settings" : "Налады", "today" : "Сёння", "yesterday" : "Ўчора", "_%n day ago_::_%n days ago_" : ["","","",""], diff --git a/lib/l10n/bg_BG.js b/lib/l10n/bg_BG.js index 009d582cb94..6d7238deb2b 100644 --- a/lib/l10n/bg_BG.js +++ b/lib/l10n/bg_BG.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "Необходим е ownCloud с по-ниска версия от %s.", "Help" : "Помощ", "Personal" : "Лични", - "Settings" : "Настройки", "Users" : "Потребители", "Admin" : "Админ", "Recommended" : "Препоръчано", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Валидна парола трябва да бъде зададена.", "The username is already being used" : "Това потребителско име е вече заето.", "No database drivers (sqlite, mysql, or postgresql) installed." : "Липсват инсталирани драйвери за бази данни(sqlite, mysql или postgresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Правата за достъп обикновено могат да бъдат оправени като %s даде разрешение на уеб сървъра да пише в root папката %s.", "Cannot write into \"config\" directory" : "Неуспешен опит за запис в \"config\" папката.", "Cannot write into \"apps\" directory" : "Неуспешен опит за запис в \"apps\" папката.", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Това обикновено може да бъде оправено като %s даде разрешение на уеб сървъра да записва в app папката %s или като изключи магазина за приложения в config файла.", "Cannot create \"data\" directory (%s)" : "Неуспешен опит за създаване на \"data\" папката (%s).", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Това обикновено може да бъде оправено като <a href=\"%s\" target=\"_blank\">дадеш разрешение на уеб сървъра да записва в root папката</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Правата за достъп обикновено могат да бъдат оправени като %s даде разрешение на уеб сървъра да пише в root папката %s.", "Setting locale to %s failed" : "Неуспешно задаване на %s като настройка език-държава.", "Please install one of these locales on your system and restart your webserver." : "Моля, инсталирай едно от следните език-държава на сървъра и рестартирай уеб сървъра.", "Please ask your server administrator to install the module." : "Моля, поискай твоят администратор да инсталира модула.", diff --git a/lib/l10n/bg_BG.json b/lib/l10n/bg_BG.json index 2e9c228729d..8c88907836a 100644 --- a/lib/l10n/bg_BG.json +++ b/lib/l10n/bg_BG.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "Необходим е ownCloud с по-ниска версия от %s.", "Help" : "Помощ", "Personal" : "Лични", - "Settings" : "Настройки", "Users" : "Потребители", "Admin" : "Админ", "Recommended" : "Препоръчано", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Валидна парола трябва да бъде зададена.", "The username is already being used" : "Това потребителско име е вече заето.", "No database drivers (sqlite, mysql, or postgresql) installed." : "Липсват инсталирани драйвери за бази данни(sqlite, mysql или postgresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Правата за достъп обикновено могат да бъдат оправени като %s даде разрешение на уеб сървъра да пише в root папката %s.", "Cannot write into \"config\" directory" : "Неуспешен опит за запис в \"config\" папката.", "Cannot write into \"apps\" directory" : "Неуспешен опит за запис в \"apps\" папката.", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Това обикновено може да бъде оправено като %s даде разрешение на уеб сървъра да записва в app папката %s или като изключи магазина за приложения в config файла.", "Cannot create \"data\" directory (%s)" : "Неуспешен опит за създаване на \"data\" папката (%s).", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Това обикновено може да бъде оправено като <a href=\"%s\" target=\"_blank\">дадеш разрешение на уеб сървъра да записва в root папката</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Правата за достъп обикновено могат да бъдат оправени като %s даде разрешение на уеб сървъра да пише в root папката %s.", "Setting locale to %s failed" : "Неуспешно задаване на %s като настройка език-държава.", "Please install one of these locales on your system and restart your webserver." : "Моля, инсталирай едно от следните език-държава на сървъра и рестартирай уеб сървъра.", "Please ask your server administrator to install the module." : "Моля, поискай твоят администратор да инсталира модула.", diff --git a/lib/l10n/bn_BD.js b/lib/l10n/bn_BD.js index 432d033352f..3f26d26410e 100644 --- a/lib/l10n/bn_BD.js +++ b/lib/l10n/bn_BD.js @@ -8,7 +8,6 @@ OC.L10N.register( "Sample configuration detected" : "নমুনা কনফিগারেশন পাওয়া গেছে", "Help" : "সহায়িকা", "Personal" : "ব্যক্তিগত", - "Settings" : "নিয়ামকসমূহ", "Users" : "ব্যবহারকারী", "Admin" : "প্রশাসন", "No app name specified" : "কোন অ্যাপ নাম সুনির্দিষ্ট নয়", diff --git a/lib/l10n/bn_BD.json b/lib/l10n/bn_BD.json index 08e5edc50d2..224d042a001 100644 --- a/lib/l10n/bn_BD.json +++ b/lib/l10n/bn_BD.json @@ -6,7 +6,6 @@ "Sample configuration detected" : "নমুনা কনফিগারেশন পাওয়া গেছে", "Help" : "সহায়িকা", "Personal" : "ব্যক্তিগত", - "Settings" : "নিয়ামকসমূহ", "Users" : "ব্যবহারকারী", "Admin" : "প্রশাসন", "No app name specified" : "কোন অ্যাপ নাম সুনির্দিষ্ট নয়", diff --git a/lib/l10n/bn_IN.js b/lib/l10n/bn_IN.js index 9933281c8d8..a12702211c2 100644 --- a/lib/l10n/bn_IN.js +++ b/lib/l10n/bn_IN.js @@ -1,7 +1,6 @@ OC.L10N.register( "lib", { - "Settings" : "সেটিংস", "_%n day ago_::_%n days ago_" : ["",""], "_%n month ago_::_%n months ago_" : ["",""], "_%n year ago_::_%n years ago_" : ["",""], diff --git a/lib/l10n/bn_IN.json b/lib/l10n/bn_IN.json index 239478adca6..b994fa289eb 100644 --- a/lib/l10n/bn_IN.json +++ b/lib/l10n/bn_IN.json @@ -1,5 +1,4 @@ { "translations": { - "Settings" : "সেটিংস", "_%n day ago_::_%n days ago_" : ["",""], "_%n month ago_::_%n months ago_" : ["",""], "_%n year ago_::_%n years ago_" : ["",""], diff --git a/lib/l10n/bs.js b/lib/l10n/bs.js index cad023a3701..2685f38ea40 100644 --- a/lib/l10n/bs.js +++ b/lib/l10n/bs.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Pomoć", "Personal" : "Osobno", - "Settings" : "Postavke", "Users" : "Korisnici", "Admin" : "Admin", "Recommended" : "Preporučljivo", diff --git a/lib/l10n/bs.json b/lib/l10n/bs.json index df1b3fbd25e..2ae3317736e 100644 --- a/lib/l10n/bs.json +++ b/lib/l10n/bs.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Pomoć", "Personal" : "Osobno", - "Settings" : "Postavke", "Users" : "Korisnici", "Admin" : "Admin", "Recommended" : "Preporučljivo", diff --git a/lib/l10n/ca.js b/lib/l10n/ca.js index d086be8adac..570ffe4e83e 100644 --- a/lib/l10n/ca.js +++ b/lib/l10n/ca.js @@ -10,7 +10,6 @@ OC.L10N.register( "PHP %s or higher is required." : "Es requereix PHP %s o superior.", "Help" : "Ajuda", "Personal" : "Personal", - "Settings" : "Configuració", "Users" : "Usuaris", "Admin" : "Administració", "Recommended" : "Recomanat", @@ -93,12 +92,12 @@ OC.L10N.register( "A valid password must be provided" : "Heu de facilitar una contrasenya vàlida", "The username is already being used" : "El nom d'usuari ja està en ús", "No database drivers (sqlite, mysql, or postgresql) installed." : "No hi ha instal·lats controladors de bases de dades (sqlite, mysql o postgresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s", "Cannot write into \"config\" directory" : "No es pot escriure a la carpeta \"config\"", "Cannot write into \"apps\" directory" : "No es pot escriure a la carpeta \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta d'aplicacions %s o inhabilitant la botiga d'aplicacions en el fitxer de configuració.", "Cannot create \"data\" directory (%s)" : "No es pot crear la carpeta \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Aixó normalment es por solucionar <a href=\"%s\" target=\"_blank\">donant al servidor web permís d'accés a la carpeta arrel</a>", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s", "Setting locale to %s failed" : "Ha fallat en establir la llengua a %s", "Please install one of these locales on your system and restart your webserver." : "Siusplau, instal·li un d'aquests arxius de localització en el seu sistema, i reinicii el seu servidor web.", "Please ask your server administrator to install the module." : "Demaneu a l'administrador del sistema que instal·li el mòdul.", diff --git a/lib/l10n/ca.json b/lib/l10n/ca.json index e0928e6d606..23cea38826f 100644 --- a/lib/l10n/ca.json +++ b/lib/l10n/ca.json @@ -8,7 +8,6 @@ "PHP %s or higher is required." : "Es requereix PHP %s o superior.", "Help" : "Ajuda", "Personal" : "Personal", - "Settings" : "Configuració", "Users" : "Usuaris", "Admin" : "Administració", "Recommended" : "Recomanat", @@ -91,12 +90,12 @@ "A valid password must be provided" : "Heu de facilitar una contrasenya vàlida", "The username is already being used" : "El nom d'usuari ja està en ús", "No database drivers (sqlite, mysql, or postgresql) installed." : "No hi ha instal·lats controladors de bases de dades (sqlite, mysql o postgresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s", "Cannot write into \"config\" directory" : "No es pot escriure a la carpeta \"config\"", "Cannot write into \"apps\" directory" : "No es pot escriure a la carpeta \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta d'aplicacions %s o inhabilitant la botiga d'aplicacions en el fitxer de configuració.", "Cannot create \"data\" directory (%s)" : "No es pot crear la carpeta \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Aixó normalment es por solucionar <a href=\"%s\" target=\"_blank\">donant al servidor web permís d'accés a la carpeta arrel</a>", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s", "Setting locale to %s failed" : "Ha fallat en establir la llengua a %s", "Please install one of these locales on your system and restart your webserver." : "Siusplau, instal·li un d'aquests arxius de localització en el seu sistema, i reinicii el seu servidor web.", "Please ask your server administrator to install the module." : "Demaneu a l'administrador del sistema que instal·li el mòdul.", diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js index 3eba7347b72..7f8bd1e75eb 100644 --- a/lib/l10n/cs_CZ.js +++ b/lib/l10n/cs_CZ.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "Je vyžadován ownCloud ve verzi nižší než %s.", "Help" : "Nápověda", "Personal" : "Osobní", - "Settings" : "Nastavení", "Users" : "Uživatelé", "Admin" : "Administrace", "Recommended" : "Doporučené", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Musíte zadat platné heslo", "The username is already being used" : "Uživatelské jméno je již využíváno", "No database drivers (sqlite, mysql, or postgresql) installed." : "Nejsou instalovány ovladače databází (sqlite, mysql nebo postresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnění lze obvykle napravit %spovolením zápisu webovému serveru do kořenového adresáře%s.", "Cannot write into \"config\" directory" : "Nelze zapisovat do adresáře \"config\"", "Cannot write into \"apps\" directory" : "Nelze zapisovat do adresáře \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "To lze obvykle vyřešit %spovolením zápisu webovému serveru do adresáře apps%s nebo zakázáním appstore v konfiguračním souboru.", "Cannot create \"data\" directory (%s)" : "Nelze vytvořit adresář \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "To lze obvykle vyřešit <a href=\"%s\" target=\"_blank\">povolením zápisu webovému serveru do kořenového adresáře</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnění lze obvykle napravit %spovolením zápisu webovému serveru do kořenového adresáře%s.", "Setting locale to %s failed" : "Nastavení jazyka na %s selhalo", "Please install one of these locales on your system and restart your webserver." : "Prosím nainstalujte alespoň jeden z těchto jazyků do svého systému a restartujte webový server.", "Please ask your server administrator to install the module." : "Požádejte svého správce systému o instalaci tohoto modulu.", diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json index dbbdccf9261..fefc6f0af7f 100644 --- a/lib/l10n/cs_CZ.json +++ b/lib/l10n/cs_CZ.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "Je vyžadován ownCloud ve verzi nižší než %s.", "Help" : "Nápověda", "Personal" : "Osobní", - "Settings" : "Nastavení", "Users" : "Uživatelé", "Admin" : "Administrace", "Recommended" : "Doporučené", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Musíte zadat platné heslo", "The username is already being used" : "Uživatelské jméno je již využíváno", "No database drivers (sqlite, mysql, or postgresql) installed." : "Nejsou instalovány ovladače databází (sqlite, mysql nebo postresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnění lze obvykle napravit %spovolením zápisu webovému serveru do kořenového adresáře%s.", "Cannot write into \"config\" directory" : "Nelze zapisovat do adresáře \"config\"", "Cannot write into \"apps\" directory" : "Nelze zapisovat do adresáře \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "To lze obvykle vyřešit %spovolením zápisu webovému serveru do adresáře apps%s nebo zakázáním appstore v konfiguračním souboru.", "Cannot create \"data\" directory (%s)" : "Nelze vytvořit adresář \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "To lze obvykle vyřešit <a href=\"%s\" target=\"_blank\">povolením zápisu webovému serveru do kořenového adresáře</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnění lze obvykle napravit %spovolením zápisu webovému serveru do kořenového adresáře%s.", "Setting locale to %s failed" : "Nastavení jazyka na %s selhalo", "Please install one of these locales on your system and restart your webserver." : "Prosím nainstalujte alespoň jeden z těchto jazyků do svého systému a restartujte webový server.", "Please ask your server administrator to install the module." : "Požádejte svého správce systému o instalaci tohoto modulu.", diff --git a/lib/l10n/cy_GB.js b/lib/l10n/cy_GB.js index cd3772cd7c1..2b4a4c40221 100644 --- a/lib/l10n/cy_GB.js +++ b/lib/l10n/cy_GB.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Cymorth", "Personal" : "Personol", - "Settings" : "Gosodiadau", "Users" : "Defnyddwyr", "Admin" : "Gweinyddu", "today" : "heddiw", diff --git a/lib/l10n/cy_GB.json b/lib/l10n/cy_GB.json index 3d88f8b876b..8a5d8a9c5bb 100644 --- a/lib/l10n/cy_GB.json +++ b/lib/l10n/cy_GB.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Cymorth", "Personal" : "Personol", - "Settings" : "Gosodiadau", "Users" : "Defnyddwyr", "Admin" : "Gweinyddu", "today" : "heddiw", diff --git a/lib/l10n/da.js b/lib/l10n/da.js index 362f27e3416..b86e8997e6f 100644 --- a/lib/l10n/da.js +++ b/lib/l10n/da.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "Der kræves ownCloud i en version som er lavere end %s.", "Help" : "Hjælp", "Personal" : "Personligt", - "Settings" : "Indstillinger", "Users" : "Brugere", "Admin" : "Admin", "Recommended" : "Anbefalet", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "En gyldig adgangskode skal angives", "The username is already being used" : "Brugernavnet er allerede i brug", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ingen database driver (sqlite, mysql eller postgresql) er installeret.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rettigheder kan som regel rettes ved %sat give webserveren skriveadgang til rodmappen%s.", "Cannot write into \"config\" directory" : "Kan ikke skrive til mappen \"config\"", "Cannot write into \"apps\" directory" : "Kan ikke skrive til mappen \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dette kan som regel rettes ved at %sgive webserveren skriveadgang til apps-mappen%s eller slå appstore fra i config-filen.", "Cannot create \"data\" directory (%s)" : "Kan ikke oprette mappen \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dette kan som regel rettes ved <a href=\"%s\" target=\"_blank\">give webserveren skriveadgang til rodmappen</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rettigheder kan som regel rettes ved %sat give webserveren skriveadgang til rodmappen%s.", "Setting locale to %s failed" : "Angivelse af %s for lokalitet mislykkedes", "Please install one of these locales on your system and restart your webserver." : "Installér venligst én af disse lokaliteter på dit system, og genstart din webserver.", "Please ask your server administrator to install the module." : "Du bedes anmode din serveradministrator om at installere modulet.", diff --git a/lib/l10n/da.json b/lib/l10n/da.json index b0ab2b4f6e7..94a060735f2 100644 --- a/lib/l10n/da.json +++ b/lib/l10n/da.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "Der kræves ownCloud i en version som er lavere end %s.", "Help" : "Hjælp", "Personal" : "Personligt", - "Settings" : "Indstillinger", "Users" : "Brugere", "Admin" : "Admin", "Recommended" : "Anbefalet", @@ -106,12 +105,12 @@ "A valid password must be provided" : "En gyldig adgangskode skal angives", "The username is already being used" : "Brugernavnet er allerede i brug", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ingen database driver (sqlite, mysql eller postgresql) er installeret.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rettigheder kan som regel rettes ved %sat give webserveren skriveadgang til rodmappen%s.", "Cannot write into \"config\" directory" : "Kan ikke skrive til mappen \"config\"", "Cannot write into \"apps\" directory" : "Kan ikke skrive til mappen \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dette kan som regel rettes ved at %sgive webserveren skriveadgang til apps-mappen%s eller slå appstore fra i config-filen.", "Cannot create \"data\" directory (%s)" : "Kan ikke oprette mappen \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dette kan som regel rettes ved <a href=\"%s\" target=\"_blank\">give webserveren skriveadgang til rodmappen</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rettigheder kan som regel rettes ved %sat give webserveren skriveadgang til rodmappen%s.", "Setting locale to %s failed" : "Angivelse af %s for lokalitet mislykkedes", "Please install one of these locales on your system and restart your webserver." : "Installér venligst én af disse lokaliteter på dit system, og genstart din webserver.", "Please ask your server administrator to install the module." : "Du bedes anmode din serveradministrator om at installere modulet.", diff --git a/lib/l10n/de.js b/lib/l10n/de.js index 0ed8a3b208a..e8fc0cefdd9 100644 --- a/lib/l10n/de.js +++ b/lib/l10n/de.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud wird in einer früheren Version als %s benötigt.", "Help" : "Hilfe", "Personal" : "Persönlich", - "Settings" : "Einstellungen", "Users" : "Benutzer", "Admin" : "Administration", "Recommended" : "Empfohlen", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden", "The username is already being used" : "Dieser Benutzername existiert bereits", "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MySQL oder PostgreSQL) installiert.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.", "Cannot write into \"config\" directory" : "Das Schreiben in das „config“-Verzeichnis ist nicht möglich", "Cannot write into \"apps\" directory" : "Das Schreiben in das „apps“-Verzeichnis ist nicht möglich", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Anwendungsverzeichnis %s gegeben wird oder die Anwendungsauswahl in der Konfigurationsdatei deaktiviert wird.", "Cannot create \"data\" directory (%s)" : "Das Erstellen des „data“-Verzeichnisses ist nicht möglich (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.", "Setting locale to %s failed" : "Das Setzen der Umgebungslokale auf %s fehlgeschlagen", "Please install one of these locales on your system and restart your webserver." : "Bitte installiere eine dieser Sprachen auf Deinem System und starte den Webserver neu.", "Please ask your server administrator to install the module." : "Bitte frage, für die Installation des Moduls, Deinen Server-Administrator.", diff --git a/lib/l10n/de.json b/lib/l10n/de.json index 6f101492749..fcebdf87fba 100644 --- a/lib/l10n/de.json +++ b/lib/l10n/de.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud wird in einer früheren Version als %s benötigt.", "Help" : "Hilfe", "Personal" : "Persönlich", - "Settings" : "Einstellungen", "Users" : "Benutzer", "Admin" : "Administration", "Recommended" : "Empfohlen", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden", "The username is already being used" : "Dieser Benutzername existiert bereits", "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MySQL oder PostgreSQL) installiert.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.", "Cannot write into \"config\" directory" : "Das Schreiben in das „config“-Verzeichnis ist nicht möglich", "Cannot write into \"apps\" directory" : "Das Schreiben in das „apps“-Verzeichnis ist nicht möglich", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Anwendungsverzeichnis %s gegeben wird oder die Anwendungsauswahl in der Konfigurationsdatei deaktiviert wird.", "Cannot create \"data\" directory (%s)" : "Das Erstellen des „data“-Verzeichnisses ist nicht möglich (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.", "Setting locale to %s failed" : "Das Setzen der Umgebungslokale auf %s fehlgeschlagen", "Please install one of these locales on your system and restart your webserver." : "Bitte installiere eine dieser Sprachen auf Deinem System und starte den Webserver neu.", "Please ask your server administrator to install the module." : "Bitte frage, für die Installation des Moduls, Deinen Server-Administrator.", diff --git a/lib/l10n/de_AT.js b/lib/l10n/de_AT.js index 3c567ba4d2d..4dda0e03fd3 100644 --- a/lib/l10n/de_AT.js +++ b/lib/l10n/de_AT.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Hilfe", "Personal" : "Persönlich", - "Settings" : "Einstellungen", "_%n day ago_::_%n days ago_" : ["",""], "_%n month ago_::_%n months ago_" : ["",""], "_%n year ago_::_%n years ago_" : ["",""], diff --git a/lib/l10n/de_AT.json b/lib/l10n/de_AT.json index 6e81c34cf1a..90fce6927b0 100644 --- a/lib/l10n/de_AT.json +++ b/lib/l10n/de_AT.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Hilfe", "Personal" : "Persönlich", - "Settings" : "Einstellungen", "_%n day ago_::_%n days ago_" : ["",""], "_%n month ago_::_%n months ago_" : ["",""], "_%n year ago_::_%n years ago_" : ["",""], diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js index 34b75e28884..8d106b62be3 100644 --- a/lib/l10n/de_DE.js +++ b/lib/l10n/de_DE.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud wird in einer früheren Version als %s benötigt.", "Help" : "Hilfe", "Personal" : "Persönlich", - "Settings" : "Einstellungen", "Users" : "Benutzer", "Admin" : "Administrator", "Recommended" : "Empfohlen", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden", "The username is already being used" : "Der Benutzername existiert bereits", "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MYSQL oder PostgreSQL) installiert.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.", "Cannot write into \"config\" directory" : "Das Schreiben in das »config«-Verzeichnis ist nicht möglich", "Cannot write into \"apps\" directory" : "Das Schreiben in das „apps“-Verzeichnis ist nicht möglich", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Anwendungsverzeichnis %s gegeben wird oder die Anwendungsauswahl in der Konfigurationsdatei deaktiviert wird.", "Cannot create \"data\" directory (%s)" : "Das Erstellen des „data“-Verzeichnisses ist nicht möglich (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.", "Setting locale to %s failed" : "Das Setzen der Umgebungslokale auf %s fehlgeschlagen", "Please install one of these locales on your system and restart your webserver." : "Bitte installieren Sie eine dieser Sprachen auf Ihrem System und starten Sie den Webserver neu.", "Please ask your server administrator to install the module." : "Bitte fragen Sie, für die Installation des Moduls, Ihren Server-Administrator.", diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json index a64b625fa8e..4d22a549fa4 100644 --- a/lib/l10n/de_DE.json +++ b/lib/l10n/de_DE.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud wird in einer früheren Version als %s benötigt.", "Help" : "Hilfe", "Personal" : "Persönlich", - "Settings" : "Einstellungen", "Users" : "Benutzer", "Admin" : "Administrator", "Recommended" : "Empfohlen", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden", "The username is already being used" : "Der Benutzername existiert bereits", "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MYSQL oder PostgreSQL) installiert.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.", "Cannot write into \"config\" directory" : "Das Schreiben in das »config«-Verzeichnis ist nicht möglich", "Cannot write into \"apps\" directory" : "Das Schreiben in das „apps“-Verzeichnis ist nicht möglich", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Anwendungsverzeichnis %s gegeben wird oder die Anwendungsauswahl in der Konfigurationsdatei deaktiviert wird.", "Cannot create \"data\" directory (%s)" : "Das Erstellen des „data“-Verzeichnisses ist nicht möglich (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.", "Setting locale to %s failed" : "Das Setzen der Umgebungslokale auf %s fehlgeschlagen", "Please install one of these locales on your system and restart your webserver." : "Bitte installieren Sie eine dieser Sprachen auf Ihrem System und starten Sie den Webserver neu.", "Please ask your server administrator to install the module." : "Bitte fragen Sie, für die Installation des Moduls, Ihren Server-Administrator.", diff --git a/lib/l10n/el.js b/lib/l10n/el.js index db45139a1cb..8272add406f 100644 --- a/lib/l10n/el.js +++ b/lib/l10n/el.js @@ -10,7 +10,6 @@ OC.L10N.register( "PHP %s or higher is required." : "PHP %s ή νεώτερη απαιτείται.", "Help" : "Βοήθεια", "Personal" : "Προσωπικά", - "Settings" : "Ρυθμίσεις", "Users" : "Χρήστες", "Admin" : "Διαχείριση", "Recommended" : "Προτείνεται", @@ -96,12 +95,12 @@ OC.L10N.register( "A valid password must be provided" : "Πρέπει να δοθεί έγκυρο συνθηματικό", "The username is already being used" : "Το όνομα χρήστη είναι κατειλημμένο", "No database drivers (sqlite, mysql, or postgresql) installed." : "Δεν βρέθηκαν εγκατεστημένοι οδηγοί βάσεων δεδομένων (sqlite, mysql, or postgresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Τα δικαιώματα πρόσβασης μπορούν συνήθως να διορθωθούν %sδίνοντας δικαιώματα εγγραφής για τον βασικό κατάλογο στο διακομιστή δικτύου%s.", "Cannot write into \"config\" directory" : "Αδυναμία εγγραφής στον κατάλογο \"config\"", "Cannot write into \"apps\" directory" : "Αδυναμία εγγραφής στον κατάλογο \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Αυτό μπορεί συνήθως να διορθωθεί %sδίνοντας διακαιώματα εγγραφής για τον κατάλογο εφαρμογών στο διακομιστή δικτύου%s ή απενεργοποιώντας το κέντρο εφαρμογών στο αρχείο config.", "Cannot create \"data\" directory (%s)" : "Αδυναμία δημιουργίας του καταλόγου \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Αυτό μπορεί συνήθως να διορθωθεί <a href=\"%s\" target=\"_blank\">δίνοντας δικαιώματα εγγραφής για το βασικό κατάλογο στο διακομιστή δικτύου</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Τα δικαιώματα πρόσβασης μπορούν συνήθως να διορθωθούν %sδίνοντας δικαιώματα εγγραφής για τον βασικό κατάλογο στο διακομιστή δικτύου%s.", "Setting locale to %s failed" : "Ρύθμιση τοπικών ρυθμίσεων σε %s απέτυχε", "Please install one of these locales on your system and restart your webserver." : "Παρακαλώ να εγκαταστήσετε μία από αυτές τις τοπικές ρυθμίσεις στο σύστημά σας και να επανεκκινήσετε τον διακομιστή δικτύου σας.", "Please ask your server administrator to install the module." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να εγκαταστήσει τη μονάδα.", diff --git a/lib/l10n/el.json b/lib/l10n/el.json index da637c4a12b..c62fd99589b 100644 --- a/lib/l10n/el.json +++ b/lib/l10n/el.json @@ -8,7 +8,6 @@ "PHP %s or higher is required." : "PHP %s ή νεώτερη απαιτείται.", "Help" : "Βοήθεια", "Personal" : "Προσωπικά", - "Settings" : "Ρυθμίσεις", "Users" : "Χρήστες", "Admin" : "Διαχείριση", "Recommended" : "Προτείνεται", @@ -94,12 +93,12 @@ "A valid password must be provided" : "Πρέπει να δοθεί έγκυρο συνθηματικό", "The username is already being used" : "Το όνομα χρήστη είναι κατειλημμένο", "No database drivers (sqlite, mysql, or postgresql) installed." : "Δεν βρέθηκαν εγκατεστημένοι οδηγοί βάσεων δεδομένων (sqlite, mysql, or postgresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Τα δικαιώματα πρόσβασης μπορούν συνήθως να διορθωθούν %sδίνοντας δικαιώματα εγγραφής για τον βασικό κατάλογο στο διακομιστή δικτύου%s.", "Cannot write into \"config\" directory" : "Αδυναμία εγγραφής στον κατάλογο \"config\"", "Cannot write into \"apps\" directory" : "Αδυναμία εγγραφής στον κατάλογο \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Αυτό μπορεί συνήθως να διορθωθεί %sδίνοντας διακαιώματα εγγραφής για τον κατάλογο εφαρμογών στο διακομιστή δικτύου%s ή απενεργοποιώντας το κέντρο εφαρμογών στο αρχείο config.", "Cannot create \"data\" directory (%s)" : "Αδυναμία δημιουργίας του καταλόγου \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Αυτό μπορεί συνήθως να διορθωθεί <a href=\"%s\" target=\"_blank\">δίνοντας δικαιώματα εγγραφής για το βασικό κατάλογο στο διακομιστή δικτύου</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Τα δικαιώματα πρόσβασης μπορούν συνήθως να διορθωθούν %sδίνοντας δικαιώματα εγγραφής για τον βασικό κατάλογο στο διακομιστή δικτύου%s.", "Setting locale to %s failed" : "Ρύθμιση τοπικών ρυθμίσεων σε %s απέτυχε", "Please install one of these locales on your system and restart your webserver." : "Παρακαλώ να εγκαταστήσετε μία από αυτές τις τοπικές ρυθμίσεις στο σύστημά σας και να επανεκκινήσετε τον διακομιστή δικτύου σας.", "Please ask your server administrator to install the module." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να εγκαταστήσει τη μονάδα.", diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js index e3c2a7ab67d..6bf8f1ee211 100644 --- a/lib/l10n/en_GB.js +++ b/lib/l10n/en_GB.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud with a version lower than %s is required.", "Help" : "Help", "Personal" : "Personal", - "Settings" : "Settings", "Users" : "Users", "Admin" : "Admin", "Recommended" : "Recommended", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "A valid password must be provided", "The username is already being used" : "The username is already being used", "No database drivers (sqlite, mysql, or postgresql) installed." : "No database drivers (sqlite, mysql, or postgresql) installed.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s.", "Cannot write into \"config\" directory" : "Cannot write into \"config\" directory", "Cannot write into \"apps\" directory" : "Cannot write into \"apps\" directory", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file.", "Cannot create \"data\" directory (%s)" : "Cannot create \"data\" directory (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s.", "Setting locale to %s failed" : "Setting locale to %s failed", "Please install one of these locales on your system and restart your webserver." : "Please install one of these locales on your system and restart your webserver.", "Please ask your server administrator to install the module." : "Please ask your server administrator to install the module.", diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json index 013afd3a0d1..f5672749549 100644 --- a/lib/l10n/en_GB.json +++ b/lib/l10n/en_GB.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud with a version lower than %s is required.", "Help" : "Help", "Personal" : "Personal", - "Settings" : "Settings", "Users" : "Users", "Admin" : "Admin", "Recommended" : "Recommended", @@ -106,12 +105,12 @@ "A valid password must be provided" : "A valid password must be provided", "The username is already being used" : "The username is already being used", "No database drivers (sqlite, mysql, or postgresql) installed." : "No database drivers (sqlite, mysql, or postgresql) installed.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s.", "Cannot write into \"config\" directory" : "Cannot write into \"config\" directory", "Cannot write into \"apps\" directory" : "Cannot write into \"apps\" directory", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file.", "Cannot create \"data\" directory (%s)" : "Cannot create \"data\" directory (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s.", "Setting locale to %s failed" : "Setting locale to %s failed", "Please install one of these locales on your system and restart your webserver." : "Please install one of these locales on your system and restart your webserver.", "Please ask your server administrator to install the module." : "Please ask your server administrator to install the module.", diff --git a/lib/l10n/eo.js b/lib/l10n/eo.js index fdf8d5b5ab0..9a3ca42ac23 100644 --- a/lib/l10n/eo.js +++ b/lib/l10n/eo.js @@ -5,7 +5,6 @@ OC.L10N.register( "PHP %s or higher is required." : "PHP %s aŭ pli alta necesas.", "Help" : "Helpo", "Personal" : "Persona", - "Settings" : "Agordo", "Users" : "Uzantoj", "Admin" : "Administranto", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "La aplikaĵo “%s” ne povas instaliĝi ĉar ĝi ne kongruas kun ĉi tiu eldono de ownCloud.", diff --git a/lib/l10n/eo.json b/lib/l10n/eo.json index bd433423828..17aba175900 100644 --- a/lib/l10n/eo.json +++ b/lib/l10n/eo.json @@ -3,7 +3,6 @@ "PHP %s or higher is required." : "PHP %s aŭ pli alta necesas.", "Help" : "Helpo", "Personal" : "Persona", - "Settings" : "Agordo", "Users" : "Uzantoj", "Admin" : "Administranto", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "La aplikaĵo “%s” ne povas instaliĝi ĉar ĝi ne kongruas kun ĉi tiu eldono de ownCloud.", diff --git a/lib/l10n/es.js b/lib/l10n/es.js index d4a41b9e542..7a7c488bb19 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud con una versión inferior que %s la requerida.", "Help" : "Ayuda", "Personal" : "Personal", - "Settings" : "Ajustes", "Users" : "Usuarios", "Admin" : "Administración", "Recommended" : "Recomendado", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Se debe proporcionar una contraseña válida", "The username is already being used" : "El nombre de usuario ya está en uso", "No database drivers (sqlite, mysql, or postgresql) installed." : "No están instalados los drivers de BBDD (sqlite, mysql, o postgresql)", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Los permisos normalmente puede solucionarse %sdándole al servidor permisos de escritura del directorio raíz%s.", "Cannot write into \"config\" directory" : "No se puede escribir el el directorio de configuración", "Cannot write into \"apps\" directory" : "No se puede escribir en el directorio de \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Esto puede solucionarse fácilmente %sdándole permisos de escritura al servidor en el directorio%s de apps o deshabilitando la tienda de apps en el archivo de configuración.", "Cannot create \"data\" directory (%s)" : "No puedo crear del directorio \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Esto puede ser solucionado <a href=\"%s\" target=\"_blank\">dando al servidor web permisos de escritura en el directorio raíz</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Los permisos normalmente puede solucionarse %sdándole al servidor permisos de escritura del directorio raíz%s.", "Setting locale to %s failed" : "Falló la activación del idioma %s ", "Please install one of these locales on your system and restart your webserver." : "Instale uno de estos idiomas en su sistema y reinicie su servidor web.", "Please ask your server administrator to install the module." : "Consulte al administrador de su servidor para instalar el módulo.", diff --git a/lib/l10n/es.json b/lib/l10n/es.json index 9ee46db45aa..d0a1218eb87 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud con una versión inferior que %s la requerida.", "Help" : "Ayuda", "Personal" : "Personal", - "Settings" : "Ajustes", "Users" : "Usuarios", "Admin" : "Administración", "Recommended" : "Recomendado", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Se debe proporcionar una contraseña válida", "The username is already being used" : "El nombre de usuario ya está en uso", "No database drivers (sqlite, mysql, or postgresql) installed." : "No están instalados los drivers de BBDD (sqlite, mysql, o postgresql)", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Los permisos normalmente puede solucionarse %sdándole al servidor permisos de escritura del directorio raíz%s.", "Cannot write into \"config\" directory" : "No se puede escribir el el directorio de configuración", "Cannot write into \"apps\" directory" : "No se puede escribir en el directorio de \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Esto puede solucionarse fácilmente %sdándole permisos de escritura al servidor en el directorio%s de apps o deshabilitando la tienda de apps en el archivo de configuración.", "Cannot create \"data\" directory (%s)" : "No puedo crear del directorio \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Esto puede ser solucionado <a href=\"%s\" target=\"_blank\">dando al servidor web permisos de escritura en el directorio raíz</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Los permisos normalmente puede solucionarse %sdándole al servidor permisos de escritura del directorio raíz%s.", "Setting locale to %s failed" : "Falló la activación del idioma %s ", "Please install one of these locales on your system and restart your webserver." : "Instale uno de estos idiomas en su sistema y reinicie su servidor web.", "Please ask your server administrator to install the module." : "Consulte al administrador de su servidor para instalar el módulo.", diff --git a/lib/l10n/es_AR.js b/lib/l10n/es_AR.js index bc291ddb3b6..db0da45be58 100644 --- a/lib/l10n/es_AR.js +++ b/lib/l10n/es_AR.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Ayuda", "Personal" : "Personal", - "Settings" : "Configuración", "Users" : "Usuarios", "Admin" : "Administración", "No app name specified" : "No fue especificado el nombre de la app", diff --git a/lib/l10n/es_AR.json b/lib/l10n/es_AR.json index e1245fabfef..2b95e2ab678 100644 --- a/lib/l10n/es_AR.json +++ b/lib/l10n/es_AR.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Ayuda", "Personal" : "Personal", - "Settings" : "Configuración", "Users" : "Usuarios", "Admin" : "Administración", "No app name specified" : "No fue especificado el nombre de la app", diff --git a/lib/l10n/es_CL.js b/lib/l10n/es_CL.js index 84e47673937..70629b8d2db 100644 --- a/lib/l10n/es_CL.js +++ b/lib/l10n/es_CL.js @@ -7,7 +7,6 @@ OC.L10N.register( "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Generalmente esto se puede resolver %s otorgando permisos de escritura al servidor web en la carpeta configurada %s", "Help" : "Ayuda", "Personal" : "Personal", - "Settings" : "Configuración", "Users" : "Usuarios", "Admin" : "Administración", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "La aplicación \\\"%s\\\" no puede ser instalada debido a que no es compatible con esta versión de ownCloud.", diff --git a/lib/l10n/es_CL.json b/lib/l10n/es_CL.json index 946cf11dc09..f9b9abab6c1 100644 --- a/lib/l10n/es_CL.json +++ b/lib/l10n/es_CL.json @@ -5,7 +5,6 @@ "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Generalmente esto se puede resolver %s otorgando permisos de escritura al servidor web en la carpeta configurada %s", "Help" : "Ayuda", "Personal" : "Personal", - "Settings" : "Configuración", "Users" : "Usuarios", "Admin" : "Administración", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "La aplicación \\\"%s\\\" no puede ser instalada debido a que no es compatible con esta versión de ownCloud.", diff --git a/lib/l10n/es_MX.js b/lib/l10n/es_MX.js index e739b14c9fd..f607baaf755 100644 --- a/lib/l10n/es_MX.js +++ b/lib/l10n/es_MX.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Ayuda", "Personal" : "Personal", - "Settings" : "Ajustes", "Users" : "Usuarios", "Admin" : "Administración", "No app name specified" : "No se ha especificado nombre de la aplicación", diff --git a/lib/l10n/es_MX.json b/lib/l10n/es_MX.json index 9b63e52244c..55f23534ea6 100644 --- a/lib/l10n/es_MX.json +++ b/lib/l10n/es_MX.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Ayuda", "Personal" : "Personal", - "Settings" : "Ajustes", "Users" : "Usuarios", "Admin" : "Administración", "No app name specified" : "No se ha especificado nombre de la aplicación", diff --git a/lib/l10n/et_EE.js b/lib/l10n/et_EE.js index 2718a1e4223..e952ca79f8c 100644 --- a/lib/l10n/et_EE.js +++ b/lib/l10n/et_EE.js @@ -10,7 +10,6 @@ OC.L10N.register( "PHP %s or higher is required." : "PHP %s või uuem on nõutav.", "Help" : "Abiinfo", "Personal" : "Isiklik", - "Settings" : "Seaded", "Users" : "Kasutajad", "Admin" : "Admin", "Recommended" : "Soovitatud", @@ -94,12 +93,12 @@ OC.L10N.register( "A valid password must be provided" : "Sisesta nõuetele vastav parool", "The username is already being used" : "Kasutajanimi on juba kasutuses", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ühtegi andmebaasi (sqlite, mysql või postgresql) draiverit pole paigaldatud.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Õigused saab tavaliselt paika %s andes veebiserverile juurkataloogile kirjutusõigused %s", "Cannot write into \"config\" directory" : "Ei saa kirjutada \"config\" kataloogi", "Cannot write into \"apps\" directory" : "Ei saa kirjutada \"apps\" kataloogi!", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Tavaliselt saab selle lahendada %s andes veebiserverile rakendite kataloogile kirjutusõigused %s või keelates seadetes rakendikogu.", "Cannot create \"data\" directory (%s)" : "Ei suuda luua \"data\" kataloogi (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Tavaliselt saab selle lahendada <a href=\"%s\" target=\"_blank\">andes veebiserverile juur-kataloogile kirjutusõigused</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Õigused saab tavaliselt paika %s andes veebiserverile juurkataloogile kirjutusõigused %s", "Setting locale to %s failed" : "Lokaadi %s määramine ebaõnnestus.", "Please install one of these locales on your system and restart your webserver." : "Palun paigalda mõni neist lokaatides oma süsteemi ning taaskäivita veebiserver.", "Please ask your server administrator to install the module." : "Palu oma serveri haldajal moodul paigadalda.", diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json index f71ee98481d..911afbe449b 100644 --- a/lib/l10n/et_EE.json +++ b/lib/l10n/et_EE.json @@ -8,7 +8,6 @@ "PHP %s or higher is required." : "PHP %s või uuem on nõutav.", "Help" : "Abiinfo", "Personal" : "Isiklik", - "Settings" : "Seaded", "Users" : "Kasutajad", "Admin" : "Admin", "Recommended" : "Soovitatud", @@ -92,12 +91,12 @@ "A valid password must be provided" : "Sisesta nõuetele vastav parool", "The username is already being used" : "Kasutajanimi on juba kasutuses", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ühtegi andmebaasi (sqlite, mysql või postgresql) draiverit pole paigaldatud.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Õigused saab tavaliselt paika %s andes veebiserverile juurkataloogile kirjutusõigused %s", "Cannot write into \"config\" directory" : "Ei saa kirjutada \"config\" kataloogi", "Cannot write into \"apps\" directory" : "Ei saa kirjutada \"apps\" kataloogi!", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Tavaliselt saab selle lahendada %s andes veebiserverile rakendite kataloogile kirjutusõigused %s või keelates seadetes rakendikogu.", "Cannot create \"data\" directory (%s)" : "Ei suuda luua \"data\" kataloogi (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Tavaliselt saab selle lahendada <a href=\"%s\" target=\"_blank\">andes veebiserverile juur-kataloogile kirjutusõigused</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Õigused saab tavaliselt paika %s andes veebiserverile juurkataloogile kirjutusõigused %s", "Setting locale to %s failed" : "Lokaadi %s määramine ebaõnnestus.", "Please install one of these locales on your system and restart your webserver." : "Palun paigalda mõni neist lokaatides oma süsteemi ning taaskäivita veebiserver.", "Please ask your server administrator to install the module." : "Palu oma serveri haldajal moodul paigadalda.", diff --git a/lib/l10n/eu.js b/lib/l10n/eu.js index e28eec8e214..9c96dca09df 100644 --- a/lib/l10n/eu.js +++ b/lib/l10n/eu.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud %s baino bertsio txikiagoa behar da.", "Help" : "Laguntza", "Personal" : "Pertsonala", - "Settings" : "Ezarpenak", "Users" : "Erabiltzaileak", "Admin" : "Admin", "Recommended" : "Aholkatuta", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Baliozko pasahitza eman behar da", "The username is already being used" : "Erabiltzaile izena dagoeneko erabiltzen ari da", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ez dago datubaseen (sqlite, mysql edo postgresql) driverrik instalatuta.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Hau normalean konpondu daiteke %sweb zerbitzarira erro karpetan idazteko baimenak emanez%s.", "Cannot write into \"config\" directory" : "Ezin da idatzi \"config\" karpetan", "Cannot write into \"apps\" directory" : "Ezin da idatzi \"apps\" karpetan", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Hau normalean konpondu daiteke %sweb zerbitzarira apps karpetan idazteko baimenak emanez%s edo konfigurazio fitxategian appstorea ez gaituz.", "Cannot create \"data\" directory (%s)" : "Ezin da \"data\" karpeta sortu (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Hau normalean konpondu daiteke <a href=\"%s\" target=\"_blank\">web zerbitzarira erro karpetan idazteko baimenak emanez</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Hau normalean konpondu daiteke %sweb zerbitzarira erro karpetan idazteko baimenak emanez%s.", "Setting locale to %s failed" : "Lokala %sra ezartzeak huts egin du", "Please install one of these locales on your system and restart your webserver." : "Instalatu hauetako lokal bat zure sisteman eta berrabiarazi zure web zerbitzaria.", "Please ask your server administrator to install the module." : "Mesedez eskatu zure zerbitzariaren kudeatzaileari modulua instala dezan.", diff --git a/lib/l10n/eu.json b/lib/l10n/eu.json index 6405f8968fb..286d9e763fe 100644 --- a/lib/l10n/eu.json +++ b/lib/l10n/eu.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud %s baino bertsio txikiagoa behar da.", "Help" : "Laguntza", "Personal" : "Pertsonala", - "Settings" : "Ezarpenak", "Users" : "Erabiltzaileak", "Admin" : "Admin", "Recommended" : "Aholkatuta", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Baliozko pasahitza eman behar da", "The username is already being used" : "Erabiltzaile izena dagoeneko erabiltzen ari da", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ez dago datubaseen (sqlite, mysql edo postgresql) driverrik instalatuta.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Hau normalean konpondu daiteke %sweb zerbitzarira erro karpetan idazteko baimenak emanez%s.", "Cannot write into \"config\" directory" : "Ezin da idatzi \"config\" karpetan", "Cannot write into \"apps\" directory" : "Ezin da idatzi \"apps\" karpetan", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Hau normalean konpondu daiteke %sweb zerbitzarira apps karpetan idazteko baimenak emanez%s edo konfigurazio fitxategian appstorea ez gaituz.", "Cannot create \"data\" directory (%s)" : "Ezin da \"data\" karpeta sortu (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Hau normalean konpondu daiteke <a href=\"%s\" target=\"_blank\">web zerbitzarira erro karpetan idazteko baimenak emanez</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Hau normalean konpondu daiteke %sweb zerbitzarira erro karpetan idazteko baimenak emanez%s.", "Setting locale to %s failed" : "Lokala %sra ezartzeak huts egin du", "Please install one of these locales on your system and restart your webserver." : "Instalatu hauetako lokal bat zure sisteman eta berrabiarazi zure web zerbitzaria.", "Please ask your server administrator to install the module." : "Mesedez eskatu zure zerbitzariaren kudeatzaileari modulua instala dezan.", diff --git a/lib/l10n/fa.js b/lib/l10n/fa.js index e5cacb279d4..33f9633e65f 100644 --- a/lib/l10n/fa.js +++ b/lib/l10n/fa.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "راهنما", "Personal" : "شخصی", - "Settings" : "تنظیمات", "Users" : "کاربران", "Admin" : "مدیر", "Unknown filetype" : "نوع فایل ناشناخته", diff --git a/lib/l10n/fa.json b/lib/l10n/fa.json index 608d66645da..5f419ccf229 100644 --- a/lib/l10n/fa.json +++ b/lib/l10n/fa.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "راهنما", "Personal" : "شخصی", - "Settings" : "تنظیمات", "Users" : "کاربران", "Admin" : "مدیر", "Unknown filetype" : "نوع فایل ناشناخته", diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js index 5c37b9c4093..8be70237972 100644 --- a/lib/l10n/fi_FI.js +++ b/lib/l10n/fi_FI.js @@ -18,7 +18,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud versiota %s alempi vaaditaan.", "Help" : "Ohje", "Personal" : "Henkilökohtainen", - "Settings" : "Asetukset", "Users" : "Käyttäjät", "Admin" : "Ylläpito", "Recommended" : "Suositeltu", diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json index 38215ca862d..c19b81afa72 100644 --- a/lib/l10n/fi_FI.json +++ b/lib/l10n/fi_FI.json @@ -16,7 +16,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud versiota %s alempi vaaditaan.", "Help" : "Ohje", "Personal" : "Henkilökohtainen", - "Settings" : "Asetukset", "Users" : "Käyttäjät", "Admin" : "Ylläpito", "Recommended" : "Suositeltu", diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js index c2c5556ed18..aff31f2cd44 100644 --- a/lib/l10n/fr.js +++ b/lib/l10n/fr.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "Une version antérieure à %s d'ownCloud est requise.", "Help" : "Aide", "Personal" : "Personnel", - "Settings" : "Paramètres", "Users" : "Utilisateurs", "Admin" : "Administration", "Recommended" : "Recommandée", diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json index 4be87a0d4df..460822d3e8b 100644 --- a/lib/l10n/fr.json +++ b/lib/l10n/fr.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "Une version antérieure à %s d'ownCloud est requise.", "Help" : "Aide", "Personal" : "Personnel", - "Settings" : "Paramètres", "Users" : "Utilisateurs", "Admin" : "Administration", "Recommended" : "Recommandée", diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js index 8fa89bae6b4..a26629e9418 100644 --- a/lib/l10n/gl.js +++ b/lib/l10n/gl.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "Requírese ownCloud cunha versión inferior a %s.", "Help" : "Axuda", "Personal" : "Persoal", - "Settings" : "Axustes", "Users" : "Usuarios", "Admin" : "Administración", "Recommended" : "Recomendado", diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json index 9c8992ddeac..ff5c6861120 100644 --- a/lib/l10n/gl.json +++ b/lib/l10n/gl.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "Requírese ownCloud cunha versión inferior a %s.", "Help" : "Axuda", "Personal" : "Persoal", - "Settings" : "Axustes", "Users" : "Usuarios", "Admin" : "Administración", "Recommended" : "Recomendado", diff --git a/lib/l10n/he.js b/lib/l10n/he.js index 200d3d7035a..23561a4d3a5 100644 --- a/lib/l10n/he.js +++ b/lib/l10n/he.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "עזרה", "Personal" : "אישי", - "Settings" : "הגדרות", "Users" : "משתמשים", "Admin" : "מנהל", "today" : "היום", diff --git a/lib/l10n/he.json b/lib/l10n/he.json index 0cadc7beba2..2e1453c7916 100644 --- a/lib/l10n/he.json +++ b/lib/l10n/he.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "עזרה", "Personal" : "אישי", - "Settings" : "הגדרות", "Users" : "משתמשים", "Admin" : "מנהל", "today" : "היום", diff --git a/lib/l10n/hi.js b/lib/l10n/hi.js index fdc0ecac1a2..b4741e9aa06 100644 --- a/lib/l10n/hi.js +++ b/lib/l10n/hi.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "सहयोग", "Personal" : "यक्तिगत", - "Settings" : "सेटिंग्स", "Users" : "उपयोगकर्ता", "_%n day ago_::_%n days ago_" : ["",""], "_%n month ago_::_%n months ago_" : ["",""], diff --git a/lib/l10n/hi.json b/lib/l10n/hi.json index b231ead2917..b7347838a83 100644 --- a/lib/l10n/hi.json +++ b/lib/l10n/hi.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "सहयोग", "Personal" : "यक्तिगत", - "Settings" : "सेटिंग्स", "Users" : "उपयोगकर्ता", "_%n day ago_::_%n days ago_" : ["",""], "_%n month ago_::_%n months ago_" : ["",""], diff --git a/lib/l10n/hr.js b/lib/l10n/hr.js index 3c2df29120a..34d5ec9f160 100644 --- a/lib/l10n/hr.js +++ b/lib/l10n/hr.js @@ -16,7 +16,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud sa verzijom manjom od %s je potrebna.", "Help" : "Pomoć", "Personal" : "Osobno", - "Settings" : "Postavke", "Users" : "Korisnici", "Admin" : "Admin", "Recommended" : "Preporuceno", @@ -102,12 +101,12 @@ OC.L10N.register( "A valid password must be provided" : "Nužno je navesti ispravnu lozinku", "The username is already being used" : "Korisničko ime se već koristi", "No database drivers (sqlite, mysql, or postgresql) installed." : "Pogonski programi baze podataka (sqlite, mysql, ili postgresql) nisu instalirani.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dozvole se obično mogu popraviti %sdavanjem pristupa web poslužitelju za pisanje u korijenskom direktoriju%s", "Cannot write into \"config\" directory" : "Nije moguće zapisivati u \"config\" direktorij", "Cannot write into \"apps\" directory" : "Nije moguće zapisivati u \"apps\" direktorij", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ovo se obično može popraviti %sdavanjem pristupa web poslužitelju za pisanje u apps direktorij%sili isključivanjem appstorea u konfiguracijskoj datoteci.", "Cannot create \"data\" directory (%s)" : "Kreiranje \"data\" direktorija (%s) nije moguće", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ovo obično može popraviti <a href=\"%s\"target=\"_blank\">davanjem pristupa web poslužiteljuza pisanje u korijenskom direktoriju</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dozvole se obično mogu popraviti %sdavanjem pristupa web poslužitelju za pisanje u korijenskom direktoriju%s", "Setting locale to %s failed" : "Postavljanje regionalne sheme u %s nije uspjelo", "Please install one of these locales on your system and restart your webserver." : "Molimo instalirajte jednu od ovih regionalnih shema u svoj sustav i ponovno pokrenite svoj web poslužitelj.", "Please ask your server administrator to install the module." : "Molimo zamolite svog administratora poslužitelja da instalira modul.", diff --git a/lib/l10n/hr.json b/lib/l10n/hr.json index 372d5515966..5e933fead22 100644 --- a/lib/l10n/hr.json +++ b/lib/l10n/hr.json @@ -14,7 +14,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud sa verzijom manjom od %s je potrebna.", "Help" : "Pomoć", "Personal" : "Osobno", - "Settings" : "Postavke", "Users" : "Korisnici", "Admin" : "Admin", "Recommended" : "Preporuceno", @@ -100,12 +99,12 @@ "A valid password must be provided" : "Nužno je navesti ispravnu lozinku", "The username is already being used" : "Korisničko ime se već koristi", "No database drivers (sqlite, mysql, or postgresql) installed." : "Pogonski programi baze podataka (sqlite, mysql, ili postgresql) nisu instalirani.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dozvole se obično mogu popraviti %sdavanjem pristupa web poslužitelju za pisanje u korijenskom direktoriju%s", "Cannot write into \"config\" directory" : "Nije moguće zapisivati u \"config\" direktorij", "Cannot write into \"apps\" directory" : "Nije moguće zapisivati u \"apps\" direktorij", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ovo se obično može popraviti %sdavanjem pristupa web poslužitelju za pisanje u apps direktorij%sili isključivanjem appstorea u konfiguracijskoj datoteci.", "Cannot create \"data\" directory (%s)" : "Kreiranje \"data\" direktorija (%s) nije moguće", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ovo obično može popraviti <a href=\"%s\"target=\"_blank\">davanjem pristupa web poslužiteljuza pisanje u korijenskom direktoriju</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dozvole se obično mogu popraviti %sdavanjem pristupa web poslužitelju za pisanje u korijenskom direktoriju%s", "Setting locale to %s failed" : "Postavljanje regionalne sheme u %s nije uspjelo", "Please install one of these locales on your system and restart your webserver." : "Molimo instalirajte jednu od ovih regionalnih shema u svoj sustav i ponovno pokrenite svoj web poslužitelj.", "Please ask your server administrator to install the module." : "Molimo zamolite svog administratora poslužitelja da instalira modul.", diff --git a/lib/l10n/hu_HU.js b/lib/l10n/hu_HU.js index f1f645b1616..849740ad57d 100644 --- a/lib/l10n/hu_HU.js +++ b/lib/l10n/hu_HU.js @@ -10,7 +10,6 @@ OC.L10N.register( "PHP %s or higher is required." : "PHP %s vagy ennél újabb szükséges.", "Help" : "Súgó", "Personal" : "Személyes", - "Settings" : "Beállítások", "Users" : "Felhasználók", "Admin" : "Adminsztráció", "Recommended" : "Ajánlott", @@ -94,12 +93,12 @@ OC.L10N.register( "A valid password must be provided" : "Érvényes jelszót kell megadnia", "The username is already being used" : "Ez a bejelentkezési név már foglalt", "No database drivers (sqlite, mysql, or postgresql) installed." : "Nincs telepítve adatbázis-meghajtóprogram (sqlite, mysql vagy postgresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Az elérési problémák rendszerint megoldhatók azzal, ha a %swebszervernek írásjogot adunk a gyökérkönyvtárra%s.", "Cannot write into \"config\" directory" : "Nem írható a \"config\" könyvtár", "Cannot write into \"apps\" directory" : "Nem írható az \"apps\" könyvtár", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ez rendszerint úgy oldható meg, hogy %sírási jogot adunk a webszervernek az app könyvtárra%s, vagy letiltjuk a config fájlban az appstore használatát.", "Cannot create \"data\" directory (%s)" : "Nem sikerült létrehozni a \"data\" könyvtárt (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ez rendszerint úgy oldható meg, hogy <a href=\"%s\" target=\"_blank\">írásjogot adunk a webszervernek a gyökérkönyvtárra</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Az elérési problémák rendszerint megoldhatók azzal, ha a %swebszervernek írásjogot adunk a gyökérkönyvtárra%s.", "Setting locale to %s failed" : "A lokalizáció %s-re való állítása nem sikerült", "Please install one of these locales on your system and restart your webserver." : "Kérjük állítsa be a következő lokalizációk valamelyikét a rendszeren és indítsa újra a webszervert!", "Please ask your server administrator to install the module." : "Kérje meg a rendszergazdát, hogy telepítse a modult!", diff --git a/lib/l10n/hu_HU.json b/lib/l10n/hu_HU.json index ac09b9d84ef..265c1a5264e 100644 --- a/lib/l10n/hu_HU.json +++ b/lib/l10n/hu_HU.json @@ -8,7 +8,6 @@ "PHP %s or higher is required." : "PHP %s vagy ennél újabb szükséges.", "Help" : "Súgó", "Personal" : "Személyes", - "Settings" : "Beállítások", "Users" : "Felhasználók", "Admin" : "Adminsztráció", "Recommended" : "Ajánlott", @@ -92,12 +91,12 @@ "A valid password must be provided" : "Érvényes jelszót kell megadnia", "The username is already being used" : "Ez a bejelentkezési név már foglalt", "No database drivers (sqlite, mysql, or postgresql) installed." : "Nincs telepítve adatbázis-meghajtóprogram (sqlite, mysql vagy postgresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Az elérési problémák rendszerint megoldhatók azzal, ha a %swebszervernek írásjogot adunk a gyökérkönyvtárra%s.", "Cannot write into \"config\" directory" : "Nem írható a \"config\" könyvtár", "Cannot write into \"apps\" directory" : "Nem írható az \"apps\" könyvtár", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ez rendszerint úgy oldható meg, hogy %sírási jogot adunk a webszervernek az app könyvtárra%s, vagy letiltjuk a config fájlban az appstore használatát.", "Cannot create \"data\" directory (%s)" : "Nem sikerült létrehozni a \"data\" könyvtárt (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ez rendszerint úgy oldható meg, hogy <a href=\"%s\" target=\"_blank\">írásjogot adunk a webszervernek a gyökérkönyvtárra</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Az elérési problémák rendszerint megoldhatók azzal, ha a %swebszervernek írásjogot adunk a gyökérkönyvtárra%s.", "Setting locale to %s failed" : "A lokalizáció %s-re való állítása nem sikerült", "Please install one of these locales on your system and restart your webserver." : "Kérjük állítsa be a következő lokalizációk valamelyikét a rendszeren és indítsa újra a webszervert!", "Please ask your server administrator to install the module." : "Kérje meg a rendszergazdát, hogy telepítse a modult!", diff --git a/lib/l10n/ia.js b/lib/l10n/ia.js index 345df54ec33..336aff70234 100644 --- a/lib/l10n/ia.js +++ b/lib/l10n/ia.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Adjuta", "Personal" : "Personal", - "Settings" : "Configurationes", "Users" : "Usatores", "Admin" : "Administration", "Unknown filetype" : "Typo de file incognite", diff --git a/lib/l10n/ia.json b/lib/l10n/ia.json index 3f722b77a0d..b768db5aed2 100644 --- a/lib/l10n/ia.json +++ b/lib/l10n/ia.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Adjuta", "Personal" : "Personal", - "Settings" : "Configurationes", "Users" : "Usatores", "Admin" : "Administration", "Unknown filetype" : "Typo de file incognite", diff --git a/lib/l10n/id.js b/lib/l10n/id.js index 072380ddf86..994c543d070 100644 --- a/lib/l10n/id.js +++ b/lib/l10n/id.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "Diperlukan ownCloud dengan versi yang lebih rendah dari %s.", "Help" : "Bantuan", "Personal" : "Pribadi", - "Settings" : "Pengaturan", "Users" : "Pengguna", "Admin" : "Admin", "Recommended" : "Direkomendasikan", @@ -103,12 +102,12 @@ OC.L10N.register( "A valid password must be provided" : "Tuliskan sandi yang valid", "The username is already being used" : "Nama pengguna ini telah digunakan", "No database drivers (sqlite, mysql, or postgresql) installed." : "Tidak ada driver (sqlite, mysql, or postgresql) yang terinstal.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Perizinan biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori root.", "Cannot write into \"config\" directory" : "Tidak dapat menulis kedalam direktori \"config\"", "Cannot write into \"apps\" directory" : "Tidak dapat menulis kedalam direktori \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Hal ini biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori apps atau menonaktifkan toko aplikasi didalam berkas config.", "Cannot create \"data\" directory (%s)" : "Tidak dapat membuat direktori (%s) \"data\"", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Hal ini biasanya dapat diperbaiki dengan <a href=\"%s\" target=\"_blank\">memberikan akses tulis bagi situs web ke direktori root</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Perizinan biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori root.", "Setting locale to %s failed" : "Pengaturan lokal ke %s gagal", "Please install one of these locales on your system and restart your webserver." : "Mohon instal paling tidak satu lokal pada sistem Anda dan jalankan ulang server web.", "Please ask your server administrator to install the module." : "Mohon tanyakan administrator Anda untuk menginstal module.", diff --git a/lib/l10n/id.json b/lib/l10n/id.json index 6e9271e4ec5..f5743dc4166 100644 --- a/lib/l10n/id.json +++ b/lib/l10n/id.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "Diperlukan ownCloud dengan versi yang lebih rendah dari %s.", "Help" : "Bantuan", "Personal" : "Pribadi", - "Settings" : "Pengaturan", "Users" : "Pengguna", "Admin" : "Admin", "Recommended" : "Direkomendasikan", @@ -101,12 +100,12 @@ "A valid password must be provided" : "Tuliskan sandi yang valid", "The username is already being used" : "Nama pengguna ini telah digunakan", "No database drivers (sqlite, mysql, or postgresql) installed." : "Tidak ada driver (sqlite, mysql, or postgresql) yang terinstal.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Perizinan biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori root.", "Cannot write into \"config\" directory" : "Tidak dapat menulis kedalam direktori \"config\"", "Cannot write into \"apps\" directory" : "Tidak dapat menulis kedalam direktori \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Hal ini biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori apps atau menonaktifkan toko aplikasi didalam berkas config.", "Cannot create \"data\" directory (%s)" : "Tidak dapat membuat direktori (%s) \"data\"", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Hal ini biasanya dapat diperbaiki dengan <a href=\"%s\" target=\"_blank\">memberikan akses tulis bagi situs web ke direktori root</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Perizinan biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori root.", "Setting locale to %s failed" : "Pengaturan lokal ke %s gagal", "Please install one of these locales on your system and restart your webserver." : "Mohon instal paling tidak satu lokal pada sistem Anda dan jalankan ulang server web.", "Please ask your server administrator to install the module." : "Mohon tanyakan administrator Anda untuk menginstal module.", diff --git a/lib/l10n/is.js b/lib/l10n/is.js index 712b8bbd10a..25c1b18a47c 100644 --- a/lib/l10n/is.js +++ b/lib/l10n/is.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Hjálp", "Personal" : "Um mig", - "Settings" : "Stillingar", "Users" : "Notendur", "Admin" : "Stjórnun", "today" : "í dag", diff --git a/lib/l10n/is.json b/lib/l10n/is.json index fd0291c96c3..8a320228277 100644 --- a/lib/l10n/is.json +++ b/lib/l10n/is.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Hjálp", "Personal" : "Um mig", - "Settings" : "Stillingar", "Users" : "Notendur", "Admin" : "Stjórnun", "today" : "í dag", diff --git a/lib/l10n/it.js b/lib/l10n/it.js index 229bb8bd2ec..9166b48cc6f 100644 --- a/lib/l10n/it.js +++ b/lib/l10n/it.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "Richiesta una versione di ownCloud minore di %s.", "Help" : "Aiuto", "Personal" : "Personale", - "Settings" : "Impostazioni", "Users" : "Utenti", "Admin" : "Admin", "Recommended" : "Consigliata", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Deve essere fornita una password valida", "The username is already being used" : "Il nome utente è già utilizzato", "No database drivers (sqlite, mysql, or postgresql) installed." : "Nessun driver di database (sqlite, mysql o postgresql) installato", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "I permessi possono essere normalmente corretti %sfornendo al server web accesso in scrittura alla cartella radice%s.", "Cannot write into \"config\" directory" : "Impossibile scrivere nella cartella \"config\"", "Cannot write into \"apps\" directory" : "Impossibile scrivere nella cartella \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ciò può essere normalmente corretto %sfornendo al server web accesso in scrittura alla cartella \"apps\"%s o disabilitando il negozio di applicazioni nel file di configurazione.", "Cannot create \"data\" directory (%s)" : "Impossibile creare la cartella \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ciò può essere normalmente corretto <a href=\"%s\" target=\"_blank\">fornendo al server web accesso in scrittura alla cartella radice</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "I permessi possono essere normalmente corretti %sfornendo al server web accesso in scrittura alla cartella radice%s.", "Setting locale to %s failed" : "L'impostazione della localizzazione a %s non è riuscita", "Please install one of these locales on your system and restart your webserver." : "Installa una delle seguenti localizzazioni sul tuo sistema e riavvia il server web.", "Please ask your server administrator to install the module." : "Chiedi all'amministratore del tuo server di installare il modulo.", diff --git a/lib/l10n/it.json b/lib/l10n/it.json index 8fca8b4684c..2b90ad9d892 100644 --- a/lib/l10n/it.json +++ b/lib/l10n/it.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "Richiesta una versione di ownCloud minore di %s.", "Help" : "Aiuto", "Personal" : "Personale", - "Settings" : "Impostazioni", "Users" : "Utenti", "Admin" : "Admin", "Recommended" : "Consigliata", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Deve essere fornita una password valida", "The username is already being used" : "Il nome utente è già utilizzato", "No database drivers (sqlite, mysql, or postgresql) installed." : "Nessun driver di database (sqlite, mysql o postgresql) installato", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "I permessi possono essere normalmente corretti %sfornendo al server web accesso in scrittura alla cartella radice%s.", "Cannot write into \"config\" directory" : "Impossibile scrivere nella cartella \"config\"", "Cannot write into \"apps\" directory" : "Impossibile scrivere nella cartella \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ciò può essere normalmente corretto %sfornendo al server web accesso in scrittura alla cartella \"apps\"%s o disabilitando il negozio di applicazioni nel file di configurazione.", "Cannot create \"data\" directory (%s)" : "Impossibile creare la cartella \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ciò può essere normalmente corretto <a href=\"%s\" target=\"_blank\">fornendo al server web accesso in scrittura alla cartella radice</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "I permessi possono essere normalmente corretti %sfornendo al server web accesso in scrittura alla cartella radice%s.", "Setting locale to %s failed" : "L'impostazione della localizzazione a %s non è riuscita", "Please install one of these locales on your system and restart your webserver." : "Installa una delle seguenti localizzazioni sul tuo sistema e riavvia il server web.", "Please ask your server administrator to install the module." : "Chiedi all'amministratore del tuo server di installare il modulo.", diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js index 8d5d005ce79..4082c06140d 100644 --- a/lib/l10n/ja.js +++ b/lib/l10n/ja.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud %s 以下が必要です。", "Help" : "ヘルプ", "Personal" : "個人", - "Settings" : "設定", "Users" : "ユーザー", "Admin" : "管理", "Recommended" : "おすすめ", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "有効なパスワードを指定する必要があります", "The username is already being used" : "ユーザー名はすでに使われています", "No database drivers (sqlite, mysql, or postgresql) installed." : "データベースドライバー (sqlite, mysql, postgresql) がインストールされていません。", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "多くの場合、パーミッションは %s Webサーバーにルートディレクトリ %s への書き込み権限を与えることで解決できます。", "Cannot write into \"config\" directory" : "\"config\" ディレクトリに書き込みができません", "Cannot write into \"apps\" directory" : "\"apps\" ディレクトリに書き込みができません", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "多くの場合、これは %s Webサーバーにappsディレクトリ %s への書き込み権限を与えるか、設定ファイルでアプリストアを無効化することで解決できます。", "Cannot create \"data\" directory (%s)" : "\"data\" ディレクトリ (%s) を作成できません", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "多くの場合、これは<a href=\"%s\" target=\"_blank\">Webサーバーにルートディレクトリへの書き込み権限を与える</a>ことで解決できます。", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "多くの場合、パーミッションは %s Webサーバーにルートディレクトリ %s への書き込み権限を与えることで解決できます。", "Setting locale to %s failed" : "ロケールを %s に設定できませんでした", "Please install one of these locales on your system and restart your webserver." : "これらのロケールのうちいずれかをシステムにインストールし、Webサーバーを再起動してください。", "Please ask your server administrator to install the module." : "サーバー管理者にモジュールのインストールを依頼してください。", diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json index 5b6e8f4f212..b4da8536f82 100644 --- a/lib/l10n/ja.json +++ b/lib/l10n/ja.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud %s 以下が必要です。", "Help" : "ヘルプ", "Personal" : "個人", - "Settings" : "設定", "Users" : "ユーザー", "Admin" : "管理", "Recommended" : "おすすめ", @@ -106,12 +105,12 @@ "A valid password must be provided" : "有効なパスワードを指定する必要があります", "The username is already being used" : "ユーザー名はすでに使われています", "No database drivers (sqlite, mysql, or postgresql) installed." : "データベースドライバー (sqlite, mysql, postgresql) がインストールされていません。", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "多くの場合、パーミッションは %s Webサーバーにルートディレクトリ %s への書き込み権限を与えることで解決できます。", "Cannot write into \"config\" directory" : "\"config\" ディレクトリに書き込みができません", "Cannot write into \"apps\" directory" : "\"apps\" ディレクトリに書き込みができません", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "多くの場合、これは %s Webサーバーにappsディレクトリ %s への書き込み権限を与えるか、設定ファイルでアプリストアを無効化することで解決できます。", "Cannot create \"data\" directory (%s)" : "\"data\" ディレクトリ (%s) を作成できません", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "多くの場合、これは<a href=\"%s\" target=\"_blank\">Webサーバーにルートディレクトリへの書き込み権限を与える</a>ことで解決できます。", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "多くの場合、パーミッションは %s Webサーバーにルートディレクトリ %s への書き込み権限を与えることで解決できます。", "Setting locale to %s failed" : "ロケールを %s に設定できませんでした", "Please install one of these locales on your system and restart your webserver." : "これらのロケールのうちいずれかをシステムにインストールし、Webサーバーを再起動してください。", "Please ask your server administrator to install the module." : "サーバー管理者にモジュールのインストールを依頼してください。", diff --git a/lib/l10n/ka_GE.js b/lib/l10n/ka_GE.js index 63b886e6ce1..b10774e806c 100644 --- a/lib/l10n/ka_GE.js +++ b/lib/l10n/ka_GE.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "დახმარება", "Personal" : "პირადი", - "Settings" : "პარამეტრები", "Users" : "მომხმარებელი", "Admin" : "ადმინისტრატორი", "today" : "დღეს", diff --git a/lib/l10n/ka_GE.json b/lib/l10n/ka_GE.json index 0371cfcfc90..29f7be8e261 100644 --- a/lib/l10n/ka_GE.json +++ b/lib/l10n/ka_GE.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "დახმარება", "Personal" : "პირადი", - "Settings" : "პარამეტრები", "Users" : "მომხმარებელი", "Admin" : "ადმინისტრატორი", "today" : "დღეს", diff --git a/lib/l10n/km.js b/lib/l10n/km.js index 4f96e661179..5bdbc74176b 100644 --- a/lib/l10n/km.js +++ b/lib/l10n/km.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "ជំនួយ", "Personal" : "ផ្ទាល់ខ្លួន", - "Settings" : "ការកំណត់", "Users" : "អ្នកប្រើ", "Admin" : "អ្នកគ្រប់គ្រង", "No app name specified" : "មិនបានបញ្ជាក់ឈ្មោះកម្មវិធី", diff --git a/lib/l10n/km.json b/lib/l10n/km.json index 9c1010b0020..690d937a11e 100644 --- a/lib/l10n/km.json +++ b/lib/l10n/km.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "ជំនួយ", "Personal" : "ផ្ទាល់ខ្លួន", - "Settings" : "ការកំណត់", "Users" : "អ្នកប្រើ", "Admin" : "អ្នកគ្រប់គ្រង", "No app name specified" : "មិនបានបញ្ជាក់ឈ្មោះកម្មវិធី", diff --git a/lib/l10n/kn.js b/lib/l10n/kn.js index 75314b0abea..7bcde5e4d6a 100644 --- a/lib/l10n/kn.js +++ b/lib/l10n/kn.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "ಸಹಾಯ", "Personal" : "ವೈಯಕ್ತಿಕ", - "Settings" : "ಆಯ್ಕೆ", "Users" : "ಬಳಕೆದಾರರು", "Admin" : "ನಿರ್ವಹಕ", "Recommended" : "ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ", diff --git a/lib/l10n/kn.json b/lib/l10n/kn.json index ae5f3359a13..28b9d581d93 100644 --- a/lib/l10n/kn.json +++ b/lib/l10n/kn.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "ಸಹಾಯ", "Personal" : "ವೈಯಕ್ತಿಕ", - "Settings" : "ಆಯ್ಕೆ", "Users" : "ಬಳಕೆದಾರರು", "Admin" : "ನಿರ್ವಹಕ", "Recommended" : "ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ", diff --git a/lib/l10n/ko.js b/lib/l10n/ko.js index 41f87248eef..a2661ff9494 100644 --- a/lib/l10n/ko.js +++ b/lib/l10n/ko.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud 버전 %s 미만이 필요합니다.", "Help" : "도움말", "Personal" : "개인", - "Settings" : "설정", "Users" : "사용자", "Admin" : "관리자", "Recommended" : "추천", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "올바른 암호를 입력해야 합니다", "The username is already being used" : "사용자 이름이 이미 존재합니다", "No database drivers (sqlite, mysql, or postgresql) installed." : "데이터베이스 드라이버(sqlite, mysql, postgresql)가 설치되지 않았습니다.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "%s루트 디렉터리에 웹 서버 쓰기 권한%s을 주면 해결됩니다.", "Cannot write into \"config\" directory" : "\"config\" 디렉터리에 기록할 수 없습니다", "Cannot write into \"apps\" directory" : "\"apps\" 디렉터리에 기록할 수 없습니다", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "%sapps 디렉터리에 웹 서버 쓰기 권한%s을 주거나 설정 파일에서 앱 스토어를 비활성화하면 해결됩니다.", "Cannot create \"data\" directory (%s)" : "\"data\" 디렉터리를 만들 수 없음(%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "<a href=\"%s\" target=\"_blank\">루트 디렉터리에 웹 서버 쓰기 권한</a>을 주면 해결됩니다.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "%s루트 디렉터리에 웹 서버 쓰기 권한%s을 주면 해결됩니다.", "Setting locale to %s failed" : "로캘을 %s(으)로 설정할 수 없음", "Please install one of these locales on your system and restart your webserver." : "다음 중 하나 이상의 로캘을 시스템에 설치하고 웹 서버를 다시 시작하십시오.", "Please ask your server administrator to install the module." : "서버 관리자에게 모듈 설치를 요청하십시오.", diff --git a/lib/l10n/ko.json b/lib/l10n/ko.json index 768dbeafefe..d2ab229e4ba 100644 --- a/lib/l10n/ko.json +++ b/lib/l10n/ko.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud 버전 %s 미만이 필요합니다.", "Help" : "도움말", "Personal" : "개인", - "Settings" : "설정", "Users" : "사용자", "Admin" : "관리자", "Recommended" : "추천", @@ -106,12 +105,12 @@ "A valid password must be provided" : "올바른 암호를 입력해야 합니다", "The username is already being used" : "사용자 이름이 이미 존재합니다", "No database drivers (sqlite, mysql, or postgresql) installed." : "데이터베이스 드라이버(sqlite, mysql, postgresql)가 설치되지 않았습니다.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "%s루트 디렉터리에 웹 서버 쓰기 권한%s을 주면 해결됩니다.", "Cannot write into \"config\" directory" : "\"config\" 디렉터리에 기록할 수 없습니다", "Cannot write into \"apps\" directory" : "\"apps\" 디렉터리에 기록할 수 없습니다", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "%sapps 디렉터리에 웹 서버 쓰기 권한%s을 주거나 설정 파일에서 앱 스토어를 비활성화하면 해결됩니다.", "Cannot create \"data\" directory (%s)" : "\"data\" 디렉터리를 만들 수 없음(%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "<a href=\"%s\" target=\"_blank\">루트 디렉터리에 웹 서버 쓰기 권한</a>을 주면 해결됩니다.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "%s루트 디렉터리에 웹 서버 쓰기 권한%s을 주면 해결됩니다.", "Setting locale to %s failed" : "로캘을 %s(으)로 설정할 수 없음", "Please install one of these locales on your system and restart your webserver." : "다음 중 하나 이상의 로캘을 시스템에 설치하고 웹 서버를 다시 시작하십시오.", "Please ask your server administrator to install the module." : "서버 관리자에게 모듈 설치를 요청하십시오.", diff --git a/lib/l10n/ku_IQ.js b/lib/l10n/ku_IQ.js index eea2d55138e..d618f2f1fa0 100644 --- a/lib/l10n/ku_IQ.js +++ b/lib/l10n/ku_IQ.js @@ -2,7 +2,6 @@ OC.L10N.register( "lib", { "Help" : "یارمەتی", - "Settings" : "دهستكاری", "Users" : "بهكارهێنهر", "Admin" : "بهڕێوهبهری سهرهكی", "_%n day ago_::_%n days ago_" : ["",""], diff --git a/lib/l10n/ku_IQ.json b/lib/l10n/ku_IQ.json index b2ab2dc219d..08ec5ba660d 100644 --- a/lib/l10n/ku_IQ.json +++ b/lib/l10n/ku_IQ.json @@ -1,6 +1,5 @@ { "translations": { "Help" : "یارمەتی", - "Settings" : "دهستكاری", "Users" : "بهكارهێنهر", "Admin" : "بهڕێوهبهری سهرهكی", "_%n day ago_::_%n days ago_" : ["",""], diff --git a/lib/l10n/lb.js b/lib/l10n/lb.js index 470652f4017..94a3d4639f5 100644 --- a/lib/l10n/lb.js +++ b/lib/l10n/lb.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Hëllef", "Personal" : "Perséinlech", - "Settings" : "Astellungen", "Users" : "Benotzer", "Admin" : "Admin", "Unknown filetype" : "Onbekannten Fichier Typ", diff --git a/lib/l10n/lb.json b/lib/l10n/lb.json index 2f63f042538..e83729d0f92 100644 --- a/lib/l10n/lb.json +++ b/lib/l10n/lb.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Hëllef", "Personal" : "Perséinlech", - "Settings" : "Astellungen", "Users" : "Benotzer", "Admin" : "Admin", "Unknown filetype" : "Onbekannten Fichier Typ", diff --git a/lib/l10n/lt_LT.js b/lib/l10n/lt_LT.js index 1f05855b77e..a17e3d26ceb 100644 --- a/lib/l10n/lt_LT.js +++ b/lib/l10n/lt_LT.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Pagalba", "Personal" : "Asmeniniai", - "Settings" : "Nustatymai", "Users" : "Vartotojai", "Admin" : "Administravimas", "No app name specified" : "Nenurodytas programos pavadinimas", diff --git a/lib/l10n/lt_LT.json b/lib/l10n/lt_LT.json index a3a53baf010..ea389f40c1b 100644 --- a/lib/l10n/lt_LT.json +++ b/lib/l10n/lt_LT.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Pagalba", "Personal" : "Asmeniniai", - "Settings" : "Nustatymai", "Users" : "Vartotojai", "Admin" : "Administravimas", "No app name specified" : "Nenurodytas programos pavadinimas", diff --git a/lib/l10n/lv.js b/lib/l10n/lv.js index 1f381ecb9bf..f3ecf0a94fc 100644 --- a/lib/l10n/lv.js +++ b/lib/l10n/lv.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Palīdzība", "Personal" : "Personīgi", - "Settings" : "Iestatījumi", "Users" : "Lietotāji", "Admin" : "Administratori", "Recommended" : "Rekomendēts", diff --git a/lib/l10n/lv.json b/lib/l10n/lv.json index a729e3a40b9..c7a556ab665 100644 --- a/lib/l10n/lv.json +++ b/lib/l10n/lv.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Palīdzība", "Personal" : "Personīgi", - "Settings" : "Iestatījumi", "Users" : "Lietotāji", "Admin" : "Administratori", "Recommended" : "Rekomendēts", diff --git a/lib/l10n/mk.js b/lib/l10n/mk.js index 5ab596f4c95..760a1286172 100644 --- a/lib/l10n/mk.js +++ b/lib/l10n/mk.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Помош", "Personal" : "Лично", - "Settings" : "Подесувања", "Users" : "Корисници", "Admin" : "Админ", "No app name specified" : "Не е специфицирано име на апликацијата", diff --git a/lib/l10n/mk.json b/lib/l10n/mk.json index de9fff6b1a1..d58784f6c1d 100644 --- a/lib/l10n/mk.json +++ b/lib/l10n/mk.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Помош", "Personal" : "Лично", - "Settings" : "Подесувања", "Users" : "Корисници", "Admin" : "Админ", "No app name specified" : "Не е специфицирано име на апликацијата", diff --git a/lib/l10n/mn.js b/lib/l10n/mn.js index 3d8b52309d6..d84aa82c14e 100644 --- a/lib/l10n/mn.js +++ b/lib/l10n/mn.js @@ -1,7 +1,6 @@ OC.L10N.register( "lib", { - "Settings" : "Тохиргоо", "_%n day ago_::_%n days ago_" : ["",""], "_%n month ago_::_%n months ago_" : ["",""], "_%n year ago_::_%n years ago_" : ["",""], diff --git a/lib/l10n/mn.json b/lib/l10n/mn.json index 8b0f4650d50..82cdad16805 100644 --- a/lib/l10n/mn.json +++ b/lib/l10n/mn.json @@ -1,5 +1,4 @@ { "translations": { - "Settings" : "Тохиргоо", "_%n day ago_::_%n days ago_" : ["",""], "_%n month ago_::_%n months ago_" : ["",""], "_%n year ago_::_%n years ago_" : ["",""], diff --git a/lib/l10n/mr.js b/lib/l10n/mr.js new file mode 100644 index 00000000000..a12702211c2 --- /dev/null +++ b/lib/l10n/mr.js @@ -0,0 +1,10 @@ +OC.L10N.register( + "lib", + { + "_%n day ago_::_%n days ago_" : ["",""], + "_%n month ago_::_%n months ago_" : ["",""], + "_%n year ago_::_%n years ago_" : ["",""], + "_%n hour ago_::_%n hours ago_" : ["",""], + "_%n minute ago_::_%n minutes ago_" : ["",""] +}, +"nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/mr.json b/lib/l10n/mr.json new file mode 100644 index 00000000000..b994fa289eb --- /dev/null +++ b/lib/l10n/mr.json @@ -0,0 +1,8 @@ +{ "translations": { + "_%n day ago_::_%n days ago_" : ["",""], + "_%n month ago_::_%n months ago_" : ["",""], + "_%n year ago_::_%n years ago_" : ["",""], + "_%n hour ago_::_%n hours ago_" : ["",""], + "_%n minute ago_::_%n minutes ago_" : ["",""] +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/lib/l10n/ms_MY.js b/lib/l10n/ms_MY.js index a501399af5c..0e4d4becc84 100644 --- a/lib/l10n/ms_MY.js +++ b/lib/l10n/ms_MY.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Bantuan", "Personal" : "Peribadi", - "Settings" : "Tetapan", "Users" : "Pengguna", "Admin" : "Admin", "_%n day ago_::_%n days ago_" : [""], diff --git a/lib/l10n/ms_MY.json b/lib/l10n/ms_MY.json index 8c2a83136ee..c4b0b5d0569 100644 --- a/lib/l10n/ms_MY.json +++ b/lib/l10n/ms_MY.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Bantuan", "Personal" : "Peribadi", - "Settings" : "Tetapan", "Users" : "Pengguna", "Admin" : "Admin", "_%n day ago_::_%n days ago_" : [""], diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb_NO.js index fea128e6f0a..62f9e45a8f0 100644 --- a/lib/l10n/nb_NO.js +++ b/lib/l10n/nb_NO.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud med en versjon lavere enn %s kreves.", "Help" : "Hjelp", "Personal" : "Personlig", - "Settings" : "Innstillinger", "Users" : "Brukere", "Admin" : "Admin", "Recommended" : "Anbefalt", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Oppgi et gyldig passord", "The username is already being used" : "Brukernavnet er allerede i bruk", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ingen databasedrivere (sqlite, mysql, or postgresql) installert.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Tillatelser kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til rotmappen%s.", "Cannot write into \"config\" directory" : "Kan ikke skrive i \"config\"-mappen", "Cannot write into \"apps\" directory" : "Kan ikke skrive i \"apps\"-mappen", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dette kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til apps-mappen%s eller ved å deaktivere app-butikken i config-filen.", "Cannot create \"data\" directory (%s)" : "Kan ikke opprette \"data\"-mappen (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dette kan vanligvis ordnes ved <a href=\"%s\" target=\"_blank\">gi web-serveren skrivetilgang til rotmappen</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Tillatelser kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til rotmappen%s.", "Setting locale to %s failed" : "Setting av nasjonale innstillinger til %s feilet.", "Please install one of these locales on your system and restart your webserver." : "Vennligst installer en av disse nasjonale innstillingene på systemet ditt og start webserveren på nytt.", "Please ask your server administrator to install the module." : "Be server-administratoren om å installere modulen.", diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb_NO.json index 0fe634772f7..d432aba266a 100644 --- a/lib/l10n/nb_NO.json +++ b/lib/l10n/nb_NO.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud med en versjon lavere enn %s kreves.", "Help" : "Hjelp", "Personal" : "Personlig", - "Settings" : "Innstillinger", "Users" : "Brukere", "Admin" : "Admin", "Recommended" : "Anbefalt", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Oppgi et gyldig passord", "The username is already being used" : "Brukernavnet er allerede i bruk", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ingen databasedrivere (sqlite, mysql, or postgresql) installert.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Tillatelser kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til rotmappen%s.", "Cannot write into \"config\" directory" : "Kan ikke skrive i \"config\"-mappen", "Cannot write into \"apps\" directory" : "Kan ikke skrive i \"apps\"-mappen", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dette kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til apps-mappen%s eller ved å deaktivere app-butikken i config-filen.", "Cannot create \"data\" directory (%s)" : "Kan ikke opprette \"data\"-mappen (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dette kan vanligvis ordnes ved <a href=\"%s\" target=\"_blank\">gi web-serveren skrivetilgang til rotmappen</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Tillatelser kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til rotmappen%s.", "Setting locale to %s failed" : "Setting av nasjonale innstillinger til %s feilet.", "Please install one of these locales on your system and restart your webserver." : "Vennligst installer en av disse nasjonale innstillingene på systemet ditt og start webserveren på nytt.", "Please ask your server administrator to install the module." : "Be server-administratoren om å installere modulen.", diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js index b44fd91d594..1235e233b78 100644 --- a/lib/l10n/nl.js +++ b/lib/l10n/nl.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud met een versie lager dan %s is vereist.", "Help" : "Help", "Personal" : "Persoonlijk", - "Settings" : "Instellingen", "Users" : "Gebruikers", "Admin" : "Beheerder", "Recommended" : "Aanbevolen", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven", "The username is already being used" : "De gebruikersnaam bestaat al", "No database drivers (sqlite, mysql, or postgresql) installed." : "Geen database drivers (sqlite, mysql of postgres) geïnstalleerd.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de hoofddirectory %s.", "Cannot write into \"config\" directory" : "Kan niet schrijven naar de \"config\" directory", "Cannot write into \"apps\" directory" : "Kan niet schrijven naar de \"apps\" directory", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de appsdirectory %s of door de appstore te deactiveren in het configbestand.", "Cannot create \"data\" directory (%s)" : "Kan de \"data\" directory (%s) niet aanmaken", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dit kan worden hersteld door <a href=\"%s\" target=\"_blank\"> de webserver schrijfrechten te geven tot de hoofddirectory</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de hoofddirectory %s.", "Setting locale to %s failed" : "Instellen taal op %s mislukte", "Please install one of these locales on your system and restart your webserver." : "Installeer één van de talen op uw systeem en herstart uw webserver.", "Please ask your server administrator to install the module." : "Vraag uw beheerder om de module te installeren.", diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json index e453aa0f6a0..5a076e4b0ba 100644 --- a/lib/l10n/nl.json +++ b/lib/l10n/nl.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud met een versie lager dan %s is vereist.", "Help" : "Help", "Personal" : "Persoonlijk", - "Settings" : "Instellingen", "Users" : "Gebruikers", "Admin" : "Beheerder", "Recommended" : "Aanbevolen", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven", "The username is already being used" : "De gebruikersnaam bestaat al", "No database drivers (sqlite, mysql, or postgresql) installed." : "Geen database drivers (sqlite, mysql of postgres) geïnstalleerd.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de hoofddirectory %s.", "Cannot write into \"config\" directory" : "Kan niet schrijven naar de \"config\" directory", "Cannot write into \"apps\" directory" : "Kan niet schrijven naar de \"apps\" directory", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de appsdirectory %s of door de appstore te deactiveren in het configbestand.", "Cannot create \"data\" directory (%s)" : "Kan de \"data\" directory (%s) niet aanmaken", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dit kan worden hersteld door <a href=\"%s\" target=\"_blank\"> de webserver schrijfrechten te geven tot de hoofddirectory</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de hoofddirectory %s.", "Setting locale to %s failed" : "Instellen taal op %s mislukte", "Please install one of these locales on your system and restart your webserver." : "Installeer één van de talen op uw systeem en herstart uw webserver.", "Please ask your server administrator to install the module." : "Vraag uw beheerder om de module te installeren.", diff --git a/lib/l10n/nn_NO.js b/lib/l10n/nn_NO.js index b16dd54cc18..79a9c335980 100644 --- a/lib/l10n/nn_NO.js +++ b/lib/l10n/nn_NO.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Hjelp", "Personal" : "Personleg", - "Settings" : "Innstillingar", "Users" : "Brukarar", "Admin" : "Administrer", "Unknown filetype" : "Ukjend filtype", diff --git a/lib/l10n/nn_NO.json b/lib/l10n/nn_NO.json index 6dad7797027..a465496723b 100644 --- a/lib/l10n/nn_NO.json +++ b/lib/l10n/nn_NO.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Hjelp", "Personal" : "Personleg", - "Settings" : "Innstillingar", "Users" : "Brukarar", "Admin" : "Administrer", "Unknown filetype" : "Ukjend filtype", diff --git a/lib/l10n/oc.js b/lib/l10n/oc.js index 4c16d7ec821..f4cb27ec628 100644 --- a/lib/l10n/oc.js +++ b/lib/l10n/oc.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Ajuda", "Personal" : "Personal", - "Settings" : "Configuracion", "Users" : "Usancièrs", "Admin" : "Admin", "today" : "uèi", diff --git a/lib/l10n/oc.json b/lib/l10n/oc.json index 9ebedb6f913..097e5553718 100644 --- a/lib/l10n/oc.json +++ b/lib/l10n/oc.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Ajuda", "Personal" : "Personal", - "Settings" : "Configuracion", "Users" : "Usancièrs", "Admin" : "Admin", "today" : "uèi", diff --git a/lib/l10n/pa.js b/lib/l10n/pa.js index 5b3f0a80f6a..13e4ed1fde8 100644 --- a/lib/l10n/pa.js +++ b/lib/l10n/pa.js @@ -1,7 +1,6 @@ OC.L10N.register( "lib", { - "Settings" : "ਸੈਟਿੰਗ", "today" : "ਅੱਜ", "yesterday" : "ਕੱਲ੍ਹ", "_%n day ago_::_%n days ago_" : ["",""], diff --git a/lib/l10n/pa.json b/lib/l10n/pa.json index 254909bc8b4..d42044e460f 100644 --- a/lib/l10n/pa.json +++ b/lib/l10n/pa.json @@ -1,5 +1,4 @@ { "translations": { - "Settings" : "ਸੈਟਿੰਗ", "today" : "ਅੱਜ", "yesterday" : "ਕੱਲ੍ਹ", "_%n day ago_::_%n days ago_" : ["",""], diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js index 9663e705324..b706afeb282 100644 --- a/lib/l10n/pl.js +++ b/lib/l10n/pl.js @@ -13,7 +13,6 @@ OC.L10N.register( "Following platforms are supported: %s" : "Obsługiwane są następujące platformy: %s", "Help" : "Pomoc", "Personal" : "Osobiste", - "Settings" : "Ustawienia", "Users" : "Użytkownicy", "Admin" : "Administrator", "Recommended" : "Polecane", @@ -99,12 +98,12 @@ OC.L10N.register( "A valid password must be provided" : "Należy podać prawidłowe hasło", "The username is already being used" : "Ta nazwa użytkownika jest już używana", "No database drivers (sqlite, mysql, or postgresql) installed." : "Brak sterowników bazy danych (sqlite, mysql or postgresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Problemy z uprawnieniami można zwykle naprawić przez %sdodanie serwerowi www uprawnień zapisu do katalogu głównego%s.", "Cannot write into \"config\" directory" : "Nie można zapisać do katalogu \"config\"", "Cannot write into \"apps\" directory" : "Nie można zapisać do katalogu \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Można to zwykle rozwiązać przez %sdodanie serwerowi www uprawnień zapisu do katalogu apps%s lub wyłączenie appstore w pliku konfiguracyjnym.", "Cannot create \"data\" directory (%s)" : "Nie można utworzyć katalogu \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Można to zwykle rozwiązać przez <a href=\"%s\" target=\"_blank\">dodanie serwerowi www uprawnień zapisu do katalogu głównego</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Problemy z uprawnieniami można zwykle naprawić przez %sdodanie serwerowi www uprawnień zapisu do katalogu głównego%s.", "Setting locale to %s failed" : "Nie udało się zmienić języka na %s", "Please install one of these locales on your system and restart your webserver." : "Proszę zainstalować jedno z poniższych locale w Twoim systemie i uruchomić ponownie serwer www.", "Please ask your server administrator to install the module." : "Proszę poproś administratora serwera aby zainstalował ten moduł.", diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json index 575f0fddf31..52a0508475c 100644 --- a/lib/l10n/pl.json +++ b/lib/l10n/pl.json @@ -11,7 +11,6 @@ "Following platforms are supported: %s" : "Obsługiwane są następujące platformy: %s", "Help" : "Pomoc", "Personal" : "Osobiste", - "Settings" : "Ustawienia", "Users" : "Użytkownicy", "Admin" : "Administrator", "Recommended" : "Polecane", @@ -97,12 +96,12 @@ "A valid password must be provided" : "Należy podać prawidłowe hasło", "The username is already being used" : "Ta nazwa użytkownika jest już używana", "No database drivers (sqlite, mysql, or postgresql) installed." : "Brak sterowników bazy danych (sqlite, mysql or postgresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Problemy z uprawnieniami można zwykle naprawić przez %sdodanie serwerowi www uprawnień zapisu do katalogu głównego%s.", "Cannot write into \"config\" directory" : "Nie można zapisać do katalogu \"config\"", "Cannot write into \"apps\" directory" : "Nie można zapisać do katalogu \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Można to zwykle rozwiązać przez %sdodanie serwerowi www uprawnień zapisu do katalogu apps%s lub wyłączenie appstore w pliku konfiguracyjnym.", "Cannot create \"data\" directory (%s)" : "Nie można utworzyć katalogu \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Można to zwykle rozwiązać przez <a href=\"%s\" target=\"_blank\">dodanie serwerowi www uprawnień zapisu do katalogu głównego</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Problemy z uprawnieniami można zwykle naprawić przez %sdodanie serwerowi www uprawnień zapisu do katalogu głównego%s.", "Setting locale to %s failed" : "Nie udało się zmienić języka na %s", "Please install one of these locales on your system and restart your webserver." : "Proszę zainstalować jedno z poniższych locale w Twoim systemie i uruchomić ponownie serwer www.", "Please ask your server administrator to install the module." : "Proszę poproś administratora serwera aby zainstalował ten moduł.", diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js index f3d765fa0a9..517f746d84e 100644 --- a/lib/l10n/pt_BR.js +++ b/lib/l10n/pt_BR.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "É necessário um ownCloud com uma versão menor que %s.", "Help" : "Ajuda", "Personal" : "Pessoal", - "Settings" : "Configurações", "Users" : "Usuários", "Admin" : "Admin", "Recommended" : "Recomendado", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Forneça uma senha válida", "The username is already being used" : "Este nome de usuário já está sendo usado", "No database drivers (sqlite, mysql, or postgresql) installed." : "Nenhum driver de banco de dados (sqlite, mysql, or postgresql) instalado.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissões podem ser corrigidas dando permissão de escita %sgiving ao webserver para o diretório raiz directory%s", "Cannot write into \"config\" directory" : "Não é possível gravar no diretório \"config\"", "Cannot write into \"apps\" directory" : "Não é possível gravar no diretório \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Isto pode ser corrigido dando ao webserver permissão de escrita %sgiving para o diretório apps directory%s ou desabilitando o appstore no arquivo de configuração.", "Cannot create \"data\" directory (%s)" : "Não pode ser criado \"dados\" no diretório (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Isto pode ser corrigido por <a href=\"%s\" target=\"_blank\">dando ao webserver permissão de escrita ao diretório raiz</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissões podem ser corrigidas dando permissão de escita %sgiving ao webserver para o diretório raiz directory%s", "Setting locale to %s failed" : "Falha ao configurar localidade para %s", "Please install one of these locales on your system and restart your webserver." : "Por favor, defina uma dessas localizações em seu sistema e reinicie o seu servidor web.", "Please ask your server administrator to install the module." : "Por favor, peça ao seu administrador do servidor para instalar o módulo.", diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json index e2f27123d3f..990579539c0 100644 --- a/lib/l10n/pt_BR.json +++ b/lib/l10n/pt_BR.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "É necessário um ownCloud com uma versão menor que %s.", "Help" : "Ajuda", "Personal" : "Pessoal", - "Settings" : "Configurações", "Users" : "Usuários", "Admin" : "Admin", "Recommended" : "Recomendado", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Forneça uma senha válida", "The username is already being used" : "Este nome de usuário já está sendo usado", "No database drivers (sqlite, mysql, or postgresql) installed." : "Nenhum driver de banco de dados (sqlite, mysql, or postgresql) instalado.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissões podem ser corrigidas dando permissão de escita %sgiving ao webserver para o diretório raiz directory%s", "Cannot write into \"config\" directory" : "Não é possível gravar no diretório \"config\"", "Cannot write into \"apps\" directory" : "Não é possível gravar no diretório \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Isto pode ser corrigido dando ao webserver permissão de escrita %sgiving para o diretório apps directory%s ou desabilitando o appstore no arquivo de configuração.", "Cannot create \"data\" directory (%s)" : "Não pode ser criado \"dados\" no diretório (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Isto pode ser corrigido por <a href=\"%s\" target=\"_blank\">dando ao webserver permissão de escrita ao diretório raiz</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissões podem ser corrigidas dando permissão de escita %sgiving ao webserver para o diretório raiz directory%s", "Setting locale to %s failed" : "Falha ao configurar localidade para %s", "Please install one of these locales on your system and restart your webserver." : "Por favor, defina uma dessas localizações em seu sistema e reinicie o seu servidor web.", "Please ask your server administrator to install the module." : "Por favor, peça ao seu administrador do servidor para instalar o módulo.", diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js index 5abfa3f57cd..de189883eca 100644 --- a/lib/l10n/pt_PT.js +++ b/lib/l10n/pt_PT.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "É necessário uma versão do ownCloud inferior a %s.", "Help" : "Ajuda", "Personal" : "Pessoal", - "Settings" : "Configurações", "Users" : "Utilizadores", "Admin" : "Admin", "Recommended" : "Recomendado", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Uma password válida deve ser fornecida", "The username is already being used" : "O nome de utilizador já está a ser usado", "No database drivers (sqlite, mysql, or postgresql) installed." : "Nenhuma base de dados de drivers (sqlite, mysql, or postgresql) instaladas.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "As autorizações podem ser resolvidas normalmente %sdando ao servidor web direito de escrita para o directório root%s.", "Cannot write into \"config\" directory" : "Não é possível escrever na directoria \"configurar\"", "Cannot write into \"apps\" directory" : "Não é possivel escrever na directoria \"aplicações\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Isto pode ser normalmente resolvido %sdando ao servidor web direito de escrita para o directório de aplicação%s ou desactivando a loja de aplicações no ficheiro de configuração.", "Cannot create \"data\" directory (%s)" : "Não é possivel criar a directoria \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Isto pode ser normalmente resolvido <a href=\"%s\" target=\"_blank\">dando ao servidor web direito de escrita para o directório do root</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "As autorizações podem ser resolvidas normalmente %sdando ao servidor web direito de escrita para o directório root%s.", "Setting locale to %s failed" : "Definindo local para %s falhado", "Please install one of these locales on your system and restart your webserver." : "Por favor instale um destes locais no seu sistema e reinicie o seu servidor web.", "Please ask your server administrator to install the module." : "Por favor pergunte ao seu administrador do servidor para instalar o modulo.", diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json index fff334cb3b0..dcf1a893f82 100644 --- a/lib/l10n/pt_PT.json +++ b/lib/l10n/pt_PT.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "É necessário uma versão do ownCloud inferior a %s.", "Help" : "Ajuda", "Personal" : "Pessoal", - "Settings" : "Configurações", "Users" : "Utilizadores", "Admin" : "Admin", "Recommended" : "Recomendado", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Uma password válida deve ser fornecida", "The username is already being used" : "O nome de utilizador já está a ser usado", "No database drivers (sqlite, mysql, or postgresql) installed." : "Nenhuma base de dados de drivers (sqlite, mysql, or postgresql) instaladas.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "As autorizações podem ser resolvidas normalmente %sdando ao servidor web direito de escrita para o directório root%s.", "Cannot write into \"config\" directory" : "Não é possível escrever na directoria \"configurar\"", "Cannot write into \"apps\" directory" : "Não é possivel escrever na directoria \"aplicações\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Isto pode ser normalmente resolvido %sdando ao servidor web direito de escrita para o directório de aplicação%s ou desactivando a loja de aplicações no ficheiro de configuração.", "Cannot create \"data\" directory (%s)" : "Não é possivel criar a directoria \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Isto pode ser normalmente resolvido <a href=\"%s\" target=\"_blank\">dando ao servidor web direito de escrita para o directório do root</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "As autorizações podem ser resolvidas normalmente %sdando ao servidor web direito de escrita para o directório root%s.", "Setting locale to %s failed" : "Definindo local para %s falhado", "Please install one of these locales on your system and restart your webserver." : "Por favor instale um destes locais no seu sistema e reinicie o seu servidor web.", "Please ask your server administrator to install the module." : "Por favor pergunte ao seu administrador do servidor para instalar o modulo.", diff --git a/lib/l10n/ro.js b/lib/l10n/ro.js index 08d5d9bb5b4..b06836c7fc3 100644 --- a/lib/l10n/ro.js +++ b/lib/l10n/ro.js @@ -6,7 +6,6 @@ OC.L10N.register( "PHP %s or higher is required." : "Versiunea PHP %s sau mai mare este necesară.", "Help" : "Ajutor", "Personal" : "Personal", - "Settings" : "Setări", "Users" : "Utilizatori", "Admin" : "Admin", "Recommended" : "Recomandat", diff --git a/lib/l10n/ro.json b/lib/l10n/ro.json index 9a0a316a57d..20b71834e23 100644 --- a/lib/l10n/ro.json +++ b/lib/l10n/ro.json @@ -4,7 +4,6 @@ "PHP %s or higher is required." : "Versiunea PHP %s sau mai mare este necesară.", "Help" : "Ajutor", "Personal" : "Personal", - "Settings" : "Setări", "Users" : "Utilizatori", "Admin" : "Admin", "Recommended" : "Recomandat", diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js index 79a53ab3302..6ee348d2fa1 100644 --- a/lib/l10n/ru.js +++ b/lib/l10n/ru.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "Требуется версия ownCloud ниже %s.", "Help" : "Помощь", "Personal" : "Личное", - "Settings" : "Настройки", "Users" : "Пользователи", "Admin" : "Администрирование", "Recommended" : "Рекомендовано", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Укажите правильный пароль", "The username is already being used" : "Имя пользователя уже используется", "No database drivers (sqlite, mysql, or postgresql) installed." : "Не установлены драйвера баз данных (sqlite, mysql или postgresql)", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в корневой каталог%s.", "Cannot write into \"config\" directory" : "Запись в каталог \"config\" невозможна", "Cannot write into \"apps\" directory" : "Запись в каталог \"app\" невозможна", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в каталог приложений%s или отключив хранилище программ в файле конфигурации.", "Cannot create \"data\" directory (%s)" : "Невозможно создать каталог \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Обычно это можно исправить, <a href=\"%s\" target=\"_blank\">предоставив веб-серверу права на запись в корневом каталоге.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в корневой каталог%s.", "Setting locale to %s failed" : "Установка локали %s не удалась", "Please install one of these locales on your system and restart your webserver." : "Установите один из этих языковых пакетов на вашу систему и перезапустите веб-сервер.", "Please ask your server administrator to install the module." : "Пожалуйста, попростите администратора сервера установить модуль.", diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json index 8863fe4c0a9..124b68038bd 100644 --- a/lib/l10n/ru.json +++ b/lib/l10n/ru.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "Требуется версия ownCloud ниже %s.", "Help" : "Помощь", "Personal" : "Личное", - "Settings" : "Настройки", "Users" : "Пользователи", "Admin" : "Администрирование", "Recommended" : "Рекомендовано", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Укажите правильный пароль", "The username is already being used" : "Имя пользователя уже используется", "No database drivers (sqlite, mysql, or postgresql) installed." : "Не установлены драйвера баз данных (sqlite, mysql или postgresql)", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в корневой каталог%s.", "Cannot write into \"config\" directory" : "Запись в каталог \"config\" невозможна", "Cannot write into \"apps\" directory" : "Запись в каталог \"app\" невозможна", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в каталог приложений%s или отключив хранилище программ в файле конфигурации.", "Cannot create \"data\" directory (%s)" : "Невозможно создать каталог \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Обычно это можно исправить, <a href=\"%s\" target=\"_blank\">предоставив веб-серверу права на запись в корневом каталоге.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в корневой каталог%s.", "Setting locale to %s failed" : "Установка локали %s не удалась", "Please install one of these locales on your system and restart your webserver." : "Установите один из этих языковых пакетов на вашу систему и перезапустите веб-сервер.", "Please ask your server administrator to install the module." : "Пожалуйста, попростите администратора сервера установить модуль.", diff --git a/lib/l10n/si_LK.js b/lib/l10n/si_LK.js index 09d5d0c84da..e3eea5e0b9b 100644 --- a/lib/l10n/si_LK.js +++ b/lib/l10n/si_LK.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "උදව්", "Personal" : "පෞද්ගලික", - "Settings" : "සිටුවම්", "Users" : "පරිශීලකයන්", "Admin" : "පරිපාලක", "today" : "අද", diff --git a/lib/l10n/si_LK.json b/lib/l10n/si_LK.json index 6c65802af2e..f1ac256a740 100644 --- a/lib/l10n/si_LK.json +++ b/lib/l10n/si_LK.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "උදව්", "Personal" : "පෞද්ගලික", - "Settings" : "සිටුවම්", "Users" : "පරිශීලකයන්", "Admin" : "පරිපාලක", "today" : "අද", diff --git a/lib/l10n/sk_SK.js b/lib/l10n/sk_SK.js index 47b404ff4a1..ef1a55d444e 100644 --- a/lib/l10n/sk_SK.js +++ b/lib/l10n/sk_SK.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud je vyžadovaný v nižšej verzii ako %s.", "Help" : "Pomoc", "Personal" : "Osobné", - "Settings" : "Nastavenia", "Users" : "Používatelia", "Admin" : "Administrátor", "Recommended" : "Odporúčané", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Musíte zadať platné heslo", "The username is already being used" : "Meno používateľa je už použité", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ovládače databázy (sqlite, mysql, alebo postgresql) nie sú nainštalované.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnenia je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do koreňového priečinka%s.", "Cannot write into \"config\" directory" : "Nie je možné zapisovať do priečinka \"config\"", "Cannot write into \"apps\" directory" : "Nie je možné zapisovať do priečinka \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Toto je zvyčajne možné opraviť tým, že %s udelíte webovému serveru oprávnenie na zápis do priečinka aplikácií %s alebo vypnete obchod s aplikáciami v konfiguračnom súbore.", "Cannot create \"data\" directory (%s)" : "Nie je možné vytvoriť priečinok \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Toto je zvyčajne možné opraviť tým, že <a href=\"%s\" target=\"_blank\">udelíte webovému serveru oprávnenie na zápis do koreňového adresára</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnenia je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do koreňového priečinka%s.", "Setting locale to %s failed" : "Nastavenie locale na %s zlyhalo", "Please install one of these locales on your system and restart your webserver." : "Prosím, nainštalujte si aspoň jeden z týchto jazykov so svojho systému a reštartujte webserver.", "Please ask your server administrator to install the module." : "Prosím, požiadajte administrátora vášho servera o inštaláciu modulu.", diff --git a/lib/l10n/sk_SK.json b/lib/l10n/sk_SK.json index 6d9768f569a..4a16e934053 100644 --- a/lib/l10n/sk_SK.json +++ b/lib/l10n/sk_SK.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud je vyžadovaný v nižšej verzii ako %s.", "Help" : "Pomoc", "Personal" : "Osobné", - "Settings" : "Nastavenia", "Users" : "Používatelia", "Admin" : "Administrátor", "Recommended" : "Odporúčané", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Musíte zadať platné heslo", "The username is already being used" : "Meno používateľa je už použité", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ovládače databázy (sqlite, mysql, alebo postgresql) nie sú nainštalované.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnenia je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do koreňového priečinka%s.", "Cannot write into \"config\" directory" : "Nie je možné zapisovať do priečinka \"config\"", "Cannot write into \"apps\" directory" : "Nie je možné zapisovať do priečinka \"apps\"", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Toto je zvyčajne možné opraviť tým, že %s udelíte webovému serveru oprávnenie na zápis do priečinka aplikácií %s alebo vypnete obchod s aplikáciami v konfiguračnom súbore.", "Cannot create \"data\" directory (%s)" : "Nie je možné vytvoriť priečinok \"data\" (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Toto je zvyčajne možné opraviť tým, že <a href=\"%s\" target=\"_blank\">udelíte webovému serveru oprávnenie na zápis do koreňového adresára</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnenia je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do koreňového priečinka%s.", "Setting locale to %s failed" : "Nastavenie locale na %s zlyhalo", "Please install one of these locales on your system and restart your webserver." : "Prosím, nainštalujte si aspoň jeden z týchto jazykov so svojho systému a reštartujte webserver.", "Please ask your server administrator to install the module." : "Prosím, požiadajte administrátora vášho servera o inštaláciu modulu.", diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js index 91efdf6d6eb..70224c5e391 100644 --- a/lib/l10n/sl.js +++ b/lib/l10n/sl.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "Zahtevana je različica ownCloud %s ali nižja.", "Help" : "Pomoč", "Personal" : "Osebno", - "Settings" : "Nastavitve", "Users" : "Uporabniki", "Admin" : "Skrbništvo", "Recommended" : "Priporočljivo", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Navedeno mora biti veljavno geslo", "The username is already being used" : "Vpisano uporabniško ime je že v uporabi", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dovoljenja je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje korensko mapo%s.", "Cannot write into \"config\" directory" : "Mapa 'config' nima nastavljenih ustreznih dovoljenj za pisanje!", "Cannot write into \"apps\" directory" : "Mapa \"apps\" nima nastavljenih ustreznih dovoljenj za pisanje!", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Napako je mogoče odpraviti z dodelitvijo dovoljenja spletnemu strežniku %s za pisanje v mapo programov %s, ali pa z onemogočanjem nameščanja programov v nastavitveni datoteki.", "Cannot create \"data\" directory (%s)" : "Ni mogoče ustvariti\"podatkovne\" mape (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Napako je mogoče odpraviti z <a href=\"%s\" target=\"_blank\">dodelitvijo dovoljenja spletnemu strežniku za pisanje v korensko mapo</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dovoljenja je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje korensko mapo%s.", "Setting locale to %s failed" : "Nastavljanje jezikovnih določil na %s je spodletelo.", "Please install one of these locales on your system and restart your webserver." : "Namestiti je treba podporo za vsaj eno od navedenih jezikovnih določil v sistemu in nato ponovno zagnati spletni strežnik.", "Please ask your server administrator to install the module." : "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.", diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json index 3c70d01bc66..3556e9f70f4 100644 --- a/lib/l10n/sl.json +++ b/lib/l10n/sl.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "Zahtevana je različica ownCloud %s ali nižja.", "Help" : "Pomoč", "Personal" : "Osebno", - "Settings" : "Nastavitve", "Users" : "Uporabniki", "Admin" : "Skrbništvo", "Recommended" : "Priporočljivo", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Navedeno mora biti veljavno geslo", "The username is already being used" : "Vpisano uporabniško ime je že v uporabi", "No database drivers (sqlite, mysql, or postgresql) installed." : "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dovoljenja je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje korensko mapo%s.", "Cannot write into \"config\" directory" : "Mapa 'config' nima nastavljenih ustreznih dovoljenj za pisanje!", "Cannot write into \"apps\" directory" : "Mapa \"apps\" nima nastavljenih ustreznih dovoljenj za pisanje!", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Napako je mogoče odpraviti z dodelitvijo dovoljenja spletnemu strežniku %s za pisanje v mapo programov %s, ali pa z onemogočanjem nameščanja programov v nastavitveni datoteki.", "Cannot create \"data\" directory (%s)" : "Ni mogoče ustvariti\"podatkovne\" mape (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Napako je mogoče odpraviti z <a href=\"%s\" target=\"_blank\">dodelitvijo dovoljenja spletnemu strežniku za pisanje v korensko mapo</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dovoljenja je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje korensko mapo%s.", "Setting locale to %s failed" : "Nastavljanje jezikovnih določil na %s je spodletelo.", "Please install one of these locales on your system and restart your webserver." : "Namestiti je treba podporo za vsaj eno od navedenih jezikovnih določil v sistemu in nato ponovno zagnati spletni strežnik.", "Please ask your server administrator to install the module." : "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.", diff --git a/lib/l10n/sq.js b/lib/l10n/sq.js index a92d868f116..3c89e0cbbad 100644 --- a/lib/l10n/sq.js +++ b/lib/l10n/sq.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Ndihmë", "Personal" : "Personale", - "Settings" : "Parametra", "Users" : "Përdoruesit", "Admin" : "Admin", "Recommended" : "E rekomanduar", diff --git a/lib/l10n/sq.json b/lib/l10n/sq.json index 4903e1be195..1af0e50c65b 100644 --- a/lib/l10n/sq.json +++ b/lib/l10n/sq.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Ndihmë", "Personal" : "Personale", - "Settings" : "Parametra", "Users" : "Përdoruesit", "Admin" : "Admin", "Recommended" : "E rekomanduar", diff --git a/lib/l10n/sr.js b/lib/l10n/sr.js index 4b2b401c127..a439016568a 100644 --- a/lib/l10n/sr.js +++ b/lib/l10n/sr.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Помоћ", "Personal" : "Лично", - "Settings" : "Поставке", "Users" : "Корисници", "Admin" : "Администратор", "today" : "данас", diff --git a/lib/l10n/sr.json b/lib/l10n/sr.json index a9d28c1ea5a..a8139cecf2d 100644 --- a/lib/l10n/sr.json +++ b/lib/l10n/sr.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Помоћ", "Personal" : "Лично", - "Settings" : "Поставке", "Users" : "Корисници", "Admin" : "Администратор", "today" : "данас", diff --git a/lib/l10n/sr@latin.js b/lib/l10n/sr@latin.js index be1a41c85ff..263365f9e35 100644 --- a/lib/l10n/sr@latin.js +++ b/lib/l10n/sr@latin.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Pomoć", "Personal" : "Lično", - "Settings" : "Podešavanja", "Users" : "Korisnici", "Admin" : "Adninistracija", "Unknown filetype" : "Nepoznat tip fajla", diff --git a/lib/l10n/sr@latin.json b/lib/l10n/sr@latin.json index b6aeff717c0..753466c538d 100644 --- a/lib/l10n/sr@latin.json +++ b/lib/l10n/sr@latin.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Pomoć", "Personal" : "Lično", - "Settings" : "Podešavanja", "Users" : "Korisnici", "Admin" : "Adninistracija", "Unknown filetype" : "Nepoznat tip fajla", diff --git a/lib/l10n/sv.js b/lib/l10n/sv.js index b4c471592b5..cd714ba567f 100644 --- a/lib/l10n/sv.js +++ b/lib/l10n/sv.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud med version lägre än %s krävs.", "Help" : "Hjälp", "Personal" : "Personligt", - "Settings" : "Inställningar", "Users" : "Användare", "Admin" : "Admin", "Recommended" : "Rekomenderad", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Ett giltigt lösenord måste anges", "The username is already being used" : "Användarnamnet används redan", "No database drivers (sqlite, mysql, or postgresql) installed." : "Inga databasdrivrutiner (sqlite, mysql, eller postgresql) installerade.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rättigheterna kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till rootkatalogen %s.", "Cannot write into \"config\" directory" : "Kan inte skriva till \"config\" katalogen", "Cannot write into \"apps\" directory" : "Kan inte skriva till \"apps\" katalogen!", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Detta kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till applikationskatalogen %s eller stänga av app-butik i konfigurationsfilen.", "Cannot create \"data\" directory (%s)" : "Kan inte skapa \"data\" katalog (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Detta kan vanligtvis åtgärdas genom att ge <a href=\"%s\" target=\"_blank\">webservern skrivrättigheter till rootkatalogen</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rättigheterna kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till rootkatalogen %s.", "Setting locale to %s failed" : "Sätta locale till %s misslyckades", "Please install one of these locales on your system and restart your webserver." : "Vänligen installera en av dessa locale på din server och starta om dinn webbserver,", "Please ask your server administrator to install the module." : "Vänligen be din administratör att installera modulen.", diff --git a/lib/l10n/sv.json b/lib/l10n/sv.json index c9af123467b..2af4aec4a71 100644 --- a/lib/l10n/sv.json +++ b/lib/l10n/sv.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud med version lägre än %s krävs.", "Help" : "Hjälp", "Personal" : "Personligt", - "Settings" : "Inställningar", "Users" : "Användare", "Admin" : "Admin", "Recommended" : "Rekomenderad", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Ett giltigt lösenord måste anges", "The username is already being used" : "Användarnamnet används redan", "No database drivers (sqlite, mysql, or postgresql) installed." : "Inga databasdrivrutiner (sqlite, mysql, eller postgresql) installerade.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rättigheterna kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till rootkatalogen %s.", "Cannot write into \"config\" directory" : "Kan inte skriva till \"config\" katalogen", "Cannot write into \"apps\" directory" : "Kan inte skriva till \"apps\" katalogen!", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Detta kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till applikationskatalogen %s eller stänga av app-butik i konfigurationsfilen.", "Cannot create \"data\" directory (%s)" : "Kan inte skapa \"data\" katalog (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Detta kan vanligtvis åtgärdas genom att ge <a href=\"%s\" target=\"_blank\">webservern skrivrättigheter till rootkatalogen</a>.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rättigheterna kan vanligtvis åtgärdas genom att %s ger webbservern skrivrättigheter till rootkatalogen %s.", "Setting locale to %s failed" : "Sätta locale till %s misslyckades", "Please install one of these locales on your system and restart your webserver." : "Vänligen installera en av dessa locale på din server och starta om dinn webbserver,", "Please ask your server administrator to install the module." : "Vänligen be din administratör att installera modulen.", diff --git a/lib/l10n/ta_IN.js b/lib/l10n/ta_IN.js index 27a3f155da1..a12702211c2 100644 --- a/lib/l10n/ta_IN.js +++ b/lib/l10n/ta_IN.js @@ -1,7 +1,6 @@ OC.L10N.register( "lib", { - "Settings" : "அமைப்புகள்", "_%n day ago_::_%n days ago_" : ["",""], "_%n month ago_::_%n months ago_" : ["",""], "_%n year ago_::_%n years ago_" : ["",""], diff --git a/lib/l10n/ta_IN.json b/lib/l10n/ta_IN.json index 937923e8068..b994fa289eb 100644 --- a/lib/l10n/ta_IN.json +++ b/lib/l10n/ta_IN.json @@ -1,5 +1,4 @@ { "translations": { - "Settings" : "அமைப்புகள்", "_%n day ago_::_%n days ago_" : ["",""], "_%n month ago_::_%n months ago_" : ["",""], "_%n year ago_::_%n years ago_" : ["",""], diff --git a/lib/l10n/ta_LK.js b/lib/l10n/ta_LK.js index 758ad47a78d..fbf1b5c9e70 100644 --- a/lib/l10n/ta_LK.js +++ b/lib/l10n/ta_LK.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "உதவி", "Personal" : "தனிப்பட்ட", - "Settings" : "அமைப்புகள்", "Users" : "பயனாளர்", "Admin" : "நிர்வாகம்", "today" : "இன்று", diff --git a/lib/l10n/ta_LK.json b/lib/l10n/ta_LK.json index 378f926337e..89928821e59 100644 --- a/lib/l10n/ta_LK.json +++ b/lib/l10n/ta_LK.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "உதவி", "Personal" : "தனிப்பட்ட", - "Settings" : "அமைப்புகள்", "Users" : "பயனாளர்", "Admin" : "நிர்வாகம்", "today" : "இன்று", diff --git a/lib/l10n/te.js b/lib/l10n/te.js index 615c6bd68ca..2a3f206338a 100644 --- a/lib/l10n/te.js +++ b/lib/l10n/te.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "సహాయం", "Personal" : "వ్యక్తిగతం", - "Settings" : "అమరికలు", "Users" : "వాడుకరులు", "today" : "ఈరోజు", "yesterday" : "నిన్న", diff --git a/lib/l10n/te.json b/lib/l10n/te.json index 4b243366da1..1f9d621fdc0 100644 --- a/lib/l10n/te.json +++ b/lib/l10n/te.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "సహాయం", "Personal" : "వ్యక్తిగతం", - "Settings" : "అమరికలు", "Users" : "వాడుకరులు", "today" : "ఈరోజు", "yesterday" : "నిన్న", diff --git a/lib/l10n/th_TH.js b/lib/l10n/th_TH.js index 9ab8b29e5a0..536b6f52ce2 100644 --- a/lib/l10n/th_TH.js +++ b/lib/l10n/th_TH.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "ช่วยเหลือ", "Personal" : "ส่วนตัว", - "Settings" : "ตั้งค่า", "Users" : "ผู้ใช้งาน", "Admin" : "ผู้ดูแล", "today" : "วันนี้", diff --git a/lib/l10n/th_TH.json b/lib/l10n/th_TH.json index 13452ec720a..21b2cf74d6a 100644 --- a/lib/l10n/th_TH.json +++ b/lib/l10n/th_TH.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "ช่วยเหลือ", "Personal" : "ส่วนตัว", - "Settings" : "ตั้งค่า", "Users" : "ผู้ใช้งาน", "Admin" : "ผู้ดูแล", "today" : "วันนี้", diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js index f6f8a89713f..2a53c0606b5 100644 --- a/lib/l10n/tr.js +++ b/lib/l10n/tr.js @@ -19,7 +19,6 @@ OC.L10N.register( "ownCloud with a version lower than %s is required." : "ownCloud %s sürümünden daha öncesi gerekli.", "Help" : "Yardım", "Personal" : "Kişisel", - "Settings" : "Ayarlar", "Users" : "Kullanıcılar", "Admin" : "Yönetici", "Recommended" : "Önerilen", @@ -108,12 +107,12 @@ OC.L10N.register( "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı", "The username is already being used" : "Bu kullanıcı adı zaten kullanımda", "No database drivers (sqlite, mysql, or postgresql) installed." : "Yüklü veritabanı sürücüsü (sqlite, mysql veya postgresql) yok.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "İzinler genellikle, %sweb sunucusuna kök dizinine yazma erişimi verilerek%s çözülebilir", "Cannot write into \"config\" directory" : "\"config\" dizinine yazılamıyor", "Cannot write into \"apps\" directory" : "\"apps\" dizinine yazılamıyor", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Bu genellikle, %sweb sunucusuna apps dizinine yazma erişimi verilerek%s veya yapılandırma dosyasında appstore (uygulama mağazası) devre dışı bırakılarak çözülebilir.", "Cannot create \"data\" directory (%s)" : "\"Veri\" dizini oluşturulamıyor (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "İzinler genellikle, <a href=\"%s\" target=\"_blank\">web sunucusuna kök dizinine yazma erişimi verilerek</a> çözülebilir.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "İzinler genellikle, %sweb sunucusuna kök dizinine yazma erişimi verilerek%s çözülebilir", "Setting locale to %s failed" : "Dili %s olarak ayarlama başarısız", "Please install one of these locales on your system and restart your webserver." : "Lütfen bu yerellerden birini sisteminize yükleyin ve web sunucunuzu yeniden başlatın.", "Please ask your server administrator to install the module." : "Lütfen modülün kurulması için sunucu yöneticinize danışın.", diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json index 778818c8a86..93c2a7b98c5 100644 --- a/lib/l10n/tr.json +++ b/lib/l10n/tr.json @@ -17,7 +17,6 @@ "ownCloud with a version lower than %s is required." : "ownCloud %s sürümünden daha öncesi gerekli.", "Help" : "Yardım", "Personal" : "Kişisel", - "Settings" : "Ayarlar", "Users" : "Kullanıcılar", "Admin" : "Yönetici", "Recommended" : "Önerilen", @@ -106,12 +105,12 @@ "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı", "The username is already being used" : "Bu kullanıcı adı zaten kullanımda", "No database drivers (sqlite, mysql, or postgresql) installed." : "Yüklü veritabanı sürücüsü (sqlite, mysql veya postgresql) yok.", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "İzinler genellikle, %sweb sunucusuna kök dizinine yazma erişimi verilerek%s çözülebilir", "Cannot write into \"config\" directory" : "\"config\" dizinine yazılamıyor", "Cannot write into \"apps\" directory" : "\"apps\" dizinine yazılamıyor", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Bu genellikle, %sweb sunucusuna apps dizinine yazma erişimi verilerek%s veya yapılandırma dosyasında appstore (uygulama mağazası) devre dışı bırakılarak çözülebilir.", "Cannot create \"data\" directory (%s)" : "\"Veri\" dizini oluşturulamıyor (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "İzinler genellikle, <a href=\"%s\" target=\"_blank\">web sunucusuna kök dizinine yazma erişimi verilerek</a> çözülebilir.", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "İzinler genellikle, %sweb sunucusuna kök dizinine yazma erişimi verilerek%s çözülebilir", "Setting locale to %s failed" : "Dili %s olarak ayarlama başarısız", "Please install one of these locales on your system and restart your webserver." : "Lütfen bu yerellerden birini sisteminize yükleyin ve web sunucunuzu yeniden başlatın.", "Please ask your server administrator to install the module." : "Lütfen modülün kurulması için sunucu yöneticinize danışın.", diff --git a/lib/l10n/ug.js b/lib/l10n/ug.js index 5ee6ccadd82..03369e132d3 100644 --- a/lib/l10n/ug.js +++ b/lib/l10n/ug.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "ياردەم", "Personal" : "شەخسىي", - "Settings" : "تەڭشەكلەر", "Users" : "ئىشلەتكۈچىلەر", "today" : "بۈگۈن", "yesterday" : "تۈنۈگۈن", diff --git a/lib/l10n/ug.json b/lib/l10n/ug.json index b73fb7e1b35..824bb116a40 100644 --- a/lib/l10n/ug.json +++ b/lib/l10n/ug.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "ياردەم", "Personal" : "شەخسىي", - "Settings" : "تەڭشەكلەر", "Users" : "ئىشلەتكۈچىلەر", "today" : "بۈگۈن", "yesterday" : "تۈنۈگۈن", diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js index ee35acd8dab..cca57d41549 100644 --- a/lib/l10n/uk.js +++ b/lib/l10n/uk.js @@ -10,7 +10,6 @@ OC.L10N.register( "PHP %s or higher is required." : "Необхідно PHP %s або вище", "Help" : "Допомога", "Personal" : "Особисте", - "Settings" : "Налаштування", "Users" : "Користувачі", "Admin" : "Адмін", "Recommended" : "Рекомендуємо", diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json index 2969c10ea97..bc4d2ac5890 100644 --- a/lib/l10n/uk.json +++ b/lib/l10n/uk.json @@ -8,7 +8,6 @@ "PHP %s or higher is required." : "Необхідно PHP %s або вище", "Help" : "Допомога", "Personal" : "Особисте", - "Settings" : "Налаштування", "Users" : "Користувачі", "Admin" : "Адмін", "Recommended" : "Рекомендуємо", diff --git a/lib/l10n/ur_PK.js b/lib/l10n/ur_PK.js index d02b480fd13..e4fcea7f162 100644 --- a/lib/l10n/ur_PK.js +++ b/lib/l10n/ur_PK.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "مدد", "Personal" : "ذاتی", - "Settings" : "سیٹینگز", "Users" : "یوزرز", "Admin" : "ایڈمن", "Unknown filetype" : "غیر معرروف قسم کی فائل", diff --git a/lib/l10n/ur_PK.json b/lib/l10n/ur_PK.json index bbe6e221b2a..605653eddcf 100644 --- a/lib/l10n/ur_PK.json +++ b/lib/l10n/ur_PK.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "مدد", "Personal" : "ذاتی", - "Settings" : "سیٹینگز", "Users" : "یوزرز", "Admin" : "ایڈمن", "Unknown filetype" : "غیر معرروف قسم کی فائل", diff --git a/lib/l10n/vi.js b/lib/l10n/vi.js index a7e68528166..bab0698ef76 100644 --- a/lib/l10n/vi.js +++ b/lib/l10n/vi.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "Giúp đỡ", "Personal" : "Cá nhân", - "Settings" : "Cài đặt", "Users" : "Người dùng", "Admin" : "Quản trị", "Unknown filetype" : "Không biết kiểu tập tin", diff --git a/lib/l10n/vi.json b/lib/l10n/vi.json index a7a29de350a..6f6aa42f7c9 100644 --- a/lib/l10n/vi.json +++ b/lib/l10n/vi.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "Giúp đỡ", "Personal" : "Cá nhân", - "Settings" : "Cài đặt", "Users" : "Người dùng", "Admin" : "Quản trị", "Unknown filetype" : "Không biết kiểu tập tin", diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js index 75f97fc6879..6079f2a42e8 100644 --- a/lib/l10n/zh_CN.js +++ b/lib/l10n/zh_CN.js @@ -6,7 +6,6 @@ OC.L10N.register( "PHP %s or higher is required." : "要求 PHP 版本 %s 或者更高。", "Help" : "帮助", "Personal" : "个人", - "Settings" : "设置", "Users" : "用户", "Admin" : "管理", "No app name specified" : "没有指定的 App 名称", diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json index 46e10f91993..a26f75ee226 100644 --- a/lib/l10n/zh_CN.json +++ b/lib/l10n/zh_CN.json @@ -4,7 +4,6 @@ "PHP %s or higher is required." : "要求 PHP 版本 %s 或者更高。", "Help" : "帮助", "Personal" : "个人", - "Settings" : "设置", "Users" : "用户", "Admin" : "管理", "No app name specified" : "没有指定的 App 名称", diff --git a/lib/l10n/zh_HK.js b/lib/l10n/zh_HK.js index 1fa04277511..734c1679fac 100644 --- a/lib/l10n/zh_HK.js +++ b/lib/l10n/zh_HK.js @@ -3,7 +3,6 @@ OC.L10N.register( { "Help" : "幫助", "Personal" : "個人", - "Settings" : "設定", "Users" : "用戶", "Admin" : "管理", "Recommended" : "建議", diff --git a/lib/l10n/zh_HK.json b/lib/l10n/zh_HK.json index 3ad83045700..e8226d3936b 100644 --- a/lib/l10n/zh_HK.json +++ b/lib/l10n/zh_HK.json @@ -1,7 +1,6 @@ { "translations": { "Help" : "幫助", "Personal" : "個人", - "Settings" : "設定", "Users" : "用戶", "Admin" : "管理", "Recommended" : "建議", diff --git a/lib/l10n/zh_TW.js b/lib/l10n/zh_TW.js index 477fa6bda3a..195cee01757 100644 --- a/lib/l10n/zh_TW.js +++ b/lib/l10n/zh_TW.js @@ -10,7 +10,6 @@ OC.L10N.register( "PHP %s or higher is required." : "需要 PHP %s 或更高版本", "Help" : "說明", "Personal" : "個人", - "Settings" : "設定", "Users" : "使用者", "Admin" : "管理", "Recommended" : "建議", @@ -94,12 +93,12 @@ OC.L10N.register( "A valid password must be provided" : "一定要提供一個有效的密碼", "The username is already being used" : "這個使用者名稱已經有人使用了", "No database drivers (sqlite, mysql, or postgresql) installed." : "沒有安裝資料庫驅動程式 (sqlite, mysql, 或 postgresql)", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "通常藉由%s開放網頁伺服器對根目錄的權限%s就可以修正權限問題", "Cannot write into \"config\" directory" : "無法寫入 config 目錄", "Cannot write into \"apps\" directory" : "無法寫入 apps 目錄", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "通常藉由%s開放網頁伺服器對 apps 目錄的權限%s或是在設定檔中關閉 appstore 就可以修正這個問題", "Cannot create \"data\" directory (%s)" : "無法建立 data 目錄 (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "通常藉由<a href=\"%s\" target=\"_blank\">開放網頁伺服器對根目錄的權限</a>就可以修正權限問題", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "通常藉由%s開放網頁伺服器對根目錄的權限%s就可以修正權限問題", "Setting locale to %s failed" : "設定語系為 %s 失敗", "Please install one of these locales on your system and restart your webserver." : "請在系統中安裝這些語系的其中一個，然後重啓網頁伺服器", "Please ask your server administrator to install the module." : "請詢問系統管理員來安裝這些模組", diff --git a/lib/l10n/zh_TW.json b/lib/l10n/zh_TW.json index 685214cbc06..cbfd15b060f 100644 --- a/lib/l10n/zh_TW.json +++ b/lib/l10n/zh_TW.json @@ -8,7 +8,6 @@ "PHP %s or higher is required." : "需要 PHP %s 或更高版本", "Help" : "說明", "Personal" : "個人", - "Settings" : "設定", "Users" : "使用者", "Admin" : "管理", "Recommended" : "建議", @@ -92,12 +91,12 @@ "A valid password must be provided" : "一定要提供一個有效的密碼", "The username is already being used" : "這個使用者名稱已經有人使用了", "No database drivers (sqlite, mysql, or postgresql) installed." : "沒有安裝資料庫驅動程式 (sqlite, mysql, 或 postgresql)", - "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "通常藉由%s開放網頁伺服器對根目錄的權限%s就可以修正權限問題", "Cannot write into \"config\" directory" : "無法寫入 config 目錄", "Cannot write into \"apps\" directory" : "無法寫入 apps 目錄", "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "通常藉由%s開放網頁伺服器對 apps 目錄的權限%s或是在設定檔中關閉 appstore 就可以修正這個問題", "Cannot create \"data\" directory (%s)" : "無法建立 data 目錄 (%s)", "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "通常藉由<a href=\"%s\" target=\"_blank\">開放網頁伺服器對根目錄的權限</a>就可以修正權限問題", + "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "通常藉由%s開放網頁伺服器對根目錄的權限%s就可以修正權限問題", "Setting locale to %s failed" : "設定語系為 %s 失敗", "Please install one of these locales on your system and restart your webserver." : "請在系統中安裝這些語系的其中一個，然後重啓網頁伺服器", "Please ask your server administrator to install the module." : "請詢問系統管理員來安裝這些模組", diff --git a/lib/private/app.php b/lib/private/app.php index a92ddd40e6f..1af2c36e19f 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -35,13 +35,11 @@ use OC\App\Platform; */ class OC_App { static private $appVersion = []; - static private $settingsForms = array(); static private $adminForms = array(); static private $personalForms = array(); static private $appInfo = array(); static private $appTypes = array(); static private $loadedApps = array(); - static private $checkedApps = array(); static private $altLogin = array(); /** @@ -320,6 +318,7 @@ class OC_App { /** * This function set an app as disabled in appconfig. * @param string $app app + * @throws Exception */ public static function disable($app) { if($app === 'files') { @@ -431,18 +430,6 @@ class OC_App { "icon" => OC_Helper::imagePath("settings", "personal.svg") ); - // if there are some settings forms - if (!empty(self::$settingsForms)) { - // settings menu - $settings[] = array( - "id" => "settings", - "order" => 1000, - "href" => OC_Helper::linkToRoute("settings_settings"), - "name" => $l->t("Settings"), - "icon" => OC_Helper::imagePath("settings", "settings.svg") - ); - } - //SubAdmins are also allowed to access user management if (OC_SubAdmin::isSubAdmin(OC_User::getUser())) { // admin users menu @@ -455,7 +442,6 @@ class OC_App { ); } - // if the user is an admin if (OC_User::isAdminUser(OC_User::getUser())) { // admin settings @@ -679,10 +665,11 @@ class OC_App { * @return string */ public static function getCurrentApp() { - $script = substr(OC_Request::scriptName(), strlen(OC::$WEBROOT) + 1); + $request = \OC::$server->getRequest(); + $script = substr($request->getScriptName(), strlen(OC::$WEBROOT) + 1); $topFolder = substr($script, 0, strpos($script, '/')); if (empty($topFolder)) { - $path_info = OC_Request::getPathInfo(); + $path_info = $request->getPathInfo(); if ($path_info) { $topFolder = substr($path_info, 1, strpos($path_info, '/', 1) - 1); } @@ -696,14 +683,12 @@ class OC_App { } /** - * get the forms for either settings, admin or personal + * @param string $type + * @return array */ public static function getForms($type) { $forms = array(); switch ($type) { - case 'settings': - $source = self::$settingsForms; - break; case 'admin': $source = self::$adminForms; break; @@ -720,13 +705,6 @@ class OC_App { } /** - * register a settings form to be shown - */ - public static function registerSettings($app, $page) { - self::$settingsForms[] = $app . '/' . $page . '.php'; - } - - /** * register an admin form to be shown * * @param string $app @@ -743,10 +721,16 @@ class OC_App { self::$personalForms[] = $app . '/' . $page . '.php'; } - public static function registerLogIn($entry) { + /** + * @param array $entry + */ + public static function registerLogIn(array $entry) { self::$altLogin[] = $entry; } + /** + * @return array + */ public static function getAlternativeLogIns() { return self::$altLogin; } diff --git a/lib/private/app/codechecker.php b/lib/private/app/codechecker.php new file mode 100644 index 00000000000..dbec53579a8 --- /dev/null +++ b/lib/private/app/codechecker.php @@ -0,0 +1,130 @@ +<?php +/** + * Copyright (c) 2015 Thomas Müller <deepdiver@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\App; + +use OC\Hooks\BasicEmitter; +use PhpParser\Lexer; +use PhpParser\Node; +use PhpParser\Node\Name; +use PhpParser\NodeTraverser; +use PhpParser\NodeVisitorAbstract; +use PhpParser\Parser; +use RecursiveCallbackFilterIterator; +use RecursiveDirectoryIterator; +use RecursiveIteratorIterator; +use RegexIterator; +use SplFileInfo; + +class CodeChecker extends BasicEmitter { + + const CLASS_EXTENDS_NOT_ALLOWED = 1000; + const CLASS_IMPLEMENTS_NOT_ALLOWED = 1001; + const STATIC_CALL_NOT_ALLOWED = 1002; + const CLASS_CONST_FETCH_NOT_ALLOWED = 1003; + const CLASS_NEW_FETCH_NOT_ALLOWED = 1004; + + /** @var Parser */ + private $parser; + + /** @var string[] */ + private $blackListedClassNames; + + public function __construct() { + $this->parser = new Parser(new Lexer); + $this->blackListedClassNames = [ + // classes replaced by the public api + 'OC_API', + 'OC_App', + 'OC_AppConfig', + 'OC_Avatar', + 'OC_BackgroundJob', + 'OC_Config', + 'OC_DB', + 'OC_Files', + 'OC_Helper', + 'OC_Hook', + 'OC_Image', + 'OC_JSON', + 'OC_L10N', + 'OC_Log', + 'OC_Mail', + 'OC_Preferences', + 'OC_Request', + 'OC_Response', + 'OC_Template', + 'OC_User', + 'OC_Util', + ]; + } + + /** + * @param string $appId + * @return array + */ + public function analyse($appId) { + $appPath = \OC_App::getAppPath($appId); + if ($appPath === false) { + throw new \RuntimeException("No app with given id <$appId> known."); + } + + return $this->analyseFolder($appPath); + } + + /** + * @param string $folder + * @return array + */ + public function analyseFolder($folder) { + $errors = []; + + $excludes = array_map(function($item) use ($folder) { + return $folder . '/' . $item; + }, ['vendor', '3rdparty', '.git', 'l10n']); + + $iterator = new RecursiveDirectoryIterator($folder, RecursiveDirectoryIterator::SKIP_DOTS); + $iterator = new RecursiveCallbackFilterIterator($iterator, function($item) use ($folder, $excludes){ + /** @var SplFileInfo $item */ + foreach($excludes as $exclude) { + if (substr($item->getPath(), 0, strlen($exclude)) === $exclude) { + return false; + } + } + return true; + }); + $iterator = new RecursiveIteratorIterator($iterator); + $iterator = new RegexIterator($iterator, '/^.+\.php$/i'); + + foreach ($iterator as $file) { + /** @var SplFileInfo $file */ + $this->emit('CodeChecker', 'analyseFileBegin', [$file->getPathname()]); + $errors = array_merge($this->analyseFile($file), $errors); + $this->emit('CodeChecker', 'analyseFileFinished', [$errors]); + } + + return $errors; + } + + + /** + * @param string $file + * @return array + */ + public function analyseFile($file) { + $code = file_get_contents($file); + $statements = $this->parser->parse($code); + + $visitor = new CodeCheckVisitor($this->blackListedClassNames); + $traverser = new NodeTraverser; + $traverser->addVisitor($visitor); + + $traverser->traverse($statements); + + return $visitor->errors; + } +} diff --git a/lib/private/app/codecheckvisitor.php b/lib/private/app/codecheckvisitor.php new file mode 100644 index 00000000000..939c905bcf6 --- /dev/null +++ b/lib/private/app/codecheckvisitor.php @@ -0,0 +1,111 @@ +<?php +/** + * Copyright (c) 2015 Thomas Müller <deepdiver@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\App; + +use OC\Hooks\BasicEmitter; +use PhpParser\Lexer; +use PhpParser\Node; +use PhpParser\Node\Name; +use PhpParser\NodeTraverser; +use PhpParser\NodeVisitorAbstract; +use PhpParser\Parser; +use RecursiveCallbackFilterIterator; +use RecursiveDirectoryIterator; +use RecursiveIteratorIterator; +use RegexIterator; +use SplFileInfo; + +class CodeCheckVisitor extends NodeVisitorAbstract { + + public function __construct($blackListedClassNames) { + $this->blackListedClassNames = array_map('strtolower', $blackListedClassNames); + } + + public $errors = []; + + public function enterNode(Node $node) { + if ($node instanceof Node\Stmt\Class_) { + if (!is_null($node->extends)) { + $this->checkBlackList($node->extends->toString(), CodeChecker::CLASS_EXTENDS_NOT_ALLOWED, $node); + } + foreach ($node->implements as $implements) { + $this->checkBlackList($implements->toString(), CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED, $node); + } + } + if ($node instanceof Node\Expr\StaticCall) { + if (!is_null($node->class)) { + if ($node->class instanceof Name) { + $this->checkBlackList($node->class->toString(), CodeChecker::STATIC_CALL_NOT_ALLOWED, $node); + } + if ($node->class instanceof Node\Expr\Variable) { + /** + * TODO: find a way to detect something like this: + * $c = "OC_API"; + * $n = $i::call(); + */ + } + } + } + if ($node instanceof Node\Expr\ClassConstFetch) { + if (!is_null($node->class)) { + if ($node->class instanceof Name) { + $this->checkBlackList($node->class->toString(), CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED, $node); + } + if ($node->class instanceof Node\Expr\Variable) { + /** + * TODO: find a way to detect something like this: + * $c = "OC_API"; + * $n = $i::ADMIN_AUTH; + */ + } + } + } + if ($node instanceof Node\Expr\New_) { + if (!is_null($node->class)) { + if ($node->class instanceof Name) { + $this->checkBlackList($node->class->toString(), CodeChecker::CLASS_NEW_FETCH_NOT_ALLOWED, $node); + } + if ($node->class instanceof Node\Expr\Variable) { + /** + * TODO: find a way to detect something like this: + * $c = "OC_API"; + * $n = new $i; + */ + } + } + } + } + + private function checkBlackList($name, $errorCode, Node $node) { + if (in_array(strtolower($name), $this->blackListedClassNames)) { + $this->errors[]= [ + 'disallowedToken' => $name, + 'errorCode' => $errorCode, + 'line' => $node->getLine(), + 'reason' => $this->buildReason($name, $errorCode) + ]; + } + } + + private function buildReason($name, $errorCode) { + static $errorMessages= [ + CodeChecker::CLASS_EXTENDS_NOT_ALLOWED => "used as base class", + CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED => "used as interface", + CodeChecker::STATIC_CALL_NOT_ALLOWED => "static method call on private class", + CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED => "used to fetch a const from", + CodeChecker::CLASS_NEW_FETCH_NOT_ALLOWED => "is instanciated", + ]; + + if (isset($errorMessages[$errorCode])) { + return $errorMessages[$errorCode]; + } + + return "$name usage not allowed - error: $errorCode"; + } +} diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php index 4902671d4b8..d85bfd4f30a 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/appframework/http/request.php @@ -24,6 +24,8 @@ namespace OC\AppFramework\Http; +use OC\Security\TrustedDomainHelper; +use OCP\IConfig; use OCP\IRequest; use OCP\Security\ISecureRandom; @@ -31,9 +33,14 @@ use OCP\Security\ISecureRandom; * Class for accessing variables in the request. * This class provides an immutable object with request variables. */ - class Request implements \ArrayAccess, \Countable, IRequest { + const USER_AGENT_IE = '/MSIE/'; + // 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$#'; + const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost)$/'; + protected $inputStream; protected $content; protected $items = array(); @@ -51,6 +58,8 @@ class Request implements \ArrayAccess, \Countable, IRequest { ); /** @var ISecureRandom */ protected $secureRandom; + /** @var IConfig */ + protected $config; /** @var string */ protected $requestId = ''; @@ -66,15 +75,18 @@ class Request implements \ArrayAccess, \Countable, IRequest { * - string 'method' the request method (GET, POST etc) * - string|false 'requesttoken' the requesttoken or false when not available * @param ISecureRandom $secureRandom + * @param IConfig $config * @param string $stream * @see http://www.php.net/manual/en/reserved.variables.php */ public function __construct(array $vars=array(), - ISecureRandom $secureRandom, + ISecureRandom $secureRandom = null, + IConfig $config, $stream='php://input') { $this->inputStream = $stream; $this->items['params'] = array(); $this->secureRandom = $secureRandom; + $this->config = $config; if(!array_key_exists('method', $vars)) { $vars['method'] = 'GET'; @@ -115,8 +127,10 @@ class Request implements \ArrayAccess, \Countable, IRequest { ); } - - public function setUrlParameters($parameters) { + /** + * @param array $parameters + */ + public function setUrlParameters(array $parameters) { $this->items['urlParams'] = $parameters; $this->items['parameters'] = array_merge( $this->items['parameters'], @@ -124,7 +138,10 @@ class Request implements \ArrayAccess, \Countable, IRequest { ); } - // Countable method. + /** + * Countable method + * @return int + */ public function count() { return count(array_keys($this->items['parameters'])); } @@ -176,7 +193,11 @@ class Request implements \ArrayAccess, \Countable, IRequest { throw new \RuntimeException('You cannot change the contents of the request object'); } - // Magic property accessors + /** + * Magic property accessors + * @param string $name + * @param mixed $value + */ public function __set($name, $value) { throw new \RuntimeException('You cannot change the contents of the request object'); } @@ -231,12 +252,17 @@ class Request implements \ArrayAccess, \Countable, IRequest { } } - + /** + * @param string $name + * @return bool + */ public function __isset($name) { return isset($this->items['parameters'][$name]); } - + /** + * @param string $id + */ public function __unset($id) { throw new \RunTimeException('You cannot change the contents of the request object'); } @@ -412,4 +438,254 @@ class Request implements \ArrayAccess, \Countable, IRequest { return $this->requestId; } + /** + * Returns the remote address, if the connection came from a trusted proxy + * and `forwarded_for_headers` has been configured then the IP address + * specified in this header will be returned instead. + * Do always use this instead of $_SERVER['REMOTE_ADDR'] + * @return string IP address + */ + public function getRemoteAddress() { + $remoteAddress = isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : ''; + $trustedProxies = $this->config->getSystemValue('trusted_proxies', []); + + if(is_array($trustedProxies) && in_array($remoteAddress, $trustedProxies)) { + $forwardedForHeaders = $this->config->getSystemValue('forwarded_for_headers', []); + + foreach($forwardedForHeaders as $header) { + if(isset($this->server[$header])) { + foreach(explode(',', $this->server[$header]) as $IP) { + $IP = trim($IP); + if (filter_var($IP, FILTER_VALIDATE_IP) !== false) { + return $IP; + } + } + } + } + } + + return $remoteAddress; + } + + /** + * Check overwrite condition + * @param string $type + * @return bool + */ + private function isOverwriteCondition($type = '') { + $regex = '/' . $this->config->getSystemValue('overwritecondaddr', '') . '/'; + return $regex === '//' || preg_match($regex, $this->server['REMOTE_ADDR']) === 1 + || ($type !== 'protocol' && $this->config->getSystemValue('forcessl', false)); + } + + /** + * Returns the server protocol. It respects reverse proxy servers and load + * balancers. + * @return string Server protocol (http or https) + */ + public function getServerProtocol() { + if($this->config->getSystemValue('overwriteprotocol') !== '' + && $this->isOverwriteCondition('protocol')) { + return $this->config->getSystemValue('overwriteprotocol'); + } + + if (isset($this->server['HTTP_X_FORWARDED_PROTO'])) { + $proto = strtolower($this->server['HTTP_X_FORWARDED_PROTO']); + // Verify that the protocol is always HTTP or HTTPS + // default to http if an invalid value is provided + return $proto === 'https' ? 'https' : 'http'; + } + + if (isset($this->server['HTTPS']) + && $this->server['HTTPS'] !== null + && $this->server['HTTPS'] !== 'off') { + return 'https'; + } + + return 'http'; + } + + /** + * Returns the request uri, even if the website uses one or more + * reverse proxies + * @return string + */ + public function getRequestUri() { + $uri = isset($this->server['REQUEST_URI']) ? $this->server['REQUEST_URI'] : ''; + if($this->config->getSystemValue('overwritewebroot') !== '' && $this->isOverwriteCondition()) { + $uri = $this->getScriptName() . substr($uri, strlen($this->server['SCRIPT_NAME'])); + } + return $uri; + } + + /** + * Get raw PathInfo from request (not urldecoded) + * @throws \Exception + * @return string Path info + */ + public function getRawPathInfo() { + $requestUri = isset($this->server['REQUEST_URI']) ? $this->server['REQUEST_URI'] : ''; + // remove too many leading slashes - can be caused by reverse proxy configuration + if (strpos($requestUri, '/') === 0) { + $requestUri = '/' . ltrim($requestUri, '/'); + } + + $requestUri = preg_replace('%/{2,}%', '/', $requestUri); + + // Remove the query string from REQUEST_URI + if ($pos = strpos($requestUri, '?')) { + $requestUri = substr($requestUri, 0, $pos); + } + + $scriptName = $this->server['SCRIPT_NAME']; + $pathInfo = $requestUri; + + // strip off the script name's dir and file name + // FIXME: Sabre does not really belong here + list($path, $name) = \Sabre\DAV\URLUtil::splitPath($scriptName); + if (!empty($path)) { + if($path === $pathInfo || strpos($pathInfo, $path.'/') === 0) { + $pathInfo = substr($pathInfo, strlen($path)); + } else { + throw new \Exception("The requested uri($requestUri) cannot be processed by the script '$scriptName')"); + } + } + if (strpos($pathInfo, '/'.$name) === 0) { + $pathInfo = substr($pathInfo, strlen($name) + 1); + } + if (strpos($pathInfo, $name) === 0) { + $pathInfo = substr($pathInfo, strlen($name)); + } + if($pathInfo === '/'){ + return ''; + } else { + return $pathInfo; + } + } + + /** + * Get PathInfo from request + * @throws \Exception + * @return string|false Path info or false when not found + */ + public function getPathInfo() { + if(isset($this->server['PATH_INFO'])) { + return $this->server['PATH_INFO']; + } + + $pathInfo = $this->getRawPathInfo(); + // following is taken from \Sabre\DAV\URLUtil::decodePathSegment + $pathInfo = rawurldecode($pathInfo); + $encoding = mb_detect_encoding($pathInfo, ['UTF-8', 'ISO-8859-1']); + + switch($encoding) { + case 'ISO-8859-1' : + $pathInfo = utf8_encode($pathInfo); + } + // end copy + + return $pathInfo; + } + + /** + * Returns the script name, even if the website uses one or more + * reverse proxies + * @return string the script name + */ + public function getScriptName() { + $name = $this->server['SCRIPT_NAME']; + $overwriteWebRoot = $this->config->getSystemValue('overwritewebroot'); + if ($overwriteWebRoot !== '' && $this->isOverwriteCondition()) { + // FIXME: This code is untestable due to __DIR__, also that hardcoded path is really dangerous + $serverRoot = str_replace('\\', '/', substr(__DIR__, 0, -strlen('lib/private/appframework/http/'))); + $suburi = str_replace('\\', '/', substr(realpath($this->server['SCRIPT_FILENAME']), strlen($serverRoot))); + $name = '/' . ltrim($overwriteWebRoot . $suburi, '/'); + } + return $name; + } + + /** + * Checks whether the user agent matches a given regex + * @param array $agent array of agent names + * @return bool true if at least one of the given agent matches, false otherwise + */ + public function isUserAgent(array $agent) { + foreach ($agent as $regex) { + if (preg_match($regex, $this->server['HTTP_USER_AGENT'])) { + return true; + } + } + return false; + } + + /** + * Returns the unverified server host from the headers without checking + * whether it is a trusted domain + * @return string Server host + */ + public function getInsecureServerHost() { + $host = null; + if (isset($this->server['HTTP_X_FORWARDED_HOST'])) { + if (strpos($this->server['HTTP_X_FORWARDED_HOST'], ',') !== false) { + $parts = explode(',', $this->server['HTTP_X_FORWARDED_HOST']); + $host = trim(current($parts)); + } else { + $host = $this->server['HTTP_X_FORWARDED_HOST']; + } + } else { + if (isset($this->server['HTTP_HOST'])) { + $host = $this->server['HTTP_HOST']; + } else if (isset($this->server['SERVER_NAME'])) { + $host = $this->server['SERVER_NAME']; + } + } + return $host; + } + + + /** + * Returns the server host from the headers, or the first configured + * trusted domain if the host isn't in the trusted list + * @return string Server host + */ + public function getServerHost() { + // FIXME: Ugly workaround that we need to get rid of + if (\OC::$CLI && defined('PHPUNIT_RUN')) { + return 'localhost'; + } + + // overwritehost is always trusted + $host = $this->getOverwriteHost(); + if ($host !== null) { + return $host; + } + + // get the host from the headers + $host = $this->getInsecureServerHost(); + + // Verify that the host is a trusted domain if the trusted domains + // are defined + // If no trusted domain is provided the first trusted domain is returned + $trustedDomainHelper = new TrustedDomainHelper($this->config); + if ($trustedDomainHelper->isTrustedDomain($host)) { + return $host; + } else { + $trustedList = $this->config->getSystemValue('trusted_domains', []); + return $trustedList[0]; + } + } + + /** + * Returns the overwritehost setting from the config if set and + * if the overwrite condition is met + * @return string|null overwritehost value or null if not defined or the defined condition + * isn't met + */ + private function getOverwriteHost() { + if($this->config->getSystemValue('overwritehost') !== '' && $this->isOverwriteCondition()) { + return $this->config->getSystemValue('overwritehost'); + } + return null; + } + } diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php index c878e5ee4b4..7c35bfa1791 100644 --- a/lib/private/connector/sabre/directory.php +++ b/lib/private/connector/sabre/directory.php @@ -20,7 +20,6 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. * */ - class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota { @@ -32,6 +31,13 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node private $dirContent; /** + * Cached quota info + * + * @var array + */ + private $quotaInfo; + + /** * Creates a new file in the directory * * Data will either be supplied as a stream resource, or in certain cases @@ -66,7 +72,8 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node // exit if we can't create a new file and we don't updatable existing file $info = OC_FileChunking::decodeName($name); if (!$this->fileView->isCreatable($this->path) && - !$this->fileView->isUpdatable($this->path . '/' . $info['name'])) { + !$this->fileView->isUpdatable($this->path . '/' . $info['name']) + ) { throw new \Sabre\DAV\Exception\Forbidden(); } @@ -101,8 +108,8 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node } $newPath = $this->path . '/' . $name; - if(!$this->fileView->mkdir($newPath)) { - throw new \Sabre\DAV\Exception\Forbidden('Could not create directory '.$newPath); + if (!$this->fileView->mkdir($newPath)) { + throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath); } } catch (\OCP\Files\StorageNotAvailableException $e) { throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage()); @@ -152,14 +159,14 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node $properties = array(); $paths = array(); - foreach($folderContent as $info) { + foreach ($folderContent as $info) { $name = $info->getName(); $paths[] = $this->path . '/' . $name; - $properties[$this->path.'/' . $name][self::GETETAG_PROPERTYNAME] = '"' . $info->getEtag() . '"'; + $properties[$this->path . '/' . $name][self::GETETAG_PROPERTYNAME] = '"' . $info->getEtag() . '"'; } // TODO: move this to a beforeGetPropertiesForPath event to pre-cache properties // TODO: only fetch the requested properties - if(count($paths)>0) { + if (count($paths) > 0) { // // the number of arguments within IN conditions are limited in most databases // we chunk $paths into arrays of 200 items each to meet this criteria @@ -167,15 +174,15 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node $chunks = array_chunk($paths, 200, false); foreach ($chunks as $pack) { $placeholders = join(',', array_fill(0, count($pack), '?')); - $query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*properties`' - .' WHERE `userid` = ?' . ' AND `propertypath` IN ('.$placeholders.')' ); + $query = OC_DB::prepare('SELECT * FROM `*PREFIX*properties`' + . ' WHERE `userid` = ?' . ' AND `propertypath` IN (' . $placeholders . ')'); array_unshift($pack, OC_User::getUser()); // prepend userid - $result = $query->execute( $pack ); - while($row = $result->fetchRow()) { + $result = $query->execute($pack); + while ($row = $result->fetchRow()) { $propertypath = $row['propertypath']; $propertyname = $row['propertyname']; $propertyvalue = $row['propertyvalue']; - if($propertyname !== self::GETETAG_PROPERTYNAME) { + if ($propertyname !== self::GETETAG_PROPERTYNAME) { $properties[$propertypath][$propertyname] = $propertyvalue; } } @@ -183,7 +190,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node } $nodes = array(); - foreach($folderContent as $info) { + foreach ($folderContent as $info) { $node = $this->getChild($info->getName(), $info); $node->setPropertyCache($properties[$this->path . '/' . $info->getName()]); $nodes[] = $node; @@ -230,15 +237,17 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node * @return array */ public function getQuotaInfo() { + if ($this->quotaInfo) { + return $this->quotaInfo; + } try { - $path = \OC\Files\Filesystem::getView()->getRelativePath($this->info->getPath()); - $storageInfo = OC_Helper::getStorageInfo($path); - return array( + $storageInfo = OC_Helper::getStorageInfo($this->info->getPath(), $this->info); + $this->quotaInfo = array( $storageInfo['used'], $storageInfo['free'] ); - } - catch (\OCP\Files\StorageNotAvailableException $e) { + return $this->quotaInfo; + } catch (\OCP\Files\StorageNotAvailableException $e) { return array(0, 0); } } diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index e57d04f9a6e..bb672696f2b 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -149,9 +149,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\ } // allow sync clients to send the mtime along in a header - $mtime = OC_Request::hasModificationTime(); - if ($mtime !== false) { - if($this->fileView->touch($this->path, $mtime)) { + $request = \OC::$server->getRequest(); + if (isset($request->server['HTTP_X_OC_MTIME'])) { + if($this->fileView->touch($this->path, $request->server['HTTP_X_OC_MTIME'])) { header('X-OC-MTime: accepted'); } } @@ -165,8 +165,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\ /** * Returns the data - * * @return string|resource + * @throws \Sabre\DAV\Exception\Forbidden + * @throws \Sabre\DAV\Exception\ServiceUnavailable */ public function get() { @@ -187,9 +188,8 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\ /** * Delete the current file - * - * @return void * @throws \Sabre\DAV\Exception\Forbidden + * @throws \Sabre\DAV\Exception\ServiceUnavailable */ public function delete() { if (!$this->info->isDeletable()) { @@ -251,6 +251,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\ return \OC_Helper::getSecureMimeType($mimeType); } + /** + * @return array|false + */ public function getDirectDownload() { if (\OCP\App::isEnabled('encryption')) { return []; @@ -267,6 +270,10 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\ /** * @param resource $data * @return null|string + * @throws \Sabre\DAV\Exception + * @throws \Sabre\DAV\Exception\BadRequest + * @throws \Sabre\DAV\Exception\NotImplemented + * @throws \Sabre\DAV\Exception\ServiceUnavailable */ private function createFileChunked($data) { @@ -319,9 +326,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\ } // allow sync clients to send the mtime along in a header - $mtime = OC_Request::hasModificationTime(); - if ($mtime !== false) { - if($this->fileView->touch($targetPath, $mtime)) { + $request = \OC::$server->getRequest(); + if (isset($request->server['HTTP_X_OC_MTIME'])) { + if($this->fileView->touch($targetPath, $request->server['HTTP_X_OC_MTIME'])) { header('X-OC-MTime: accepted'); } } @@ -340,9 +347,8 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\ * Returns whether a part file is needed for the given storage * or whether the file can be assembled/uploaded directly on the * target storage. - * - * @param \OCP\Files\Storage $storage storage to check - * @param bool true if the storage needs part file handling + * @param \OCP\Files\Storage $storage + * @return bool true if the storage needs part file handling */ private function needsPartFile($storage) { // TODO: in the future use ChunkHandler provided by storage diff --git a/lib/private/connector/sabre/request.php b/lib/private/connector/sabre/request.php index c98b28c4d74..2ce753d916f 100644 --- a/lib/private/connector/sabre/request.php +++ b/lib/private/connector/sabre/request.php @@ -28,7 +28,7 @@ class OC_Connector_Sabre_Request extends \Sabre\HTTP\Request { * @return string */ public function getUri() { - return OC_Request::requestUri(); + return \OC::$server->getRequest()->getRequestUri(); } /** diff --git a/lib/private/db/sqlitemigrator.php b/lib/private/db/sqlitemigrator.php index 42b65634645..739bb242810 100644 --- a/lib/private/db/sqlitemigrator.php +++ b/lib/private/db/sqlitemigrator.php @@ -58,6 +58,7 @@ class SQLiteMigrator extends Migrator { $platform = $connection->getDatabasePlatform(); $platform->registerDoctrineTypeMapping('tinyint unsigned', 'integer'); $platform->registerDoctrineTypeMapping('smallint unsigned', 'integer'); + $platform->registerDoctrineTypeMapping('varchar ', 'string'); return parent::getDiff($targetSchema, $connection); } diff --git a/lib/private/defaults.php b/lib/private/defaults.php index dfcd97aedd6..a3902ee80de 100644 --- a/lib/private/defaults.php +++ b/lib/private/defaults.php @@ -215,7 +215,8 @@ class OC_Defaults { if ($this->themeExist('getShortFooter')) { $footer = $this->theme->getShortFooter(); } else { - $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank">' .$this->getEntity() . '</a>'. + $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' . + ' rel="noreferrer">' .$this->getEntity() . '</a>'. ' – ' . $this->getSlogan(); } diff --git a/lib/private/files/cache/changepropagator.php b/lib/private/files/cache/changepropagator.php index 2967c8f6259..36fc6e80144 100644 --- a/lib/private/files/cache/changepropagator.php +++ b/lib/private/files/cache/changepropagator.php @@ -59,8 +59,8 @@ class ChangePropagator { list($storage, $internalPath) = $this->view->resolvePath($parent); if ($storage) { $cache = $storage->getCache(); - $id = $cache->getId($internalPath); - $cache->update($id, array('mtime' => $time, 'etag' => $storage->getETag($internalPath))); + $entry = $cache->get($internalPath); + $cache->update($entry['fileid'], array('mtime' => max($time, $entry['mtime']), 'etag' => $storage->getETag($internalPath))); } } } diff --git a/lib/private/image.php b/lib/private/image.php index f5f9a04facc..317b6fde160 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -391,7 +391,7 @@ class OC_Image { $rotate = 90; break; } - if($flip) { + if($flip && function_exists('imageflip')) { imageflip($this->resource, IMG_FLIP_HORIZONTAL); } if ($rotate) { diff --git a/lib/private/installer.php b/lib/private/installer.php index db8f27aeeab..8ed15a3a5d8 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -308,7 +308,7 @@ class OC_Installer{ } $info=OC_App::getAppInfo($extractDir.'/appinfo/info.xml', true); // check the code for not allowed calls - if(!$isShipped && !OC_Installer::checkCode($info['id'], $extractDir)) { + if(!$isShipped && !OC_Installer::checkCode($extractDir)) { OC_Helper::rmdirr($extractDir); throw new \Exception($l->t("App can't be installed because of not allowed code in the App")); } @@ -511,7 +511,7 @@ class OC_Installer{ OC_Appconfig::setValue($app, 'ocsid', $info['ocsid']); } - //set remote/public handelers + //set remote/public handlers foreach($info['remote'] as $name=>$path) { OCP\CONFIG::setAppValue('core', 'remote_'.$name, $app.'/'.$path); } @@ -529,58 +529,15 @@ class OC_Installer{ * @param string $folder the folder of the app to check * @return boolean true for app is o.k. and false for app is not o.k. */ - public static function checkCode($appname, $folder) { - $blacklist=array( - // classes replaced by the public api - 'OC_API::', - 'OC_App::', - 'OC_AppConfig::', - 'OC_Avatar', - 'OC_BackgroundJob::', - 'OC_Config::', - 'OC_DB::', - 'OC_Files::', - 'OC_Helper::', - 'OC_Hook::', - 'OC_Image::', - 'OC_JSON::', - 'OC_L10N::', - 'OC_Log::', - 'OC_Mail::', - 'OC_Request::', - 'OC_Response::', - 'OC_Template::', - 'OC_User::', - 'OC_Util::', - ); - + public static function checkCode($folder) { // is the code checker enabled? - if(OC_Config::getValue('appcodechecker', false)) { - // check if grep is installed - $grep = \OC_Helper::findBinaryPath('grep'); - if (!$grep) { - OC_Log::write('core', - 'grep not installed. So checking the code of the app "'.$appname.'" was not possible', - OC_Log::ERROR); - return true; - } - - // iterate the bad patterns - foreach($blacklist as $bl) { - $cmd = 'grep --include \\*.php -ri '.escapeshellarg($bl).' '.$folder.''; - $result = exec($cmd); - // bad pattern found - if($result<>'') { - OC_Log::write('core', - 'App "'.$appname.'" is using a not allowed call "'.$bl.'". Installation refused.', - OC_Log::ERROR); - return false; - } - } - return true; - - }else{ + if(!OC_Config::getValue('appcodechecker', false)) { return true; } + + $codeChecker = new \OC\App\CodeChecker(); + $errors = $codeChecker->analyseFolder($folder); + + return empty($errors); } } diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php index 8e55bf1c695..62c2da6febe 100644 --- a/lib/private/log/owncloud.php +++ b/lib/private/log/owncloud.php @@ -68,8 +68,9 @@ class OC_Log_Owncloud { $timezone = new DateTimeZone('UTC'); } $time = new DateTime(null, $timezone); - $reqId = \OC::$server->getRequest()->getId(); - $remoteAddr = \OC_Request::getRemoteAddress(); + $request = \OC::$server->getRequest(); + $reqId = $request->getId(); + $remoteAddr = $request->getRemoteAddress(); // remove username/passwords from URLs before writing the to the log file $time = $time->format($format); if($minLevel == OC_Log::DEBUG) { diff --git a/lib/private/memcache/apcu.php b/lib/private/memcache/apcu.php index 7f780f32718..1043690a361 100644 --- a/lib/private/memcache/apcu.php +++ b/lib/private/memcache/apcu.php @@ -14,6 +14,8 @@ class APCu extends APC { return false; } elseif (!ini_get('apc.enable_cli') && \OC::$CLI) { return false; + } elseif (version_compare(phpversion('apc'), '4.0.6') === -1) { + return false; } else { return true; } diff --git a/lib/private/memcache/arraycache.php b/lib/private/memcache/arraycache.php new file mode 100644 index 00000000000..9456c0f80c6 --- /dev/null +++ b/lib/private/memcache/arraycache.php @@ -0,0 +1,71 @@ +<?php +/** + * Copyright (c) 2015 Joas Schilling <nickvergessen@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Memcache; + +class ArrayCache extends Cache { + /** @var array Array with the cached data */ + protected $cachedData = array(); + + /** + * {@inheritDoc} + */ + public function get($key) { + if ($this->hasKey($key)) { + return $this->cachedData[$key]; + } + return null; + } + + /** + * {@inheritDoc} + */ + public function set($key, $value, $ttl = 0) { + $this->cachedData[$key] = $value; + return true; + } + + /** + * {@inheritDoc} + */ + public function hasKey($key) { + return isset($this->cachedData[$key]); + } + + /** + * {@inheritDoc} + */ + public function remove($key) { + unset($this->cachedData[$key]); + return true; + } + + /** + * {@inheritDoc} + */ + public function clear($prefix = '') { + if ($prefix === '') { + $this->cachedData = []; + return true; + } + + foreach ($this->cachedData as $key => $value) { + if (strpos($key, $prefix) === 0) { + $this->remove($key); + } + } + return true; + } + + /** + * {@inheritDoc} + */ + static public function isAvailable() { + return true; + } +} diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php index 1e663eecfe1..e8a91c52269 100644 --- a/lib/private/memcache/factory.php +++ b/lib/private/memcache/factory.php @@ -42,7 +42,7 @@ class Factory implements ICacheFactory { } elseif (Memcached::isAvailable()) { return new Memcached($prefix); } else { - return new Null($prefix); + return new ArrayCache($prefix); } } diff --git a/lib/private/request.php b/lib/private/request.php deleted file mode 100644 index ab011c913d9..00000000000 --- a/lib/private/request.php +++ /dev/null @@ -1,330 +0,0 @@ -<?php -/** - * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -class OC_Request { - - const USER_AGENT_IE = '/MSIE/'; - // 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$#'; - const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost)$/'; - - /** - * Returns the remote address, if the connection came from a trusted proxy and `forwarded_for_headers` has been configured - * then the IP address specified in this header will be returned instead. - * Do always use this instead of $_SERVER['REMOTE_ADDR'] - * @return string IP address - */ - public static function getRemoteAddress() { - $remoteAddress = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : ''; - $trustedProxies = \OC::$server->getConfig()->getSystemValue('trusted_proxies', array()); - - if(is_array($trustedProxies) && in_array($remoteAddress, $trustedProxies)) { - $forwardedForHeaders = \OC::$server->getConfig()->getSystemValue('forwarded_for_headers', array()); - - foreach($forwardedForHeaders as $header) { - if (array_key_exists($header, $_SERVER) === true) { - foreach (explode(',', $_SERVER[$header]) as $IP) { - $IP = trim($IP); - if (filter_var($IP, FILTER_VALIDATE_IP) !== false) { - return $IP; - } - } - } - } - } - - return $remoteAddress; - } - - /** - * Check overwrite condition - * @param string $type - * @return bool - */ - private static function isOverwriteCondition($type = '') { - $regex = '/' . OC_Config::getValue('overwritecondaddr', '') . '/'; - return $regex === '//' or preg_match($regex, $_SERVER['REMOTE_ADDR']) === 1 - or ($type !== 'protocol' and OC_Config::getValue('forcessl', false)); - } - - /** - * Strips a potential port from a domain (in format domain:port) - * @param $host - * @return string $host without appended port - */ - public static function getDomainWithoutPort($host) { - $pos = strrpos($host, ':'); - if ($pos !== false) { - $port = substr($host, $pos + 1); - if (is_numeric($port)) { - $host = substr($host, 0, $pos); - } - } - return $host; - } - - /** - * Checks whether a domain is considered as trusted from the list - * of trusted domains. If no trusted domains have been configured, returns - * true. - * This is used to prevent Host Header Poisoning. - * @param string $domainWithPort - * @return bool true if the given domain is trusted or if no trusted domains - * have been configured - */ - public static function isTrustedDomain($domainWithPort) { - // Extract port from domain if needed - $domain = self::getDomainWithoutPort($domainWithPort); - - // FIXME: Empty config array defaults to true for now. - Deprecate this behaviour with ownCloud 8. - $trustedList = \OC::$server->getConfig()->getSystemValue('trusted_domains', array()); - if (empty($trustedList)) { - return true; - } - - // FIXME: Workaround for older instances still with port applied. Remove for ownCloud 9. - if(in_array($domainWithPort, $trustedList)) { - return true; - } - - // Always allow access from localhost - if (preg_match(self::REGEX_LOCALHOST, $domain) === 1) { - return true; - } - - return in_array($domain, $trustedList); - } - - /** - * Returns the unverified server host from the headers without checking - * whether it is a trusted domain - * @return string the server host - * - * Returns the server host, even if the website uses one or more - * reverse proxies - */ - public static function insecureServerHost() { - $host = null; - if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) { - if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) { - $parts = explode(',', $_SERVER['HTTP_X_FORWARDED_HOST']); - $host = trim(current($parts)); - } else { - $host = $_SERVER['HTTP_X_FORWARDED_HOST']; - } - } else { - if (isset($_SERVER['HTTP_HOST'])) { - $host = $_SERVER['HTTP_HOST']; - } else if (isset($_SERVER['SERVER_NAME'])) { - $host = $_SERVER['SERVER_NAME']; - } - } - return $host; - } - - /** - * Returns the overwritehost setting from the config if set and - * if the overwrite condition is met - * @return string|null overwritehost value or null if not defined or the defined condition - * isn't met - */ - public static function getOverwriteHost() { - if(OC_Config::getValue('overwritehost', '') !== '' and self::isOverwriteCondition()) { - return OC_Config::getValue('overwritehost'); - } - return null; - } - - /** - * Returns the server host from the headers, or the first configured - * trusted domain if the host isn't in the trusted list - * @return string the server host - * - * Returns the server host, even if the website uses one or more - * reverse proxies - */ - public static function serverHost() { - if (OC::$CLI && defined('PHPUNIT_RUN')) { - return 'localhost'; - } - - // overwritehost is always trusted - $host = self::getOverwriteHost(); - if ($host !== null) { - return $host; - } - - // get the host from the headers - $host = self::insecureServerHost(); - - // Verify that the host is a trusted domain if the trusted domains - // are defined - // If no trusted domain is provided the first trusted domain is returned - if (self::isTrustedDomain($host)) { - return $host; - } else { - $trustedList = \OC_Config::getValue('trusted_domains', array('')); - return $trustedList[0]; - } - } - - /** - * Returns the server protocol - * @return string the server protocol - * - * Returns the server protocol. It respects reverse proxy servers and load balancers - */ - public static function serverProtocol() { - if(OC_Config::getValue('overwriteprotocol', '') !== '' and self::isOverwriteCondition('protocol')) { - return OC_Config::getValue('overwriteprotocol'); - } - if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) { - $proto = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']); - // Verify that the protocol is always HTTP or HTTPS - // default to http if an invalid value is provided - return $proto === 'https' ? 'https' : 'http'; - } - if (isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') { - return 'https'; - } - return 'http'; - } - - /** - * Returns the request uri - * @return string the request uri - * - * Returns the request uri, even if the website uses one or more - * reverse proxies - * @return string - */ - public static function requestUri() { - $uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''; - if (OC_Config::getValue('overwritewebroot', '') !== '' and self::isOverwriteCondition()) { - $uri = self::scriptName() . substr($uri, strlen($_SERVER['SCRIPT_NAME'])); - } - return $uri; - } - - /** - * Returns the script name - * @return string the script name - * - * Returns the script name, even if the website uses one or more - * reverse proxies - */ - public static function scriptName() { - $name = $_SERVER['SCRIPT_NAME']; - $overwriteWebRoot = OC_Config::getValue('overwritewebroot', ''); - if ($overwriteWebRoot !== '' and self::isOverwriteCondition()) { - $serverroot = str_replace("\\", '/', substr(__DIR__, 0, -strlen('lib/private/'))); - $suburi = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen($serverroot))); - $name = '/' . ltrim($overwriteWebRoot . $suburi, '/'); - } - return $name; - } - - /** - * get Path info from request - * @return string Path info or false when not found - */ - public static function getPathInfo() { - if (array_key_exists('PATH_INFO', $_SERVER)) { - $path_info = $_SERVER['PATH_INFO']; - }else{ - $path_info = self::getRawPathInfo(); - // following is taken from \Sabre\DAV\URLUtil::decodePathSegment - $path_info = rawurldecode($path_info); - $encoding = mb_detect_encoding($path_info, array('UTF-8', 'ISO-8859-1')); - - switch($encoding) { - - case 'ISO-8859-1' : - $path_info = utf8_encode($path_info); - - } - // end copy - } - return $path_info; - } - - /** - * get Path info from request, not urldecoded - * @throws Exception - * @return string Path info or false when not found - */ - public static function getRawPathInfo() { - $requestUri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''; - // remove too many leading slashes - can be caused by reverse proxy configuration - if (strpos($requestUri, '/') === 0) { - $requestUri = '/' . ltrim($requestUri, '/'); - } - - $requestUri = preg_replace('%/{2,}%', '/', $requestUri); - - // Remove the query string from REQUEST_URI - if ($pos = strpos($requestUri, '?')) { - $requestUri = substr($requestUri, 0, $pos); - } - - $scriptName = $_SERVER['SCRIPT_NAME']; - $path_info = $requestUri; - - // strip off the script name's dir and file name - list($path, $name) = \Sabre\DAV\URLUtil::splitPath($scriptName); - if (!empty($path)) { - if( $path === $path_info || strpos($path_info, $path.'/') === 0) { - $path_info = substr($path_info, strlen($path)); - } else { - throw new Exception("The requested uri($requestUri) cannot be processed by the script '$scriptName')"); - } - } - if (strpos($path_info, '/'.$name) === 0) { - $path_info = substr($path_info, strlen($name) + 1); - } - if (strpos($path_info, $name) === 0) { - $path_info = substr($path_info, strlen($name)); - } - if($path_info === '/'){ - return ''; - } else { - return $path_info; - } - } - - /** - * Check if the requester sent along an mtime - * @return false or an mtime - */ - static public function hasModificationTime () { - if (isset($_SERVER['HTTP_X_OC_MTIME'])) { - return $_SERVER['HTTP_X_OC_MTIME']; - } else { - return false; - } - } - - /** - * Checks whether the user agent matches a given regex - * @param string|array $agent agent name or array of agent names - * @return boolean true if at least one of the given agent matches, - * false otherwise - */ - static public function isUserAgent($agent) { - if (!is_array($agent)) { - $agent = array($agent); - } - foreach ($agent as $regex) { - if (preg_match($regex, $_SERVER['HTTP_USER_AGENT'])) { - return true; - } - } - return false; - } -} diff --git a/lib/private/response.php b/lib/private/response.php index 8e4a7d309b0..600b702810c 100644 --- a/lib/private/response.php +++ b/lib/private/response.php @@ -158,11 +158,12 @@ class OC_Response { * @param string $type disposition type, either 'attachment' or 'inline' */ static public function setContentDispositionHeader( $filename, $type = 'attachment' ) { - if (OC_Request::isUserAgent(array( - OC_Request::USER_AGENT_IE, - OC_Request::USER_AGENT_ANDROID_MOBILE_CHROME, - OC_Request::USER_AGENT_FREEBOX - ))) { + if (\OC::$server->getRequest()->isUserAgent( + [ + \OC\AppFramework\Http\Request::USER_AGENT_IE, + \OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME, + \OC\AppFramework\Http\Request::USER_AGENT_FREEBOX, + ])) { header( 'Content-Disposition: ' . rawurlencode($type) . '; filename="' . rawurlencode( $filename ) . '"' ); } else { header( 'Content-Disposition: ' . rawurlencode($type) . '; filename*=UTF-8\'\'' . rawurlencode( $filename ) diff --git a/lib/private/route/router.php b/lib/private/route/router.php index 3559b841926..25e897123d1 100644 --- a/lib/private/route/router.php +++ b/lib/private/route/router.php @@ -63,8 +63,9 @@ class Router implements IRouter { } else { $method = 'GET'; } - $host = \OC_Request::serverHost(); - $schema = \OC_Request::serverProtocol(); + $request = \OC::$server->getRequest(); + $host = $request->getServerHost(); + $schema = $request->getServerProtocol(); $this->context = new RequestContext($baseUrl, $method, $host, $schema); // TODO cache $this->root = $this->getCollection('root'); diff --git a/lib/private/security/securerandom.php b/lib/private/security/securerandom.php index 2402e863fb0..b1169bff289 100644 --- a/lib/private/security/securerandom.php +++ b/lib/private/security/securerandom.php @@ -64,8 +64,7 @@ class SecureRandom implements ISecureRandom { * Generate a random string of specified length. * @param string $length The length of the generated string * @param string $characters An optional list of characters to use if no characterlist is - * specified 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ./ - * is used. + * specified all valid base64 characters are used. * @return string * @throws \Exception If the generator is not initialized. */ diff --git a/lib/private/security/trusteddomainhelper.php b/lib/private/security/trusteddomainhelper.php new file mode 100644 index 00000000000..da5e0ff0a12 --- /dev/null +++ b/lib/private/security/trusteddomainhelper.php @@ -0,0 +1,75 @@ +<?php +/** + * Copyright (c) 2015 Lukas Reschke <lukas@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Security; +use OC\AppFramework\Http\Request; +use OCP\IConfig; + +/** + * Class TrustedDomain + * + * @package OC\Security + */ +class TrustedDomainHelper { + /** @var IConfig */ + private $config; + + /** + * @param IConfig $config + */ + function __construct(IConfig $config) { + $this->config = $config; + } + + /** + * Strips a potential port from a domain (in format domain:port) + * @param string $host + * @return string $host without appended port + */ + private function getDomainWithoutPort($host) { + $pos = strrpos($host, ':'); + if ($pos !== false) { + $port = substr($host, $pos + 1); + if (is_numeric($port)) { + $host = substr($host, 0, $pos); + } + } + return $host; + } + + /** + * Checks whether a domain is considered as trusted from the list + * of trusted domains. If no trusted domains have been configured, returns + * true. + * This is used to prevent Host Header Poisoning. + * @param string $domainWithPort + * @return bool true if the given domain is trusted or if no trusted domains + * have been configured + */ + public function isTrustedDomain($domainWithPort) { + $domain = $this->getDomainWithoutPort($domainWithPort); + + // Read trusted domains from config + $trustedList = $this->config->getSystemValue('trusted_domains', []); + if(!is_array($trustedList)) { + return false; + } + + // TODO: Workaround for older instances still with port applied. Remove for ownCloud 9. + if(in_array($domainWithPort, $trustedList)) { + return true; + } + + // Always allow access from localhost + if (preg_match(Request::REGEX_LOCALHOST, $domain) === 1) { + return true; + } + return in_array($domain, $trustedList); + } + +} diff --git a/lib/private/server.php b/lib/private/server.php index b023534ae21..5eaecc00932 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -17,6 +17,7 @@ use OC\Security\Crypto; use OC\Security\Hasher; use OC\Security\SecureRandom; use OC\Diagnostics\NullEventLogger; +use OC\Security\TrustedDomainHelper; use OCP\IServerContainer; use OCP\ISession; use OC\Tagging\TagMapper; @@ -41,45 +42,6 @@ class Server extends SimpleContainer implements IServerContainer { $this->registerService('ContactsManager', function ($c) { return new ContactsManager(); }); - $this->registerService('Request', function (Server $c) { - if (isset($c['urlParams'])) { - $urlParams = $c['urlParams']; - } else { - $urlParams = array(); - } - - if ($c->getSession()->exists('requesttoken')) { - $requestToken = $c->getSession()->get('requesttoken'); - } else { - $requestToken = false; - } - - if (defined('PHPUNIT_RUN') && PHPUNIT_RUN - && in_array('fakeinput', stream_get_wrappers()) - ) { - $stream = 'fakeinput://data'; - } else { - $stream = 'php://input'; - } - - return new Request( - [ - 'get' => $_GET, - 'post' => $_POST, - 'files' => $_FILES, - 'server' => $_SERVER, - 'env' => $_ENV, - 'cookies' => $_COOKIE, - 'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD'])) - ? $_SERVER['REQUEST_METHOD'] - : null, - 'urlParams' => $urlParams, - 'requesttoken' => $requestToken, - ], - $this->getSecureRandom(), - $stream - ); - }); $this->registerService('PreviewManager', function ($c) { return new PreviewManager(); }); @@ -298,6 +260,9 @@ class Server extends SimpleContainer implements IServerContainer { $this->registerService('IniWrapper', function ($c) { return new IniGetWrapper(); }); + $this->registerService('TrustedDomainHelper', function ($c) { + return new TrustedDomainHelper($this->getConfig()); + }); } /** @@ -312,10 +277,54 @@ class Server extends SimpleContainer implements IServerContainer { * currently being processed is returned from this method. * In case the current execution was not initiated by a web request null is returned * + * FIXME: This should be queried as well. However, due to our totally awesome + * static code a lot of tests do stuff like $_SERVER['foo'] which obviously + * will not work with that approach. We even have some integration tests in our + * unit tests which setup a complete webserver. Once the code is all non-static + * or we don't have such mixed integration/unit tests setup anymore this can + * get moved out again. + * * @return \OCP\IRequest|null */ function getRequest() { - return $this->query('Request'); + if (isset($this['urlParams'])) { + $urlParams = $this['urlParams']; + } else { + $urlParams = array(); + } + + if ($this->getSession()->exists('requesttoken')) { + $requestToken = $this->getSession()->get('requesttoken'); + } else { + $requestToken = false; + } + + if (defined('PHPUNIT_RUN') && PHPUNIT_RUN + && in_array('fakeinput', stream_get_wrappers()) + ) { + $stream = 'fakeinput://data'; + } else { + $stream = 'php://input'; + } + + return new Request( + [ + 'get' => $_GET, + 'post' => $_POST, + 'files' => $_FILES, + 'server' => $_SERVER, + 'env' => $_ENV, + 'cookies' => $_COOKIE, + 'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD'])) + ? $_SERVER['REQUEST_METHOD'] + : null, + 'urlParams' => $urlParams, + 'requesttoken' => $requestToken, + ], + $this->getSecureRandom(), + $this->getConfig(), + $stream + ); } /** @@ -736,4 +745,13 @@ class Server extends SimpleContainer implements IServerContainer { public function getIniWrapper() { return $this->query('IniWrapper'); } + + /** + * Get the trusted domain helper + * + * @return TrustedDomainHelper + */ + public function getTrustedDomainHelper() { + return $this->query('TrustedDomainHelper'); + } } diff --git a/lib/private/setup.php b/lib/private/setup.php index e3a29b6469d..ede3a452c29 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -157,12 +157,14 @@ class OC_Setup { return $error; } + $request = \OC::$server->getRequest(); + //no errors, good if(isset($options['trusted_domains']) && is_array($options['trusted_domains'])) { $trustedDomains = $options['trusted_domains']; } else { - $trustedDomains = array(\OC_Request::getDomainWithoutPort(\OC_Request::serverHost())); + $trustedDomains = [$request->getInsecureServerHost()]; } if (OC_Util::runningOnWindows()) { @@ -185,7 +187,7 @@ class OC_Setup { 'secret' => $secret, 'trusted_domains' => $trustedDomains, 'datadirectory' => $dataDir, - 'overwrite.cli.url' => \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT, + 'overwrite.cli.url' => $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . OC::$WEBROOT, 'dbtype' => $dbType, 'version' => implode('.', OC_Util::getVersion()), ]); diff --git a/lib/private/template.php b/lib/private/template.php index 4fa1c867d54..b0d212c6f53 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -215,6 +215,7 @@ class OC_Template extends \OC\Template\Base { * @param Exception $exception */ public static function printExceptionErrorPage(Exception $exception) { + $request = \OC::$server->getRequest(); $content = new \OC_Template('', 'exception', 'error', false); $content->assign('errorMsg', $exception->getMessage()); $content->assign('errorCode', $exception->getCode()); @@ -222,8 +223,8 @@ class OC_Template extends \OC\Template\Base { $content->assign('line', $exception->getLine()); $content->assign('trace', $exception->getTraceAsString()); $content->assign('debugMode', defined('DEBUG') && DEBUG === true); - $content->assign('remoteAddr', OC_Request::getRemoteAddress()); - $content->assign('requestID', \OC::$server->getRequest()->getId()); + $content->assign('remoteAddr', $request->getRemoteAddress()); + $content->assign('requestID', $request->getId()); $content->printPage(); die(); } diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 1a97eb26347..1678795f524 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -34,9 +34,9 @@ class OC_TemplateLayout extends OC_Template { $this->config = \OC::$server->getConfig(); // Decide which page we show - if( $renderAs == 'user' ) { + if($renderAs == 'user') { parent::__construct( 'core', 'layout.user' ); - if(in_array(OC_APP::getCurrentApp(), array('settings','admin', 'help'))!==false) { + if(in_array(OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) { $this->assign('bodyid', 'body-settings'); }else{ $this->assign('bodyid', 'body-user'); @@ -72,9 +72,9 @@ class OC_TemplateLayout extends OC_Template { } } $userDisplayName = OC_User::getDisplayName(); - $this->assign( 'user_displayname', $userDisplayName ); - $this->assign( 'user_uid', OC_User::getUser() ); - $this->assign( 'appsmanagement_active', strpos(OC_Request::requestUri(), OC_Helper::linkToRoute('settings_apps')) === 0 ); + $this->assign('user_displayname', $userDisplayName); + $this->assign('user_uid', OC_User::getUser()); + $this->assign('appsmanagement_active', strpos(\OC::$server->getRequest()->getRequestUri(), OC_Helper::linkToRoute('settings_apps')) === 0 ); $this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true)); $this->assign('userAvatarSet', \OC_Helper::userAvatarSet(OC_User::getUser())); } else if ($renderAs == 'error') { diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index 0bf8ce22998..e87a6c354fb 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -170,7 +170,8 @@ class URLGenerator implements IURLGenerator { ? '' : \OC::$WEBROOT; - return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost(). $webRoot . $separator . $url; + $request = \OC::$server->getRequest(); + return $request->getServerProtocol() . '://' . $request->getServerHost() . $webRoot . $separator . $url; } /** diff --git a/lib/private/user.php b/lib/private/user.php index d1fedffcaaf..10457c224f2 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -366,7 +366,7 @@ class OC_User { return $backend->getLogoutAttribute(); } - return 'href="' . link_to('', 'index.php') . '?logout=true&requesttoken=' . OC_Util::callRegister() . '"'; + return 'href="' . link_to('', 'index.php') . '?logout=true&requesttoken=' . urlencode(OC_Util::callRegister()) . '"'; } /** diff --git a/lib/private/util.php b/lib/private/util.php index 2be7e8eb293..1993a7c9a98 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -849,8 +849,11 @@ class OC_Util { // Check if we are a user if (!OC_User::isLoggedIn()) { header('Location: ' . OC_Helper::linkToAbsolute('', 'index.php', - array('redirect_url' => OC_Request::requestUri()) - )); + [ + 'redirect_url' => \OC::$server->getRequest()->getRequestUri() + ] + ) + ); exit(); } } diff --git a/lib/public/activity/iextension.php b/lib/public/activity/iextension.php index 1b405ad8d3d..6f30f4eb9c2 100644 --- a/lib/public/activity/iextension.php +++ b/lib/public/activity/iextension.php @@ -90,7 +90,7 @@ interface IExtension { * @param string $text * @return array|false */ - function getSpecialParameterList($app, $text); + public function getSpecialParameterList($app, $text); /** * A string naming the css class for the icon to be used can be returned. diff --git a/lib/public/irequest.php b/lib/public/irequest.php index b5ea1fa95da..025c8367d41 100644 --- a/lib/public/irequest.php +++ b/lib/public/irequest.php @@ -134,4 +134,69 @@ interface IRequest { * @return string */ public function getId(); + + /** + * Returns the remote address, if the connection came from a trusted proxy + * and `forwarded_for_headers` has been configured then the IP address + * specified in this header will be returned instead. + * Do always use this instead of $_SERVER['REMOTE_ADDR'] + * @return string IP address + */ + public function getRemoteAddress(); + + /** + * Returns the server protocol. It respects reverse proxy servers and load + * balancers. + * @return string Server protocol (http or https) + */ + public function getServerProtocol(); + + /** + * Returns the request uri, even if the website uses one or more + * reverse proxies + * @return string + */ + public function getRequestUri(); + + /** + * Get raw PathInfo from request (not urldecoded) + * @throws \Exception + * @return string Path info + */ + public function getRawPathInfo(); + + /** + * Get PathInfo from request + * @throws \Exception + * @return string|false Path info or false when not found + */ + public function getPathInfo(); + + /** + * Returns the script name, even if the website uses one or more + * reverse proxies + * @return string the script name + */ + public function getScriptName(); + + /** + * Checks whether the user agent matches a given regex + * @param array $agent array of agent names + * @return bool true if at least one of the given agent matches, false otherwise + */ + public function isUserAgent(array $agent); + + /** + * Returns the unverified server host from the headers without checking + * whether it is a trusted domain + * @return string Server host + */ + public function getInsecureServerHost(); + + /** + * Returns the server host from the headers, or the first configured + * trusted domain if the host isn't in the trusted list + * @return string Server host + */ + public function getServerHost(); } diff --git a/lib/public/security/isecurerandom.php b/lib/public/security/isecurerandom.php index 3de60f8d717..b4c488b7f37 100644 --- a/lib/public/security/isecurerandom.php +++ b/lib/public/security/isecurerandom.php @@ -53,9 +53,10 @@ interface ISecureRandom { /** * Generate a random string of specified length. * @param string $length The length of the generated string - * @param string $characters An optional list of characters to use + * @param string $characters An optional list of characters to use if no characterlist is + * specified all valid base64 characters are used. * @return string - * @throws \Exception + * @throws \Exception If the generator is not initialized. */ public function generate($length, $characters = ''); } diff --git a/lib/public/util.php b/lib/public/util.php index 7f1974a421d..e6e14a26e01 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -234,9 +234,10 @@ class Util { /** * Returns the server host, even if the website uses one or more reverse proxy * @return string the server host + * @deprecated Use \OCP\IRequest::getServerHost */ public static function getServerHost() { - return(\OC_Request::serverHost()); + return \OC::$server->getRequest()->getServerHost(); } /** @@ -285,25 +286,28 @@ class Util { /** * Returns the server protocol. It respects reverse proxy servers and load balancers * @return string the server protocol + * @deprecated Use \OCP\IRequest::getServerProtocol */ public static function getServerProtocol() { - return(\OC_Request::serverProtocol()); + return \OC::$server->getRequest()->getServerProtocol(); } /** * Returns the request uri, even if the website uses one or more reverse proxies * @return string the request uri + * @deprecated Use \OCP\IRequest::getRequestUri */ public static function getRequestUri() { - return(\OC_Request::requestUri()); + return \OC::$server->getRequest()->getRequestUri(); } /** * Returns the script name, even if the website uses one or more reverse proxies * @return string the script name + * @deprecated Use \OCP\IRequest::getScriptName */ public static function getScriptName() { - return(\OC_Request::scriptName()); + return \OC::$server->getRequest()->getScriptName(); } /** |