From 0956cae39ea8380d42d03857a18fdab0a07ebe8c Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 16 Jan 2013 20:43:46 +0000 Subject: [PATCH 001/546] Add new /cloud/capabilities route and remove unused methods --- lib/ocs/cloud.php | 54 ++++++++++------------------------------------- ocs/routes.php | 3 ++- 2 files changed, 13 insertions(+), 44 deletions(-) diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php index 2d18b1db3f..29db1e6361 100644 --- a/lib/ocs/cloud.php +++ b/lib/ocs/cloud.php @@ -24,49 +24,17 @@ class OC_OCS_Cloud { - public static function getSystemWebApps() { - OC_Util::checkLoggedIn(); - $apps = OC_App::getEnabledApps(); - $values = array(); - foreach($apps as $app) { - $info = OC_App::getAppInfo($app); - if(isset($info['standalone'])) { - $newValue = array('name'=>$info['name'],'url'=>OC_Helper::linkToAbsolute($app,''),'icon'=>''); - $values[] = $newValue; - } - } - return new OC_OCS_Result($values); - } - - public static function getUserQuota($parameters) { - $user = OC_User::getUser(); - if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) { - - if(OC_User::userExists($parameters['user'])) { - // calculate the disc space - $userDir = '/'.$parameters['user'].'/files'; - OC_Filesystem::init($userDir); - $rootInfo = OC_FileCache::get(''); - $sharedInfo = OC_FileCache::get('/Shared'); - $used = $rootInfo['size'] - $sharedInfo['size']; - $free = OC_Filesystem::free_space(); - $total = $free + $used; - if($total===0) $total = 1; // prevent division by zero - $relative = round(($used/$total)*10000)/100; - - $xml = array(); - $xml['quota'] = $total; - $xml['free'] = $free; - $xml['used'] = $used; - $xml['relative'] = $relative; - - return new OC_OCS_Result($xml); - } else { - return new OC_OCS_Result(null, 300); - } - } else { - return new OC_OCS_Result(null, 300); - } + public static function getCapabilities($parameters){ + $result = array(); + $result['version'] = implode('.', OC_Util::getVersion()); + $result['versionstring'] = OC_Util::getVersionString(); + $result['edition'] = OC_Util::getEditionString(); + $result['bugfilechunking'] = 'true'; + $result['encryption'] = 'false'; + $result['versioning'] = OCP\App::isEnabled('files_versioning') ? 'true' : 'false'; + $result['undelete'] = 'true'; + $result['installedapps'] = OC_App::getEnabledApps(); + return new OC_OCS_Result($result); } public static function getUserPublickey($parameters) { diff --git a/ocs/routes.php b/ocs/routes.php index d6ee589df6..5e4758fb70 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -17,4 +17,5 @@ OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Private OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH); OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'ocs', OC_API::USER_AUTH); OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'ocs', OC_API::USER_AUTH); - +// cloud +OC_API::register('get', '/cloud/capabilities', array('OC_OCS_Cloud', 'getCapabilities'), 'ocs', OC_API::USER_AUTH); \ No newline at end of file From a08e8632bb2fb0d3ec4c078af51aa2fdc76de888 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Wed, 16 Jan 2013 21:57:06 +0000 Subject: [PATCH 002/546] Add and order the result for /cloud/capabilities --- lib/ocs/cloud.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php index 29db1e6361..7b94009b11 100644 --- a/lib/ocs/cloud.php +++ b/lib/ocs/cloud.php @@ -26,14 +26,15 @@ class OC_OCS_Cloud { public static function getCapabilities($parameters){ $result = array(); - $result['version'] = implode('.', OC_Util::getVersion()); - $result['versionstring'] = OC_Util::getVersionString(); + $result['bigfilechunking'] = 'true'; $result['edition'] = OC_Util::getEditionString(); - $result['bugfilechunking'] = 'true'; $result['encryption'] = 'false'; - $result['versioning'] = OCP\App::isEnabled('files_versioning') ? 'true' : 'false'; - $result['undelete'] = 'true'; $result['installedapps'] = OC_App::getEnabledApps(); + $result['syncpollinterval'] = 30; + $result['undelete'] = 'true'; + $result['version'] = implode('.', OC_Util::getVersion()); + $result['versioning'] = OCP\App::isEnabled('files_versioning') ? 'true' : 'false'; + $result['versionstring'] = OC_Util::getVersionString(); return new OC_OCS_Result($result); } From 934735043bd130db1dc854f444a076e6e8ef89d3 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Fri, 25 Jan 2013 12:48:59 +0000 Subject: [PATCH 003/546] API: Remove api response structure from OC_OCS_Result, handle multiple registered methods for api calls --- lib/api.php | 155 +++++++++++++++++++++++++++++++++++---------- lib/ocs/result.php | 48 ++++++++++---- 2 files changed, 158 insertions(+), 45 deletions(-) diff --git a/lib/api.php b/lib/api.php index 545b55757f..3e998bd9e4 100644 --- a/lib/api.php +++ b/lib/api.php @@ -33,6 +33,13 @@ class OC_API { const USER_AUTH = 1; const SUBADMIN_AUTH = 2; const ADMIN_AUTH = 3; + /** + * API Response Codes + */ + const RESPOND_UNAUTHORISED = 997; + const RESPOND_SERVER_ERROR = 996; + const RESPOND_NOT_FOUND = 998; + const RESPOND_UNKNOWN_ERROR = 999; private static $server; @@ -42,12 +49,12 @@ class OC_API { private static function init() { self::$server = new OC_OAuth_Server(new OC_OAuth_Store()); } - + /** * api actions */ protected static $actions = array(); - + /** * registers an api call * @param string $method the http method @@ -58,7 +65,7 @@ class OC_API { * @param array $defaults * @param array $requirements */ - public static function register($method, $url, $action, $app, + public static function register($method, $url, $action, $app, $authLevel = OC_API::USER_AUTH, $defaults = array(), $requirements = array()) { @@ -71,9 +78,9 @@ class OC_API { ->action('OC_API', 'call'); self::$actions[$name] = array(); } - self::$actions[$name] = array('app' => $app, 'action' => $action, 'authlevel' => $authLevel); + self::$actions[$name][] = array('app' => $app, 'action' => $action, 'authlevel' => $authLevel); } - + /** * handles an api call * @param array $parameters @@ -86,29 +93,99 @@ class OC_API { parse_str(file_get_contents("php://input"), $parameters['_delete']); } $name = $parameters['_route']; - // Check authentication and availability - if(self::isAuthorised(self::$actions[$name])) { - if(is_callable(self::$actions[$name]['action'])) { - $response = call_user_func(self::$actions[$name]['action'], $parameters); - if(!($response instanceof OC_OCS_Result)) { - $response = new OC_OCS_Result(null, 996, 'Internal Server Error'); - } - } else { - $response = new OC_OCS_Result(null, 998, 'Api method not found'); + // Foreach registered action + $responses = array(); + foreach(self::$actions[$name] as $action) { + // Check authentication and availability + if(!self::isAuthorised(self::$actions[$name])) { + $responses[] = array( + 'app' => $action['app'], + 'response' => new OC_OCS_Result(null, OC_API::RESPOND_UNAUTHORISED, 'Unauthorised'), + ); + continue; } - } else { - header('WWW-Authenticate: Basic realm="Authorization Required"'); - header('HTTP/1.0 401 Unauthorized'); - $response = new OC_OCS_Result(null, 997, 'Unauthorised'); + if(!is_callable($action['action'])) { + $responses[] = array( + 'app' => $action['app'], + 'response' => new OC_OCS_Result(null, OC_API::RESPOND_NOT_FOUND, 'Api method not found'), + ); + continue; + } + // Run the action + $responses[] = array( + 'app' => $action['app'], + 'response' => call_user_func($action['action'], $parameters), + ); } - // Send the response + + + $response = self::mergeResponses($responses); $formats = array('json', 'xml'); $format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml'; - self::respond($response, $format); - // logout the user to be stateless + self::respond($response); OC_User::logout(); } + + /** + * merge the returned result objects into one response + * @param array $responses + */ + private static function mergeResponses($responses) { + $response = array(); + // Sort into shipped and thirdparty + $shipped = array( + 'succeded' => array(), + 'failed' => array(), + ); + $thirdparty = array( + 'succeeded' => array(), + 'failed' => array(), + ); + foreach($responses as $response) { + if(OC_App::isShipped($response['app'])) { + if($response['response']->succeeded()) { + $shipped['succeeded'][$response['app']] = $response['response']; + } else { + $shipped['failed'][$response['app']] = $response['response']; + } + } else { + if($response['response']->succeeded()) { + $thirdparty['succeeded'][$response['app']] = $response['response']; + } else { + $thirdparty['failed'][$response['app']] = $response['response']; + } + } + } + // Remove any error responses if there is one shipped response that succeeded + if(!empty($shipped['succeeded'])){ + $responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']); + } else if(!empty($shipped['failed'])){ + // Which shipped response do we use if they all failed? + // They may have failed for different reasons (different status codes) + // Which reponse code should we return? + // Maybe any that are not OC_API::RESPOND_SERVER_ERROR + $response = $shipped['failed'][0]; + return $response; + } else { + // Return the third party failure result + $response = $thirdparty['failed'][0]; + return $response; + } + // Merge the successful responses + $meta = array(); + $data = array(); + foreach($responses as $app => $response) { + if(OC_App::isShipped($app)) { + $data = array_merge_recursive($response->getData(), $data); + } else { + $data = array_merge_recursive($data, $response->getData()); + } + } + $result = new OC_OCS_Result($data, 100); + return $result; + } + /** * authenticate the api call * @param array $action the action details as supplied to OC_API::register() @@ -132,7 +209,8 @@ class OC_API { return false; } else { $subAdmin = OC_SubAdmin::isSubAdmin($user); - if($subAdmin) { + $admin = OC_Group::inGroup($user, 'admin'); + if($subAdmin || $admin) { return true; } else { return false; @@ -145,7 +223,7 @@ class OC_API { if(!$user) { return false; } else { - return OC_User::isAdminUser($user); + return OC_Group::inGroup($user, 'admin'); } break; default: @@ -153,25 +231,35 @@ class OC_API { return false; break; } - } - + } + /** * http basic auth * @return string|false (username, or false on failure) */ - private static function loginUser(){ + private static function loginUser(){ $authUser = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : ''; $authPw = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : ''; return OC_User::login($authUser, $authPw) ? $authUser : false; } - + /** * respond to a call - * @param int|array $result the result from the api method + * @param OC_OCS_Result $result * @param string $format the format xml|json */ private static function respond($result, $format='xml') { - $response = array('ocs' => $result->getResult()); + // Send 401 headers if unauthorised + if($result->getStatusCode() === self::RESPOND_UNAUTHORISED) { + header('WWW-Authenticate: Basic realm="Authorisation Required"'); + header('HTTP/1.0 401 Unauthorized'); + } + $response = array( + 'ocs' => array( + 'meta' => $result->getMeta(), + 'data' => $result->getData(), + ), + ); if ($format == 'json') { OC_JSON::encodedPrint($response); } else if ($format == 'xml') { @@ -188,10 +276,13 @@ class OC_API { private static function toXML($array, $writer) { foreach($array as $k => $v) { - if (is_numeric($k)) { + if ($k[0] === '@') { + $writer->writeAttribute(substr($k, 1), $v); + continue; + } else if (is_numeric($k)) { $k = 'element'; } - if (is_array($v)) { + if(is_array($v)) { $writer->startElement($k); self::toXML($v, $writer); $writer->endElement(); @@ -200,5 +291,5 @@ class OC_API { } } } - + } diff --git a/lib/ocs/result.php b/lib/ocs/result.php index 65b2067fc3..8ab378d79c 100644 --- a/lib/ocs/result.php +++ b/lib/ocs/result.php @@ -49,26 +49,48 @@ class OC_OCS_Result{ public function setItemsPerPage(int $items) { $this->perPage = $items; } - + /** - * returns the data associated with the api result + * get the status code + * @return int + */ + public function getStatusCode() { + return $this->statusCode; + } + + /** + * get the meta data for the result * @return array */ - public function getResult() { - $return = array(); - $return['meta'] = array(); - $return['meta']['status'] = ($this->statusCode === 100) ? 'ok' : 'failure'; - $return['meta']['statuscode'] = $this->statusCode; - $return['meta']['message'] = $this->message; + public function getMeta() { + $meta = array(); + $meta['status'] = ($this->statusCode === 100) ? 'ok' : 'failure'; + $meta['statuscode'] = $this->statusCode; + $meta['message'] = $this->message; if(isset($this->items)) { - $return['meta']['totalitems'] = $this->items; + $meta['totalitems'] = $this->items; } if(isset($this->perPage)) { - $return['meta']['itemsperpage'] = $this->perPage; + $meta['itemsperpage'] = $this->perPage; } - $return['data'] = $this->data; - // Return the result data. - return $return; + return $meta; + + } + + /** + * get the result data + * @return array|string|int + */ + public function getData() { + return $this->data; + } + + /** + * return bool if the method succedded + * @return bool + */ + public function succeeded() { + return (substr($this->statusCode, 0, 1) === '1'); } From 8b9cabf51440b75fab21f4e788d7fc582eeb6337 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Thu, 31 Jan 2013 23:45:37 +0100 Subject: [PATCH 004/546] fixing variable name type --- lib/ocs/cloud.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php index 2b53f00770..d617f68526 100644 --- a/lib/ocs/cloud.php +++ b/lib/ocs/cloud.php @@ -59,7 +59,7 @@ class OC_OCS_Cloud { if(OC_User::userExists($parameters['user'])) { // calculate the disc space $userDir = '/'.$parameters['user'].'/files'; - \OC\Files\Filesystem::init($useDir); + \OC\Files\Filesystem::init($userDir); $rootInfo = \OC\Files\Filesystem::getFileInfo(''); $sharedInfo = \OC\Files\Filesystem::getFileInfo('/Shared'); $used = $rootInfo['size'] - $sharedInfo['size']; From aec5ab3ad2adc33a32158156a59f4c00606f8be9 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Mon, 4 Feb 2013 18:34:28 +0000 Subject: [PATCH 005/546] Remove app related values and change structure of /cloud/capabilties call --- lib/ocs/cloud.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php index 7b94009b11..567defa663 100644 --- a/lib/ocs/cloud.php +++ b/lib/ocs/cloud.php @@ -26,15 +26,15 @@ class OC_OCS_Cloud { public static function getCapabilities($parameters){ $result = array(); - $result['bigfilechunking'] = 'true'; - $result['edition'] = OC_Util::getEditionString(); - $result['encryption'] = 'false'; - $result['installedapps'] = OC_App::getEnabledApps(); - $result['syncpollinterval'] = 30; - $result['undelete'] = 'true'; - $result['version'] = implode('.', OC_Util::getVersion()); - $result['versioning'] = OCP\App::isEnabled('files_versioning') ? 'true' : 'false'; - $result['versionstring'] = OC_Util::getVersionString(); + list($major, $minor, $micro) = OC_Util::getVersion(); + $result['version'] = array( + 'major' => $major, + 'minor' => $minor, + 'micro' => $micro, + 'string' => OC_Util::getVersionString(), + 'edition' => OC_Util::getEditionString(), + ); + $result['apps'] = array(); return new OC_OCS_Result($result); } From 742cafb03a79fca4f3847bbd16912034f40ccfb1 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 9 Feb 2013 11:22:29 +0000 Subject: [PATCH 006/546] Change strucutre of cloud/capabilities response --- lib/ocs/cloud.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php index 567defa663..9ae4b4c8eb 100644 --- a/lib/ocs/cloud.php +++ b/lib/ocs/cloud.php @@ -34,7 +34,12 @@ class OC_OCS_Cloud { 'string' => OC_Util::getVersionString(), 'edition' => OC_Util::getEditionString(), ); - $result['apps'] = array(); + + $result['capabilities'] = array( + 'core' => array( + 'pollinterval' => OC_Config::getValue('pollinterval', 60), + ), + ); return new OC_OCS_Result($result); } From 675afbc21374b03140f4570c585eace56875819a Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 9 Feb 2013 11:30:33 +0000 Subject: [PATCH 007/546] Remove accidental inclusion of apps repo. --- apps2 | 1 - 1 file changed, 1 deletion(-) delete mode 160000 apps2 diff --git a/apps2 b/apps2 deleted file mode 160000 index 1ac3c35a40..0000000000 --- a/apps2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1ac3c35a40c6613aba8274b056ae40aa0ce559c7 From 5102596e6d461313cd10f64d033107ce1218a854 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 9 Feb 2013 11:53:54 +0000 Subject: [PATCH 008/546] Add capabilities exposure to the versioning app --- apps/files_versions/appinfo/app.php | 1 + apps/files_versions/appinfo/routes.php | 9 +++++++++ apps/files_versions/lib/capabilities.php | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 apps/files_versions/appinfo/routes.php create mode 100644 apps/files_versions/lib/capabilities.php diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index edd0a2f702..9ac86728cc 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -3,6 +3,7 @@ //require_once 'files_versions/versions.php'; OC::$CLASSPATH['OCA_Versions\Storage'] = 'apps/files_versions/lib/versions.php'; OC::$CLASSPATH['OCA_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php'; +OC::$CLASSPATH['OC_Files_Versions_Capabiltiies'] = 'apps/files_versions/lib/capabilities.php'; OCP\App::registerAdmin('files_versions', 'settings'); OCP\App::registerPersonal('files_versions', 'settings-personal'); diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php new file mode 100644 index 0000000000..125b96db17 --- /dev/null +++ b/apps/files_versions/appinfo/routes.php @@ -0,0 +1,9 @@ + + * This file is licensed under the Affero General Public License version 3 or later. + * See the COPYING-README file. + */ + +// Register with the capabilities API +OC_API::register('get', '/cloud/capabilities', array('OC_Files_Versions_Capabiltiies', 'getCapabilities'), 'ocs', OC_API::USER_AUTH); \ No newline at end of file diff --git a/apps/files_versions/lib/capabilities.php b/apps/files_versions/lib/capabilities.php new file mode 100644 index 0000000000..ac70773df0 --- /dev/null +++ b/apps/files_versions/lib/capabilities.php @@ -0,0 +1,22 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +class OC_Files_Versions_Capabilities { + + public static function getCapabilities() { + return OC_OCS_Result(array( + 'capabilities' => array( + 'files_versions' => array( + 'versioning' => true, + ), + ), + )); + } + +} +?> \ No newline at end of file From eefaefe87d4ef2271c7a079632744948ca8d2496 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 9 Feb 2013 12:00:44 +0000 Subject: [PATCH 009/546] Use OC_User::isAdminUser() in lib/api.php --- lib/api.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/api.php b/lib/api.php index 3e998bd9e4..3d160734fb 100644 --- a/lib/api.php +++ b/lib/api.php @@ -209,7 +209,7 @@ class OC_API { return false; } else { $subAdmin = OC_SubAdmin::isSubAdmin($user); - $admin = OC_Group::inGroup($user, 'admin'); + $admin = OC_User::isAdminUser($user); if($subAdmin || $admin) { return true; } else { @@ -223,7 +223,7 @@ class OC_API { if(!$user) { return false; } else { - return OC_Group::inGroup($user, 'admin'); + return OC_User::isAdminUser($user); } break; default: From 5ad1b63f762ab52f8bf550787588dd1ca728145d Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sat, 9 Feb 2013 12:50:19 +0000 Subject: [PATCH 010/546] Fix api result merging. --- apps/files_versions/appinfo/app.php | 3 +-- apps/files_versions/appinfo/routes.php | 2 +- apps/files_versions/lib/capabilities.php | 6 ++++-- lib/api.php | 6 +++--- ocs/routes.php | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index d45c0c99a7..8de5dc27ca 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -3,8 +3,7 @@ //require_once 'files_versions/versions.php'; OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'apps/files_versions/lib/versions.php'; OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php'; -OC::$CLASSPATH['OCA\Files_Versions\Capabiltiies'] = 'apps/files_versions/lib/capabilities.php'; - +OC::$CLASSPATH['OCA\Files_Versions\Capabilities'] = 'apps/files_versions/lib/capabilities.php'; OCP\App::registerAdmin('files_versions', 'settings'); OCP\App::registerPersonal('files_versions', 'settings-personal'); diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php index 125b96db17..3793e25173 100644 --- a/apps/files_versions/appinfo/routes.php +++ b/apps/files_versions/appinfo/routes.php @@ -6,4 +6,4 @@ */ // Register with the capabilities API -OC_API::register('get', '/cloud/capabilities', array('OC_Files_Versions_Capabiltiies', 'getCapabilities'), 'ocs', OC_API::USER_AUTH); \ No newline at end of file +OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'ocs', OC_API::USER_AUTH); \ No newline at end of file diff --git a/apps/files_versions/lib/capabilities.php b/apps/files_versions/lib/capabilities.php index ac70773df0..1592c2b06e 100644 --- a/apps/files_versions/lib/capabilities.php +++ b/apps/files_versions/lib/capabilities.php @@ -6,10 +6,12 @@ * See the COPYING-README file. */ -class OC_Files_Versions_Capabilities { +namespace OCA\Files_Versions; + +class Capabilities { public static function getCapabilities() { - return OC_OCS_Result(array( + return new \OC_OCS_Result(array( 'capabilities' => array( 'files_versions' => array( 'versioning' => true, diff --git a/lib/api.php b/lib/api.php index 3d160734fb..d50882b119 100644 --- a/lib/api.php +++ b/lib/api.php @@ -118,7 +118,6 @@ class OC_API { ); } - $response = self::mergeResponses($responses); $formats = array('json', 'xml'); $format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml'; @@ -134,7 +133,7 @@ class OC_API { $response = array(); // Sort into shipped and thirdparty $shipped = array( - 'succeded' => array(), + 'succeeded' => array(), 'failed' => array(), ); $thirdparty = array( @@ -143,7 +142,7 @@ class OC_API { ); foreach($responses as $response) { - if(OC_App::isShipped($response['app'])) { + if(OC_App::isShipped($response['app']) || ($response['app'] === 'core')) { if($response['response']->succeeded()) { $shipped['succeeded'][$response['app']] = $response['response']; } else { @@ -250,6 +249,7 @@ class OC_API { */ private static function respond($result, $format='xml') { // Send 401 headers if unauthorised + die(var_dump($result)); if($result->getStatusCode() === self::RESPOND_UNAUTHORISED) { header('WWW-Authenticate: Basic realm="Authorisation Required"'); header('HTTP/1.0 401 Unauthorized'); diff --git a/ocs/routes.php b/ocs/routes.php index 5e4758fb70..81beae2f88 100644 --- a/ocs/routes.php +++ b/ocs/routes.php @@ -18,4 +18,4 @@ OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_P OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'ocs', OC_API::USER_AUTH); OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'ocs', OC_API::USER_AUTH); // cloud -OC_API::register('get', '/cloud/capabilities', array('OC_OCS_Cloud', 'getCapabilities'), 'ocs', OC_API::USER_AUTH); \ No newline at end of file +OC_API::register('get', '/cloud/capabilities', array('OC_OCS_Cloud', 'getCapabilities'), 'core', OC_API::USER_AUTH); \ No newline at end of file From 266ba2806d9b72ec675b71fb939483b40f77cf00 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sun, 10 Feb 2013 12:35:39 +0100 Subject: [PATCH 011/546] Remove debug call, correct app identifier --- apps/files_versions/appinfo/routes.php | 2 +- lib/api.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php index 3793e25173..8cef57c9e4 100644 --- a/apps/files_versions/appinfo/routes.php +++ b/apps/files_versions/appinfo/routes.php @@ -6,4 +6,4 @@ */ // Register with the capabilities API -OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'ocs', OC_API::USER_AUTH); \ No newline at end of file +OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH); \ No newline at end of file diff --git a/lib/api.php b/lib/api.php index d50882b119..8fa4d764ab 100644 --- a/lib/api.php +++ b/lib/api.php @@ -117,7 +117,6 @@ class OC_API { 'response' => call_user_func($action['action'], $parameters), ); } - $response = self::mergeResponses($responses); $formats = array('json', 'xml'); $format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml'; @@ -249,7 +248,6 @@ class OC_API { */ private static function respond($result, $format='xml') { // Send 401 headers if unauthorised - die(var_dump($result)); if($result->getStatusCode() === self::RESPOND_UNAUTHORISED) { header('WWW-Authenticate: Basic realm="Authorisation Required"'); header('HTTP/1.0 401 Unauthorized'); From e63c4e3ea8478a128bad758d90e256a04f19ddb6 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sun, 10 Feb 2013 12:41:27 +0100 Subject: [PATCH 012/546] Change capabilities exposure for files_versions since it extends files --- apps/files_versions/lib/capabilities.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/files_versions/lib/capabilities.php b/apps/files_versions/lib/capabilities.php index 1592c2b06e..3251a07b6a 100644 --- a/apps/files_versions/lib/capabilities.php +++ b/apps/files_versions/lib/capabilities.php @@ -13,12 +13,11 @@ class Capabilities { public static function getCapabilities() { return new \OC_OCS_Result(array( 'capabilities' => array( - 'files_versions' => array( + 'files' => array( 'versioning' => true, ), ), )); } -} -?> \ No newline at end of file +} \ No newline at end of file From 28498e1af4beb018a83123145459ccf5365c54ef Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sun, 10 Feb 2013 12:44:59 +0100 Subject: [PATCH 013/546] Code style and remove OAuth code --- lib/api.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/lib/api.php b/lib/api.php index 8fa4d764ab..5f2e83c9ce 100644 --- a/lib/api.php +++ b/lib/api.php @@ -33,6 +33,7 @@ class OC_API { const USER_AUTH = 1; const SUBADMIN_AUTH = 2; const ADMIN_AUTH = 3; + /** * API Response Codes */ @@ -40,15 +41,6 @@ class OC_API { const RESPOND_SERVER_ERROR = 996; const RESPOND_NOT_FOUND = 998; const RESPOND_UNKNOWN_ERROR = 999; - - private static $server; - - /** - * initialises the OAuth store and server - */ - private static function init() { - self::$server = new OC_OAuth_Server(new OC_OAuth_Store()); - } /** * api actions @@ -156,9 +148,9 @@ class OC_API { } } // Remove any error responses if there is one shipped response that succeeded - if(!empty($shipped['succeeded'])){ + if(!empty($shipped['succeeded'])) { $responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']); - } else if(!empty($shipped['failed'])){ + } else if(!empty($shipped['failed'])) { // Which shipped response do we use if they all failed? // They may have failed for different reasons (different status codes) // Which reponse code should we return? From 6d74aa0d00cd19a008059705071ebd9fa759a9ea Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sun, 10 Feb 2013 12:46:41 +0100 Subject: [PATCH 014/546] more code style --- lib/ocs/cloud.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php index 9ae4b4c8eb..132d923d96 100644 --- a/lib/ocs/cloud.php +++ b/lib/ocs/cloud.php @@ -24,7 +24,7 @@ class OC_OCS_Cloud { - public static function getCapabilities($parameters){ + public static function getCapabilities($parameters) { $result = array(); list($major, $minor, $micro) = OC_Util::getVersion(); $result['version'] = array( From f141f8b523f71351841f64ab1e4782b4535ca1b7 Mon Sep 17 00:00:00 2001 From: Tom Needham Date: Sun, 10 Feb 2013 14:42:23 +0100 Subject: [PATCH 015/546] Add further capabilities to /cloud/capabilitites api call --- apps/files/appinfo/app.php | 2 ++ apps/files/appinfo/routes.php | 5 ++++- apps/files/lib/capabilities.php | 24 ++++++++++++++++++++++ apps/files_encryption/appinfo/app.php | 1 + apps/files_encryption/appinfo/routes.php | 9 ++++++++ apps/files_encryption/lib/capabilities.php | 23 +++++++++++++++++++++ 6 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 apps/files/lib/capabilities.php create mode 100644 apps/files_encryption/appinfo/routes.php create mode 100644 apps/files_encryption/lib/capabilities.php diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php index da17a7f2cc..6535a9b7ba 100644 --- a/apps/files/appinfo/app.php +++ b/apps/files/appinfo/app.php @@ -1,4 +1,6 @@ create('download', 'download{file}') ->requirements(array('file' => '.*')) - ->actionInclude('files/download.php'); \ No newline at end of file + ->actionInclude('files/download.php'); + +// Register with the capabilities API +OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', OC_API::USER_AUTH); \ No newline at end of file diff --git a/apps/files/lib/capabilities.php b/apps/files/lib/capabilities.php new file mode 100644 index 0000000000..90a5e2f4eb --- /dev/null +++ b/apps/files/lib/capabilities.php @@ -0,0 +1,24 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCA\Files; + +class Capabilities { + + public static function getCapabilities() { + return new \OC_OCS_Result(array( + 'capabilities' => array( + 'files' => array( + 'bigfilechunking' => true, + 'undelete' => true, + ), + ), + )); + } + +} \ No newline at end of file diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index f83109a18e..3c100b4957 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -7,6 +7,7 @@ OC::$CLASSPATH['OCA\Encryption\Keymanager'] = 'apps/files_encryption/lib/keymana OC::$CLASSPATH['OCA\Encryption\Stream'] = 'apps/files_encryption/lib/stream.php'; OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'apps/files_encryption/lib/proxy.php'; OC::$CLASSPATH['OCA\Encryption\Session'] = 'apps/files_encryption/lib/session.php'; +OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'apps/files_encryption/lib/capabilities.php'; OC_FileProxy::register( new OCA\Encryption\Proxy() ); diff --git a/apps/files_encryption/appinfo/routes.php b/apps/files_encryption/appinfo/routes.php new file mode 100644 index 0000000000..ab83432a4b --- /dev/null +++ b/apps/files_encryption/appinfo/routes.php @@ -0,0 +1,9 @@ + + * This file is licensed under the Affero General Public License version 3 or later. + * See the COPYING-README file. + */ + +// Register with the capabilities API +OC_API::register('get', '/cloud/capabilities', array('OCA\Encryption\Capabilities', 'getCapabilities'), 'files_encryption', OC_API::USER_AUTH); \ No newline at end of file diff --git a/apps/files_encryption/lib/capabilities.php b/apps/files_encryption/lib/capabilities.php new file mode 100644 index 0000000000..72baddcd04 --- /dev/null +++ b/apps/files_encryption/lib/capabilities.php @@ -0,0 +1,23 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OCA\Encryption; + +class Capabilities { + + public static function getCapabilities() { + return new \OC_OCS_Result(array( + 'capabilities' => array( + 'files' => array( + 'encryption' => true, + ), + ), + )); + } + +} \ No newline at end of file From a6d3b66c751d4775f0b21015af332fbe59a7a80a Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 14 Feb 2013 17:40:29 +0100 Subject: [PATCH 016/546] added app stylings to core --- core/css/styles.css | 136 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/core/css/styles.css b/core/css/styles.css index b41c205c21..452a90c227 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -334,3 +334,139 @@ div.crumb { float:left; display:block; background:url('../img/breadcrumb.svg') n div.crumb:first-child { padding:10px 20px 10px 5px; } div.crumb.last { font-weight:bold; background:none; padding-right:10px; } div.crumb a{ padding: 0.9em 0 0.7em 0; } + + +/* ---- APP STYLING ---- */ +#app { height: 100%; width: 100%; } +/* Navigation: folder like structure */ +#app-navigation { + width: 250px; height: 100%; float: left; padding-bottom: 32px; + -moz-box-sizing: border-box; box-sizing: border-box; + border-right: 1px solid #ccc; background-color: #f8f8f8; +} +#app-navigation > ul { + height: 100%; overflow: auto; + -moz-box-sizing: border-box; box-sizing: border-box; +} +#app-navigation li { + width: 100%; position: relative; + -moz-box-sizing: border-box; box-sizing: border-box; + text-shadow: 0 1px 0 rgba(255, 255, 255, .9); +} +#app-navigation li.active { background-color: #ccc; text-shadow: 0 1px 0 rgba(255,255,255,.7); } + +#app-navigation > ul > li { + border-bottom: 1px solid #ddd; + border-top: 1px solid #fff; + background-color: #eee; +} +#app-navigation > ul > li.active { border-bottom: 1px solid #ccc; border-top: 1px solid #ccc; } + +#app-navigation ul.with-icon a { + padding-left: 32px; + background-size: 16px 16px; background-repeat: no-repeat; + background-position: 10px center; +} + +#app-navigation li > a { + display: block; width: 100%; padding: 0 16px; overflow: hidden; line-height: 32px; + -moz-box-sizing: border-box; box-sizing: border-box; + white-space: nowrap; text-overflow: ellipsis; color: #333; +} +#app-navigation li:hover > a { background-color: #ccc; } +#app-navigation > ul > li:hover { border-top: 1px solid #ccc; } + +#app-navigation li.collapsible > button.collapse { + display: none; position: absolute; left: 6px; top: 5px; height: 16px; width: 16px; + background: none; background-image: url('%webroot%/core/img/actions/triangle-s.svg'); + background-repeat: no-repeat; background-size: 16px 16px; + border: none; border-radius: 0; outline: none !important; + box-shadow: none; +} + +#app-navigation li.collapsible:hover > a { background-image: none; } +#app-navigation li.collapsible:hover > button.collapse { display: block; } + +#app-navigation li.collapsible button.collapse { + -moz-transform: rotate(-90deg); + -webkit-transform: rotate(-90deg); + -ms-transform:rotate(-90deg); + -o-transform:rotate(-90deg); + transform: rotate(-90deg); +} + +#app-navigation li.collapsible.open button.collapse { + -moz-transform: rotate(0); + -webkit-transform: rotate(0); + -ms-transform:rotate(0); + -o-transform:rotate(0); + transform: rotate(0); +} + +/* Second level nesting for lists */ +#app-navigation > ul ul { display: none; } +#app-navigation > ul ul li > a { padding-left: 32px; } +#app-navigation > ul.with-icon ul li > a { padding-left: 48px; background-position: 24px center; } + +#app-navigation .open { + background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); + background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); + background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); + background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); + background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%); +} + +#app-navigation > ul li.open:hover { + -webkit-box-shadow: inset 0 0 3px #cccccc; + box-shadow: inset 0 0 3px #cccccc; + border-top: 1px solid #ccc; +} + +#app-navigation > ul li.open ul { display: block; } + +/* drag and drop */ +#app-navigation .drag-and-drop { + -moz-transition: padding-bottom 500ms ease 0s; + -o-transition: padding-bottom 500ms ease 0s; + -webkit-transition: padding-bottom 500ms ease 0s; + -ms-transition: padding-bottom 500ms ease 0s; + transition: padding-bottom 500ms ease 0s; + padding-bottom: 40px; +} +#app-navigation .personalblock > legend { padding: 10px 0; margin: 0; } +#app-navigation .error { color: #DD1144; } + + + +/* Part where the content will be loaded into */ +#app-content { height: 100%; overflow-y: auto; } + +/* settings area */ +#app-settings { position: fixed; width: 249px; bottom: 0; border-top: 1px solid #ccc; } +#app-settings-header { background-color: #eee; } +#app-settings-content { background-color: #eee; display: none; padding: 10px; } +#app-settings.open #app-settings-content { display: block; } + +.settings-button { + height: 32px; width: 100%; padding: 0; margin: 0; display: block; + background-image: url('%webroot%/core/img/actions/settings.png'); + background-repeat: no-repeat; background-position: 10px center; + background-color: transparent; + box-shadow: none; + border-radius: 0; border: 0; +} +.settings-button:hover { background-color: #ddd; } + +/* icons */ +.folder-icon { background-image: url('%webroot%/core/img/places/folder.png'); } +.delete-icon { background-image: url('%webroot%/core/img/actions/delete.svg'); } +.delete-icon:hover { background-image: url('%webroot%/core/img/actions/delete-hover.svg'); } +.edit-icon { background-image: url('%webroot%/core/img/actions/rename.svg'); } + +/* buttons */ +button.loading { + background-image: url('%webroot%/core/img/loading.gif'); + background-position: right 10px center; + background-repeat: no-repeat; + padding-right: 30px; +} \ No newline at end of file From ab8c97e9c60307d25b83c71d2ea210b40e836382 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 14 Feb 2013 17:52:55 +0100 Subject: [PATCH 017/546] small fixes --- core/css/styles.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 452a90c227..b441b5477a 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -378,7 +378,7 @@ div.crumb a{ padding: 0.9em 0 0.7em 0; } #app-navigation li.collapsible > button.collapse { display: none; position: absolute; left: 6px; top: 5px; height: 16px; width: 16px; - background: none; background-image: url('%webroot%/core/img/actions/triangle-s.svg'); + background: none; background-image: url('../img/actions/triangle-s.svg'); background-repeat: no-repeat; background-size: 16px 16px; border: none; border-radius: 0; outline: none !important; box-shadow: none; @@ -449,7 +449,7 @@ div.crumb a{ padding: 0.9em 0 0.7em 0; } .settings-button { height: 32px; width: 100%; padding: 0; margin: 0; display: block; - background-image: url('%webroot%/core/img/actions/settings.png'); + background-image: url('../img/actions/settings.png'); background-repeat: no-repeat; background-position: 10px center; background-color: transparent; box-shadow: none; @@ -458,14 +458,14 @@ div.crumb a{ padding: 0.9em 0 0.7em 0; } .settings-button:hover { background-color: #ddd; } /* icons */ -.folder-icon { background-image: url('%webroot%/core/img/places/folder.png'); } -.delete-icon { background-image: url('%webroot%/core/img/actions/delete.svg'); } -.delete-icon:hover { background-image: url('%webroot%/core/img/actions/delete-hover.svg'); } -.edit-icon { background-image: url('%webroot%/core/img/actions/rename.svg'); } +.folder-icon { background-image: url('../img/places/folder.png'); } +.delete-icon { background-image: url('../img/actions/delete.svg'); } +.delete-icon:hover { background-image: url('../img/actions/delete-hover.svg'); } +.edit-icon { background-image: url('../img/actions/rename.svg'); } /* buttons */ button.loading { - background-image: url('%webroot%/core/img/loading.gif'); + background-image: url('../img/loading.gif'); background-position: right 10px center; background-repeat: no-repeat; padding-right: 30px; From 4205f8243982f9ee570c85581cb86c7412436782 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 14 Feb 2013 17:57:38 +0100 Subject: [PATCH 018/546] also make bottom border grey on first level hover --- core/css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index b441b5477a..ef619fac55 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -374,7 +374,7 @@ div.crumb a{ padding: 0.9em 0 0.7em 0; } white-space: nowrap; text-overflow: ellipsis; color: #333; } #app-navigation li:hover > a { background-color: #ccc; } -#app-navigation > ul > li:hover { border-top: 1px solid #ccc; } +#app-navigation > ul > li:hover { border-top: 1px solid #ccc; border-bottom: 1px solid #ccc;} #app-navigation li.collapsible > button.collapse { display: none; position: absolute; left: 6px; top: 5px; height: 16px; width: 16px; From 3dfb1628ce6e394a80c03a96da7c837209767e5b Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Tue, 19 Feb 2013 20:42:48 -0500 Subject: [PATCH 019/546] Include etags for the root of the shared folder --- apps/files_sharing/lib/cache.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 9655e44787..910c268f01 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -28,10 +28,11 @@ namespace OC\Files\Cache; */ class Shared_Cache extends Cache { + private $storage; private $files = array(); public function __construct($storage) { - + $this->storage = $storage; } /** @@ -64,7 +65,14 @@ class Shared_Cache extends Cache { */ public function get($file) { if ($file == '') { - return \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT); + $data = \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT); + $etag = \OCP\Config::getUserValue(\OCP\User::getUser(), 'files_sharing', 'etag'); + if (!isset($etag)) { + $etag = $this->storage->getETag(''); + \OCP\Config::setUserValue(\OCP\User::getUser(), 'files_sharing', 'etag', $etag); + } + $data['etag'] = $etag; + return $data; } else if (is_string($file)) { if ($cache = $this->getSourceCache($file)) { return $cache->get($this->files[$file]); @@ -117,7 +125,9 @@ class Shared_Cache extends Cache { * @return int file id */ public function put($file, array $data) { - if ($cache = $this->getSourceCache($file)) { + if ($file == '' && isset($data['etag'])) { + \OCP\Config::setUserValue(\OCP\User::getUser(), 'files_sharing', 'etag', $etag); + } else if ($cache = $this->getSourceCache($file)) { return $cache->put($this->files[$file], $data); } return false; From 09a2730f571c08945bfb90342c6cab9f7941e856 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 23 Feb 2013 15:22:34 -0500 Subject: [PATCH 020/546] Include etag field for folder contents --- apps/files_sharing/lib/share/file.php | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index 6d3c55a008..ceabc7d548 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -87,6 +87,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { $file['size'] = $item['size']; $file['mtime'] = $item['mtime']; $file['encrypted'] = $item['encrypted']; + $file['etag'] = $item['etag']; $files[] = $file; } return $files; From b6a21cc4b5f060863e1dbfa9d090b8baeed02b59 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 23 Feb 2013 15:32:59 -0500 Subject: [PATCH 021/546] Fix WebDAV uploading of partial shared files --- apps/files_sharing/lib/sharedstorage.php | 73 +++++++++++++++--------- 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 65812b7e2f..d0ee371c0b 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -45,9 +45,19 @@ class Shared extends \OC\Files\Storage\Common { */ private function getFile($target) { if (!isset($this->files[$target])) { - $source = \OC_Share_Backend_File::getSource($target); - if ($source) { - $source['path'] = '/'.$source['uid_owner'].'/'.$source['path']; + // Check for partial files + if (pathinfo($target, PATHINFO_EXTENSION) === 'part') { + $source = \OC_Share_Backend_File::getSource(substr($target, 0, -5)); + if ($source) { + $source['path'] = '/'.$source['uid_owner'].'/'.$source['path'].'.part'; + // All partial files have delete permission + $source['permissions'] |= \OCP\PERMISSION_DELETE; + } + } else { + $source = \OC_Share_Backend_File::getSource($target); + if ($source) { + $source['path'] = '/'.$source['uid_owner'].'/'.$source['path']; + } } $this->files[$target] = $source; } @@ -275,34 +285,43 @@ class Shared extends \OC\Files\Storage\Common { } public function rename($path1, $path2) { - // Renaming/moving is only allowed within shared folders - $pos1 = strpos($path1, '/', 1); - $pos2 = strpos($path2, '/', 1); - if ($pos1 !== false && $pos2 !== false && ($oldSource = $this->getSourcePath($path1))) { - $newSource = $this->getSourcePath(dirname($path2)).'/'.basename($path2); - if (dirname($path1) == dirname($path2)) { - // Rename the file if UPDATE permission is granted - if ($this->isUpdatable($path1)) { - list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource); - list( , $newInternalPath) = \OC\Files\Filesystem::resolvePath($newSource); - return $storage->rename($oldInternalPath, $newInternalPath); - } - } else { - // Move the file if DELETE and CREATE permissions are granted - if ($this->isDeletable($path1) && $this->isCreatable(dirname($path2))) { - // Get the root shared folder - $folder1 = substr($path1, 0, $pos1); - $folder2 = substr($path2, 0, $pos2); - // Copy and unlink the file if it exists in a different shared folder - if ($folder1 != $folder2) { - if ($this->copy($path1, $path2)) { - return $this->unlink($path1); - } - } else { + // Check for partial files + if (pathinfo($path1, PATHINFO_EXTENSION) === 'part') { + if ($oldSource = $this->getSourcePath($path1)) { + list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource); + $newInternalPath = substr($oldInternalPath, 0, -5); + return $storage->rename($oldInternalPath, $newInternalPath); + } + } else { + // Renaming/moving is only allowed within shared folders + $pos1 = strpos($path1, '/', 1); + $pos2 = strpos($path2, '/', 1); + if ($pos1 !== false && $pos2 !== false && ($oldSource = $this->getSourcePath($path1))) { + $newSource = $this->getSourcePath(dirname($path2)).'/'.basename($path2); + if (dirname($path1) == dirname($path2)) { + // Rename the file if UPDATE permission is granted + if ($this->isUpdatable($path1)) { list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource); list( , $newInternalPath) = \OC\Files\Filesystem::resolvePath($newSource); return $storage->rename($oldInternalPath, $newInternalPath); } + } else { + // Move the file if DELETE and CREATE permissions are granted + if ($this->isDeletable($path1) && $this->isCreatable(dirname($path2))) { + // Get the root shared folder + $folder1 = substr($path1, 0, $pos1); + $folder2 = substr($path2, 0, $pos2); + // Copy and unlink the file if it exists in a different shared folder + if ($folder1 != $folder2) { + if ($this->copy($path1, $path2)) { + return $this->unlink($path1); + } + } else { + list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource); + list( , $newInternalPath) = \OC\Files\Filesystem::resolvePath($newSource); + return $storage->rename($oldInternalPath, $newInternalPath); + } + } } } } From 00e28cf15641cccffd39ce2b41ddb0a2dca5cd48 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 23 Feb 2013 15:42:01 -0500 Subject: [PATCH 022/546] Return unknown free space for shared root folder so we can still upload partial files --- apps/files_sharing/lib/sharedstorage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index d0ee371c0b..1e82d04ec2 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -384,7 +384,7 @@ class Shared extends \OC\Files\Storage\Common { public function free_space($path) { if ($path == '') { - return -1; + return \OC\Files\FREE_SPACE_UNKNOWN; } $source = $this->getSourcePath($path); if ($source) { From 36827d15498f443819b3aceb503d6cc1b071e041 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 23 Feb 2013 16:09:56 -0500 Subject: [PATCH 023/546] Fix variable --- apps/files_sharing/lib/cache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 910c268f01..5309ec7896 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -126,7 +126,7 @@ class Shared_Cache extends Cache { */ public function put($file, array $data) { if ($file == '' && isset($data['etag'])) { - \OCP\Config::setUserValue(\OCP\User::getUser(), 'files_sharing', 'etag', $etag); + \OCP\Config::setUserValue(\OCP\User::getUser(), 'files_sharing', 'etag', $data['etag']); } else if ($cache = $this->getSourceCache($file)) { return $cache->put($this->files[$file], $data); } From 8983465210c9dcd91cc178a072775efbcda85ca8 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Tue, 26 Feb 2013 01:21:48 -0500 Subject: [PATCH 024/546] Correct parent folders' ETags for all users with access to a shared file --- apps/files_sharing/appinfo/app.php | 1 + apps/files_sharing/lib/cache.php | 4 +- apps/files_sharing/lib/sharedstorage.php | 3 + apps/files_sharing/lib/updater.php | 77 ++++++++++++++++++++++++ lib/public/share.php | 23 +++++++ 5 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 apps/files_sharing/lib/updater.php diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index d3e05cc62d..f8326db45b 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -5,6 +5,7 @@ OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'apps/files_sharing/lib/share/folder OC::$CLASSPATH['OC\Files\Storage\Shared'] = "apps/files_sharing/lib/sharedstorage.php"; OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'apps/files_sharing/lib/cache.php'; OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'apps/files_sharing/lib/permissions.php'; +OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'apps/files_sharing/lib/updater.php'; OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'apps/files_sharing/lib/watcher.php'; OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup'); OCP\Share::registerBackend('file', 'OC_Share_Backend_File'); diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 5309ec7896..851e958f68 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -125,8 +125,8 @@ class Shared_Cache extends Cache { * @return int file id */ public function put($file, array $data) { - if ($file == '' && isset($data['etag'])) { - \OCP\Config::setUserValue(\OCP\User::getUser(), 'files_sharing', 'etag', $data['etag']); + if ($file === '' && isset($data['etag'])) { + return \OCP\Config::setUserValue(\OCP\User::getUser(), 'files_sharing', 'etag', $data['etag']); } else if ($cache = $this->getSourceCache($file)) { return $cache->put($this->files[$file], $data); } diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 1e82d04ec2..0163f2e00b 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -412,6 +412,9 @@ class Shared extends \OC\Files\Storage\Common { if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] || \OCP\Share::getItemsSharedWith('file')) { $user_dir = $options['user_dir']; \OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/'); + \OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook'); + \OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook'); + \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook'); } } diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php new file mode 100644 index 0000000000..af6f921559 --- /dev/null +++ b/apps/files_sharing/lib/updater.php @@ -0,0 +1,77 @@ +. + */ + +namespace OC\Files\Cache; + +class Shared_Updater { + + /** + * Correct the parent folders' ETags for all users shared the file at $target + * + * @param string $target + */ + static public function correctFolders($target) { + $uid = \OCP\User::getUser(); + $uidOwner = \OC\Files\Filesystem::getOwner($target); + $info = \OC\Files\Filesystem::getFileInfo($target); + // Correct Shared folders of other users shared with + $users = \OCP\Share::getUsersItemShared('file', $info['fileid'], $uidOwner, true); + if (!empty($users)) { + foreach ($users as $user) { + // The ETag of the logged in user should already be updated + if ($user !== $uid) { + $etag = \OC\Files\Filesystem::getETag(''); + \OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag); + } + } + // Correct folders of shared file owner + if ($uidOwner !== $uid && $source = \OC_Share_Backend_File::getSource($target)) { + \OC\Files\Filesystem::initMountPoints($source['uid_owner']); + $source = '/'.$source['uid_owner'].'/'.$source['path']; + $mtime = \OC\Files\Filesystem::filemtime($target); + \OC\Files\Cache\Updater::correctFolder($source, $mtime); + } + } + } + + /** + * @param array $params + */ + static public function writeHook($params) { + self::correctFolders($params['path']); + } + + /** + * @param array $params + */ + static public function renameHook($params) { + self::correctFolders($params['oldpath']); + self::correctFolders($params['newpath']); + } + + /** + * @param array $params + */ + static public function deleteHook($params) { + self::correctFolders($params['path']); + } + +} \ No newline at end of file diff --git a/lib/public/share.php b/lib/public/share.php index c0f35333e8..3d157b1a5f 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -197,6 +197,29 @@ class Share { $parameters, -1, $includeCollections); } + /** + * Get all users an item is shared with + * @param string Item type + * @param string Item source + * @param string Owner + * @param bool Include collections + * @return Return array of users + */ + public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false) { + $users = array(); + $items = self::getItems($itemType, $itemSource, null, null, $uidOwner, self::FORMAT_NONE, null, -1, $includeCollections); + if ($items) { + foreach ($items as $item) { + if ((int)$item['share_type'] === self::SHARE_TYPE_USER) { + $users[] = $item['share_with']; + } else if ((int)$item['share_type'] === self::SHARE_TYPE_GROUP) { + $users = array_merge($users, \OC_Group::usersInGroup($item['share_with'])); + } + } + } + return $users; + } + /** * @brief Share an item with a user, group, or via private link * @param string Item type From ea83acedebbcf70b19643efe82b72fb139cf8ad2 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Tue, 26 Feb 2013 01:43:04 -0500 Subject: [PATCH 025/546] Fix target path and reuse mtime --- apps/files_sharing/lib/updater.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index af6f921559..a41ce76f93 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -43,11 +43,11 @@ class Shared_Updater { } } // Correct folders of shared file owner + $target = substr($target, 8); if ($uidOwner !== $uid && $source = \OC_Share_Backend_File::getSource($target)) { - \OC\Files\Filesystem::initMountPoints($source['uid_owner']); - $source = '/'.$source['uid_owner'].'/'.$source['path']; - $mtime = \OC\Files\Filesystem::filemtime($target); - \OC\Files\Cache\Updater::correctFolder($source, $mtime); + \OC\Files\Filesystem::initMountPoints($uidOwner); + $source = '/'.$uidOwner.'/'.$source['path']; + \OC\Files\Cache\Updater::correctFolder($source, $info['mtime']); } } } From ab5e20a2c18fca77aaf12c360e324ab0882a495e Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Wed, 27 Feb 2013 21:53:46 +0100 Subject: [PATCH 026/546] Just use rawurlencode in files list template --- apps/files/templates/part.list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 3c6c5dbd26..8b7ae23638 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -9,9 +9,9 @@ // the older the file, the brighter the shade of grey; days*14 $relative_date_color = round((time()-$file['mtime'])/60/60/24*14); if($relative_date_color>200) $relative_date_color = 200; - $name = str_replace('+', '%20', urlencode($file['name'])); + $name = rawurlencode($file['name']); $name = str_replace('%2F', '/', $name); - $directory = str_replace('+', '%20', urlencode($file['directory'])); + $directory = rawurlencode($file['directory']); $directory = str_replace('%2F', '/', $directory); ?> Date: Sat, 2 Mar 2013 12:57:29 -0500 Subject: [PATCH 027/546] Update ETag when file is shared --- apps/files_sharing/lib/sharedstorage.php | 1 + apps/files_sharing/lib/updater.php | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 19abc83825..f61a47c190 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -420,6 +420,7 @@ class Shared extends \OC\Files\Storage\Common { \OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook'); \OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook'); \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook'); + \OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook'); } } diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index a41ce76f93..8d00d44c3b 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -74,4 +74,14 @@ class Shared_Updater { self::correctFolders($params['path']); } + /** + * @param array $params + */ + static public function shareHook($params) { + if ($params['itemType'] === 'file' || $param['itemType'] === 'folder') { + $id = \OC\Files\Filesystem::getPath($params['itemSource']); + self::correctFolders($id); + } + } + } \ No newline at end of file From e466d680fea1738bfa5eeb12a13b6e8fa858a986 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 2 Mar 2013 13:11:57 -0500 Subject: [PATCH 028/546] Fix variable name in Shared_Updater --- apps/files_sharing/lib/updater.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index 8d00d44c3b..cc04835b7d 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -78,7 +78,7 @@ class Shared_Updater { * @param array $params */ static public function shareHook($params) { - if ($params['itemType'] === 'file' || $param['itemType'] === 'folder') { + if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { $id = \OC\Files\Filesystem::getPath($params['itemSource']); self::correctFolders($id); } From ee0c38bb5112af4aa491b526ca390de52dd3ab7e Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 4 Mar 2013 19:43:56 -0500 Subject: [PATCH 029/546] Fix group post_shared hook --- lib/public/share.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/public/share.php b/lib/public/share.php index f3c1da7476..eadf24b14e 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -1103,20 +1103,6 @@ class Share { } else { $fileTarget = null; } - \OC_Hook::emit('OCP\Share', 'post_shared', array( - 'itemType' => $itemType, - 'itemSource' => $itemSource, - 'itemTarget' => $itemTarget, - 'parent' => $parent, - 'shareType' => self::$shareTypeGroupUserUnique, - 'shareWith' => $uid, - 'uidOwner' => $uidOwner, - 'permissions' => $permissions, - 'fileSource' => $fileSource, - 'fileTarget' => $fileTarget, - 'id' => $parent, - 'token' => $token - )); // Insert an extra row for the group share if the item or file target is unique for this user if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) { $query->execute(array($itemType, $itemSource, $itemTarget, $parent, @@ -1125,6 +1111,20 @@ class Share { $id = \OC_DB::insertid('*PREFIX*share'); } } + \OC_Hook::emit('OCP\Share', 'post_shared', array( + 'itemType' => $itemType, + 'itemSource' => $itemSource, + 'itemTarget' => $groupItemTarget, + 'parent' => $parent, + 'shareType' => $shareType, + 'shareWith' => $uid, + 'uidOwner' => $uidOwner, + 'permissions' => $permissions, + 'fileSource' => $fileSource, + 'fileTarget' => $groupFileTarget, + 'id' => $parent, + 'token' => $token + )); if ($parentFolder === true) { // Return parent folders to preserve file target paths for potential children return $parentFolders; From 771e01af35157f99539134ceae68a672e4cb36f9 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Tue, 5 Mar 2013 21:57:32 -0500 Subject: [PATCH 030/546] Move hook connectors from shared storage to app.php, add post_unshare hook --- apps/files_sharing/appinfo/app.php | 5 +++++ apps/files_sharing/lib/sharedstorage.php | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index c9237a4b3a..8f9234c822 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -11,3 +11,8 @@ OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'set OCP\Share::registerBackend('file', 'OC_Share_Backend_File'); OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file'); OCP\Util::addScript('files_sharing', 'share'); +\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook'); +\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook'); +\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook'); +\OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook'); +\OC_Hook::connect('OCP\Share', 'post_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook'); \ No newline at end of file diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index f61a47c190..f1a371b123 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -417,10 +417,6 @@ class Shared extends \OC\Files\Storage\Common { \OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/'); - \OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook'); - \OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook'); - \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook'); - \OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook'); } } From a68cbb00e0006d1bf82fd6c520c092ac799d7f0f Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Wed, 6 Mar 2013 21:05:13 +0100 Subject: [PATCH 031/546] Preserve Debug flag accross config writes --- lib/config.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/config.php b/lib/config.php index 0bd497b8e5..c94eb27815 100644 --- a/lib/config.php +++ b/lib/config.php @@ -155,7 +155,11 @@ class OC_Config{ */ public static function writeData() { // Create a php file ... - $content = " Date: Wed, 6 Mar 2013 23:30:16 +0100 Subject: [PATCH 032/546] Allow to load splited config files ref #946 --- lib/config.php | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/lib/config.php b/lib/config.php index 0bd497b8e5..626dc8b02e 100644 --- a/lib/config.php +++ b/lib/config.php @@ -130,14 +130,24 @@ class OC_Config{ return true; } - if( !file_exists( OC::$SERVERROOT."/config/config.php" )) { - return false; - } + // read all file in config dir ending by config.php + $config_files = glob( OC::$SERVERROOT."/config/*.config.php"); - // Include the file, save the data from $CONFIG - include OC::$SERVERROOT."/config/config.php"; - if( isset( $CONFIG ) && is_array( $CONFIG )) { - self::$cache = $CONFIG; + //Sort array naturally : + natsort($config_files); + + //Filter only regular files + $config_files = array_filter($config_files, 'is_file'); + + // Add default config + array_unshift($config_files,OC::$SERVERROOT."/config/config.php"); + + //Include file and merge config + foreach($config_files as $file){ + include $file; + if( isset( $CONFIG ) && is_array( $CONFIG )) { + self::$cache = array_merge(self::$cache, $CONFIG); + } } // We cached everything From 812e306e6e1a10b879052bccaa6b94a6bb8bf9f4 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 6 Mar 2013 17:33:27 -0500 Subject: [PATCH 033/546] Update Shared folders ETags of users with reshares --- apps/files_sharing/lib/updater.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index cc04835b7d..030180543c 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -35,12 +35,18 @@ class Shared_Updater { // Correct Shared folders of other users shared with $users = \OCP\Share::getUsersItemShared('file', $info['fileid'], $uidOwner, true); if (!empty($users)) { - foreach ($users as $user) { - // The ETag of the logged in user should already be updated - if ($user !== $uid) { - $etag = \OC\Files\Filesystem::getETag(''); - \OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag); + while (!empty($users)) { + $reshareUsers = array(); + foreach ($users as $user) { + // The ETag of the logged in user should already be updated + if ($user !== $uid) { + $etag = \OC\Files\Filesystem::getETag(''); + \OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag); + // Look for reshares + $reshareUsers = array_merge($reshareUsers, \OCP\Share::getUsersItemShared('file', $info['fileid'], $user, true)); + } } + $users = $reshareUsers; } // Correct folders of shared file owner $target = substr($target, 8); From 4cb5cb9693a2b5d13905079f2ba7c6300c26d9b2 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Thu, 7 Mar 2013 10:00:03 -0500 Subject: [PATCH 034/546] itemSource parameter should be fileSource --- apps/files_sharing/lib/updater.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index 030180543c..66f0d30c77 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -85,9 +85,9 @@ class Shared_Updater { */ static public function shareHook($params) { if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { - $id = \OC\Files\Filesystem::getPath($params['itemSource']); + $id = \OC\Files\Filesystem::getPath($params['fileSource']); self::correctFolders($id); } } -} \ No newline at end of file +} From 6e5e8c6b46f24027ee86284844f43e744a3f5f4c Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Thu, 7 Mar 2013 22:30:12 -0500 Subject: [PATCH 035/546] Fix #2080 and fix #2141 --- core/js/share.js | 88 ++++++++++++++++++-------------------------- lib/public/share.php | 25 ++++++++----- 2 files changed, 51 insertions(+), 62 deletions(-) diff --git a/core/js/share.js b/core/js/share.js index 34f24da4df..0b6afda59c 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -10,8 +10,9 @@ OC.Share={ // Load all share icons $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) { if (result && result.status === 'success') { - $.each(result.data, function(item, hasLink) { - OC.Share.statuses[item] = hasLink; + $.each(result.data, function(item, data) { + OC.Share.statuses[item] = data; + var hasLink = data['link']; // Links override shared in terms of icon display if (hasLink) { var image = OC.imagePath('core', 'actions/public'); @@ -21,30 +22,33 @@ OC.Share={ if (itemType != 'file' && itemType != 'folder') { $('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center'); } else { - var file = $('tr').filterAttr('data-file', OC.basename(item)); + var file = $('tr').filterAttr('data-id', item); if (file.length > 0) { var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); var img = action.find('img').attr('src', image); action.addClass('permanent'); action.html(' '+t('core', 'Shared')).prepend(img); - } - var dir = $('#dir').val(); - if (dir.length > 1) { - var last = ''; - var path = dir; - // Search for possible parent folders that are shared - while (path != last) { - if (path == item) { - var action = $('.fileactions .action').filterAttr('data-action', 'Share'); - var img = action.find('img'); - if (img.attr('src') != OC.imagePath('core', 'actions/public')) { - img.attr('src', image); - action.addClass('permanent'); - action.html(' '+t('core', 'Shared')).prepend(img); + } else { + var dir = $('#dir').val(); + if (dir.length > 1) { + var last = ''; + var path = dir; + // Search for possible parent folders that are shared + while (path != last) { + if (path == data['path']) { + var actions = $('.fileactions .action').filterAttr('data-action', 'Share'); + $.each(actions, function(index, action) { + var img = $(action).find('img'); + if (img.attr('src') != OC.imagePath('core', 'actions/public')) { + img.attr('src', image); + $(action).addClass('permanent'); + $(action).html(' '+t('core', 'Shared')).prepend(img); + } + }); } + last = path; + path = OC.Share.dirname(path); } - last = path; - path = OC.Share.dirname(path); } } } @@ -53,15 +57,6 @@ OC.Share={ }); }, updateIcon:function(itemType, itemSource) { - if (itemType == 'file' || itemType == 'folder') { - var file = $('tr').filterAttr('data-id', String(itemSource)); - var filename = file.data('file'); - if ($('#dir').val() == '/') { - itemSource = $('#dir').val() + filename; - } else { - itemSource = $('#dir').val() + '/' + filename; - } - } var shares = false; var link = false; var image = OC.imagePath('core', 'actions/share'); @@ -83,18 +78,21 @@ OC.Share={ if (itemType != 'file' && itemType != 'folder') { $('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center'); } else { - var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); - var img = action.find('img').attr('src', image); - if (shares) { - action.addClass('permanent'); - action.html(' '+t('core', 'Shared')).prepend(img); - } else { - action.removeClass('permanent'); - action.html(' '+t('core', 'Share')).prepend(img); + var file = $('tr').filterAttr('data-id', String(itemSource)); + if (file.length > 0) { + var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); + var img = action.find('img').attr('src', image); + if (shares) { + action.addClass('permanent'); + action.html(' '+t('core', 'Shared')).prepend(img); + } else { + action.removeClass('permanent'); + action.html(' '+t('core', 'Share')).prepend(img); + } } } if (shares) { - OC.Share.statuses[itemSource] = link; + OC.Share.statuses[itemSource]['link'] = link; } else { delete OC.Share.statuses[itemSource]; } @@ -102,21 +100,7 @@ OC.Share={ loadItem:function(itemType, itemSource) { var data = ''; var checkReshare = true; - // Switch file sources to path to check if status is set - if (itemType == 'file' || itemType == 'folder') { - var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file'); - if ($('#dir').val() == '/') { - var item = $('#dir').val() + filename; - } else { - var item = $('#dir').val() + '/' + filename; - } - if (item.substring(0, 8) != '/Shared/') { - checkReshare = false; - } - } else { - var item = itemSource; - } - if (typeof OC.Share.statuses[item] === 'undefined') { + if (typeof OC.Share.statuses[itemSource] === 'undefined') { // NOTE: Check does not always work and misses some shares, fix later checkShares = true; } else { diff --git a/lib/public/share.php b/lib/public/share.php index 59f41a9bfd..d1ae0312bf 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -759,7 +759,7 @@ class Share { if ($format == self::FORMAT_STATUSES) { if ($itemType == 'file' || $itemType == 'folder') { $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,' - .' `share_type`, `file_source`, `path`, `expiration`'; + .' `share_type`, `file_source`, `path`, `expiration`, `storage`'; } else { $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `expiration`'; } @@ -768,7 +768,7 @@ class Share { if ($itemType == 'file' || $itemType == 'folder') { $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,' .' `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`,' - .' `expiration`, `token`'; + .' `expiration`, `token`, `storage`'; } else { $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`,' .' `stime`, `file_source`, `expiration`, `token`'; @@ -804,6 +804,7 @@ class Share { $items = array(); $targets = array(); $switchedItems = array(); + $mounts = array(); while ($row = $result->fetchRow()) { // Filter out duplicate group shares for users with unique targets if ($row['share_type'] == self::$shareTypeGroupUserUnique && isset($items[$row['parent']])) { @@ -848,8 +849,13 @@ class Share { if (isset($row['parent'])) { $row['path'] = '/Shared/'.basename($row['path']); } else { - // Strip 'files' from path - $row['path'] = substr($row['path'], 5); + if (!isset($mounts[$row['storage']])) { + $mounts[$row['storage']] = \OC\Files\Mount::findByNumericId($row['storage']); + } + if ($mounts[$row['storage']]) { + $path = $mounts[$row['storage']]->getMountPoint().$row['path']; + $row['path'] = substr($path, $root); + } } } if (isset($row['expiration'])) { @@ -957,15 +963,14 @@ class Share { return $items; } else if ($format == self::FORMAT_STATUSES) { $statuses = array(); - // Switch column to path for files and folders, used for determining statuses inside of folders - if ($itemType == 'file' || $itemType == 'folder') { - $column = 'path'; - } foreach ($items as $item) { if ($item['share_type'] == self::SHARE_TYPE_LINK) { - $statuses[$item[$column]] = true; + $statuses[$item[$column]]['link'] = true; } else if (!isset($statuses[$item[$column]])) { - $statuses[$item[$column]] = false; + $statuses[$item[$column]]['link'] = false; + } + if ($itemType == 'file' || $itemType == 'folder') { + $statuses[$item[$column]]['path'] = $item['path']; } } return $statuses; From ef2e84026e4c388fb1c91b59079354caa36ad865 Mon Sep 17 00:00:00 2001 From: Myles McNamara Date: Thu, 7 Mar 2013 23:30:56 -0500 Subject: [PATCH 036/546] remove php_value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit php_value can only be used with mod_php, using it with FCGI will cause 500 Internal Server errors.  This needs to be set in php.ini manually or set using ini_set(). --- .htaccess | 1 - 1 file changed, 1 deletion(-) diff --git a/.htaccess b/.htaccess index 616118b2ce..463b49993e 100755 --- a/.htaccess +++ b/.htaccess @@ -1,5 +1,4 @@ -php_value cgi.fix_pathinfo 1 SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1 From 2d00d13a5d8f8607897455befb15c81b651c4db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Fri, 8 Mar 2013 15:13:00 +0100 Subject: [PATCH 037/546] use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated --- apps/files_sharing/appinfo/app.php | 2 +- lib/public/share.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 8f9234c822..5711669815 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -15,4 +15,4 @@ OCP\Util::addScript('files_sharing', 'share'); \OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook'); \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook'); \OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook'); -\OC_Hook::connect('OCP\Share', 'post_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook'); \ No newline at end of file +\OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook'); \ No newline at end of file diff --git a/lib/public/share.php b/lib/public/share.php index 3e5af467d6..bc404e2963 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -406,6 +406,7 @@ class Share { \OC_Hook::emit('OCP\Share', 'pre_unshare', array( 'itemType' => $itemType, 'itemSource' => $itemSource, + 'fileSource' => $item['file_source'], 'shareType' => $shareType, 'shareWith' => $shareWith, )); From 20828488bc99ceb22516367f8c6be02cb300a882 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 8 Mar 2013 10:59:22 -0500 Subject: [PATCH 038/546] Fix share hook for updater --- apps/files_sharing/lib/updater.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index 66f0d30c77..69219db8cb 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -85,8 +85,20 @@ class Shared_Updater { */ static public function shareHook($params) { if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { - $id = \OC\Files\Filesystem::getPath($params['fileSource']); - self::correctFolders($id); + $uidOwner = \OCP\User::getUser(); + $users = \OCP\Share::getUsersItemShared('file', $params['fileSource'], $uidOwner, true); + if (!empty($users)) { + while (!empty($users)) { + $reshareUsers = array(); + foreach ($users as $user) { + $etag = \OC\Files\Filesystem::getETag(''); + \OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag); + // Look for reshares + $reshareUsers = array_merge($reshareUsers, \OCP\Share::getUsersItemShared('file', $params['fileSource'], $user, true)); + } + $users = $reshareUsers; + } + } } } From 9ad03b61a357fa1edb322ffd1aab4d62daa856e5 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Fri, 8 Mar 2013 17:29:05 +0100 Subject: [PATCH 039/546] Update share.js Added HTML escaping --- core/js/share.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/js/share.js b/core/js/share.js index 0b6afda59c..8e767663f1 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -84,10 +84,10 @@ OC.Share={ var img = action.find('img').attr('src', image); if (shares) { action.addClass('permanent'); - action.html(' '+t('core', 'Shared')).prepend(img); + action.html(' '+ escapeHTML(t('core', 'Shared'))).prepend(img); } else { action.removeClass('permanent'); - action.html(' '+t('core', 'Share')).prepend(img); + action.html(' '+ escapeHTML(t('core', 'Share'))).prepend(img); } } } From 02e2f7384eca440ce38cec98808cbd8aeb04e9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Fri, 8 Mar 2013 17:32:04 +0100 Subject: [PATCH 040/546] not only files can be reshared but also folders --- apps/files_sharing/lib/updater.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index 69219db8cb..861025c593 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -86,7 +86,7 @@ class Shared_Updater { static public function shareHook($params) { if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { $uidOwner = \OCP\User::getUser(); - $users = \OCP\Share::getUsersItemShared('file', $params['fileSource'], $uidOwner, true); + $users = \OCP\Share::getUsersItemShared($params['itemType'], $params['fileSource'], $uidOwner, true); if (!empty($users)) { while (!empty($users)) { $reshareUsers = array(); From 1d3beffacf70519d5d9c49b3a7af18faae99a6c4 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 8 Mar 2013 19:08:07 +0100 Subject: [PATCH 041/546] Cache: better rename hook for cache updater --- lib/files/cache/updater.php | 43 ++++++++++++++++++++++++------- tests/lib/files/cache/updater.php | 5 ++-- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/lib/files/cache/updater.php b/lib/files/cache/updater.php index d04541c219..e760ba71bc 100644 --- a/lib/files/cache/updater.php +++ b/lib/files/cache/updater.php @@ -53,12 +53,36 @@ class Updater { } } + static public function renameUpdate($from, $to) { + /** + * @var \OC\Files\Storage\Storage $storageFrom + * @var \OC\Files\Storage\Storage $storageTo + * @var string $internalFrom + * @var string $internalTo + */ + list($storageFrom, $internalFrom) = self::resolvePath($from); + list($storageTo, $internalTo) = self::resolvePath($to); + if ($storageFrom && $storageTo) { + if ($storageFrom === $storageTo) { + $cache = $storageFrom->getCache($internalFrom); + $cache->move($internalFrom, $internalTo); + $cache->correctFolderSize($internalFrom); + $cache->correctFolderSize($internalTo); + self::correctFolder($from, time()); + self::correctFolder($to, time()); + } else { + self::deleteUpdate($from); + self::writeUpdate($to); + } + } + } + /** - * Update the mtime and ETag of all parent folders - * - * @param string $path - * @param string $time - */ + * Update the mtime and ETag of all parent folders + * + * @param string $path + * @param string $time + */ static public function correctFolder($path, $time) { if ($path !== '' && $path !== '/') { $parent = dirname($path); @@ -66,9 +90,9 @@ class Updater { $parent = ''; } /** - * @var \OC\Files\Storage\Storage $storage - * @var string $internalPath - */ + * @var \OC\Files\Storage\Storage $storage + * @var string $internalPath + */ list($storage, $internalPath) = self::resolvePath($parent); if ($storage) { $cache = $storage->getCache(); @@ -92,8 +116,7 @@ class Updater { * @param array $params */ static public function renameHook($params) { - self::deleteUpdate($params['oldpath']); - self::writeUpdate($params['newpath']); + self::renameUpdate($params['oldpath'], $params['newpath']); } /** diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php index 7a79f45a20..aaf932c97f 100644 --- a/tests/lib/files/cache/updater.php +++ b/tests/lib/files/cache/updater.php @@ -54,6 +54,8 @@ class Updater extends \PHPUnit_Framework_TestCase { Filesystem::clearMounts(); Filesystem::mount($this->storage, array(), '/' . self::$user . '/files'); + \OC_Hook::clear('OC_Filesystem'); + \OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook'); \OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook'); \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook'); @@ -137,11 +139,10 @@ class Updater extends \PHPUnit_Framework_TestCase { $this->assertFalse($this->cache->inCache('foo.txt')); $this->assertTrue($this->cache->inCache('bar.txt')); $cachedData = $this->cache->get('bar.txt'); - $this->assertNotEquals($fooCachedData['etag'], $cachedData['etag']); + $this->assertEquals($fooCachedData['fileid'], $cachedData['fileid']); $mtime = $cachedData['mtime']; $cachedData = $this->cache->get(''); $this->assertEquals(3 * $textSize + $imageSize, $cachedData['size']); $this->assertNotEquals($rootCachedData['etag'], $cachedData['etag']); - $this->assertEquals($mtime, $cachedData['mtime']); } } From e743386acffe6cb7de4b8d2dac5aeac70f1a74e0 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 8 Mar 2013 14:27:30 -0500 Subject: [PATCH 042/546] Fix correctFolders and retrieve the correct storage cache --- apps/files_sharing/lib/cache.php | 23 +++++++++++++---------- apps/files_sharing/lib/updater.php | 11 ++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 6f834e0899..9fccd0b46f 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -42,16 +42,19 @@ class Shared_Cache extends Cache { */ private function getSourceCache($target) { $source = \OC_Share_Backend_File::getSource($target); - if (isset($source['path'])) { - $source['path'] = '/' . $source['uid_owner'] . '/' . $source['path']; - \OC\Files\Filesystem::initMountPoints($source['uid_owner']); - list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source['path']); - if ($storage) { - $this->files[$target] = $internalPath; - $cache = $storage->getCache(); - $this->storageId = $storage->getId(); - $this->numericId = $cache->getNumericStorageId(); - return $cache; + if (isset($source['path']) && isset($source['fileOwner'])) { + \OC\Files\Filesystem::initMountPoints($source['fileOwner']); + $mount = \OC\Files\Mount::findByNumericId($source['storage']); + if ($mount) { + $fullPath = $mount->getMountPoint().$source['path']; + list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($fullPath); + if ($storage) { + $this->files[$target] = $internalPath; + $cache = $storage->getCache(); + $this->storageId = $storage->getId(); + $this->numericId = $cache->getNumericStorageId(); + return $cache; + } } } return false; diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php index 861025c593..73e7808f24 100644 --- a/apps/files_sharing/lib/updater.php +++ b/apps/files_sharing/lib/updater.php @@ -38,13 +38,10 @@ class Shared_Updater { while (!empty($users)) { $reshareUsers = array(); foreach ($users as $user) { - // The ETag of the logged in user should already be updated - if ($user !== $uid) { - $etag = \OC\Files\Filesystem::getETag(''); - \OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag); - // Look for reshares - $reshareUsers = array_merge($reshareUsers, \OCP\Share::getUsersItemShared('file', $info['fileid'], $user, true)); - } + $etag = \OC\Files\Filesystem::getETag(''); + \OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag); + // Look for reshares + $reshareUsers = array_merge($reshareUsers, \OCP\Share::getUsersItemShared('file', $info['fileid'], $user, true)); } $users = $reshareUsers; } From 0629ff4dd91b488bd98c35eeff24c5fea50fc30d Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 9 Mar 2013 00:06:34 +0100 Subject: [PATCH 043/546] [tx-robot] updated from transifex --- apps/files/l10n/sl.php | 1 + apps/files_encryption/l10n/sl.php | 3 + apps/files_trashbin/l10n/ca.php | 3 +- apps/files_trashbin/l10n/cs_CZ.php | 3 +- apps/files_trashbin/l10n/de.php | 3 +- apps/files_trashbin/l10n/de_DE.php | 3 +- apps/files_trashbin/l10n/el.php | 3 +- apps/files_trashbin/l10n/eo.php | 3 +- apps/files_trashbin/l10n/es.php | 3 +- apps/files_trashbin/l10n/es_AR.php | 3 +- apps/files_trashbin/l10n/eu.php | 3 +- apps/files_trashbin/l10n/fi_FI.php | 3 +- apps/files_trashbin/l10n/fr.php | 3 +- apps/files_trashbin/l10n/gl.php | 3 +- apps/files_trashbin/l10n/it.php | 3 +- apps/files_trashbin/l10n/ja_JP.php | 3 +- apps/files_trashbin/l10n/lv.php | 3 +- apps/files_trashbin/l10n/nl.php | 3 +- apps/files_trashbin/l10n/pl.php | 3 +- apps/files_trashbin/l10n/pt_BR.php | 3 +- apps/files_trashbin/l10n/pt_PT.php | 3 +- apps/files_trashbin/l10n/ru.php | 3 +- apps/files_trashbin/l10n/ru_RU.php | 3 +- apps/files_trashbin/l10n/sk_SK.php | 3 +- apps/files_trashbin/l10n/sl.php | 11 ++- apps/files_trashbin/l10n/sv.php | 3 +- apps/files_trashbin/l10n/th_TH.php | 3 +- apps/files_trashbin/l10n/uk.php | 3 +- apps/files_trashbin/l10n/vi.php | 3 +- apps/files_trashbin/l10n/zh_CN.php | 3 +- apps/files_trashbin/l10n/zh_TW.php | 3 +- apps/files_versions/l10n/sl.php | 10 +- apps/user_ldap/l10n/sl.php | 9 +- apps/user_webdavauth/l10n/sl.php | 4 +- core/l10n/sl.php | 6 +- l10n/ca/files_trashbin.po | 6 +- l10n/cs_CZ/files_trashbin.po | 6 +- l10n/de/files_trashbin.po | 6 +- l10n/de_DE/files_trashbin.po | 6 +- l10n/el/files_trashbin.po | 6 +- l10n/eo/files_trashbin.po | 6 +- l10n/es/files_trashbin.po | 6 +- l10n/es_AR/files_trashbin.po | 6 +- l10n/eu/files_trashbin.po | 6 +- l10n/fi_FI/files_trashbin.po | 6 +- l10n/fr/files_trashbin.po | 6 +- l10n/gl/files_trashbin.po | 6 +- l10n/it/files_trashbin.po | 6 +- l10n/ja_JP/files_trashbin.po | 6 +- l10n/lv/files_trashbin.po | 6 +- l10n/nl/files_trashbin.po | 6 +- l10n/pl/files_trashbin.po | 6 +- l10n/pt_BR/files_trashbin.po | 6 +- l10n/pt_PT/files_trashbin.po | 6 +- l10n/ru/files_trashbin.po | 6 +- l10n/ru_RU/files_trashbin.po | 6 +- l10n/sk_SK/files_trashbin.po | 6 +- l10n/sl/core.po | 130 +++++++++++++------------- l10n/sl/files.po | 44 ++++----- l10n/sl/files_encryption.po | 13 +-- l10n/sl/files_trashbin.po | 25 ++--- l10n/sl/files_versions.po | 25 ++--- l10n/sl/lib.po | 35 +++---- l10n/sl/settings.po | 127 +++++++++++++------------- l10n/sl/user_ldap.po | 137 ++++++++++++++-------------- l10n/sl/user_webdavauth.po | 13 +-- l10n/sv/files_trashbin.po | 6 +- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 6 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/th_TH/files_trashbin.po | 6 +- l10n/uk/files_trashbin.po | 6 +- l10n/vi/files_trashbin.po | 6 +- l10n/zh_CN/files_trashbin.po | 6 +- l10n/zh_TW/files_trashbin.po | 6 +- lib/l10n/sl.php | 13 ++- settings/l10n/sl.php | 75 ++++++++++++--- 85 files changed, 540 insertions(+), 419 deletions(-) diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index 6458a588ae..a861788459 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -8,6 +8,7 @@ "Missing a temporary folder" => "Manjka začasna mapa", "Failed to write to disk" => "Pisanje na disk je spodletelo", "Files" => "Datoteke", +"Delete permanently" => "Izbriši trajno", "Delete" => "Izbriši", "Rename" => "Preimenuj", "Pending" => "V čakanju ...", diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php index 45272f1ee0..39a5a0d40f 100644 --- a/apps/files_encryption/l10n/sl.php +++ b/apps/files_encryption/l10n/sl.php @@ -1,4 +1,7 @@ "Šifriranje", +"File encryption is enabled." => "Šifriranje datotek je omogočeno.", +"The following file types will not be encrypted:" => "Navedene vrste datotek ne bodo šifrirane:", +"Exclude the following file types from encryption:" => "Izloči navedene vrste datotek med šifriranjem:", "None" => "Brez" ); diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php index 894ed6a729..79ed5f871a 100644 --- a/apps/files_trashbin/l10n/ca.php +++ b/apps/files_trashbin/l10n/ca.php @@ -12,5 +12,6 @@ "{count} files" => "{count} fitxers", "Nothing in here. Your trash bin is empty!" => "La paperera està buida!", "Restore" => "Recupera", -"Delete" => "Esborra" +"Delete" => "Esborra", +"Deleted Files" => "Fitxers eliminats" ); diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php index d32af39877..7fab334b7d 100644 --- a/apps/files_trashbin/l10n/cs_CZ.php +++ b/apps/files_trashbin/l10n/cs_CZ.php @@ -12,5 +12,6 @@ "{count} files" => "{count} soubory", "Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.", "Restore" => "Obnovit", -"Delete" => "Smazat" +"Delete" => "Smazat", +"Deleted Files" => "Smazané soubory" ); diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php index d1952c9635..b1c9e13def 100644 --- a/apps/files_trashbin/l10n/de.php +++ b/apps/files_trashbin/l10n/de.php @@ -12,5 +12,6 @@ "{count} files" => "{count} Dateien", "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, der Papierkorb ist leer!", "Restore" => "Wiederherstellen", -"Delete" => "Löschen" +"Delete" => "Löschen", +"Deleted Files" => "Gelöschte Dateien" ); diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php index 269680ca2c..48d1425ded 100644 --- a/apps/files_trashbin/l10n/de_DE.php +++ b/apps/files_trashbin/l10n/de_DE.php @@ -12,5 +12,6 @@ "{count} files" => "{count} Dateien", "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!", "Restore" => "Wiederherstellen", -"Delete" => "Löschen" +"Delete" => "Löschen", +"Deleted Files" => "gelöschte Dateien" ); diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php index cf9471780c..32e2945686 100644 --- a/apps/files_trashbin/l10n/el.php +++ b/apps/files_trashbin/l10n/el.php @@ -12,5 +12,6 @@ "{count} files" => "{count} αρχεία", "Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!", "Restore" => "Επαναφορά", -"Delete" => "Διαγραφή" +"Delete" => "Διαγραφή", +"Deleted Files" => "Διαγραμμένα Αρχεία" ); diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php index e1e5acbb5a..8e0cc16039 100644 --- a/apps/files_trashbin/l10n/eo.php +++ b/apps/files_trashbin/l10n/eo.php @@ -5,5 +5,6 @@ "1 file" => "1 dosiero", "{count} files" => "{count} dosierujoj", "Restore" => "Restaŭri", -"Delete" => "Forigi" +"Delete" => "Forigi", +"Deleted Files" => "Forigitaj dosieroj" ); diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php index ebc01b1d21..3ae4be92a4 100644 --- a/apps/files_trashbin/l10n/es.php +++ b/apps/files_trashbin/l10n/es.php @@ -12,5 +12,6 @@ "{count} files" => "{count} archivos", "Nothing in here. Your trash bin is empty!" => "Nada aqui. La papelera esta vacia!", "Restore" => "Recuperar", -"Delete" => "Eliminar" +"Delete" => "Eliminar", +"Deleted Files" => "Archivos Eliminados" ); diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php index bb78a39d6c..c18444e73e 100644 --- a/apps/files_trashbin/l10n/es_AR.php +++ b/apps/files_trashbin/l10n/es_AR.php @@ -12,5 +12,6 @@ "{count} files" => "{count} archivos", "Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!", "Restore" => "Recuperar", -"Delete" => "Borrar" +"Delete" => "Borrar", +"Deleted Files" => "Archivos eliminados" ); diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php index 5a565436ed..3622de2694 100644 --- a/apps/files_trashbin/l10n/eu.php +++ b/apps/files_trashbin/l10n/eu.php @@ -12,5 +12,6 @@ "{count} files" => "{count} fitxategi", "Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!", "Restore" => "Berrezarri", -"Delete" => "Ezabatu" +"Delete" => "Ezabatu", +"Deleted Files" => "Ezabatutako Fitxategiak" ); diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php index e18689956d..30aef80556 100644 --- a/apps/files_trashbin/l10n/fi_FI.php +++ b/apps/files_trashbin/l10n/fi_FI.php @@ -12,5 +12,6 @@ "{count} files" => "{count} tiedostoa", "Nothing in here. Your trash bin is empty!" => "Tyhjää täynnä! Roskakorissa ei ole mitään.", "Restore" => "Palauta", -"Delete" => "Poista" +"Delete" => "Poista", +"Deleted Files" => "Poistetut tiedostot" ); diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php index 0a783785ef..092e1e65d1 100644 --- a/apps/files_trashbin/l10n/fr.php +++ b/apps/files_trashbin/l10n/fr.php @@ -12,5 +12,6 @@ "{count} files" => "{count} fichiers", "Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !", "Restore" => "Restaurer", -"Delete" => "Supprimer" +"Delete" => "Supprimer", +"Deleted Files" => "Fichiers effacés" ); diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php index 4e31dd0018..da44b1bee3 100644 --- a/apps/files_trashbin/l10n/gl.php +++ b/apps/files_trashbin/l10n/gl.php @@ -12,5 +12,6 @@ "{count} files" => "{count} ficheiros", "Nothing in here. Your trash bin is empty!" => "Aquí non hai nada. O cesto do lixo está baleiro!", "Restore" => "Restablecer", -"Delete" => "Eliminar" +"Delete" => "Eliminar", +"Deleted Files" => "Ficheiros eliminados" ); diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php index 027b22c91a..14400624ce 100644 --- a/apps/files_trashbin/l10n/it.php +++ b/apps/files_trashbin/l10n/it.php @@ -12,5 +12,6 @@ "{count} files" => "{count} file", "Nothing in here. Your trash bin is empty!" => "Qui non c'è niente. Il tuo cestino è vuoto.", "Restore" => "Ripristina", -"Delete" => "Elimina" +"Delete" => "Elimina", +"Deleted Files" => "File eliminati" ); diff --git a/apps/files_trashbin/l10n/ja_JP.php b/apps/files_trashbin/l10n/ja_JP.php index 478aa40066..a6e4261bc6 100644 --- a/apps/files_trashbin/l10n/ja_JP.php +++ b/apps/files_trashbin/l10n/ja_JP.php @@ -12,5 +12,6 @@ "{count} files" => "{count} ファイル", "Nothing in here. Your trash bin is empty!" => "ここには何もありません。ゴミ箱は空です!", "Restore" => "復元", -"Delete" => "削除" +"Delete" => "削除", +"Deleted Files" => "削除されたファイル" ); diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php index d3c68e2a77..98a734224f 100644 --- a/apps/files_trashbin/l10n/lv.php +++ b/apps/files_trashbin/l10n/lv.php @@ -12,5 +12,6 @@ "{count} files" => "{count} datnes", "Nothing in here. Your trash bin is empty!" => "Šeit nekā nav. Jūsu miskaste ir tukša!", "Restore" => "Atjaunot", -"Delete" => "Dzēst" +"Delete" => "Dzēst", +"Deleted Files" => "Dzēstās datnes" ); diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php index c576e5d81f..b33ee8bc4d 100644 --- a/apps/files_trashbin/l10n/nl.php +++ b/apps/files_trashbin/l10n/nl.php @@ -12,5 +12,6 @@ "{count} files" => "{count} bestanden", "Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!", "Restore" => "Herstellen", -"Delete" => "Verwijder" +"Delete" => "Verwijder", +"Deleted Files" => "Verwijderde bestanden" ); diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php index e5ea45b88a..c3e7fd8e73 100644 --- a/apps/files_trashbin/l10n/pl.php +++ b/apps/files_trashbin/l10n/pl.php @@ -12,5 +12,6 @@ "{count} files" => "{count} pliki", "Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!", "Restore" => "Przywróć", -"Delete" => "Usuń" +"Delete" => "Usuń", +"Deleted Files" => "Usunięte pliki" ); diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php index b9932a7102..dcf58e083c 100644 --- a/apps/files_trashbin/l10n/pt_BR.php +++ b/apps/files_trashbin/l10n/pt_BR.php @@ -12,5 +12,6 @@ "{count} files" => "{count} arquivos", "Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!", "Restore" => "Restaurar", -"Delete" => "Excluir" +"Delete" => "Excluir", +"Deleted Files" => "Arquivos Apagados" ); diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php index a621587ea0..f1dc71b44e 100644 --- a/apps/files_trashbin/l10n/pt_PT.php +++ b/apps/files_trashbin/l10n/pt_PT.php @@ -12,5 +12,6 @@ "{count} files" => "{count} ficheiros", "Nothing in here. Your trash bin is empty!" => "Não ha ficheiros. O lixo está vazio", "Restore" => "Restaurar", -"Delete" => "Apagar" +"Delete" => "Apagar", +"Deleted Files" => "Ficheiros Apagados" ); diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php index 4cf9af1fc3..ef493ddcbe 100644 --- a/apps/files_trashbin/l10n/ru.php +++ b/apps/files_trashbin/l10n/ru.php @@ -12,5 +12,6 @@ "{count} files" => "{count} файлов", "Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!", "Restore" => "Восстановить", -"Delete" => "Удалить" +"Delete" => "Удалить", +"Deleted Files" => "Удаленные файлы" ); diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php index 04a899bdd5..9c79c7fba6 100644 --- a/apps/files_trashbin/l10n/ru_RU.php +++ b/apps/files_trashbin/l10n/ru_RU.php @@ -12,5 +12,6 @@ "{count} files" => "{количество} файлов", "Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!", "Restore" => "Восстановить", -"Delete" => "Удалить" +"Delete" => "Удалить", +"Deleted Files" => "Удаленные файлы" ); diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php index c5806a5dee..b7ca91b1c5 100644 --- a/apps/files_trashbin/l10n/sk_SK.php +++ b/apps/files_trashbin/l10n/sk_SK.php @@ -12,5 +12,6 @@ "{count} files" => "{count} súborov", "Nothing in here. Your trash bin is empty!" => "Žiadny obsah. Kôš je prázdny!", "Restore" => "Obnoviť", -"Delete" => "Zmazať" +"Delete" => "Zmazať", +"Deleted Files" => "Zmazané súbory" ); diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php index 4765945747..04fd13763f 100644 --- a/apps/files_trashbin/l10n/sl.php +++ b/apps/files_trashbin/l10n/sl.php @@ -1,8 +1,17 @@ "Datoteke %s ni mogoče trajno izbrisati.", +"Couldn't restore %s" => "Ni mogoče obnoviti %s", +"perform restore operation" => "izvedi opravilo obnavljanja", +"delete file permanently" => "izbriši datoteko trajno", +"Delete permanently" => "Izbriši trajno", "Name" => "Ime", +"Deleted" => "izbrisano", "1 folder" => "1 mapa", "{count} folders" => "{count} map", "1 file" => "1 datoteka", "{count} files" => "{count} datotek", -"Delete" => "Izbriši" +"Nothing in here. Your trash bin is empty!" => "Mapa smeti je prazna.", +"Restore" => "Obnovi", +"Delete" => "Izbriši", +"Deleted Files" => "Izbrisane datoteke" ); diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php index 6f8c236581..15128e5f77 100644 --- a/apps/files_trashbin/l10n/sv.php +++ b/apps/files_trashbin/l10n/sv.php @@ -12,5 +12,6 @@ "{count} files" => "{count} filer", "Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!", "Restore" => "Återskapa", -"Delete" => "Radera" +"Delete" => "Radera", +"Deleted Files" => "Raderade filer" ); diff --git a/apps/files_trashbin/l10n/th_TH.php b/apps/files_trashbin/l10n/th_TH.php index 3f5d44c763..e2875feaa3 100644 --- a/apps/files_trashbin/l10n/th_TH.php +++ b/apps/files_trashbin/l10n/th_TH.php @@ -8,5 +8,6 @@ "{count} files" => "{count} ไฟล์", "Nothing in here. Your trash bin is empty!" => "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่", "Restore" => "คืนค่า", -"Delete" => "ลบ" +"Delete" => "ลบ", +"Deleted Files" => "ไฟล์ที่ลบทิ้ง" ); diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php index df7dd24864..e0f22d4387 100644 --- a/apps/files_trashbin/l10n/uk.php +++ b/apps/files_trashbin/l10n/uk.php @@ -12,5 +12,6 @@ "{count} files" => "{count} файлів", "Nothing in here. Your trash bin is empty!" => "Нічого немає. Ваший кошик для сміття пустий!", "Restore" => "Відновити", -"Delete" => "Видалити" +"Delete" => "Видалити", +"Deleted Files" => "Видалено Файлів" ); diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php index 165fa9cfd9..7bc1fd237d 100644 --- a/apps/files_trashbin/l10n/vi.php +++ b/apps/files_trashbin/l10n/vi.php @@ -12,5 +12,6 @@ "{count} files" => "{count} tập tin", "Nothing in here. Your trash bin is empty!" => "Không có gì ở đây. Thùng rác của bạn rỗng!", "Restore" => "Khôi phục", -"Delete" => "Xóa" +"Delete" => "Xóa", +"Deleted Files" => "File đã xóa" ); diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php index 327a3e2470..17bbe93f2b 100644 --- a/apps/files_trashbin/l10n/zh_CN.php +++ b/apps/files_trashbin/l10n/zh_CN.php @@ -4,5 +4,6 @@ "{count} folders" => "{count} 个文件夹", "1 file" => "1 个文件", "{count} files" => "{count} 个文件", -"Delete" => "删除" +"Delete" => "删除", +"Deleted Files" => "已删除文件" ); diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php index 0142e901f5..baa3c0c1ad 100644 --- a/apps/files_trashbin/l10n/zh_TW.php +++ b/apps/files_trashbin/l10n/zh_TW.php @@ -5,5 +5,6 @@ "{count} folders" => "{count} 個資料夾", "1 file" => "1 個檔案", "{count} files" => "{count} 個檔案", -"Delete" => "刪除" +"Delete" => "刪除", +"Deleted Files" => "已刪除的檔案" ); diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php index b6ad6a1e9b..d6dfbee6aa 100644 --- a/apps/files_versions/l10n/sl.php +++ b/apps/files_versions/l10n/sl.php @@ -1,3 +1,11 @@ "Starejših različic ni na voljo" +"Could not revert: %s" => "Ni mogoče povrniti: %s", +"success" => "uspešno", +"File %s was reverted to version %s" => "Datoteka %s je povrnjena na različico %s.", +"failure" => "spodletelo", +"File %s could not be reverted to version %s" => "Datoteka %s ni mogoče povrniti na različico %s.", +"No old versions available" => "Ni starejših različic.", +"No path specified" => "Ni določene poti", +"Versions" => "Različice", +"Revert a file to a previous version by clicking on its revert button" => "Povrni datoteko na predhodno različico s klikom na gumb za povrnitev." ); diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php index e1734a9078..6e581bbe88 100644 --- a/apps/user_ldap/l10n/sl.php +++ b/apps/user_ldap/l10n/sl.php @@ -1,12 +1,13 @@ "Brisanje je spodletelo.", +"Keep settings?" => "Ali nas se nastavitve ohranijo?", "Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Opozorilo: Aplikaciji user_ldap in user_webdavauth nista združljivi. Morda boste opazili nepričakovano obnašanje sistema. Prosimo, prosite vašega skrbnika, da eno od aplikacij onemogoči.", "Host" => "Gostitelj", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://", "Base DN" => "Osnovni DN", -"You can specify Base DN for users and groups in the Advanced tab" => "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno", +"You can specify Base DN for users and groups in the Advanced tab" => "Osnovni DN za uporabnike in skupine lahko določite v zavihku naprednih možnosti.", "User DN" => "Uporabnik DN", -"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop sta polji DN in geslo prazni.", +"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za brezimni dostop sta polji DN in geslo prazni.", "Password" => "Geslo", "For anonymous access, leave DN and Password empty." => "Za anonimni dostop sta polji DN in geslo prazni.", "User Login Filter" => "Filter prijav uporabnikov", @@ -18,6 +19,7 @@ "Group Filter" => "Filter skupin", "Defines the filter to apply, when retrieving groups." => "Določi filter za uporabo med pridobivanjem skupin.", "without any placeholder, e.g. \"objectClass=posixGroup\"." => "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\".", +"Connection Settings" => "Nastavitve povezave", "Port" => "Vrata", "Use TLS" => "Uporabi TLS", "Case insensitve LDAP server (Windows)" => "Strežnik LDAP ne upošteva velikosti črk (Windows)", @@ -25,6 +27,7 @@ "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "V primeru, da povezava deluje le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud.", "Not recommended, use for testing only." => "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja.", "in seconds. A change empties the cache." => "v sekundah. Sprememba izprazni predpomnilnik.", +"Directory Settings" => "Nastavitve mape", "User Display Name Field" => "Polje za uporabnikovo prikazano ime", "The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud.", "Base User Tree" => "Osnovno uporabniško drevo", @@ -32,7 +35,9 @@ "The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud.", "Base Group Tree" => "Osnovno drevo skupine", "Group-Member association" => "Povezava člana skupine", +"Special Attributes" => "Posebni atributi", "in bytes" => "v bajtih", +"Email Field" => "Polje elektronske pošte", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite atribut LDAP/AD.", "Help" => "Pomoč" ); diff --git a/apps/user_webdavauth/l10n/sl.php b/apps/user_webdavauth/l10n/sl.php index 245a510134..dec593252f 100644 --- a/apps/user_webdavauth/l10n/sl.php +++ b/apps/user_webdavauth/l10n/sl.php @@ -1,3 +1,5 @@ "URL: http://" +"WebDAV Authentication" => "Overitev WebDAV", +"URL: http://" => "URL: http://", +"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Sistem ownCloud bo poslal uporabniška poverila na naveden naslov URL. Ta vstavek preveri odziv in tolmači kode stanja HTTP 401 in HTTP 403 kot spodletel odgovor in vse ostale odzive kot veljavna poverila." ); diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 2b5b02191e..af9f7badc6 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -5,6 +5,7 @@ "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s", "Category type not provided." => "Vrsta kategorije ni podana.", "No category to add?" => "Ni kategorije za dodajanje?", +"This category already exists: %s" => "Kategorija že obstaja: %s", "Object type not provided." => "Vrsta predmeta ni podana.", "%s ID not provided." => "%s ID ni podan.", "Error adding %s to favorites." => "Napaka pri dodajanju %s med priljubljene.", @@ -52,6 +53,7 @@ "Error" => "Napaka", "The app name is not specified." => "Ime aplikacije ni podano.", "The required file {file} is not installed!" => "Zahtevana datoteka {file} ni nameščena!", +"Shared" => "V souporabi", "Share" => "Souporaba", "Error while sharing" => "Napaka med souporabo", "Error while unsharing" => "Napaka med odstranjevanjem souporabe", @@ -124,6 +126,8 @@ "Lost your password?" => "Ali ste pozabili geslo?", "remember" => "Zapomni si me", "Log in" => "Prijava", +"Alternative Logins" => "Druge prijavne možnosti", "prev" => "nazaj", -"next" => "naprej" +"next" => "naprej", +"Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na različico %s je lahko dolgotrajno." ); diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po index cc147c1f7f..5b2e39179c 100644 --- a/l10n/ca/files_trashbin.po +++ b/l10n/ca/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Esborra" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Fitxers eliminats" diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po index 95843b88de..3f6246643a 100644 --- a/l10n/cs_CZ/files_trashbin.po +++ b/l10n/cs_CZ/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Smazat" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Smazané soubory" diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po index ceb8a6faea..ef49bcedfa 100644 --- a/l10n/de/files_trashbin.po +++ b/l10n/de/files_trashbin.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -81,4 +81,4 @@ msgstr "Löschen" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Gelöschte Dateien" diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po index 447c37a5ed..cc95fb352c 100644 --- a/l10n/de_DE/files_trashbin.po +++ b/l10n/de_DE/files_trashbin.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Germany) \n" "MIME-Version: 1.0\n" @@ -84,4 +84,4 @@ msgstr "Löschen" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "gelöschte Dateien" diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po index e47d9c1615..584be8fdd4 100644 --- a/l10n/el/files_trashbin.po +++ b/l10n/el/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:41+0000\n" "Last-Translator: I Robot \n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Διαγραφή" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Διαγραμμένα Αρχεία" diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po index 783a5f733f..a81fb19475 100644 --- a/l10n/eo/files_trashbin.po +++ b/l10n/eo/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -77,4 +77,4 @@ msgstr "Forigi" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Forigitaj dosieroj" diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po index c0b5a2c7ec..0830457367 100644 --- a/l10n/es/files_trashbin.po +++ b/l10n/es/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Eliminar" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Archivos Eliminados" diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po index ad68177e2e..d2db48c94d 100644 --- a/l10n/es_AR/files_trashbin.po +++ b/l10n/es_AR/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Borrar" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Archivos eliminados" diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po index 1e340f1ca1..484e0d33ed 100644 --- a/l10n/eu/files_trashbin.po +++ b/l10n/eu/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:41+0000\n" "Last-Translator: I Robot \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Ezabatu" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Ezabatutako Fitxategiak" diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po index 482678d9c7..2a92c69293 100644 --- a/l10n/fi_FI/files_trashbin.po +++ b/l10n/fi_FI/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:41+0000\n" "Last-Translator: I Robot \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Poista" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Poistetut tiedostot" diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po index 4b183165c7..c5304882a5 100644 --- a/l10n/fr/files_trashbin.po +++ b/l10n/fr/files_trashbin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:41+0000\n" "Last-Translator: I Robot \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -79,4 +79,4 @@ msgstr "Supprimer" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Fichiers effacés" diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po index 6f1595820d..59b976f980 100644 --- a/l10n/gl/files_trashbin.po +++ b/l10n/gl/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Eliminar" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Ficheiros eliminados" diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po index b2baa9ac7a..3abe485a28 100644 --- a/l10n/it/files_trashbin.po +++ b/l10n/it/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:41+0000\n" "Last-Translator: I Robot \n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Elimina" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "File eliminati" diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po index 842098d522..3d87ec0682 100644 --- a/l10n/ja_JP/files_trashbin.po +++ b/l10n/ja_JP/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "削除" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "削除されたファイル" diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po index 14de7d18f6..a15568a44e 100644 --- a/l10n/lv/files_trashbin.po +++ b/l10n/lv/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:41+0000\n" "Last-Translator: I Robot \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Dzēst" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Dzēstās datnes" diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po index a20ba8e0e4..1d6b5c7cdb 100644 --- a/l10n/nl/files_trashbin.po +++ b/l10n/nl/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:41+0000\n" "Last-Translator: I Robot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Verwijder" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Verwijderde bestanden" diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po index a226bea747..d33ebb0042 100644 --- a/l10n/pl/files_trashbin.po +++ b/l10n/pl/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Usuń" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Usunięte pliki" diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po index 71df0cbd86..d016d12f4f 100644 --- a/l10n/pt_BR/files_trashbin.po +++ b/l10n/pt_BR/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Excluir" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Arquivos Apagados" diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po index abd247504d..b7c57b0cf0 100644 --- a/l10n/pt_PT/files_trashbin.po +++ b/l10n/pt_PT/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Apagar" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Ficheiros Apagados" diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po index b30bcd85ec..339575a0bc 100644 --- a/l10n/ru/files_trashbin.po +++ b/l10n/ru/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Удалить" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Удаленные файлы" diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po index 5d35237936..cb950a5b53 100644 --- a/l10n/ru_RU/files_trashbin.po +++ b/l10n/ru_RU/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:41+0000\n" "Last-Translator: I Robot \n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Удалить" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Удаленные файлы" diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po index 9e51dd8cd2..15a570d462 100644 --- a/l10n/sk_SK/files_trashbin.po +++ b/l10n/sk_SK/files_trashbin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -79,4 +79,4 @@ msgstr "Zmazať" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Zmazané súbory" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index 3237325869..7c254cfc0d 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/core.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <>, 2013. # <>, 2012. # , 2012. # Peter Peroša , 2012. @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-22 00:06+0100\n" -"PO-Revision-Date: 2013-02-20 23:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-08 21:20+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,24 +22,24 @@ msgstr "" "Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -#: ajax/share.php:85 +#: ajax/share.php:97 #, php-format msgid "User %s shared a file with you" msgstr "Uporanik %s je dal datoteko v souporabo z vami" -#: ajax/share.php:87 +#: ajax/share.php:99 #, php-format msgid "User %s shared a folder with you" msgstr "Uporanik %s je dal mapo v souporabo z vami" -#: ajax/share.php:89 +#: ajax/share.php:101 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" msgstr "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s" -#: ajax/share.php:91 +#: ajax/share.php:104 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " @@ -56,7 +57,7 @@ msgstr "Ni kategorije za dodajanje?" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "Kategorija že obstaja: %s" #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 @@ -84,79 +85,79 @@ msgstr "Za izbris ni izbrana nobena kategorija." msgid "Error removing %s from favorites." msgstr "Napaka pri odstranjevanju %s iz priljubljenih." -#: js/config.php:32 +#: js/config.php:34 msgid "Sunday" msgstr "nedelja" -#: js/config.php:32 +#: js/config.php:35 msgid "Monday" msgstr "ponedeljek" -#: js/config.php:32 +#: js/config.php:36 msgid "Tuesday" msgstr "torek" -#: js/config.php:32 +#: js/config.php:37 msgid "Wednesday" msgstr "sreda" -#: js/config.php:32 +#: js/config.php:38 msgid "Thursday" msgstr "četrtek" -#: js/config.php:32 +#: js/config.php:39 msgid "Friday" msgstr "petek" -#: js/config.php:32 +#: js/config.php:40 msgid "Saturday" msgstr "sobota" -#: js/config.php:33 +#: js/config.php:45 msgid "January" msgstr "januar" -#: js/config.php:33 +#: js/config.php:46 msgid "February" msgstr "februar" -#: js/config.php:33 +#: js/config.php:47 msgid "March" msgstr "marec" -#: js/config.php:33 +#: js/config.php:48 msgid "April" msgstr "april" -#: js/config.php:33 +#: js/config.php:49 msgid "May" msgstr "maj" -#: js/config.php:33 +#: js/config.php:50 msgid "June" msgstr "junij" -#: js/config.php:33 +#: js/config.php:51 msgid "July" msgstr "julij" -#: js/config.php:33 +#: js/config.php:52 msgid "August" msgstr "avgust" -#: js/config.php:33 +#: js/config.php:53 msgid "September" msgstr "september" -#: js/config.php:33 +#: js/config.php:54 msgid "October" msgstr "oktober" -#: js/config.php:33 +#: js/config.php:55 msgid "November" msgstr "november" -#: js/config.php:33 +#: js/config.php:56 msgid "December" msgstr "december" @@ -164,55 +165,55 @@ msgstr "december" msgid "Settings" msgstr "Nastavitve" -#: js/js.js:767 +#: js/js.js:777 msgid "seconds ago" msgstr "pred nekaj sekundami" -#: js/js.js:768 +#: js/js.js:778 msgid "1 minute ago" msgstr "pred minuto" -#: js/js.js:769 +#: js/js.js:779 msgid "{minutes} minutes ago" msgstr "pred {minutes} minutami" -#: js/js.js:770 +#: js/js.js:780 msgid "1 hour ago" msgstr "pred 1 uro" -#: js/js.js:771 +#: js/js.js:781 msgid "{hours} hours ago" msgstr "pred {hours} urami" -#: js/js.js:772 +#: js/js.js:782 msgid "today" msgstr "danes" -#: js/js.js:773 +#: js/js.js:783 msgid "yesterday" msgstr "včeraj" -#: js/js.js:774 +#: js/js.js:784 msgid "{days} days ago" msgstr "pred {days} dnevi" -#: js/js.js:775 +#: js/js.js:785 msgid "last month" msgstr "zadnji mesec" -#: js/js.js:776 +#: js/js.js:786 msgid "{months} months ago" msgstr "pred {months} meseci" -#: js/js.js:777 +#: js/js.js:787 msgid "months ago" msgstr "mesecev nazaj" -#: js/js.js:778 +#: js/js.js:788 msgid "last year" msgstr "lansko leto" -#: js/js.js:779 +#: js/js.js:789 msgid "years ago" msgstr "let nazaj" @@ -257,7 +258,7 @@ msgstr "Zahtevana datoteka {file} ni nameščena!" #: js/share.js:29 js/share.js:43 js/share.js:90 msgid "Shared" -msgstr "" +msgstr "V souporabi" #: js/share.js:93 msgid "Share" @@ -295,7 +296,7 @@ msgstr "Omogoči souporabo s povezavo" msgid "Password protect" msgstr "Zaščiti z geslom" -#: js/share.js:185 templates/installation.php:44 templates/login.php:35 +#: js/share.js:185 templates/installation.php:47 templates/login.php:35 msgid "Password" msgstr "Geslo" @@ -410,7 +411,7 @@ msgstr "E-pošta za ponastavitev je bila poslana." msgid "Request failed!" msgstr "Zahtevek je spodletel!" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41 #: templates/login.php:28 msgid "Username" msgstr "Uporabniško Ime" @@ -471,85 +472,86 @@ msgstr "Uredi kategorije" msgid "Add" msgstr "Dodaj" -#: templates/installation.php:23 templates/installation.php:30 +#: templates/installation.php:24 templates/installation.php:31 msgid "Security Warning" msgstr "Varnostno opozorilo" -#: templates/installation.php:24 +#: templates/installation.php:25 msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." msgstr "Na voljo ni varnega generatorja naključnih števil. Prosimo, če omogočite PHP OpenSSL razširitev." -#: templates/installation.php:25 +#: templates/installation.php:26 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." msgstr "Brez varnega generatorja naključnih števil lahko napadalec napove žetone za ponastavitev gesla, kar mu omogoča, da prevzame vaš ​​račun." -#: templates/installation.php:31 +#: templates/installation.php:32 msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." msgstr "" -#: templates/installation.php:32 +#: templates/installation.php:33 msgid "" "For information how to properly configure your server, please see the documentation." msgstr "" -#: templates/installation.php:36 +#: templates/installation.php:37 msgid "Create an admin account" msgstr "Ustvari skrbniški račun" -#: templates/installation.php:52 +#: templates/installation.php:55 msgid "Advanced" msgstr "Napredne možnosti" -#: templates/installation.php:54 +#: templates/installation.php:57 msgid "Data folder" msgstr "Mapa s podatki" -#: templates/installation.php:61 +#: templates/installation.php:66 msgid "Configure the database" msgstr "Nastavi podatkovno zbirko" -#: templates/installation.php:66 templates/installation.php:77 -#: templates/installation.php:87 templates/installation.php:97 +#: templates/installation.php:71 templates/installation.php:83 +#: templates/installation.php:94 templates/installation.php:105 +#: templates/installation.php:117 msgid "will be used" msgstr "bo uporabljen" -#: templates/installation.php:109 +#: templates/installation.php:129 msgid "Database user" msgstr "Uporabnik zbirke" -#: templates/installation.php:113 +#: templates/installation.php:134 msgid "Database password" msgstr "Geslo podatkovne zbirke" -#: templates/installation.php:117 +#: templates/installation.php:139 msgid "Database name" msgstr "Ime podatkovne zbirke" -#: templates/installation.php:125 +#: templates/installation.php:149 msgid "Database tablespace" msgstr "Razpredelnica podatkovne zbirke" -#: templates/installation.php:131 +#: templates/installation.php:156 msgid "Database host" msgstr "Gostitelj podatkovne zbirke" -#: templates/installation.php:136 +#: templates/installation.php:162 msgid "Finish setup" msgstr "Dokončaj namestitev" -#: templates/layout.guest.php:33 +#: templates/layout.guest.php:40 msgid "web services under your control" msgstr "spletne storitve pod vašim nadzorom" -#: templates/layout.user.php:48 +#: templates/layout.user.php:58 msgid "Log out" msgstr "Odjava" @@ -581,7 +583,7 @@ msgstr "Prijava" #: templates/login.php:49 msgid "Alternative Logins" -msgstr "" +msgstr "Druge prijavne možnosti" #: templates/part.pagenavi.php:3 msgid "prev" @@ -594,4 +596,4 @@ msgstr "naprej" #: templates/update.php:3 #, php-format msgid "Updating ownCloud to version %s, this may take a while." -msgstr "" +msgstr "Posodabljanje sistema ownCloud na različico %s je lahko dolgotrajno." diff --git a/l10n/sl/files.po b/l10n/sl/files.po index 4ba12451df..9d68e7359b 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-08 21:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -84,7 +84,7 @@ msgstr "Datoteke" #: js/fileactions.js:125 msgid "Delete permanently" -msgstr "" +msgstr "Izbriši trajno" #: js/fileactions.js:127 templates/index.php:92 templates/index.php:93 msgid "Delete" @@ -94,8 +94,8 @@ msgstr "Izbriši" msgid "Rename" msgstr "Preimenuj" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 -#: js/files.js:439 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409 +#: js/files.js:440 msgid "Pending" msgstr "V čakanju ..." @@ -149,74 +149,74 @@ msgstr "" msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:225 +#: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:262 +#: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov." -#: js/files.js:262 +#: js/files.js:263 msgid "Upload Error" msgstr "Napaka med nalaganjem" -#: js/files.js:273 +#: js/files.js:274 msgid "Close" msgstr "Zapri" -#: js/files.js:312 +#: js/files.js:313 msgid "1 file uploading" msgstr "Pošiljanje 1 datoteke" -#: js/files.js:315 js/files.js:370 js/files.js:385 +#: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" msgstr "nalagam {count} datotek" -#: js/files.js:388 js/files.js:423 +#: js/files.js:389 js/files.js:424 msgid "Upload cancelled." msgstr "Pošiljanje je preklicano." -#: js/files.js:497 +#: js/files.js:498 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano." -#: js/files.js:570 +#: js/files.js:571 msgid "URL cannot be empty." msgstr "Naslov URL ne sme biti prazen." -#: js/files.js:575 +#: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "" -#: js/files.js:953 templates/index.php:68 +#: js/files.js:954 templates/index.php:68 msgid "Name" msgstr "Ime" -#: js/files.js:954 templates/index.php:79 +#: js/files.js:955 templates/index.php:79 msgid "Size" msgstr "Velikost" -#: js/files.js:955 templates/index.php:81 +#: js/files.js:956 templates/index.php:81 msgid "Modified" msgstr "Spremenjeno" -#: js/files.js:974 +#: js/files.js:975 msgid "1 folder" msgstr "1 mapa" -#: js/files.js:976 +#: js/files.js:977 msgid "{count} folders" msgstr "{count} map" -#: js/files.js:984 +#: js/files.js:985 msgid "1 file" msgstr "1 datoteka" -#: js/files.js:986 +#: js/files.js:987 msgid "{count} files" msgstr "{count} datotek" diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po index 86d2a0d7d3..f35ef4641d 100644 --- a/l10n/sl/files_encryption.po +++ b/l10n/sl/files_encryption.po @@ -4,14 +4,15 @@ # # Translators: # <>, 2012. +# Matej Urbančič <>, 2013. # Peter Peroša , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-10 00:08+0100\n" -"PO-Revision-Date: 2013-02-09 23:09+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-08 21:52+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,15 +26,15 @@ msgstr "Šifriranje" #: templates/settings-personal.php:7 msgid "File encryption is enabled." -msgstr "" +msgstr "Šifriranje datotek je omogočeno." #: templates/settings-personal.php:11 msgid "The following file types will not be encrypted:" -msgstr "" +msgstr "Navedene vrste datotek ne bodo šifrirane:" #: templates/settings.php:7 msgid "Exclude the following file types from encryption:" -msgstr "" +msgstr "Izloči navedene vrste datotek med šifriranjem:" #: templates/settings.php:12 msgid "None" diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po index 6731c6eb2b..bff8d31296 100644 --- a/l10n/sl/files_trashbin.po +++ b/l10n/sl/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-08 21:40+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,24 +21,24 @@ msgstr "" #: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" -msgstr "" +msgstr "Datoteke %s ni mogoče trajno izbrisati." #: ajax/undelete.php:41 #, php-format msgid "Couldn't restore %s" -msgstr "" +msgstr "Ni mogoče obnoviti %s" #: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" -msgstr "" +msgstr "izvedi opravilo obnavljanja" #: js/trash.js:34 msgid "delete file permanently" -msgstr "" +msgstr "izbriši datoteko trajno" #: js/trash.js:121 msgid "Delete permanently" -msgstr "" +msgstr "Izbriši trajno" #: js/trash.js:174 templates/index.php:17 msgid "Name" @@ -45,7 +46,7 @@ msgstr "Ime" #: js/trash.js:175 templates/index.php:27 msgid "Deleted" -msgstr "" +msgstr "izbrisano" #: js/trash.js:184 msgid "1 folder" @@ -65,11 +66,11 @@ msgstr "{count} datotek" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" -msgstr "" +msgstr "Mapa smeti je prazna." #: templates/index.php:20 templates/index.php:22 msgid "Restore" -msgstr "" +msgstr "Obnovi" #: templates/index.php:30 templates/index.php:31 msgid "Delete" @@ -77,4 +78,4 @@ msgstr "Izbriši" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Izbrisane datoteke" diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po index d2588528b0..a5026ce9b2 100644 --- a/l10n/sl/files_versions.po +++ b/l10n/sl/files_versions.po @@ -4,14 +4,15 @@ # # Translators: # <>, 2012. +# Matej Urbančič <>, 2013. # Peter Peroša , 2012-2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-03 00:05+0100\n" -"PO-Revision-Date: 2013-03-02 08:31+0000\n" -"Last-Translator: Peter Peroša \n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-08 21:30+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,38 +23,38 @@ msgstr "" #: ajax/rollbackVersion.php:15 #, php-format msgid "Could not revert: %s" -msgstr "" +msgstr "Ni mogoče povrniti: %s" #: history.php:40 msgid "success" -msgstr "" +msgstr "uspešno" #: history.php:42 #, php-format msgid "File %s was reverted to version %s" -msgstr "" +msgstr "Datoteka %s je povrnjena na različico %s." #: history.php:49 msgid "failure" -msgstr "" +msgstr "spodletelo" #: history.php:51 #, php-format msgid "File %s could not be reverted to version %s" -msgstr "" +msgstr "Datoteka %s ni mogoče povrniti na različico %s." #: history.php:69 msgid "No old versions available" -msgstr "Starejših različic ni na voljo" +msgstr "Ni starejših različic." #: history.php:74 msgid "No path specified" -msgstr "" +msgstr "Ni določene poti" #: js/versions.js:6 msgid "Versions" -msgstr "" +msgstr "Različice" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" -msgstr "" +msgstr "Povrni datoteko na predhodno različico s klikom na gumb za povrnitev." diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po index 620819da9f..fbe59ad8f5 100644 --- a/l10n/sl/lib.po +++ b/l10n/sl/lib.po @@ -4,14 +4,15 @@ # # Translators: # <>, 2012. +# Matej Urbančič <>, 2013. # Peter Peroša , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-08 22:10+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,25 +44,25 @@ msgstr "Programi" msgid "Admin" msgstr "Skrbništvo" -#: files.php:202 +#: files.php:209 msgid "ZIP download is turned off." msgstr "Prejem datotek ZIP je onemogočen." -#: files.php:203 +#: files.php:210 msgid "Files need to be downloaded one by one." -msgstr "Datoteke je mogoče prejeti le posamič." +msgstr "Datoteke je mogoče prejeti le posamično." -#: files.php:204 files.php:231 +#: files.php:211 files.php:244 msgid "Back to Files" msgstr "Nazaj na datoteke" -#: files.php:228 +#: files.php:241 msgid "Selected files too large to generate zip file." msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip." #: helper.php:228 msgid "couldn't be determined" -msgstr "" +msgstr "ni mogoče določiti" #: json.php:28 msgid "Application is not enabled" @@ -73,7 +74,7 @@ msgstr "Napaka overitve" #: json.php:51 msgid "Token expired. Please reload page." -msgstr "Žeton je potekel. Spletišče je traba znova naložiti." +msgstr "Žeton je potekel. Stran je treba ponovno naložiti." #: search/provider/file.php:17 search/provider/file.php:35 msgid "Files" @@ -89,15 +90,15 @@ msgstr "Slike" #: setup.php:34 msgid "Set an admin username." -msgstr "" +msgstr "Nastavi uporabniško ime skrbnika." #: setup.php:37 msgid "Set an admin password." -msgstr "" +msgstr "Nastavi geslo skrbnika." #: setup.php:40 msgid "Specify a data folder." -msgstr "" +msgstr "Določi podatkovno mapo." #: setup.php:55 #, php-format @@ -141,7 +142,7 @@ msgstr "" #: setup.php:610 #, php-format msgid "DB Error: \"%s\"" -msgstr "" +msgstr "Napaka podatkovne zbirke: \"%s\"" #: setup.php:283 setup.php:387 setup.php:396 setup.php:414 setup.php:424 #: setup.php:433 setup.php:462 setup.php:528 setup.php:554 setup.php:561 @@ -182,12 +183,12 @@ msgstr "" msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena." #: setup.php:850 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Preverite navodila namestitve." #: template.php:113 msgid "seconds ago" @@ -257,4 +258,4 @@ msgstr "preverjanje za posodobitve je onemogočeno" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "Kategorije \"%s\" ni bilo mogoče najti." +msgstr "Kategorije \"%s\" ni mogoče najti." diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index 3eb120c5f5..e000105776 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/settings.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <>, 2013. # <>, 2012. # , 2012. # Peter Peroša , 2012-2013. @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 08:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-08 21:30+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "Napaka overitve" #: ajax/changedisplayname.php:32 msgid "Unable to change display name" -msgstr "" +msgstr "Prikazanega imena ni mogoče spremeniti." #: ajax/creategroup.php:10 msgid "Group already exists" @@ -40,7 +41,7 @@ msgstr "Skupina že obstaja" #: ajax/creategroup.php:19 msgid "Unable to add group" -msgstr "Ni mogoče dodati skupine" +msgstr "Skupine ni mogoče dodati" #: ajax/enableapp.php:11 msgid "Could not enable app. " @@ -56,15 +57,15 @@ msgstr "Neveljaven elektronski naslov" #: ajax/removegroup.php:13 msgid "Unable to delete group" -msgstr "Ni mogoče izbrisati skupine" +msgstr "Skupine ni mogoče izbrisati" #: ajax/removeuser.php:24 msgid "Unable to delete user" -msgstr "Ni mogoče izbrisati uporabnika" +msgstr "Uporabnika ni mogoče izbrisati" #: ajax/setlanguage.php:15 msgid "Language changed" -msgstr "Jezik je bil spremenjen" +msgstr "Jezik je spremenjen" #: ajax/setlanguage.php:17 ajax/setlanguage.php:20 msgid "Invalid request" @@ -72,7 +73,7 @@ msgstr "Neveljavna zahteva" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" -msgstr "Administratorji sebe ne morejo odstraniti iz skupine admin" +msgstr "Skrbniki se ne morejo odstraniti iz skupine admin" #: ajax/togglegroups.php:30 #, php-format @@ -86,11 +87,11 @@ msgstr "Uporabnika ni mogoče odstraniti iz skupine %s" #: ajax/updateapp.php:14 msgid "Couldn't update app." -msgstr "" +msgstr "Programa ni mogoče posodobiti." #: js/apps.js:30 msgid "Update to {appversion}" -msgstr "" +msgstr "Posodobi na {appversion}" #: js/apps.js:36 js/apps.js:76 msgid "Disable" @@ -102,15 +103,15 @@ msgstr "Omogoči" #: js/apps.js:55 msgid "Please wait...." -msgstr "" +msgstr "Počakajte ..." #: js/apps.js:84 msgid "Updating...." -msgstr "" +msgstr "Poteka posodabljanje ..." #: js/apps.js:87 msgid "Error while updating app" -msgstr "" +msgstr "Prišlo je do napake med posodabljanjem programa." #: js/apps.js:87 msgid "Error" @@ -118,7 +119,7 @@ msgstr "Napaka" #: js/apps.js:90 msgid "Updated" -msgstr "" +msgstr "Posodobljeno" #: js/personal.js:99 msgid "Saving..." @@ -134,7 +135,7 @@ msgstr "razveljavi" #: js/users.js:62 msgid "Unable to remove user" -msgstr "" +msgstr "Uporabnika ni mogoče odstraniti" #: js/users.js:75 templates/users.php:26 templates/users.php:80 #: templates/users.php:105 @@ -151,23 +152,23 @@ msgstr "Izbriši" #: js/users.js:191 msgid "add group" -msgstr "" +msgstr "dodaj skupino" #: js/users.js:352 msgid "A valid username must be provided" -msgstr "" +msgstr "Navedeno mora biti veljavno uporabniško ime" #: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" -msgstr "" +msgstr "Napaka ustvarjanja uporabnika" #: js/users.js:358 msgid "A valid password must be provided" -msgstr "" +msgstr "Navedeno mora biti veljavno geslo" #: personal.php:29 personal.php:30 msgid "__language_name__" -msgstr "__ime_jezika__" +msgstr "Slovenščina" #: templates/admin.php:15 msgid "Security Warning" @@ -180,36 +181,36 @@ msgid "" "strongly suggest that you configure your webserver in a way that the data " "directory is no longer accessible or you move the data directory outside the" " webserver document root." -msgstr "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen vsem uporabnikom na omrežju. Datoteka .htaccess, vključena v ownCloud namreč ni omogočena. Močno priporočamo nastavitev spletnega strežnika tako, da mapa podatkov ne bo javno dostopna ali pa, da jo prestavite ven iz korenske mape spletnega strežnika." +msgstr "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen vsem uporabnikom na omrežju. Datoteka .htaccess, vključena v ownCloud namreč ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da mapa podatkov ne bo javno dostopna, ali pa, da jo prestavite v podmapo korenske mape spletnega strežnika." #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "Opozorilo nastavitve" #: templates/admin.php:32 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena." #: templates/admin.php:33 #, php-format msgid "Please double check the installation guides." -msgstr "" +msgstr "Preverite navodila namestitve." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" -msgstr "" +msgstr "Manjka modul 'fileinfo'." #: templates/admin.php:47 msgid "" "The PHP module 'fileinfo' is missing. We strongly recommend to enable this " "module to get best results with mime-type detection." -msgstr "" +msgstr "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME." #: templates/admin.php:58 msgid "Locale not working" -msgstr "" +msgstr "Jezikovne prilagoditve ne delujejo." #: templates/admin.php:63 #, php-format @@ -217,11 +218,11 @@ msgid "" "This ownCloud server can't set system locale to %s. This means that there " "might be problems with certain characters in file names. We strongly suggest" " to install the required packages on your system to support %s." -msgstr "" +msgstr "Na strežniku ownCloud ni mogoče nastaviti jezikovnih določil na jezik %s. Najverjetneje so težave s posebnimi znaki v imenih datotek. Priporočljivo je namestiti zahtevane pakete za podporo jeziku %s." #: templates/admin.php:75 msgid "Internet connection not working" -msgstr "" +msgstr "Internetna povezava ne deluje." #: templates/admin.php:78 msgid "" @@ -235,11 +236,11 @@ msgstr "" #: templates/admin.php:92 msgid "Cron" -msgstr "" +msgstr "Cron" #: templates/admin.php:101 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "Izvedi eno nalogo z vsako naloženo stranjo." #: templates/admin.php:111 msgid "" @@ -255,66 +256,66 @@ msgstr "" #: templates/admin.php:128 msgid "Sharing" -msgstr "" +msgstr "Souporaba" #: templates/admin.php:134 msgid "Enable Share API" -msgstr "" +msgstr "Omogoči API souporabe" #: templates/admin.php:135 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "Dovoli programom uporabo vmesnika API souporabe" #: templates/admin.php:142 msgid "Allow links" -msgstr "" +msgstr "Dovoli povezave" #: templates/admin.php:143 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami" #: templates/admin.php:150 msgid "Allow resharing" -msgstr "" +msgstr "Dovoli nadaljnjo souporabo" #: templates/admin.php:151 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov" #: templates/admin.php:158 msgid "Allow users to share with anyone" -msgstr "" +msgstr "Uporabnikom dovoli souporabo s komerkoli" #: templates/admin.php:161 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine" #: templates/admin.php:168 msgid "Security" -msgstr "" +msgstr "Varnost" #: templates/admin.php:181 msgid "Enforce HTTPS" -msgstr "" +msgstr "Zahtevaj uporabo HTTPS" #: templates/admin.php:182 msgid "" "Enforces the clients to connect to ownCloud via an encrypted connection." -msgstr "" +msgstr "Zahtevaj šifrirano povezovanje odjemalcev v oblak ownCloud" #: templates/admin.php:185 msgid "" "Please connect to this ownCloud instance via HTTPS to enable or disable the " "SSL enforcement." -msgstr "" +msgstr "Prijava mora biti vzpostavljena z uporabo protokolo HTTPS za omogočanje šifriranja SSL." #: templates/admin.php:195 msgid "Log" -msgstr "" +msgstr "Dnevnik" #: templates/admin.php:196 msgid "Log level" -msgstr "" +msgstr "Raven beleženja" #: templates/admin.php:223 msgid "More" @@ -332,7 +333,7 @@ msgid "" "licensed under the AGPL." -msgstr "Programski paket razvija skupnost ownCloud. Izvorna koda je objavljena pod pogoji dovoljenja AGPL." +msgstr "Programski paket razvija skupnost ownCloud. Izvorna koda je objavljena pod pogoji AGPL." #: templates/apps.php:11 msgid "Add your App" @@ -352,7 +353,7 @@ msgstr "Obiščite spletno stran programa na apps.owncloud.com" #: templates/apps.php:36 msgid "-licensed by " -msgstr "-z dovoljenjem s strani " +msgstr "-z dovoljenjem " #: templates/apps.php:38 msgid "Update" @@ -364,7 +365,7 @@ msgstr "Uporabniška dokumentacija" #: templates/help.php:6 msgid "Administrator Documentation" -msgstr "Administratorjeva dokumentacija" +msgstr "Skrbniška dokumentacija" #: templates/help.php:9 msgid "Online Documentation" @@ -376,11 +377,11 @@ msgstr "Forum" #: templates/help.php:14 msgid "Bugtracker" -msgstr "Sistem za sledenje napakam" +msgstr "Sledilnik hroščev" #: templates/help.php:17 msgid "Commercial Support" -msgstr "Komercialna podpora" +msgstr "Podpora strankam" #: templates/personal.php:8 #, php-format @@ -393,7 +394,7 @@ msgstr "Pridobi programe za usklajevanje datotek" #: templates/personal.php:26 msgid "Show First Run Wizard again" -msgstr "" +msgstr "Zaženi čarovnika prvega zagona" #: templates/personal.php:37 templates/users.php:23 templates/users.php:79 msgid "Password" @@ -421,19 +422,19 @@ msgstr "Spremeni geslo" #: templates/personal.php:56 templates/users.php:78 msgid "Display Name" -msgstr "" +msgstr "Prikazano ime" #: templates/personal.php:57 msgid "Your display name was changed" -msgstr "" +msgstr "Prikazano ime je spremenjeno." #: templates/personal.php:58 msgid "Unable to change your display name" -msgstr "" +msgstr "Prikazanega imena ni mogoče spremeniti." #: templates/personal.php:61 msgid "Change display name" -msgstr "" +msgstr "Spremeni prikazano ime" #: templates/personal.php:70 msgid "Email" @@ -441,7 +442,7 @@ msgstr "Elektronska pošta" #: templates/personal.php:72 msgid "Your email address" -msgstr "Vaš elektronski poštni naslov" +msgstr "Vaš elektronski naslov" #: templates/personal.php:73 msgid "Fill in an email address to enable password recovery" @@ -453,7 +454,7 @@ msgstr "Jezik" #: templates/personal.php:86 msgid "Help translate" -msgstr "Pomagajte pri prevajanju" +msgstr "Sodelujte pri prevajanju" #: templates/personal.php:91 msgid "WebDAV" @@ -461,11 +462,11 @@ msgstr "WebDAV" #: templates/personal.php:93 msgid "Use this address to connect to your ownCloud in your file manager" -msgstr "Uporabite ta naslov za povezavo do ownCloud v vašem upravljalniku datotek." +msgstr "Ta naslov uporabite za povezavo z oblakom ownCloud iz vašega upravljalnika datotek." #: templates/users.php:21 templates/users.php:77 msgid "Login Name" -msgstr "" +msgstr "Prijavno ime" #: templates/users.php:32 msgid "Create" @@ -489,11 +490,11 @@ msgstr "Shramba" #: templates/users.php:95 msgid "change display name" -msgstr "" +msgstr "spremeni prikazano ime" #: templates/users.php:99 msgid "set new password" -msgstr "" +msgstr "nastavi novo geslo" #: templates/users.php:134 msgid "Default" diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po index e4a0d78c54..b47b53e154 100644 --- a/l10n/sl/user_ldap.po +++ b/l10n/sl/user_ldap.po @@ -4,14 +4,15 @@ # # Translators: # <>, 2012. +# Matej Urbančič <>, 2013. # Peter Peroša , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-08 22:03+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -49,7 +50,7 @@ msgstr "" #: js/settings.js:83 msgid "Keep settings?" -msgstr "" +msgstr "Ali nas se nastavitve ohranijo?" #: js/settings.js:97 msgid "Cannot add server configuration" @@ -88,248 +89,248 @@ msgstr "" msgid "Server configuration" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:31 msgid "Add Server Configuration" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:36 msgid "Host" msgstr "Gostitelj" -#: templates/settings.php:25 +#: templates/settings.php:38 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://" -#: templates/settings.php:26 +#: templates/settings.php:39 msgid "Base DN" msgstr "Osnovni DN" -#: templates/settings.php:27 +#: templates/settings.php:40 msgid "One Base DN per line" msgstr "" -#: templates/settings.php:28 +#: templates/settings.php:41 msgid "You can specify Base DN for users and groups in the Advanced tab" -msgstr "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno" +msgstr "Osnovni DN za uporabnike in skupine lahko določite v zavihku naprednih možnosti." -#: templates/settings.php:30 +#: templates/settings.php:43 msgid "User DN" msgstr "Uporabnik DN" -#: templates/settings.php:32 +#: templates/settings.php:45 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." -msgstr "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop sta polji DN in geslo prazni." +msgstr "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za brezimni dostop sta polji DN in geslo prazni." -#: templates/settings.php:33 +#: templates/settings.php:46 msgid "Password" msgstr "Geslo" -#: templates/settings.php:36 +#: templates/settings.php:49 msgid "For anonymous access, leave DN and Password empty." msgstr "Za anonimni dostop sta polji DN in geslo prazni." -#: templates/settings.php:37 +#: templates/settings.php:50 msgid "User Login Filter" msgstr "Filter prijav uporabnikov" -#: templates/settings.php:40 +#: templates/settings.php:53 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime za prijavo." -#: templates/settings.php:41 +#: templates/settings.php:54 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"." -#: templates/settings.php:42 +#: templates/settings.php:55 msgid "User List Filter" msgstr "Filter seznama uporabnikov" -#: templates/settings.php:45 +#: templates/settings.php:58 msgid "Defines the filter to apply, when retrieving users." msgstr "Določi filter za uporabo med pridobivanjem uporabnikov." -#: templates/settings.php:46 +#: templates/settings.php:59 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"." -#: templates/settings.php:47 +#: templates/settings.php:60 msgid "Group Filter" msgstr "Filter skupin" -#: templates/settings.php:50 +#: templates/settings.php:63 msgid "Defines the filter to apply, when retrieving groups." msgstr "Določi filter za uporabo med pridobivanjem skupin." -#: templates/settings.php:51 +#: templates/settings.php:64 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"." -#: templates/settings.php:55 +#: templates/settings.php:68 msgid "Connection Settings" -msgstr "" +msgstr "Nastavitve povezave" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "Configuration Active" msgstr "" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "When unchecked, this configuration will be skipped." msgstr "" -#: templates/settings.php:58 +#: templates/settings.php:71 msgid "Port" msgstr "Vrata" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "Backup (Replica) Host" msgstr "" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "" -#: templates/settings.php:60 +#: templates/settings.php:73 msgid "Backup (Replica) Port" msgstr "" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "Disable Main Server" msgstr "" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Use TLS" msgstr "Uporabi TLS" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "" -#: templates/settings.php:63 +#: templates/settings.php:76 msgid "Case insensitve LDAP server (Windows)" msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Turn off SSL certificate validation." msgstr "Onemogoči potrditev veljavnosti potrdila SSL." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "V primeru, da povezava deluje le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Not recommended, use for testing only." msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja." -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "Cache Time-To-Live" msgstr "" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "in seconds. A change empties the cache." msgstr "v sekundah. Sprememba izprazni predpomnilnik." -#: templates/settings.php:67 +#: templates/settings.php:80 msgid "Directory Settings" -msgstr "" +msgstr "Nastavitve mape" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "User Display Name Field" msgstr "Polje za uporabnikovo prikazano ime" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud." -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "Base User Tree" msgstr "Osnovno uporabniško drevo" -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "One User Base DN per line" msgstr "" -#: templates/settings.php:71 +#: templates/settings.php:84 msgid "User Search Attributes" msgstr "" -#: templates/settings.php:71 templates/settings.php:74 +#: templates/settings.php:84 templates/settings.php:87 msgid "Optional; one attribute per line" msgstr "" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "Group Display Name Field" msgstr "Polje za prikazano ime skupine" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud." -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "Base Group Tree" msgstr "Osnovno drevo skupine" -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "One Group Base DN per line" msgstr "" -#: templates/settings.php:74 +#: templates/settings.php:87 msgid "Group Search Attributes" msgstr "" -#: templates/settings.php:75 +#: templates/settings.php:88 msgid "Group-Member association" msgstr "Povezava člana skupine" -#: templates/settings.php:77 +#: templates/settings.php:90 msgid "Special Attributes" -msgstr "" +msgstr "Posebni atributi" -#: templates/settings.php:79 +#: templates/settings.php:92 msgid "Quota Field" msgstr "" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "Quota Default" msgstr "" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "in bytes" msgstr "v bajtih" -#: templates/settings.php:81 +#: templates/settings.php:94 msgid "Email Field" -msgstr "" +msgstr "Polje elektronske pošte" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "User Home Folder Naming Rule" msgstr "" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite atribut LDAP/AD." -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Test Configuration" msgstr "" -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Help" msgstr "Pomoč" diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po index 05172dc5b9..999e85d2a9 100644 --- a/l10n/sl/user_webdavauth.po +++ b/l10n/sl/user_webdavauth.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Matej Urbančič <>, 2013. # Peter Peroša , 2012-2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-15 00:03+0100\n" -"PO-Revision-Date: 2013-01-14 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-08 21:55+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,15 +21,15 @@ msgstr "" #: templates/settings.php:3 msgid "WebDAV Authentication" -msgstr "" +msgstr "Overitev WebDAV" #: templates/settings.php:4 msgid "URL: http://" msgstr "URL: http://" -#: templates/settings.php:6 +#: templates/settings.php:7 msgid "" "ownCloud will send the user credentials to this URL. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "" +msgstr "Sistem ownCloud bo poslal uporabniška poverila na naveden naslov URL. Ta vstavek preveri odziv in tolmači kode stanja HTTP 401 in HTTP 403 kot spodletel odgovor in vse ostale odzive kot veljavna poverila." diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po index 48a48d9ad7..7bcef3c030 100644 --- a/l10n/sv/files_trashbin.po +++ b/l10n/sv/files_trashbin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:41+0000\n" "Last-Translator: I Robot \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" @@ -79,4 +79,4 @@ msgstr "Radera" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Raderade filer" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 160af149ed..9ded8a4593 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 111131195d..eee8f7c008 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 346bfbdf18..e2a04a566c 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 2d2aed314a..523c37cb80 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 43243d0e61..b418a05153 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 497a5c3ab6..352b935eb3 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 51022726f2..48a03c3a4b 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 7cee4b36cc..1f7994c510 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -49,11 +49,11 @@ msgstr "" msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:211 files.php:238 +#: files.php:211 files.php:244 msgid "Back to Files" msgstr "" -#: files.php:235 +#: files.php:241 msgid "Selected files too large to generate zip file." msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 31cd164617..a7761ecfbf 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index ba91ba629c..82b4e23a8a 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 8f6a357f84..98481b5650 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po index 29f0f76aec..73191ef2fb 100644 --- a/l10n/th_TH/files_trashbin.po +++ b/l10n/th_TH/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:41+0000\n" "Last-Translator: I Robot \n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "ลบ" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "ไฟล์ที่ลบทิ้ง" diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po index c722965153..54c078642c 100644 --- a/l10n/uk/files_trashbin.po +++ b/l10n/uk/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:41+0000\n" "Last-Translator: I Robot \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Видалити" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Видалено Файлів" diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po index 5087b9c429..01e4eb471c 100644 --- a/l10n/vi/files_trashbin.po +++ b/l10n/vi/files_trashbin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -78,4 +78,4 @@ msgstr "Xóa" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "File đã xóa" diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po index 91cae3fa60..b711f925b4 100644 --- a/l10n/zh_CN/files_trashbin.po +++ b/l10n/zh_CN/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -77,4 +77,4 @@ msgstr "删除" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "已删除文件" diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po index 286b95c98d..783e301f0a 100644 --- a/l10n/zh_TW/files_trashbin.po +++ b/l10n/zh_TW/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"PO-Revision-Date: 2013-03-07 23:40+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -77,4 +77,4 @@ msgstr "刪除" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "已刪除的檔案" diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php index 391d932c4e..64b5653ef5 100644 --- a/lib/l10n/sl.php +++ b/lib/l10n/sl.php @@ -6,15 +6,22 @@ "Apps" => "Programi", "Admin" => "Skrbništvo", "ZIP download is turned off." => "Prejem datotek ZIP je onemogočen.", -"Files need to be downloaded one by one." => "Datoteke je mogoče prejeti le posamič.", +"Files need to be downloaded one by one." => "Datoteke je mogoče prejeti le posamično.", "Back to Files" => "Nazaj na datoteke", "Selected files too large to generate zip file." => "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip.", +"couldn't be determined" => "ni mogoče določiti", "Application is not enabled" => "Program ni omogočen", "Authentication error" => "Napaka overitve", -"Token expired. Please reload page." => "Žeton je potekel. Spletišče je traba znova naložiti.", +"Token expired. Please reload page." => "Žeton je potekel. Stran je treba ponovno naložiti.", "Files" => "Datoteke", "Text" => "Besedilo", "Images" => "Slike", +"Set an admin username." => "Nastavi uporabniško ime skrbnika.", +"Set an admin password." => "Nastavi geslo skrbnika.", +"Specify a data folder." => "Določi podatkovno mapo.", +"DB Error: \"%s\"" => "Napaka podatkovne zbirke: \"%s\"", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena.", +"Please double check the installation guides." => "Preverite navodila namestitve.", "seconds ago" => "pred nekaj sekundami", "1 minute ago" => "pred minuto", "%d minutes ago" => "pred %d minutami", @@ -30,5 +37,5 @@ "%s is available. Get more information" => "%s je na voljo. Več podrobnosti.", "up to date" => "posodobljeno", "updates check is disabled" => "preverjanje za posodobitve je onemogočeno", -"Could not find category \"%s\"" => "Kategorije \"%s\" ni bilo mogoče najti." +"Could not find category \"%s\"" => "Kategorije \"%s\" ni mogoče najti." ); diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php index 249591ab47..01fddd94c0 100644 --- a/settings/l10n/sl.php +++ b/settings/l10n/sl.php @@ -1,64 +1,109 @@ "Ni mogoče naložiti seznama iz App Store", "Authentication error" => "Napaka overitve", +"Unable to change display name" => "Prikazanega imena ni mogoče spremeniti.", "Group already exists" => "Skupina že obstaja", -"Unable to add group" => "Ni mogoče dodati skupine", +"Unable to add group" => "Skupine ni mogoče dodati", "Could not enable app. " => "Programa ni mogoče omogočiti.", "Email saved" => "Elektronski naslov je shranjen", "Invalid email" => "Neveljaven elektronski naslov", -"Unable to delete group" => "Ni mogoče izbrisati skupine", -"Unable to delete user" => "Ni mogoče izbrisati uporabnika", -"Language changed" => "Jezik je bil spremenjen", +"Unable to delete group" => "Skupine ni mogoče izbrisati", +"Unable to delete user" => "Uporabnika ni mogoče izbrisati", +"Language changed" => "Jezik je spremenjen", "Invalid request" => "Neveljavna zahteva", -"Admins can't remove themself from the admin group" => "Administratorji sebe ne morejo odstraniti iz skupine admin", +"Admins can't remove themself from the admin group" => "Skrbniki se ne morejo odstraniti iz skupine admin", "Unable to add user to group %s" => "Uporabnika ni mogoče dodati k skupini %s", "Unable to remove user from group %s" => "Uporabnika ni mogoče odstraniti iz skupine %s", +"Couldn't update app." => "Programa ni mogoče posodobiti.", +"Update to {appversion}" => "Posodobi na {appversion}", "Disable" => "Onemogoči", "Enable" => "Omogoči", +"Please wait...." => "Počakajte ...", +"Updating...." => "Poteka posodabljanje ...", +"Error while updating app" => "Prišlo je do napake med posodabljanjem programa.", "Error" => "Napaka", +"Updated" => "Posodobljeno", "Saving..." => "Poteka shranjevanje ...", "deleted" => "izbrisano", "undo" => "razveljavi", +"Unable to remove user" => "Uporabnika ni mogoče odstraniti", "Groups" => "Skupine", "Group Admin" => "Skrbnik skupine", "Delete" => "Izbriši", -"__language_name__" => "__ime_jezika__", +"add group" => "dodaj skupino", +"A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime", +"Error creating user" => "Napaka ustvarjanja uporabnika", +"A valid password must be provided" => "Navedeno mora biti veljavno geslo", +"__language_name__" => "Slovenščina", "Security Warning" => "Varnostno opozorilo", -"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen vsem uporabnikom na omrežju. Datoteka .htaccess, vključena v ownCloud namreč ni omogočena. Močno priporočamo nastavitev spletnega strežnika tako, da mapa podatkov ne bo javno dostopna ali pa, da jo prestavite ven iz korenske mape spletnega strežnika.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen vsem uporabnikom na omrežju. Datoteka .htaccess, vključena v ownCloud namreč ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da mapa podatkov ne bo javno dostopna, ali pa, da jo prestavite v podmapo korenske mape spletnega strežnika.", +"Setup Warning" => "Opozorilo nastavitve", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena.", +"Please double check the installation guides." => "Preverite navodila namestitve.", +"Module 'fileinfo' missing" => "Manjka modul 'fileinfo'.", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.", +"Locale not working" => "Jezikovne prilagoditve ne delujejo.", +"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Na strežniku ownCloud ni mogoče nastaviti jezikovnih določil na jezik %s. Najverjetneje so težave s posebnimi znaki v imenih datotek. Priporočljivo je namestiti zahtevane pakete za podporo jeziku %s.", +"Internet connection not working" => "Internetna povezava ne deluje.", +"Cron" => "Cron", +"Execute one task with each page loaded" => "Izvedi eno nalogo z vsako naloženo stranjo.", +"Sharing" => "Souporaba", +"Enable Share API" => "Omogoči API souporabe", +"Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe", +"Allow links" => "Dovoli povezave", +"Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo predmetov z javnimi povezavami", +"Allow resharing" => "Dovoli nadaljnjo souporabo", +"Allow users to share items shared with them again" => "Uporabnikom dovoli nadaljnjo souporabo predmetov", +"Allow users to share with anyone" => "Uporabnikom dovoli souporabo s komerkoli", +"Allow users to only share with users in their groups" => "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine", +"Security" => "Varnost", +"Enforce HTTPS" => "Zahtevaj uporabo HTTPS", +"Enforces the clients to connect to ownCloud via an encrypted connection." => "Zahtevaj šifrirano povezovanje odjemalcev v oblak ownCloud", +"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Prijava mora biti vzpostavljena z uporabo protokolo HTTPS za omogočanje šifriranja SSL.", +"Log" => "Dnevnik", +"Log level" => "Raven beleženja", "More" => "Več", "Version" => "Različica", -"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Programski paket razvija skupnost ownCloud. Izvorna koda je objavljena pod pogoji dovoljenja AGPL.", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Programski paket razvija skupnost ownCloud. Izvorna koda je objavljena pod pogoji AGPL.", "Add your App" => "Dodaj program", "More Apps" => "Več programov", "Select an App" => "Izberite program", "See application page at apps.owncloud.com" => "Obiščite spletno stran programa na apps.owncloud.com", -"-licensed by " => "-z dovoljenjem s strani ", +"-licensed by " => "-z dovoljenjem ", "Update" => "Posodobi", "User Documentation" => "Uporabniška dokumentacija", -"Administrator Documentation" => "Administratorjeva dokumentacija", +"Administrator Documentation" => "Skrbniška dokumentacija", "Online Documentation" => "Spletna dokumentacija", "Forum" => "Forum", -"Bugtracker" => "Sistem za sledenje napakam", -"Commercial Support" => "Komercialna podpora", +"Bugtracker" => "Sledilnik hroščev", +"Commercial Support" => "Podpora strankam", "You have used %s of the available %s" => "Uporabljate %s od razpoložljivih %s", "Get the apps to sync your files" => "Pridobi programe za usklajevanje datotek", +"Show First Run Wizard again" => "Zaženi čarovnika prvega zagona", "Password" => "Geslo", "Your password was changed" => "Vaše geslo je spremenjeno", "Unable to change your password" => "Gesla ni mogoče spremeniti.", "Current password" => "Trenutno geslo", "New password" => "Novo geslo", "Change password" => "Spremeni geslo", +"Display Name" => "Prikazano ime", +"Your display name was changed" => "Prikazano ime je spremenjeno.", +"Unable to change your display name" => "Prikazanega imena ni mogoče spremeniti.", +"Change display name" => "Spremeni prikazano ime", "Email" => "Elektronska pošta", -"Your email address" => "Vaš elektronski poštni naslov", +"Your email address" => "Vaš elektronski naslov", "Fill in an email address to enable password recovery" => "Vpišite vaš elektronski naslov in s tem omogočite obnovitev gesla", "Language" => "Jezik", -"Help translate" => "Pomagajte pri prevajanju", +"Help translate" => "Sodelujte pri prevajanju", "WebDAV" => "WebDAV", -"Use this address to connect to your ownCloud in your file manager" => "Uporabite ta naslov za povezavo do ownCloud v vašem upravljalniku datotek.", +"Use this address to connect to your ownCloud in your file manager" => "Ta naslov uporabite za povezavo z oblakom ownCloud iz vašega upravljalnika datotek.", +"Login Name" => "Prijavno ime", "Create" => "Ustvari", "Default Storage" => "Privzeta shramba", "Unlimited" => "Neomejeno", "Other" => "Drugo", "Storage" => "Shramba", +"change display name" => "spremeni prikazano ime", +"set new password" => "nastavi novo geslo", "Default" => "Privzeto" ); From d4f98923b9be7f3e6805573085bf9fedfaff836c Mon Sep 17 00:00:00 2001 From: herbrechtsmeier Date: Sat, 23 Feb 2013 12:58:06 +0100 Subject: [PATCH 044/546] Overwrite host and webroot when forcessl is enabled This patch enables the use of forcessl together with a multiple domains reverse SSL proxy (owncloud/core#1099) which have different hostname and webroot for http and https access. The code assumes that the ssl proxy (https) hostname and webroot is configured via overwritehost and overwritewebroot. --- lib/request.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/request.php b/lib/request.php index 9f74cf9beb..859276a12a 100755 --- a/lib/request.php +++ b/lib/request.php @@ -11,9 +11,10 @@ class OC_Request { * @brief Check overwrite condition * @returns true/false */ - private static function isOverwriteCondition() { + private static function isOverwriteCondition($type = '') { $regex = '/' . OC_Config::getValue('overwritecondaddr', '') . '/'; - return $regex === '//' or preg_match($regex, $_SERVER['REMOTE_ADDR']) === 1; + return $regex === '//' or preg_match($regex, $_SERVER['REMOTE_ADDR']) === 1 + or ($type <> 'protocol' and OC_Config::getValue('forcessl', false)); } /** @@ -52,7 +53,7 @@ class OC_Request { * Returns the server protocol. It respects reverse proxy servers and load balancers */ public static function serverProtocol() { - if(OC_Config::getValue('overwriteprotocol', '')<>'' and self::isOverwriteCondition()) { + if(OC_Config::getValue('overwriteprotocol', '')<>'' and self::isOverwriteCondition('protocol')) { return OC_Config::getValue('overwriteprotocol'); } if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) { From ecb9d37b55f5c55545a2c0ec475e22d71bd4dcc8 Mon Sep 17 00:00:00 2001 From: herbrechtsmeier Date: Sat, 9 Mar 2013 11:39:20 +0100 Subject: [PATCH 045/546] request.php: add type check to the not empty check of a string The not equal comparison (<>) of a variable with an empty string could lead to false positive results as the compare do not check the type and thereby could not make sure that the checked variable is a string. The usage of the not identical comparison operator (!==) make sure that the variable is a string and not empty. --- lib/request.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/request.php b/lib/request.php index 859276a12a..4d8380eb9a 100755 --- a/lib/request.php +++ b/lib/request.php @@ -14,7 +14,7 @@ class OC_Request { 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)); + or ($type !== 'protocol' and OC_Config::getValue('forcessl', false)); } /** @@ -28,7 +28,7 @@ class OC_Request { if(OC::$CLI) { return 'localhost'; } - if(OC_Config::getValue('overwritehost', '')<>'' and self::isOverwriteCondition()) { + if(OC_Config::getValue('overwritehost', '') !== '' and self::isOverwriteCondition()) { return OC_Config::getValue('overwritehost'); } if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) { @@ -53,7 +53,7 @@ class OC_Request { * 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')) { + if(OC_Config::getValue('overwriteprotocol', '') !== '' and self::isOverwriteCondition('protocol')) { return OC_Config::getValue('overwriteprotocol'); } if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) { @@ -77,7 +77,7 @@ class OC_Request { */ public static function requestUri() { $uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''; - if (OC_Config::getValue('overwritewebroot', '') <> '' and self::isOverwriteCondition()) { + if (OC_Config::getValue('overwritewebroot', '') !== '' and self::isOverwriteCondition()) { $uri = self::scriptName() . substr($uri, strlen($_SERVER['SCRIPT_NAME'])); } return $uri; @@ -92,7 +92,7 @@ class OC_Request { */ public static function scriptName() { $name = $_SERVER['SCRIPT_NAME']; - if (OC_Config::getValue('overwritewebroot', '') <> '' and self::isOverwriteCondition()) { + if (OC_Config::getValue('overwritewebroot', '') !== '' and self::isOverwriteCondition()) { $serverroot = str_replace("\\", '/', substr(__DIR__, 0, -4)); $suburi = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen($serverroot))); $name = OC_Config::getValue('overwritewebroot', '') . $suburi; From 988a67fc9acfd280e8e96ac353ddfd89192dbab0 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Sat, 9 Mar 2013 13:45:37 +0100 Subject: [PATCH 046/546] remove remaining br-tags that do not belong here --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index 47c02074a8..d8adfd99a4 100755 --- a/lib/util.php +++ b/lib/util.php @@ -211,7 +211,7 @@ class OC_Util { ."'chown -R www-data:www-data /path/to/your/owncloud/install/data' "); } } else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) { - $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud
', + $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud', 'hint'=>$permissionsHint); } else { $errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY)); @@ -309,7 +309,7 @@ class OC_Util { clearstatcache(); $prems = substr(decoct(@fileperms($dataDirectory)), -3); if (substr($prems, 2, 1) != '0') { - $errors[] = array('error' => 'Data directory ('.$dataDirectory.') is readable for other users
', + $errors[] = array('error' => 'Data directory ('.$dataDirectory.') is readable for other users', 'hint' => $permissionsModHint); } } From 99c873ea29d3e970bf5d706a2da446a8ee91595f Mon Sep 17 00:00:00 2001 From: Valerio Ponte Date: Sat, 9 Mar 2013 15:35:36 +0100 Subject: [PATCH 047/546] fixed typo that broke xsendfile --- lib/files.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/files.php b/lib/files.php index 71bb21851b..2433502444 100644 --- a/lib/files.php +++ b/lib/files.php @@ -128,7 +128,7 @@ class OC_Files { header('Content-Type: '.\OC\Files\Filesystem::getMimeType($filename)); header("Content-Length: ".\OC\Files\Filesystem::filesize($filename)); list($storage) = \OC\Files\Filesystem::resolvePath($filename); - if ($storage instanceof \OC\File\Storage\Local) { + if ($storage instanceof \OC\Files\Storage\Local) { self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename)); } } From 3ae70ab162c005a8931e757f29536e10d2d5fe7a Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 11 Mar 2013 16:21:26 +0100 Subject: [PATCH 048/546] Check if username is valid and remove slashes from filename --- lib/migrate.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/migrate.php b/lib/migrate.php index a0a329705a..0b31917740 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -246,11 +246,20 @@ class OC_Migrate{ OC_Log::write( 'migration', 'User doesn\'t exist', OC_Log::ERROR ); return json_encode( array( 'success' => false ) ); } + + // Check if the username is valid + if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $json->exporteduser )) { + OC_Log::write( 'migration', 'Username is not valid', OC_Log::ERROR ); + return json_encode( array( 'success' => false ) ); + } + // Copy data $userfolder = $extractpath . $json->exporteduser; $newuserfolder = $datadir . '/' . self::$uid; foreach(scandir($userfolder) as $file){ if($file !== '.' && $file !== '..' && is_dir($file)) { + $file = str_replace(array('/', '\\'), '', $file); + // Then copy the folder over OC_Helper::copyr($userfolder.'/'.$file, $newuserfolder.'/'.$file); } From 256595e7b2e06de630ca5a9983accadabc309281 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sat, 9 Mar 2013 18:51:02 +0100 Subject: [PATCH 049/546] 5.0.0 --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index d8adfd99a4..6d641bc472 100755 --- a/lib/util.php +++ b/lib/util.php @@ -75,7 +75,7 @@ class OC_Util { public static function getVersion() { // hint: We only can count up. Reset minor/patchlevel when // updating major/minor version number. - return array(4, 97, 10); + return array(5, 00, 00); } /** @@ -83,7 +83,7 @@ class OC_Util { * @return string */ public static function getVersionString() { - return '5.0 RC 3'; + return '5.0'; } /** From e6c2a91781830f869c3d1ea0331987eb262e8232 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sat, 9 Mar 2013 20:19:34 +0100 Subject: [PATCH 050/546] this is now 6.0 pre alpha --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index 6d641bc472..e79daae8a0 100755 --- a/lib/util.php +++ b/lib/util.php @@ -75,7 +75,7 @@ class OC_Util { public static function getVersion() { // hint: We only can count up. Reset minor/patchlevel when // updating major/minor version number. - return array(5, 00, 00); + return array(5, 80, 00); } /** @@ -83,7 +83,7 @@ class OC_Util { * @return string */ public static function getVersionString() { - return '5.0'; + return '6.0 pre alpha'; } /** From d5da94acbcc53e310a1970af12af6712eb374a09 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Sat, 9 Mar 2013 21:41:59 +0100 Subject: [PATCH 051/546] Small perf improvement : filter before sort --- lib/config.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/config.php b/lib/config.php index 626dc8b02e..387948c49c 100644 --- a/lib/config.php +++ b/lib/config.php @@ -133,12 +133,12 @@ class OC_Config{ // read all file in config dir ending by config.php $config_files = glob( OC::$SERVERROOT."/config/*.config.php"); - //Sort array naturally : - natsort($config_files); - //Filter only regular files $config_files = array_filter($config_files, 'is_file'); + //Sort array naturally : + natsort($config_files); + // Add default config array_unshift($config_files,OC::$SERVERROOT."/config/config.php"); From 6bdb84ab288a2ef2087c8daa2255071cf45d26b4 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 10 Mar 2013 00:06:53 +0100 Subject: [PATCH 052/546] [tx-robot] updated from transifex --- apps/files/l10n/fa.php | 2 + apps/files/l10n/sl.php | 33 +++++-- apps/files_trashbin/l10n/fa.php | 1 + apps/files_trashbin/l10n/sl.php | 8 +- apps/user_ldap/l10n/lv.php | 6 ++ apps/user_ldap/l10n/sl.php | 26 ++++-- apps/user_webdavauth/l10n/sl.php | 2 +- core/l10n/sl.php | 18 ++-- l10n/fa/files.po | 48 +++++----- l10n/fa/files_trashbin.po | 6 +- l10n/lv/user_ldap.po | 134 ++++++++++++++-------------- l10n/sl/core.po | 27 +++--- l10n/sl/files.po | 53 +++++------ l10n/sl/files_sharing.po | 14 +-- l10n/sl/files_trashbin.po | 13 +-- l10n/sl/lib.po | 34 +++---- l10n/sl/settings.po | 11 +-- l10n/sl/user_ldap.po | 42 ++++----- l10n/sl/user_webdavauth.po | 6 +- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- lib/l10n/sl.php | 15 ++++ settings/l10n/sl.php | 6 +- 32 files changed, 293 insertions(+), 234 deletions(-) diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php index f4e0af9576..b9a88b5791 100644 --- a/apps/files/l10n/fa.php +++ b/apps/files/l10n/fa.php @@ -12,6 +12,7 @@ "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود", "Invalid directory." => "فهرست راهنما نامعتبر می باشد.", "Files" => "فایل ها", +"Delete permanently" => "حذف قطعی", "Delete" => "پاک کردن", "Rename" => "تغییرنام", "Pending" => "در انتظار", @@ -54,6 +55,7 @@ "Text file" => "فایل متنی", "Folder" => "پوشه", "From link" => "از پیوند", +"Deleted files" => "فایل های حذف شده", "Cancel upload" => "متوقف کردن بار گذاری", "Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.", "Download" => "بارگیری", diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index a861788459..9c86ffcfef 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -1,12 +1,17 @@ "Ni mogoče premakniti %s - datoteka s tem imenom že obstaja", +"Could not move %s" => "Ni mogoče premakniti %s", +"Unable to rename file" => "Ni mogoče preimenovati datoteke", "No file was uploaded. Unknown error" => "Nobena datoteka ni naložena. Neznana napaka.", -"There is no error, the file uploaded with success" => "Datoteka je uspešno naložena brez napak.", +"There is no error, the file uploaded with success" => "Datoteka je uspešno poslana.", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Naložena datoteka presega dovoljeno velikost. Le-ta je določena z vrstico upload_max_filesize v datoteki php.ini:", -"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML.", "The uploaded file was only partially uploaded" => "Datoteka je le delno naložena", "No file was uploaded" => "Nobena datoteka ni bila naložena", "Missing a temporary folder" => "Manjka začasna mapa", "Failed to write to disk" => "Pisanje na disk je spodletelo", +"Not enough storage available" => "Na voljo ni dovolj prostora", +"Invalid directory." => "Neveljavna mapa.", "Files" => "Datoteke", "Delete permanently" => "Izbriši trajno", "Delete" => "Izbriši", @@ -18,15 +23,22 @@ "cancel" => "prekliči", "replaced {new_name} with {old_name}" => "zamenjano ime {new_name} z imenom {old_name}", "undo" => "razveljavi", +"perform delete operation" => "izvedi opravilo brisanja", +"'.' is an invalid file name." => "'.' je neveljavno ime datoteke.", +"File name cannot be empty." => "Ime datoteke ne sme biti prazno.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.", +"Your storage is full, files can not be updated or synced anymore!" => "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!", +"Your storage is almost full ({usedSpacePercent}%)" => "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)", +"Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen.", "Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov.", -"Upload Error" => "Napaka med nalaganjem", +"Upload Error" => "Napaka med pošiljanjem", "Close" => "Zapri", "1 file uploading" => "Pošiljanje 1 datoteke", "{count} files uploading" => "nalagam {count} datotek", "Upload cancelled." => "Pošiljanje je preklicano.", "File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.", "URL cannot be empty." => "Naslov URL ne sme biti prazen.", +"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud", "Name" => "Ime", "Size" => "Velikost", "Modified" => "Spremenjeno", @@ -38,21 +50,24 @@ "File handling" => "Upravljanje z datotekami", "Maximum upload size" => "Največja velikost za pošiljanja", "max. possible: " => "največ mogoče:", -"Needed for multi-file and folder downloads." => "Uporabljeno za prenos več datotek in map.", +"Needed for multi-file and folder downloads." => "Uporabljeno za prejem več datotek in map.", "Enable ZIP-download" => "Omogoči prejemanje arhivov ZIP", -"0 is unlimited" => "0 je neskončno", +"0 is unlimited" => "0 predstavlja neomejeno vrednost", "Maximum input size for ZIP files" => "Največja vhodna velikost za datoteke ZIP", "Save" => "Shrani", "New" => "Nova", "Text file" => "Besedilna datoteka", "Folder" => "Mapa", "From link" => "Iz povezave", +"Deleted files" => "Izbrisane datoteke", "Cancel upload" => "Prekliči pošiljanje", -"Nothing in here. Upload something!" => "Tukaj ni ničesar. Naložite kaj!", +"You don’t have write permissions here." => "Za to mesto ni ustreznih dovoljenj za pisanje.", +"Nothing in here. Upload something!" => "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!", "Download" => "Prejmi", "Unshare" => "Odstrani iz souporabe", -"Upload too large" => "Nalaganje ni mogoče, ker je preveliko", -"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku.", +"Upload too large" => "Prekoračenje omejitve velikosti", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.", "Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...", -"Current scanning" => "Trenutno poteka preučevanje" +"Current scanning" => "Trenutno poteka preučevanje", +"Upgrading filesystem cache..." => "Nadgrajevanje predpomnilnika datotečnega sistema ..." ); diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php index 7cc695215e..879ee722a6 100644 --- a/apps/files_trashbin/l10n/fa.php +++ b/apps/files_trashbin/l10n/fa.php @@ -1,4 +1,5 @@ "حذف قطعی", "Name" => "نام", "1 folder" => "1 پوشه", "{count} folders" => "{ شمار} پوشه ها", diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php index 04fd13763f..edef7294a4 100644 --- a/apps/files_trashbin/l10n/sl.php +++ b/apps/files_trashbin/l10n/sl.php @@ -1,11 +1,11 @@ "Datoteke %s ni mogoče trajno izbrisati.", +"Couldn't delete %s permanently" => "Datoteke %s ni mogoče dokončno izbrisati.", "Couldn't restore %s" => "Ni mogoče obnoviti %s", "perform restore operation" => "izvedi opravilo obnavljanja", -"delete file permanently" => "izbriši datoteko trajno", -"Delete permanently" => "Izbriši trajno", +"delete file permanently" => "dokončno izbriši datoteko", +"Delete permanently" => "Izbriši dokončno", "Name" => "Ime", -"Deleted" => "izbrisano", +"Deleted" => "Izbrisano", "1 folder" => "1 mapa", "{count} folders" => "{count} map", "1 file" => "1 datoteka", diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php index 34e9196b8d..50126664e5 100644 --- a/apps/user_ldap/l10n/lv.php +++ b/apps/user_ldap/l10n/lv.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Izslēgt SSL sertifikātu validēšanu.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Ja savienojums darbojas ar šo opciju, importē LDAP serveru SSL sertifikātu savā ownCloud serverī.", "Not recommended, use for testing only." => "Nav ieteicams, izmanto tikai testēšanai!", +"Cache Time-To-Live" => "Kešatmiņas dzīvlaiks", "in seconds. A change empties the cache." => "sekundēs. Izmaiņas iztukšos kešatmiņu.", "Directory Settings" => "Direktorijas iestatījumi", "User Display Name Field" => "Lietotāja redzamā vārda lauks", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Grupu meklēšanas atribūts", "Group-Member association" => "Grupu piederības asociācija", "Special Attributes" => "Īpašie atribūti", +"Quota Field" => "Kvotu lauks", +"Quota Default" => "Kvotas noklusējums", "in bytes" => "baitos", +"Email Field" => "E-pasta lauks", +"User Home Folder Naming Rule" => "Lietotāja mājas mapes nosaukšanas kārtula", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu.", +"Test Configuration" => "Testa konfigurācija", "Help" => "Palīdzība" ); diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php index 6e581bbe88..9508d49557 100644 --- a/apps/user_ldap/l10n/sl.php +++ b/apps/user_ldap/l10n/sl.php @@ -1,7 +1,12 @@ "Brisanje nastavitev strežnika je spodletelo.", "Deletion failed" => "Brisanje je spodletelo.", "Keep settings?" => "Ali nas se nastavitve ohranijo?", -"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Opozorilo: Aplikaciji user_ldap in user_webdavauth nista združljivi. Morda boste opazili nepričakovano obnašanje sistema. Prosimo, prosite vašega skrbnika, da eno od aplikacij onemogoči.", +"Do you really want to delete the current Server Configuration?" => "Ali res želite izbrisati trenutne nastavitve strežnika?", +"Confirm Deletion" => "Potrdi brisanje", +"Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Opozorilo: možnosti user_ldap in user_webdavauth nista združljivi. Pri uporabi je mogoče nepričakovano obnašanje sistema. Eno izmed možnosti je priporočeno onemgočiti.", +"Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Opozorilo: modul PHP LDAP mora biti nameščen, sicer vmesnik ne bo deloval. Paket je treba namestiti.", +"Add Server Configuration" => "Dodaj nastavitve strežnika", "Host" => "Gostitelj", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://", "Base DN" => "Osnovni DN", @@ -9,9 +14,9 @@ "User DN" => "Uporabnik DN", "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za brezimni dostop sta polji DN in geslo prazni.", "Password" => "Geslo", -"For anonymous access, leave DN and Password empty." => "Za anonimni dostop sta polji DN in geslo prazni.", +"For anonymous access, leave DN and Password empty." => "Za brezimni dostop sta polji DN in geslo prazni.", "User Login Filter" => "Filter prijav uporabnikov", -"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime za prijavo.", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime v postopku prijave.", "use %%uid placeholder, e.g. \"uid=%%uid\"" => "Uporabite vsebnik %%uid, npr. \"uid=%%uid\".", "User List Filter" => "Filter seznama uporabnikov", "Defines the filter to apply, when retrieving users." => "Določi filter za uporabo med pridobivanjem uporabnikov.", @@ -21,23 +26,30 @@ "without any placeholder, e.g. \"objectClass=posixGroup\"." => "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\".", "Connection Settings" => "Nastavitve povezave", "Port" => "Vrata", +"Disable Main Server" => "Onemogoči glavni strežnik", "Use TLS" => "Uporabi TLS", "Case insensitve LDAP server (Windows)" => "Strežnik LDAP ne upošteva velikosti črk (Windows)", -"Turn off SSL certificate validation." => "Onemogoči potrditev veljavnosti potrdila SSL.", -"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "V primeru, da povezava deluje le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud.", +"Turn off SSL certificate validation." => "Onemogoči določanje veljavnosti potrdila SSL.", +"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Kadar deluje povezava le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud.", "Not recommended, use for testing only." => "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja.", "in seconds. A change empties the cache." => "v sekundah. Sprememba izprazni predpomnilnik.", "Directory Settings" => "Nastavitve mape", "User Display Name Field" => "Polje za uporabnikovo prikazano ime", "The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud.", "Base User Tree" => "Osnovno uporabniško drevo", +"One User Base DN per line" => "Eno osnovno uporabniško ime DN na vrstico", "Group Display Name Field" => "Polje za prikazano ime skupine", "The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud.", "Base Group Tree" => "Osnovno drevo skupine", -"Group-Member association" => "Povezava člana skupine", +"One Group Base DN per line" => "Eno osnovno ime skupine DN na vrstico", +"Group Search Attributes" => "Atributi iskanja skupine", +"Group-Member association" => "Povezava član-skupina", "Special Attributes" => "Posebni atributi", +"Quota Field" => "Polje količinske omejitve", +"Quota Default" => "Privzeta količinska omejitev", "in bytes" => "v bajtih", "Email Field" => "Polje elektronske pošte", -"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite atribut LDAP/AD.", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD.", +"Test Configuration" => "Preizkusne nastavitve", "Help" => "Pomoč" ); diff --git a/apps/user_webdavauth/l10n/sl.php b/apps/user_webdavauth/l10n/sl.php index dec593252f..7c592723af 100644 --- a/apps/user_webdavauth/l10n/sl.php +++ b/apps/user_webdavauth/l10n/sl.php @@ -1,5 +1,5 @@ "Overitev WebDAV", "URL: http://" => "URL: http://", -"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Sistem ownCloud bo poslal uporabniška poverila na naveden naslov URL. Ta vstavek preveri odziv in tolmači kode stanja HTTP 401 in HTTP 403 kot spodletel odgovor in vse ostale odzive kot veljavna poverila." +"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Sistem ownCloud bo poslal uporabniška poverila na navedeni naslov URL. Ta vstavek preveri odziv in tolmači kode stanja HTTP 401 in HTTP 403 kot spodletel odgovor in vse ostale odzive kot veljavna poverila." ); diff --git a/core/l10n/sl.php b/core/l10n/sl.php index af9f7badc6..747aa1c2a2 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -77,21 +77,23 @@ "access control" => "nadzor dostopa", "create" => "ustvari", "update" => "posodobi", -"delete" => "izbriše", +"delete" => "izbriši", "share" => "določi souporabo", "Password protected" => "Zaščiteno z geslom", "Error unsetting expiration date" => "Napaka brisanja datuma preteka", "Error setting expiration date" => "Napaka med nastavljanjem datuma preteka", -"Sending ..." => "Pošiljam ...", +"Sending ..." => "Pošiljanje ...", "Email sent" => "E-pošta je bila poslana", +"The update was unsuccessful. Please report this issue to the ownCloud community." => "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu ownCloud.", +"The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.", "ownCloud password reset" => "Ponastavitev gesla ownCloud", "Use the following link to reset your password: {link}" => "Uporabite naslednjo povezavo za ponastavitev gesla: {link}", "You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.", "Reset email send." => "E-pošta za ponastavitev je bila poslana.", "Request failed!" => "Zahtevek je spodletel!", "Username" => "Uporabniško Ime", -"Request reset" => "Zahtevaj ponastavitev", -"Your password was reset" => "Geslo je ponastavljeno", +"Request reset" => "Zahtevaj ponovno nastavitev", +"Your password was reset" => "Geslo je ponovno nastavljeno", "To login page" => "Na prijavno stran", "New password" => "Novo geslo", "Reset password" => "Ponastavi geslo", @@ -107,17 +109,19 @@ "Security Warning" => "Varnostno opozorilo", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni varnega generatorja naključnih števil. Prosimo, če omogočite PHP OpenSSL razširitev.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega generatorja naključnih števil lahko napadalec napove žetone za ponastavitev gesla, kar mu omogoča, da prevzame vaš ​​račun.", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.", +"For information how to properly configure your server, please see the documentation." => "Navodila, kako pravilno namestiti strežnik, so na straneh documentacije.", "Create an admin account" => "Ustvari skrbniški račun", "Advanced" => "Napredne možnosti", -"Data folder" => "Mapa s podatki", +"Data folder" => "Podatkovna mapa", "Configure the database" => "Nastavi podatkovno zbirko", "will be used" => "bo uporabljen", -"Database user" => "Uporabnik zbirke", +"Database user" => "Uporabnik podatkovne zbirke", "Database password" => "Geslo podatkovne zbirke", "Database name" => "Ime podatkovne zbirke", "Database tablespace" => "Razpredelnica podatkovne zbirke", "Database host" => "Gostitelj podatkovne zbirke", -"Finish setup" => "Dokončaj namestitev", +"Finish setup" => "Končaj namestitev", "web services under your control" => "spletne storitve pod vašim nadzorom", "Log out" => "Odjava", "Automatic logon rejected!" => "Samodejno prijavljanje je zavrnjeno!", diff --git a/l10n/fa/files.po b/l10n/fa/files.po index a6f1b66d2f..1103ddafa4 100644 --- a/l10n/fa/files.po +++ b/l10n/fa/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"PO-Revision-Date: 2013-03-09 16:20+0000\n" +"Last-Translator: miki_mika1362 \n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -84,7 +84,7 @@ msgstr "فایل ها" #: js/fileactions.js:125 msgid "Delete permanently" -msgstr "" +msgstr "حذف قطعی" #: js/fileactions.js:127 templates/index.php:92 templates/index.php:93 msgid "Delete" @@ -94,8 +94,8 @@ msgstr "پاک کردن" msgid "Rename" msgstr "تغییرنام" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 -#: js/files.js:439 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409 +#: js/files.js:440 msgid "Pending" msgstr "در انتظار" @@ -149,74 +149,74 @@ msgstr "" msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:225 +#: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد." -#: js/files.js:262 +#: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد" -#: js/files.js:262 +#: js/files.js:263 msgid "Upload Error" msgstr "خطا در بار گذاری" -#: js/files.js:273 +#: js/files.js:274 msgid "Close" msgstr "بستن" -#: js/files.js:312 +#: js/files.js:313 msgid "1 file uploading" msgstr "1 پرونده آپلود شد." -#: js/files.js:315 js/files.js:370 js/files.js:385 +#: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" msgstr "{ شمار } فایل های در حال آپلود" -#: js/files.js:388 js/files.js:423 +#: js/files.js:389 js/files.js:424 msgid "Upload cancelled." msgstr "بار گذاری لغو شد" -#: js/files.js:497 +#: js/files.js:498 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. " -#: js/files.js:570 +#: js/files.js:571 msgid "URL cannot be empty." msgstr "URL نمی تواند خالی باشد." -#: js/files.js:575 +#: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است." -#: js/files.js:953 templates/index.php:68 +#: js/files.js:954 templates/index.php:68 msgid "Name" msgstr "نام" -#: js/files.js:954 templates/index.php:79 +#: js/files.js:955 templates/index.php:79 msgid "Size" msgstr "اندازه" -#: js/files.js:955 templates/index.php:81 +#: js/files.js:956 templates/index.php:81 msgid "Modified" msgstr "تغییر یافته" -#: js/files.js:974 +#: js/files.js:975 msgid "1 folder" msgstr "1 پوشه" -#: js/files.js:976 +#: js/files.js:977 msgid "{count} folders" msgstr "{ شمار} پوشه ها" -#: js/files.js:984 +#: js/files.js:985 msgid "1 file" msgstr "1 پرونده" -#: js/files.js:986 +#: js/files.js:987 msgid "{count} files" msgstr "{ شمار } فایل ها" @@ -274,7 +274,7 @@ msgstr "از پیوند" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "فایل های حذف شده" #: templates/index.php:46 msgid "Cancel upload" diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po index 8a62df4a88..d65d6f66ed 100644 --- a/l10n/fa/files_trashbin.po +++ b/l10n/fa/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"PO-Revision-Date: 2013-03-09 16:20+0000\n" "Last-Translator: I Robot \n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgstr "" #: js/trash.js:121 msgid "Delete permanently" -msgstr "" +msgstr "حذف قطعی" #: js/trash.js:174 templates/index.php:17 msgid "Name" diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po index 9a1c7c56fa..ddb4d8fd5f 100644 --- a/l10n/lv/user_ldap.po +++ b/l10n/lv/user_ldap.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"PO-Revision-Date: 2013-03-09 12:40+0000\n" +"Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,248 +87,248 @@ msgstr "Brīdinājums: PHP LDAP modulis nav uzinstalēts, aizmugure nedar msgid "Server configuration" msgstr "Servera konfigurācija" -#: templates/settings.php:18 +#: templates/settings.php:31 msgid "Add Server Configuration" msgstr "Pievienot servera konfigurāciju" -#: templates/settings.php:23 +#: templates/settings.php:36 msgid "Host" msgstr "Resursdators" -#: templates/settings.php:25 +#: templates/settings.php:38 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Var neiekļaut protokolu, izņemot, ja vajag SSL. Tad sākums ir ldaps://" -#: templates/settings.php:26 +#: templates/settings.php:39 msgid "Base DN" msgstr "Bāzes DN" -#: templates/settings.php:27 +#: templates/settings.php:40 msgid "One Base DN per line" msgstr "Viena bāzes DN rindā" -#: templates/settings.php:28 +#: templates/settings.php:41 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Lietotājiem un grupām bāzes DN var norādīt cilnē “Paplašināti”" -#: templates/settings.php:30 +#: templates/settings.php:43 msgid "User DN" msgstr "Lietotāja DN" -#: templates/settings.php:32 +#: templates/settings.php:45 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Klienta lietotāja DN, ar ko veiks sasaisti, piemēram, uid=agent,dc=example,dc=com. Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu." -#: templates/settings.php:33 +#: templates/settings.php:46 msgid "Password" msgstr "Parole" -#: templates/settings.php:36 +#: templates/settings.php:49 msgid "For anonymous access, leave DN and Password empty." msgstr "Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu." -#: templates/settings.php:37 +#: templates/settings.php:50 msgid "User Login Filter" msgstr "Lietotāja ierakstīšanās filtrs" -#: templates/settings.php:40 +#: templates/settings.php:53 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Definē filtru, ko izmantot, kad mēģina ierakstīties. %%uid ierakstīšanās darbībā aizstāj lietotājvārdu." -#: templates/settings.php:41 +#: templates/settings.php:54 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "lieto %%uid vietturi, piemēram, \"uid=%%uid\"" -#: templates/settings.php:42 +#: templates/settings.php:55 msgid "User List Filter" msgstr "Lietotāju saraksta filtrs" -#: templates/settings.php:45 +#: templates/settings.php:58 msgid "Defines the filter to apply, when retrieving users." msgstr "Definē filtru, ko izmantot, kad saņem lietotāju sarakstu." -#: templates/settings.php:46 +#: templates/settings.php:59 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=person\"." -#: templates/settings.php:47 +#: templates/settings.php:60 msgid "Group Filter" msgstr "Grupu filtrs" -#: templates/settings.php:50 +#: templates/settings.php:63 msgid "Defines the filter to apply, when retrieving groups." msgstr "Definē filtru, ko izmantot, kad saņem grupu sarakstu." -#: templates/settings.php:51 +#: templates/settings.php:64 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=posixGroup\"." -#: templates/settings.php:55 +#: templates/settings.php:68 msgid "Connection Settings" msgstr "Savienojuma iestatījumi" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "Configuration Active" msgstr "Konfigurācija ir aktīva" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "When unchecked, this configuration will be skipped." msgstr "Ja nav atzīmēts, šī konfigurācija tiks izlaista." -#: templates/settings.php:58 +#: templates/settings.php:71 msgid "Port" msgstr "Ports" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "Backup (Replica) Host" msgstr "Rezerves (kopija) serveris" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "Norādi rezerves serveri (nav obligāti). Tam ir jābūt galvenā LDAP/AD servera kopijai." -#: templates/settings.php:60 +#: templates/settings.php:73 msgid "Backup (Replica) Port" msgstr "Rezerves (kopijas) ports" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "Disable Main Server" msgstr "Deaktivēt galveno serveri" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "Kad ieslēgts, ownCloud savienosies tikai ar kopijas serveri." -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Use TLS" msgstr "Lietot TLS" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "Neizmanto papildu LDAPS savienojumus! Tas nestrādās." -#: templates/settings.php:63 +#: templates/settings.php:76 msgid "Case insensitve LDAP server (Windows)" msgstr "Reģistrnejutīgs LDAP serveris (Windows)" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Turn off SSL certificate validation." msgstr "Izslēgt SSL sertifikātu validēšanu." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Ja savienojums darbojas ar šo opciju, importē LDAP serveru SSL sertifikātu savā ownCloud serverī." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Not recommended, use for testing only." msgstr "Nav ieteicams, izmanto tikai testēšanai!" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Kešatmiņas dzīvlaiks" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "in seconds. A change empties the cache." msgstr "sekundēs. Izmaiņas iztukšos kešatmiņu." -#: templates/settings.php:67 +#: templates/settings.php:80 msgid "Directory Settings" msgstr "Direktorijas iestatījumi" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "User Display Name Field" msgstr "Lietotāja redzamā vārda lauks" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "LDAP atribūts, ko izmantot lietotāja ownCloud vārda veidošanai." -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "Base User Tree" msgstr "Bāzes lietotāju koks" -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "One User Base DN per line" msgstr "Viena lietotāju bāzes DN rindā" -#: templates/settings.php:71 +#: templates/settings.php:84 msgid "User Search Attributes" msgstr "Lietotāju meklēšanas atribūts" -#: templates/settings.php:71 templates/settings.php:74 +#: templates/settings.php:84 templates/settings.php:87 msgid "Optional; one attribute per line" msgstr "Neobligāti; viens atribūts rindā" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "Group Display Name Field" msgstr "Grupas redzamā nosaukuma lauks" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "LDAP atribūts, ko izmantot grupas ownCloud nosaukuma veidošanai." -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "Base Group Tree" msgstr "Bāzes grupu koks" -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "One Group Base DN per line" msgstr "Viena grupu bāzes DN rindā" -#: templates/settings.php:74 +#: templates/settings.php:87 msgid "Group Search Attributes" msgstr "Grupu meklēšanas atribūts" -#: templates/settings.php:75 +#: templates/settings.php:88 msgid "Group-Member association" msgstr "Grupu piederības asociācija" -#: templates/settings.php:77 +#: templates/settings.php:90 msgid "Special Attributes" msgstr "Īpašie atribūti" -#: templates/settings.php:79 +#: templates/settings.php:92 msgid "Quota Field" -msgstr "" +msgstr "Kvotu lauks" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "Quota Default" -msgstr "" +msgstr "Kvotas noklusējums" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "in bytes" msgstr "baitos" -#: templates/settings.php:81 +#: templates/settings.php:94 msgid "Email Field" -msgstr "" +msgstr "E-pasta lauks" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Lietotāja mājas mapes nosaukšanas kārtula" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu." -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Test Configuration" -msgstr "" +msgstr "Testa konfigurācija" -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Help" msgstr "Palīdzība" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index 7c254cfc0d..f067101a9a 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/core.po @@ -5,6 +5,7 @@ # Translators: # <>, 2013. # <>, 2012. +# Matej Urbančič <>, 2013. # , 2012. # Peter Peroša , 2012. # , 2012. @@ -12,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-08 21:20+0000\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"PO-Revision-Date: 2013-03-09 09:30+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -354,7 +355,7 @@ msgstr "posodobi" #: js/share.js:336 msgid "delete" -msgstr "izbriše" +msgstr "izbriši" #: js/share.js:339 msgid "share" @@ -374,7 +375,7 @@ msgstr "Napaka med nastavljanjem datuma preteka" #: js/share.js:609 msgid "Sending ..." -msgstr "Pošiljam ..." +msgstr "Pošiljanje ..." #: js/share.js:620 msgid "Email sent" @@ -385,11 +386,11 @@ msgid "" "The update was unsuccessful. Please report this issue to the ownCloud " "community." -msgstr "" +msgstr "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu ownCloud." #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud." #: lostpassword/controller.php:48 msgid "ownCloud password reset" @@ -418,11 +419,11 @@ msgstr "Uporabniško Ime" #: lostpassword/templates/lostpassword.php:14 msgid "Request reset" -msgstr "Zahtevaj ponastavitev" +msgstr "Zahtevaj ponovno nastavitev" #: lostpassword/templates/resetpassword.php:4 msgid "Your password was reset" -msgstr "Geslo je ponastavljeno" +msgstr "Geslo je ponovno nastavljeno" #: lostpassword/templates/resetpassword.php:5 msgid "To login page" @@ -492,14 +493,14 @@ msgstr "Brez varnega generatorja naključnih števil lahko napadalec napove žet msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena." #: templates/installation.php:33 msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "Navodila, kako pravilno namestiti strežnik, so na straneh documentacije." #: templates/installation.php:37 msgid "Create an admin account" @@ -511,7 +512,7 @@ msgstr "Napredne možnosti" #: templates/installation.php:57 msgid "Data folder" -msgstr "Mapa s podatki" +msgstr "Podatkovna mapa" #: templates/installation.php:66 msgid "Configure the database" @@ -525,7 +526,7 @@ msgstr "bo uporabljen" #: templates/installation.php:129 msgid "Database user" -msgstr "Uporabnik zbirke" +msgstr "Uporabnik podatkovne zbirke" #: templates/installation.php:134 msgid "Database password" @@ -545,7 +546,7 @@ msgstr "Gostitelj podatkovne zbirke" #: templates/installation.php:162 msgid "Finish setup" -msgstr "Dokončaj namestitev" +msgstr "Končaj namestitev" #: templates/layout.guest.php:40 msgid "web services under your control" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index 9d68e7359b..001412ad69 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -4,6 +4,7 @@ # # Translators: # <>, 2012. +# Matej Urbančič <>, 2013. # , 2012. # Peter Peroša , 2012. # , 2012. @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-08 21:40+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"PO-Revision-Date: 2013-03-09 21:40+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,16 +25,16 @@ msgstr "" #: ajax/move.php:17 #, php-format msgid "Could not move %s - File with this name already exists" -msgstr "" +msgstr "Ni mogoče premakniti %s - datoteka s tem imenom že obstaja" #: ajax/move.php:27 ajax/move.php:30 #, php-format msgid "Could not move %s" -msgstr "" +msgstr "Ni mogoče premakniti %s" #: ajax/rename.php:22 ajax/rename.php:25 msgid "Unable to rename file" -msgstr "" +msgstr "Ni mogoče preimenovati datoteke" #: ajax/upload.php:19 msgid "No file was uploaded. Unknown error" @@ -41,7 +42,7 @@ msgstr "Nobena datoteka ni naložena. Neznana napaka." #: ajax/upload.php:26 msgid "There is no error, the file uploaded with success" -msgstr "Datoteka je uspešno naložena brez napak." +msgstr "Datoteka je uspešno poslana." #: ajax/upload.php:27 msgid "" @@ -52,7 +53,7 @@ msgstr "Naložena datoteka presega dovoljeno velikost. Le-ta je določena z vrst msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form" -msgstr "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu" +msgstr "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML." #: ajax/upload.php:30 msgid "The uploaded file was only partially uploaded" @@ -72,11 +73,11 @@ msgstr "Pisanje na disk je spodletelo" #: ajax/upload.php:51 msgid "Not enough storage available" -msgstr "" +msgstr "Na voljo ni dovolj prostora" #: ajax/upload.php:82 msgid "Invalid directory." -msgstr "" +msgstr "Neveljavna mapa." #: appinfo/app.php:10 msgid "Files" @@ -125,15 +126,15 @@ msgstr "razveljavi" #: js/filelist.js:323 msgid "perform delete operation" -msgstr "" +msgstr "izvedi opravilo brisanja" #: js/files.js:52 msgid "'.' is an invalid file name." -msgstr "" +msgstr "'.' je neveljavno ime datoteke." #: js/files.js:56 msgid "File name cannot be empty." -msgstr "" +msgstr "Ime datoteke ne sme biti prazno." #: js/files.js:64 msgid "" @@ -143,17 +144,17 @@ msgstr "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' ni #: js/files.js:78 msgid "Your storage is full, files can not be updated or synced anymore!" -msgstr "" +msgstr "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!" #: js/files.js:82 msgid "Your storage is almost full ({usedSpacePercent}%)" -msgstr "" +msgstr "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)" #: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." -msgstr "" +msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen." #: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" @@ -161,7 +162,7 @@ msgstr "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 #: js/files.js:263 msgid "Upload Error" -msgstr "Napaka med nalaganjem" +msgstr "Napaka med pošiljanjem" #: js/files.js:274 msgid "Close" @@ -190,7 +191,7 @@ msgstr "Naslov URL ne sme biti prazen." #: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" -msgstr "" +msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud" #: js/files.js:954 templates/index.php:68 msgid "Name" @@ -238,7 +239,7 @@ msgstr "največ mogoče:" #: templates/admin.php:15 msgid "Needed for multi-file and folder downloads." -msgstr "Uporabljeno za prenos več datotek in map." +msgstr "Uporabljeno za prejem več datotek in map." #: templates/admin.php:17 msgid "Enable ZIP-download" @@ -246,7 +247,7 @@ msgstr "Omogoči prejemanje arhivov ZIP" #: templates/admin.php:20 msgid "0 is unlimited" -msgstr "0 je neskončno" +msgstr "0 predstavlja neomejeno vrednost" #: templates/admin.php:22 msgid "Maximum input size for ZIP files" @@ -274,7 +275,7 @@ msgstr "Iz povezave" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "Izbrisane datoteke" #: templates/index.php:46 msgid "Cancel upload" @@ -282,11 +283,11 @@ msgstr "Prekliči pošiljanje" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Za to mesto ni ustreznih dovoljenj za pisanje." #: templates/index.php:60 msgid "Nothing in here. Upload something!" -msgstr "Tukaj ni ničesar. Naložite kaj!" +msgstr "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!" #: templates/index.php:74 msgid "Download" @@ -298,13 +299,13 @@ msgstr "Odstrani iz souporabe" #: templates/index.php:106 msgid "Upload too large" -msgstr "Nalaganje ni mogoče, ker je preveliko" +msgstr "Prekoračenje omejitve velikosti" #: templates/index.php:108 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." -msgstr "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku." +msgstr "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku." #: templates/index.php:113 msgid "Files are being scanned, please wait." @@ -316,4 +317,4 @@ msgstr "Trenutno poteka preučevanje" #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." -msgstr "" +msgstr "Nadgrajevanje predpomnilnika datotečnega sistema ..." diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po index 00395c37a2..9d62304a4d 100644 --- a/l10n/sl/files_sharing.po +++ b/l10n/sl/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-23 02:02+0200\n" -"PO-Revision-Date: 2012-10-22 16:59+0000\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"PO-Revision-Date: 2013-03-09 18:42+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -27,24 +27,24 @@ msgstr "Geslo" msgid "Submit" msgstr "Pošlji" -#: templates/public.php:9 +#: templates/public.php:10 #, php-format msgid "%s shared the folder %s with you" msgstr "Oseba %s je določila mapo %s za souporabo" -#: templates/public.php:11 +#: templates/public.php:13 #, php-format msgid "%s shared the file %s with you" msgstr "Oseba %s je določila datoteko %s za souporabo" -#: templates/public.php:14 templates/public.php:30 +#: templates/public.php:19 templates/public.php:37 msgid "Download" msgstr "Prejmi" -#: templates/public.php:29 +#: templates/public.php:34 msgid "No preview available for" msgstr "Predogled ni na voljo za" -#: templates/public.php:35 +#: templates/public.php:43 msgid "web services under your control" msgstr "spletne storitve pod vašim nadzorom" diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po index bff8d31296..d7643659a2 100644 --- a/l10n/sl/files_trashbin.po +++ b/l10n/sl/files_trashbin.po @@ -4,12 +4,13 @@ # # Translators: # <>, 2013. +# Matej Urbančič <>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-08 21:40+0000\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"PO-Revision-Date: 2013-03-09 19:30+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -21,7 +22,7 @@ msgstr "" #: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" -msgstr "Datoteke %s ni mogoče trajno izbrisati." +msgstr "Datoteke %s ni mogoče dokončno izbrisati." #: ajax/undelete.php:41 #, php-format @@ -34,11 +35,11 @@ msgstr "izvedi opravilo obnavljanja" #: js/trash.js:34 msgid "delete file permanently" -msgstr "izbriši datoteko trajno" +msgstr "dokončno izbriši datoteko" #: js/trash.js:121 msgid "Delete permanently" -msgstr "Izbriši trajno" +msgstr "Izbriši dokončno" #: js/trash.js:174 templates/index.php:17 msgid "Name" @@ -46,7 +47,7 @@ msgstr "Ime" #: js/trash.js:175 templates/index.php:27 msgid "Deleted" -msgstr "izbrisano" +msgstr "Izbrisano" #: js/trash.js:184 msgid "1 folder" diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po index fbe59ad8f5..29df321b54 100644 --- a/l10n/sl/lib.po +++ b/l10n/sl/lib.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-08 22:10+0000\n" +"POT-Creation-Date: 2013-03-10 00:06+0100\n" +"PO-Revision-Date: 2013-03-09 07:30+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -103,38 +103,38 @@ msgstr "Določi podatkovno mapo." #: setup.php:55 #, php-format msgid "%s enter the database username." -msgstr "" +msgstr "%s - vnos uporabniškega imena podatkovne zbirke." #: setup.php:58 #, php-format msgid "%s enter the database name." -msgstr "" +msgstr "%s - vnos imena podatkovne zbirke." #: setup.php:61 #, php-format msgid "%s you may not use dots in the database name" -msgstr "" +msgstr "%s - v imenu podatkovne zbirke ni dovoljeno vpisati pik." #: setup.php:64 #, php-format msgid "%s set the database host." -msgstr "" +msgstr "%s - vnos gostitelja podatkovne zbirke." #: setup.php:128 setup.php:320 setup.php:365 msgid "PostgreSQL username and/or password not valid" -msgstr "" +msgstr "Uporabniško ime ali geslo PostgreSQL ni pravilno" #: setup.php:129 setup.php:152 setup.php:229 msgid "You need to enter either an existing account or the administrator." -msgstr "" +msgstr "Prijaviti se je treba v obstoječi ali pa skrbniški račun." #: setup.php:151 setup.php:453 setup.php:520 msgid "Oracle username and/or password not valid" -msgstr "" +msgstr "Uporabniško ime ali geslo Oracle ni pravilno" #: setup.php:228 msgid "MySQL username and/or password not valid" -msgstr "" +msgstr "Uporabniško ime ali geslo MySQL ni pravilno" #: setup.php:282 setup.php:386 setup.php:395 setup.php:413 setup.php:423 #: setup.php:432 setup.php:461 setup.php:527 setup.php:553 setup.php:560 @@ -149,35 +149,35 @@ msgstr "Napaka podatkovne zbirke: \"%s\"" #: setup.php:572 setup.php:588 setup.php:596 setup.php:605 #, php-format msgid "Offending command was: \"%s\"" -msgstr "" +msgstr "Napačni ukaz je: \"%s\"" #: setup.php:299 #, php-format msgid "MySQL user '%s'@'localhost' exists already." -msgstr "" +msgstr "Uporabnik MySQL '%s'@'localhost' že obstaja." #: setup.php:300 msgid "Drop this user from MySQL" -msgstr "" +msgstr "Odstrani uporabnika s podatkovne zbirke MySQL" #: setup.php:305 #, php-format msgid "MySQL user '%s'@'%%' already exists" -msgstr "" +msgstr "Uporabnik MySQL '%s'@'%%' že obstaja." #: setup.php:306 msgid "Drop this user from MySQL." -msgstr "" +msgstr "Odstrani uporabnika s podatkovne zbirke MySQL" #: setup.php:579 setup.php:611 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" -msgstr "" +msgstr "Napačni ukaz je: \"%s\", ime: %s, geslo: %s" #: setup.php:631 #, php-format msgid "MS SQL username and/or password not valid: %s" -msgstr "" +msgstr "Uporabniško ime ali geslo MS SQL ni pravilno: %s" #: setup.php:849 msgid "" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index e000105776..b754bc7992 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/settings.po @@ -5,6 +5,7 @@ # Translators: # <>, 2013. # <>, 2012. +# Matej Urbančič <>, 2013. # , 2012. # Peter Peroša , 2012-2013. # , 2011, 2012. @@ -12,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-08 21:30+0000\n" +"POT-Creation-Date: 2013-03-10 00:06+0100\n" +"PO-Revision-Date: 2013-03-09 22:50+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -386,7 +387,7 @@ msgstr "Podpora strankam" #: templates/personal.php:8 #, php-format msgid "You have used %s of the available %s" -msgstr "Uporabljate %s od razpoložljivih %s" +msgstr "Uporabljenega je %s od razpoložljivih %s prostora." #: templates/personal.php:15 msgid "Get the apps to sync your files" @@ -442,11 +443,11 @@ msgstr "Elektronska pošta" #: templates/personal.php:72 msgid "Your email address" -msgstr "Vaš elektronski naslov" +msgstr "Osebni elektronski naslov" #: templates/personal.php:73 msgid "Fill in an email address to enable password recovery" -msgstr "Vpišite vaš elektronski naslov in s tem omogočite obnovitev gesla" +msgstr "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla" #: templates/personal.php:79 templates/personal.php:80 msgid "Language" diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po index b47b53e154..033d398089 100644 --- a/l10n/sl/user_ldap.po +++ b/l10n/sl/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-08 22:03+0000\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"PO-Revision-Date: 2013-03-09 13:10+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" #: ajax/deleteConfiguration.php:34 msgid "Failed to delete the server configuration" -msgstr "" +msgstr "Brisanje nastavitev strežnika je spodletelo." #: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" @@ -66,24 +66,24 @@ msgstr "" #: js/settings.js:136 msgid "Do you really want to delete the current Server Configuration?" -msgstr "" +msgstr "Ali res želite izbrisati trenutne nastavitve strežnika?" #: js/settings.js:137 msgid "Confirm Deletion" -msgstr "" +msgstr "Potrdi brisanje" #: templates/settings.php:8 msgid "" "Warning: Apps user_ldap and user_webdavauth are incompatible. You may" " experience unexpected behaviour. Please ask your system administrator to " "disable one of them." -msgstr "Opozorilo: Aplikaciji user_ldap in user_webdavauth nista združljivi. Morda boste opazili nepričakovano obnašanje sistema. Prosimo, prosite vašega skrbnika, da eno od aplikacij onemogoči." +msgstr "Opozorilo: možnosti user_ldap in user_webdavauth nista združljivi. Pri uporabi je mogoče nepričakovano obnašanje sistema. Eno izmed možnosti je priporočeno onemgočiti." #: templates/settings.php:11 msgid "" "Warning: The PHP LDAP module is not installed, the backend will not " "work. Please ask your system administrator to install it." -msgstr "" +msgstr "Opozorilo: modul PHP LDAP mora biti nameščen, sicer vmesnik ne bo deloval. Paket je treba namestiti." #: templates/settings.php:15 msgid "Server configuration" @@ -91,7 +91,7 @@ msgstr "" #: templates/settings.php:31 msgid "Add Server Configuration" -msgstr "" +msgstr "Dodaj nastavitve strežnika" #: templates/settings.php:36 msgid "Host" @@ -131,7 +131,7 @@ msgstr "Geslo" #: templates/settings.php:49 msgid "For anonymous access, leave DN and Password empty." -msgstr "Za anonimni dostop sta polji DN in geslo prazni." +msgstr "Za brezimni dostop sta polji DN in geslo prazni." #: templates/settings.php:50 msgid "User Login Filter" @@ -142,7 +142,7 @@ msgstr "Filter prijav uporabnikov" msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." -msgstr "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime za prijavo." +msgstr "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime v postopku prijave." #: templates/settings.php:54 #, php-format @@ -205,7 +205,7 @@ msgstr "" #: templates/settings.php:74 msgid "Disable Main Server" -msgstr "" +msgstr "Onemogoči glavni strežnik" #: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." @@ -225,13 +225,13 @@ msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)" #: templates/settings.php:77 msgid "Turn off SSL certificate validation." -msgstr "Onemogoči potrditev veljavnosti potrdila SSL." +msgstr "Onemogoči določanje veljavnosti potrdila SSL." #: templates/settings.php:77 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." -msgstr "V primeru, da povezava deluje le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud." +msgstr "Kadar deluje povezava le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud." #: templates/settings.php:77 msgid "Not recommended, use for testing only." @@ -263,7 +263,7 @@ msgstr "Osnovno uporabniško drevo" #: templates/settings.php:83 msgid "One User Base DN per line" -msgstr "" +msgstr "Eno osnovno uporabniško ime DN na vrstico" #: templates/settings.php:84 msgid "User Search Attributes" @@ -287,15 +287,15 @@ msgstr "Osnovno drevo skupine" #: templates/settings.php:86 msgid "One Group Base DN per line" -msgstr "" +msgstr "Eno osnovno ime skupine DN na vrstico" #: templates/settings.php:87 msgid "Group Search Attributes" -msgstr "" +msgstr "Atributi iskanja skupine" #: templates/settings.php:88 msgid "Group-Member association" -msgstr "Povezava člana skupine" +msgstr "Povezava član-skupina" #: templates/settings.php:90 msgid "Special Attributes" @@ -303,11 +303,11 @@ msgstr "Posebni atributi" #: templates/settings.php:92 msgid "Quota Field" -msgstr "" +msgstr "Polje količinske omejitve" #: templates/settings.php:93 msgid "Quota Default" -msgstr "" +msgstr "Privzeta količinska omejitev" #: templates/settings.php:93 msgid "in bytes" @@ -325,11 +325,11 @@ msgstr "" msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." -msgstr "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite atribut LDAP/AD." +msgstr "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD." #: templates/settings.php:99 msgid "Test Configuration" -msgstr "" +msgstr "Preizkusne nastavitve" #: templates/settings.php:99 msgid "Help" diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po index 999e85d2a9..829fe4d8a1 100644 --- a/l10n/sl/user_webdavauth.po +++ b/l10n/sl/user_webdavauth.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-08 21:55+0000\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"PO-Revision-Date: 2013-03-09 19:30+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -32,4 +32,4 @@ msgid "" "ownCloud will send the user credentials to this URL. This plugin checks the " "response and will interpret the HTTP statuscodes 401 and 403 as invalid " "credentials, and all other responses as valid credentials." -msgstr "Sistem ownCloud bo poslal uporabniška poverila na naveden naslov URL. Ta vstavek preveri odziv in tolmači kode stanja HTTP 401 in HTTP 403 kot spodletel odgovor in vse ostale odzive kot veljavna poverila." +msgstr "Sistem ownCloud bo poslal uporabniška poverila na navedeni naslov URL. Ta vstavek preveri odziv in tolmači kode stanja HTTP 401 in HTTP 403 kot spodletel odgovor in vse ostale odzive kot veljavna poverila." diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 9ded8a4593..feab728aed 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index eee8f7c008..caa14bb36c 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index e2a04a566c..9474683d87 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 523c37cb80..46611588b0 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index b418a05153..f13a790262 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 352b935eb3..894026db9a 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 48a03c3a4b..700851f2ac 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 1f7994c510..fc63c0fa4d 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"POT-Creation-Date: 2013-03-10 00:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index a7761ecfbf..bd0d0eef80 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"POT-Creation-Date: 2013-03-10 00:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 82b4e23a8a..2c349216ff 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 98481b5650..3ba0952c2d 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" +"POT-Creation-Date: 2013-03-10 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php index 64b5653ef5..58c3ddf141 100644 --- a/lib/l10n/sl.php +++ b/lib/l10n/sl.php @@ -19,7 +19,22 @@ "Set an admin username." => "Nastavi uporabniško ime skrbnika.", "Set an admin password." => "Nastavi geslo skrbnika.", "Specify a data folder." => "Določi podatkovno mapo.", +"%s enter the database username." => "%s - vnos uporabniškega imena podatkovne zbirke.", +"%s enter the database name." => "%s - vnos imena podatkovne zbirke.", +"%s you may not use dots in the database name" => "%s - v imenu podatkovne zbirke ni dovoljeno vpisati pik.", +"%s set the database host." => "%s - vnos gostitelja podatkovne zbirke.", +"PostgreSQL username and/or password not valid" => "Uporabniško ime ali geslo PostgreSQL ni pravilno", +"You need to enter either an existing account or the administrator." => "Prijaviti se je treba v obstoječi ali pa skrbniški račun.", +"Oracle username and/or password not valid" => "Uporabniško ime ali geslo Oracle ni pravilno", +"MySQL username and/or password not valid" => "Uporabniško ime ali geslo MySQL ni pravilno", "DB Error: \"%s\"" => "Napaka podatkovne zbirke: \"%s\"", +"Offending command was: \"%s\"" => "Napačni ukaz je: \"%s\"", +"MySQL user '%s'@'localhost' exists already." => "Uporabnik MySQL '%s'@'localhost' že obstaja.", +"Drop this user from MySQL" => "Odstrani uporabnika s podatkovne zbirke MySQL", +"MySQL user '%s'@'%%' already exists" => "Uporabnik MySQL '%s'@'%%' že obstaja.", +"Drop this user from MySQL." => "Odstrani uporabnika s podatkovne zbirke MySQL", +"Offending command was: \"%s\", name: %s, password: %s" => "Napačni ukaz je: \"%s\", ime: %s, geslo: %s", +"MS SQL username and/or password not valid: %s" => "Uporabniško ime ali geslo MS SQL ni pravilno: %s", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena.", "Please double check the installation guides." => "Preverite navodila namestitve.", "seconds ago" => "pred nekaj sekundami", diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php index 01fddd94c0..13547c1430 100644 --- a/settings/l10n/sl.php +++ b/settings/l10n/sl.php @@ -77,7 +77,7 @@ "Forum" => "Forum", "Bugtracker" => "Sledilnik hroščev", "Commercial Support" => "Podpora strankam", -"You have used %s of the available %s" => "Uporabljate %s od razpoložljivih %s", +"You have used %s of the available %s" => "Uporabljenega je %s od razpoložljivih %s prostora.", "Get the apps to sync your files" => "Pridobi programe za usklajevanje datotek", "Show First Run Wizard again" => "Zaženi čarovnika prvega zagona", "Password" => "Geslo", @@ -91,8 +91,8 @@ "Unable to change your display name" => "Prikazanega imena ni mogoče spremeniti.", "Change display name" => "Spremeni prikazano ime", "Email" => "Elektronska pošta", -"Your email address" => "Vaš elektronski naslov", -"Fill in an email address to enable password recovery" => "Vpišite vaš elektronski naslov in s tem omogočite obnovitev gesla", +"Your email address" => "Osebni elektronski naslov", +"Fill in an email address to enable password recovery" => "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla", "Language" => "Jezik", "Help translate" => "Sodelujte pri prevajanju", "WebDAV" => "WebDAV", From be4806d0314e9b6a4e2487456e4c80b8fac3377b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 10 Mar 2013 02:25:03 +0100 Subject: [PATCH 053/546] Store the global mount configuration file in the datadir --- apps/files_external/lib/config.php | 6 ++++-- lib/files/filesystem.php | 11 ++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 430269e03d..11d24045fd 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -307,8 +307,9 @@ class OC_Mount_Config { $phpFile = OC_User::getHome(OCP\User::getUser()).'/mount.php'; $jsonFile = OC_User::getHome(OCP\User::getUser()).'/mount.json'; } else { + $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); $phpFile = OC::$SERVERROOT.'/config/mount.php'; - $jsonFile = OC::$SERVERROOT.'/config/mount.json'; + $jsonFile = $datadir . '/mount.json'; } if (is_file($jsonFile)) { $mountPoints = json_decode(file_get_contents($jsonFile), true); @@ -333,7 +334,8 @@ class OC_Mount_Config { if ($isPersonal) { $file = OC_User::getHome(OCP\User::getUser()).'/mount.json'; } else { - $file = OC::$SERVERROOT.'/config/mount.json'; + $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); + $file = $datadir . '/mount.json'; } $content = json_encode($data); @file_put_contents($file, $content); diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index 0bbd7550d7..40fef674a0 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -221,11 +221,16 @@ class Filesystem { $root = \OC_User::getHome($user); self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user); + $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); + //move config file to it's new position + if (is_file(\OC::$SERVERROOT . '/config/mount.json')) { + rename(\OC::$SERVERROOT . '/config/mount.json', $datadir . '/mount.json'); + } // Load system mount points - if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file(\OC::$SERVERROOT . '/config/mount.json')) { - if (is_file(\OC::$SERVERROOT . '/config/mount.json')) { - $mountConfig = json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mount.json'), true); + if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file($datadir . '/mount.json')) { + if (is_file($datadir . '/mount.json')) { + $mountConfig = json_decode(file_get_contents($datadir . '/mount.json'), true); } elseif (is_file(\OC::$SERVERROOT . '/config/mount.php')) { $mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php')); } From 8a5946fadc12b7327263eb1ec6bdb70a9718dd3e Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 9 Mar 2013 21:09:31 -0500 Subject: [PATCH 054/546] Fix variable for mounting for all users, fix #357 --- lib/files/filesystem.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index 0bbd7550d7..d7cbb70032 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -249,7 +249,7 @@ class Filesystem { } if (isset($mountConfig['user'])) { foreach ($mountConfig['user'] as $mountUser => $mounts) { - if ($user === 'all' or strtolower($mountUser) === strtolower($user)) { + if ($mountUser === 'all' or strtolower($mountUser) === strtolower($user)) { foreach ($mounts as $mountPoint => $options) { $mountPoint = self::setUserVars($user, $mountPoint); foreach ($options as &$option) { From 07f88424c8ea8db1bee3cc2d96743364a24e8274 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Sun, 10 Mar 2013 18:34:56 +0100 Subject: [PATCH 055/546] LDAP: fancy version for release, no code change --- apps/user_ldap/appinfo/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version index e619108dd6..60a2d3e96c 100644 --- a/apps/user_ldap/appinfo/version +++ b/apps/user_ldap/appinfo/version @@ -1 +1 @@ -0.3.9.5 \ No newline at end of file +0.4.0 \ No newline at end of file From 1e07801c95b367f9e4c0d8f58c3796a116084310 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 11 Mar 2013 13:30:06 +0100 Subject: [PATCH 056/546] LDAP: compatibility with Novell eDirectory UUID --- apps/user_ldap/lib/access.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index a8cfd45bf4..90d026962d 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -84,7 +84,7 @@ abstract class Access { for($i=0;$i<$result[$attr]['count'];$i++) { if($this->resemblesDN($attr)) { $values[] = $this->sanitizeDN($result[$attr][$i]); - } elseif(strtolower($attr) == 'objectguid') { + } elseif(strtolower($attr) == 'objectguid' || strtolower($attr) == 'guid') { $values[] = $this->convertObjectGUID2Str($result[$attr][$i]); } else { $values[] = $result[$attr][$i]; @@ -895,7 +895,7 @@ abstract class Access { } //for now, supported (known) attributes are entryUUID, nsuniqueid, objectGUID - $testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid'); + $testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid'); foreach($testAttributes as $attribute) { \OCP\Util::writeLog('user_ldap', 'Testing '.$attribute.' as UUID attr', \OCP\Util::DEBUG); From 569c7ab1384c9d01255ae7bc2075edf11508d4a6 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 12 Mar 2013 00:14:05 +0100 Subject: [PATCH 057/546] [tx-robot] updated from transifex --- apps/files/l10n/sl.php | 16 ++-- apps/files_external/l10n/sl.php | 10 ++- apps/files_trashbin/l10n/hu_HU.php | 3 +- apps/user_ldap/l10n/de.php | 6 ++ apps/user_ldap/l10n/sl.php | 20 +++++ core/l10n/sl.php | 44 ++++----- l10n/de/user_ldap.po | 134 ++++++++++++++-------------- l10n/hu_HU/files_trashbin.po | 9 +- l10n/sl/core.po | 114 +++++++++++------------ l10n/sl/files.po | 22 ++--- l10n/sl/files_external.po | 23 ++--- l10n/sl/files_sharing.po | 4 +- l10n/sl/lib.po | 8 +- l10n/sl/settings.po | 20 ++--- l10n/sl/user_ldap.po | 44 ++++----- l10n/templates/core.pot | 68 +++++++------- l10n/templates/files.pot | 4 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 6 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- lib/l10n/sl.php | 4 +- settings/l10n/sl.php | 13 +-- 28 files changed, 311 insertions(+), 277 deletions(-) diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index 9c86ffcfef..01405530ff 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -2,9 +2,9 @@ "Could not move %s - File with this name already exists" => "Ni mogoče premakniti %s - datoteka s tem imenom že obstaja", "Could not move %s" => "Ni mogoče premakniti %s", "Unable to rename file" => "Ni mogoče preimenovati datoteke", -"No file was uploaded. Unknown error" => "Nobena datoteka ni naložena. Neznana napaka.", +"No file was uploaded. Unknown error" => "Ni poslane nobene datoteke. Neznana napaka.", "There is no error, the file uploaded with success" => "Datoteka je uspešno poslana.", -"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Naložena datoteka presega dovoljeno velikost. Le-ta je določena z vrstico upload_max_filesize v datoteki php.ini:", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML.", "The uploaded file was only partially uploaded" => "Datoteka je le delno naložena", "No file was uploaded" => "Nobena datoteka ni bila naložena", @@ -21,24 +21,24 @@ "replace" => "zamenjaj", "suggest name" => "predlagaj ime", "cancel" => "prekliči", -"replaced {new_name} with {old_name}" => "zamenjano ime {new_name} z imenom {old_name}", +"replaced {new_name} with {old_name}" => "preimenovano ime {new_name} z imenom {old_name}", "undo" => "razveljavi", "perform delete operation" => "izvedi opravilo brisanja", "'.' is an invalid file name." => "'.' je neveljavno ime datoteke.", -"File name cannot be empty." => "Ime datoteke ne sme biti prazno.", +"File name cannot be empty." => "Ime datoteke ne sme biti prazno polje.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.", "Your storage is full, files can not be updated or synced anymore!" => "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!", "Your storage is almost full ({usedSpacePercent}%)" => "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)", -"Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen.", +"Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika.", "Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov.", "Upload Error" => "Napaka med pošiljanjem", "Close" => "Zapri", "1 file uploading" => "Pošiljanje 1 datoteke", -"{count} files uploading" => "nalagam {count} datotek", +"{count} files uploading" => "pošiljanje {count} datotek", "Upload cancelled." => "Pošiljanje je preklicano.", "File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.", -"URL cannot be empty." => "Naslov URL ne sme biti prazen.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud", +"URL cannot be empty." => "Naslov URL ne sme biti prazna vrednost.", +"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud.", "Name" => "Ime", "Size" => "Velikost", "Modified" => "Spremenjeno", diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php index 5614c93585..4ff2eed3bf 100644 --- a/apps/files_external/l10n/sl.php +++ b/apps/files_external/l10n/sl.php @@ -2,21 +2,23 @@ "Access granted" => "Dostop je odobren", "Error configuring Dropbox storage" => "Napaka nastavljanja shrambe Dropbox", "Grant access" => "Odobri dostop", -"Please provide a valid Dropbox app key and secret." => "Vpišite veljaven ključ programa in kodo za Dropbox", +"Please provide a valid Dropbox app key and secret." => "Vpisati je treba veljaven ključ programa in kodo za Dropbox", "Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive", -"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Opozorilo: \"smbclient\" ni nameščen. Priklapljanje CIFS/SMB pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če ga namesti.", -"Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Opozorilo: FTP podpora v PHP ni omogočena ali nameščena. Priklapljanje FTP pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če jo namesti ali omogoči.", +"Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Opozorilo: paket \"smbclient\" ni nameščen. Priklapljanje pogonov CIFS/SMB ne bo mogoče.", +"Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Opozorilo: podpora FTP v PHP ni omogočena ali pa ni nameščena. Priklapljanje pogonov FTP zato ni mogoče.", "External Storage" => "Zunanja podatkovna shramba", "Folder name" => "Ime mape", +"External storage" => "Zunanja shramba", "Configuration" => "Nastavitve", "Options" => "Možnosti", "Applicable" => "Se uporablja", +"Add storage" => "Dodaj shrambo", "None set" => "Ni nastavljeno", "All Users" => "Vsi uporabniki", "Groups" => "Skupine", "Users" => "Uporabniki", "Delete" => "Izbriši", -"Enable User External Storage" => "Omogoči uporabo zunanje podatkovne shrambe za uporabnike", +"Enable User External Storage" => "Omogoči uporabniško zunanjo podatkovno shrambo", "Allow users to mount their own external storage" => "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe", "SSL root certificates" => "Korenska potrdila SSL", "Import Root Certificate" => "Uvozi korensko potrdilo" diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php index 9c158c2b9e..1d86190daa 100644 --- a/apps/files_trashbin/l10n/hu_HU.php +++ b/apps/files_trashbin/l10n/hu_HU.php @@ -12,5 +12,6 @@ "{count} files" => "{count} fájl", "Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!", "Restore" => "Visszaállítás", -"Delete" => "Törlés" +"Delete" => "Törlés", +"Deleted Files" => "Törölt fájlok" ); diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php index 6217a6d482..399bfdc037 100644 --- a/apps/user_ldap/l10n/de.php +++ b/apps/user_ldap/l10n/de.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.", "Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.", +"Cache Time-To-Live" => "Speichere Time-To-Live zwischen", "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.", "Directory Settings" => "Ordnereinstellungen", "User Display Name Field" => "Feld für den Anzeigenamen des Benutzers", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Gruppensucheigenschaften", "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer", "Special Attributes" => "Spezielle Eigenschaften", +"Quota Field" => "Kontingent Feld", +"Quota Default" => "Kontingent Standard", "in bytes" => "in Bytes", +"Email Field" => "E-Mail Feld", +"User Home Folder Naming Rule" => "Benennungsregel für das Heimatverzeichnis des Benutzers", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.", +"Test Configuration" => "Testkonfiguration", "Help" => "Hilfe" ); diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php index 9508d49557..22ed5dc2f7 100644 --- a/apps/user_ldap/l10n/sl.php +++ b/apps/user_ldap/l10n/sl.php @@ -1,15 +1,24 @@ "Brisanje nastavitev strežnika je spodletelo.", +"The configuration is valid and the connection could be established!" => "Nastavitev je veljavna, zato je povezavo mogoče vzpostaviti!", +"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Nastavitev je veljavna, vendar pa je vez Bind spodletela. Preveriti je treba nastavitve strežnika in ustreznost poveril.", +"The configuration is invalid. Please look in the ownCloud log for further details." => "Nastavitev je veljavna. Več podrobnosti je zapisanih v dnevniku ownCloud.", "Deletion failed" => "Brisanje je spodletelo.", +"Take over settings from recent server configuration?" => "Ali naj se prevzame nastavitve nedavne nastavitve strežnika?", "Keep settings?" => "Ali nas se nastavitve ohranijo?", +"Cannot add server configuration" => "Ni mogoče dodati nastavitev strežnika", +"Connection test succeeded" => "Preizkus povezave je uspešno končan.", +"Connection test failed" => "Preizkus povezave je spodletel.", "Do you really want to delete the current Server Configuration?" => "Ali res želite izbrisati trenutne nastavitve strežnika?", "Confirm Deletion" => "Potrdi brisanje", "Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "Opozorilo: možnosti user_ldap in user_webdavauth nista združljivi. Pri uporabi je mogoče nepričakovano obnašanje sistema. Eno izmed možnosti je priporočeno onemgočiti.", "Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "Opozorilo: modul PHP LDAP mora biti nameščen, sicer vmesnik ne bo deloval. Paket je treba namestiti.", +"Server configuration" => "Nastavitev strežnika", "Add Server Configuration" => "Dodaj nastavitve strežnika", "Host" => "Gostitelj", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://", "Base DN" => "Osnovni DN", +"One Base DN per line" => "En osnovni DN na vrstico", "You can specify Base DN for users and groups in the Advanced tab" => "Osnovni DN za uporabnike in skupine lahko določite v zavihku naprednih možnosti.", "User DN" => "Uporabnik DN", "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za brezimni dostop sta polji DN in geslo prazni.", @@ -25,19 +34,29 @@ "Defines the filter to apply, when retrieving groups." => "Določi filter za uporabo med pridobivanjem skupin.", "without any placeholder, e.g. \"objectClass=posixGroup\"." => "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\".", "Connection Settings" => "Nastavitve povezave", +"Configuration Active" => "Dejavna nastavitev", +"When unchecked, this configuration will be skipped." => "Neizbrana možnost preskoči nastavitev.", "Port" => "Vrata", +"Backup (Replica) Host" => "Varnostna kopija (replika) podatkov gostitelja", +"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD.", +"Backup (Replica) Port" => "Varnostna kopija (replika) podatka vrat", "Disable Main Server" => "Onemogoči glavni strežnik", +"When switched on, ownCloud will only connect to the replica server." => "Ob priklopu bo strežnik ownCloud povezan le z kopijo (repliko) strežnika.", "Use TLS" => "Uporabi TLS", +"Do not use it additionally for LDAPS connections, it will fail." => "Strežnika ni priporočljivo uporabljati za povezave LDAPS. Povezava bo spodletela.", "Case insensitve LDAP server (Windows)" => "Strežnik LDAP ne upošteva velikosti črk (Windows)", "Turn off SSL certificate validation." => "Onemogoči določanje veljavnosti potrdila SSL.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Kadar deluje povezava le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud.", "Not recommended, use for testing only." => "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja.", +"Cache Time-To-Live" => "Predpomni podatke TTL", "in seconds. A change empties the cache." => "v sekundah. Sprememba izprazni predpomnilnik.", "Directory Settings" => "Nastavitve mape", "User Display Name Field" => "Polje za uporabnikovo prikazano ime", "The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud.", "Base User Tree" => "Osnovno uporabniško drevo", "One User Base DN per line" => "Eno osnovno uporabniško ime DN na vrstico", +"User Search Attributes" => "Uporabi atribute iskanja", +"Optional; one attribute per line" => "Izbirno; en atribut na vrstico", "Group Display Name Field" => "Polje za prikazano ime skupine", "The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud.", "Base Group Tree" => "Osnovno drevo skupine", @@ -49,6 +68,7 @@ "Quota Default" => "Privzeta količinska omejitev", "in bytes" => "v bajtih", "Email Field" => "Polje elektronske pošte", +"User Home Folder Naming Rule" => "Pravila poimenovanja uporabniške osebne mape", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD.", "Test Configuration" => "Preizkusne nastavitve", "Help" => "Pomoč" diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 747aa1c2a2..502a37cb31 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -1,16 +1,16 @@ "Uporanik %s je dal datoteko v souporabo z vami", -"User %s shared a folder with you" => "Uporanik %s je dal mapo v souporabo z vami", -"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s", -"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s", +"User %s shared a file with you" => "Uporabnik %s je omogočil souporabo datoteke", +"User %s shared a folder with you" => "Uporabnik %s je omogočil souporabo mape", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporabnik %s je omogočil souporabo datoteke \"%s\". Prejmete jo lahko preko povezave: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporabnik %s je omogočil souporabo mape \"%s\". Prejmete jo lahko preko povezave: %s", "Category type not provided." => "Vrsta kategorije ni podana.", -"No category to add?" => "Ni kategorije za dodajanje?", +"No category to add?" => "Ali ni kategorije za dodajanje?", "This category already exists: %s" => "Kategorija že obstaja: %s", "Object type not provided." => "Vrsta predmeta ni podana.", -"%s ID not provided." => "%s ID ni podan.", -"Error adding %s to favorites." => "Napaka pri dodajanju %s med priljubljene.", +"%s ID not provided." => "ID %s ni podan.", +"Error adding %s to favorites." => "Napaka dodajanja %s med priljubljene predmete.", "No categories selected for deletion." => "Za izbris ni izbrana nobena kategorija.", -"Error removing %s from favorites." => "Napaka pri odstranjevanju %s iz priljubljenih.", +"Error removing %s from favorites." => "Napaka odstranjevanja %s iz priljubljenih predmetov.", "Sunday" => "nedelja", "Monday" => "ponedeljek", "Tuesday" => "torek", @@ -51,7 +51,7 @@ "Ok" => "V redu", "The object type is not specified." => "Vrsta predmeta ni podana.", "Error" => "Napaka", -"The app name is not specified." => "Ime aplikacije ni podano.", +"The app name is not specified." => "Ime programa ni podano.", "The required file {file} is not installed!" => "Zahtevana datoteka {file} ni nameščena!", "Shared" => "V souporabi", "Share" => "Souporaba", @@ -61,16 +61,16 @@ "Shared with you and the group {group} by {owner}" => "V souporabi z vami in skupino {group}. Lastnik je {owner}.", "Shared with you by {owner}" => "V souporabi z vami. Lastnik je {owner}.", "Share with" => "Omogoči souporabo z", -"Share with link" => "Omogoči souporabo s povezavo", +"Share with link" => "Omogoči souporabo preko povezave", "Password protect" => "Zaščiti z geslom", "Password" => "Geslo", -"Email link to person" => "Posreduj povezavo po e-pošti", +"Email link to person" => "Posreduj povezavo po elektronski pošti", "Send" => "Pošlji", "Set expiration date" => "Nastavi datum preteka", "Expiration date" => "Datum preteka", "Share via email:" => "Souporaba preko elektronske pošte:", "No people found" => "Ni najdenih uporabnikov", -"Resharing is not allowed" => "Ponovna souporaba ni omogočena", +"Resharing is not allowed" => "Nadaljnja souporaba ni dovoljena", "Shared in {item} with {user}" => "V souporabi v {item} z {user}", "Unshare" => "Odstrani souporabo", "can edit" => "lahko ureja", @@ -83,14 +83,14 @@ "Error unsetting expiration date" => "Napaka brisanja datuma preteka", "Error setting expiration date" => "Napaka med nastavljanjem datuma preteka", "Sending ..." => "Pošiljanje ...", -"Email sent" => "E-pošta je bila poslana", +"Email sent" => "Elektronska pošta je poslana", "The update was unsuccessful. Please report this issue to the ownCloud community." => "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu ownCloud.", "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.", -"ownCloud password reset" => "Ponastavitev gesla ownCloud", -"Use the following link to reset your password: {link}" => "Uporabite naslednjo povezavo za ponastavitev gesla: {link}", +"ownCloud password reset" => "Ponastavitev gesla za oblak ownCloud", +"Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}", "You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.", -"Reset email send." => "E-pošta za ponastavitev je bila poslana.", -"Request failed!" => "Zahtevek je spodletel!", +"Reset email send." => "Sporočilo z navodili za ponastavitev gesla je poslana na vaš elektronski naslov.", +"Request failed!" => "Zahteva je spodletela!", "Username" => "Uporabniško Ime", "Request reset" => "Zahtevaj ponovno nastavitev", "Your password was reset" => "Geslo je ponovno nastavljeno", @@ -107,10 +107,10 @@ "Edit categories" => "Uredi kategorije", "Add" => "Dodaj", "Security Warning" => "Varnostno opozorilo", -"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni varnega generatorja naključnih števil. Prosimo, če omogočite PHP OpenSSL razširitev.", -"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega generatorja naključnih števil lahko napadalec napove žetone za ponastavitev gesla, kar mu omogoča, da prevzame vaš ​​račun.", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni nobenega varnega ustvarjalnika naključnih števil. Omogočiti je treba razširitev PHP OpenSSL.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega ustvarjalnika naključnih števil je mogoče napovedati žetone za ponastavitev gesla, s čimer je mogoče prevzeti nadzor nad računom.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.", -"For information how to properly configure your server, please see the documentation." => "Navodila, kako pravilno namestiti strežnik, so na straneh documentacije.", +"For information how to properly configure your server, please see the documentation." => "Navodila, kako pravilno namestiti strežnik, so na straneh dokumentacije.", "Create an admin account" => "Ustvari skrbniški račun", "Advanced" => "Napredne možnosti", "Data folder" => "Podatkovna mapa", @@ -125,10 +125,10 @@ "web services under your control" => "spletne storitve pod vašim nadzorom", "Log out" => "Odjava", "Automatic logon rejected!" => "Samodejno prijavljanje je zavrnjeno!", -"If you did not change your password recently, your account may be compromised!" => "Če vašega gesla niste nedavno spremenili, je vaš račun lahko ogrožen!", +"If you did not change your password recently, your account may be compromised!" => "V primeru, da gesla za dostop že nekaj časa niste spremenili, je račun lahko ogrožen!", "Please change your password to secure your account again." => "Spremenite geslo za izboljšanje zaščite računa.", "Lost your password?" => "Ali ste pozabili geslo?", -"remember" => "Zapomni si me", +"remember" => "zapomni si", "Log in" => "Prijava", "Alternative Logins" => "Druge prijavne možnosti", "prev" => "nazaj", diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index f11912dee7..7bdb91c81f 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 18:30+0000\n" +"Last-Translator: Marcel Kühlhorn \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -96,248 +96,248 @@ msgstr "Warnung: Da das PHP-Modul für LDAP nicht installiert ist, wird d msgid "Server configuration" msgstr "Serverkonfiguration" -#: templates/settings.php:18 +#: templates/settings.php:31 msgid "Add Server Configuration" msgstr "Serverkonfiguration hinzufügen" -#: templates/settings.php:23 +#: templates/settings.php:36 msgid "Host" msgstr "Host" -#: templates/settings.php:25 +#: templates/settings.php:38 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://" -#: templates/settings.php:26 +#: templates/settings.php:39 msgid "Base DN" msgstr "Basis-DN" -#: templates/settings.php:27 +#: templates/settings.php:40 msgid "One Base DN per line" msgstr "Ein Base DN pro Zeile" -#: templates/settings.php:28 +#: templates/settings.php:41 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren" -#: templates/settings.php:30 +#: templates/settings.php:43 msgid "User DN" msgstr "Benutzer-DN" -#: templates/settings.php:32 +#: templates/settings.php:45 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer." -#: templates/settings.php:33 +#: templates/settings.php:46 msgid "Password" msgstr "Passwort" -#: templates/settings.php:36 +#: templates/settings.php:49 msgid "For anonymous access, leave DN and Password empty." msgstr "Lasse die Felder von DN und Passwort für anonymen Zugang leer." -#: templates/settings.php:37 +#: templates/settings.php:50 msgid "User Login Filter" msgstr "Benutzer-Login-Filter" -#: templates/settings.php:40 +#: templates/settings.php:53 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch." -#: templates/settings.php:41 +#: templates/settings.php:54 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"" -#: templates/settings.php:42 +#: templates/settings.php:55 msgid "User List Filter" msgstr "Benutzer-Filter-Liste" -#: templates/settings.php:45 +#: templates/settings.php:58 msgid "Defines the filter to apply, when retrieving users." msgstr "Definiert den Filter für die Anfrage der Benutzer." -#: templates/settings.php:46 +#: templates/settings.php:59 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "ohne Platzhalter, z.B.: \"objectClass=person\"" -#: templates/settings.php:47 +#: templates/settings.php:60 msgid "Group Filter" msgstr "Gruppen-Filter" -#: templates/settings.php:50 +#: templates/settings.php:63 msgid "Defines the filter to apply, when retrieving groups." msgstr "Definiert den Filter für die Anfrage der Gruppen." -#: templates/settings.php:51 +#: templates/settings.php:64 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"" -#: templates/settings.php:55 +#: templates/settings.php:68 msgid "Connection Settings" msgstr "Verbindungseinstellungen" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "Configuration Active" msgstr "Konfiguration aktiv" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "When unchecked, this configuration will be skipped." msgstr "Konfiguration wird übersprungen wenn deaktiviert" -#: templates/settings.php:58 +#: templates/settings.php:71 msgid "Port" msgstr "Port" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "Backup (Replica) Host" msgstr "Backup Host (Kopie)" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln." -#: templates/settings.php:60 +#: templates/settings.php:73 msgid "Backup (Replica) Port" msgstr "Backup Port" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "Disable Main Server" msgstr "Hauptserver deaktivieren" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden." -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Use TLS" msgstr "Nutze TLS" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen." -#: templates/settings.php:63 +#: templates/settings.php:76 msgid "Case insensitve LDAP server (Windows)" msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Turn off SSL certificate validation." msgstr "Schalte die SSL-Zertifikatsprüfung aus." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Not recommended, use for testing only." msgstr "Nicht empfohlen, nur zu Testzwecken." -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Speichere Time-To-Live zwischen" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "in seconds. A change empties the cache." msgstr "in Sekunden. Eine Änderung leert den Cache." -#: templates/settings.php:67 +#: templates/settings.php:80 msgid "Directory Settings" msgstr "Ordnereinstellungen" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "User Display Name Field" msgstr "Feld für den Anzeigenamen des Benutzers" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. " -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "Base User Tree" msgstr "Basis-Benutzerbaum" -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "One User Base DN per line" msgstr "Ein Benutzer Base DN pro Zeile" -#: templates/settings.php:71 +#: templates/settings.php:84 msgid "User Search Attributes" msgstr "Benutzersucheigenschaften" -#: templates/settings.php:71 templates/settings.php:74 +#: templates/settings.php:84 templates/settings.php:87 msgid "Optional; one attribute per line" msgstr "Optional; eine Eigenschaft pro Zeile" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "Group Display Name Field" msgstr "Feld für den Anzeigenamen der Gruppe" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. " -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "Base Group Tree" msgstr "Basis-Gruppenbaum" -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "One Group Base DN per line" msgstr "Ein Gruppen Base DN pro Zeile" -#: templates/settings.php:74 +#: templates/settings.php:87 msgid "Group Search Attributes" msgstr "Gruppensucheigenschaften" -#: templates/settings.php:75 +#: templates/settings.php:88 msgid "Group-Member association" msgstr "Assoziation zwischen Gruppe und Benutzer" -#: templates/settings.php:77 +#: templates/settings.php:90 msgid "Special Attributes" msgstr "Spezielle Eigenschaften" -#: templates/settings.php:79 +#: templates/settings.php:92 msgid "Quota Field" -msgstr "" +msgstr "Kontingent Feld" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "Quota Default" -msgstr "" +msgstr "Kontingent Standard" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "in bytes" msgstr "in Bytes" -#: templates/settings.php:81 +#: templates/settings.php:94 msgid "Email Field" -msgstr "" +msgstr "E-Mail Feld" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Benennungsregel für das Heimatverzeichnis des Benutzers" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein." -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Test Configuration" -msgstr "" +msgstr "Testkonfiguration" -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Help" msgstr "Hilfe" diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po index 3496d44486..0206e4346f 100644 --- a/l10n/hu_HU/files_trashbin.po +++ b/l10n/hu_HU/files_trashbin.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Akos , 2013. # Laszlo Tornoci , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-10 13:10+0000\n" +"Last-Translator: akoscomp \n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,4 +79,4 @@ msgstr "Törlés" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Törölt fájlok" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index f067101a9a..a979c84ecf 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/core.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" -"PO-Revision-Date: 2013-03-09 09:30+0000\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 21:40+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -26,26 +26,26 @@ msgstr "" #: ajax/share.php:97 #, php-format msgid "User %s shared a file with you" -msgstr "Uporanik %s je dal datoteko v souporabo z vami" +msgstr "Uporabnik %s je omogočil souporabo datoteke" #: ajax/share.php:99 #, php-format msgid "User %s shared a folder with you" -msgstr "Uporanik %s je dal mapo v souporabo z vami" +msgstr "Uporabnik %s je omogočil souporabo mape" #: ajax/share.php:101 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s" +msgstr "Uporabnik %s je omogočil souporabo datoteke \"%s\". Prejmete jo lahko preko povezave: %s" #: ajax/share.php:104 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " "here: %s" -msgstr "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s" +msgstr "Uporabnik %s je omogočil souporabo mape \"%s\". Prejmete jo lahko preko povezave: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -53,7 +53,7 @@ msgstr "Vrsta kategorije ni podana." #: ajax/vcategories/add.php:30 msgid "No category to add?" -msgstr "Ni kategorije za dodajanje?" +msgstr "Ali ni kategorije za dodajanje?" #: ajax/vcategories/add.php:37 #, php-format @@ -70,12 +70,12 @@ msgstr "Vrsta predmeta ni podana." #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "%s ID ni podan." +msgstr "ID %s ni podan." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "Napaka pri dodajanju %s med priljubljene." +msgstr "Napaka dodajanja %s med priljubljene predmete." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." @@ -84,7 +84,7 @@ msgstr "Za izbris ni izbrana nobena kategorija." #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "Napaka pri odstranjevanju %s iz priljubljenih." +msgstr "Napaka odstranjevanja %s iz priljubljenih predmetov." #: js/config.php:34 msgid "Sunday" @@ -244,142 +244,142 @@ msgid "The object type is not specified." msgstr "Vrsta predmeta ni podana." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582 -#: js/share.js:594 +#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566 +#: js/share.js:578 msgid "Error" msgstr "Napaka" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "Ime aplikacije ni podano." +msgstr "Ime programa ni podano." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" msgstr "Zahtevana datoteka {file} ni nameščena!" -#: js/share.js:29 js/share.js:43 js/share.js:90 +#: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" msgstr "V souporabi" -#: js/share.js:93 +#: js/share.js:90 msgid "Share" msgstr "Souporaba" -#: js/share.js:141 js/share.js:622 +#: js/share.js:125 js/share.js:606 msgid "Error while sharing" msgstr "Napaka med souporabo" -#: js/share.js:152 +#: js/share.js:136 msgid "Error while unsharing" msgstr "Napaka med odstranjevanjem souporabe" -#: js/share.js:159 +#: js/share.js:143 msgid "Error while changing permissions" msgstr "Napaka med spreminjanjem dovoljenj" -#: js/share.js:168 +#: js/share.js:152 msgid "Shared with you and the group {group} by {owner}" msgstr "V souporabi z vami in skupino {group}. Lastnik je {owner}." -#: js/share.js:170 +#: js/share.js:154 msgid "Shared with you by {owner}" msgstr "V souporabi z vami. Lastnik je {owner}." -#: js/share.js:175 +#: js/share.js:159 msgid "Share with" msgstr "Omogoči souporabo z" -#: js/share.js:180 +#: js/share.js:164 msgid "Share with link" -msgstr "Omogoči souporabo s povezavo" +msgstr "Omogoči souporabo preko povezave" -#: js/share.js:183 +#: js/share.js:167 msgid "Password protect" msgstr "Zaščiti z geslom" -#: js/share.js:185 templates/installation.php:47 templates/login.php:35 +#: js/share.js:169 templates/installation.php:47 templates/login.php:35 msgid "Password" msgstr "Geslo" -#: js/share.js:189 +#: js/share.js:173 msgid "Email link to person" -msgstr "Posreduj povezavo po e-pošti" +msgstr "Posreduj povezavo po elektronski pošti" -#: js/share.js:190 +#: js/share.js:174 msgid "Send" msgstr "Pošlji" -#: js/share.js:194 +#: js/share.js:178 msgid "Set expiration date" msgstr "Nastavi datum preteka" -#: js/share.js:195 +#: js/share.js:179 msgid "Expiration date" msgstr "Datum preteka" -#: js/share.js:227 +#: js/share.js:211 msgid "Share via email:" msgstr "Souporaba preko elektronske pošte:" -#: js/share.js:229 +#: js/share.js:213 msgid "No people found" msgstr "Ni najdenih uporabnikov" -#: js/share.js:256 +#: js/share.js:240 msgid "Resharing is not allowed" -msgstr "Ponovna souporaba ni omogočena" +msgstr "Nadaljnja souporaba ni dovoljena" -#: js/share.js:292 +#: js/share.js:276 msgid "Shared in {item} with {user}" msgstr "V souporabi v {item} z {user}" -#: js/share.js:313 +#: js/share.js:297 msgid "Unshare" msgstr "Odstrani souporabo" -#: js/share.js:325 +#: js/share.js:309 msgid "can edit" msgstr "lahko ureja" -#: js/share.js:327 +#: js/share.js:311 msgid "access control" msgstr "nadzor dostopa" -#: js/share.js:330 +#: js/share.js:314 msgid "create" msgstr "ustvari" -#: js/share.js:333 +#: js/share.js:317 msgid "update" msgstr "posodobi" -#: js/share.js:336 +#: js/share.js:320 msgid "delete" msgstr "izbriši" -#: js/share.js:339 +#: js/share.js:323 msgid "share" msgstr "določi souporabo" -#: js/share.js:373 js/share.js:569 +#: js/share.js:357 js/share.js:553 msgid "Password protected" msgstr "Zaščiteno z geslom" -#: js/share.js:582 +#: js/share.js:566 msgid "Error unsetting expiration date" msgstr "Napaka brisanja datuma preteka" -#: js/share.js:594 +#: js/share.js:578 msgid "Error setting expiration date" msgstr "Napaka med nastavljanjem datuma preteka" -#: js/share.js:609 +#: js/share.js:593 msgid "Sending ..." msgstr "Pošiljanje ..." -#: js/share.js:620 +#: js/share.js:604 msgid "Email sent" -msgstr "E-pošta je bila poslana" +msgstr "Elektronska pošta je poslana" #: js/update.js:14 msgid "" @@ -394,11 +394,11 @@ msgstr "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownClou #: lostpassword/controller.php:48 msgid "ownCloud password reset" -msgstr "Ponastavitev gesla ownCloud" +msgstr "Ponastavitev gesla za oblak ownCloud" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" -msgstr "Uporabite naslednjo povezavo za ponastavitev gesla: {link}" +msgstr "Za ponastavitev gesla uporabite povezavo: {link}" #: lostpassword/templates/lostpassword.php:3 msgid "You will receive a link to reset your password via Email." @@ -406,11 +406,11 @@ msgstr "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "E-pošta za ponastavitev je bila poslana." +msgstr "Sporočilo z navodili za ponastavitev gesla je poslana na vaš elektronski naslov." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "Zahtevek je spodletel!" +msgstr "Zahteva je spodletela!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:41 #: templates/login.php:28 @@ -481,13 +481,13 @@ msgstr "Varnostno opozorilo" msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "Na voljo ni varnega generatorja naključnih števil. Prosimo, če omogočite PHP OpenSSL razširitev." +msgstr "Na voljo ni nobenega varnega ustvarjalnika naključnih števil. Omogočiti je treba razširitev PHP OpenSSL." #: templates/installation.php:26 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." -msgstr "Brez varnega generatorja naključnih števil lahko napadalec napove žetone za ponastavitev gesla, kar mu omogoča, da prevzame vaš ​​račun." +msgstr "Brez varnega ustvarjalnika naključnih števil je mogoče napovedati žetone za ponastavitev gesla, s čimer je mogoče prevzeti nadzor nad računom." #: templates/installation.php:32 msgid "" @@ -500,7 +500,7 @@ msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "Navodila, kako pravilno namestiti strežnik, so na straneh documentacije." +msgstr "Navodila, kako pravilno namestiti strežnik, so na straneh dokumentacije." #: templates/installation.php:37 msgid "Create an admin account" @@ -564,7 +564,7 @@ msgstr "Samodejno prijavljanje je zavrnjeno!" msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "Če vašega gesla niste nedavno spremenili, je vaš račun lahko ogrožen!" +msgstr "V primeru, da gesla za dostop že nekaj časa niste spremenili, je račun lahko ogrožen!" #: templates/login.php:13 msgid "Please change your password to secure your account again." @@ -576,7 +576,7 @@ msgstr "Ali ste pozabili geslo?" #: templates/login.php:41 msgid "remember" -msgstr "Zapomni si me" +msgstr "zapomni si" #: templates/login.php:43 msgid "Log in" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index 001412ad69..40792e24db 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" -"PO-Revision-Date: 2013-03-09 21:40+0000\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 21:40+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "Ni mogoče preimenovati datoteke" #: ajax/upload.php:19 msgid "No file was uploaded. Unknown error" -msgstr "Nobena datoteka ni naložena. Neznana napaka." +msgstr "Ni poslane nobene datoteke. Neznana napaka." #: ajax/upload.php:26 msgid "There is no error, the file uploaded with success" @@ -47,7 +47,7 @@ msgstr "Datoteka je uspešno poslana." #: ajax/upload.php:27 msgid "" "The uploaded file exceeds the upload_max_filesize directive in php.ini: " -msgstr "Naložena datoteka presega dovoljeno velikost. Le-ta je določena z vrstico upload_max_filesize v datoteki php.ini:" +msgstr "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:" #: ajax/upload.php:29 msgid "" @@ -79,7 +79,7 @@ msgstr "Na voljo ni dovolj prostora" msgid "Invalid directory." msgstr "Neveljavna mapa." -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" msgstr "Datoteke" @@ -118,7 +118,7 @@ msgstr "prekliči" #: js/filelist.js:298 msgid "replaced {new_name} with {old_name}" -msgstr "zamenjano ime {new_name} z imenom {old_name}" +msgstr "preimenovano ime {new_name} z imenom {old_name}" #: js/filelist.js:298 msgid "undo" @@ -134,7 +134,7 @@ msgstr "'.' je neveljavno ime datoteke." #: js/files.js:56 msgid "File name cannot be empty." -msgstr "Ime datoteke ne sme biti prazno." +msgstr "Ime datoteke ne sme biti prazno polje." #: js/files.js:64 msgid "" @@ -154,7 +154,7 @@ msgstr "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)" msgid "" "Your download is being prepared. This might take some time if the files are " "big." -msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen." +msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika." #: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" @@ -174,7 +174,7 @@ msgstr "Pošiljanje 1 datoteke" #: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" -msgstr "nalagam {count} datotek" +msgstr "pošiljanje {count} datotek" #: js/files.js:389 js/files.js:424 msgid "Upload cancelled." @@ -187,11 +187,11 @@ msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošilja #: js/files.js:571 msgid "URL cannot be empty." -msgstr "Naslov URL ne sme biti prazen." +msgstr "Naslov URL ne sme biti prazna vrednost." #: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" -msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud" +msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud." #: js/files.js:954 templates/index.php:68 msgid "Name" diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po index 1eb81c7708..d76b4df657 100644 --- a/l10n/sl/files_external.po +++ b/l10n/sl/files_external.po @@ -4,14 +4,15 @@ # # Translators: # <>, 2012. +# Matej Urbančič <>, 2013. # Peter Peroša , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-01 00:05+0100\n" -"PO-Revision-Date: 2013-02-27 23:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 14:31+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,24 +34,24 @@ msgstr "Odobri dostop" #: js/dropbox.js:101 msgid "Please provide a valid Dropbox app key and secret." -msgstr "Vpišite veljaven ključ programa in kodo za Dropbox" +msgstr "Vpisati je treba veljaven ključ programa in kodo za Dropbox" #: js/google.js:36 js/google.js:93 msgid "Error configuring Google Drive storage" msgstr "Napaka nastavljanja shrambe Google Drive" -#: lib/config.php:421 +#: lib/config.php:423 msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "Opozorilo: \"smbclient\" ni nameščen. Priklapljanje CIFS/SMB pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če ga namesti." +msgstr "Opozorilo: paket \"smbclient\" ni nameščen. Priklapljanje pogonov CIFS/SMB ne bo mogoče." -#: lib/config.php:424 +#: lib/config.php:426 msgid "" "Warning: The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " "install it." -msgstr "Opozorilo: FTP podpora v PHP ni omogočena ali nameščena. Priklapljanje FTP pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če jo namesti ali omogoči." +msgstr "Opozorilo: podpora FTP v PHP ni omogočena ali pa ni nameščena. Priklapljanje pogonov FTP zato ni mogoče." #: templates/settings.php:3 msgid "External Storage" @@ -62,7 +63,7 @@ msgstr "Ime mape" #: templates/settings.php:10 msgid "External storage" -msgstr "" +msgstr "Zunanja shramba" #: templates/settings.php:11 msgid "Configuration" @@ -78,7 +79,7 @@ msgstr "Se uporablja" #: templates/settings.php:33 msgid "Add storage" -msgstr "" +msgstr "Dodaj shrambo" #: templates/settings.php:90 msgid "None set" @@ -103,7 +104,7 @@ msgstr "Izbriši" #: templates/settings.php:129 msgid "Enable User External Storage" -msgstr "Omogoči uporabo zunanje podatkovne shrambe za uporabnike" +msgstr "Omogoči uporabniško zunanjo podatkovno shrambo" #: templates/settings.php:130 msgid "Allow users to mount their own external storage" diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po index 9d62304a4d..ea4e088032 100644 --- a/l10n/sl/files_sharing.po +++ b/l10n/sl/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" -"PO-Revision-Date: 2013-03-09 18:42+0000\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 19:52+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po index 29df321b54..291699bf84 100644 --- a/l10n/sl/lib.po +++ b/l10n/sl/lib.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-10 00:06+0100\n" -"PO-Revision-Date: 2013-03-09 07:30+0000\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 08:50+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ msgstr "Skrbništvo" #: files.php:209 msgid "ZIP download is turned off." -msgstr "Prejem datotek ZIP je onemogočen." +msgstr "Prejemanje datotek v paketu ZIP je onemogočeno." #: files.php:210 msgid "Files need to be downloaded one by one." @@ -236,7 +236,7 @@ msgstr "Pred %d meseci" #: template.php:123 msgid "last year" -msgstr "lani" +msgstr "lansko leto" #: template.php:124 msgid "years ago" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index b754bc7992..efba9dfb34 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/settings.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-10 00:06+0100\n" -"PO-Revision-Date: 2013-03-09 22:50+0000\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 13:00+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" #: ajax/apps/ocs.php:20 msgid "Unable to load list from App Store" -msgstr "Ni mogoče naložiti seznama iz App Store" +msgstr "Ni mogoče naložiti seznama iz središča App Store" #: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17 #: ajax/togglegroups.php:20 @@ -74,7 +74,7 @@ msgstr "Neveljavna zahteva" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" -msgstr "Skrbniki se ne morejo odstraniti iz skupine admin" +msgstr "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)" #: ajax/togglegroups.php:30 #, php-format @@ -233,7 +233,7 @@ msgid "" "remote and sending of notification emails might also not work. We suggest to" " enable internet connection for this server if you want to have all features" " of ownCloud." -msgstr "" +msgstr "Strežnik ownCloud je brez delujoče internetne povezave. To pomeni, da bodo nekatere možnosti onemogočene. Ne bo mogoče priklapljati zunanjih priklopnih točk, ne bo obvestil o posodobitvah ali namestitvah programske opreme, prav tako najverjetneje ne bo mogoče pošiljati obvestilnih sporočil preko elektronske pošte. Za uporabo vseh zmožnosti oblaka ownCloud, mora biti internetna povezava vzpostavljena in delujoča." #: templates/admin.php:92 msgid "Cron" @@ -247,13 +247,13 @@ msgstr "Izvedi eno nalogo z vsako naloženo stranjo." msgid "" "cron.php is registered at a webcron service. Call the cron.php page in the " "owncloud root once a minute over http." -msgstr "" +msgstr "Datoteka cron.php je vpisana pri storitvi webcron. Preko protokola HTTP je datoteka cron.php, ki se nahaja v korenski mapi ownCloud, klicana enkrat na minuto." #: templates/admin.php:121 msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "Uporaba sistemske storitve cron. Preko sistemskega posla cron je datoteka cron.php, ki se nahaja v mapi ownCloud, klicana enkrat na minuto." #: templates/admin.php:128 msgid "Sharing" @@ -346,7 +346,7 @@ msgstr "Več programov" #: templates/apps.php:28 msgid "Select an App" -msgstr "Izberite program" +msgstr "Izbor programa" #: templates/apps.php:34 msgid "See application page at apps.owncloud.com" @@ -403,7 +403,7 @@ msgstr "Geslo" #: templates/personal.php:38 msgid "Your password was changed" -msgstr "Vaše geslo je spremenjeno" +msgstr "Geslo je spremenjeno" #: templates/personal.php:39 msgid "Unable to change your password" @@ -463,7 +463,7 @@ msgstr "WebDAV" #: templates/personal.php:93 msgid "Use this address to connect to your ownCloud in your file manager" -msgstr "Ta naslov uporabite za povezavo z oblakom ownCloud iz vašega upravljalnika datotek." +msgstr "Ta naslov uporabite za povezavo upravljalnika datotek z oblakom ownCloud." #: templates/users.php:21 templates/users.php:77 msgid "Login Name" diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po index 033d398089..680f05c14e 100644 --- a/l10n/sl/user_ldap.po +++ b/l10n/sl/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" -"PO-Revision-Date: 2013-03-09 13:10+0000\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 18:30+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -26,19 +26,19 @@ msgstr "Brisanje nastavitev strežnika je spodletelo." #: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" -msgstr "" +msgstr "Nastavitev je veljavna, zato je povezavo mogoče vzpostaviti!" #: ajax/testConfiguration.php:39 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." -msgstr "" +msgstr "Nastavitev je veljavna, vendar pa je vez Bind spodletela. Preveriti je treba nastavitve strežnika in ustreznost poveril." #: ajax/testConfiguration.php:43 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." -msgstr "" +msgstr "Nastavitev je veljavna. Več podrobnosti je zapisanih v dnevniku ownCloud." #: js/settings.js:66 msgid "Deletion failed" @@ -46,7 +46,7 @@ msgstr "Brisanje je spodletelo." #: js/settings.js:82 msgid "Take over settings from recent server configuration?" -msgstr "" +msgstr "Ali naj se prevzame nastavitve nedavne nastavitve strežnika?" #: js/settings.js:83 msgid "Keep settings?" @@ -54,15 +54,15 @@ msgstr "Ali nas se nastavitve ohranijo?" #: js/settings.js:97 msgid "Cannot add server configuration" -msgstr "" +msgstr "Ni mogoče dodati nastavitev strežnika" #: js/settings.js:121 msgid "Connection test succeeded" -msgstr "" +msgstr "Preizkus povezave je uspešno končan." #: js/settings.js:126 msgid "Connection test failed" -msgstr "" +msgstr "Preizkus povezave je spodletel." #: js/settings.js:136 msgid "Do you really want to delete the current Server Configuration?" @@ -87,7 +87,7 @@ msgstr "Opozorilo: modul PHP LDAP mora biti nameščen, sicer vmesnik ne #: templates/settings.php:15 msgid "Server configuration" -msgstr "" +msgstr "Nastavitev strežnika" #: templates/settings.php:31 msgid "Add Server Configuration" @@ -108,7 +108,7 @@ msgstr "Osnovni DN" #: templates/settings.php:40 msgid "One Base DN per line" -msgstr "" +msgstr "En osnovni DN na vrstico" #: templates/settings.php:41 msgid "You can specify Base DN for users and groups in the Advanced tab" @@ -179,11 +179,11 @@ msgstr "Nastavitve povezave" #: templates/settings.php:70 msgid "Configuration Active" -msgstr "" +msgstr "Dejavna nastavitev" #: templates/settings.php:70 msgid "When unchecked, this configuration will be skipped." -msgstr "" +msgstr "Neizbrana možnost preskoči nastavitev." #: templates/settings.php:71 msgid "Port" @@ -191,17 +191,17 @@ msgstr "Vrata" #: templates/settings.php:72 msgid "Backup (Replica) Host" -msgstr "" +msgstr "Varnostna kopija (replika) podatkov gostitelja" #: templates/settings.php:72 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." -msgstr "" +msgstr "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD." #: templates/settings.php:73 msgid "Backup (Replica) Port" -msgstr "" +msgstr "Varnostna kopija (replika) podatka vrat" #: templates/settings.php:74 msgid "Disable Main Server" @@ -209,7 +209,7 @@ msgstr "Onemogoči glavni strežnik" #: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." -msgstr "" +msgstr "Ob priklopu bo strežnik ownCloud povezan le z kopijo (repliko) strežnika." #: templates/settings.php:75 msgid "Use TLS" @@ -217,7 +217,7 @@ msgstr "Uporabi TLS" #: templates/settings.php:75 msgid "Do not use it additionally for LDAPS connections, it will fail." -msgstr "" +msgstr "Strežnika ni priporočljivo uporabljati za povezave LDAPS. Povezava bo spodletela." #: templates/settings.php:76 msgid "Case insensitve LDAP server (Windows)" @@ -239,7 +239,7 @@ msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanj #: templates/settings.php:78 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Predpomni podatke TTL" #: templates/settings.php:78 msgid "in seconds. A change empties the cache." @@ -267,11 +267,11 @@ msgstr "Eno osnovno uporabniško ime DN na vrstico" #: templates/settings.php:84 msgid "User Search Attributes" -msgstr "" +msgstr "Uporabi atribute iskanja" #: templates/settings.php:84 templates/settings.php:87 msgid "Optional; one attribute per line" -msgstr "" +msgstr "Izbirno; en atribut na vrstico" #: templates/settings.php:85 msgid "Group Display Name Field" @@ -319,7 +319,7 @@ msgstr "Polje elektronske pošte" #: templates/settings.php:95 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Pravila poimenovanja uporabniške osebne mape" #: templates/settings.php:95 msgid "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index feab728aed..2b0f3f96e5 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -238,8 +238,8 @@ msgid "The object type is not specified." msgstr "" #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582 -#: js/share.js:594 +#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566 +#: js/share.js:578 msgid "Error" msgstr "" @@ -251,127 +251,127 @@ msgstr "" msgid "The required file {file} is not installed!" msgstr "" -#: js/share.js:29 js/share.js:43 js/share.js:90 +#: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" msgstr "" -#: js/share.js:93 +#: js/share.js:90 msgid "Share" msgstr "" -#: js/share.js:141 js/share.js:622 +#: js/share.js:125 js/share.js:606 msgid "Error while sharing" msgstr "" -#: js/share.js:152 +#: js/share.js:136 msgid "Error while unsharing" msgstr "" -#: js/share.js:159 +#: js/share.js:143 msgid "Error while changing permissions" msgstr "" -#: js/share.js:168 +#: js/share.js:152 msgid "Shared with you and the group {group} by {owner}" msgstr "" -#: js/share.js:170 +#: js/share.js:154 msgid "Shared with you by {owner}" msgstr "" -#: js/share.js:175 +#: js/share.js:159 msgid "Share with" msgstr "" -#: js/share.js:180 +#: js/share.js:164 msgid "Share with link" msgstr "" -#: js/share.js:183 +#: js/share.js:167 msgid "Password protect" msgstr "" -#: js/share.js:185 templates/installation.php:47 templates/login.php:35 +#: js/share.js:169 templates/installation.php:47 templates/login.php:35 msgid "Password" msgstr "" -#: js/share.js:189 +#: js/share.js:173 msgid "Email link to person" msgstr "" -#: js/share.js:190 +#: js/share.js:174 msgid "Send" msgstr "" -#: js/share.js:194 +#: js/share.js:178 msgid "Set expiration date" msgstr "" -#: js/share.js:195 +#: js/share.js:179 msgid "Expiration date" msgstr "" -#: js/share.js:227 +#: js/share.js:211 msgid "Share via email:" msgstr "" -#: js/share.js:229 +#: js/share.js:213 msgid "No people found" msgstr "" -#: js/share.js:256 +#: js/share.js:240 msgid "Resharing is not allowed" msgstr "" -#: js/share.js:292 +#: js/share.js:276 msgid "Shared in {item} with {user}" msgstr "" -#: js/share.js:313 +#: js/share.js:297 msgid "Unshare" msgstr "" -#: js/share.js:325 +#: js/share.js:309 msgid "can edit" msgstr "" -#: js/share.js:327 +#: js/share.js:311 msgid "access control" msgstr "" -#: js/share.js:330 +#: js/share.js:314 msgid "create" msgstr "" -#: js/share.js:333 +#: js/share.js:317 msgid "update" msgstr "" -#: js/share.js:336 +#: js/share.js:320 msgid "delete" msgstr "" -#: js/share.js:339 +#: js/share.js:323 msgid "share" msgstr "" -#: js/share.js:373 js/share.js:569 +#: js/share.js:357 js/share.js:553 msgid "Password protected" msgstr "" -#: js/share.js:582 +#: js/share.js:566 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:594 +#: js/share.js:578 msgid "Error setting expiration date" msgstr "" -#: js/share.js:609 +#: js/share.js:593 msgid "Sending ..." msgstr "" -#: js/share.js:620 +#: js/share.js:604 msgid "Email sent" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index caa14bb36c..7560185daf 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgstr "" msgid "Invalid directory." msgstr "" -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 9474683d87..0ba2492393 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 46611588b0..ef320179ba 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,13 +37,13 @@ msgstr "" msgid "Error configuring Google Drive storage" msgstr "" -#: lib/config.php:421 +#: lib/config.php:423 msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:424 +#: lib/config.php:426 msgid "" "Warning: The FTP support in PHP is not enabled or installed. Mounting " "of FTP shares is not possible. Please ask your system administrator to " diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index f13a790262..e87e420998 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 894026db9a..e5bcb350ab 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 700851f2ac..739d5d7e3c 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index fc63c0fa4d..8ffe6dd9b4 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:06+0100\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index bd0d0eef80..7e3614321b 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:06+0100\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 2c349216ff..e2a201c4d9 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 3ba0952c2d..454b5eec27 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php index 58c3ddf141..c036303197 100644 --- a/lib/l10n/sl.php +++ b/lib/l10n/sl.php @@ -5,7 +5,7 @@ "Users" => "Uporabniki", "Apps" => "Programi", "Admin" => "Skrbništvo", -"ZIP download is turned off." => "Prejem datotek ZIP je onemogočen.", +"ZIP download is turned off." => "Prejemanje datotek v paketu ZIP je onemogočeno.", "Files need to be downloaded one by one." => "Datoteke je mogoče prejeti le posamično.", "Back to Files" => "Nazaj na datoteke", "Selected files too large to generate zip file." => "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip.", @@ -47,7 +47,7 @@ "%d days ago" => "pred %d dnevi", "last month" => "prejšnji mesec", "%d months ago" => "Pred %d meseci", -"last year" => "lani", +"last year" => "lansko leto", "years ago" => "pred nekaj leti", "%s is available. Get more information" => "%s je na voljo. Več podrobnosti.", "up to date" => "posodobljeno", diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php index 13547c1430..4406a72297 100644 --- a/settings/l10n/sl.php +++ b/settings/l10n/sl.php @@ -1,5 +1,5 @@ "Ni mogoče naložiti seznama iz App Store", +"Unable to load list from App Store" => "Ni mogoče naložiti seznama iz središča App Store", "Authentication error" => "Napaka overitve", "Unable to change display name" => "Prikazanega imena ni mogoče spremeniti.", "Group already exists" => "Skupina že obstaja", @@ -11,7 +11,7 @@ "Unable to delete user" => "Uporabnika ni mogoče izbrisati", "Language changed" => "Jezik je spremenjen", "Invalid request" => "Neveljavna zahteva", -"Admins can't remove themself from the admin group" => "Skrbniki se ne morejo odstraniti iz skupine admin", +"Admins can't remove themself from the admin group" => "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)", "Unable to add user to group %s" => "Uporabnika ni mogoče dodati k skupini %s", "Unable to remove user from group %s" => "Uporabnika ni mogoče odstraniti iz skupine %s", "Couldn't update app." => "Programa ni mogoče posodobiti.", @@ -45,8 +45,11 @@ "Locale not working" => "Jezikovne prilagoditve ne delujejo.", "This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Na strežniku ownCloud ni mogoče nastaviti jezikovnih določil na jezik %s. Najverjetneje so težave s posebnimi znaki v imenih datotek. Priporočljivo je namestiti zahtevane pakete za podporo jeziku %s.", "Internet connection not working" => "Internetna povezava ne deluje.", +"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Strežnik ownCloud je brez delujoče internetne povezave. To pomeni, da bodo nekatere možnosti onemogočene. Ne bo mogoče priklapljati zunanjih priklopnih točk, ne bo obvestil o posodobitvah ali namestitvah programske opreme, prav tako najverjetneje ne bo mogoče pošiljati obvestilnih sporočil preko elektronske pošte. Za uporabo vseh zmožnosti oblaka ownCloud, mora biti internetna povezava vzpostavljena in delujoča.", "Cron" => "Cron", "Execute one task with each page loaded" => "Izvedi eno nalogo z vsako naloženo stranjo.", +"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Datoteka cron.php je vpisana pri storitvi webcron. Preko protokola HTTP je datoteka cron.php, ki se nahaja v korenski mapi ownCloud, klicana enkrat na minuto.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Uporaba sistemske storitve cron. Preko sistemskega posla cron je datoteka cron.php, ki se nahaja v mapi ownCloud, klicana enkrat na minuto.", "Sharing" => "Souporaba", "Enable Share API" => "Omogoči API souporabe", "Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe", @@ -67,7 +70,7 @@ "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Programski paket razvija skupnost ownCloud. Izvorna koda je objavljena pod pogoji AGPL.", "Add your App" => "Dodaj program", "More Apps" => "Več programov", -"Select an App" => "Izberite program", +"Select an App" => "Izbor programa", "See application page at apps.owncloud.com" => "Obiščite spletno stran programa na apps.owncloud.com", "-licensed by " => "-z dovoljenjem ", "Update" => "Posodobi", @@ -81,7 +84,7 @@ "Get the apps to sync your files" => "Pridobi programe za usklajevanje datotek", "Show First Run Wizard again" => "Zaženi čarovnika prvega zagona", "Password" => "Geslo", -"Your password was changed" => "Vaše geslo je spremenjeno", +"Your password was changed" => "Geslo je spremenjeno", "Unable to change your password" => "Gesla ni mogoče spremeniti.", "Current password" => "Trenutno geslo", "New password" => "Novo geslo", @@ -96,7 +99,7 @@ "Language" => "Jezik", "Help translate" => "Sodelujte pri prevajanju", "WebDAV" => "WebDAV", -"Use this address to connect to your ownCloud in your file manager" => "Ta naslov uporabite za povezavo z oblakom ownCloud iz vašega upravljalnika datotek.", +"Use this address to connect to your ownCloud in your file manager" => "Ta naslov uporabite za povezavo upravljalnika datotek z oblakom ownCloud.", "Login Name" => "Prijavno ime", "Create" => "Ustvari", "Default Storage" => "Privzeta shramba", From 2fe56b8969406ce6b3ade6d9d2adfb8740329478 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 12 Mar 2013 09:14:05 +0100 Subject: [PATCH 058/546] fixes #2081 --- lib/setup.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/setup.php b/lib/setup.php index 8814447f52..e9c090c5b6 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -70,6 +70,13 @@ class OC_Setup { $password = htmlspecialchars_decode($options['adminpass']); $datadir = htmlspecialchars_decode($options['directory']); + if (OC_Util::runningOnWindows()) { + $datadir = realpath($datadir); + if (substr($datadir, -1) == '\\') { + $datadir = substr_replace($datadir ,"",-1); + } + } + //use sqlite3 when available, otherise sqlite2 will be used. if($dbtype=='sqlite' and class_exists('SQLite3')) { $dbtype='sqlite3'; From 09003016686eea2ff674136792e09db49a1f925c Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 12 Mar 2013 09:15:53 +0100 Subject: [PATCH 059/546] indexed slug should be created based on logic path --- lib/files/mapper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/files/mapper.php b/lib/files/mapper.php index 520fadbd8c..c5f1f9888d 100644 --- a/lib/files/mapper.php +++ b/lib/files/mapper.php @@ -149,7 +149,7 @@ class Mapper // detect duplicates while ($this->resolvePhysicalPath($physicalPath) !== null) { - $physicalPath = $this->slugifyPath($physicalPath, $index++); + $physicalPath = $this->slugifyPath($logicPath, $index++); } // insert the new path mapping if requested From 06992fec6d3d014060f8c4f4a5a75bb759d6c86e Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 12 Mar 2013 09:24:58 +0100 Subject: [PATCH 060/546] slug generates uniqid in case the file/folder name contains not one single valid character --- lib/files/mapper.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/files/mapper.php b/lib/files/mapper.php index c5f1f9888d..418ef354f9 100644 --- a/lib/files/mapper.php +++ b/lib/files/mapper.php @@ -219,10 +219,8 @@ class Mapper // remove unwanted characters $text = preg_replace('~[^-\w]+~', '', $text); - if (empty($text)) - { - // TODO: we better generate a guid in this case - return 'n-a'; + if (empty($text)) { + return uniqid(); } return $text; From eedbebd40e1ea887fe1e42472570647e290bb96a Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 12 Mar 2013 09:26:21 +0100 Subject: [PATCH 061/546] adding //IGNORE to iconv to prevent nasty php warnings --- lib/files/mapper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/files/mapper.php b/lib/files/mapper.php index 418ef354f9..d65726d68d 100644 --- a/lib/files/mapper.php +++ b/lib/files/mapper.php @@ -210,7 +210,7 @@ class Mapper // transliterate if (function_exists('iconv')) { - $text = iconv('utf-8', 'us-ascii//TRANSLIT', $text); + $text = iconv('utf-8', 'us-ascii//TRANSLIT//IGNORE', $text); } // lowercase From 818c24bd4578c151c412939ad47b20d649bd68a5 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 12 Mar 2013 10:33:40 +0100 Subject: [PATCH 062/546] skip archive tests for now --- tests/lib/archive/tar.php | 2 ++ tests/lib/archive/zip.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php index 51de004813..e66a874087 100644 --- a/tests/lib/archive/tar.php +++ b/tests/lib/archive/tar.php @@ -8,6 +8,7 @@ require_once 'archive.php'; +if (!OC_Util::runningOnWindows()) { class Test_Archive_TAR extends Test_Archive { protected function getExisting() { $dir = OC::$SERVERROOT . '/tests/data'; @@ -18,3 +19,4 @@ class Test_Archive_TAR extends Test_Archive { return new OC_Archive_TAR(OCP\Files::tmpFile('.tar.gz')); } } +} diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php index adddf81ee1..e049a899d8 100644 --- a/tests/lib/archive/zip.php +++ b/tests/lib/archive/zip.php @@ -8,6 +8,7 @@ require_once 'archive.php'; +if (!OC_Util::runningOnWindows()) { class Test_Archive_ZIP extends Test_Archive { protected function getExisting() { $dir = OC::$SERVERROOT . '/tests/data'; @@ -18,3 +19,4 @@ class Test_Archive_ZIP extends Test_Archive { return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip')); } } +} \ No newline at end of file From a05820c6594aa3ea6f2394e8d75117d339f06ed3 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 12 Mar 2013 15:30:10 +0100 Subject: [PATCH 063/546] fixing various filesystem/storage unit tests on windows fixing copy operation on mapper --- lib/files/mapper.php | 8 +++++--- lib/files/storage/mappedlocal.php | 9 ++++++--- tests/lib/files/storage/storage.php | 3 +-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/files/mapper.php b/lib/files/mapper.php index d65726d68d..179e28e5e7 100644 --- a/lib/files/mapper.php +++ b/lib/files/mapper.php @@ -77,7 +77,9 @@ class Mapper $result = $query->execute(array($path1.'%')); $updateQuery = \OC_DB::prepare('UPDATE `*PREFIX*file_map`' .' SET `logic_path` = ?' - .' AND `physic_path` = ?' + .' , `logic_path_hash` = ?' + .' , `physic_path` = ?' + .' , `physic_path_hash` = ?' .' WHERE `logic_path` = ?'); while( $row = $result->fetchRow()) { $currentLogic = $row['logic_path']; @@ -86,7 +88,7 @@ class Mapper $newPhysic = $physicPath2.$this->stripRootFolder($currentPhysic, $physicPath1); if ($path1 !== $currentLogic) { try { - $updateQuery->execute(array($newLogic, $newPhysic, $currentLogic)); + $updateQuery->execute(array($newLogic, md5($newLogic), $newPhysic, md5($newPhysic), $currentLogic)); } catch (\Exception $e) { error_log('Mapper::Copy failed '.$currentLogic.' -> '.$newLogic.'\n'.$e); throw $e; @@ -190,7 +192,7 @@ class Mapper array_push($sluggedElements, $last.'-'.$index); } - $sluggedPath = $this->unchangedPhysicalRoot.implode(DIRECTORY_SEPARATOR, $sluggedElements); + $sluggedPath = $this->unchangedPhysicalRoot.implode('/', $sluggedElements); return $this->stripLast($sluggedPath); } diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php index 434c10bcbf..ba3fcdc5c9 100644 --- a/lib/files/storage/mappedlocal.php +++ b/lib/files/storage/mappedlocal.php @@ -50,7 +50,7 @@ class MappedLocal extends \OC\Files\Storage\Common{ continue; } - $logicalFilePath = $this->mapper->physicalToLogic($physicalPath.DIRECTORY_SEPARATOR.$file); + $logicalFilePath = $this->mapper->physicalToLogic($physicalPath.'/'.$file); $file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath); $file = $this->stripLeading($file); @@ -130,7 +130,7 @@ class MappedLocal extends \OC\Files\Storage\Common{ public function file_get_contents($path) { return file_get_contents($this->buildPath($path)); } - public function file_put_contents($path, $data) {//trigger_error("$path = ".var_export($path, 1)); + public function file_put_contents($path, $data) { return file_put_contents($this->buildPath($path), $data); } public function unlink($path) { @@ -280,7 +280,7 @@ class MappedLocal extends \OC\Files\Storage\Common{ foreach (scandir($physicalDir) as $item) { if ($item == '.' || $item == '..') continue; - $physicalItem = $this->mapper->physicalToLogic($physicalDir.DIRECTORY_SEPARATOR.$item); + $physicalItem = $this->mapper->physicalToLogic($physicalDir.'/'.$item); $item = substr($physicalItem, strlen($physicalDir)+1); if(strstr(strtolower($item), strtolower($query)) !== false) { @@ -331,6 +331,9 @@ class MappedLocal extends \OC\Files\Storage\Common{ if(strpos($path, '/') === 0) { $path = substr($path, 1); } + if(strpos($path, '\\') === 0) { + $path = substr($path, 1); + } if ($path === false) { return ''; } diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php index f78f66d8b8..3d68efea5f 100644 --- a/tests/lib/files/storage/storage.php +++ b/tests/lib/files/storage/storage.php @@ -224,8 +224,7 @@ abstract class Storage extends \PHPUnit_Framework_TestCase { } public function testSearchInSubFolder() { - $this->instance->mkdir('sub') - ; + $this->instance->mkdir('sub'); $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt'; $this->instance->file_put_contents('/sub/lorem.txt', file_get_contents($textFile, 'r')); $pngFile = \OC::$SERVERROOT . '/tests/data/logo-wide.png'; From 9d4d399aa3296c40daed863a7ed31601c1c724c3 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 12 Mar 2013 15:32:28 +0100 Subject: [PATCH 064/546] write error message to log file in case insert to file cache failed - took hours to find that the insert failed :-( --- lib/files/cache/cache.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php index f288919df7..1ff66f11f1 100644 --- a/lib/files/cache/cache.php +++ b/lib/files/cache/cache.php @@ -203,7 +203,10 @@ class Cache { $query = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache`(' . implode(', ', $queryParts) . ')' . ' VALUES(' . implode(', ', $valuesPlaceholder) . ')'); - $query->execute($params); + $result = $query->execute($params); + if (\MDB2::isError($result)) { + \OCP\Util::writeLog('cache', 'Insert to cache failed: '.$result, \OCP\Util::ERROR); + } return (int)\OC_DB::insertid('*PREFIX*filecache'); } From ec1685311258935548512be3698b59512b084de5 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 12 Mar 2013 15:33:37 +0100 Subject: [PATCH 065/546] enable UTF-8 charset on mssql disable MDB2_PORTABILITY_EMPTY_TO_NULL for mssql to allow insert of empty string to no null fields --- lib/db.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/db.php b/lib/db.php index 347deac851..9699b216f6 100644 --- a/lib/db.php +++ b/lib/db.php @@ -292,8 +292,10 @@ class OC_DB { 'username' => $user, 'password' => $pass, 'hostspec' => $host, - 'database' => $name - ); + 'database' => $name, + 'charset' => 'UTF-8' + ); + $options['portability'] = $options['portability'] - MDB2_PORTABILITY_EMPTY_TO_NULL; break; default: return false; From b2da2f769a896af5a139e6ce426e835b6c60aca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Tue, 12 Mar 2013 17:28:36 +0100 Subject: [PATCH 066/546] don't add share action to the Shared folder --- apps/files/js/fileactions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 38f5bab6f7..3c4fa08bf1 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -112,7 +112,7 @@ var FileActions = { addAction(name, action); } }); - if(actions.Share){ + if(actions.Share && file !== 'Shared'){ addAction('Share', actions.Share); } From 17fd6482d873c170278aafeceb9005415f272901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20T=C3=A9tard?= Date: Tue, 12 Mar 2013 11:53:41 +0100 Subject: [PATCH 067/546] Fix file sharing via public link for one particular file. Fix OC_Files::get() to not return the first character of the filename if only one file is requested. --- lib/files.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/files.php b/lib/files.php index 2433502444..04ba51d9d2 100644 --- a/lib/files.php +++ b/lib/files.php @@ -50,7 +50,7 @@ class OC_Files { $xsendfile = true; } - if (count($files) == 1) { + if (is_array($files) && count($files) == 1) { $files = $files[0]; } From f3a2daaa9d4fd574236b9168cdd6b0598d8578ce Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 13 Mar 2013 00:06:21 +0100 Subject: [PATCH 068/546] [tx-robot] updated from transifex --- apps/files/l10n/fr.php | 1 + apps/files_encryption/l10n/sl.php | 2 +- apps/files_external/l10n/fr.php | 2 + apps/files_versions/l10n/fr.php | 1 + apps/files_versions/l10n/sl.php | 2 +- apps/user_ldap/l10n/fr.php | 6 ++ apps/user_ldap/l10n/sl.php | 2 +- l10n/fr/files.po | 49 +++++----- l10n/fr/files_external.po | 15 ++-- l10n/fr/files_versions.po | 13 +-- l10n/fr/user_ldap.po | 135 ++++++++++++++-------------- l10n/sl/files_encryption.po | 6 +- l10n/sl/files_sharing.po | 4 +- l10n/sl/files_versions.po | 6 +- l10n/sl/user_ldap.po | 6 +- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- 26 files changed, 143 insertions(+), 129 deletions(-) diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 9849184441..5e53f5ab02 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -61,6 +61,7 @@ "From link" => "Depuis le lien", "Deleted files" => "Fichiers supprimés", "Cancel upload" => "Annuler l'envoi", +"You don’t have write permissions here." => "Vous n'avez pas le droit d'écriture ici.", "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)", "Download" => "Télécharger", "Unshare" => "Ne plus partager", diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php index 39a5a0d40f..4754e21214 100644 --- a/apps/files_encryption/l10n/sl.php +++ b/apps/files_encryption/l10n/sl.php @@ -2,6 +2,6 @@ "Encryption" => "Šifriranje", "File encryption is enabled." => "Šifriranje datotek je omogočeno.", "The following file types will not be encrypted:" => "Navedene vrste datotek ne bodo šifrirane:", -"Exclude the following file types from encryption:" => "Izloči navedene vrste datotek med šifriranjem:", +"Exclude the following file types from encryption:" => "Ne šifriraj navedenih vrst datotek:", "None" => "Brez" ); diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php index db4140b483..c42c89f857 100644 --- a/apps/files_external/l10n/fr.php +++ b/apps/files_external/l10n/fr.php @@ -8,9 +8,11 @@ "Warning: The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Attention : Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas disponible. Contactez votre administrateur système pour l'installer.", "External Storage" => "Stockage externe", "Folder name" => "Nom du dossier", +"External storage" => "Stockage externe", "Configuration" => "Configuration", "Options" => "Options", "Applicable" => "Disponible", +"Add storage" => "Ajouter un support de stockage", "None set" => "Aucun spécifié", "All Users" => "Tous les utilisateurs", "Groups" => "Groupes", diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php index 76ad8fc97a..e2698c5c4a 100644 --- a/apps/files_versions/l10n/fr.php +++ b/apps/files_versions/l10n/fr.php @@ -6,5 +6,6 @@ "File %s could not be reverted to version %s" => "Le fichier %s ne peut être restauré dans sa version %s", "No old versions available" => "Aucune ancienne version n'est disponible", "No path specified" => "Aucun chemin spécifié", +"Versions" => "Versions", "Revert a file to a previous version by clicking on its revert button" => "Restaurez un fichier dans une version antérieure en cliquant sur son bouton de restauration" ); diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php index d6dfbee6aa..2df00fc826 100644 --- a/apps/files_versions/l10n/sl.php +++ b/apps/files_versions/l10n/sl.php @@ -3,7 +3,7 @@ "success" => "uspešno", "File %s was reverted to version %s" => "Datoteka %s je povrnjena na različico %s.", "failure" => "spodletelo", -"File %s could not be reverted to version %s" => "Datoteka %s ni mogoče povrniti na različico %s.", +"File %s could not be reverted to version %s" => "Datoteke %s ni mogoče povrniti na različico %s.", "No old versions available" => "Ni starejših različic.", "No path specified" => "Ni določene poti", "Versions" => "Različice", diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php index abe1363569..990658e147 100644 --- a/apps/user_ldap/l10n/fr.php +++ b/apps/user_ldap/l10n/fr.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud.", "Not recommended, use for testing only." => "Non recommandé, utilisation pour tests uniquement.", +"Cache Time-To-Live" => "Durée de vie du cache", "in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.", "Directory Settings" => "Paramètres du répertoire", "User Display Name Field" => "Champ \"nom d'affichage\" de l'utilisateur", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Recherche des attributs du groupe", "Group-Member association" => "Association groupe-membre", "Special Attributes" => "Attributs spéciaux", +"Quota Field" => "Champ du quota", +"Quota Default" => "Quota par défaut", "in bytes" => "en octets", +"Email Field" => "Champ Email", +"User Home Folder Naming Rule" => "Convention de nommage du répertoire utilisateur", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ", +"Test Configuration" => "Tester la configuration", "Help" => "Aide" ); diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php index 22ed5dc2f7..8ff1fd5344 100644 --- a/apps/user_ldap/l10n/sl.php +++ b/apps/user_ldap/l10n/sl.php @@ -41,7 +41,7 @@ "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD.", "Backup (Replica) Port" => "Varnostna kopija (replika) podatka vrat", "Disable Main Server" => "Onemogoči glavni strežnik", -"When switched on, ownCloud will only connect to the replica server." => "Ob priklopu bo strežnik ownCloud povezan le z kopijo (repliko) strežnika.", +"When switched on, ownCloud will only connect to the replica server." => "Ob priklopu bo strežnik ownCloud povezan le s kopijo (repliko) strežnika.", "Use TLS" => "Uporabi TLS", "Do not use it additionally for LDAPS connections, it will fail." => "Strežnika ni priporočljivo uporabljati za povezave LDAPS. Povezava bo spodletela.", "Case insensitve LDAP server (Windows)" => "Strežnik LDAP ne upošteva velikosti črk (Windows)", diff --git a/l10n/fr/files.po b/l10n/fr/files.po index f7ba7a0308..64ca95eab0 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -18,13 +18,14 @@ # Robert Di Rosa <>, 2012-2013. # , 2011. # Romain DEP. , 2012-2013. +# , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 19:10+0000\n" +"Last-Translator: Zertrin \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,7 +90,7 @@ msgstr "Plus assez d'espace de stockage disponible" msgid "Invalid directory." msgstr "Dossier invalide." -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" msgstr "Fichiers" @@ -105,8 +106,8 @@ msgstr "Supprimer" msgid "Rename" msgstr "Renommer" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 -#: js/files.js:439 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409 +#: js/files.js:440 msgid "Pending" msgstr "En cours" @@ -160,74 +161,74 @@ msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus être t msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)" -#: js/files.js:225 +#: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux." -#: js/files.js:262 +#: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet." -#: js/files.js:262 +#: js/files.js:263 msgid "Upload Error" msgstr "Erreur de chargement" -#: js/files.js:273 +#: js/files.js:274 msgid "Close" msgstr "Fermer" -#: js/files.js:312 +#: js/files.js:313 msgid "1 file uploading" msgstr "1 fichier en cours de téléchargement" -#: js/files.js:315 js/files.js:370 js/files.js:385 +#: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" msgstr "{count} fichiers téléversés" -#: js/files.js:388 js/files.js:423 +#: js/files.js:389 js/files.js:424 msgid "Upload cancelled." msgstr "Chargement annulé." -#: js/files.js:497 +#: js/files.js:498 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier." -#: js/files.js:570 +#: js/files.js:571 msgid "URL cannot be empty." msgstr "L'URL ne peut-être vide" -#: js/files.js:575 +#: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud" -#: js/files.js:953 templates/index.php:68 +#: js/files.js:954 templates/index.php:68 msgid "Name" msgstr "Nom" -#: js/files.js:954 templates/index.php:79 +#: js/files.js:955 templates/index.php:79 msgid "Size" msgstr "Taille" -#: js/files.js:955 templates/index.php:81 +#: js/files.js:956 templates/index.php:81 msgid "Modified" msgstr "Modifié" -#: js/files.js:974 +#: js/files.js:975 msgid "1 folder" msgstr "1 dossier" -#: js/files.js:976 +#: js/files.js:977 msgid "{count} folders" msgstr "{count} dossiers" -#: js/files.js:984 +#: js/files.js:985 msgid "1 file" msgstr "1 fichier" -#: js/files.js:986 +#: js/files.js:987 msgid "{count} files" msgstr "{count} fichiers" @@ -293,7 +294,7 @@ msgstr "Annuler l'envoi" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Vous n'avez pas le droit d'écriture ici." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po index fd92856f84..6a690785e2 100644 --- a/l10n/fr/files_external.po +++ b/l10n/fr/files_external.po @@ -5,13 +5,14 @@ # Translators: # , 2012. # Romain DEP. , 2012. +# , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-01 00:05+0100\n" -"PO-Revision-Date: 2013-02-27 23:20+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 19:21+0000\n" +"Last-Translator: Zertrin \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,13 +40,13 @@ msgstr "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de pas msgid "Error configuring Google Drive storage" msgstr "Erreur lors de la configuration du support de stockage Google Drive" -#: lib/config.php:421 +#: lib/config.php:423 msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." msgstr "Attention : \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur système pour l'installer." -#: lib/config.php:424 +#: lib/config.php:426 msgid "" "Warning: The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " @@ -62,7 +63,7 @@ msgstr "Nom du dossier" #: templates/settings.php:10 msgid "External storage" -msgstr "" +msgstr "Stockage externe" #: templates/settings.php:11 msgid "Configuration" @@ -78,7 +79,7 @@ msgstr "Disponible" #: templates/settings.php:33 msgid "Add storage" -msgstr "" +msgstr "Ajouter un support de stockage" #: templates/settings.php:90 msgid "None set" diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po index 7b7b6fa9a6..abef94b52e 100644 --- a/l10n/fr/files_versions.po +++ b/l10n/fr/files_versions.po @@ -4,13 +4,14 @@ # # Translators: # Romain DEP. , 2012-2013. +# , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-28 00:04+0100\n" -"PO-Revision-Date: 2013-02-27 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 19:21+0000\n" +"Last-Translator: Zertrin \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,17 +42,17 @@ msgstr "échec" msgid "File %s could not be reverted to version %s" msgstr "Le fichier %s ne peut être restauré dans sa version %s" -#: history.php:68 +#: history.php:69 msgid "No old versions available" msgstr "Aucune ancienne version n'est disponible" -#: history.php:73 +#: history.php:74 msgid "No path specified" msgstr "Aucun chemin spécifié" #: js/versions.js:6 msgid "Versions" -msgstr "" +msgstr "Versions" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po index 177014bd97..2e8c1298c1 100644 --- a/l10n/fr/user_ldap.po +++ b/l10n/fr/user_ldap.po @@ -9,14 +9,15 @@ # Romain DEP. , 2012-2013. # , 2013. # , 2012. +# , 2013. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 19:21+0000\n" +"Last-Translator: Zertrin \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,248 +94,248 @@ msgstr "Attention : Le module php LDAP n'est pas installé, par conséque msgid "Server configuration" msgstr "Configuration du serveur" -#: templates/settings.php:18 +#: templates/settings.php:31 msgid "Add Server Configuration" msgstr "Ajouter une configuration du serveur" -#: templates/settings.php:23 +#: templates/settings.php:36 msgid "Host" msgstr "Hôte" -#: templates/settings.php:25 +#: templates/settings.php:38 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://" -#: templates/settings.php:26 +#: templates/settings.php:39 msgid "Base DN" msgstr "DN Racine" -#: templates/settings.php:27 +#: templates/settings.php:40 msgid "One Base DN per line" msgstr "Un DN racine par ligne" -#: templates/settings.php:28 +#: templates/settings.php:41 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé" -#: templates/settings.php:30 +#: templates/settings.php:43 msgid "User DN" msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)" -#: templates/settings.php:32 +#: templates/settings.php:45 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides." -#: templates/settings.php:33 +#: templates/settings.php:46 msgid "Password" msgstr "Mot de passe" -#: templates/settings.php:36 +#: templates/settings.php:49 msgid "For anonymous access, leave DN and Password empty." msgstr "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides." -#: templates/settings.php:37 +#: templates/settings.php:50 msgid "User Login Filter" msgstr "Modèle d'authentification utilisateurs" -#: templates/settings.php:40 +#: templates/settings.php:53 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion." -#: templates/settings.php:41 +#: templates/settings.php:54 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\"" -#: templates/settings.php:42 +#: templates/settings.php:55 msgid "User List Filter" msgstr "Filtre d'utilisateurs" -#: templates/settings.php:45 +#: templates/settings.php:58 msgid "Defines the filter to apply, when retrieving users." msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs." -#: templates/settings.php:46 +#: templates/settings.php:59 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "sans élément de substitution, par exemple \"objectClass=person\"." -#: templates/settings.php:47 +#: templates/settings.php:60 msgid "Group Filter" msgstr "Filtre de groupes" -#: templates/settings.php:50 +#: templates/settings.php:63 msgid "Defines the filter to apply, when retrieving groups." msgstr "Définit le filtre à appliquer lors de la récupération des groupes." -#: templates/settings.php:51 +#: templates/settings.php:64 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"." -#: templates/settings.php:55 +#: templates/settings.php:68 msgid "Connection Settings" msgstr "Paramètres de connexion" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "Configuration Active" msgstr "Configuration active" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "When unchecked, this configuration will be skipped." msgstr "Lorsque non cochée, la configuration sera ignorée." -#: templates/settings.php:58 +#: templates/settings.php:71 msgid "Port" msgstr "Port" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "Backup (Replica) Host" msgstr "Serveur de backup (réplique)" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "Fournir un serveur de backup optionnel. Il doit s'agir d'une réplique du serveur LDAP/AD principal." -#: templates/settings.php:60 +#: templates/settings.php:73 msgid "Backup (Replica) Port" msgstr "Port du serveur de backup (réplique)" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "Disable Main Server" msgstr "Désactiver le serveur principal" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "Lorsqu'activé, ownCloud ne se connectera qu'au serveur répliqué." -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Use TLS" msgstr "Utiliser TLS" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "À ne pas utiliser pour les connexions LDAPS (cela échouera)." -#: templates/settings.php:63 +#: templates/settings.php:76 msgid "Case insensitve LDAP server (Windows)" msgstr "Serveur LDAP insensible à la casse (Windows)" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Turn off SSL certificate validation." msgstr "Désactiver la validation du certificat SSL." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Not recommended, use for testing only." msgstr "Non recommandé, utilisation pour tests uniquement." -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Durée de vie du cache" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "in seconds. A change empties the cache." msgstr "en secondes. Tout changement vide le cache." -#: templates/settings.php:67 +#: templates/settings.php:80 msgid "Directory Settings" msgstr "Paramètres du répertoire" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "User Display Name Field" msgstr "Champ \"nom d'affichage\" de l'utilisateur" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud." -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "Base User Tree" msgstr "DN racine de l'arbre utilisateurs" -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "One User Base DN per line" msgstr "Un DN racine utilisateur par ligne" -#: templates/settings.php:71 +#: templates/settings.php:84 msgid "User Search Attributes" msgstr "Recherche des attributs utilisateur" -#: templates/settings.php:71 templates/settings.php:74 +#: templates/settings.php:84 templates/settings.php:87 msgid "Optional; one attribute per line" msgstr "Optionnel, un attribut par ligne" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "Group Display Name Field" msgstr "Champ \"nom d'affichage\" du groupe" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud." -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "Base Group Tree" msgstr "DN racine de l'arbre groupes" -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "One Group Base DN per line" msgstr "Un DN racine groupe par ligne" -#: templates/settings.php:74 +#: templates/settings.php:87 msgid "Group Search Attributes" msgstr "Recherche des attributs du groupe" -#: templates/settings.php:75 +#: templates/settings.php:88 msgid "Group-Member association" msgstr "Association groupe-membre" -#: templates/settings.php:77 +#: templates/settings.php:90 msgid "Special Attributes" msgstr "Attributs spéciaux" -#: templates/settings.php:79 +#: templates/settings.php:92 msgid "Quota Field" -msgstr "" +msgstr "Champ du quota" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "Quota Default" -msgstr "" +msgstr "Quota par défaut" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "in bytes" msgstr "en octets" -#: templates/settings.php:81 +#: templates/settings.php:94 msgid "Email Field" -msgstr "" +msgstr "Champ Email" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Convention de nommage du répertoire utilisateur" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Laisser vide " -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Test Configuration" -msgstr "" +msgstr "Tester la configuration" -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Help" msgstr "Aide" diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po index f35ef4641d..05ce9505eb 100644 --- a/l10n/sl/files_encryption.po +++ b/l10n/sl/files_encryption.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-08 21:52+0000\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 14:30+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgstr "Navedene vrste datotek ne bodo šifrirane:" #: templates/settings.php:7 msgid "Exclude the following file types from encryption:" -msgstr "Izloči navedene vrste datotek med šifriranjem:" +msgstr "Ne šifriraj navedenih vrst datotek:" #: templates/settings.php:12 msgid "None" diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po index ea4e088032..2080303af5 100644 --- a/l10n/sl/files_sharing.po +++ b/l10n/sl/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" -"PO-Revision-Date: 2013-03-11 19:52+0000\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 14:21+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po index a5026ce9b2..5810bb0297 100644 --- a/l10n/sl/files_versions.po +++ b/l10n/sl/files_versions.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-08 21:30+0000\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 14:30+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgstr "spodletelo" #: history.php:51 #, php-format msgid "File %s could not be reverted to version %s" -msgstr "Datoteka %s ni mogoče povrniti na različico %s." +msgstr "Datoteke %s ni mogoče povrniti na različico %s." #: history.php:69 msgid "No old versions available" diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po index 680f05c14e..6811f4f026 100644 --- a/l10n/sl/user_ldap.po +++ b/l10n/sl/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" -"PO-Revision-Date: 2013-03-11 18:30+0000\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 14:30+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -209,7 +209,7 @@ msgstr "Onemogoči glavni strežnik" #: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." -msgstr "Ob priklopu bo strežnik ownCloud povezan le z kopijo (repliko) strežnika." +msgstr "Ob priklopu bo strežnik ownCloud povezan le s kopijo (repliko) strežnika." #: templates/settings.php:75 msgid "Use TLS" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 2b0f3f96e5..116f08d4c3 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 7560185daf..470be4fdce 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 0ba2492393..85d29c0f1e 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index ef320179ba..9ca37d1d3b 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index e87e420998..1d0eeda3a1 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index e5bcb350ab..674fec9fe9 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 739d5d7e3c..5b2c883954 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 8ffe6dd9b4..861476a62f 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 7e3614321b..7cd50aea3f 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index e2a201c4d9..545a7706a9 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 454b5eec27..505c651b97 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From f971ce0b66ba32b1946df493ab5a937e4a778548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 13 Mar 2013 11:15:17 +0100 Subject: [PATCH 069/546] let public link download handle json encoded file lists --- apps/files/js/files.js | 2 +- apps/files_sharing/public.php | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index a4ef41c280..82069e3bc5 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -226,7 +226,7 @@ $(document).ready(function() { OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.')); // use special download URL if provided, e.g. for public shared files if ( (downloadURL = document.getElementById("downloadURL")) ) { - window.location=downloadURL.value+"&download&files="+files; + window.location=downloadURL.value+"&download&files="+encodeURIComponent(fileslist); } else { window.location=OC.filePath('files', 'ajax', 'download.php') + '?'+ $.param({ dir: dir, files: fileslist }); } diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 1da972ad7e..c8aca498f8 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -113,7 +113,13 @@ if (isset($path)) { // Download the file if (isset($_GET['download'])) { if (isset($_GET['files'])) { // download selected files - OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); + $files = urldecode($_GET['files']); + $files_list = json_decode($files); + // in case we get only a single file + if ($files_list === NULL ) { + $files_list = array($files); + } + OC_Files::get($path, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); } else { OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); } From e5f40ddaae1004835600f3b5a44bc1bdaea59d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 13 Mar 2013 11:33:20 +0100 Subject: [PATCH 070/546] only prevent shared action for the Shared folder in the root dir --- apps/files/js/fileactions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 3c4fa08bf1..f3264da5a1 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -112,7 +112,7 @@ var FileActions = { addAction(name, action); } }); - if(actions.Share && file !== 'Shared'){ + if(actions.Share && !($('#dir').val() === '/' && file === 'Shared')){ addAction('Share', actions.Share); } From 30831b6b554fbc99f422d5d490f6a325a6296f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Wed, 13 Mar 2013 15:39:39 +0100 Subject: [PATCH 071/546] we need to listen to the pre delete hook, otherwise the file is already gone --- apps/files_sharing/appinfo/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 5711669815..9363a5431f 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -12,7 +12,7 @@ OCP\Share::registerBackend('file', 'OC_Share_Backend_File'); OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file'); OCP\Util::addScript('files_sharing', 'share'); \OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook'); -\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook'); +\OC_Hook::connect('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook'); \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook'); \OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook'); \OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook'); \ No newline at end of file From 9a0cb2ccaa92731a14e079a024bb38c934130d78 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 14 Mar 2013 00:06:29 +0100 Subject: [PATCH 072/546] [tx-robot] updated from transifex --- apps/files/l10n/es_AR.php | 1 + apps/files/l10n/zh_HK.php | 8 + apps/files_external/l10n/zh_HK.php | 5 + apps/files_sharing/l10n/zh_HK.php | 4 + apps/files_trashbin/l10n/zh_HK.php | 3 + apps/user_ldap/l10n/es_AR.php | 6 + apps/user_ldap/l10n/zh_HK.php | 4 + core/l10n/fa.php | 3 + core/l10n/zh_HK.php | 89 ++++++- l10n/es_AR/files.po | 48 ++-- l10n/es_AR/user_ldap.po | 134 +++++----- l10n/fa/core.po | 106 ++++---- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_trashbin.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/templates/user_webdavauth.pot | 2 +- l10n/zh_HK/core.po | 392 ++++++++++++++-------------- l10n/zh_HK/files.po | 56 ++-- l10n/zh_HK/files_external.po | 14 +- l10n/zh_HK/files_sharing.po | 16 +- l10n/zh_HK/files_trashbin.po | 6 +- l10n/zh_HK/lib.po | 34 +-- l10n/zh_HK/settings.po | 16 +- l10n/zh_HK/user_ldap.po | 124 ++++----- lib/l10n/zh_HK.php | 13 + settings/l10n/zh_HK.php | 8 + 33 files changed, 628 insertions(+), 484 deletions(-) create mode 100644 apps/files/l10n/zh_HK.php create mode 100644 apps/files_external/l10n/zh_HK.php create mode 100644 apps/files_sharing/l10n/zh_HK.php create mode 100644 apps/files_trashbin/l10n/zh_HK.php create mode 100644 apps/user_ldap/l10n/zh_HK.php create mode 100644 lib/l10n/zh_HK.php create mode 100644 settings/l10n/zh_HK.php diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index f16385a652..6cd7c02692 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -61,6 +61,7 @@ "From link" => "Desde enlace", "Deleted files" => "Archivos Borrados", "Cancel upload" => "Cancelar subida", +"You don’t have write permissions here." => "No tenés permisos de escritura acá.", "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!", "Download" => "Descargar", "Unshare" => "Dejar de compartir", diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php new file mode 100644 index 0000000000..76acf22cd5 --- /dev/null +++ b/apps/files/l10n/zh_HK.php @@ -0,0 +1,8 @@ + "文件", +"Delete" => "刪除", +"Upload" => "上傳", +"Save" => "儲存", +"Download" => "下載", +"Unshare" => "取消分享" +); diff --git a/apps/files_external/l10n/zh_HK.php b/apps/files_external/l10n/zh_HK.php new file mode 100644 index 0000000000..a85b5a03b8 --- /dev/null +++ b/apps/files_external/l10n/zh_HK.php @@ -0,0 +1,5 @@ + "群組", +"Users" => "用戶", +"Delete" => "刪除" +); diff --git a/apps/files_sharing/l10n/zh_HK.php b/apps/files_sharing/l10n/zh_HK.php new file mode 100644 index 0000000000..7ef0f19ca4 --- /dev/null +++ b/apps/files_sharing/l10n/zh_HK.php @@ -0,0 +1,4 @@ + "密碼", +"Download" => "下載" +); diff --git a/apps/files_trashbin/l10n/zh_HK.php b/apps/files_trashbin/l10n/zh_HK.php new file mode 100644 index 0000000000..8dbddf43e3 --- /dev/null +++ b/apps/files_trashbin/l10n/zh_HK.php @@ -0,0 +1,3 @@ + "刪除" +); diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php index b0e7ec12b2..c8aec0cd41 100644 --- a/apps/user_ldap/l10n/es_AR.php +++ b/apps/user_ldap/l10n/es_AR.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Desactivar la validación por certificado SSL.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud.", "Not recommended, use for testing only." => "No recomendado, sólo para pruebas.", +"Cache Time-To-Live" => "Tiempo de vida del caché", "in seconds. A change empties the cache." => "en segundos. Cambiarlo vacía la cache.", "Directory Settings" => "Configuración de Directorio", "User Display Name Field" => "Campo de nombre de usuario a mostrar", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Atributos de búsqueda de grupo", "Group-Member association" => "Asociación Grupo-Miembro", "Special Attributes" => "Atributos Especiales", +"Quota Field" => "Campo de cuota", +"Quota Default" => "Cuota por defecto", "in bytes" => "en bytes", +"Email Field" => "Campo de e-mail", +"User Home Folder Naming Rule" => "Regla de nombre de los directorios de usuario", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.", +"Test Configuration" => "Probar configuración", "Help" => "Ayuda" ); diff --git a/apps/user_ldap/l10n/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php new file mode 100644 index 0000000000..4dec54822a --- /dev/null +++ b/apps/user_ldap/l10n/zh_HK.php @@ -0,0 +1,4 @@ + "密碼", +"Help" => "幫助" +); diff --git a/core/l10n/fa.php b/core/l10n/fa.php index 2420ee67df..9cd3a5e978 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -109,6 +109,8 @@ "Security Warning" => "اخطار امنیتی", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "هیچ مولد تصادفی امن در دسترس نیست، لطفا فرمت PHP OpenSSL را فعال نمایید.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "بدون وجود یک تولید کننده اعداد تصادفی امن ، یک مهاجم ممکن است این قابلیت را داشته باشد که پیشگویی کند پسوورد های راه انداز گرفته شده و کنترلی روی حساب کاربری شما داشته باشد .", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.", +"For information how to properly configure your server, please see the documentation." => "برای مطلع شدن از چگونگی تنظیم سرورتان،لطفا این را ببینید.", "Create an admin account" => "لطفا یک شناسه برای مدیر بسازید", "Advanced" => "حرفه ای", "Data folder" => "پوشه اطلاعاتی", @@ -128,6 +130,7 @@ "Lost your password?" => "آیا گذرواژه تان را به یاد نمی آورید؟", "remember" => "بیاد آوری", "Log in" => "ورود", +"Alternative Logins" => "ورود متناوب", "prev" => "بازگشت", "next" => "بعدی", "Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد." diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php index f55da4d3ef..d02b7be660 100644 --- a/core/l10n/zh_HK.php +++ b/core/l10n/zh_HK.php @@ -1,3 +1,90 @@ "你已登出。" +"Sunday" => "星期日", +"Monday" => "星期一", +"Tuesday" => "星期二", +"Wednesday" => "星期三", +"Thursday" => "星期四", +"Friday" => "星期五", +"Saturday" => "星期六", +"January" => "一月", +"February" => "二月", +"March" => "三月", +"April" => "四月", +"May" => "五月", +"June" => "六月", +"July" => "七月", +"August" => "八月", +"September" => "九月", +"October" => "十月", +"November" => "十一月", +"December" => "十二月", +"Settings" => "設定", +"today" => "今日", +"yesterday" => "昨日", +"last month" => "前一月", +"months ago" => "個月之前", +"Cancel" => "取消", +"No" => "No", +"Yes" => "Yes", +"Ok" => "OK", +"Error" => "錯誤", +"Shared" => "已分享", +"Share" => "分享", +"Error while sharing" => "分享時發生錯誤", +"Error while unsharing" => "取消分享時發生錯誤", +"Error while changing permissions" => "更改權限時發生錯誤", +"Shared with you and the group {group} by {owner}" => "{owner}與你及群組的分享", +"Shared with you by {owner}" => "{owner}與你的分享", +"Share with" => "分享", +"Share with link" => "以連結分享", +"Password protect" => "密碼保護", +"Password" => "密碼", +"Send" => "傳送", +"Set expiration date" => "設定分享期限", +"Expiration date" => "分享期限", +"Share via email:" => "以電郵分享", +"No people found" => "找不到", +"Unshare" => "取消分享", +"create" => "新增", +"update" => "更新", +"delete" => "刪除", +"share" => "分享", +"Password protected" => "密碼保護", +"Sending ..." => "傳送中", +"Email sent" => "郵件已傳", +"The update was successful. Redirecting you to ownCloud now." => "更新成功, 正", +"Use the following link to reset your password: {link}" => "請用以下連結重設你的密碼: {link}", +"You will receive a link to reset your password via Email." => "你將收到一封電郵", +"Reset email send." => "重設密碼郵件已傳", +"Request failed!" => "請求失敗", +"Username" => "用戶名稱", +"Request reset" => "重設", +"Your password was reset" => "你的密碼已被重設", +"To login page" => "前往登入版面", +"New password" => "新密碼", +"Reset password" => "重設密碼", +"Personal" => "個人", +"Users" => "用戶", +"Apps" => "軟件", +"Admin" => "管理", +"Help" => "幫助", +"Cloud not found" => "未找到Cloud", +"Add" => "加入", +"Create an admin account" => "建立管理員帳戶", +"Advanced" => "進階", +"Configure the database" => "設定資料庫", +"will be used" => "將被使用", +"Database user" => "資料庫帳戶", +"Database password" => "資料庫密碼", +"Database name" => "資料庫名稱", +"Log out" => "登出", +"Automatic logon rejected!" => "自動登入被拒", +"If you did not change your password recently, your account may be compromised!" => "如果你近期未曾更改密碼, 你的帳號可能被洩露!", +"Please change your password to secure your account again." => "請更改你的密碼以保護你的帳戶", +"Lost your password?" => "忘記密碼", +"remember" => "記住", +"Log in" => "登入", +"prev" => "前一步", +"next" => "下一步", +"Updating ownCloud to version %s, this may take a while." => "ownCloud (ver. %s)更新中, 請耐心等侯" ); diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po index 4e357c0092..1f3877df3c 100644 --- a/l10n/es_AR/files.po +++ b/l10n/es_AR/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 09:50+0000\n" +"Last-Translator: cjtess \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,7 +78,7 @@ msgstr "No hay suficiente capacidad de almacenamiento" msgid "Invalid directory." msgstr "Directorio invalido." -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" msgstr "Archivos" @@ -94,8 +94,8 @@ msgstr "Borrar" msgid "Rename" msgstr "Cambiar nombre" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 -#: js/files.js:439 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409 +#: js/files.js:440 msgid "Pending" msgstr "Pendiente" @@ -149,74 +149,74 @@ msgstr "El almacenamiento está lleno, los archivos no se pueden seguir actualiz msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)" -#: js/files.js:225 +#: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes." -#: js/files.js:262 +#: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes" -#: js/files.js:262 +#: js/files.js:263 msgid "Upload Error" msgstr "Error al subir el archivo" -#: js/files.js:273 +#: js/files.js:274 msgid "Close" msgstr "Cerrar" -#: js/files.js:312 +#: js/files.js:313 msgid "1 file uploading" msgstr "Subiendo 1 archivo" -#: js/files.js:315 js/files.js:370 js/files.js:385 +#: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" msgstr "Subiendo {count} archivos" -#: js/files.js:388 js/files.js:423 +#: js/files.js:389 js/files.js:424 msgid "Upload cancelled." msgstr "La subida fue cancelada" -#: js/files.js:497 +#: js/files.js:498 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará." -#: js/files.js:570 +#: js/files.js:571 msgid "URL cannot be empty." msgstr "La URL no puede estar vacía" -#: js/files.js:575 +#: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud" -#: js/files.js:953 templates/index.php:68 +#: js/files.js:954 templates/index.php:68 msgid "Name" msgstr "Nombre" -#: js/files.js:954 templates/index.php:79 +#: js/files.js:955 templates/index.php:79 msgid "Size" msgstr "Tamaño" -#: js/files.js:955 templates/index.php:81 +#: js/files.js:956 templates/index.php:81 msgid "Modified" msgstr "Modificado" -#: js/files.js:974 +#: js/files.js:975 msgid "1 folder" msgstr "1 directorio" -#: js/files.js:976 +#: js/files.js:977 msgid "{count} folders" msgstr "{count} directorios" -#: js/files.js:984 +#: js/files.js:985 msgid "1 file" msgstr "1 archivo" -#: js/files.js:986 +#: js/files.js:987 msgid "{count} files" msgstr "{count} archivos" @@ -282,7 +282,7 @@ msgstr "Cancelar subida" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "No tenés permisos de escritura acá." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po index 6f51b5e950..e73aafc61c 100644 --- a/l10n/es_AR/user_ldap.po +++ b/l10n/es_AR/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 10:01+0000\n" +"Last-Translator: cjtess \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,248 +89,248 @@ msgstr "Atención: El módulo PHP LDAP no está instalado, este elemento msgid "Server configuration" msgstr "Configuración del Servidor" -#: templates/settings.php:18 +#: templates/settings.php:31 msgid "Add Server Configuration" msgstr "Añadir Configuración del Servidor" -#: templates/settings.php:23 +#: templates/settings.php:36 msgid "Host" msgstr "Servidor" -#: templates/settings.php:25 +#: templates/settings.php:38 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://" -#: templates/settings.php:26 +#: templates/settings.php:39 msgid "Base DN" msgstr "DN base" -#: templates/settings.php:27 +#: templates/settings.php:40 msgid "One Base DN per line" msgstr "Una DN base por línea" -#: templates/settings.php:28 +#: templates/settings.php:41 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"" -#: templates/settings.php:30 +#: templates/settings.php:43 msgid "User DN" msgstr "DN usuario" -#: templates/settings.php:32 +#: templates/settings.php:45 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos." -#: templates/settings.php:33 +#: templates/settings.php:46 msgid "Password" msgstr "Contraseña" -#: templates/settings.php:36 +#: templates/settings.php:49 msgid "For anonymous access, leave DN and Password empty." msgstr "Para acceso anónimo, dejá DN y contraseña vacíos." -#: templates/settings.php:37 +#: templates/settings.php:50 msgid "User Login Filter" msgstr "Filtro de inicio de sesión de usuario" -#: templates/settings.php:40 +#: templates/settings.php:53 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión." -#: templates/settings.php:41 +#: templates/settings.php:54 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\"" -#: templates/settings.php:42 +#: templates/settings.php:55 msgid "User List Filter" msgstr "Lista de filtros de usuario" -#: templates/settings.php:45 +#: templates/settings.php:58 msgid "Defines the filter to apply, when retrieving users." msgstr "Define el filtro a aplicar, cuando se obtienen usuarios." -#: templates/settings.php:46 +#: templates/settings.php:59 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "Sin plantilla, p. ej.: \"objectClass=person\"." -#: templates/settings.php:47 +#: templates/settings.php:60 msgid "Group Filter" msgstr "Filtro de grupo" -#: templates/settings.php:50 +#: templates/settings.php:63 msgid "Defines the filter to apply, when retrieving groups." msgstr "Define el filtro a aplicar cuando se obtienen grupos." -#: templates/settings.php:51 +#: templates/settings.php:64 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"." -#: templates/settings.php:55 +#: templates/settings.php:68 msgid "Connection Settings" msgstr "Configuración de Conección" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "Configuration Active" msgstr "Configuración activa" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "When unchecked, this configuration will be skipped." msgstr "Si no está seleccionada, esta configuración será omitida." -#: templates/settings.php:58 +#: templates/settings.php:71 msgid "Port" msgstr "Puerto" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "Backup (Replica) Host" msgstr "Host para copia de seguridad (réplica)" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD." -#: templates/settings.php:60 +#: templates/settings.php:73 msgid "Backup (Replica) Port" msgstr "Puerto para copia de seguridad (réplica)" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "Disable Main Server" msgstr "Deshabilitar el Servidor Principal" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "Al comenzar, ownCloud se conectará únicamente al servidor réplica" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Use TLS" msgstr "Usar TLS" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "No usar adicionalmente para conexiones LDAPS, las mismas fallarán" -#: templates/settings.php:63 +#: templates/settings.php:76 msgid "Case insensitve LDAP server (Windows)" msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Turn off SSL certificate validation." msgstr "Desactivar la validación por certificado SSL." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Not recommended, use for testing only." msgstr "No recomendado, sólo para pruebas." -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Tiempo de vida del caché" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "in seconds. A change empties the cache." msgstr "en segundos. Cambiarlo vacía la cache." -#: templates/settings.php:67 +#: templates/settings.php:80 msgid "Directory Settings" msgstr "Configuración de Directorio" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "User Display Name Field" msgstr "Campo de nombre de usuario a mostrar" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud." -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "Base User Tree" msgstr "Árbol base de usuario" -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "One User Base DN per line" msgstr "Una DN base de usuario por línea" -#: templates/settings.php:71 +#: templates/settings.php:84 msgid "User Search Attributes" msgstr "Atributos de la búsqueda de usuario" -#: templates/settings.php:71 templates/settings.php:74 +#: templates/settings.php:84 templates/settings.php:87 msgid "Optional; one attribute per line" msgstr "Opcional; un atributo por linea" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "Group Display Name Field" msgstr "Campo de nombre de grupo a mostrar" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud." -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "Base Group Tree" msgstr "Árbol base de grupo" -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "One Group Base DN per line" msgstr "Una DN base de grupo por línea" -#: templates/settings.php:74 +#: templates/settings.php:87 msgid "Group Search Attributes" msgstr "Atributos de búsqueda de grupo" -#: templates/settings.php:75 +#: templates/settings.php:88 msgid "Group-Member association" msgstr "Asociación Grupo-Miembro" -#: templates/settings.php:77 +#: templates/settings.php:90 msgid "Special Attributes" msgstr "Atributos Especiales" -#: templates/settings.php:79 +#: templates/settings.php:92 msgid "Quota Field" -msgstr "" +msgstr "Campo de cuota" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "Quota Default" -msgstr "" +msgstr "Cuota por defecto" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "in bytes" msgstr "en bytes" -#: templates/settings.php:81 +#: templates/settings.php:94 msgid "Email Field" -msgstr "" +msgstr "Campo de e-mail" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Regla de nombre de los directorios de usuario" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD." -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Test Configuration" -msgstr "" +msgstr "Probar configuración" -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Help" msgstr "Ayuda" diff --git a/l10n/fa/core.po b/l10n/fa/core.po index e800192efd..7f82989ac3 100644 --- a/l10n/fa/core.po +++ b/l10n/fa/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 00:08+0100\n" -"PO-Revision-Date: 2013-02-26 07:50+0000\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 06:00+0000\n" "Last-Translator: miki_mika1362 \n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -162,55 +162,55 @@ msgstr "دسامبر" msgid "Settings" msgstr "تنظیمات" -#: js/js.js:768 +#: js/js.js:777 msgid "seconds ago" msgstr "ثانیه‌ها پیش" -#: js/js.js:769 +#: js/js.js:778 msgid "1 minute ago" msgstr "1 دقیقه پیش" -#: js/js.js:770 +#: js/js.js:779 msgid "{minutes} minutes ago" msgstr "{دقیقه ها} دقیقه های پیش" -#: js/js.js:771 +#: js/js.js:780 msgid "1 hour ago" msgstr "1 ساعت پیش" -#: js/js.js:772 +#: js/js.js:781 msgid "{hours} hours ago" msgstr "{ساعت ها} ساعت ها پیش" -#: js/js.js:773 +#: js/js.js:782 msgid "today" msgstr "امروز" -#: js/js.js:774 +#: js/js.js:783 msgid "yesterday" msgstr "دیروز" -#: js/js.js:775 +#: js/js.js:784 msgid "{days} days ago" msgstr "{روزها} روزهای پیش" -#: js/js.js:776 +#: js/js.js:785 msgid "last month" msgstr "ماه قبل" -#: js/js.js:777 +#: js/js.js:786 msgid "{months} months ago" msgstr "{ماه ها} ماه ها پیش" -#: js/js.js:778 +#: js/js.js:787 msgid "months ago" msgstr "ماه‌های قبل" -#: js/js.js:779 +#: js/js.js:788 msgid "last year" msgstr "سال قبل" -#: js/js.js:780 +#: js/js.js:789 msgid "years ago" msgstr "سال‌های قبل" @@ -240,8 +240,8 @@ msgid "The object type is not specified." msgstr "نوع شی تعیین نشده است." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582 -#: js/share.js:594 +#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566 +#: js/share.js:578 msgid "Error" msgstr "خطا" @@ -253,127 +253,127 @@ msgstr "نام برنامه تعیین نشده است." msgid "The required file {file} is not installed!" msgstr "پرونده { پرونده} درخواست شده نصب نشده است !" -#: js/share.js:29 js/share.js:43 js/share.js:90 +#: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" msgstr "اشتراک گذاشته شده" -#: js/share.js:93 +#: js/share.js:90 msgid "Share" msgstr "اشتراک‌گزاری" -#: js/share.js:141 js/share.js:622 +#: js/share.js:125 js/share.js:606 msgid "Error while sharing" msgstr "خطا درحال به اشتراک گذاشتن" -#: js/share.js:152 +#: js/share.js:136 msgid "Error while unsharing" msgstr "خطا درحال لغو اشتراک" -#: js/share.js:159 +#: js/share.js:143 msgid "Error while changing permissions" msgstr "خطا در حال تغییر مجوز" -#: js/share.js:168 +#: js/share.js:152 msgid "Shared with you and the group {group} by {owner}" msgstr "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}" -#: js/share.js:170 +#: js/share.js:154 msgid "Shared with you by {owner}" msgstr "به اشتراک گذاشته شده با شما توسط { دارنده}" -#: js/share.js:175 +#: js/share.js:159 msgid "Share with" msgstr "به اشتراک گذاشتن با" -#: js/share.js:180 +#: js/share.js:164 msgid "Share with link" msgstr "به اشتراک گذاشتن با پیوند" -#: js/share.js:183 +#: js/share.js:167 msgid "Password protect" msgstr "نگهداری کردن رمز عبور" -#: js/share.js:185 templates/installation.php:47 templates/login.php:35 +#: js/share.js:169 templates/installation.php:47 templates/login.php:35 msgid "Password" msgstr "گذرواژه" -#: js/share.js:189 +#: js/share.js:173 msgid "Email link to person" msgstr "پیوند ایمیل برای شخص." -#: js/share.js:190 +#: js/share.js:174 msgid "Send" msgstr "ارسال" -#: js/share.js:194 +#: js/share.js:178 msgid "Set expiration date" msgstr "تنظیم تاریخ انقضا" -#: js/share.js:195 +#: js/share.js:179 msgid "Expiration date" msgstr "تاریخ انقضا" -#: js/share.js:227 +#: js/share.js:211 msgid "Share via email:" msgstr "از طریق ایمیل به اشتراک بگذارید :" -#: js/share.js:229 +#: js/share.js:213 msgid "No people found" msgstr "کسی یافت نشد" -#: js/share.js:256 +#: js/share.js:240 msgid "Resharing is not allowed" msgstr "اشتراک گذاری مجدد مجاز نمی باشد" -#: js/share.js:292 +#: js/share.js:276 msgid "Shared in {item} with {user}" msgstr "به اشتراک گذاشته شده در {بخش} با {کاربر}" -#: js/share.js:313 +#: js/share.js:297 msgid "Unshare" msgstr "لغو اشتراک" -#: js/share.js:325 +#: js/share.js:309 msgid "can edit" msgstr "می توان ویرایش کرد" -#: js/share.js:327 +#: js/share.js:311 msgid "access control" msgstr "کنترل دسترسی" -#: js/share.js:330 +#: js/share.js:314 msgid "create" msgstr "ایجاد" -#: js/share.js:333 +#: js/share.js:317 msgid "update" msgstr "به روز" -#: js/share.js:336 +#: js/share.js:320 msgid "delete" msgstr "پاک کردن" -#: js/share.js:339 +#: js/share.js:323 msgid "share" msgstr "به اشتراک گذاشتن" -#: js/share.js:373 js/share.js:569 +#: js/share.js:357 js/share.js:553 msgid "Password protected" msgstr "نگهداری از رمز عبور" -#: js/share.js:582 +#: js/share.js:566 msgid "Error unsetting expiration date" msgstr "خطا در تنظیم نکردن تاریخ انقضا " -#: js/share.js:594 +#: js/share.js:578 msgid "Error setting expiration date" msgstr "خطا در تنظیم تاریخ انقضا" -#: js/share.js:609 +#: js/share.js:593 msgid "Sending ..." msgstr "درحال ارسال ..." -#: js/share.js:620 +#: js/share.js:604 msgid "Email sent" msgstr "ایمیل ارسال شد" @@ -489,14 +489,14 @@ msgstr "بدون وجود یک تولید کننده اعداد تصادفی ا msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند." #: templates/installation.php:33 msgid "" "For information how to properly configure your server, please see the documentation." -msgstr "" +msgstr "برای مطلع شدن از چگونگی تنظیم سرورتان،لطفا این را ببینید." #: templates/installation.php:37 msgid "Create an admin account" @@ -544,11 +544,11 @@ msgstr "هاست پایگاه داده" msgid "Finish setup" msgstr "اتمام نصب" -#: templates/layout.guest.php:35 +#: templates/layout.guest.php:40 msgid "web services under your control" msgstr "سرویس وب تحت کنترل شما" -#: templates/layout.user.php:53 +#: templates/layout.user.php:58 msgid "Log out" msgstr "خروج" @@ -580,7 +580,7 @@ msgstr "ورود" #: templates/login.php:49 msgid "Alternative Logins" -msgstr "" +msgstr "ورود متناوب" #: templates/part.pagenavi.php:3 msgid "prev" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 116f08d4c3..848cdf3bb8 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 470be4fdce..6357d63f29 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 85d29c0f1e..eec3e2d2a2 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 9ca37d1d3b..8037953766 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 1d0eeda3a1..5dd32d279f 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 674fec9fe9..999ae0525d 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 5b2c883954..1e50b9107f 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 861476a62f..7747d939c9 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 7cd50aea3f..7fc8346e6c 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 545a7706a9..ff8327d92e 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 505c651b97..646eca0dcf 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po index 65b41b0aee..407c8e9b18 100644 --- a/l10n/zh_HK/core.po +++ b/l10n/zh_HK/core.po @@ -4,13 +4,14 @@ # # Translators: # , 2012. +# Dennis , 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-09 00:12+0100\n" -"PO-Revision-Date: 2013-02-08 23:12+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 06:10+0000\n" +"Last-Translator: dtsang29 \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,24 +19,24 @@ msgstr "" "Language: zh_HK\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/share.php:85 +#: ajax/share.php:97 #, php-format msgid "User %s shared a file with you" msgstr "" -#: ajax/share.php:87 +#: ajax/share.php:99 #, php-format msgid "User %s shared a folder with you" msgstr "" -#: ajax/share.php:89 +#: ajax/share.php:101 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" msgstr "" -#: ajax/share.php:91 +#: ajax/share.php:104 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " @@ -81,135 +82,135 @@ msgstr "" msgid "Error removing %s from favorites." msgstr "" -#: js/config.php:32 +#: js/config.php:34 msgid "Sunday" -msgstr "" +msgstr "星期日" -#: js/config.php:32 +#: js/config.php:35 msgid "Monday" -msgstr "" +msgstr "星期一" -#: js/config.php:32 +#: js/config.php:36 msgid "Tuesday" -msgstr "" +msgstr "星期二" -#: js/config.php:32 +#: js/config.php:37 msgid "Wednesday" -msgstr "" +msgstr "星期三" -#: js/config.php:32 +#: js/config.php:38 msgid "Thursday" -msgstr "" +msgstr "星期四" -#: js/config.php:32 +#: js/config.php:39 msgid "Friday" -msgstr "" +msgstr "星期五" -#: js/config.php:32 +#: js/config.php:40 msgid "Saturday" -msgstr "" +msgstr "星期六" -#: js/config.php:33 +#: js/config.php:45 msgid "January" -msgstr "" +msgstr "一月" -#: js/config.php:33 +#: js/config.php:46 msgid "February" -msgstr "" +msgstr "二月" -#: js/config.php:33 +#: js/config.php:47 msgid "March" -msgstr "" +msgstr "三月" -#: js/config.php:33 +#: js/config.php:48 msgid "April" -msgstr "" +msgstr "四月" -#: js/config.php:33 +#: js/config.php:49 msgid "May" -msgstr "" +msgstr "五月" -#: js/config.php:33 +#: js/config.php:50 msgid "June" -msgstr "" +msgstr "六月" -#: js/config.php:33 +#: js/config.php:51 msgid "July" -msgstr "" +msgstr "七月" -#: js/config.php:33 +#: js/config.php:52 msgid "August" -msgstr "" +msgstr "八月" -#: js/config.php:33 +#: js/config.php:53 msgid "September" -msgstr "" +msgstr "九月" -#: js/config.php:33 +#: js/config.php:54 msgid "October" -msgstr "" +msgstr "十月" -#: js/config.php:33 +#: js/config.php:55 msgid "November" -msgstr "" +msgstr "十一月" -#: js/config.php:33 +#: js/config.php:56 msgid "December" -msgstr "" +msgstr "十二月" -#: js/js.js:284 +#: js/js.js:286 msgid "Settings" -msgstr "" +msgstr "設定" -#: js/js.js:764 +#: js/js.js:777 msgid "seconds ago" msgstr "" -#: js/js.js:765 +#: js/js.js:778 msgid "1 minute ago" msgstr "" -#: js/js.js:766 +#: js/js.js:779 msgid "{minutes} minutes ago" msgstr "" -#: js/js.js:767 +#: js/js.js:780 msgid "1 hour ago" msgstr "" -#: js/js.js:768 +#: js/js.js:781 msgid "{hours} hours ago" msgstr "" -#: js/js.js:769 +#: js/js.js:782 msgid "today" -msgstr "" +msgstr "今日" -#: js/js.js:770 +#: js/js.js:783 msgid "yesterday" -msgstr "" +msgstr "昨日" -#: js/js.js:771 +#: js/js.js:784 msgid "{days} days ago" msgstr "" -#: js/js.js:772 +#: js/js.js:785 msgid "last month" -msgstr "" +msgstr "前一月" -#: js/js.js:773 +#: js/js.js:786 msgid "{months} months ago" msgstr "" -#: js/js.js:774 +#: js/js.js:787 msgid "months ago" -msgstr "" +msgstr "個月之前" -#: js/js.js:775 +#: js/js.js:788 msgid "last year" msgstr "" -#: js/js.js:776 +#: js/js.js:789 msgid "years ago" msgstr "" @@ -219,19 +220,19 @@ msgstr "" #: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" -msgstr "" +msgstr "取消" #: js/oc-dialogs.js:162 msgid "No" -msgstr "" +msgstr "No" #: js/oc-dialogs.js:163 msgid "Yes" -msgstr "" +msgstr "Yes" #: js/oc-dialogs.js:180 msgid "Ok" -msgstr "" +msgstr "OK" #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 @@ -239,10 +240,10 @@ msgid "The object type is not specified." msgstr "" #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571 -#: js/share.js:583 +#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566 +#: js/share.js:578 msgid "Error" -msgstr "" +msgstr "錯誤" #: js/oc-vcategories.js:179 msgid "The app name is not specified." @@ -252,129 +253,129 @@ msgstr "" msgid "The required file {file} is not installed!" msgstr "" -#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93 -msgid "Share" -msgstr "" - -#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93 +#: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" -msgstr "" +msgstr "已分享" -#: js/share.js:141 js/share.js:611 +#: js/share.js:90 +msgid "Share" +msgstr "分享" + +#: js/share.js:125 js/share.js:606 msgid "Error while sharing" -msgstr "" +msgstr "分享時發生錯誤" + +#: js/share.js:136 +msgid "Error while unsharing" +msgstr "取消分享時發生錯誤" + +#: js/share.js:143 +msgid "Error while changing permissions" +msgstr "更改權限時發生錯誤" #: js/share.js:152 -msgid "Error while unsharing" -msgstr "" +msgid "Shared with you and the group {group} by {owner}" +msgstr "{owner}與你及群組的分享" + +#: js/share.js:154 +msgid "Shared with you by {owner}" +msgstr "{owner}與你的分享" #: js/share.js:159 -msgid "Error while changing permissions" -msgstr "" - -#: js/share.js:168 -msgid "Shared with you and the group {group} by {owner}" -msgstr "" - -#: js/share.js:170 -msgid "Shared with you by {owner}" -msgstr "" - -#: js/share.js:175 msgid "Share with" -msgstr "" +msgstr "分享" -#: js/share.js:180 +#: js/share.js:164 msgid "Share with link" -msgstr "" +msgstr "以連結分享" -#: js/share.js:183 +#: js/share.js:167 msgid "Password protect" -msgstr "" +msgstr "密碼保護" -#: js/share.js:185 templates/installation.php:44 templates/login.php:35 +#: js/share.js:169 templates/installation.php:47 templates/login.php:35 msgid "Password" -msgstr "" +msgstr "密碼" -#: js/share.js:189 +#: js/share.js:173 msgid "Email link to person" msgstr "" -#: js/share.js:190 +#: js/share.js:174 msgid "Send" -msgstr "" +msgstr "傳送" -#: js/share.js:194 +#: js/share.js:178 msgid "Set expiration date" -msgstr "" +msgstr "設定分享期限" -#: js/share.js:195 +#: js/share.js:179 msgid "Expiration date" -msgstr "" +msgstr "分享期限" -#: js/share.js:227 +#: js/share.js:211 msgid "Share via email:" -msgstr "" +msgstr "以電郵分享" -#: js/share.js:229 +#: js/share.js:213 msgid "No people found" -msgstr "" +msgstr "找不到" -#: js/share.js:256 +#: js/share.js:240 msgid "Resharing is not allowed" msgstr "" -#: js/share.js:292 +#: js/share.js:276 msgid "Shared in {item} with {user}" msgstr "" -#: js/share.js:313 +#: js/share.js:297 msgid "Unshare" -msgstr "" +msgstr "取消分享" -#: js/share.js:325 +#: js/share.js:309 msgid "can edit" msgstr "" -#: js/share.js:327 +#: js/share.js:311 msgid "access control" msgstr "" -#: js/share.js:330 +#: js/share.js:314 msgid "create" -msgstr "" +msgstr "新增" -#: js/share.js:333 +#: js/share.js:317 msgid "update" -msgstr "" +msgstr "更新" -#: js/share.js:336 +#: js/share.js:320 msgid "delete" -msgstr "" +msgstr "刪除" -#: js/share.js:339 +#: js/share.js:323 msgid "share" -msgstr "" +msgstr "分享" -#: js/share.js:373 js/share.js:558 +#: js/share.js:357 js/share.js:553 msgid "Password protected" -msgstr "" +msgstr "密碼保護" -#: js/share.js:571 +#: js/share.js:566 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:583 +#: js/share.js:578 msgid "Error setting expiration date" msgstr "" -#: js/share.js:598 +#: js/share.js:593 msgid "Sending ..." -msgstr "" +msgstr "傳送中" -#: js/share.js:609 +#: js/share.js:604 msgid "Email sent" -msgstr "" +msgstr "郵件已傳" #: js/update.js:14 msgid "" @@ -385,72 +386,72 @@ msgstr "" #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "更新成功, 正" -#: lostpassword/controller.php:47 +#: lostpassword/controller.php:48 msgid "ownCloud password reset" msgstr "" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" -msgstr "" +msgstr "請用以下連結重設你的密碼: {link}" #: lostpassword/templates/lostpassword.php:3 msgid "You will receive a link to reset your password via Email." -msgstr "" +msgstr "你將收到一封電郵" #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "重設密碼郵件已傳" #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "請求失敗" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41 #: templates/login.php:28 msgid "Username" -msgstr "" +msgstr "用戶名稱" #: lostpassword/templates/lostpassword.php:14 msgid "Request reset" -msgstr "" +msgstr "重設" #: lostpassword/templates/resetpassword.php:4 msgid "Your password was reset" -msgstr "" +msgstr "你的密碼已被重設" #: lostpassword/templates/resetpassword.php:5 msgid "To login page" -msgstr "" +msgstr "前往登入版面" #: lostpassword/templates/resetpassword.php:8 msgid "New password" -msgstr "" +msgstr "新密碼" #: lostpassword/templates/resetpassword.php:11 msgid "Reset password" -msgstr "" +msgstr "重設密碼" #: strings.php:5 msgid "Personal" -msgstr "" +msgstr "個人" #: strings.php:6 msgid "Users" -msgstr "" +msgstr "用戶" #: strings.php:7 msgid "Apps" -msgstr "" +msgstr "軟件" #: strings.php:8 msgid "Admin" -msgstr "" +msgstr "管理" #: strings.php:9 msgid "Help" -msgstr "" +msgstr "幫助" #: templates/403.php:12 msgid "Access forbidden" @@ -458,7 +459,7 @@ msgstr "" #: templates/404.php:12 msgid "Cloud not found" -msgstr "" +msgstr "未找到Cloud" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" @@ -466,115 +467,116 @@ msgstr "" #: templates/edit_categories_dialog.php:16 msgid "Add" -msgstr "" +msgstr "加入" -#: templates/installation.php:23 templates/installation.php:30 +#: templates/installation.php:24 templates/installation.php:31 msgid "Security Warning" msgstr "" -#: templates/installation.php:24 +#: templates/installation.php:25 msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." msgstr "" -#: templates/installation.php:25 +#: templates/installation.php:26 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." msgstr "" -#: templates/installation.php:31 +#: templates/installation.php:32 msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." msgstr "" -#: templates/installation.php:32 +#: templates/installation.php:33 msgid "" "For information how to properly configure your server, please see the documentation." msgstr "" -#: templates/installation.php:36 +#: templates/installation.php:37 msgid "Create an admin account" -msgstr "" +msgstr "建立管理員帳戶" -#: templates/installation.php:52 +#: templates/installation.php:55 msgid "Advanced" -msgstr "" +msgstr "進階" -#: templates/installation.php:54 +#: templates/installation.php:57 msgid "Data folder" msgstr "" -#: templates/installation.php:61 +#: templates/installation.php:66 msgid "Configure the database" -msgstr "" - -#: templates/installation.php:66 templates/installation.php:77 -#: templates/installation.php:87 templates/installation.php:97 -msgid "will be used" -msgstr "" - -#: templates/installation.php:109 -msgid "Database user" -msgstr "" - -#: templates/installation.php:113 -msgid "Database password" -msgstr "" +msgstr "設定資料庫" +#: templates/installation.php:71 templates/installation.php:83 +#: templates/installation.php:94 templates/installation.php:105 #: templates/installation.php:117 -msgid "Database name" -msgstr "" +msgid "will be used" +msgstr "將被使用" -#: templates/installation.php:125 +#: templates/installation.php:129 +msgid "Database user" +msgstr "資料庫帳戶" + +#: templates/installation.php:134 +msgid "Database password" +msgstr "資料庫密碼" + +#: templates/installation.php:139 +msgid "Database name" +msgstr "資料庫名稱" + +#: templates/installation.php:149 msgid "Database tablespace" msgstr "" -#: templates/installation.php:131 +#: templates/installation.php:156 msgid "Database host" msgstr "" -#: templates/installation.php:136 +#: templates/installation.php:162 msgid "Finish setup" msgstr "" -#: templates/layout.guest.php:33 +#: templates/layout.guest.php:40 msgid "web services under your control" msgstr "" -#: templates/layout.user.php:48 +#: templates/layout.user.php:58 msgid "Log out" -msgstr "" +msgstr "登出" #: templates/login.php:10 msgid "Automatic logon rejected!" -msgstr "" +msgstr "自動登入被拒" #: templates/login.php:11 msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "如果你近期未曾更改密碼, 你的帳號可能被洩露!" #: templates/login.php:13 msgid "Please change your password to secure your account again." -msgstr "" +msgstr "請更改你的密碼以保護你的帳戶" #: templates/login.php:19 msgid "Lost your password?" -msgstr "" +msgstr "忘記密碼" #: templates/login.php:41 msgid "remember" -msgstr "" +msgstr "記住" #: templates/login.php:43 msgid "Log in" -msgstr "" +msgstr "登入" #: templates/login.php:49 msgid "Alternative Logins" @@ -582,13 +584,13 @@ msgstr "" #: templates/part.pagenavi.php:3 msgid "prev" -msgstr "" +msgstr "前一步" #: templates/part.pagenavi.php:20 msgid "next" -msgstr "" +msgstr "下一步" #: templates/update.php:3 #, php-format msgid "Updating ownCloud to version %s, this may take a while." -msgstr "" +msgstr "ownCloud (ver. %s)更新中, 請耐心等侯" diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po index 6fb648527a..a760f750ca 100644 --- a/l10n/zh_HK/files.po +++ b/l10n/zh_HK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 06:00+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -74,9 +74,9 @@ msgstr "" msgid "Invalid directory." msgstr "" -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" -msgstr "" +msgstr "文件" #: js/fileactions.js:125 msgid "Delete permanently" @@ -84,14 +84,14 @@ msgstr "" #: js/fileactions.js:127 templates/index.php:92 templates/index.php:93 msgid "Delete" -msgstr "" +msgstr "刪除" #: js/fileactions.js:193 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 -#: js/files.js:439 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409 +#: js/files.js:440 msgid "Pending" msgstr "" @@ -145,80 +145,80 @@ msgstr "" msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:225 +#: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:262 +#: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:262 +#: js/files.js:263 msgid "Upload Error" msgstr "" -#: js/files.js:273 +#: js/files.js:274 msgid "Close" msgstr "" -#: js/files.js:312 +#: js/files.js:313 msgid "1 file uploading" msgstr "" -#: js/files.js:315 js/files.js:370 js/files.js:385 +#: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" msgstr "" -#: js/files.js:388 js/files.js:423 +#: js/files.js:389 js/files.js:424 msgid "Upload cancelled." msgstr "" -#: js/files.js:497 +#: js/files.js:498 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:570 +#: js/files.js:571 msgid "URL cannot be empty." msgstr "" -#: js/files.js:575 +#: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "" -#: js/files.js:953 templates/index.php:68 +#: js/files.js:954 templates/index.php:68 msgid "Name" msgstr "" -#: js/files.js:954 templates/index.php:79 +#: js/files.js:955 templates/index.php:79 msgid "Size" msgstr "" -#: js/files.js:955 templates/index.php:81 +#: js/files.js:956 templates/index.php:81 msgid "Modified" msgstr "" -#: js/files.js:974 +#: js/files.js:975 msgid "1 folder" msgstr "" -#: js/files.js:976 +#: js/files.js:977 msgid "{count} folders" msgstr "" -#: js/files.js:984 +#: js/files.js:985 msgid "1 file" msgstr "" -#: js/files.js:986 +#: js/files.js:987 msgid "{count} files" msgstr "" #: lib/helper.php:11 templates/index.php:18 msgid "Upload" -msgstr "" +msgstr "上傳" #: templates/admin.php:5 msgid "File handling" @@ -250,7 +250,7 @@ msgstr "" #: templates/admin.php:26 msgid "Save" -msgstr "" +msgstr "儲存" #: templates/index.php:7 msgid "New" @@ -286,11 +286,11 @@ msgstr "" #: templates/index.php:74 msgid "Download" -msgstr "" +msgstr "下載" #: templates/index.php:86 templates/index.php:87 msgid "Unshare" -msgstr "" +msgstr "取消分享" #: templates/index.php:106 msgid "Upload too large" diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po index 95bd8e76a9..f5a0dad842 100644 --- a/l10n/zh_HK/files_external.po +++ b/l10n/zh_HK/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-28 00:04+0100\n" -"PO-Revision-Date: 2013-02-27 23:04+0000\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 02:10+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -37,13 +37,13 @@ msgstr "" msgid "Error configuring Google Drive storage" msgstr "" -#: lib/config.php:421 +#: lib/config.php:423 msgid "" "Warning: \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:424 +#: lib/config.php:426 msgid "" "Warning: The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " @@ -88,16 +88,16 @@ msgstr "" #: templates/settings.php:92 msgid "Groups" -msgstr "" +msgstr "群組" #: templates/settings.php:100 msgid "Users" -msgstr "" +msgstr "用戶" #: templates/settings.php:113 templates/settings.php:114 #: templates/settings.php:149 templates/settings.php:150 msgid "Delete" -msgstr "" +msgstr "刪除" #: templates/settings.php:129 msgid "Enable User External Storage" diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po index 4721ae096c..792810587f 100644 --- a/l10n/zh_HK/files_sharing.po +++ b/l10n/zh_HK/files_sharing.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-19 00:01+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: 2012-08-12 22:35+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" @@ -19,30 +19,30 @@ msgstr "" #: templates/authenticate.php:4 msgid "Password" -msgstr "" +msgstr "密碼" #: templates/authenticate.php:6 msgid "Submit" msgstr "" -#: templates/public.php:9 +#: templates/public.php:10 #, php-format msgid "%s shared the folder %s with you" msgstr "" -#: templates/public.php:11 +#: templates/public.php:13 #, php-format msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:14 templates/public.php:30 +#: templates/public.php:19 templates/public.php:37 msgid "Download" -msgstr "" +msgstr "下載" -#: templates/public.php:29 +#: templates/public.php:34 msgid "No preview available for" msgstr "" -#: templates/public.php:35 +#: templates/public.php:43 msgid "web services under your control" msgstr "" diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po index efeae3b8e6..fb4c6a8aca 100644 --- a/l10n/zh_HK/files_trashbin.po +++ b/l10n/zh_HK/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 02:00+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -73,7 +73,7 @@ msgstr "" #: templates/index.php:30 templates/index.php:31 msgid "Delete" -msgstr "" +msgstr "刪除" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po index 17cc010041..0314f6fd2b 100644 --- a/l10n/zh_HK/lib.po +++ b/l10n/zh_HK/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 06:00+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -19,41 +19,41 @@ msgstr "" #: app.php:349 msgid "Help" -msgstr "" +msgstr "幫助" #: app.php:362 msgid "Personal" -msgstr "" +msgstr "個人" #: app.php:373 msgid "Settings" -msgstr "" +msgstr "設定" #: app.php:385 msgid "Users" -msgstr "" +msgstr "用戶" #: app.php:398 msgid "Apps" -msgstr "" +msgstr "軟件" #: app.php:406 msgid "Admin" -msgstr "" +msgstr "管理" -#: files.php:202 +#: files.php:209 msgid "ZIP download is turned off." msgstr "" -#: files.php:203 +#: files.php:210 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:204 files.php:231 +#: files.php:211 files.php:244 msgid "Back to Files" msgstr "" -#: files.php:228 +#: files.php:241 msgid "Selected files too large to generate zip file." msgstr "" @@ -75,11 +75,11 @@ msgstr "" #: search/provider/file.php:17 search/provider/file.php:35 msgid "Files" -msgstr "" +msgstr "文件" #: search/provider/file.php:26 search/provider/file.php:33 msgid "Text" -msgstr "" +msgstr "文字" #: search/provider/file.php:29 msgid "Images" @@ -211,11 +211,11 @@ msgstr "" #: template.php:118 msgid "today" -msgstr "" +msgstr "今日" #: template.php:119 msgid "yesterday" -msgstr "" +msgstr "昨日" #: template.php:120 #, php-format @@ -224,7 +224,7 @@ msgstr "" #: template.php:121 msgid "last month" -msgstr "" +msgstr "前一月" #: template.php:122 #, php-format diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po index 5650c78910..4420bb1820 100644 --- a/l10n/zh_HK/settings.po +++ b/l10n/zh_HK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 02:20+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -110,7 +110,7 @@ msgstr "" #: js/apps.js:87 msgid "Error" -msgstr "" +msgstr "錯誤" #: js/apps.js:90 msgid "Updated" @@ -135,7 +135,7 @@ msgstr "" #: js/users.js:75 templates/users.php:26 templates/users.php:80 #: templates/users.php:105 msgid "Groups" -msgstr "" +msgstr "群組" #: js/users.js:78 templates/users.php:82 templates/users.php:119 msgid "Group Admin" @@ -143,7 +143,7 @@ msgstr "" #: js/users.js:99 templates/users.php:161 msgid "Delete" -msgstr "" +msgstr "刪除" #: js/users.js:191 msgid "add group" @@ -393,7 +393,7 @@ msgstr "" #: templates/personal.php:37 templates/users.php:23 templates/users.php:79 msgid "Password" -msgstr "" +msgstr "密碼" #: templates/personal.php:38 msgid "Your password was changed" @@ -409,7 +409,7 @@ msgstr "" #: templates/personal.php:42 msgid "New password" -msgstr "" +msgstr "新密碼" #: templates/personal.php:44 msgid "Change password" @@ -433,7 +433,7 @@ msgstr "" #: templates/personal.php:70 msgid "Email" -msgstr "" +msgstr "電郵" #: templates/personal.php:72 msgid "Your email address" diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po index 55843162a9..f5a83b73b2 100644 --- a/l10n/zh_HK/user_ldap.po +++ b/l10n/zh_HK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 01:20+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -86,248 +86,248 @@ msgstr "" msgid "Server configuration" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:31 msgid "Add Server Configuration" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:36 msgid "Host" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:38 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:26 +#: templates/settings.php:39 msgid "Base DN" msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:40 msgid "One Base DN per line" msgstr "" -#: templates/settings.php:28 +#: templates/settings.php:41 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:43 msgid "User DN" msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:45 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:33 +#: templates/settings.php:46 msgid "Password" -msgstr "" +msgstr "密碼" -#: templates/settings.php:36 +#: templates/settings.php:49 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:37 +#: templates/settings.php:50 msgid "User Login Filter" msgstr "" -#: templates/settings.php:40 +#: templates/settings.php:53 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:41 +#: templates/settings.php:54 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:42 +#: templates/settings.php:55 msgid "User List Filter" msgstr "" -#: templates/settings.php:45 +#: templates/settings.php:58 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:46 +#: templates/settings.php:59 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:47 +#: templates/settings.php:60 msgid "Group Filter" msgstr "" -#: templates/settings.php:50 +#: templates/settings.php:63 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:51 +#: templates/settings.php:64 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:55 +#: templates/settings.php:68 msgid "Connection Settings" msgstr "" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "Configuration Active" msgstr "" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "When unchecked, this configuration will be skipped." msgstr "" -#: templates/settings.php:58 +#: templates/settings.php:71 msgid "Port" msgstr "" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "Backup (Replica) Host" msgstr "" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "" -#: templates/settings.php:60 +#: templates/settings.php:73 msgid "Backup (Replica) Port" msgstr "" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "Disable Main Server" msgstr "" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Use TLS" msgstr "" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "" -#: templates/settings.php:63 +#: templates/settings.php:76 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "Cache Time-To-Live" msgstr "" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:67 +#: templates/settings.php:80 msgid "Directory Settings" msgstr "" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "Base User Tree" msgstr "" -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "One User Base DN per line" msgstr "" -#: templates/settings.php:71 +#: templates/settings.php:84 msgid "User Search Attributes" msgstr "" -#: templates/settings.php:71 templates/settings.php:74 +#: templates/settings.php:84 templates/settings.php:87 msgid "Optional; one attribute per line" msgstr "" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "One Group Base DN per line" msgstr "" -#: templates/settings.php:74 +#: templates/settings.php:87 msgid "Group Search Attributes" msgstr "" -#: templates/settings.php:75 +#: templates/settings.php:88 msgid "Group-Member association" msgstr "" -#: templates/settings.php:77 +#: templates/settings.php:90 msgid "Special Attributes" msgstr "" -#: templates/settings.php:79 +#: templates/settings.php:92 msgid "Quota Field" msgstr "" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "Quota Default" msgstr "" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "in bytes" msgstr "" -#: templates/settings.php:81 +#: templates/settings.php:94 msgid "Email Field" msgstr "" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "User Home Folder Naming Rule" msgstr "" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Test Configuration" msgstr "" -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Help" -msgstr "" +msgstr "幫助" diff --git a/lib/l10n/zh_HK.php b/lib/l10n/zh_HK.php new file mode 100644 index 0000000000..cfa33ec36f --- /dev/null +++ b/lib/l10n/zh_HK.php @@ -0,0 +1,13 @@ + "幫助", +"Personal" => "個人", +"Settings" => "設定", +"Users" => "用戶", +"Apps" => "軟件", +"Admin" => "管理", +"Files" => "文件", +"Text" => "文字", +"today" => "今日", +"yesterday" => "昨日", +"last month" => "前一月" +); diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php new file mode 100644 index 0000000000..843a41c9c1 --- /dev/null +++ b/settings/l10n/zh_HK.php @@ -0,0 +1,8 @@ + "錯誤", +"Groups" => "群組", +"Delete" => "刪除", +"Password" => "密碼", +"New password" => "新密碼", +"Email" => "電郵" +); From 17cb47fbf6c5164dda3a27cb030f44557a1e3c1e Mon Sep 17 00:00:00 2001 From: Ceri Davies Date: Thu, 14 Mar 2013 10:04:58 +0000 Subject: [PATCH 073/546] Correct emails when folders are shared. itemType is never "dir"; it's either "file" or "folder". --- core/ajax/share.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/ajax/share.php b/core/ajax/share.php index 9201b48cb9..37ddf8ae6c 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -95,12 +95,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo // setup the email $subject = (string)$l->t('User %s shared a file with you', $displayName); - if ($type === 'dir') + if ($type === 'folder') $subject = (string)$l->t('User %s shared a folder with you', $displayName); $text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($displayName, $file, $link)); - if ($type === 'dir') + if ($type === 'folder') $text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($displayName, $file, $link)); From 8154b4be7de8c0f9616b3fb0d4b8385204615c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 14 Mar 2013 13:26:20 +0100 Subject: [PATCH 074/546] use display name as sender for private link mails, approved in #2294 --- core/ajax/share.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/ajax/share.php b/core/ajax/share.php index 9201b48cb9..7ebd894971 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -110,7 +110,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo // send it out now try { - OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $user); + OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $displayName); OCP\JSON::success(); } catch (Exception $exception) { OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($exception->getMessage())))); From abe408e934d1620a500d9be365e265c9fd635b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 14 Mar 2013 14:59:12 +0100 Subject: [PATCH 075/546] replace \MDB with \OC_DB, approved in #2278 --- lib/files/cache/cache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php index 1ff66f11f1..91bcb73a55 100644 --- a/lib/files/cache/cache.php +++ b/lib/files/cache/cache.php @@ -204,7 +204,7 @@ class Cache { $query = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache`(' . implode(', ', $queryParts) . ')' . ' VALUES(' . implode(', ', $valuesPlaceholder) . ')'); $result = $query->execute($params); - if (\MDB2::isError($result)) { + if (\OC_DB::isError($result)) { \OCP\Util::writeLog('cache', 'Insert to cache failed: '.$result, \OCP\Util::ERROR); } From 0cf50d63bfcbe359d850a7ce0228555a3766b31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 14 Mar 2013 16:47:59 +0100 Subject: [PATCH 076/546] create new version if the same file is uploaded again over the web interface --- apps/files_versions/lib/versions.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 20611c61ec..8874fec6bd 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -156,11 +156,18 @@ class Storage { /** * rename versions of a file */ - public static function rename($oldpath, $newpath) { - list($uid, $oldpath) = self::getUidAndFilename($oldpath); - list($uidn, $newpath) = self::getUidAndFilename($newpath); + public static function rename($old_path, $new_path) { + list($uid, $oldpath) = self::getUidAndFilename($old_path); + list($uidn, $newpath) = self::getUidAndFilename($new_path); $versions_view = new \OC\Files\View('/'.$uid .'/files_versions'); $files_view = new \OC\Files\View('/'.$uid .'/files'); + + // if the file already exists than it was a upload of a existing file + // over the web interface -> store() is the right function we need here + if ($files_view->file_exists($newpath)) { + return self::store($newpath); + } + $abs_newpath = $versions_view->getLocalFile($newpath); if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) { From ed8359737199a8a6640986e00df80d971aa6e1d7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 14 Mar 2013 17:00:30 +0100 Subject: [PATCH 077/546] Return unknown freespace if the free_space call failed Fixes #2312 --- lib/files/storage/local.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php index da6597c805..7b637a9705 100644 --- a/lib/files/storage/local.php +++ b/lib/files/storage/local.php @@ -218,7 +218,11 @@ class Local extends \OC\Files\Storage\Common{ } public function free_space($path) { - return @disk_free_space($this->datadir.$path); + $space = @disk_free_space($this->datadir.$path); + if($space === false){ + return \OC\Files\FREE_SPACE_UNKNOWN; + } + return $space; } public function search($query) { From 93b2ada6f6b54dc9b3c341c379e524f51a75b8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 14 Mar 2013 17:08:16 +0100 Subject: [PATCH 078/546] fix var name --- apps/files_versions/lib/versions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 8874fec6bd..6d47b3038c 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -164,7 +164,7 @@ class Storage { // if the file already exists than it was a upload of a existing file // over the web interface -> store() is the right function we need here - if ($files_view->file_exists($newpath)) { + if ($files_view->file_exists($new_path)) { return self::store($newpath); } From f78594c0aeeb29bfc4365f48dbb967b645fd5c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 14 Mar 2013 17:09:48 +0100 Subject: [PATCH 079/546] fix var name --- apps/files_versions/lib/versions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 6d47b3038c..f99e26a091 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -164,8 +164,8 @@ class Storage { // if the file already exists than it was a upload of a existing file // over the web interface -> store() is the right function we need here - if ($files_view->file_exists($new_path)) { - return self::store($newpath); + if ($files_view->file_exists($newpath)) { + return self::store($new_path); } $abs_newpath = $versions_view->getLocalFile($newpath); From 7f43d6559fa3658c6c8eacf4a513d8f8712f5a02 Mon Sep 17 00:00:00 2001 From: Chris Kankiewicz Date: Thu, 14 Mar 2013 10:21:37 -0700 Subject: [PATCH 080/546] Added 3rdparty folder as a git submodule --- .gitignore | 1 - .gitmodules | 3 +++ 3rdparty | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 3rdparty diff --git a/.gitignore b/.gitignore index 40d6e6ca0f..b0cc783123 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ owncloud config/config.php config/mount.php apps/inc.php -3rdparty # ignore all apps except core ones apps/* diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..b9c1a3702c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "3rdparty"] + path = 3rdparty + url = git://github.com/owncloud/3rdparty.git diff --git a/3rdparty b/3rdparty new file mode 160000 index 0000000000..63cb284792 --- /dev/null +++ b/3rdparty @@ -0,0 +1 @@ +Subproject commit 63cb2847921d668c2b48b572872cfddbcf41bea4 From 285d328ef145010922773a0d05451a80759da788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= Date: Thu, 14 Mar 2013 20:10:21 +0100 Subject: [PATCH 081/546] use html video tag to preview videos for public shares --- apps/files_sharing/templates/public.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 88692445ec..88a4cc242b 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -28,7 +28,13 @@
- + +
+ +
+
  • t('No preview available for').' '.$_['fileTarget']); ?>
    @@ -37,6 +43,7 @@ />t('Download'))?>
+