From 530f3f8be9336ec49eab9f00e2c3b15d29bc78c7 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Tue, 13 Nov 2012 23:45:17 +0100 Subject: [PATCH 01/26] Create functions to install standard hooks Also use these in tests that needs them Fix #151 --- lib/base.php | 38 +++++++++++++++++++++++++++++++------- lib/public/share.php | 5 ----- tests/lib/filesystem.php | 3 +-- tests/lib/share/share.php | 2 ++ 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/lib/base.php b/lib/base.php index c97700b3db..74b53c5665 100644 --- a/lib/base.php +++ b/lib/base.php @@ -433,13 +433,9 @@ class OC{ //setup extra user backends OC_User::setupBackends(); - // register cache cleanup jobs - OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc'); - OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener'); - - // Check for blacklisted files - OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted'); - OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted'); + self::installCacheHooks(); + self::installFilesystemHooks(); + self::installShareHooks(); //make sure temporary files are cleaned up register_shutdown_function(array('OC_Helper', 'cleanTmp')); @@ -474,6 +470,34 @@ class OC{ } } + /** + * install hooks for the cache + */ + public static function installCacheHooks() { + // register cache cleanup jobs + OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc'); + OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener'); + } + + /** + * install hooks for the filesystem + */ + public static function installFilesystemHooks() { + // Check for blacklisted files + OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted'); + OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted'); + } + + /** + * install hooks for sharing + */ + public static function installShareHooks() { + OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser'); + OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup'); + OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup'); + OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup'); + } + /** * @brief Handle the request */ diff --git a/lib/public/share.php b/lib/public/share.php index dcb1b5c278..3bf0602f63 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -20,11 +20,6 @@ */ namespace OCP; -\OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser'); -\OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup'); -\OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup'); -\OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup'); - /** * This class provides the ability for apps to share their content between users. * Apps must create a backend class that implements OCP\Share_Backend and register it with this class. diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php index 0008336383..7b856ef020 100644 --- a/tests/lib/filesystem.php +++ b/tests/lib/filesystem.php @@ -74,8 +74,7 @@ class Test_Filesystem extends UnitTestCase { public function testBlacklist() { OC_Hook::clear('OC_Filesystem'); - OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted'); - OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted'); + OC::installFilesystemHooks(); $run = true; OC_Hook::emit( diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php index 3cdae98ca6..25656c6bcd 100644 --- a/tests/lib/share/share.php +++ b/tests/lib/share/share.php @@ -54,6 +54,8 @@ class Test_Share extends UnitTestCase { OC_Group::addToGroup($this->user2, $this->group2); OC_Group::addToGroup($this->user4, $this->group2); OCP\Share::registerBackend('test', 'Test_Share_Backend'); + OC_Hook::clear('OCP\\Share'); + OC::installShareHooks(); } public function tearDown() { From 8bed38c78ddea18ed10a253d0838166d4342a171 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Thu, 15 Nov 2012 18:13:54 +0100 Subject: [PATCH 02/26] Rename install hook functions to register hook --- lib/base.php | 18 +++++++++--------- tests/lib/filesystem.php | 2 +- tests/lib/share/share.php | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/base.php b/lib/base.php index 74b53c5665..f600800b61 100644 --- a/lib/base.php +++ b/lib/base.php @@ -433,9 +433,9 @@ class OC{ //setup extra user backends OC_User::setupBackends(); - self::installCacheHooks(); - self::installFilesystemHooks(); - self::installShareHooks(); + self::registerCacheHooks(); + self::registerFilesystemHooks(); + self::registerShareHooks(); //make sure temporary files are cleaned up register_shutdown_function(array('OC_Helper', 'cleanTmp')); @@ -471,27 +471,27 @@ class OC{ } /** - * install hooks for the cache + * register hooks for the cache */ - public static function installCacheHooks() { + public static function registerCacheHooks() { // register cache cleanup jobs OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc'); OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener'); } /** - * install hooks for the filesystem + * register hooks for the filesystem */ - public static function installFilesystemHooks() { + public static function registerFilesystemHooks() { // Check for blacklisted files OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted'); OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted'); } /** - * install hooks for sharing + * register hooks for sharing */ - public static function installShareHooks() { + public static function registerShareHooks() { OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser'); OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup'); OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup'); diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php index 7b856ef020..5cced4946d 100644 --- a/tests/lib/filesystem.php +++ b/tests/lib/filesystem.php @@ -74,7 +74,7 @@ class Test_Filesystem extends UnitTestCase { public function testBlacklist() { OC_Hook::clear('OC_Filesystem'); - OC::installFilesystemHooks(); + OC::registerFilesystemHooks(); $run = true; OC_Hook::emit( diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php index 25656c6bcd..92f5d065cf 100644 --- a/tests/lib/share/share.php +++ b/tests/lib/share/share.php @@ -55,7 +55,7 @@ class Test_Share extends UnitTestCase { OC_Group::addToGroup($this->user4, $this->group2); OCP\Share::registerBackend('test', 'Test_Share_Backend'); OC_Hook::clear('OCP\\Share'); - OC::installShareHooks(); + OC::registerShareHooks(); } public function tearDown() { From d8a171df26a33710ad162b6acc9f46d00976b986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 12 Nov 2012 14:44:00 +0100 Subject: [PATCH 03/26] implement share via link token --- apps/files_sharing/public.php | 208 +++++++++++++++++----------------- core/ajax/share.php | 16 ++- core/js/share.js | 18 +-- db_structure.xml | 15 +++ lib/helper.php | 1 - lib/public/share.php | 66 +++++++---- lib/util.php | 2 +- 7 files changed, 184 insertions(+), 142 deletions(-) diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 1fc41b4275..d680a87fa7 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -21,73 +21,81 @@ if (isset($_GET['token'])) { } // Enf of backward compatibility -function getID($path) { - // use the share table from the db to find the item source if the file was reshared because shared files - //are not stored in the file cache. - if (substr(OC_Filesystem::getMountPoint($path), -7, 6) == "Shared") { - $path_parts = explode('/', $path, 5); - $user = $path_parts[1]; - $intPath = '/'.$path_parts[4]; - $query = \OC_DB::prepare('SELECT item_source FROM *PREFIX*share WHERE uid_owner = ? AND file_target = ? '); - $result = $query->execute(array($user, $intPath)); - $row = $result->fetchRow(); - $fileSource = $row['item_source']; - } else { - $fileSource = OC_Filecache::getId($path, ''); - } - - return $fileSource; +/** + * lookup file path and owner by fetching it from the fscache + * needed becaus OC_FileCache::getPath($id, $user) already requires the user + * @param int $id + * @return array + */ +function getPathAndUser($id) { + $query = \OC_DB::prepare('SELECT `user`, `path` FROM `*PREFIX*fscache` WHERE `id` = ?'); + $result = $query->execute(array($id)); + $row = $result->fetchRow(); + return $row; } -if (isset($_GET['file']) || isset($_GET['dir'])) { - if (isset($_GET['dir'])) { - $type = 'folder'; - $path = $_GET['dir']; - if(strlen($path)>1 and substr($path, -1, 1)==='/') { - $path=substr($path, 0, -1); - } - $baseDir = $path; - $dir = $baseDir; - } else { - $type = 'file'; - $path = $_GET['file']; - if(strlen($path)>1 and substr($path, -1, 1)==='/') { - $path=substr($path, 0, -1); - } - } - $uidOwner = substr($path, 1, strpos($path, '/', 1) - 1); - if (OCP\User::userExists($uidOwner)) { - OC_Util::setupFS($uidOwner); - $fileSource = getId($path); - if ($fileSource != -1 && ($linkItem = OCP\Share::getItemSharedWithByLink($type, $fileSource, $uidOwner))) { - // TODO Fix in the getItems - if (!isset($linkItem['item_type']) || $linkItem['item_type'] != $type) { +if (isset($_GET['t'])) { + $token = $_GET['t']; + $linkItem = OCP\Share::getShareByToken($token); + if (is_array($linkItem) && isset($linkItem['uid_owner'])) { + // seems to be a valid share + $type = $linkItem['item_type']; + $fileSource = $linkItem['file_source']; + $shareOwner = $linkItem['uid_owner']; + + if (OCP\User::userExists($shareOwner) && $fileSource != -1 ) { + + $pathAndUser = getPathAndUser($linkItem['file_source']); + $fileOwner = $pathAndUser['user']; + + //if this is a reshare check the file owner also exists + if ($shareOwner != $fileOwner && ! OCP\User::userExists($fileOwner)) { + OCP\Util::writeLog('share', 'original file owner '.$fileOwner.' does not exist for share '.$linkItem['id'], \OCP\Util::ERROR); + header('HTTP/1.0 404 Not Found'); + $tmpl = new OCP\Template('', '404', 'guest'); + $tmpl->printPage(); + exit(); + } + + //mount filesystem of file owner + OC_Util::setupFS($fileOwner); + if (!isset($linkItem['item_type'])) { + OCP\Util::writeLog('share', 'No item type set for share id: '.$linkItem['id'], \OCP\Util::ERROR); header('HTTP/1.0 404 Not Found'); $tmpl = new OCP\Template('', '404', 'guest'); $tmpl->printPage(); exit(); } if (isset($linkItem['share_with'])) { - // Check password + // Authenticate share_with + $url = OCP\Util::linkToPublic('files').'&t='.$token; if (isset($_GET['file'])) { - $url = OCP\Util::linkToPublic('files').'&file='.urlencode($_GET['file']); - } else { - $url = OCP\Util::linkToPublic('files').'&dir='.urlencode($_GET['dir']); + $url .= '&file='.urlencode($_GET['file']); + } else if (isset($_GET['dir'])) { + $url .= '&dir='.urlencode($_GET['dir']); } if (isset($_POST['password'])) { $password = $_POST['password']; - $storedHash = $linkItem['share_with']; - $forcePortable = (CRYPT_BLOWFISH != 1); - $hasher = new PasswordHash(8, $forcePortable); - if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash))) { - $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest'); - $tmpl->assign('URL', $url); - $tmpl->assign('error', true); + if ($linkItem['share_type'] == OCP\Share::SHARE_TYPE_LINK) { + // Check Password + $forcePortable = (CRYPT_BLOWFISH != 1); + $hasher = new PasswordHash(8, $forcePortable); + if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $linkItem['share_with']))) { + $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest'); + $tmpl->assign('URL', $url); + $tmpl->assign('error', true); + $tmpl->printPage(); + exit(); + } else { + // Save item id in session for future requests + $_SESSION['public_link_authenticated'] = $linkItem['id']; + } + } else { + OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type'].' for share id '.$linkItem['id'], \OCP\Util::ERROR); + header('HTTP/1.0 404 Not Found'); + $tmpl = new OCP\Template('', '404', 'guest'); $tmpl->printPage(); exit(); - } else { - // Save item id in session for future requests - $_SESSION['public_link_authenticated'] = $linkItem['id']; } // Check if item id is set in session } else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) { @@ -98,29 +106,32 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { exit(); } } - $path = $linkItem['path']; + $basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files')); + $path = $basePath; if (isset($_GET['path'])) { $path .= $_GET['path']; - $dir .= $_GET['path']; - if (!OC_Filesystem::file_exists($path)) { - header('HTTP/1.0 404 Not Found'); - $tmpl = new OCP\Template('', '404', 'guest'); - $tmpl->printPage(); - exit(); - } } + if (!$path || !OC_Filesystem::isValidPath($path) || !OC_Filesystem::file_exists($path)) { + OCP\Util::writeLog('share', 'Invalid path '.$path.' for share id '.$linkItem['id'], \OCP\Util::ERROR); + header('HTTP/1.0 404 Not Found'); + $tmpl = new OCP\Template('', '404', 'guest'); + $tmpl->printPage(); + exit(); + } + $dir = dirname($path); + $file = basename($path); // Download the file if (isset($_GET['download'])) { - if (isset($_GET['dir'])) { + if (isset($_GET['path']) && $_GET['path'] !== '' ) { if ( isset($_GET['files']) ) { // download selected files OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); - } else if (isset($_GET['path']) && $_GET['path'] != '' ) { // download a file from a shared directory - OC_Files::get('', $path, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); + } else if (isset($_GET['path']) && $_GET['path'] != '' ) { // download a file from a shared directory + OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); } else { // download the whole shared directory - OC_Files::get($path, '', $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); + OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); } } else { // download a single shared file - OC_Files::get("", $path, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); + OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); } } else { @@ -128,14 +139,22 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { OCP\Util::addScript('files_sharing', 'public'); OCP\Util::addScript('files', 'fileactions'); $tmpl = new OCP\Template('files_sharing', 'public', 'base'); - $tmpl->assign('owner', $uidOwner); + $tmpl->assign('uidOwner', $shareOwner); + $tmpl->assign('dir', $dir); + $tmpl->assign('filename', $file); + $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path)); + if (isset($_GET['path'])) { + $getPath = $_GET['path']; + } else { + $getPath = ''; + } // Show file list if (OC_Filesystem::is_dir($path)) { OCP\Util::addStyle('files', 'files'); OCP\Util::addScript('files', 'files'); OCP\Util::addScript('files', 'filelist'); $files = array(); - $rootLength = strlen($baseDir) + 1; + $rootLength = strlen($basePath) + 1; foreach (OC_Files::getDirectoryContent($path) as $i) { $i['date'] = OCP\Util::formatDate($i['mtime']); if ($i['type'] == 'file') { @@ -143,7 +162,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { $i['basename'] = $fileinfo['filename']; $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : ''; } - $i['directory'] = '/'.substr('/'.$uidOwner.'/files'.$i['directory'], $rootLength); + $i['directory'] = '/'.substr($i['directory'], $rootLength); if ($i['directory'] == '/') { $i['directory'] = ''; } @@ -153,30 +172,29 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { // Make breadcrumb $breadcrumb = array(); $pathtohere = ''; - $count = 1; - foreach (explode('/', $dir) as $i) { + + //add base breadcrumb + $breadcrumb[] = array('dir' => '/', 'name' => basename($basePath)); + + //add subdir breadcrumbs + foreach (explode('/', urldecode($_GET['path'])) as $i) { if ($i != '') { - if ($i != $baseDir) { - $pathtohere .= '/'.$i; - } - if ( strlen($pathtohere) < strlen($_GET['dir'])) { - continue; - } - $breadcrumb[] = array('dir' => str_replace($_GET['dir'], "", $pathtohere, $count), 'name' => $i); + $pathtohere .= '/'.$i; + $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i); } } + $list = new OCP\Template('files', 'part.list', ''); $list->assign('files', $files, false); $list->assign('publicListView', true); - $list->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.urlencode($_GET['dir']).'&path=', false); - $list->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.urlencode($_GET['dir']).'&path=', false); + $list->assign('baseURL', OCP\Util::linkToPublic('files').'&t='.$token.'&path=', false); + $list->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download&path=', false); $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' ); $breadcrumbNav->assign('breadcrumb', $breadcrumb, false); - $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.urlencode($_GET['dir']).'&path=', false); + $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').'&t='.$token.'&path=', false); $folder = new OCP\Template('files', 'index', ''); $folder->assign('fileList', $list->fetchPage(), false); $folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false); - $folder->assign('dir', basename($dir)); $folder->assign('isCreatable', false); $folder->assign('permissions', 0); $folder->assign('files', $files); @@ -184,32 +202,14 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { $folder->assign('uploadMaxHumanFilesize', 0); $folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); $tmpl->assign('folder', $folder->fetchPage(), false); - $tmpl->assign('uidOwner', $uidOwner); - $tmpl->assign('dir', basename($dir)); - $tmpl->assign('filename', basename($path)); - $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path)); $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); - if (isset($_GET['path'])) { - $getPath = $_GET['path']; - } else { - $getPath = ''; - } - $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.urlencode($_GET['dir']).'&path='.urlencode($getPath), false); + $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download&path='.urlencode($getPath)); } else { // Show file preview if viewer is available - $tmpl->assign('uidOwner', $uidOwner); - $tmpl->assign('dir', dirname($path)); - $tmpl->assign('filename', basename($path)); - $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path)); if ($type == 'file') { - $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&file='.urlencode($_GET['file']).'&download', false); + $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download'); } else { - if (isset($_GET['path'])) { - $getPath = $_GET['path']; - } else { - $getPath = ''; - } - $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.urlencode($_GET['dir']).'&path='.urlencode($getPath), false); + $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download&path='.urlencode($getPath)); } } $tmpl->printPage(); @@ -217,6 +217,8 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { exit(); } } +} else { + OCP\Util::writeLog('share', 'Missing token', \OCP\Util::DEBUG); } header('HTTP/1.0 404 Not Found'); $tmpl = new OCP\Template('', '404', 'guest'); diff --git a/core/ajax/share.php b/core/ajax/share.php index efe01dff88..41832a3c65 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -28,13 +28,19 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo case 'share': if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) { try { - if ((int)$_POST['shareType'] === OCP\Share::SHARE_TYPE_LINK && $_POST['shareWith'] == '') { + $shareType = (int)$_POST['shareType']; + $shareWith = $_POST['shareWith']; + if ($shareType === OCP\Share::SHARE_TYPE_LINK && $shareWith == '') { $shareWith = null; - } else { - $shareWith = $_POST['shareWith']; } - OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], (int)$_POST['shareType'], $shareWith, $_POST['permissions']); - OC_JSON::success(); + + $token = OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], $shareType, $shareWith, $_POST['permissions']); + + if (is_string($token)) { + OC_JSON::success(array('data' => array('token' => $token))); + } else { + OC_JSON::success(); + } } catch (Exception $exception) { OC_JSON::error(array('data' => array('message' => $exception->getMessage()))); } diff --git a/core/js/share.js b/core/js/share.js index 8fcea84af8..879befd95b 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -179,7 +179,7 @@ OC.Share={ if (data.shares) { $.each(data.shares, function(index, share) { if (share.share_type == OC.Share.SHARE_TYPE_LINK) { - OC.Share.showLink(itemSource, share.share_with); + OC.Share.showLink(share.token, share.share_with); } else { if (share.collection) { OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, share.collection); @@ -323,18 +323,10 @@ OC.Share={ $('#expiration').show(); } }, - showLink:function(itemSource, password) { + showLink:function(token, password) { OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true; $('#linkCheckbox').attr('checked', true); - var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file'); - var type = $('tr').filterAttr('data-id', String(itemSource)).data('type'); - if ($('#dir').val() == '/') { - var file = $('#dir').val() + filename; - } else { - var file = $('#dir').val() + '/' + filename; - } - file = '/'+OC.currentUser+'/files'+file; - var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file); + var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&t='+token; $('#linkText').val(link); $('#linkText').show('blind'); $('#showPassword').show(); @@ -480,8 +472,8 @@ $(document).ready(function() { var itemSource = $('#dropdown').data('item-source'); if (this.checked) { // Create a link - OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function() { - OC.Share.showLink(itemSource); + OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function(data) { + OC.Share.showLink(data.token); OC.Share.updateIcon(itemType, itemSource); }); } else { diff --git a/db_structure.xml b/db_structure.xml index 851c8aa998..8ddb67a3d8 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -581,6 +581,21 @@ false + + token + text + + false + 32 + + + + token_index + + token + ascending + + diff --git a/lib/helper.php b/lib/helper.php index 27ebd24f6e..5dec7fadfb 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -758,5 +758,4 @@ class OC_Helper { } return $str; } - } diff --git a/lib/public/share.php b/lib/public/share.php index dcb1b5c278..2ded31a42e 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -53,6 +53,8 @@ class Share { const FORMAT_STATUSES = -2; const FORMAT_SOURCES = -3; + const TOKEN_LENGTH = 32; // see db_structure.xml + private static $shareTypeUserAndGroups = -1; private static $shareTypeGroupUserUnique = 2; private static $backends = array(); @@ -139,6 +141,20 @@ class Share { return self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE, null, 1); } + /** + * @brief Get the item shared by a token + * @param string token + * @return Item + */ + public static function getShareByToken($token) { + $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?',1); + $result = $query->execute(array($token)); + if (\OC_DB::isError($result)) { + \OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', token=' . $token, \OC_Log::ERROR); + } + return $result->fetchRow(); + } + /** * @brief Get the shared items of item type owned by the current user * @param string Item type @@ -168,7 +184,7 @@ class Share { * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK * @param string User or group the item is being shared with * @param int CRUDS permissions - * @return bool Returns true on success or false on failure + * @return bool|string Returns true on success or false on failure, Returns token on success for links */ public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions) { $uidOwner = \OC_User::getUser(); @@ -230,23 +246,33 @@ class Share { $shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner)); } else if ($shareType === self::SHARE_TYPE_LINK) { if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') == 'yes') { + // when updating a link share if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE, null, 1)) { - // If password is set delete the old link - if (isset($shareWith)) { - self::delete($checkExists['id']); - } else { - $message = 'Sharing '.$itemSource.' failed, because this item is already shared with a link'; - \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); - throw new \Exception($message); - } + // remember old token + $oldToken = $checkExists['token']; + //delete the old share + self::delete($checkExists['id']); } + // Generate hash of password - same method as user passwords if (isset($shareWith)) { $forcePortable = (CRYPT_BLOWFISH != 1); $hasher = new \PasswordHash(8, $forcePortable); $shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', '')); } - return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions); + + // Generate token + if (isset($oldToken)) { + $token = $oldToken; + } else { + $token = \OC_Util::generate_random_bytes(self::TOKEN_LENGTH); + } + $result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, $token); + if ($result) { + return $token; + } else { + return false; + } } $message = 'Sharing '.$itemSource.' failed, because sharing with links is not allowed'; \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); @@ -654,9 +680,9 @@ class Share { } else { if (isset($uidOwner)) { if ($itemType == 'file' || $itemType == 'folder') { - $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`, `expiration`'; + $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`, `expiration`, `token`'; } else { - $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`, `expiration`'; + $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`, `expiration`, `token`'; } } else { if ($fileDependent) { @@ -835,7 +861,7 @@ class Share { * @param bool|array Parent folder target (optional) * @return bool Returns true on success or false on failure */ - private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null) { + private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder = null, $token = null) { $backend = self::getBackend($itemType); // Check if this is a reshare if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) { @@ -892,7 +918,7 @@ class Share { $fileSource = null; } } - $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`, `file_target`) VALUES (?,?,?,?,?,?,?,?,?,?,?)'); + $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`, `file_target`, `token`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)'); // Share with a group if ($shareType == self::SHARE_TYPE_GROUP) { $groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'], $uidOwner, $suggestedItemTarget); @@ -913,7 +939,7 @@ class Share { } else { $groupFileTarget = null; } - $query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget)); + $query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType, $shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget, $token)); // Save this id, any extra rows for this group share will need to reference it $parent = \OC_DB::insertid('*PREFIX*share'); // Loop through all users of this group in case we need to add an extra row @@ -947,11 +973,12 @@ class Share { 'permissions' => $permissions, 'fileSource' => $fileSource, 'fileTarget' => $fileTarget, - 'id' => $parent + '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, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget)); + $query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget, $token)); $id = \OC_DB::insertid('*PREFIX*share'); } } @@ -976,7 +1003,7 @@ class Share { } else { $fileTarget = null; } - $query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget)); + $query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner, $permissions, time(), $fileSource, $fileTarget, $token)); $id = \OC_DB::insertid('*PREFIX*share'); \OC_Hook::emit('OCP\Share', 'post_shared', array( 'itemType' => $itemType, @@ -989,7 +1016,8 @@ class Share { 'permissions' => $permissions, 'fileSource' => $fileSource, 'fileTarget' => $fileTarget, - 'id' => $id + 'id' => $id, + 'token' => $token )); if ($parentFolder === true) { $parentFolders['id'] = $id; diff --git a/lib/util.php b/lib/util.php index e7ba3dd3df..adec69248d 100755 --- a/lib/util.php +++ b/lib/util.php @@ -95,7 +95,7 @@ class OC_Util { */ public static function getVersion() { // hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4.90.0. This is not visible to the user - return array(4, 91, 01); + return array(4, 91, 02); } /** From 995b5c073922afd5d4fae00cad7e1bfc87c0ac73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 23 Nov 2012 15:51:57 +0100 Subject: [PATCH 04/26] readd fallback code for pre token links --- apps/files_sharing/public.php | 346 ++++++++++++++++++++-------------- core/js/share.js | 22 ++- lib/public/share.php | 2 +- 3 files changed, 219 insertions(+), 151 deletions(-) diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index d680a87fa7..ac24736873 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -19,6 +19,24 @@ if (isset($_GET['token'])) { \OCP\Util::writeLog('files_sharing', 'You have files that are shared by link originating from ownCloud 4.0. Redistribute the new links, because backwards compatibility will be removed in ownCloud 5.', \OCP\Util::WARN); } } + +function getID($path) { + // use the share table from the db to find the item source if the file was reshared because shared files + //are not stored in the file cache. + if (substr(OC_Filesystem::getMountPoint($path), -7, 6) == "Shared") { + $path_parts = explode('/', $path, 5); + $user = $path_parts[1]; + $intPath = '/'.$path_parts[4]; + $query = \OC_DB::prepare('SELECT `item_source` FROM `*PREFIX*share` WHERE `uid_owner` = ? AND `file_target` = ? '); + $result = $query->execute(array($user, $intPath)); + $row = $result->fetchRow(); + $fileSource = $row['item_source']; + } else { + $fileSource = OC_Filecache::getId($path, ''); + } + + return $fileSource; +} // Enf of backward compatibility /** @@ -34,6 +52,7 @@ function getPathAndUser($id) { return $row; } + if (isset($_GET['t'])) { $token = $_GET['t']; $linkItem = OCP\Share::getShareByToken($token); @@ -59,166 +78,201 @@ if (isset($_GET['t'])) { //mount filesystem of file owner OC_Util::setupFS($fileOwner); - if (!isset($linkItem['item_type'])) { - OCP\Util::writeLog('share', 'No item type set for share id: '.$linkItem['id'], \OCP\Util::ERROR); - header('HTTP/1.0 404 Not Found'); - $tmpl = new OCP\Template('', '404', 'guest'); - $tmpl->printPage(); - exit(); - } - if (isset($linkItem['share_with'])) { - // Authenticate share_with - $url = OCP\Util::linkToPublic('files').'&t='.$token; - if (isset($_GET['file'])) { - $url .= '&file='.urlencode($_GET['file']); - } else if (isset($_GET['dir'])) { - $url .= '&dir='.urlencode($_GET['dir']); - } - if (isset($_POST['password'])) { - $password = $_POST['password']; - if ($linkItem['share_type'] == OCP\Share::SHARE_TYPE_LINK) { - // Check Password - $forcePortable = (CRYPT_BLOWFISH != 1); - $hasher = new PasswordHash(8, $forcePortable); - if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $linkItem['share_with']))) { - $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest'); - $tmpl->assign('URL', $url); - $tmpl->assign('error', true); - $tmpl->printPage(); - exit(); - } else { - // Save item id in session for future requests - $_SESSION['public_link_authenticated'] = $linkItem['id']; - } - } else { - OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type'].' for share id '.$linkItem['id'], \OCP\Util::ERROR); - header('HTTP/1.0 404 Not Found'); - $tmpl = new OCP\Template('', '404', 'guest'); - $tmpl->printPage(); - exit(); - } - // Check if item id is set in session - } else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) { - // Prompt for password + } + } +} else if (isset($_GET['file']) || isset($_GET['dir'])) { + OCP\Util::writeLog('share', 'Missing token, trying fallback file/dir links', \OCP\Util::DEBUG); + if (isset($_GET['dir'])) { + $type = 'folder'; + $path = $_GET['dir']; + if(strlen($path)>1 and substr($path, -1, 1)==='/') { + $path=substr($path, 0, -1); + } + $baseDir = $path; + $dir = $baseDir; + } else { + $type = 'file'; + $path = $_GET['file']; + if(strlen($path)>1 and substr($path, -1, 1)==='/') { + $path=substr($path, 0, -1); + } + } + $shareOwner = substr($path, 1, strpos($path, '/', 1) - 1); + + if (OCP\User::userExists($shareOwner)) { + OC_Util::setupFS($shareOwner); + $fileSource = getId($path); + if ($fileSource != -1 ) { + $linkItem = OCP\Share::getItemSharedWithByLink($type, $fileSource, $shareOwner); + $pathAndUser['path'] = $path; + $path_parts = explode('/', $path, 5); + $pathAndUser['user'] = $path_parts[1]; + $fileOwner = $path_parts[1]; + } + } +} + +if ($linkItem) { + if (!isset($linkItem['item_type'])) { + OCP\Util::writeLog('share', 'No item type set for share id: '.$linkItem['id'], \OCP\Util::ERROR); + header('HTTP/1.0 404 Not Found'); + $tmpl = new OCP\Template('', '404', 'guest'); + $tmpl->printPage(); + exit(); + } + if (isset($linkItem['share_with'])) { + // Authenticate share_with + $url = OCP\Util::linkToPublic('files').'&t='.$token; + if (isset($_GET['file'])) { + $url .= '&file='.urlencode($_GET['file']); + } else if (isset($_GET['dir'])) { + $url .= '&dir='.urlencode($_GET['dir']); + } + if (isset($_POST['password'])) { + $password = $_POST['password']; + if ($linkItem['share_type'] == OCP\Share::SHARE_TYPE_LINK) { + // Check Password + $forcePortable = (CRYPT_BLOWFISH != 1); + $hasher = new PasswordHash(8, $forcePortable); + if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $linkItem['share_with']))) { $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest'); $tmpl->assign('URL', $url); + $tmpl->assign('error', true); $tmpl->printPage(); exit(); + } else { + // Save item id in session for future requests + $_SESSION['public_link_authenticated'] = $linkItem['id']; } - } - $basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files')); - $path = $basePath; - if (isset($_GET['path'])) { - $path .= $_GET['path']; - } - if (!$path || !OC_Filesystem::isValidPath($path) || !OC_Filesystem::file_exists($path)) { - OCP\Util::writeLog('share', 'Invalid path '.$path.' for share id '.$linkItem['id'], \OCP\Util::ERROR); + } else { + OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type'].' for share id '.$linkItem['id'], \OCP\Util::ERROR); header('HTTP/1.0 404 Not Found'); $tmpl = new OCP\Template('', '404', 'guest'); $tmpl->printPage(); exit(); } - $dir = dirname($path); - $file = basename($path); - // Download the file - if (isset($_GET['download'])) { - if (isset($_GET['path']) && $_GET['path'] !== '' ) { - if ( isset($_GET['files']) ) { // download selected files - OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); - } else if (isset($_GET['path']) && $_GET['path'] != '' ) { // download a file from a shared directory - OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); - } else { // download the whole shared directory - OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); - } - } else { // download a single shared file - OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); - } - - } else { - OCP\Util::addStyle('files_sharing', 'public'); - OCP\Util::addScript('files_sharing', 'public'); - OCP\Util::addScript('files', 'fileactions'); - $tmpl = new OCP\Template('files_sharing', 'public', 'base'); - $tmpl->assign('uidOwner', $shareOwner); - $tmpl->assign('dir', $dir); - $tmpl->assign('filename', $file); - $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path)); - if (isset($_GET['path'])) { - $getPath = $_GET['path']; - } else { - $getPath = ''; - } - // Show file list - if (OC_Filesystem::is_dir($path)) { - OCP\Util::addStyle('files', 'files'); - OCP\Util::addScript('files', 'files'); - OCP\Util::addScript('files', 'filelist'); - $files = array(); - $rootLength = strlen($basePath) + 1; - foreach (OC_Files::getDirectoryContent($path) as $i) { - $i['date'] = OCP\Util::formatDate($i['mtime']); - if ($i['type'] == 'file') { - $fileinfo = pathinfo($i['name']); - $i['basename'] = $fileinfo['filename']; - $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : ''; - } - $i['directory'] = '/'.substr($i['directory'], $rootLength); - if ($i['directory'] == '/') { - $i['directory'] = ''; - } - $i['permissions'] = OCP\PERMISSION_READ; - $files[] = $i; - } - // Make breadcrumb - $breadcrumb = array(); - $pathtohere = ''; - - //add base breadcrumb - $breadcrumb[] = array('dir' => '/', 'name' => basename($basePath)); - - //add subdir breadcrumbs - foreach (explode('/', urldecode($_GET['path'])) as $i) { - if ($i != '') { - $pathtohere .= '/'.$i; - $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i); - } - } - - $list = new OCP\Template('files', 'part.list', ''); - $list->assign('files', $files, false); - $list->assign('publicListView', true); - $list->assign('baseURL', OCP\Util::linkToPublic('files').'&t='.$token.'&path=', false); - $list->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download&path=', false); - $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' ); - $breadcrumbNav->assign('breadcrumb', $breadcrumb, false); - $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').'&t='.$token.'&path=', false); - $folder = new OCP\Template('files', 'index', ''); - $folder->assign('fileList', $list->fetchPage(), false); - $folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false); - $folder->assign('isCreatable', false); - $folder->assign('permissions', 0); - $folder->assign('files', $files); - $folder->assign('uploadMaxFilesize', 0); - $folder->assign('uploadMaxHumanFilesize', 0); - $folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); - $tmpl->assign('folder', $folder->fetchPage(), false); - $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); - $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download&path='.urlencode($getPath)); - } else { - // Show file preview if viewer is available - if ($type == 'file') { - $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download'); - } else { - $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&t='.$token.'&download&path='.urlencode($getPath)); - } - } - $tmpl->printPage(); - } + // Check if item id is set in session + } else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) { + // Prompt for password + $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest'); + $tmpl->assign('URL', $url); + $tmpl->printPage(); exit(); } } + $basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files')); + $path = $basePath; + if (isset($_GET['path'])) { + $path .= $_GET['path']; + } + if (!$path || !OC_Filesystem::isValidPath($path) || !OC_Filesystem::file_exists($path)) { + OCP\Util::writeLog('share', 'Invalid path '.$path.' for share id '.$linkItem['id'], \OCP\Util::ERROR); + header('HTTP/1.0 404 Not Found'); + $tmpl = new OCP\Template('', '404', 'guest'); + $tmpl->printPage(); + exit(); + } + $dir = dirname($path); + $file = basename($path); + // Download the file + if (isset($_GET['download'])) { + if (isset($_GET['path']) && $_GET['path'] !== '' ) { + if ( isset($_GET['files']) ) { // download selected files + OC_Files::get($path, $_GET['files'], $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); + } else if (isset($_GET['path']) && $_GET['path'] != '' ) { // download a file from a shared directory + OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); + } else { // download the whole shared directory + OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); + } + } else { // download a single shared file + OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false); + } + + } else { + OCP\Util::addStyle('files_sharing', 'public'); + OCP\Util::addScript('files_sharing', 'public'); + OCP\Util::addScript('files', 'fileactions'); + $tmpl = new OCP\Template('files_sharing', 'public', 'base'); + $tmpl->assign('uidOwner', $shareOwner); + $tmpl->assign('dir', $dir); + $tmpl->assign('filename', $file); + $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path)); + if (isset($_GET['path'])) { + $getPath = $_GET['path']; + } else { + $getPath = ''; + } + // + $urlLinkIdentifiers= (isset($token)?'&t='.$token:'').(isset($_GET['dir'])?'&dir='.$_GET['dir']:'').(isset($_GET['file'])?'&file='.$_GET['file']:''); + // Show file list + if (OC_Filesystem::is_dir($path)) { + OCP\Util::addStyle('files', 'files'); + OCP\Util::addScript('files', 'files'); + OCP\Util::addScript('files', 'filelist'); + $files = array(); + $rootLength = strlen($basePath) + 1; + foreach (OC_Files::getDirectoryContent($path) as $i) { + $i['date'] = OCP\Util::formatDate($i['mtime']); + if ($i['type'] == 'file') { + $fileinfo = pathinfo($i['name']); + $i['basename'] = $fileinfo['filename']; + $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : ''; + } + $i['directory'] = '/'.substr($i['directory'], $rootLength); + if ($i['directory'] == '/') { + $i['directory'] = ''; + } + $i['permissions'] = OCP\PERMISSION_READ; + $files[] = $i; + } + // Make breadcrumb + $breadcrumb = array(); + $pathtohere = ''; + + //add base breadcrumb + $breadcrumb[] = array('dir' => '/', 'name' => basename($basePath)); + + //add subdir breadcrumbs + foreach (explode('/', urldecode($_GET['path'])) as $i) { + if ($i != '') { + $pathtohere .= '/'.$i; + $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i); + } + } + + $list = new OCP\Template('files', 'part.list', ''); + $list->assign('files', $files, false); + $list->assign('publicListView', true); + $list->assign('baseURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&path=', false); + $list->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download&path=', false); + $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' ); + $breadcrumbNav->assign('breadcrumb', $breadcrumb, false); + $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&path=', false); + $folder = new OCP\Template('files', 'index', ''); + $folder->assign('fileList', $list->fetchPage(), false); + $folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false); + $folder->assign('isCreatable', false); + $folder->assign('permissions', 0); + $folder->assign('files', $files); + $folder->assign('uploadMaxFilesize', 0); + $folder->assign('uploadMaxHumanFilesize', 0); + $folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); + $tmpl->assign('folder', $folder->fetchPage(), false); + $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); + $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download&path='.urlencode($getPath)); + } else { + // Show file preview if viewer is available + if ($type == 'file') { + $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download'); + } else { + $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download&path='.urlencode($getPath)); + } + } + $tmpl->printPage(); + } + exit(); } else { - OCP\Util::writeLog('share', 'Missing token', \OCP\Util::DEBUG); + OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG); } header('HTTP/1.0 404 Not Found'); $tmpl = new OCP\Template('', '404', 'guest'); diff --git a/core/js/share.js b/core/js/share.js index 879befd95b..0f71ae2241 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -179,7 +179,7 @@ OC.Share={ if (data.shares) { $.each(data.shares, function(index, share) { if (share.share_type == OC.Share.SHARE_TYPE_LINK) { - OC.Share.showLink(share.token, share.share_with); + OC.Share.showLink(share.token, share.share_with, itemSource); } else { if (share.collection) { OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, share.collection); @@ -323,10 +323,24 @@ OC.Share={ $('#expiration').show(); } }, - showLink:function(token, password) { + showLink:function(token, password, itemSource) { OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true; $('#linkCheckbox').attr('checked', true); - var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&t='+token; + if (! token) { + //fallback to pre token link + var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file'); + var type = $('tr').filterAttr('data-id', String(itemSource)).data('type'); + if ($('#dir').val() == '/') { + var file = $('#dir').val() + filename; + } else { + var file = $('#dir').val() + '/' + filename; + } + file = '/'+OC.currentUser+'/files'+file; + var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file); + } else { + //TODO add path param when showing a link to file in a subfolder of a public link share + var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&t='+token; + } $('#linkText').val(link); $('#linkText').show('blind'); $('#showPassword').show(); @@ -473,7 +487,7 @@ $(document).ready(function() { if (this.checked) { // Create a link OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function(data) { - OC.Share.showLink(data.token); + OC.Share.showLink(data.token, null, itemSource); OC.Share.updateIcon(itemType, itemSource); }); } else { diff --git a/lib/public/share.php b/lib/public/share.php index 2ded31a42e..653ea64fa6 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -689,7 +689,7 @@ class Share { if (($itemType == 'file' || $itemType == 'folder') && $format == \OC_Share_Backend_File::FORMAT_FILE_APP || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT) { $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, `share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, `expiration`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, `versioned`, `writable`'; } else { - $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`'; + $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`'; } } else { $select = '*'; From ebe3c9130d101fb5c5ec4007eef3ed78716d840b Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sat, 24 Nov 2012 20:58:51 +0100 Subject: [PATCH 05/26] add a few more indexes. This is just a first step. More work is needed here but this should improve perfomance already for big installations. --- db_structure.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/db_structure.xml b/db_structure.xml index 851c8aa998..e1080cd235 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -46,6 +46,13 @@ ascending + + appconfig_config_key_index + + configkey + ascending + + @@ -257,6 +264,13 @@ true 64 + + group_admin_uid + + uid + ascending + + @@ -580,6 +594,21 @@ false + + share_file_target_index + + file_target + ascending + + + uid_owner + ascending + + + share_type + ascending + + From f712ca61dfdec7ed80d405115d6eb48e405fe894 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sun, 25 Nov 2012 15:09:07 +0100 Subject: [PATCH 06/26] remove the index on the share table because of problems with the index size. Thanks to icewind for spotting this. --- db_structure.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/db_structure.xml b/db_structure.xml index e1080cd235..e1da6448c8 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -594,21 +594,6 @@ false - - share_file_target_index - - file_target - ascending - - - uid_owner - ascending - - - share_type - ascending - - From 789220407768da586b8c3a1c4759b7ab59325b00 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 26 Nov 2012 00:02:04 +0100 Subject: [PATCH 07/26] [tx-robot] updated from transifex --- apps/files/l10n/ca.php | 1 + apps/files/l10n/de.php | 2 + apps/files/l10n/de_DE.php | 2 + apps/files/l10n/eu.php | 16 ++++- apps/files/l10n/fr.php | 2 + apps/files/l10n/ta_LK.php | 2 + apps/files_external/l10n/ta_LK.php | 24 +++++++ apps/user_webdavauth/l10n/eu.php | 3 + apps/user_webdavauth/l10n/fr.php | 3 + core/l10n/eu.php | 7 +- core/l10n/fr.php | 11 +++ l10n/ca/files.po | 8 +-- l10n/de/files.po | 9 +-- l10n/de_DE/files.po | 9 +-- l10n/eu/core.po | 96 ++++++++++++------------- l10n/eu/files.po | 36 +++++----- l10n/eu/settings.po | 10 +-- l10n/eu/user_webdavauth.po | 9 +-- l10n/fr/core.po | 108 ++++++++++++++-------------- l10n/fr/files.po | 10 +-- l10n/fr/lib.po | 22 +++--- l10n/fr/user_webdavauth.po | 9 +-- l10n/ta_LK/files.po | 10 +-- l10n/ta_LK/files_external.po | 51 ++++++------- 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_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/fr.php | 6 +- settings/l10n/eu.php | 2 + 36 files changed, 284 insertions(+), 204 deletions(-) create mode 100644 apps/files_external/l10n/ta_LK.php create mode 100644 apps/user_webdavauth/l10n/eu.php create mode 100644 apps/user_webdavauth/l10n/fr.php diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index a2d5bddbfc..de72d3f46f 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}", "unshared {files}" => "no compartits {files}", "deleted {files}" => "eliminats {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.", "generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.", "Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes", "Upload Error" => "Error en la pujada", diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 4abfc8c432..88c1e792ae 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}", "unshared {files}" => "Freigabe von {files} aufgehoben", "deleted {files}" => "{files} gelöscht", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.", "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.", "Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.", "Upload Error" => "Fehler beim Upload", @@ -28,6 +29,7 @@ "{count} files uploading" => "{count} Dateien werden hochgeladen", "Upload cancelled." => "Upload abgebrochen.", "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.", "{count} files scanned" => "{count} Dateien wurden gescannt", "error while scanning" => "Fehler beim Scannen", "Name" => "Name", diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php index 7ba7600a0d..427380e5a2 100644 --- a/apps/files/l10n/de_DE.php +++ b/apps/files/l10n/de_DE.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}", "unshared {files}" => "Freigabe für {files} beendet", "deleted {files}" => "{files} gelöscht", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.", "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.", "Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.", "Upload Error" => "Fehler beim Upload", @@ -28,6 +29,7 @@ "{count} files uploading" => "{count} Dateien wurden hochgeladen", "Upload cancelled." => "Upload abgebrochen.", "File upload is in progress. Leaving the page now will cancel the upload." => "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.", "{count} files scanned" => "{count} Dateien wurden gescannt", "error while scanning" => "Fehler beim Scannen", "Name" => "Name", diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index dddb58e9cb..062ae33fb6 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -7,25 +7,38 @@ "Missing a temporary folder" => "Aldi baterako karpeta falta da", "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan", "Files" => "Fitxategiak", -"Unshare" => "Ez partekatu", +"Unshare" => "Ez elkarbanatu", "Delete" => "Ezabatu", "Rename" => "Berrizendatu", +"{new_name} already exists" => "{new_name} dagoeneko existitzen da", "replace" => "ordeztu", "suggest name" => "aholkatu izena", "cancel" => "ezeztatu", +"replaced {new_name}" => "ordezkatua {new_name}", "undo" => "desegin", +"replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du", +"unshared {files}" => "elkarbanaketa utzita {files}", +"deleted {files}" => "ezabatuta {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.", "generating ZIP-file, it may take some time." => "ZIP-fitxategia sortzen ari da, denbora har dezake", "Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu", "Upload Error" => "Igotzean errore bat suertatu da", "Close" => "Itxi", "Pending" => "Zain", "1 file uploading" => "fitxategi 1 igotzen", +"{count} files uploading" => "{count} fitxategi igotzen", "Upload cancelled." => "Igoera ezeztatuta", "File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Karpeta izen baliogabea. \"Shared\" karpetaren erabilera Owncloudek erreserbatuta dauka", +"{count} files scanned" => "{count} fitxategi eskaneatuta", "error while scanning" => "errore bat egon da eskaneatzen zen bitartean", "Name" => "Izena", "Size" => "Tamaina", "Modified" => "Aldatuta", +"1 folder" => "karpeta bat", +"{count} folders" => "{count} karpeta", +"1 file" => "fitxategi bat", +"{count} files" => "{count} fitxategi", "File handling" => "Fitxategien kudeaketa", "Maximum upload size" => "Igo daitekeen gehienezko tamaina", "max. possible: " => "max, posiblea:", @@ -37,6 +50,7 @@ "New" => "Berria", "Text file" => "Testu fitxategia", "Folder" => "Karpeta", +"From link" => "Estekatik", "Upload" => "Igo", "Cancel upload" => "Ezeztatu igoera", "Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 5170272c45..97643c6363 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}", "unshared {files}" => "Fichiers non partagés : {files}", "deleted {files}" => "Fichiers supprimés : {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.", "generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ; cela peut prendre du temps.", "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.", "Upload Error" => "Erreur de chargement", @@ -28,6 +29,7 @@ "{count} files uploading" => "{count} fichiers téléversés", "Upload cancelled." => "Chargement annulé.", "File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nom de répertoire invalide. \"Shared\" est réservé par ownCloud", "{count} files scanned" => "{count} fichiers indexés", "error while scanning" => "erreur lors de l'indexation", "Name" => "Nom", diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php index 0bd4b173c0..d9b6b021be 100644 --- a/apps/files/l10n/ta_LK.php +++ b/apps/files/l10n/ta_LK.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது", "unshared {files}" => "பகிரப்படாதது {கோப்புகள்}", "deleted {files}" => "நீக்கப்பட்டது {கோப்புகள்}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.", "generating ZIP-file, it may take some time." => " ZIP கோப்பு உருவாக்கப்படுகின்றது, இது சில நேரம் ஆகலாம்.", "Unable to upload your file as it is a directory or has 0 bytes" => "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை", "Upload Error" => "பதிவேற்றல் வழு", @@ -28,6 +29,7 @@ "{count} files uploading" => "{எண்ணிக்கை} கோப்புகள் பதிவேற்றப்படுகின்றது", "Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது", "File upload is in progress. Leaving the page now will cancel the upload." => "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "செல்லுபடியற்ற கோப்புறை பெயர். \"பகிர்வின்\" பாவனை Owncloud இனால் ஒதுக்கப்பட்டுள்ளது", "{count} files scanned" => "{எண்ணிக்கை} கோப்புகள் வருடப்பட்டது", "error while scanning" => "வருடும் போதான வழு", "Name" => "பெயர்", diff --git a/apps/files_external/l10n/ta_LK.php b/apps/files_external/l10n/ta_LK.php new file mode 100644 index 0000000000..1e01b22efa --- /dev/null +++ b/apps/files_external/l10n/ta_LK.php @@ -0,0 +1,24 @@ + "அனுமதி வழங்கப்பட்டது", +"Error configuring Dropbox storage" => "Dropbox சேமிப்பை தகவமைப்பதில் வழு", +"Grant access" => "அனுமதியை வழங்கல்", +"Fill out all required fields" => "தேவையான எல்லா புலங்களையும் நிரப்புக", +"Please provide a valid Dropbox app key and secret." => "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. ", +"Error configuring Google Drive storage" => "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு", +"External Storage" => "வெளி சேமிப்பு", +"Mount point" => "ஏற்றப்புள்ளி", +"Backend" => "பின்நிலை", +"Configuration" => "தகவமைப்பு", +"Options" => "தெரிவுகள்", +"Applicable" => "பயன்படத்தக்க", +"Add mount point" => "ஏற்றப்புள்ளியை சேர்க்க", +"None set" => "தொகுப்பில்லா", +"All Users" => "பயனாளர்கள் எல்லாம்", +"Groups" => "குழுக்கள்", +"Users" => "பயனாளர்", +"Delete" => "நீக்குக", +"Enable User External Storage" => "பயனாளர் வெளி சேமிப்பை இயலுமைப்படுத்துக", +"Allow users to mount their own external storage" => "பயனாளர் அவர்களுடைய சொந்த வெளியக சேமிப்பை ஏற்ற அனுமதிக்க", +"SSL root certificates" => "SSL வேர் சான்றிதழ்கள்", +"Import Root Certificate" => "வேர் சான்றிதழை இறக்குமதி செய்க" +); diff --git a/apps/user_webdavauth/l10n/eu.php b/apps/user_webdavauth/l10n/eu.php new file mode 100644 index 0000000000..9bd32954b0 --- /dev/null +++ b/apps/user_webdavauth/l10n/eu.php @@ -0,0 +1,3 @@ + "WebDAV URL: http://" +); diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php new file mode 100644 index 0000000000..759d45b230 --- /dev/null +++ b/apps/user_webdavauth/l10n/fr.php @@ -0,0 +1,3 @@ + "URL WebDAV : http://" +); diff --git a/core/l10n/eu.php b/core/l10n/eu.php index 6622a822d0..8bc5d690d5 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -1,6 +1,9 @@ "Kategoria mota ez da zehaztu.", "No category to add?" => "Ez dago gehitzeko kategoriarik?", "This category already exists: " => "Kategoria hau dagoeneko existitzen da:", +"Object type not provided." => "Objetu mota ez da zehaztu.", +"%s ID not provided." => "%s ID mota ez da zehaztu.", "No categories selected for deletion." => "Ez da ezabatzeko kategoriarik hautatu.", "Settings" => "Ezarpenak", "seconds ago" => "segundu", @@ -96,5 +99,7 @@ "Log in" => "Hasi saioa", "You are logged out." => "Zure saioa bukatu da.", "prev" => "aurrekoa", -"next" => "hurrengoa" +"next" => "hurrengoa", +"Security Warning!" => "Segurtasun abisua", +"Verify" => "Egiaztatu" ); diff --git a/core/l10n/fr.php b/core/l10n/fr.php index a513ad1965..f02a7b0087 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -1,15 +1,23 @@ "Type de catégorie non spécifié.", "No category to add?" => "Pas de catégorie à ajouter ?", "This category already exists: " => "Cette catégorie existe déjà : ", +"Object type not provided." => "Type d'objet non spécifié.", +"%s ID not provided." => "L'identifiant de %s n'est pas spécifié.", +"Error adding %s to favorites." => "Erreur lors de l'ajout de %s aux favoris.", "No categories selected for deletion." => "Aucune catégorie sélectionnée pour suppression", +"Error removing %s from favorites." => "Erreur lors de la suppression de %s des favoris.", "Settings" => "Paramètres", "seconds ago" => "il y a quelques secondes", "1 minute ago" => "il y a une minute", "{minutes} minutes ago" => "il y a {minutes} minutes", +"1 hour ago" => "Il y a une heure", +"{hours} hours ago" => "Il y a {hours} heures", "today" => "aujourd'hui", "yesterday" => "hier", "{days} days ago" => "il y a {days} jours", "last month" => "le mois dernier", +"{months} months ago" => "Il y a {months} mois", "months ago" => "il y a plusieurs mois", "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", @@ -18,7 +26,10 @@ "No" => "Non", "Yes" => "Oui", "Ok" => "Ok", +"The object type is not specified." => "Le type d'objet n'est pas spécifié.", "Error" => "Erreur", +"The app name is not specified." => "Le nom de l'application n'est pas spécifié.", +"The required file {file} is not installed!" => "Le fichier requis {file} n'est pas installé !", "Error while sharing" => "Erreur lors de la mise en partage", "Error while unsharing" => "Erreur lors de l'annulation du partage", "Error while changing permissions" => "Erreur lors du changement des permissions", diff --git a/l10n/ca/files.po b/l10n/ca/files.po index 4275de50fa..f8f8371902 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/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: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 10:24+0000\n" +"Last-Translator: rogerc \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -107,7 +107,7 @@ msgstr "eliminats {files}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." diff --git a/l10n/de/files.po b/l10n/de/files.po index 0134a285f0..1a69a4a4cf 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -5,6 +5,7 @@ # Translators: # , 2012. # , 2012. +# I Robot , 2012. # I Robot , 2012. # Jan-Christoph Borchardt , 2012. # Jan-Christoph Borchardt , 2011. @@ -23,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:01+0000\n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 00:10+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -119,7 +120,7 @@ msgstr "{files} gelöscht" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." @@ -160,7 +161,7 @@ msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload a #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten." #: js/files.js:704 msgid "{count} files scanned" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index 0b8ace46ae..336308b77b 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -6,6 +6,7 @@ # , 2012. # , 2012. # , 2012. +# I Robot , 2012. # I Robot , 2012. # Jan-Christoph Borchardt , 2012. # Jan-Christoph Borchardt , 2011. @@ -24,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 00:13+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" @@ -120,7 +121,7 @@ msgstr "{files} gelöscht" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." @@ -161,7 +162,7 @@ msgstr "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upl #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten." #: js/files.js:704 msgid "{count} files scanned" diff --git a/l10n/eu/core.po b/l10n/eu/core.po index 3aa27daaa8..1c55b9ec27 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 23:01+0000\n" +"Last-Translator: asieriko \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ msgstr "" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "Kategoria mota ez da zehaztu." #: ajax/vcategories/add.php:30 msgid "No category to add?" @@ -35,13 +35,13 @@ msgstr "Kategoria hau dagoeneko existitzen da:" #: ajax/vcategories/favorites.php:24 #: ajax/vcategories/removeFromFavorites.php:26 msgid "Object type not provided." -msgstr "" +msgstr "Objetu mota ez da zehaztu." #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "" +msgstr "%s ID mota ez da zehaztu." #: ajax/vcategories/addToFavorites.php:35 #, php-format @@ -57,59 +57,59 @@ msgstr "Ez da ezabatzeko kategoriarik hautatu." msgid "Error removing %s from favorites." msgstr "" -#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60 +#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 msgid "Settings" msgstr "Ezarpenak" -#: js/js.js:688 +#: js/js.js:704 msgid "seconds ago" msgstr "segundu" -#: js/js.js:689 +#: js/js.js:705 msgid "1 minute ago" msgstr "orain dela minutu 1" -#: js/js.js:690 +#: js/js.js:706 msgid "{minutes} minutes ago" msgstr "" -#: js/js.js:691 +#: js/js.js:707 msgid "1 hour ago" msgstr "" -#: js/js.js:692 +#: js/js.js:708 msgid "{hours} hours ago" msgstr "" -#: js/js.js:693 +#: js/js.js:709 msgid "today" msgstr "gaur" -#: js/js.js:694 +#: js/js.js:710 msgid "yesterday" msgstr "atzo" -#: js/js.js:695 +#: js/js.js:711 msgid "{days} days ago" msgstr "" -#: js/js.js:696 +#: js/js.js:712 msgid "last month" msgstr "joan den hilabetean" -#: js/js.js:697 +#: js/js.js:713 msgid "{months} months ago" msgstr "" -#: js/js.js:698 +#: js/js.js:714 msgid "months ago" msgstr "hilabete" -#: js/js.js:699 +#: js/js.js:715 msgid "last year" msgstr "joan den urtean" -#: js/js.js:700 +#: js/js.js:716 msgid "years ago" msgstr "urte" @@ -139,8 +139,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:135 js/share.js:142 js/share.js:525 -#: js/share.js:537 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527 +#: js/share.js:539 msgid "Error" msgstr "Errorea" @@ -241,15 +241,15 @@ msgstr "ezabatu" msgid "share" msgstr "elkarbanatu" -#: js/share.js:343 js/share.js:512 js/share.js:514 +#: js/share.js:343 js/share.js:514 js/share.js:516 msgid "Password protected" msgstr "Pasahitzarekin babestuta" -#: js/share.js:525 +#: js/share.js:527 msgid "Error unsetting expiration date" msgstr "Errorea izan da muga data kentzean" -#: js/share.js:537 +#: js/share.js:539 msgid "Error setting expiration date" msgstr "Errore bat egon da muga data ezartzean" @@ -404,87 +404,87 @@ msgstr "Datubasearen hostalaria" msgid "Finish setup" msgstr "Bukatu konfigurazioa" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Sunday" msgstr "Igandea" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Monday" msgstr "Astelehena" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Tuesday" msgstr "Asteartea" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Wednesday" msgstr "Asteazkena" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Thursday" msgstr "Osteguna" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Friday" msgstr "Ostirala" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Saturday" msgstr "Larunbata" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "January" msgstr "Urtarrila" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "February" msgstr "Otsaila" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "March" msgstr "Martxoa" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "April" msgstr "Apirila" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "May" msgstr "Maiatza" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "June" msgstr "Ekaina" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "July" msgstr "Uztaila" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "August" msgstr "Abuztua" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "September" msgstr "Iraila" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "October" msgstr "Urria" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "November" msgstr "Azaroa" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "December" msgstr "Abendua" -#: templates/layout.guest.php:41 +#: templates/layout.guest.php:42 msgid "web services under your control" msgstr "web zerbitzuak zure kontrolpean" -#: templates/layout.user.php:44 +#: templates/layout.user.php:45 msgid "Log out" msgstr "Saioa bukatu" @@ -528,7 +528,7 @@ msgstr "hurrengoa" #: templates/verify.php:5 msgid "Security Warning!" -msgstr "" +msgstr "Segurtasun abisua" #: templates/verify.php:6 msgid "" @@ -538,4 +538,4 @@ msgstr "" #: templates/verify.php:16 msgid "Verify" -msgstr "" +msgstr "Egiaztatu" diff --git a/l10n/eu/files.po b/l10n/eu/files.po index a726851e13..2f667de1c6 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 23:00+0000\n" +"Last-Translator: asieriko \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "Fitxategiak" #: js/fileactions.js:117 templates/index.php:64 msgid "Unshare" -msgstr "Ez partekatu" +msgstr "Ez elkarbanatu" #: js/fileactions.js:119 templates/index.php:66 msgid "Delete" @@ -67,7 +67,7 @@ msgstr "Berrizendatu" #: js/filelist.js:201 js/filelist.js:203 msgid "{new_name} already exists" -msgstr "" +msgstr "{new_name} dagoeneko existitzen da" #: js/filelist.js:201 js/filelist.js:203 msgid "replace" @@ -83,7 +83,7 @@ msgstr "ezeztatu" #: js/filelist.js:250 msgid "replaced {new_name}" -msgstr "" +msgstr "ordezkatua {new_name}" #: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286 msgid "undo" @@ -91,21 +91,21 @@ msgstr "desegin" #: js/filelist.js:252 msgid "replaced {new_name} with {old_name}" -msgstr "" +msgstr " {new_name}-k {old_name} ordezkatu du" #: js/filelist.js:284 msgid "unshared {files}" -msgstr "" +msgstr "elkarbanaketa utzita {files}" #: js/filelist.js:286 msgid "deleted {files}" -msgstr "" +msgstr "ezabatuta {files}" #: js/files.js:33 msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." @@ -133,7 +133,7 @@ msgstr "fitxategi 1 igotzen" #: js/files.js:277 js/files.js:331 js/files.js:346 msgid "{count} files uploading" -msgstr "" +msgstr "{count} fitxategi igotzen" #: js/files.js:349 js/files.js:382 msgid "Upload cancelled." @@ -146,11 +146,11 @@ msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du. #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Karpeta izen baliogabea. \"Shared\" karpetaren erabilera Owncloudek erreserbatuta dauka" #: js/files.js:704 msgid "{count} files scanned" -msgstr "" +msgstr "{count} fitxategi eskaneatuta" #: js/files.js:712 msgid "error while scanning" @@ -170,19 +170,19 @@ msgstr "Aldatuta" #: js/files.js:814 msgid "1 folder" -msgstr "" +msgstr "karpeta bat" #: js/files.js:816 msgid "{count} folders" -msgstr "" +msgstr "{count} karpeta" #: js/files.js:824 msgid "1 file" -msgstr "" +msgstr "fitxategi bat" #: js/files.js:826 msgid "{count} files" -msgstr "" +msgstr "{count} fitxategi" #: templates/admin.php:5 msgid "File handling" @@ -230,7 +230,7 @@ msgstr "Karpeta" #: templates/index.php:11 msgid "From link" -msgstr "" +msgstr "Estekatik" #: templates/index.php:22 msgid "Upload" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index 1606e178d6..93adee8ec6 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-10 00:01+0100\n" -"PO-Revision-Date: 2012-11-09 23:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 22:46+0000\n" +"Last-Translator: asieriko \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -100,7 +100,7 @@ msgstr "Gehitu zure aplikazioa" #: templates/apps.php:11 msgid "More Apps" -msgstr "" +msgstr "App gehiago" #: templates/apps.php:27 msgid "Select an App" @@ -141,7 +141,7 @@ msgstr "Erantzun" #: templates/personal.php:8 #, php-format msgid "You have used %s of the available %s" -msgstr "" +msgstr "Dagoeneko %s erabili duzu eskuragarri duzun %setatik" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po index a21e5c32e9..eca9edb6ff 100644 --- a/l10n/eu/user_webdavauth.po +++ b/l10n/eu/user_webdavauth.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-09 10:06+0100\n" -"PO-Revision-Date: 2012-11-09 09:06+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 22:56+0000\n" +"Last-Translator: asieriko \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,4 +20,4 @@ msgstr "" #: templates/settings.php:4 msgid "WebDAV URL: http://" -msgstr "" +msgstr "WebDAV URL: http://" diff --git a/l10n/fr/core.po b/l10n/fr/core.po index bbe6c0ef45..28f66a6fa2 100644 --- a/l10n/fr/core.po +++ b/l10n/fr/core.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 00:59+0000\n" +"Last-Translator: Romain DEP. \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" @@ -27,7 +27,7 @@ msgstr "" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "Type de catégorie non spécifié." #: ajax/vcategories/add.php:30 msgid "No category to add?" @@ -41,18 +41,18 @@ msgstr "Cette catégorie existe déjà : " #: ajax/vcategories/favorites.php:24 #: ajax/vcategories/removeFromFavorites.php:26 msgid "Object type not provided." -msgstr "" +msgstr "Type d'objet non spécifié." #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "" +msgstr "L'identifiant de %s n'est pas spécifié." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "Erreur lors de l'ajout de %s aux favoris." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." @@ -61,61 +61,61 @@ msgstr "Aucune catégorie sélectionnée pour suppression" #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "Erreur lors de la suppression de %s des favoris." -#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60 +#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 msgid "Settings" msgstr "Paramètres" -#: js/js.js:688 +#: js/js.js:704 msgid "seconds ago" msgstr "il y a quelques secondes" -#: js/js.js:689 +#: js/js.js:705 msgid "1 minute ago" msgstr "il y a une minute" -#: js/js.js:690 +#: js/js.js:706 msgid "{minutes} minutes ago" msgstr "il y a {minutes} minutes" -#: js/js.js:691 +#: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "Il y a une heure" -#: js/js.js:692 +#: js/js.js:708 msgid "{hours} hours ago" -msgstr "" +msgstr "Il y a {hours} heures" -#: js/js.js:693 +#: js/js.js:709 msgid "today" msgstr "aujourd'hui" -#: js/js.js:694 +#: js/js.js:710 msgid "yesterday" msgstr "hier" -#: js/js.js:695 +#: js/js.js:711 msgid "{days} days ago" msgstr "il y a {days} jours" -#: js/js.js:696 +#: js/js.js:712 msgid "last month" msgstr "le mois dernier" -#: js/js.js:697 +#: js/js.js:713 msgid "{months} months ago" -msgstr "" +msgstr "Il y a {months} mois" -#: js/js.js:698 +#: js/js.js:714 msgid "months ago" msgstr "il y a plusieurs mois" -#: js/js.js:699 +#: js/js.js:715 msgid "last year" msgstr "l'année dernière" -#: js/js.js:700 +#: js/js.js:716 msgid "years ago" msgstr "il y a plusieurs années" @@ -142,21 +142,21 @@ 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 msgid "The object type is not specified." -msgstr "" +msgstr "Le type d'objet n'est pas spécifié." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525 -#: js/share.js:537 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527 +#: js/share.js:539 msgid "Error" msgstr "Erreur" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "" +msgstr "Le nom de l'application n'est pas spécifié." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "" +msgstr "Le fichier requis {file} n'est pas installé !" #: js/share.js:124 msgid "Error while sharing" @@ -247,15 +247,15 @@ msgstr "supprimer" msgid "share" msgstr "partager" -#: js/share.js:343 js/share.js:512 js/share.js:514 +#: js/share.js:343 js/share.js:514 js/share.js:516 msgid "Password protected" msgstr "Protégé par un mot de passe" -#: js/share.js:525 +#: js/share.js:527 msgid "Error unsetting expiration date" msgstr "Un erreur est survenue pendant la suppression de la date d'expiration" -#: js/share.js:537 +#: js/share.js:539 msgid "Error setting expiration date" msgstr "Erreur lors de la spécification de la date d'expiration" @@ -410,87 +410,87 @@ msgstr "Serveur de la base de données" msgid "Finish setup" msgstr "Terminer l'installation" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Sunday" msgstr "Dimanche" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Monday" msgstr "Lundi" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Tuesday" msgstr "Mardi" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Wednesday" msgstr "Mercredi" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Thursday" msgstr "Jeudi" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Friday" msgstr "Vendredi" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Saturday" msgstr "Samedi" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "January" msgstr "janvier" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "February" msgstr "février" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "March" msgstr "mars" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "April" msgstr "avril" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "May" msgstr "mai" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "June" msgstr "juin" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "July" msgstr "juillet" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "August" msgstr "août" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "September" msgstr "septembre" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "October" msgstr "octobre" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "November" msgstr "novembre" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "December" msgstr "décembre" -#: templates/layout.guest.php:41 +#: templates/layout.guest.php:42 msgid "web services under your control" msgstr "services web sous votre contrôle" -#: templates/layout.user.php:44 +#: templates/layout.user.php:45 msgid "Log out" msgstr "Se déconnecter" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index 0db7fb69f6..58459bcd52 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 01:02+0000\n" +"Last-Translator: Romain DEP. \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" @@ -113,7 +113,7 @@ msgstr "Fichiers supprimés : {files}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." @@ -154,7 +154,7 @@ msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Nom de répertoire invalide. \"Shared\" est réservé par ownCloud" #: js/files.js:704 msgid "{count} files scanned" diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po index b4788144e0..7617ac30e7 100644 --- a/l10n/fr/lib.po +++ b/l10n/fr/lib.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 00:56+0000\n" +"Last-Translator: Romain DEP. \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" @@ -43,19 +43,19 @@ msgstr "Applications" msgid "Admin" msgstr "Administration" -#: files.php:332 +#: files.php:361 msgid "ZIP download is turned off." msgstr "Téléchargement ZIP désactivé." -#: files.php:333 +#: files.php:362 msgid "Files need to be downloaded one by one." msgstr "Les fichiers nécessitent d'être téléchargés un par un." -#: files.php:333 files.php:358 +#: files.php:362 files.php:387 msgid "Back to Files" msgstr "Retour aux Fichiers" -#: files.php:357 +#: files.php:386 msgid "Selected files too large to generate zip file." msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés." @@ -98,12 +98,12 @@ msgstr "il y a %d minutes" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "Il y a une heure" #: template.php:107 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "Il y a %d heures" #: template.php:108 msgid "today" @@ -125,7 +125,7 @@ msgstr "le mois dernier" #: template.php:112 #, php-format msgid "%d months ago" -msgstr "" +msgstr "Il y a %d mois" #: template.php:113 msgid "last year" @@ -151,4 +151,4 @@ msgstr "la vérification des mises à jour est désactivée" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "Impossible de trouver la catégorie \"%s\"" diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po index b47a063ca3..ef3cebf770 100644 --- a/l10n/fr/user_webdavauth.po +++ b/l10n/fr/user_webdavauth.po @@ -4,13 +4,14 @@ # # Translators: # Robert Di Rosa <>, 2012. +# Romain DEP. , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-12 00:01+0100\n" -"PO-Revision-Date: 2012-11-11 10:15+0000\n" -"Last-Translator: Robert Di Rosa <>\n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 00:28+0000\n" +"Last-Translator: Romain DEP. \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" @@ -20,4 +21,4 @@ msgstr "" #: templates/settings.php:4 msgid "WebDAV URL: http://" -msgstr "" +msgstr "URL WebDAV : http://" diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po index 4f7d243f4e..8305b7c9cd 100644 --- a/l10n/ta_LK/files.po +++ b/l10n/ta_LK/files.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 16:24+0000\n" +"Last-Translator: suganthi \n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,7 +104,7 @@ msgstr "நீக்கப்பட்டது {கோப்புகள்}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." @@ -145,7 +145,7 @@ msgstr "கோப்பு பதிவேற்றம் செயல்பா #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "செல்லுபடியற்ற கோப்புறை பெயர். \"பகிர்வின்\" பாவனை Owncloud இனால் ஒதுக்கப்பட்டுள்ளது" #: js/files.js:704 msgid "{count} files scanned" diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po index 469c1e516e..8bbabf7c15 100644 --- a/l10n/ta_LK/files_external.po +++ b/l10n/ta_LK/files_external.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-16 02:03+0200\n" -"PO-Revision-Date: 2012-08-12 22:34+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"PO-Revision-Date: 2012-11-25 17:04+0000\n" +"Last-Translator: suganthi \n" "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,88 +20,88 @@ msgstr "" #: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23 msgid "Access granted" -msgstr "" +msgstr "அனுமதி வழங்கப்பட்டது" #: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86 msgid "Error configuring Dropbox storage" -msgstr "" +msgstr "Dropbox சேமிப்பை தகவமைப்பதில் வழு" #: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40 msgid "Grant access" -msgstr "" +msgstr "அனுமதியை வழங்கல்" #: js/dropbox.js:73 js/google.js:72 msgid "Fill out all required fields" -msgstr "" +msgstr "தேவையான எல்லா புலங்களையும் நிரப்புக" #: js/dropbox.js:85 msgid "Please provide a valid Dropbox app key and secret." -msgstr "" +msgstr "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. " #: js/google.js:26 js/google.js:73 js/google.js:78 msgid "Error configuring Google Drive storage" -msgstr "" +msgstr "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு" #: templates/settings.php:3 msgid "External Storage" -msgstr "" +msgstr "வெளி சேமிப்பு" #: templates/settings.php:7 templates/settings.php:19 msgid "Mount point" -msgstr "" +msgstr "ஏற்றப்புள்ளி" #: templates/settings.php:8 msgid "Backend" -msgstr "" +msgstr "பின்நிலை" #: templates/settings.php:9 msgid "Configuration" -msgstr "" +msgstr "தகவமைப்பு" #: templates/settings.php:10 msgid "Options" -msgstr "" +msgstr "தெரிவுகள்" #: templates/settings.php:11 msgid "Applicable" -msgstr "" +msgstr "பயன்படத்தக்க" #: templates/settings.php:23 msgid "Add mount point" -msgstr "" +msgstr "ஏற்றப்புள்ளியை சேர்க்க" #: templates/settings.php:54 templates/settings.php:62 msgid "None set" -msgstr "" +msgstr "தொகுப்பில்லா" #: templates/settings.php:63 msgid "All Users" -msgstr "" +msgstr "பயனாளர்கள் எல்லாம்" #: templates/settings.php:64 msgid "Groups" -msgstr "" +msgstr "குழுக்கள்" #: templates/settings.php:69 msgid "Users" -msgstr "" +msgstr "பயனாளர்" #: templates/settings.php:77 templates/settings.php:107 msgid "Delete" -msgstr "" +msgstr "நீக்குக" #: templates/settings.php:87 msgid "Enable User External Storage" -msgstr "" +msgstr "பயனாளர் வெளி சேமிப்பை இயலுமைப்படுத்துக" #: templates/settings.php:88 msgid "Allow users to mount their own external storage" -msgstr "" +msgstr "பயனாளர் அவர்களுடைய சொந்த வெளியக சேமிப்பை ஏற்ற அனுமதிக்க" #: templates/settings.php:99 msgid "SSL root certificates" -msgstr "" +msgstr "SSL வேர் சான்றிதழ்கள்" #: templates/settings.php:113 msgid "Import Root Certificate" -msgstr "" +msgstr "வேர் சான்றிதழை இறக்குமதி செய்க" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index c3e74226aa..b09dccc2a7 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-25 00:02+0100\n" +"POT-Creation-Date: 2012-11-26 00:01+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 3b81dada19..423f7f4273 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-25 00:02+0100\n" +"POT-Creation-Date: 2012-11-26 00:01+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 7444a9eda7..55cd072fc3 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-25 00:02+0100\n" +"POT-Creation-Date: 2012-11-26 00:01+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 1f436bcd76..a08e7852bc 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-25 00:02+0100\n" +"POT-Creation-Date: 2012-11-26 00:01+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 82e901ba5a..f1a671c7ee 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-25 00:02+0100\n" +"POT-Creation-Date: 2012-11-26 00:01+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 519effc51a..e2a5cec27b 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-25 00:02+0100\n" +"POT-Creation-Date: 2012-11-26 00:01+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 61386b6b7a..66bfa23b0c 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-25 00:02+0100\n" +"POT-Creation-Date: 2012-11-26 00:01+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 2ed7cfd45c..20ea64dcbe 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-25 00:02+0100\n" +"POT-Creation-Date: 2012-11-26 00:01+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 892bdd0802..40a4786ac1 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-25 00:02+0100\n" +"POT-Creation-Date: 2012-11-26 00:01+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 cd37e3c189..3740c1853c 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-25 00:02+0100\n" +"POT-Creation-Date: 2012-11-26 00:01+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/fr.php b/lib/l10n/fr.php index ad5a034f5b..218c22c1d5 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -18,13 +18,17 @@ "seconds ago" => "à l'instant", "1 minute ago" => "il y a 1 minute", "%d minutes ago" => "il y a %d minutes", +"1 hour ago" => "Il y a une heure", +"%d hours ago" => "Il y a %d heures", "today" => "aujourd'hui", "yesterday" => "hier", "%d days ago" => "il y a %d jours", "last month" => "le mois dernier", +"%d months ago" => "Il y a %d mois", "last year" => "l'année dernière", "years ago" => "il y a plusieurs années", "%s is available. Get more information" => "%s est disponible. Obtenez plus d'informations", "up to date" => "À jour", -"updates check is disabled" => "la vérification des mises à jour est désactivée" +"updates check is disabled" => "la vérification des mises à jour est désactivée", +"Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\"" ); diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php index bfef1a0447..d6c87e0928 100644 --- a/settings/l10n/eu.php +++ b/settings/l10n/eu.php @@ -18,6 +18,7 @@ "Saving..." => "Gordetzen...", "__language_name__" => "Euskera", "Add your App" => "Gehitu zure aplikazioa", +"More Apps" => "App gehiago", "Select an App" => "Aukeratu programa bat", "See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en", "-licensed by " => "-lizentziatua ", @@ -27,6 +28,7 @@ "Problems connecting to help database." => "Arazoak daude laguntza datubasera konektatzeko.", "Go there manually." => "Joan hara eskuz.", "Answer" => "Erantzun", +"You have used %s of the available %s" => "Dagoeneko %s erabili duzu eskuragarri duzun %setatik", "Desktop and Mobile Syncing Clients" => "Mahaigain eta mugikorren sinkronizazio bezeroak", "Download" => "Deskargatu", "Your password was changed" => "Zere pasahitza aldatu da", From fdc7a8b2043daeb74f9dc4d7221e13760787c1c0 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 15 Nov 2012 18:25:31 +0100 Subject: [PATCH 08/26] make sure path starts with / --- apps/files/ajax/newfile.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index b87079f271..411654af60 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -65,6 +65,9 @@ if($source) { $target=$dir.'/'.$filename; $result=OC_Filesystem::file_put_contents($target, $sourceStream); if($result) { + if($target[0] != '/') { + $target = '/'.$target; + } $meta = OC_FileCache::get($target); $mime=$meta['mimetype']; $id = OC_FileCache::getId($target); From 776be8d9f78e7c10099f068415f153fa69014166 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 15 Nov 2012 18:26:08 +0100 Subject: [PATCH 09/26] all but the first parameter are introduced by & --- apps/files/js/files.js | 2 +- core/js/eventsource.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 28d4b49670..dbd9a64715 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -864,7 +864,7 @@ function getMimeIcon(mime, ready){ if(getMimeIcon.cache[mime]){ ready(getMimeIcon.cache[mime]); }else{ - $.get( OC.filePath('files','ajax','mimeicon.php')+'?mime='+mime, function(path){ + $.get( OC.filePath('files','ajax','mimeicon.php')+'&mime='+mime, function(path){ getMimeIcon.cache[mime]=path; ready(getMimeIcon.cache[mime]); }); diff --git a/core/js/eventsource.js b/core/js/eventsource.js index e3ad7e3a67..7a744f7a6c 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -42,7 +42,7 @@ OC.EventSource=function(src,data){ } dataStr+='requesttoken='+OC.EventSource.requesttoken; if(!this.useFallBack && typeof EventSource !='undefined'){ - this.source=new EventSource(src+'?'+dataStr); + this.source=new EventSource(src+'&'+dataStr); this.source.onmessage=function(e){ for(var i=0;i'); this.iframe.attr('id',iframeId); this.iframe.hide(); - this.iframe.attr('src',src+'?fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); + this.iframe.attr('src',src+'&fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); $('body').append(this.iframe); this.useFallBack=true; OC.EventSource.iframeCount++ @@ -90,7 +90,7 @@ OC.EventSource.prototype={ lastLength:0,//for fallback listen:function(type,callback){ if(callback && callback.call){ - + if(type){ if(this.useFallBack){ if(!this.listeners[type]){ From 4764876192bae91eaba86f3e0ca9f4c7ea8d20be Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 16 Nov 2012 20:28:03 +0100 Subject: [PATCH 10/26] check whether to join url with ? or & --- core/js/eventsource.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 7a744f7a6c..2bd080fba7 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -42,7 +42,13 @@ OC.EventSource=function(src,data){ } dataStr+='requesttoken='+OC.EventSource.requesttoken; if(!this.useFallBack && typeof EventSource !='undefined'){ - this.source=new EventSource(src+'&'+dataStr); + var joinChar = '&'; + if(src.indexOf('?') == -1) { + joinChar = '?'; + } + alert(src.indexOf('?')); + alert(joinChar); + this.source=new EventSource(src+joinChar+dataStr); this.source.onmessage=function(e){ for(var i=0;i'); this.iframe.attr('id',iframeId); this.iframe.hide(); - this.iframe.attr('src',src+'&fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); + + var joinChar = '&'; + if(src.indexOf('?') == -1) { + joinChar = '?'; + } + alert(src.indexOf('?')); this.iframe.attr('src',src+joinChar+'fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); $('body').append(this.iframe); this.useFallBack=true; OC.EventSource.iframeCount++ From e5ad774ab0058ef22396990771138b249355156e Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 16 Nov 2012 20:28:58 +0100 Subject: [PATCH 11/26] coding style --- core/js/eventsource.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 2bd080fba7..844c327e12 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -65,7 +65,8 @@ OC.EventSource=function(src,data){ if(src.indexOf('?') == -1) { joinChar = '?'; } - alert(src.indexOf('?')); this.iframe.attr('src',src+joinChar+'fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); + alert(src.indexOf('?')); + this.iframe.attr('src',src+joinChar+'fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); $('body').append(this.iframe); this.useFallBack=true; OC.EventSource.iframeCount++ From 4c707d1b1f970556e24107f28750ad8b4069c7e4 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 23 Nov 2012 12:18:38 +0100 Subject: [PATCH 12/26] remove debug output --- core/js/eventsource.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 844c327e12..0c2a995f33 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -46,8 +46,6 @@ OC.EventSource=function(src,data){ if(src.indexOf('?') == -1) { joinChar = '?'; } - alert(src.indexOf('?')); - alert(joinChar); this.source=new EventSource(src+joinChar+dataStr); this.source.onmessage=function(e){ for(var i=0;i Date: Mon, 26 Nov 2012 14:13:23 +0100 Subject: [PATCH 13/26] use normalizePath to have a proper target path --- apps/files/ajax/newfile.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index 411654af60..2bac9bb20b 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -65,9 +65,7 @@ if($source) { $target=$dir.'/'.$filename; $result=OC_Filesystem::file_put_contents($target, $sourceStream); if($result) { - if($target[0] != '/') { - $target = '/'.$target; - } + $target = OC_Filesystem::normalizePath($target); $meta = OC_FileCache::get($target); $mime=$meta['mimetype']; $id = OC_FileCache::getId($target); From d251f04b98c3be9ecb6435af15628f0ccf09cfe3 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 27 Nov 2012 00:10:47 +0100 Subject: [PATCH 14/26] [tx-robot] updated from transifex --- apps/files/l10n/fi_FI.php | 1 + apps/files/l10n/ja_JP.php | 2 + apps/files/l10n/ru.php | 1 + apps/files/l10n/ru_RU.php | 1 + apps/files/l10n/sv.php | 2 + apps/files/l10n/uk.php | 5 + apps/files/l10n/vi.php | 2 + apps/files_external/l10n/uk.php | 1 + apps/user_webdavauth/l10n/zh_TW.php | 3 + core/l10n/eu.php | 21 ++ core/l10n/uk.php | 68 +++- l10n/eu/core.po | 56 +-- l10n/eu/lib.po | 24 +- l10n/fi_FI/files.po | 8 +- l10n/ja_JP/files.po | 10 +- l10n/ru/files.po | 9 +- l10n/ru_RU/files.po | 8 +- l10n/sq/core.po | 539 ++++++++++++++++++++++++++++ l10n/sq/files.po | 269 ++++++++++++++ l10n/sq/files_encryption.po | 34 ++ l10n/sq/files_external.po | 106 ++++++ l10n/sq/files_sharing.po | 48 +++ l10n/sq/files_versions.po | 42 +++ l10n/sq/lib.po | 152 ++++++++ l10n/sq/settings.po | 243 +++++++++++++ l10n/sq/user_ldap.po | 170 +++++++++ l10n/sq/user_webdavauth.po | 22 ++ l10n/sv/files.po | 10 +- l10n/templates/core.pot | 12 +- 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_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/uk/core.po | 219 +++++------ l10n/uk/files.po | 16 +- l10n/uk/files_external.po | 6 +- l10n/uk/lib.po | 31 +- l10n/uk/settings.po | 6 +- l10n/vi/files.po | 11 +- l10n/zh_TW/lib.po | 25 +- l10n/zh_TW/user_webdavauth.po | 9 +- lib/l10n/eu.php | 7 +- lib/l10n/uk.php | 10 +- lib/l10n/zh_TW.php | 7 +- settings/l10n/uk.php | 1 + 50 files changed, 1995 insertions(+), 240 deletions(-) create mode 100644 apps/user_webdavauth/l10n/zh_TW.php create mode 100644 l10n/sq/core.po create mode 100644 l10n/sq/files.po create mode 100644 l10n/sq/files_encryption.po create mode 100644 l10n/sq/files_external.po create mode 100644 l10n/sq/files_sharing.po create mode 100644 l10n/sq/files_versions.po create mode 100644 l10n/sq/lib.po create mode 100644 l10n/sq/settings.po create mode 100644 l10n/sq/user_ldap.po create mode 100644 l10n/sq/user_webdavauth.po diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php index 781cfaca3c..cbc0fe45ff 100644 --- a/apps/files/l10n/fi_FI.php +++ b/apps/files/l10n/fi_FI.php @@ -15,6 +15,7 @@ "suggest name" => "ehdota nimeä", "cancel" => "peru", "undo" => "kumoa", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.", "generating ZIP-file, it may take some time." => "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken.", "Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio", "Upload Error" => "Lähetysvirhe.", diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 50df005091..9c0c202d73 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換", "unshared {files}" => "未共有 {files}", "deleted {files}" => "削除 {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。", "generating ZIP-file, it may take some time." => "ZIPファイルを生成中です、しばらくお待ちください。", "Unable to upload your file as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのファイルはアップロードできません", "Upload Error" => "アップロードエラー", @@ -28,6 +29,7 @@ "{count} files uploading" => "{count} ファイルをアップロード中", "Upload cancelled." => "アップロードはキャンセルされました。", "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "無効なフォルダ名です。\"Shared\" の利用は ownCloud が予約済みです。", "{count} files scanned" => "{count} ファイルをスキャン", "error while scanning" => "スキャン中のエラー", "Name" => "名前", diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index 6961c538b4..3413fa691b 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}", "unshared {files}" => "не опубликованные {files}", "deleted {files}" => "удаленные {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.", "generating ZIP-file, it may take some time." => "создание ZIP-файла, это может занять некоторое время.", "Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог", "Upload Error" => "Ошибка загрузки", diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php index 59021ea99a..018dfa8f7a 100644 --- a/apps/files/l10n/ru_RU.php +++ b/apps/files/l10n/ru_RU.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "заменено {новое_имя} с {старое_имя}", "unshared {files}" => "Cовместное использование прекращено {файлы}", "deleted {files}" => "удалено {файлы}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы.", "generating ZIP-file, it may take some time." => "Создание ZIP-файла, это может занять некоторое время.", "Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией", "Upload Error" => "Ошибка загрузки", diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php index dbac36b9a9..4b5cbe9ed4 100644 --- a/apps/files/l10n/sv.php +++ b/apps/files/l10n/sv.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}", "unshared {files}" => "stoppad delning {files}", "deleted {files}" => "raderade {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.", "generating ZIP-file, it may take some time." => "genererar ZIP-fil, det kan ta lite tid.", "Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.", "Upload Error" => "Uppladdningsfel", @@ -28,6 +29,7 @@ "{count} files uploading" => "{count} filer laddas upp", "Upload cancelled." => "Uppladdning avbruten.", "File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ogiltigt mappnamn. Ordet \"Delad\" är reserverat av ownCloud.", "{count} files scanned" => "{count} filer skannade", "error while scanning" => "fel vid skanning", "Name" => "Namn", diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index ac826d27cb..4eb130736c 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -17,7 +17,9 @@ "replaced {new_name}" => "замінено {new_name}", "undo" => "відмінити", "replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}", +"unshared {files}" => "неопубліковано {files}", "deleted {files}" => "видалено {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.", "generating ZIP-file, it may take some time." => "Створення ZIP-файлу, це може зайняти певний час.", "Unable to upload your file as it is a directory or has 0 bytes" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт", "Upload Error" => "Помилка завантаження", @@ -27,6 +29,7 @@ "{count} files uploading" => "{count} файлів завантажується", "Upload cancelled." => "Завантаження перервано.", "File upload is in progress. Leaving the page now will cancel the upload." => "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Невірне ім'я каталогу. Використання \"Shared\" зарезервовано Owncloud", "{count} files scanned" => "{count} файлів проскановано", "error while scanning" => "помилка при скануванні", "Name" => "Ім'я", @@ -36,8 +39,10 @@ "{count} folders" => "{count} папок", "1 file" => "1 файл", "{count} files" => "{count} файлів", +"File handling" => "Робота з файлами", "Maximum upload size" => "Максимальний розмір відвантажень", "max. possible: " => "макс.можливе:", +"Needed for multi-file and folder downloads." => "Необхідно для мульти-файлового та каталогового завантаження.", "Enable ZIP-download" => "Активувати ZIP-завантаження", "0 is unlimited" => "0 є безліміт", "Maximum input size for ZIP files" => "Максимальний розмір завантажуємого ZIP файлу", diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php index 9140a24f2f..047caae39f 100644 --- a/apps/files/l10n/vi.php +++ b/apps/files/l10n/vi.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "đã thay thế {new_name} bằng {old_name}", "unshared {files}" => "hủy chia sẽ {files}", "deleted {files}" => "đã xóa {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.", "generating ZIP-file, it may take some time." => "Tạo tập tin ZIP, điều này có thể làm mất một chút thời gian", "Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte", "Upload Error" => "Tải lên lỗi", @@ -28,6 +29,7 @@ "{count} files uploading" => "{count} tập tin đang tải lên", "Upload cancelled." => "Hủy tải lên", "File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Tên thư mục không hợp lệ. Sử dụng \"Chia sẻ\" được dành riêng bởi Owncloud", "{count} files scanned" => "{count} tập tin đã được quét", "error while scanning" => "lỗi trong khi quét", "Name" => "Tên", diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php index ea8f2b2665..478342380e 100644 --- a/apps/files_external/l10n/uk.php +++ b/apps/files_external/l10n/uk.php @@ -10,6 +10,7 @@ "Backend" => "Backend", "Configuration" => "Налаштування", "Options" => "Опції", +"Applicable" => "Придатний", "Add mount point" => "Додати точку монтування", "None set" => "Не встановлено", "All Users" => "Усі користувачі", diff --git a/apps/user_webdavauth/l10n/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php new file mode 100644 index 0000000000..79740561e5 --- /dev/null +++ b/apps/user_webdavauth/l10n/zh_TW.php @@ -0,0 +1,3 @@ + "WebDAV 網址 http://" +); diff --git a/core/l10n/eu.php b/core/l10n/eu.php index 8bc5d690d5..0dbf3d4169 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -4,13 +4,20 @@ "This category already exists: " => "Kategoria hau dagoeneko existitzen da:", "Object type not provided." => "Objetu mota ez da zehaztu.", "%s ID not provided." => "%s ID mota ez da zehaztu.", +"Error adding %s to favorites." => "Errorea gertatu da %s gogokoetara gehitzean.", "No categories selected for deletion." => "Ez da ezabatzeko kategoriarik hautatu.", +"Error removing %s from favorites." => "Errorea gertatu da %s gogokoetatik ezabatzean.", "Settings" => "Ezarpenak", "seconds ago" => "segundu", "1 minute ago" => "orain dela minutu 1", +"{minutes} minutes ago" => "orain dela {minutes} minutu", +"1 hour ago" => "orain dela ordu bat", +"{hours} hours ago" => "orain dela {hours} ordu", "today" => "gaur", "yesterday" => "atzo", +"{days} days ago" => "orain dela {days} egun", "last month" => "joan den hilabetean", +"{months} months ago" => "orain dela {months} hilabete", "months ago" => "hilabete", "last year" => "joan den urtean", "years ago" => "urte", @@ -19,10 +26,15 @@ "No" => "Ez", "Yes" => "Bai", "Ok" => "Ados", +"The object type is not specified." => "Objetu mota ez dago zehaztuta.", "Error" => "Errorea", +"The app name is not specified." => "App izena ez dago zehaztuta.", +"The required file {file} is not installed!" => "Beharrezkoa den {file} fitxategia ez dago instalatuta!", "Error while sharing" => "Errore bat egon da elkarbanatzean", "Error while unsharing" => "Errore bat egon da elkarbanaketa desegitean", "Error while changing permissions" => "Errore bat egon da baimenak aldatzean", +"Shared with you and the group {group} by {owner}" => "{owner}-k zu eta {group} taldearekin partekatuta", +"Shared with you by {owner}" => "{owner}-k zurekin partekatuta", "Share with" => "Elkarbanatu honekin", "Share with link" => "Elkarbanatu lotura batekin", "Password protect" => "Babestu pasahitzarekin", @@ -32,6 +44,7 @@ "Share via email:" => "Elkarbanatu eposta bidez:", "No people found" => "Ez da inor aurkitu", "Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua", +"Shared in {item} with {user}" => "{user}ekin {item}-n partekatuta", "Unshare" => "Ez elkarbanatu", "can edit" => "editatu dezake", "access control" => "sarrera kontrola", @@ -45,6 +58,8 @@ "ownCloud password reset" => "ownCloud-en pasahitza berrezarri", "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}", "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.", +"Reset email send." => "Berrezartzeko eposta bidali da.", +"Request failed!" => "Eskariak huts egin du!", "Username" => "Erabiltzaile izena", "Request reset" => "Eskaera berrezarri da", "Your password was reset" => "Zure pasahitza berrezarri da", @@ -61,6 +76,8 @@ "Edit categories" => "Editatu kategoriak", "Add" => "Gehitu", "Security Warning" => "Segurtasun abisua", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ez dago hausazko zenbaki sortzaile segururik eskuragarri, mesedez gatiu PHP OpenSSL extensioa.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Hausazko zenbaki sortzaile segururik gabe erasotzaile batek pasahitza berrezartzeko kodeak iragarri ditzake eta zure kontuaz jabetu.", "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." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.", "Create an admin account" => "Sortu kudeatzaile kontu bat", "Advanced" => "Aurreratua", @@ -94,6 +111,9 @@ "December" => "Abendua", "web services under your control" => "web zerbitzuak zure kontrolpean", "Log out" => "Saioa bukatu", +"Automatic logon rejected!" => "Saio hasiera automatikoa ez onartuta!", +"If you did not change your password recently, your account may be compromised!" => "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!", +"Please change your password to secure your account again." => "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko.", "Lost your password?" => "Galdu duzu pasahitza?", "remember" => "gogoratu", "Log in" => "Hasi saioa", @@ -101,5 +121,6 @@ "prev" => "aurrekoa", "next" => "hurrengoa", "Security Warning!" => "Segurtasun abisua", +"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Mesedez egiaztatu zure pasahitza.
Segurtasun arrazoiengatik noizbehinka zure pasahitza berriz sartzea eska diezazukegu.", "Verify" => "Egiaztatu" ); diff --git a/core/l10n/uk.php b/core/l10n/uk.php index fd5b7be8dc..904ab03bf8 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -1,22 +1,67 @@ "Не вказано тип категорії.", +"No category to add?" => "Відсутні категорії для додавання?", +"This category already exists: " => "Ця категорія вже існує: ", +"Object type not provided." => "Не вказано тип об'єкту.", +"%s ID not provided." => "%s ID не вказано.", +"Error adding %s to favorites." => "Помилка при додаванні %s до обраного.", +"No categories selected for deletion." => "Жодної категорії не обрано для видалення.", +"Error removing %s from favorites." => "Помилка при видалені %s із обраного.", "Settings" => "Налаштування", "seconds ago" => "секунди тому", "1 minute ago" => "1 хвилину тому", +"{minutes} minutes ago" => "{minutes} хвилин тому", +"1 hour ago" => "1 годину тому", +"{hours} hours ago" => "{hours} години тому", "today" => "сьогодні", "yesterday" => "вчора", +"{days} days ago" => "{days} днів тому", "last month" => "минулого місяця", +"{months} months ago" => "{months} місяців тому", "months ago" => "місяці тому", "last year" => "минулого року", "years ago" => "роки тому", +"Choose" => "Обрати", "Cancel" => "Відмінити", "No" => "Ні", "Yes" => "Так", +"Ok" => "Ok", +"The object type is not specified." => "Не визначено тип об'єкту.", "Error" => "Помилка", +"The app name is not specified." => "Не визначено ім'я програми.", +"The required file {file} is not installed!" => "Необхідний файл {file} не встановлено!", +"Error while sharing" => "Помилка під час публікації", +"Error while unsharing" => "Помилка під час відміни публікації", +"Error while changing permissions" => "Помилка при зміні повноважень", +"Shared with you and the group {group} by {owner}" => " {owner} опублікував для Вас та для групи {group}", +"Shared with you by {owner}" => "{owner} опублікував для Вас", +"Share with" => "Опублікувати для", +"Share with link" => "Опублікувати через посилання", +"Password protect" => "Захистити паролем", "Password" => "Пароль", +"Set expiration date" => "Встановити термін дії", +"Expiration date" => "Термін дії", +"Share via email:" => "Опублікувати через електронну пошту:", +"No people found" => "Жодної людини не знайдено", +"Resharing is not allowed" => "Пере-публікація не дозволяється", +"Shared in {item} with {user}" => "Опубліковано {item} для {user}", "Unshare" => "Заборонити доступ", +"can edit" => "може редагувати", +"access control" => "контроль доступу", "create" => "створити", +"update" => "оновити", +"delete" => "видалити", +"share" => "опублікувати", +"Password protected" => "Захищено паролем", +"Error unsetting expiration date" => "Помилка при відміні терміна дії", +"Error setting expiration date" => "Помилка при встановленні терміна дії", +"ownCloud password reset" => "скидання пароля ownCloud", +"Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}", "You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на e-mail.", +"Reset email send." => "Лист скидання відправлено.", +"Request failed!" => "Невдалий запит!", "Username" => "Ім'я користувача", +"Request reset" => "Запит скидання", "Your password was reset" => "Ваш пароль був скинутий", "To login page" => "До сторінки входу", "New password" => "Новий пароль", @@ -26,12 +71,24 @@ "Apps" => "Додатки", "Admin" => "Адміністратор", "Help" => "Допомога", +"Access forbidden" => "Доступ заборонено", +"Cloud not found" => "Cloud не знайдено", +"Edit categories" => "Редагувати категорії", "Add" => "Додати", +"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 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." => "Ваш каталог з даними та Ваші файли можливо доступні з Інтернету. Файл .htaccess, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.", +"Create an admin account" => "Створити обліковий запис адміністратора", +"Advanced" => "Додатково", +"Data folder" => "Каталог даних", "Configure the database" => "Налаштування бази даних", "will be used" => "буде використано", "Database user" => "Користувач бази даних", "Database password" => "Пароль для бази даних", "Database name" => "Назва бази даних", +"Database tablespace" => "Таблиця бази даних", +"Database host" => "Хост бази даних", "Finish setup" => "Завершити налаштування", "Sunday" => "Неділя", "Monday" => "Понеділок", @@ -54,7 +111,16 @@ "December" => "Грудень", "web services under your control" => "веб-сервіс під вашим контролем", "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" => "Вхід" +"Log in" => "Вхід", +"You are logged out." => "Ви вийшли з системи.", +"prev" => "попередній", +"next" => "наступний", +"Security Warning!" => "Попередження про небезпеку!", +"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Будь ласка, повторно введіть свій пароль.
З питань безпеки, Вам інколи доведеться повторно вводити свій пароль.", +"Verify" => "Підтвердити" ); diff --git a/l10n/eu/core.po b/l10n/eu/core.po index 1c55b9ec27..0aa8ffd8d1 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/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: 2012-11-26 00:01+0100\n" -"PO-Revision-Date: 2012-11-25 23:01+0000\n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2012-11-25 23:09+0000\n" "Last-Translator: asieriko \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ msgstr "%s ID mota ez da zehaztu." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "Errorea gertatu da %s gogokoetara gehitzean." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." @@ -55,7 +55,7 @@ msgstr "Ez da ezabatzeko kategoriarik hautatu." #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "Errorea gertatu da %s gogokoetatik ezabatzean." #: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 msgid "Settings" @@ -71,15 +71,15 @@ msgstr "orain dela minutu 1" #: js/js.js:706 msgid "{minutes} minutes ago" -msgstr "" +msgstr "orain dela {minutes} minutu" #: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "orain dela ordu bat" #: js/js.js:708 msgid "{hours} hours ago" -msgstr "" +msgstr "orain dela {hours} ordu" #: js/js.js:709 msgid "today" @@ -91,7 +91,7 @@ msgstr "atzo" #: js/js.js:711 msgid "{days} days ago" -msgstr "" +msgstr "orain dela {days} egun" #: js/js.js:712 msgid "last month" @@ -99,7 +99,7 @@ msgstr "joan den hilabetean" #: js/js.js:713 msgid "{months} months ago" -msgstr "" +msgstr "orain dela {months} hilabete" #: js/js.js:714 msgid "months ago" @@ -136,21 +136,21 @@ msgstr "Ados" #: 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 msgid "The object type is not specified." -msgstr "" +msgstr "Objetu mota ez dago zehaztuta." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527 -#: js/share.js:539 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533 +#: js/share.js:545 msgid "Error" msgstr "Errorea" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "" +msgstr "App izena ez dago zehaztuta." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "" +msgstr "Beharrezkoa den {file} fitxategia ez dago instalatuta!" #: js/share.js:124 msgid "Error while sharing" @@ -166,11 +166,11 @@ msgstr "Errore bat egon da baimenak aldatzean" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "{owner}-k zu eta {group} taldearekin partekatuta" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "{owner}-k zurekin partekatuta" #: js/share.js:158 msgid "Share with" @@ -211,7 +211,7 @@ msgstr "Berriz elkarbanatzea ez dago baimendua" #: js/share.js:271 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "{user}ekin {item}-n partekatuta" #: js/share.js:292 msgid "Unshare" @@ -241,15 +241,15 @@ msgstr "ezabatu" msgid "share" msgstr "elkarbanatu" -#: js/share.js:343 js/share.js:514 js/share.js:516 +#: js/share.js:349 js/share.js:520 js/share.js:522 msgid "Password protected" msgstr "Pasahitzarekin babestuta" -#: js/share.js:527 +#: js/share.js:533 msgid "Error unsetting expiration date" msgstr "Errorea izan da muga data kentzean" -#: js/share.js:539 +#: js/share.js:545 msgid "Error setting expiration date" msgstr "Errore bat egon da muga data ezartzean" @@ -267,11 +267,11 @@ msgstr "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez." #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "Berrezartzeko eposta bidali da." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "Eskariak huts egin du!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 #: templates/login.php:20 @@ -342,13 +342,13 @@ msgstr "Segurtasun abisua" msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "" +msgstr "Ez dago hausazko zenbaki sortzaile segururik eskuragarri, mesedez gatiu PHP OpenSSL extensioa." #: 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 "" +msgstr "Hausazko zenbaki sortzaile segururik gabe erasotzaile batek pasahitza berrezartzeko kodeak iragarri ditzake eta zure kontuaz jabetu." #: templates/installation.php:32 msgid "" @@ -490,17 +490,17 @@ msgstr "Saioa bukatu" #: templates/login.php:8 msgid "Automatic logon rejected!" -msgstr "" +msgstr "Saio hasiera automatikoa ez onartuta!" #: templates/login.php:9 msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!" #: templates/login.php:10 msgid "Please change your password to secure your account again." -msgstr "" +msgstr "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko." #: templates/login.php:15 msgid "Lost your password?" @@ -534,7 +534,7 @@ msgstr "Segurtasun abisua" msgid "" "Please verify your password.
For security reasons you may be " "occasionally asked to enter your password again." -msgstr "" +msgstr "Mesedez egiaztatu zure pasahitza.
Segurtasun arrazoiengatik noizbehinka zure pasahitza berriz sartzea eska diezazukegu." #: templates/verify.php:16 msgid "Verify" diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po index d5e5423a86..9442caf83a 100644 --- a/l10n/eu/lib.po +++ b/l10n/eu/lib.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2012-11-25 23:10+0000\n" +"Last-Translator: asieriko \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,19 +42,19 @@ msgstr "Aplikazioak" msgid "Admin" msgstr "Admin" -#: files.php:332 +#: files.php:361 msgid "ZIP download is turned off." msgstr "ZIP deskarga ez dago gaituta." -#: files.php:333 +#: files.php:362 msgid "Files need to be downloaded one by one." msgstr "Fitxategiak banan-banan deskargatu behar dira." -#: files.php:333 files.php:358 +#: files.php:362 files.php:387 msgid "Back to Files" msgstr "Itzuli fitxategietara" -#: files.php:357 +#: files.php:386 msgid "Selected files too large to generate zip file." msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko." @@ -80,7 +80,7 @@ msgstr "Testua" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "Irudiak" #: template.php:103 msgid "seconds ago" @@ -97,12 +97,12 @@ msgstr "orain dela %d minutu" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "orain dela ordu bat" #: template.php:107 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "orain dela %d ordu" #: template.php:108 msgid "today" @@ -124,7 +124,7 @@ msgstr "joan den hilabetea" #: template.php:112 #, php-format msgid "%d months ago" -msgstr "" +msgstr "orain dela %d hilabete" #: template.php:113 msgid "last year" @@ -150,4 +150,4 @@ msgstr "eguneraketen egiaztapena ez dago gaituta" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "Ezin da \"%s\" kategoria aurkitu" diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index 697ee9b096..1072d44d60 100644 --- a/l10n/fi_FI/files.po +++ b/l10n/fi_FI/files.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"PO-Revision-Date: 2012-11-26 19:12+0000\n" +"Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -108,7 +108,7 @@ msgstr "" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index a1f5fe2d2b..3309dc415c 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"PO-Revision-Date: 2012-11-26 01:15+0000\n" +"Last-Translator: Daisuke Deguchi \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -106,7 +106,7 @@ msgstr "削除 {files}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。" #: js/files.js:183 msgid "generating ZIP-file, it may take some time." @@ -147,7 +147,7 @@ msgstr "ファイル転送を実行中です。今このページから移動す #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "無効なフォルダ名です。\"Shared\" の利用は ownCloud が予約済みです。" #: js/files.js:704 msgid "{count} files scanned" diff --git a/l10n/ru/files.po b/l10n/ru/files.po index 880fc8a162..bb7209b951 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.po @@ -6,6 +6,7 @@ # Denis , 2012. # , 2012. # , 2012. +# , 2012. # Nick Remeslennikov , 2012. # , 2012. # , 2011. @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"PO-Revision-Date: 2012-11-26 16:49+0000\n" +"Last-Translator: mPolr \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -111,7 +112,7 @@ msgstr "удаленные {files}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po index 22c0f16561..a2b13fb41d 100644 --- a/l10n/ru_RU/files.po +++ b/l10n/ru_RU/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"PO-Revision-Date: 2012-11-26 06:47+0000\n" +"Last-Translator: AnnaSch \n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,7 +105,7 @@ msgstr "удалено {файлы}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." diff --git a/l10n/sq/core.po b/l10n/sq/core.po new file mode 100644 index 0000000000..57c778722b --- /dev/null +++ b/l10n/sq/core.po @@ -0,0 +1,539 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2011-07-25 16:05+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 +msgid "Category type not provided." +msgstr "" + +#: ajax/vcategories/add.php:30 +msgid "No category to add?" +msgstr "" + +#: ajax/vcategories/add.php:37 +msgid "This category already exists: " +msgstr "" + +#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 +#: ajax/vcategories/favorites.php:24 +#: ajax/vcategories/removeFromFavorites.php:26 +msgid "Object type not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:30 +#: ajax/vcategories/removeFromFavorites.php:30 +#, php-format +msgid "%s ID not provided." +msgstr "" + +#: ajax/vcategories/addToFavorites.php:35 +#, php-format +msgid "Error adding %s to favorites." +msgstr "" + +#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 +msgid "No categories selected for deletion." +msgstr "" + +#: ajax/vcategories/removeFromFavorites.php:35 +#, php-format +msgid "Error removing %s from favorites." +msgstr "" + +#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 +msgid "Settings" +msgstr "" + +#: js/js.js:704 +msgid "seconds ago" +msgstr "" + +#: js/js.js:705 +msgid "1 minute ago" +msgstr "" + +#: js/js.js:706 +msgid "{minutes} minutes ago" +msgstr "" + +#: js/js.js:707 +msgid "1 hour ago" +msgstr "" + +#: js/js.js:708 +msgid "{hours} hours ago" +msgstr "" + +#: js/js.js:709 +msgid "today" +msgstr "" + +#: js/js.js:710 +msgid "yesterday" +msgstr "" + +#: js/js.js:711 +msgid "{days} days ago" +msgstr "" + +#: js/js.js:712 +msgid "last month" +msgstr "" + +#: js/js.js:713 +msgid "{months} months ago" +msgstr "" + +#: js/js.js:714 +msgid "months ago" +msgstr "" + +#: js/js.js:715 +msgid "last year" +msgstr "" + +#: js/js.js:716 +msgid "years ago" +msgstr "" + +#: js/oc-dialogs.js:126 +msgid "Choose" +msgstr "" + +#: js/oc-dialogs.js:146 js/oc-dialogs.js:166 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:162 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:163 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:180 +msgid "Ok" +msgstr "" + +#: 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 +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:135 js/share.js:142 js/share.js:533 +#: js/share.js:545 +msgid "Error" +msgstr "" + +#: js/oc-vcategories.js:179 +msgid "The app name is not specified." +msgstr "" + +#: js/oc-vcategories.js:194 +msgid "The required file {file} is not installed!" +msgstr "" + +#: js/share.js:124 +msgid "Error while sharing" +msgstr "" + +#: js/share.js:135 +msgid "Error while unsharing" +msgstr "" + +#: js/share.js:142 +msgid "Error while changing permissions" +msgstr "" + +#: js/share.js:151 +msgid "Shared with you and the group {group} by {owner}" +msgstr "" + +#: js/share.js:153 +msgid "Shared with you by {owner}" +msgstr "" + +#: js/share.js:158 +msgid "Share with" +msgstr "" + +#: js/share.js:163 +msgid "Share with link" +msgstr "" + +#: js/share.js:164 +msgid "Password protect" +msgstr "" + +#: js/share.js:168 templates/installation.php:42 templates/login.php:24 +#: templates/verify.php:13 +msgid "Password" +msgstr "" + +#: js/share.js:173 +msgid "Set expiration date" +msgstr "" + +#: js/share.js:174 +msgid "Expiration date" +msgstr "" + +#: js/share.js:206 +msgid "Share via email:" +msgstr "" + +#: js/share.js:208 +msgid "No people found" +msgstr "" + +#: js/share.js:235 +msgid "Resharing is not allowed" +msgstr "" + +#: js/share.js:271 +msgid "Shared in {item} with {user}" +msgstr "" + +#: js/share.js:292 +msgid "Unshare" +msgstr "" + +#: js/share.js:304 +msgid "can edit" +msgstr "" + +#: js/share.js:306 +msgid "access control" +msgstr "" + +#: js/share.js:309 +msgid "create" +msgstr "" + +#: js/share.js:312 +msgid "update" +msgstr "" + +#: js/share.js:315 +msgid "delete" +msgstr "" + +#: js/share.js:318 +msgid "share" +msgstr "" + +#: js/share.js:349 js/share.js:520 js/share.js:522 +msgid "Password protected" +msgstr "" + +#: js/share.js:533 +msgid "Error unsetting expiration date" +msgstr "" + +#: js/share.js:545 +msgid "Error setting expiration date" +msgstr "" + +#: lostpassword/controller.php:47 +msgid "ownCloud password reset" +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:3 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:5 +msgid "Reset email send." +msgstr "" + +#: lostpassword/templates/lostpassword.php:8 +msgid "Request failed!" +msgstr "" + +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38 +#: templates/login.php:20 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:14 +msgid "Request reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:4 +msgid "Your password was reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:5 +msgid "To login page" +msgstr "" + +#: lostpassword/templates/resetpassword.php:8 +msgid "New password" +msgstr "" + +#: lostpassword/templates/resetpassword.php:11 +msgid "Reset password" +msgstr "" + +#: strings.php:5 +msgid "Personal" +msgstr "" + +#: strings.php:6 +msgid "Users" +msgstr "" + +#: strings.php:7 +msgid "Apps" +msgstr "" + +#: strings.php:8 +msgid "Admin" +msgstr "" + +#: strings.php:9 +msgid "Help" +msgstr "" + +#: templates/403.php:12 +msgid "Access forbidden" +msgstr "" + +#: templates/404.php:12 +msgid "Cloud not found" +msgstr "" + +#: templates/edit_categories_dialog.php:4 +msgid "Edit categories" +msgstr "" + +#: templates/edit_categories_dialog.php:16 +msgid "Add" +msgstr "" + +#: templates/installation.php:23 templates/installation.php:31 +msgid "Security Warning" +msgstr "" + +#: templates/installation.php:24 +msgid "" +"No secure random number generator is available, please enable the PHP " +"OpenSSL extension." +msgstr "" + +#: 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:32 +msgid "" +"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." +msgstr "" + +#: templates/installation.php:36 +msgid "Create an admin account" +msgstr "" + +#: templates/installation.php:48 +msgid "Advanced" +msgstr "" + +#: templates/installation.php:50 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:57 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:62 templates/installation.php:73 +#: templates/installation.php:83 templates/installation.php:93 +msgid "will be used" +msgstr "" + +#: templates/installation.php:105 +msgid "Database user" +msgstr "" + +#: templates/installation.php:109 +msgid "Database password" +msgstr "" + +#: templates/installation.php:113 +msgid "Database name" +msgstr "" + +#: templates/installation.php:121 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:127 +msgid "Database host" +msgstr "" + +#: templates/installation.php:132 +msgid "Finish setup" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Sunday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Monday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Tuesday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Wednesday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Thursday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Friday" +msgstr "" + +#: templates/layout.guest.php:16 templates/layout.user.php:17 +msgid "Saturday" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "January" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "February" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "March" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "April" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "May" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "June" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "July" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "August" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "September" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "October" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "November" +msgstr "" + +#: templates/layout.guest.php:17 templates/layout.user.php:18 +msgid "December" +msgstr "" + +#: templates/layout.guest.php:42 +msgid "web services under your control" +msgstr "" + +#: templates/layout.user.php:45 +msgid "Log out" +msgstr "" + +#: templates/login.php:8 +msgid "Automatic logon rejected!" +msgstr "" + +#: templates/login.php:9 +msgid "" +"If you did not change your password recently, your account may be " +"compromised!" +msgstr "" + +#: templates/login.php:10 +msgid "Please change your password to secure your account again." +msgstr "" + +#: templates/login.php:15 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:27 +msgid "remember" +msgstr "" + +#: templates/login.php:28 +msgid "Log in" +msgstr "" + +#: templates/logout.php:1 +msgid "You are logged out." +msgstr "" + +#: templates/part.pagenavi.php:3 +msgid "prev" +msgstr "" + +#: templates/part.pagenavi.php:20 +msgid "next" +msgstr "" + +#: templates/verify.php:5 +msgid "Security Warning!" +msgstr "" + +#: templates/verify.php:6 +msgid "" +"Please verify your password.
For security reasons you may be " +"occasionally asked to enter your password again." +msgstr "" + +#: templates/verify.php:16 +msgid "Verify" +msgstr "" diff --git a/l10n/sq/files.po b/l10n/sq/files.po new file mode 100644 index 0000000000..ef9e0bd116 --- /dev/null +++ b/l10n/sq/files.po @@ -0,0 +1,269 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"PO-Revision-Date: 2011-08-13 02:19+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/upload.php:20 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:21 +msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini" +msgstr "" + +#: ajax/upload.php:22 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:23 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:24 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:25 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:26 +msgid "Failed to write to disk" +msgstr "" + +#: appinfo/app.php:6 +msgid "Files" +msgstr "" + +#: js/fileactions.js:117 templates/index.php:64 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:119 templates/index.php:66 +msgid "Delete" +msgstr "" + +#: js/fileactions.js:181 +msgid "Rename" +msgstr "" + +#: js/filelist.js:201 js/filelist.js:203 +msgid "{new_name} already exists" +msgstr "" + +#: js/filelist.js:201 js/filelist.js:203 +msgid "replace" +msgstr "" + +#: js/filelist.js:201 +msgid "suggest name" +msgstr "" + +#: js/filelist.js:201 js/filelist.js:203 +msgid "cancel" +msgstr "" + +#: js/filelist.js:250 +msgid "replaced {new_name}" +msgstr "" + +#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286 +msgid "undo" +msgstr "" + +#: js/filelist.js:252 +msgid "replaced {new_name} with {old_name}" +msgstr "" + +#: js/filelist.js:284 +msgid "unshared {files}" +msgstr "" + +#: js/filelist.js:286 +msgid "deleted {files}" +msgstr "" + +#: js/files.js:33 +msgid "" +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " +"allowed." +msgstr "" + +#: js/files.js:183 +msgid "generating ZIP-file, it may take some time." +msgstr "" + +#: js/files.js:218 +msgid "Unable to upload your file as it is a directory or has 0 bytes" +msgstr "" + +#: js/files.js:218 +msgid "Upload Error" +msgstr "" + +#: js/files.js:235 +msgid "Close" +msgstr "" + +#: js/files.js:254 js/files.js:368 js/files.js:398 +msgid "Pending" +msgstr "" + +#: js/files.js:274 +msgid "1 file uploading" +msgstr "" + +#: js/files.js:277 js/files.js:331 js/files.js:346 +msgid "{count} files uploading" +msgstr "" + +#: js/files.js:349 js/files.js:382 +msgid "Upload cancelled." +msgstr "" + +#: js/files.js:451 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/files.js:523 +msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" +msgstr "" + +#: js/files.js:704 +msgid "{count} files scanned" +msgstr "" + +#: js/files.js:712 +msgid "error while scanning" +msgstr "" + +#: js/files.js:785 templates/index.php:50 +msgid "Name" +msgstr "" + +#: js/files.js:786 templates/index.php:58 +msgid "Size" +msgstr "" + +#: js/files.js:787 templates/index.php:60 +msgid "Modified" +msgstr "" + +#: js/files.js:814 +msgid "1 folder" +msgstr "" + +#: js/files.js:816 +msgid "{count} folders" +msgstr "" + +#: js/files.js:824 +msgid "1 file" +msgstr "" + +#: js/files.js:826 +msgid "{count} files" +msgstr "" + +#: templates/admin.php:5 +msgid "File handling" +msgstr "" + +#: templates/admin.php:7 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:7 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:9 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:9 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:11 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:12 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:15 +msgid "Save" +msgstr "" + +#: templates/index.php:7 +msgid "New" +msgstr "" + +#: templates/index.php:9 +msgid "Text file" +msgstr "" + +#: templates/index.php:10 +msgid "Folder" +msgstr "" + +#: templates/index.php:11 +msgid "From link" +msgstr "" + +#: templates/index.php:22 +msgid "Upload" +msgstr "" + +#: templates/index.php:29 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:42 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:52 +msgid "Share" +msgstr "" + +#: templates/index.php:54 +msgid "Download" +msgstr "" + +#: templates/index.php:77 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:79 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:84 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:87 +msgid "Current scanning" +msgstr "" diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po new file mode 100644 index 0000000000..e62739f8f2 --- /dev/null +++ b/l10n/sq/files_encryption.po @@ -0,0 +1,34 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"PO-Revision-Date: 2012-08-12 22:33+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:3 +msgid "Encryption" +msgstr "" + +#: templates/settings.php:4 +msgid "Exclude the following file types from encryption" +msgstr "" + +#: templates/settings.php:5 +msgid "None" +msgstr "" + +#: templates/settings.php:10 +msgid "Enable Encryption" +msgstr "" diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po new file mode 100644 index 0000000000..a677ece5f4 --- /dev/null +++ b/l10n/sq/files_external.po @@ -0,0 +1,106 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"PO-Revision-Date: 2012-08-12 22:34+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23 +msgid "Access granted" +msgstr "" + +#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86 +msgid "Error configuring Dropbox storage" +msgstr "" + +#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40 +msgid "Grant access" +msgstr "" + +#: js/dropbox.js:73 js/google.js:72 +msgid "Fill out all required fields" +msgstr "" + +#: js/dropbox.js:85 +msgid "Please provide a valid Dropbox app key and secret." +msgstr "" + +#: js/google.js:26 js/google.js:73 js/google.js:78 +msgid "Error configuring Google Drive storage" +msgstr "" + +#: templates/settings.php:3 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:7 templates/settings.php:19 +msgid "Mount point" +msgstr "" + +#: templates/settings.php:8 +msgid "Backend" +msgstr "" + +#: templates/settings.php:9 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:10 +msgid "Options" +msgstr "" + +#: templates/settings.php:11 +msgid "Applicable" +msgstr "" + +#: templates/settings.php:23 +msgid "Add mount point" +msgstr "" + +#: templates/settings.php:54 templates/settings.php:62 +msgid "None set" +msgstr "" + +#: templates/settings.php:63 +msgid "All Users" +msgstr "" + +#: templates/settings.php:64 +msgid "Groups" +msgstr "" + +#: templates/settings.php:69 +msgid "Users" +msgstr "" + +#: templates/settings.php:77 templates/settings.php:107 +msgid "Delete" +msgstr "" + +#: templates/settings.php:87 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:88 +msgid "Allow users to mount their own external storage" +msgstr "" + +#: templates/settings.php:99 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:113 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po new file mode 100644 index 0000000000..110e4b2ac2 --- /dev/null +++ b/l10n/sq/files_sharing.po @@ -0,0 +1,48 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2012-08-12 22:35+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/authenticate.php:4 +msgid "Password" +msgstr "" + +#: templates/authenticate.php:6 +msgid "Submit" +msgstr "" + +#: templates/public.php:17 +#, php-format +msgid "%s shared the folder %s with you" +msgstr "" + +#: templates/public.php:19 +#, php-format +msgid "%s shared the file %s with you" +msgstr "" + +#: templates/public.php:22 templates/public.php:38 +msgid "Download" +msgstr "" + +#: templates/public.php:37 +msgid "No preview available for" +msgstr "" + +#: templates/public.php:43 +msgid "web services under your control" +msgstr "" diff --git a/l10n/sq/files_versions.po b/l10n/sq/files_versions.po new file mode 100644 index 0000000000..97616a4063 --- /dev/null +++ b/l10n/sq/files_versions.po @@ -0,0 +1,42 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2012-08-12 22:37+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: js/settings-personal.js:31 templates/settings-personal.php:10 +msgid "Expire all versions" +msgstr "" + +#: js/versions.js:16 +msgid "History" +msgstr "" + +#: templates/settings-personal.php:4 +msgid "Versions" +msgstr "" + +#: templates/settings-personal.php:7 +msgid "This will delete all existing backup versions of your files" +msgstr "" + +#: templates/settings.php:3 +msgid "Files Versioning" +msgstr "" + +#: templates/settings.php:4 +msgid "Enable" +msgstr "" diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po new file mode 100644 index 0000000000..431a0e3c62 --- /dev/null +++ b/l10n/sq/lib.po @@ -0,0 +1,152 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2012-07-27 22:23+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: app.php:285 +msgid "Help" +msgstr "" + +#: app.php:292 +msgid "Personal" +msgstr "" + +#: app.php:297 +msgid "Settings" +msgstr "" + +#: app.php:302 +msgid "Users" +msgstr "" + +#: app.php:309 +msgid "Apps" +msgstr "" + +#: app.php:311 +msgid "Admin" +msgstr "" + +#: files.php:361 +msgid "ZIP download is turned off." +msgstr "" + +#: files.php:362 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: files.php:362 files.php:387 +msgid "Back to Files" +msgstr "" + +#: files.php:386 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: json.php:28 +msgid "Application is not enabled" +msgstr "" + +#: json.php:39 json.php:64 json.php:77 json.php:89 +msgid "Authentication error" +msgstr "" + +#: json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: search/provider/file.php:17 search/provider/file.php:35 +msgid "Files" +msgstr "" + +#: search/provider/file.php:26 search/provider/file.php:33 +msgid "Text" +msgstr "" + +#: search/provider/file.php:29 +msgid "Images" +msgstr "" + +#: template.php:103 +msgid "seconds ago" +msgstr "" + +#: template.php:104 +msgid "1 minute ago" +msgstr "" + +#: template.php:105 +#, php-format +msgid "%d minutes ago" +msgstr "" + +#: template.php:106 +msgid "1 hour ago" +msgstr "" + +#: template.php:107 +#, php-format +msgid "%d hours ago" +msgstr "" + +#: template.php:108 +msgid "today" +msgstr "" + +#: template.php:109 +msgid "yesterday" +msgstr "" + +#: template.php:110 +#, php-format +msgid "%d days ago" +msgstr "" + +#: template.php:111 +msgid "last month" +msgstr "" + +#: template.php:112 +#, php-format +msgid "%d months ago" +msgstr "" + +#: template.php:113 +msgid "last year" +msgstr "" + +#: template.php:114 +msgid "years ago" +msgstr "" + +#: updater.php:75 +#, php-format +msgid "%s is available. Get more information" +msgstr "" + +#: updater.php:77 +msgid "up to date" +msgstr "" + +#: updater.php:80 +msgid "updates check is disabled" +msgstr "" + +#: vcategories.php:188 vcategories.php:249 +#, php-format +msgid "Could not find category \"%s\"" +msgstr "" diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po new file mode 100644 index 0000000000..970d7a6556 --- /dev/null +++ b/l10n/sq/settings.po @@ -0,0 +1,243 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2011-07-25 16:05+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ajax/apps/ocs.php:20 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/creategroup.php:10 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Unable to add group" +msgstr "" + +#: ajax/enableapp.php:12 +msgid "Could not enable app. " +msgstr "" + +#: ajax/lostpassword.php:12 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Invalid email" +msgstr "" + +#: ajax/openid.php:13 +msgid "OpenID Changed" +msgstr "" + +#: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20 +msgid "Invalid request" +msgstr "" + +#: ajax/removegroup.php:13 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:12 +msgid "Authentication error" +msgstr "" + +#: ajax/removeuser.php:24 +msgid "Unable to delete user" +msgstr "" + +#: ajax/setlanguage.php:15 +msgid "Language changed" +msgstr "" + +#: ajax/togglegroups.php:22 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:28 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: js/apps.js:28 js/apps.js:67 +msgid "Disable" +msgstr "" + +#: js/apps.js:28 js/apps.js:55 +msgid "Enable" +msgstr "" + +#: js/personal.js:69 +msgid "Saving..." +msgstr "" + +#: personal.php:42 personal.php:43 +msgid "__language_name__" +msgstr "" + +#: templates/apps.php:10 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:11 +msgid "More Apps" +msgstr "" + +#: templates/apps.php:27 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:31 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:32 +msgid "-licensed by " +msgstr "" + +#: templates/help.php:9 +msgid "Documentation" +msgstr "" + +#: templates/help.php:10 +msgid "Managing Big Files" +msgstr "" + +#: templates/help.php:11 +msgid "Ask a question" +msgstr "" + +#: templates/help.php:22 +msgid "Problems connecting to help database." +msgstr "" + +#: templates/help.php:23 +msgid "Go there manually." +msgstr "" + +#: templates/help.php:31 +msgid "Answer" +msgstr "" + +#: templates/personal.php:8 +#, php-format +msgid "You have used %s of the available %s" +msgstr "" + +#: templates/personal.php:12 +msgid "Desktop and Mobile Syncing Clients" +msgstr "" + +#: templates/personal.php:13 +msgid "Download" +msgstr "" + +#: templates/personal.php:19 +msgid "Your password was changed" +msgstr "" + +#: templates/personal.php:20 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:21 +msgid "Current password" +msgstr "" + +#: templates/personal.php:22 +msgid "New password" +msgstr "" + +#: templates/personal.php:23 +msgid "show" +msgstr "" + +#: templates/personal.php:24 +msgid "Change password" +msgstr "" + +#: templates/personal.php:30 +msgid "Email" +msgstr "" + +#: templates/personal.php:31 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:32 +msgid "Fill in an email address to enable password recovery" +msgstr "" + +#: templates/personal.php:38 templates/personal.php:39 +msgid "Language" +msgstr "" + +#: templates/personal.php:44 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:51 +msgid "use this address to connect to your ownCloud in your file manager" +msgstr "" + +#: templates/personal.php:61 +msgid "" +"Developed by the ownCloud community, the source code is " +"licensed under the AGPL." +msgstr "" + +#: templates/users.php:21 templates/users.php:76 +msgid "Name" +msgstr "" + +#: templates/users.php:23 templates/users.php:77 +msgid "Password" +msgstr "" + +#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +msgid "Groups" +msgstr "" + +#: templates/users.php:32 +msgid "Create" +msgstr "" + +#: templates/users.php:35 +msgid "Default Quota" +msgstr "" + +#: templates/users.php:55 templates/users.php:138 +msgid "Other" +msgstr "" + +#: templates/users.php:80 templates/users.php:112 +msgid "Group Admin" +msgstr "" + +#: templates/users.php:82 +msgid "Quota" +msgstr "" + +#: templates/users.php:146 +msgid "Delete" +msgstr "" diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po new file mode 100644 index 0000000000..16fd4ec420 --- /dev/null +++ b/l10n/sq/user_ldap.po @@ -0,0 +1,170 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2012-08-12 22:45+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:8 +msgid "Host" +msgstr "" + +#: templates/settings.php:8 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/settings.php:9 +msgid "Base DN" +msgstr "" + +#: templates/settings.php:9 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/settings.php:10 +msgid "User DN" +msgstr "" + +#: templates/settings.php:10 +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:11 +msgid "Password" +msgstr "" + +#: templates/settings.php:11 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/settings.php:12 +msgid "User Login Filter" +msgstr "" + +#: templates/settings.php:12 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action." +msgstr "" + +#: templates/settings.php:12 +#, php-format +msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" +msgstr "" + +#: templates/settings.php:13 +msgid "User List Filter" +msgstr "" + +#: templates/settings.php:13 +msgid "Defines the filter to apply, when retrieving users." +msgstr "" + +#: templates/settings.php:13 +msgid "without any placeholder, e.g. \"objectClass=person\"." +msgstr "" + +#: templates/settings.php:14 +msgid "Group Filter" +msgstr "" + +#: templates/settings.php:14 +msgid "Defines the filter to apply, when retrieving groups." +msgstr "" + +#: templates/settings.php:14 +msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." +msgstr "" + +#: templates/settings.php:17 +msgid "Port" +msgstr "" + +#: templates/settings.php:18 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:19 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:20 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:21 +msgid "Use TLS" +msgstr "" + +#: templates/settings.php:21 +msgid "Do not use it for SSL connections, it will fail." +msgstr "" + +#: templates/settings.php:22 +msgid "Case insensitve LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:23 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:23 +msgid "" +"If connection only works with this option, import the LDAP server's SSL " +"certificate in your ownCloud server." +msgstr "" + +#: templates/settings.php:23 +msgid "Not recommended, use for testing only." +msgstr "" + +#: templates/settings.php:24 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:24 +msgid "The LDAP attribute to use to generate the user`s ownCloud name." +msgstr "" + +#: templates/settings.php:25 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:25 +msgid "The LDAP attribute to use to generate the groups`s ownCloud name." +msgstr "" + +#: templates/settings.php:27 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:29 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:30 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:32 +msgid "Help" +msgstr "" diff --git a/l10n/sq/user_webdavauth.po b/l10n/sq/user_webdavauth.po new file mode 100644 index 0000000000..d3865a501b --- /dev/null +++ b/l10n/sq/user_webdavauth.po @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2012-11-09 09:06+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sq\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: templates/settings.php:4 +msgid "WebDAV URL: http://" +msgstr "" diff --git a/l10n/sv/files.po b/l10n/sv/files.po index 3d1c98ce1c..9d03aae199 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"PO-Revision-Date: 2012-11-26 10:00+0000\n" +"Last-Translator: Magnus Höglund \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -109,7 +109,7 @@ msgstr "raderade {files}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." @@ -150,7 +150,7 @@ msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen." #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Ogiltigt mappnamn. Ordet \"Delad\" är reserverat av ownCloud." #: js/files.js:704 msgid "{count} files scanned" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index b09dccc2a7..066258912d 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -137,8 +137,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:135 js/share.js:142 js/share.js:527 -#: js/share.js:539 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533 +#: js/share.js:545 msgid "Error" msgstr "" @@ -239,15 +239,15 @@ msgstr "" msgid "share" msgstr "" -#: js/share.js:343 js/share.js:514 js/share.js:516 +#: js/share.js:349 js/share.js:520 js/share.js:522 msgid "Password protected" msgstr "" -#: js/share.js:527 +#: js/share.js:533 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:539 +#: js/share.js:545 msgid "Error setting expiration date" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 423f7f4273..9e9b9c8a37 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"POT-Creation-Date: 2012-11-27 00:09+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 55cd072fc3..ae938e7936 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"POT-Creation-Date: 2012-11-27 00:09+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 a08e7852bc..914289d74f 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"POT-Creation-Date: 2012-11-27 00:09+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 f1a671c7ee..819e1fdae2 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"POT-Creation-Date: 2012-11-27 00:10+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 e2a5cec27b..1a0d45b2c1 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"POT-Creation-Date: 2012-11-27 00:10+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 66bfa23b0c..5aec951442 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"POT-Creation-Date: 2012-11-27 00:10+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 20ea64dcbe..d44ef6475c 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"POT-Creation-Date: 2012-11-27 00:10+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 40a4786ac1..9772531424 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"POT-Creation-Date: 2012-11-27 00:10+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 3740c1853c..1bb445c451 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 00:01+0100\n" +"POT-Creation-Date: 2012-11-27 00:10+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/uk/core.po b/l10n/uk/core.po index 04d09bce07..c10c7fcfba 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/core.po @@ -4,15 +4,16 @@ # # Translators: # , 2012. +# , 2012. # Soul Kim , 2012. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2012-11-26 15:28+0000\n" +"Last-Translator: skoptev \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,101 +23,101 @@ msgstr "" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "Не вказано тип категорії." #: ajax/vcategories/add.php:30 msgid "No category to add?" -msgstr "" +msgstr "Відсутні категорії для додавання?" #: ajax/vcategories/add.php:37 msgid "This category already exists: " -msgstr "" +msgstr "Ця категорія вже існує: " #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 #: ajax/vcategories/removeFromFavorites.php:26 msgid "Object type not provided." -msgstr "" +msgstr "Не вказано тип об'єкту." #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "" +msgstr "%s ID не вказано." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "Помилка при додаванні %s до обраного." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." -msgstr "" +msgstr "Жодної категорії не обрано для видалення." #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "Помилка при видалені %s із обраного." -#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60 +#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 msgid "Settings" msgstr "Налаштування" -#: js/js.js:688 +#: js/js.js:704 msgid "seconds ago" msgstr "секунди тому" -#: js/js.js:689 +#: js/js.js:705 msgid "1 minute ago" msgstr "1 хвилину тому" -#: js/js.js:690 +#: js/js.js:706 msgid "{minutes} minutes ago" -msgstr "" +msgstr "{minutes} хвилин тому" -#: js/js.js:691 +#: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "1 годину тому" -#: js/js.js:692 +#: js/js.js:708 msgid "{hours} hours ago" -msgstr "" +msgstr "{hours} години тому" -#: js/js.js:693 +#: js/js.js:709 msgid "today" msgstr "сьогодні" -#: js/js.js:694 +#: js/js.js:710 msgid "yesterday" msgstr "вчора" -#: js/js.js:695 +#: js/js.js:711 msgid "{days} days ago" -msgstr "" +msgstr "{days} днів тому" -#: js/js.js:696 +#: js/js.js:712 msgid "last month" msgstr "минулого місяця" -#: js/js.js:697 +#: js/js.js:713 msgid "{months} months ago" -msgstr "" +msgstr "{months} місяців тому" -#: js/js.js:698 +#: js/js.js:714 msgid "months ago" msgstr "місяці тому" -#: js/js.js:699 +#: js/js.js:715 msgid "last year" msgstr "минулого року" -#: js/js.js:700 +#: js/js.js:716 msgid "years ago" msgstr "роки тому" #: js/oc-dialogs.js:126 msgid "Choose" -msgstr "" +msgstr "Обрати" #: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" @@ -132,58 +133,58 @@ msgstr "Так" #: 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 msgid "The object type is not specified." -msgstr "" +msgstr "Не визначено тип об'єкту." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525 -#: js/share.js:537 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533 +#: js/share.js:545 msgid "Error" msgstr "Помилка" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "" +msgstr "Не визначено ім'я програми." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "" +msgstr "Необхідний файл {file} не встановлено!" #: js/share.js:124 msgid "Error while sharing" -msgstr "" +msgstr "Помилка під час публікації" #: js/share.js:135 msgid "Error while unsharing" -msgstr "" +msgstr "Помилка під час відміни публікації" #: js/share.js:142 msgid "Error while changing permissions" -msgstr "" +msgstr "Помилка при зміні повноважень" #: js/share.js:151 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr " {owner} опублікував для Вас та для групи {group}" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "{owner} опублікував для Вас" #: js/share.js:158 msgid "Share with" -msgstr "" +msgstr "Опублікувати для" #: js/share.js:163 msgid "Share with link" -msgstr "" +msgstr "Опублікувати через посилання" #: js/share.js:164 msgid "Password protect" -msgstr "" +msgstr "Захистити паролем" #: js/share.js:168 templates/installation.php:42 templates/login.php:24 #: templates/verify.php:13 @@ -192,27 +193,27 @@ msgstr "Пароль" #: js/share.js:173 msgid "Set expiration date" -msgstr "" +msgstr "Встановити термін дії" #: js/share.js:174 msgid "Expiration date" -msgstr "" +msgstr "Термін дії" #: js/share.js:206 msgid "Share via email:" -msgstr "" +msgstr "Опублікувати через електронну пошту:" #: js/share.js:208 msgid "No people found" -msgstr "" +msgstr "Жодної людини не знайдено" #: js/share.js:235 msgid "Resharing is not allowed" -msgstr "" +msgstr "Пере-публікація не дозволяється" #: js/share.js:271 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "Опубліковано {item} для {user}" #: js/share.js:292 msgid "Unshare" @@ -220,11 +221,11 @@ msgstr "Заборонити доступ" #: js/share.js:304 msgid "can edit" -msgstr "" +msgstr "може редагувати" #: js/share.js:306 msgid "access control" -msgstr "" +msgstr "контроль доступу" #: js/share.js:309 msgid "create" @@ -232,35 +233,35 @@ msgstr "створити" #: js/share.js:312 msgid "update" -msgstr "" +msgstr "оновити" #: js/share.js:315 msgid "delete" -msgstr "" +msgstr "видалити" #: js/share.js:318 msgid "share" -msgstr "" +msgstr "опублікувати" -#: js/share.js:343 js/share.js:512 js/share.js:514 +#: js/share.js:349 js/share.js:520 js/share.js:522 msgid "Password protected" -msgstr "" +msgstr "Захищено паролем" -#: js/share.js:525 +#: js/share.js:533 msgid "Error unsetting expiration date" -msgstr "" +msgstr "Помилка при відміні терміна дії" -#: js/share.js:537 +#: js/share.js:545 msgid "Error setting expiration date" -msgstr "" +msgstr "Помилка при встановленні терміна дії" #: lostpassword/controller.php:47 msgid "ownCloud password reset" -msgstr "" +msgstr "скидання пароля ownCloud" #: 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." @@ -268,11 +269,11 @@ 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:38 #: templates/login.php:20 @@ -281,7 +282,7 @@ msgstr "Ім'я користувача" #: lostpassword/templates/lostpassword.php:14 msgid "Request reset" -msgstr "" +msgstr "Запит скидання" #: lostpassword/templates/resetpassword.php:4 msgid "Your password was reset" @@ -321,15 +322,15 @@ msgstr "Допомога" #: templates/403.php:12 msgid "Access forbidden" -msgstr "" +msgstr "Доступ заборонено" #: templates/404.php:12 msgid "Cloud not found" -msgstr "" +msgstr "Cloud не знайдено" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" -msgstr "" +msgstr "Редагувати категорії" #: templates/edit_categories_dialog.php:16 msgid "Add" @@ -337,19 +338,19 @@ msgstr "Додати" #: templates/installation.php:23 templates/installation.php:31 msgid "Security Warning" -msgstr "" +msgstr "Попередження про небезпеку" #: templates/installation.php:24 msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "" +msgstr "Не доступний безпечний генератор випадкових чисел, будь ласка, активуйте 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 "" +msgstr "Без безпечного генератора випадкових чисел зловмисник може визначити токени скидання пароля і заволодіти Вашим обліковим записом." #: templates/installation.php:32 msgid "" @@ -358,19 +359,19 @@ 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 "" +msgstr "Ваш каталог з даними та Ваші файли можливо доступні з Інтернету. Файл .htaccess, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера." #: templates/installation.php:36 msgid "Create an admin account" -msgstr "" +msgstr "Створити обліковий запис адміністратора" #: templates/installation.php:48 msgid "Advanced" -msgstr "" +msgstr "Додатково" #: templates/installation.php:50 msgid "Data folder" -msgstr "" +msgstr "Каталог даних" #: templates/installation.php:57 msgid "Configure the database" @@ -395,113 +396,113 @@ msgstr "Назва бази даних" #: templates/installation.php:121 msgid "Database tablespace" -msgstr "" +msgstr "Таблиця бази даних" #: templates/installation.php:127 msgid "Database host" -msgstr "" +msgstr "Хост бази даних" #: templates/installation.php:132 msgid "Finish setup" msgstr "Завершити налаштування" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Sunday" msgstr "Неділя" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Monday" msgstr "Понеділок" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Tuesday" msgstr "Вівторок" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Wednesday" msgstr "Середа" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Thursday" msgstr "Четвер" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Friday" msgstr "П'ятниця" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Saturday" msgstr "Субота" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "January" msgstr "Січень" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "February" msgstr "Лютий" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "March" msgstr "Березень" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "April" msgstr "Квітень" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "May" msgstr "Травень" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "June" msgstr "Червень" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "July" msgstr "Липень" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "August" msgstr "Серпень" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "September" msgstr "Вересень" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "October" msgstr "Жовтень" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "November" msgstr "Листопад" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "December" msgstr "Грудень" -#: templates/layout.guest.php:41 +#: templates/layout.guest.php:42 msgid "web services under your control" msgstr "веб-сервіс під вашим контролем" -#: templates/layout.user.php:44 +#: templates/layout.user.php:45 msgid "Log out" msgstr "Вихід" #: templates/login.php:8 msgid "Automatic logon rejected!" -msgstr "" +msgstr "Автоматичний вхід в систему відхилений!" #: templates/login.php:9 msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "Якщо Ви не міняли пароль останнім часом, Ваш обліковий запис може бути скомпрометованим!" #: templates/login.php:10 msgid "Please change your password to secure your account again." -msgstr "" +msgstr "Будь ласка, змініть свій пароль, щоб знову захистити Ваш обліковий запис." #: templates/login.php:15 msgid "Lost your password?" @@ -517,26 +518,26 @@ msgstr "Вхід" #: templates/logout.php:1 msgid "You are logged out." -msgstr "" +msgstr "Ви вийшли з системи." #: templates/part.pagenavi.php:3 msgid "prev" -msgstr "" +msgstr "попередній" #: templates/part.pagenavi.php:20 msgid "next" -msgstr "" +msgstr "наступний" #: templates/verify.php:5 msgid "Security Warning!" -msgstr "" +msgstr "Попередження про небезпеку!" #: templates/verify.php:6 msgid "" "Please verify your password.
For security reasons you may be " "occasionally asked to enter your password again." -msgstr "" +msgstr "Будь ласка, повторно введіть свій пароль.
З питань безпеки, Вам інколи доведеться повторно вводити свій пароль." #: templates/verify.php:16 msgid "Verify" -msgstr "" +msgstr "Підтвердити" diff --git a/l10n/uk/files.po b/l10n/uk/files.po index c1e2cd3499..3c75939887 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"PO-Revision-Date: 2012-11-26 15:33+0000\n" +"Last-Translator: skoptev \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -96,7 +96,7 @@ msgstr "замінено {new_name} на {old_name}" #: js/filelist.js:284 msgid "unshared {files}" -msgstr "" +msgstr "неопубліковано {files}" #: js/filelist.js:286 msgid "deleted {files}" @@ -106,7 +106,7 @@ msgstr "видалено {files}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." @@ -147,7 +147,7 @@ msgstr "Виконується завантаження файлу. Закрит #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Невірне ім'я каталогу. Використання \"Shared\" зарезервовано Owncloud" #: js/files.js:704 msgid "{count} files scanned" @@ -187,7 +187,7 @@ msgstr "{count} файлів" #: templates/admin.php:5 msgid "File handling" -msgstr "" +msgstr "Робота з файлами" #: templates/admin.php:7 msgid "Maximum upload size" @@ -199,7 +199,7 @@ msgstr "макс.можливе:" #: templates/admin.php:9 msgid "Needed for multi-file and folder downloads." -msgstr "" +msgstr "Необхідно для мульти-файлового та каталогового завантаження." #: templates/admin.php:9 msgid "Enable ZIP-download" diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po index a3dbe8d1d6..ce97ceed4c 100644 --- a/l10n/uk/files_external.po +++ b/l10n/uk/files_external.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-11-20 00:01+0100\n" -"PO-Revision-Date: 2012-11-19 15:12+0000\n" +"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"PO-Revision-Date: 2012-11-26 15:31+0000\n" "Last-Translator: skoptev \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgstr "Опції" #: templates/settings.php:11 msgid "Applicable" -msgstr "" +msgstr "Придатний" #: templates/settings.php:23 msgid "Add mount point" diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po index f6e249e3ef..f2a86e7170 100644 --- a/l10n/uk/lib.po +++ b/l10n/uk/lib.po @@ -4,14 +4,15 @@ # # Translators: # , 2012. +# , 2012. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2012-11-26 15:40+0000\n" +"Last-Translator: skoptev \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,19 +44,19 @@ msgstr "Додатки" msgid "Admin" msgstr "Адмін" -#: files.php:332 +#: files.php:361 msgid "ZIP download is turned off." msgstr "ZIP завантаження вимкнено." -#: files.php:333 +#: files.php:362 msgid "Files need to be downloaded one by one." msgstr "Файли повинні бути завантаженні послідовно." -#: files.php:333 files.php:358 +#: files.php:362 files.php:387 msgid "Back to Files" msgstr "Повернутися до файлів" -#: files.php:357 +#: files.php:386 msgid "Selected files too large to generate zip file." msgstr "Вибрані фали завеликі для генерування zip файлу." @@ -69,7 +70,7 @@ msgstr "Помилка автентифікації" #: json.php:51 msgid "Token expired. Please reload page." -msgstr "" +msgstr "Строк дії токена скінчився. Будь ласка, перезавантажте сторінку." #: search/provider/file.php:17 search/provider/file.php:35 msgid "Files" @@ -81,7 +82,7 @@ msgstr "Текст" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "Зображення" #: template.php:103 msgid "seconds ago" @@ -98,12 +99,12 @@ msgstr "%d хвилин тому" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "1 годину тому" #: template.php:107 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "%d годин тому" #: template.php:108 msgid "today" @@ -125,7 +126,7 @@ msgstr "минулого місяця" #: template.php:112 #, php-format msgid "%d months ago" -msgstr "" +msgstr "%d місяців тому" #: template.php:113 msgid "last year" @@ -138,11 +139,11 @@ msgstr "роки тому" #: updater.php:75 #, php-format msgid "%s is available. Get more information" -msgstr "" +msgstr "%s доступно. Отримати детальну інформацію" #: updater.php:77 msgid "up to date" -msgstr "" +msgstr "оновлено" #: updater.php:80 msgid "updates check is disabled" @@ -151,4 +152,4 @@ msgstr "перевірка оновлень відключена" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "Не вдалося знайти категорію \"%s\"" diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po index 9ebc9fce4a..fefdb36a52 100644 --- a/l10n/uk/settings.po +++ b/l10n/uk/settings.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-11-22 00:01+0100\n" -"PO-Revision-Date: 2012-11-21 13:10+0000\n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2012-11-26 15:30+0000\n" "Last-Translator: skoptev \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -131,7 +131,7 @@ msgstr "Проблема при з'єднані з базою допомоги" #: templates/help.php:23 msgid "Go there manually." -msgstr "" +msgstr "Перейти вручну." #: templates/help.php:31 msgid "Answer" diff --git a/l10n/vi/files.po b/l10n/vi/files.po index c44fa3bfe7..7e32322143 100644 --- a/l10n/vi/files.po +++ b/l10n/vi/files.po @@ -4,15 +4,16 @@ # # Translators: # , 2012. +# , 2012. # , 2012. # Sơn Nguyễn , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"PO-Revision-Date: 2012-11-26 03:19+0000\n" +"Last-Translator: mattheu_9x \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -106,7 +107,7 @@ msgstr "đã xóa {files}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." @@ -147,7 +148,7 @@ msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi t #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Tên thư mục không hợp lệ. Sử dụng \"Chia sẻ\" được dành riêng bởi Owncloud" #: js/files.js:704 msgid "{count} files scanned" diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po index 18209881c6..2bc0c14b6c 100644 --- a/l10n/zh_TW/lib.po +++ b/l10n/zh_TW/lib.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # , 2012. # ywang , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2012-11-26 09:03+0000\n" +"Last-Translator: sofiasu \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,19 +44,19 @@ msgstr "應用程式" msgid "Admin" msgstr "管理" -#: files.php:332 +#: files.php:361 msgid "ZIP download is turned off." msgstr "ZIP 下載已關閉" -#: files.php:333 +#: files.php:362 msgid "Files need to be downloaded one by one." msgstr "檔案需要逐一下載" -#: files.php:333 files.php:358 +#: files.php:362 files.php:387 msgid "Back to Files" msgstr "回到檔案列表" -#: files.php:357 +#: files.php:386 msgid "Selected files too large to generate zip file." msgstr "選擇的檔案太大以致於無法產生壓縮檔" @@ -81,7 +82,7 @@ msgstr "文字" #: search/provider/file.php:29 msgid "Images" -msgstr "" +msgstr "圖片" #: template.php:103 msgid "seconds ago" @@ -98,12 +99,12 @@ msgstr "%d 分鐘前" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "1小時之前" #: template.php:107 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "%d小時之前" #: template.php:108 msgid "today" @@ -125,7 +126,7 @@ msgstr "上個月" #: template.php:112 #, php-format msgid "%d months ago" -msgstr "" +msgstr "%d個月之前" #: template.php:113 msgid "last year" @@ -151,4 +152,4 @@ msgstr "檢查更新已停用" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "找不到分類-\"%s\"" diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po index f3eed87863..5a191f76b2 100644 --- a/l10n/zh_TW/user_webdavauth.po +++ b/l10n/zh_TW/user_webdavauth.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-09 10:06+0100\n" -"PO-Revision-Date: 2012-11-09 09:06+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"PO-Revision-Date: 2012-11-26 09:00+0000\n" +"Last-Translator: sofiasu \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,4 +20,4 @@ msgstr "" #: templates/settings.php:4 msgid "WebDAV URL: http://" -msgstr "" +msgstr "WebDAV 網址 http://" diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php index ae1a89eb85..5d47ecbda2 100644 --- a/lib/l10n/eu.php +++ b/lib/l10n/eu.php @@ -14,16 +14,21 @@ "Token expired. Please reload page." => "Tokena iraungitu da. Mesedez birkargatu orria.", "Files" => "Fitxategiak", "Text" => "Testua", +"Images" => "Irudiak", "seconds ago" => "orain dela segundu batzuk", "1 minute ago" => "orain dela minutu 1", "%d minutes ago" => "orain dela %d minutu", +"1 hour ago" => "orain dela ordu bat", +"%d hours ago" => "orain dela %d ordu", "today" => "gaur", "yesterday" => "atzo", "%d days ago" => "orain dela %d egun", "last month" => "joan den hilabetea", +"%d months ago" => "orain dela %d hilabete", "last year" => "joan den urtea", "years ago" => "orain dela urte batzuk", "%s is available. Get more information" => "%s eskuragarri dago. Lortu informazio gehiago", "up to date" => "eguneratuta", -"updates check is disabled" => "eguneraketen egiaztapena ez dago gaituta" +"updates check is disabled" => "eguneraketen egiaztapena ez dago gaituta", +"Could not find category \"%s\"" => "Ezin da \"%s\" kategoria aurkitu" ); diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php index f606c4aca4..f5d52f8682 100644 --- a/lib/l10n/uk.php +++ b/lib/l10n/uk.php @@ -11,16 +11,24 @@ "Selected files too large to generate zip file." => "Вибрані фали завеликі для генерування zip файлу.", "Application is not enabled" => "Додаток не увімкнений", "Authentication error" => "Помилка автентифікації", +"Token expired. Please reload page." => "Строк дії токена скінчився. Будь ласка, перезавантажте сторінку.", "Files" => "Файли", "Text" => "Текст", +"Images" => "Зображення", "seconds ago" => "секунди тому", "1 minute ago" => "1 хвилину тому", "%d minutes ago" => "%d хвилин тому", +"1 hour ago" => "1 годину тому", +"%d hours ago" => "%d годин тому", "today" => "сьогодні", "yesterday" => "вчора", "%d days ago" => "%d днів тому", "last month" => "минулого місяця", +"%d months ago" => "%d місяців тому", "last year" => "минулого року", "years ago" => "роки тому", -"updates check is disabled" => "перевірка оновлень відключена" +"%s is available. Get more information" => "%s доступно. Отримати детальну інформацію", +"up to date" => "оновлено", +"updates check is disabled" => "перевірка оновлень відключена", +"Could not find category \"%s\"" => "Не вдалося знайти категорію \"%s\"" ); diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php index 16229fe03d..4dbf89c2e0 100644 --- a/lib/l10n/zh_TW.php +++ b/lib/l10n/zh_TW.php @@ -14,16 +14,21 @@ "Token expired. Please reload page." => "Token 過期. 請重新整理頁面", "Files" => "檔案", "Text" => "文字", +"Images" => "圖片", "seconds ago" => "幾秒前", "1 minute ago" => "1 分鐘前", "%d minutes ago" => "%d 分鐘前", +"1 hour ago" => "1小時之前", +"%d hours ago" => "%d小時之前", "today" => "今天", "yesterday" => "昨天", "%d days ago" => "%d 天前", "last month" => "上個月", +"%d months ago" => "%d個月之前", "last year" => "去年", "years ago" => "幾年前", "%s is available. Get more information" => "%s 已經可用. 取得 更多資訊", "up to date" => "最新的", -"updates check is disabled" => "檢查更新已停用" +"updates check is disabled" => "檢查更新已停用", +"Could not find category \"%s\"" => "找不到分類-\"%s\"" ); diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php index 1b63fdbfc0..dd8ed567a7 100644 --- a/settings/l10n/uk.php +++ b/settings/l10n/uk.php @@ -26,6 +26,7 @@ "Managing Big Files" => "Управління великими файлами", "Ask a question" => "Запитати", "Problems connecting to help database." => "Проблема при з'єднані з базою допомоги", +"Go there manually." => "Перейти вручну.", "Answer" => "Відповідь", "You have used %s of the available %s" => "Ви використали %s із доступних %s", "Desktop and Mobile Syncing Clients" => "Настільні та мобільні клієнти синхронізації", From 9a441d3e3a30e03db2f4541153cf5c1943f288a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 27 Nov 2012 17:38:21 +0100 Subject: [PATCH 15/26] show drag shadow in firefox by using helper:'clone' --- apps/files/js/files.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index dbd9a64715..d29732f9b3 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -730,7 +730,7 @@ function updateBreadcrumb(breadcrumbHtml) { //options for file drag/dropp var dragOptions={ - distance: 20, revert: 'invalid', opacity: 0.7, + distance: 20, revert: 'invalid', opacity: 0.7, helper: 'clone', stop: function(event, ui) { $('#fileList tr td.filename').addClass('ui-draggable'); } From 1d4d4fd678cd3d76c4b8a0182ec97f65b9d97b0a Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 28 Nov 2012 00:11:21 +0100 Subject: [PATCH 16/26] [tx-robot] updated from transifex --- apps/files/l10n/el.php | 2 + apps/files/l10n/pl.php | 2 + apps/files/l10n/th_TH.php | 2 + apps/files/l10n/zh_TW.php | 12 +++ apps/files_external/l10n/zh_TW.php | 10 +++ apps/files_sharing/l10n/zh_TW.php | 2 + apps/files_versions/l10n/zh_TW.php | 6 ++ apps/user_ldap/l10n/uk.php | 33 ++++++++ apps/user_ldap/l10n/zh_TW.php | 6 ++ core/l10n/pl.php | 11 +++ core/l10n/zh_TW.php | 22 ++++- l10n/el/files.po | 10 +-- l10n/pl/core.po | 108 +++++++++++------------ l10n/pl/files.po | 11 +-- l10n/pl/lib.po | 23 ++--- 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_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/th_TH/files.po | 10 +-- l10n/uk/user_ldap.po | 72 ++++++++-------- l10n/zh_TW/core.po | 127 ++++++++++++++-------------- l10n/zh_TW/files.po | 31 +++---- l10n/zh_TW/files_external.po | 23 ++--- l10n/zh_TW/files_sharing.po | 21 ++--- l10n/zh_TW/files_versions.po | 15 ++-- l10n/zh_TW/settings.po | 9 +- l10n/zh_TW/user_ldap.po | 17 ++-- lib/l10n/pl.php | 6 +- settings/l10n/zh_TW.php | 1 + 36 files changed, 366 insertions(+), 246 deletions(-) create mode 100644 apps/files_external/l10n/zh_TW.php create mode 100644 apps/files_versions/l10n/zh_TW.php create mode 100644 apps/user_ldap/l10n/zh_TW.php diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index a7da6e04a7..3f2a44c034 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}", "unshared {files}" => "μη διαμοιρασμένα {files}", "deleted {files}" => "διαγραμμένα {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.", "generating ZIP-file, it may take some time." => "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά.", "Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes", "Upload Error" => "Σφάλμα Αποστολής", @@ -28,6 +29,7 @@ "{count} files uploading" => "{count} αρχεία ανεβαίνουν", "Upload cancelled." => "Η αποστολή ακυρώθηκε.", "File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Έξοδος από την σελίδα τώρα θα ακυρώσει την αποστολή.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του \"Shared\" είναι δεσμευμένη από το Owncloud", "{count} files scanned" => "{count} αρχεία ανιχνεύτηκαν", "error while scanning" => "σφάλμα κατά την ανίχνευση", "Name" => "Όνομα", diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php index 80b3551181..860ccba2ee 100644 --- a/apps/files/l10n/pl.php +++ b/apps/files/l10n/pl.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "zastąpiony {new_name} z {old_name}", "unshared {files}" => "Udostępniane wstrzymane {files}", "deleted {files}" => "usunięto {files}", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Niepoprawna nazwa, Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*'są niedozwolone.", "generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, może potrwać pewien czas.", "Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów", "Upload Error" => "Błąd wczytywania", @@ -28,6 +29,7 @@ "{count} files uploading" => "{count} przesyłanie plików", "Upload cancelled." => "Wczytywanie anulowane.", "File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Błędna nazwa folderu. Nazwa \"Shared\" jest zarezerwowana dla Owncloud", "{count} files scanned" => "{count} pliki skanowane", "error while scanning" => "Wystąpił błąd podczas skanowania", "Name" => "Nazwa", diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php index 4bd7abfffe..ea1aa90d51 100644 --- a/apps/files/l10n/th_TH.php +++ b/apps/files/l10n/th_TH.php @@ -19,6 +19,7 @@ "replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว", "unshared {files}" => "ยกเลิกการแชร์แล้ว {files} ไฟล์", "deleted {files}" => "ลบไฟล์แล้ว {files} ไฟล์", +"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้", "generating ZIP-file, it may take some time." => "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่", "Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์", "Upload Error" => "เกิดข้อผิดพลาดในการอัพโหลด", @@ -28,6 +29,7 @@ "{count} files uploading" => "กำลังอัพโหลด {count} ไฟล์", "Upload cancelled." => "การอัพโหลดถูกยกเลิก", "File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "ชื่อโฟลเดอร์ที่ใช้ไม่ถูกต้อง การใช้งาน \"ถูกแชร์\" ถูกสงวนไว้เฉพาะ Owncloud เท่านั้น", "{count} files scanned" => "สแกนไฟล์แล้ว {count} ไฟล์", "error while scanning" => "พบข้อผิดพลาดในระหว่างการสแกนไฟล์", "Name" => "ชื่อ", diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php index fd3d1b6099..b5a0226741 100644 --- a/apps/files/l10n/zh_TW.php +++ b/apps/files/l10n/zh_TW.php @@ -10,17 +10,29 @@ "Unshare" => "取消共享", "Delete" => "刪除", "Rename" => "重新命名", +"{new_name} already exists" => "{new_name} 已經存在", "replace" => "取代", "cancel" => "取消", +"replaced {new_name}" => "已取代 {new_name}", +"undo" => "復原", +"replaced {new_name} with {old_name}" => "使用 {new_name} 取代 {old_name}", "generating ZIP-file, it may take some time." => "產生壓縮檔, 它可能需要一段時間.", "Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0", "Upload Error" => "上傳發生錯誤", "Close" => "關閉", +"1 file uploading" => "1 個檔案正在上傳", +"{count} files uploading" => "{count} 個檔案正在上傳", "Upload cancelled." => "上傳取消", "File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中. 離開此頁面將會取消上傳.", +"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "無效的資料夾名稱. \"Shared\" 名稱已被 Owncloud 所保留使用", +"error while scanning" => "掃描時發生錯誤", "Name" => "名稱", "Size" => "大小", "Modified" => "修改", +"1 folder" => "1 個資料夾", +"{count} folders" => "{count} 個資料夾", +"1 file" => "1 個檔案", +"{count} files" => "{count} 個檔案", "File handling" => "檔案處理", "Maximum upload size" => "最大上傳容量", "max. possible: " => "最大允許: ", diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php new file mode 100644 index 0000000000..ab8c4caf24 --- /dev/null +++ b/apps/files_external/l10n/zh_TW.php @@ -0,0 +1,10 @@ + "外部儲存裝置", +"Mount point" => "掛載點", +"None set" => "尚未設定", +"All Users" => "所有使用者", +"Groups" => "群組", +"Users" => "使用者", +"Delete" => "刪除", +"Import Root Certificate" => "匯入根憑證" +); diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php index 27fa634c03..fa4f8075c6 100644 --- a/apps/files_sharing/l10n/zh_TW.php +++ b/apps/files_sharing/l10n/zh_TW.php @@ -1,6 +1,8 @@ "密碼", "Submit" => "送出", +"%s shared the folder %s with you" => "%s 分享了資料夾 %s 給您", +"%s shared the file %s with you" => "%s 分享了檔案 %s 給您", "Download" => "下載", "No preview available for" => "無法預覽" ); diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php new file mode 100644 index 0000000000..6f8fdefad0 --- /dev/null +++ b/apps/files_versions/l10n/zh_TW.php @@ -0,0 +1,6 @@ + "所有逾期的版本", +"History" => "歷史", +"Versions" => "版本", +"Enable" => "啟用" +); diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php index fd6a88d237..1bbd24f679 100644 --- a/apps/user_ldap/l10n/uk.php +++ b/apps/user_ldap/l10n/uk.php @@ -1,4 +1,37 @@ "Хост", +"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://", +"Base DN" => "Базовий DN", +"You can specify Base DN for users and groups in the Advanced tab" => "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково", +"User DN" => "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 клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми.", "Password" => "Пароль", +"For anonymous access, leave DN and Password empty." => "Для анонімного доступу, залиште DN і Пароль порожніми.", +"User Login Filter" => "Фільтр Користувачів, що під'єднуються", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході.", +"use %%uid placeholder, e.g. \"uid=%%uid\"" => "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\"", +"User List Filter" => "Фільтр Списку Користувачів", +"Defines the filter to apply, when retrieving users." => "Визначає фільтр, який застосовується при отриманні користувачів", +"without any placeholder, e.g. \"objectClass=person\"." => "без будь-якого заповнювача, наприклад: \"objectClass=person\".", +"Group Filter" => "Фільтр Груп", +"Defines the filter to apply, when retrieving groups." => "Визначає фільтр, який застосовується при отриманні груп.", +"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\".", +"Port" => "Порт", +"Base User Tree" => "Основне Дерево Користувачів", +"Base Group Tree" => "Основне Дерево Груп", +"Group-Member association" => "Асоціація Група-Член", +"Use TLS" => "Використовуйте TLS", +"Do not use it for SSL connections, it will fail." => "Не використовуйте його для SSL з'єднань, це не буде виконано.", +"Case insensitve LDAP server (Windows)" => "Нечутливий до регістру LDAP сервер (Windows)", +"Turn off SSL certificate validation." => "Вимкнути перевірку SSL сертифіката.", +"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер.", +"Not recommended, use for testing only." => "Не рекомендується, використовуйте лише для тестів.", +"User Display Name Field" => "Поле, яке відображає Ім'я Користувача", +"The LDAP attribute to use to generate the user`s ownCloud name." => "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud.", +"Group Display Name Field" => "Поле, яке відображає Ім'я Групи", +"The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP, який використовується для генерації імен груп ownCloud.", +"in bytes" => "в байтах", +"in seconds. A change empties the cache." => "в секундах. Зміна очищує кеш.", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.", "Help" => "Допомога" ); diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php new file mode 100644 index 0000000000..abc1b03d49 --- /dev/null +++ b/apps/user_ldap/l10n/zh_TW.php @@ -0,0 +1,6 @@ + "密碼", +"Use TLS" => "使用TLS", +"Turn off SSL certificate validation." => "關閉 SSL 憑證驗證", +"Help" => "說明" +); diff --git a/core/l10n/pl.php b/core/l10n/pl.php index de8c6e77b7..4b8b7fc844 100644 --- a/core/l10n/pl.php +++ b/core/l10n/pl.php @@ -1,15 +1,23 @@ "Typ kategorii nie podany.", "No category to add?" => "Brak kategorii", "This category already exists: " => "Ta kategoria już istnieje", +"Object type not provided." => "Typ obiektu nie podany.", +"%s ID not provided." => "%s ID nie podany.", +"Error adding %s to favorites." => "Błąd dodania %s do ulubionych.", "No categories selected for deletion." => "Nie ma kategorii zaznaczonych do usunięcia.", +"Error removing %s from favorites." => "Błąd usunięcia %s z ulubionych.", "Settings" => "Ustawienia", "seconds ago" => "sekund temu", "1 minute ago" => "1 minute temu", "{minutes} minutes ago" => "{minutes} minut temu", +"1 hour ago" => "1 godzine temu", +"{hours} hours ago" => "{hours} godzin temu", "today" => "dziś", "yesterday" => "wczoraj", "{days} days ago" => "{days} dni temu", "last month" => "ostani miesiąc", +"{months} months ago" => "{months} miesięcy temu", "months ago" => "miesięcy temu", "last year" => "ostatni rok", "years ago" => "lat temu", @@ -18,7 +26,10 @@ "No" => "Nie", "Yes" => "Tak", "Ok" => "Ok", +"The object type is not specified." => "Typ obiektu nie jest określony.", "Error" => "Błąd", +"The app name is not specified." => "Nazwa aplikacji nie jest określona.", +"The required file {file} is not installed!" => "Żądany plik {file} nie jest zainstalowany!", "Error while sharing" => "Błąd podczas współdzielenia", "Error while unsharing" => "Błąd podczas zatrzymywania współdzielenia", "Error while changing permissions" => "Błąd przy zmianie uprawnień", diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index 9fb2cf3663..a86dc1235b 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -5,9 +5,14 @@ "Settings" => "設定", "seconds ago" => "幾秒前", "1 minute ago" => "1 分鐘前", +"{minutes} minutes ago" => "{minutes} 分鐘前", +"1 hour ago" => "1 個小時前", +"{hours} hours ago" => "{hours} 個小時前", "today" => "今天", "yesterday" => "昨天", +"{days} days ago" => "{days} 天前", "last month" => "上個月", +"{months} months ago" => "{months} 個月前", "months ago" => "幾個月前", "last year" => "去年", "years ago" => "幾年前", @@ -16,9 +21,21 @@ "Yes" => "Yes", "Ok" => "Ok", "Error" => "錯誤", +"Error while sharing" => "分享時發生錯誤", +"Password protect" => "密碼保護", "Password" => "密碼", +"Set expiration date" => "設置到期日", +"Expiration date" => "到期日", +"Share via email:" => "透過email分享:", "Unshare" => "取消共享", +"can edit" => "可編輯", +"access control" => "存取控制", "create" => "建立", +"update" => "更新", +"delete" => "刪除", +"share" => "分享", +"Password protected" => "密碼保護", +"Error setting expiration date" => "錯誤的到期日設定", "ownCloud password reset" => "ownCloud 密碼重設", "Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: （聯結） ", "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱", @@ -38,6 +55,7 @@ "Edit categories" => "編輯分類", "Add" => "添加", "Security Warning" => "安全性警告", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "沒有可用的隨機數字產生器, 請啟用 PHP 中 OpenSSL 擴充功能.", "Create an admin account" => "建立一個管理者帳號", "Advanced" => "進階", "Data folder" => "資料夾", @@ -75,5 +93,7 @@ "Log in" => "登入", "You are logged out." => "你已登出", "prev" => "上一頁", -"next" => "下一頁" +"next" => "下一頁", +"Security Warning!" => "安全性警告!", +"Verify" => "驗證" ); diff --git a/l10n/el/files.po b/l10n/el/files.po index f5d245b261..144770834e 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:01+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 15:47+0000\n" +"Last-Translator: Dimitris M. \n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -109,7 +109,7 @@ msgstr "διαγραμμένα {files}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." @@ -150,7 +150,7 @@ msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέ #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του \"Shared\" είναι δεσμευμένη από το Owncloud" #: js/files.js:704 msgid "{count} files scanned" diff --git a/l10n/pl/core.po b/l10n/pl/core.po index a2671e4b8e..d4a3154242 100644 --- a/l10n/pl/core.po +++ b/l10n/pl/core.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 08:53+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +29,7 @@ msgstr "" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." -msgstr "" +msgstr "Typ kategorii nie podany." #: ajax/vcategories/add.php:30 msgid "No category to add?" @@ -43,18 +43,18 @@ msgstr "Ta kategoria już istnieje" #: ajax/vcategories/favorites.php:24 #: ajax/vcategories/removeFromFavorites.php:26 msgid "Object type not provided." -msgstr "" +msgstr "Typ obiektu nie podany." #: ajax/vcategories/addToFavorites.php:30 #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "" +msgstr "%s ID nie podany." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "" +msgstr "Błąd dodania %s do ulubionych." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." @@ -63,61 +63,61 @@ msgstr "Nie ma kategorii zaznaczonych do usunięcia." #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "" +msgstr "Błąd usunięcia %s z ulubionych." -#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60 +#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 msgid "Settings" msgstr "Ustawienia" -#: js/js.js:688 +#: js/js.js:704 msgid "seconds ago" msgstr "sekund temu" -#: js/js.js:689 +#: js/js.js:705 msgid "1 minute ago" msgstr "1 minute temu" -#: js/js.js:690 +#: js/js.js:706 msgid "{minutes} minutes ago" msgstr "{minutes} minut temu" -#: js/js.js:691 +#: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "1 godzine temu" -#: js/js.js:692 +#: js/js.js:708 msgid "{hours} hours ago" -msgstr "" +msgstr "{hours} godzin temu" -#: js/js.js:693 +#: js/js.js:709 msgid "today" msgstr "dziś" -#: js/js.js:694 +#: js/js.js:710 msgid "yesterday" msgstr "wczoraj" -#: js/js.js:695 +#: js/js.js:711 msgid "{days} days ago" msgstr "{days} dni temu" -#: js/js.js:696 +#: js/js.js:712 msgid "last month" msgstr "ostani miesiąc" -#: js/js.js:697 +#: js/js.js:713 msgid "{months} months ago" -msgstr "" +msgstr "{months} miesięcy temu" -#: js/js.js:698 +#: js/js.js:714 msgid "months ago" msgstr "miesięcy temu" -#: js/js.js:699 +#: js/js.js:715 msgid "last year" msgstr "ostatni rok" -#: js/js.js:700 +#: js/js.js:716 msgid "years ago" msgstr "lat temu" @@ -144,21 +144,21 @@ 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 msgid "The object type is not specified." -msgstr "" +msgstr "Typ obiektu nie jest określony." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525 -#: js/share.js:537 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533 +#: js/share.js:545 msgid "Error" msgstr "Błąd" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "" +msgstr "Nazwa aplikacji nie jest określona." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" -msgstr "" +msgstr "Żądany plik {file} nie jest zainstalowany!" #: js/share.js:124 msgid "Error while sharing" @@ -249,15 +249,15 @@ msgstr "usuń" msgid "share" msgstr "współdziel" -#: js/share.js:343 js/share.js:512 js/share.js:514 +#: js/share.js:349 js/share.js:520 js/share.js:522 msgid "Password protected" msgstr "Zabezpieczone hasłem" -#: js/share.js:525 +#: js/share.js:533 msgid "Error unsetting expiration date" msgstr "Błąd niszczenie daty wygaśnięcia" -#: js/share.js:537 +#: js/share.js:545 msgid "Error setting expiration date" msgstr "Błąd podczas ustawiania daty wygaśnięcia" @@ -412,87 +412,87 @@ msgstr "Komputer bazy danych" msgid "Finish setup" msgstr "Zakończ konfigurowanie" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Sunday" msgstr "Niedziela" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Monday" msgstr "Poniedziałek" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Tuesday" msgstr "Wtorek" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Wednesday" msgstr "Środa" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Thursday" msgstr "Czwartek" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Friday" msgstr "Piątek" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Saturday" msgstr "Sobota" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "January" msgstr "Styczeń" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "February" msgstr "Luty" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "March" msgstr "Marzec" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "April" msgstr "Kwiecień" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "May" msgstr "Maj" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "June" msgstr "Czerwiec" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "July" msgstr "Lipiec" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "August" msgstr "Sierpień" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "September" msgstr "Wrzesień" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "October" msgstr "Październik" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "November" msgstr "Listopad" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "December" msgstr "Grudzień" -#: templates/layout.guest.php:41 +#: templates/layout.guest.php:42 msgid "web services under your control" msgstr "usługi internetowe pod kontrolą" -#: templates/layout.user.php:44 +#: templates/layout.user.php:45 msgid "Log out" msgstr "Wylogowuje użytkownika" diff --git a/l10n/pl/files.po b/l10n/pl/files.po index f09de78d3d..297b437139 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/files.po @@ -9,13 +9,14 @@ # , 2011. # , 2012. # Piotr Sokół , 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 05:59+0000\n" +"Last-Translator: Thomasso \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -109,7 +110,7 @@ msgstr "usunięto {files}" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "Niepoprawna nazwa, Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*'są niedozwolone." #: js/files.js:183 msgid "generating ZIP-file, it may take some time." @@ -150,7 +151,7 @@ msgstr "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zost #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "Błędna nazwa folderu. Nazwa \"Shared\" jest zarezerwowana dla Owncloud" #: js/files.js:704 msgid "{count} files scanned" diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po index 8a509fbecf..0cebd73183 100644 --- a/l10n/pl/lib.po +++ b/l10n/pl/lib.po @@ -4,14 +4,15 @@ # # Translators: # Cyryl Sochacki <>, 2012. +# Cyryl Sochacki , 2012. # Marcin Małecki , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 08:54+0000\n" +"Last-Translator: Cyryl Sochacki \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,19 +44,19 @@ msgstr "Aplikacje" msgid "Admin" msgstr "Administrator" -#: files.php:332 +#: files.php:361 msgid "ZIP download is turned off." msgstr "Pobieranie ZIP jest wyłączone." -#: files.php:333 +#: files.php:362 msgid "Files need to be downloaded one by one." msgstr "Pliki muszą zostać pobrane pojedynczo." -#: files.php:333 files.php:358 +#: files.php:362 files.php:387 msgid "Back to Files" msgstr "Wróć do plików" -#: files.php:357 +#: files.php:386 msgid "Selected files too large to generate zip file." msgstr "Wybrane pliki są zbyt duże, aby wygenerować plik zip." @@ -98,12 +99,12 @@ msgstr "%d minut temu" #: template.php:106 msgid "1 hour ago" -msgstr "" +msgstr "1 godzine temu" #: template.php:107 #, php-format msgid "%d hours ago" -msgstr "" +msgstr "%d godzin temu" #: template.php:108 msgid "today" @@ -125,7 +126,7 @@ msgstr "ostatni miesiąc" #: template.php:112 #, php-format msgid "%d months ago" -msgstr "" +msgstr "%d miesiecy temu" #: template.php:113 msgid "last year" @@ -151,4 +152,4 @@ msgstr "wybór aktualizacji jest wyłączony" #: vcategories.php:188 vcategories.php:249 #, php-format msgid "Could not find category \"%s\"" -msgstr "" +msgstr "Nie można odnaleźć kategorii \"%s\"" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 066258912d..ad4af34712 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"POT-Creation-Date: 2012-11-28 00:10+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 9e9b9c8a37..801c9a04eb 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"POT-Creation-Date: 2012-11-28 00:10+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 ae938e7936..3fb6746626 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"POT-Creation-Date: 2012-11-28 00:10+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 914289d74f..12569fba50 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-27 00:09+0100\n" +"POT-Creation-Date: 2012-11-28 00:10+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 819e1fdae2..74f89b6760 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"POT-Creation-Date: 2012-11-28 00:10+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 1a0d45b2c1..62ec669218 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"POT-Creation-Date: 2012-11-28 00:10+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 5aec951442..9d0e0dd1d2 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"POT-Creation-Date: 2012-11-28 00:10+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 d44ef6475c..c6d312fe50 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"POT-Creation-Date: 2012-11-28 00:10+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 9772531424..4ccfa1b35b 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"POT-Creation-Date: 2012-11-28 00:10+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 1bb445c451..bea089c005 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-27 00:10+0100\n" +"POT-Creation-Date: 2012-11-28 00:10+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.po b/l10n/th_TH/files.po index ae327f9958..e9b988f70b 100644 --- a/l10n/th_TH/files.po +++ b/l10n/th_TH/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 01:43+0000\n" +"Last-Translator: AriesAnywhere Anywhere \n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,7 +105,7 @@ msgstr "ลบไฟล์แล้ว {files} ไฟล์" msgid "" "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not " "allowed." -msgstr "" +msgstr "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้" #: js/files.js:183 msgid "generating ZIP-file, it may take some time." @@ -146,7 +146,7 @@ msgstr "การอัพโหลดไฟล์กำลังอยู่ใ #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "ชื่อโฟลเดอร์ที่ใช้ไม่ถูกต้อง การใช้งาน \"ถูกแชร์\" ถูกสงวนไว้เฉพาะ Owncloud เท่านั้น" #: js/files.js:704 msgid "{count} files scanned" diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po index d82593c3df..dd12c4f2b2 100644 --- a/l10n/uk/user_ldap.po +++ b/l10n/uk/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: 2012-09-11 02:02+0200\n" -"PO-Revision-Date: 2012-09-10 11:08+0000\n" -"Last-Translator: VicDeo \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 12:54+0000\n" +"Last-Translator: volodya327 \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,31 +20,31 @@ msgstr "" #: templates/settings.php:8 msgid "Host" -msgstr "" +msgstr "Хост" #: templates/settings.php:8 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" -msgstr "" +msgstr "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://" #: templates/settings.php:9 msgid "Base DN" -msgstr "" +msgstr "Базовий DN" #: templates/settings.php:9 msgid "You can specify Base DN for users and groups in the Advanced tab" -msgstr "" +msgstr "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково" #: templates/settings.php:10 msgid "User DN" -msgstr "" +msgstr "DN Користувача" #: templates/settings.php:10 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 "" +msgstr "DN клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми." #: templates/settings.php:11 msgid "Password" @@ -52,119 +52,119 @@ msgstr "Пароль" #: templates/settings.php:11 msgid "For anonymous access, leave DN and Password empty." -msgstr "" +msgstr "Для анонімного доступу, залиште DN і Пароль порожніми." #: templates/settings.php:12 msgid "User Login Filter" -msgstr "" +msgstr "Фільтр Користувачів, що під'єднуються" #: templates/settings.php:12 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." -msgstr "" +msgstr "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході." #: templates/settings.php:12 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" -msgstr "" +msgstr "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\"" #: templates/settings.php:13 msgid "User List Filter" -msgstr "" +msgstr "Фільтр Списку Користувачів" #: templates/settings.php:13 msgid "Defines the filter to apply, when retrieving users." -msgstr "" +msgstr "Визначає фільтр, який застосовується при отриманні користувачів" #: templates/settings.php:13 msgid "without any placeholder, e.g. \"objectClass=person\"." -msgstr "" +msgstr "без будь-якого заповнювача, наприклад: \"objectClass=person\"." #: templates/settings.php:14 msgid "Group Filter" -msgstr "" +msgstr "Фільтр Груп" #: templates/settings.php:14 msgid "Defines the filter to apply, when retrieving groups." -msgstr "" +msgstr "Визначає фільтр, який застосовується при отриманні груп." #: templates/settings.php:14 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." -msgstr "" +msgstr "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\"." #: templates/settings.php:17 msgid "Port" -msgstr "" +msgstr "Порт" #: templates/settings.php:18 msgid "Base User Tree" -msgstr "" +msgstr "Основне Дерево Користувачів" #: templates/settings.php:19 msgid "Base Group Tree" -msgstr "" +msgstr "Основне Дерево Груп" #: templates/settings.php:20 msgid "Group-Member association" -msgstr "" +msgstr "Асоціація Група-Член" #: templates/settings.php:21 msgid "Use TLS" -msgstr "" +msgstr "Використовуйте TLS" #: templates/settings.php:21 msgid "Do not use it for SSL connections, it will fail." -msgstr "" +msgstr "Не використовуйте його для SSL з'єднань, це не буде виконано." #: templates/settings.php:22 msgid "Case insensitve LDAP server (Windows)" -msgstr "" +msgstr "Нечутливий до регістру LDAP сервер (Windows)" #: templates/settings.php:23 msgid "Turn off SSL certificate validation." -msgstr "" +msgstr "Вимкнути перевірку SSL сертифіката." #: templates/settings.php:23 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." -msgstr "" +msgstr "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер." #: templates/settings.php:23 msgid "Not recommended, use for testing only." -msgstr "" +msgstr "Не рекомендується, використовуйте лише для тестів." #: templates/settings.php:24 msgid "User Display Name Field" -msgstr "" +msgstr "Поле, яке відображає Ім'я Користувача" #: templates/settings.php:24 msgid "The LDAP attribute to use to generate the user`s ownCloud name." -msgstr "" +msgstr "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud." #: templates/settings.php:25 msgid "Group Display Name Field" -msgstr "" +msgstr "Поле, яке відображає Ім'я Групи" #: templates/settings.php:25 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." -msgstr "" +msgstr "Атрибут LDAP, який використовується для генерації імен груп ownCloud." #: templates/settings.php:27 msgid "in bytes" -msgstr "" +msgstr "в байтах" #: templates/settings.php:29 msgid "in seconds. A change empties the cache." -msgstr "" +msgstr "в секундах. Зміна очищує кеш." #: templates/settings.php:30 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." -msgstr "" +msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD." #: templates/settings.php:32 msgid "Help" diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po index 896dcf9990..f6f204e212 100644 --- a/l10n/zh_TW/core.po +++ b/l10n/zh_TW/core.po @@ -4,14 +4,15 @@ # # Translators: # Donahue Chuang , 2012. +# , 2012. # Ming Yi Wu , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-16 00:02+0100\n" -"PO-Revision-Date: 2012-11-14 23:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 14:16+0000\n" +"Last-Translator: dw4dev \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,59 +58,59 @@ msgstr "沒選擇要刪除的分類" msgid "Error removing %s from favorites." msgstr "" -#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60 +#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61 msgid "Settings" msgstr "設定" -#: js/js.js:688 +#: js/js.js:704 msgid "seconds ago" msgstr "幾秒前" -#: js/js.js:689 +#: js/js.js:705 msgid "1 minute ago" msgstr "1 分鐘前" -#: js/js.js:690 +#: js/js.js:706 msgid "{minutes} minutes ago" -msgstr "" +msgstr "{minutes} 分鐘前" -#: js/js.js:691 +#: js/js.js:707 msgid "1 hour ago" -msgstr "" +msgstr "1 個小時前" -#: js/js.js:692 +#: js/js.js:708 msgid "{hours} hours ago" -msgstr "" +msgstr "{hours} 個小時前" -#: js/js.js:693 +#: js/js.js:709 msgid "today" msgstr "今天" -#: js/js.js:694 +#: js/js.js:710 msgid "yesterday" msgstr "昨天" -#: js/js.js:695 +#: js/js.js:711 msgid "{days} days ago" -msgstr "" +msgstr "{days} 天前" -#: js/js.js:696 +#: js/js.js:712 msgid "last month" msgstr "上個月" -#: js/js.js:697 +#: js/js.js:713 msgid "{months} months ago" -msgstr "" +msgstr "{months} 個月前" -#: js/js.js:698 +#: js/js.js:714 msgid "months ago" msgstr "幾個月前" -#: js/js.js:699 +#: js/js.js:715 msgid "last year" msgstr "去年" -#: js/js.js:700 +#: js/js.js:716 msgid "years ago" msgstr "幾年前" @@ -139,8 +140,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:135 js/share.js:142 js/share.js:525 -#: js/share.js:537 +#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533 +#: js/share.js:545 msgid "Error" msgstr "錯誤" @@ -154,7 +155,7 @@ msgstr "" #: js/share.js:124 msgid "Error while sharing" -msgstr "" +msgstr "分享時發生錯誤" #: js/share.js:135 msgid "Error while unsharing" @@ -182,7 +183,7 @@ msgstr "" #: js/share.js:164 msgid "Password protect" -msgstr "" +msgstr "密碼保護" #: js/share.js:168 templates/installation.php:42 templates/login.php:24 #: templates/verify.php:13 @@ -191,15 +192,15 @@ msgstr "密碼" #: js/share.js:173 msgid "Set expiration date" -msgstr "" +msgstr "設置到期日" #: js/share.js:174 msgid "Expiration date" -msgstr "" +msgstr "到期日" #: js/share.js:206 msgid "Share via email:" -msgstr "" +msgstr "透過email分享:" #: js/share.js:208 msgid "No people found" @@ -219,11 +220,11 @@ msgstr "取消共享" #: js/share.js:304 msgid "can edit" -msgstr "" +msgstr "可編輯" #: js/share.js:306 msgid "access control" -msgstr "" +msgstr "存取控制" #: js/share.js:309 msgid "create" @@ -231,27 +232,27 @@ msgstr "建立" #: js/share.js:312 msgid "update" -msgstr "" +msgstr "更新" #: js/share.js:315 msgid "delete" -msgstr "" +msgstr "刪除" #: js/share.js:318 msgid "share" -msgstr "" +msgstr "分享" -#: js/share.js:343 js/share.js:512 js/share.js:514 +#: js/share.js:349 js/share.js:520 js/share.js:522 msgid "Password protected" -msgstr "" +msgstr "密碼保護" -#: js/share.js:525 +#: js/share.js:533 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:537 +#: js/share.js:545 msgid "Error setting expiration date" -msgstr "" +msgstr "錯誤的到期日設定" #: lostpassword/controller.php:47 msgid "ownCloud password reset" @@ -342,7 +343,7 @@ msgstr "安全性警告" msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "" +msgstr "沒有可用的隨機數字產生器, 請啟用 PHP 中 OpenSSL 擴充功能." #: templates/installation.php:26 msgid "" @@ -404,87 +405,87 @@ msgstr "資料庫主機" msgid "Finish setup" msgstr "完成設定" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Sunday" msgstr "週日" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Monday" msgstr "週一" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Tuesday" msgstr "週二" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Wednesday" msgstr "週三" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Thursday" msgstr "週四" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Friday" msgstr "週五" -#: templates/layout.guest.php:15 templates/layout.user.php:16 +#: templates/layout.guest.php:16 templates/layout.user.php:17 msgid "Saturday" msgstr "週六" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "January" msgstr "一月" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "February" msgstr "二月" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "March" msgstr "三月" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "April" msgstr "四月" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "May" msgstr "五月" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "June" msgstr "六月" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "July" msgstr "七月" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "August" msgstr "八月" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "September" msgstr "九月" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "October" msgstr "十月" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "November" msgstr "十一月" -#: templates/layout.guest.php:16 templates/layout.user.php:17 +#: templates/layout.guest.php:17 templates/layout.user.php:18 msgid "December" msgstr "十二月" -#: templates/layout.guest.php:41 +#: templates/layout.guest.php:42 msgid "web services under your control" msgstr "網路服務已在你控制" -#: templates/layout.user.php:44 +#: templates/layout.user.php:45 msgid "Log out" msgstr "登出" @@ -528,7 +529,7 @@ msgstr "下一頁" #: templates/verify.php:5 msgid "Security Warning!" -msgstr "" +msgstr "安全性警告!" #: templates/verify.php:6 msgid "" @@ -538,4 +539,4 @@ msgstr "" #: templates/verify.php:16 msgid "Verify" -msgstr "" +msgstr "驗證" diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po index 10f9f22e38..e204660689 100644 --- a/l10n/zh_TW/files.po +++ b/l10n/zh_TW/files.po @@ -4,15 +4,16 @@ # # Translators: # Donahue Chuang , 2012. +# , 2012. # Eddy Chang , 2012. # ywang , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-24 00:01+0100\n" -"PO-Revision-Date: 2012-11-23 23:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 14:11+0000\n" +"Last-Translator: dw4dev \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,7 +69,7 @@ msgstr "重新命名" #: js/filelist.js:201 js/filelist.js:203 msgid "{new_name} already exists" -msgstr "" +msgstr "{new_name} 已經存在" #: js/filelist.js:201 js/filelist.js:203 msgid "replace" @@ -84,15 +85,15 @@ msgstr "取消" #: js/filelist.js:250 msgid "replaced {new_name}" -msgstr "" +msgstr "已取代 {new_name}" #: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286 msgid "undo" -msgstr "" +msgstr "復原" #: js/filelist.js:252 msgid "replaced {new_name} with {old_name}" -msgstr "" +msgstr "使用 {new_name} 取代 {old_name}" #: js/filelist.js:284 msgid "unshared {files}" @@ -130,11 +131,11 @@ msgstr "" #: js/files.js:274 msgid "1 file uploading" -msgstr "" +msgstr "1 個檔案正在上傳" #: js/files.js:277 js/files.js:331 js/files.js:346 msgid "{count} files uploading" -msgstr "" +msgstr "{count} 個檔案正在上傳" #: js/files.js:349 js/files.js:382 msgid "Upload cancelled." @@ -147,7 +148,7 @@ msgstr "檔案上傳中. 離開此頁面將會取消上傳." #: js/files.js:523 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" -msgstr "" +msgstr "無效的資料夾名稱. \"Shared\" 名稱已被 Owncloud 所保留使用" #: js/files.js:704 msgid "{count} files scanned" @@ -155,7 +156,7 @@ msgstr "" #: js/files.js:712 msgid "error while scanning" -msgstr "" +msgstr "掃描時發生錯誤" #: js/files.js:785 templates/index.php:50 msgid "Name" @@ -171,19 +172,19 @@ msgstr "修改" #: js/files.js:814 msgid "1 folder" -msgstr "" +msgstr "1 個資料夾" #: js/files.js:816 msgid "{count} folders" -msgstr "" +msgstr "{count} 個資料夾" #: js/files.js:824 msgid "1 file" -msgstr "" +msgstr "1 個檔案" #: js/files.js:826 msgid "{count} files" -msgstr "" +msgstr "{count} 個檔案" #: templates/admin.php:5 msgid "File handling" diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po index ee66860464..ceb2a6c363 100644 --- a/l10n/zh_TW/files_external.po +++ b/l10n/zh_TW/files_external.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-10-02 23:16+0200\n" -"PO-Revision-Date: 2012-10-02 21:17+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 14:30+0000\n" +"Last-Translator: dw4dev \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,11 +44,11 @@ msgstr "" #: templates/settings.php:3 msgid "External Storage" -msgstr "" +msgstr "外部儲存裝置" #: templates/settings.php:7 templates/settings.php:19 msgid "Mount point" -msgstr "" +msgstr "掛載點" #: templates/settings.php:8 msgid "Backend" @@ -71,23 +72,23 @@ msgstr "" #: templates/settings.php:54 templates/settings.php:62 msgid "None set" -msgstr "" +msgstr "尚未設定" #: templates/settings.php:63 msgid "All Users" -msgstr "" +msgstr "所有使用者" #: templates/settings.php:64 msgid "Groups" -msgstr "" +msgstr "群組" #: templates/settings.php:69 msgid "Users" -msgstr "" +msgstr "使用者" #: templates/settings.php:77 templates/settings.php:107 msgid "Delete" -msgstr "" +msgstr "刪除" #: templates/settings.php:87 msgid "Enable User External Storage" @@ -103,4 +104,4 @@ msgstr "" #: templates/settings.php:113 msgid "Import Root Certificate" -msgstr "" +msgstr "匯入根憑證" diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po index 8db01e4d10..01ec04db5b 100644 --- a/l10n/zh_TW/files_sharing.po +++ b/l10n/zh_TW/files_sharing.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 14:28+0000\n" +"Last-Translator: dw4dev \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,24 +27,24 @@ msgstr "密碼" msgid "Submit" msgstr "送出" -#: templates/public.php:9 +#: templates/public.php:17 #, php-format msgid "%s shared the folder %s with you" -msgstr "" +msgstr "%s 分享了資料夾 %s 給您" -#: templates/public.php:11 +#: templates/public.php:19 #, php-format msgid "%s shared the file %s with you" -msgstr "" +msgstr "%s 分享了檔案 %s 給您" -#: templates/public.php:14 templates/public.php:30 +#: templates/public.php:22 templates/public.php:38 msgid "Download" msgstr "下載" -#: templates/public.php:29 +#: templates/public.php:37 msgid "No preview available for" msgstr "無法預覽" -#: templates/public.php:37 +#: templates/public.php:43 msgid "web services under your control" msgstr "" diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po index ed8a556567..3e9e1fb824 100644 --- a/l10n/zh_TW/files_versions.po +++ b/l10n/zh_TW/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 14:25+0000\n" +"Last-Translator: dw4dev \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,15 +20,15 @@ msgstr "" #: js/settings-personal.js:31 templates/settings-personal.php:10 msgid "Expire all versions" -msgstr "" +msgstr "所有逾期的版本" #: js/versions.js:16 msgid "History" -msgstr "" +msgstr "歷史" #: templates/settings-personal.php:4 msgid "Versions" -msgstr "" +msgstr "版本" #: templates/settings-personal.php:7 msgid "This will delete all existing backup versions of your files" @@ -39,4 +40,4 @@ msgstr "" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "啟用" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index b67e070e19..16774ce405 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/settings.po @@ -4,6 +4,7 @@ # # Translators: # Donahue Chuang , 2012. +# , 2012. # , 2012. # , 2012. # , 2012. @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-12 00:01+0100\n" -"PO-Revision-Date: 2012-11-11 14:57+0000\n" -"Last-Translator: sy6614 \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 14:02+0000\n" +"Last-Translator: dw4dev \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -143,7 +144,7 @@ msgstr "答案" #: templates/personal.php:8 #, php-format msgid "You have used %s of the available %s" -msgstr "" +msgstr "您已經使用了 %s ，目前可用空間為 %s" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po index f57f67dde9..ca4a4be144 100644 --- a/l10n/zh_TW/user_ldap.po +++ b/l10n/zh_TW/user_ldap.po @@ -3,19 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"PO-Revision-Date: 2012-11-27 14:32+0000\n" +"Last-Translator: dw4dev \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_TW\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 msgid "Host" @@ -47,7 +48,7 @@ msgstr "" #: templates/settings.php:11 msgid "Password" -msgstr "" +msgstr "密碼" #: templates/settings.php:11 msgid "For anonymous access, leave DN and Password empty." @@ -111,7 +112,7 @@ msgstr "" #: templates/settings.php:21 msgid "Use TLS" -msgstr "" +msgstr "使用TLS" #: templates/settings.php:21 msgid "Do not use it for SSL connections, it will fail." @@ -123,7 +124,7 @@ msgstr "" #: templates/settings.php:23 msgid "Turn off SSL certificate validation." -msgstr "" +msgstr "關閉 SSL 憑證驗證" #: templates/settings.php:23 msgid "" @@ -167,4 +168,4 @@ msgstr "" #: templates/settings.php:32 msgid "Help" -msgstr "" +msgstr "說明" diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php index f6397936d6..6f84a328ed 100644 --- a/lib/l10n/pl.php +++ b/lib/l10n/pl.php @@ -18,13 +18,17 @@ "seconds ago" => "sekund temu", "1 minute ago" => "1 minutę temu", "%d minutes ago" => "%d minut temu", +"1 hour ago" => "1 godzine temu", +"%d hours ago" => "%d godzin temu", "today" => "dzisiaj", "yesterday" => "wczoraj", "%d days ago" => "%d dni temu", "last month" => "ostatni miesiąc", +"%d months ago" => "%d miesiecy temu", "last year" => "ostatni rok", "years ago" => "lat temu", "%s is available. Get more information" => "%s jest dostępna. Uzyskaj więcej informacji", "up to date" => "Aktualne", -"updates check is disabled" => "wybór aktualizacji jest wyłączony" +"updates check is disabled" => "wybór aktualizacji jest wyłączony", +"Could not find category \"%s\"" => "Nie można odnaleźć kategorii \"%s\"" ); diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php index 214ad24530..35d77df214 100644 --- a/settings/l10n/zh_TW.php +++ b/settings/l10n/zh_TW.php @@ -28,6 +28,7 @@ "Problems connecting to help database." => "連接到求助資料庫時發生問題", "Go there manually." => "手動前往", "Answer" => "答案", +"You have used %s of the available %s" => "您已經使用了 %s ，目前可用空間為 %s", "Desktop and Mobile Syncing Clients" => "桌機與手機同步客戶端", "Download" => "下載", "Your password was changed" => "你的密碼已更改", From 60f4ea8ddce9d5de475e260a5021a20a3479b031 Mon Sep 17 00:00:00 2001 From: Sam Tuke Date: Wed, 28 Nov 2012 15:10:58 +0000 Subject: [PATCH 17/26] Cleaned up docblock comments --- lib/connector/sabre/node.php | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php index 9fffa108d2..52350072fb 100644 --- a/lib/connector/sabre/node.php +++ b/lib/connector/sabre/node.php @@ -50,8 +50,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr protected $property_cache = null; /** - * Sets up the node, expects a full path name - * + * @brief Sets up the node, expects a full path name * @param string $path * @return void */ @@ -62,8 +61,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr /** - * Returns the name of the node - * + * @brief Returns the name of the node * @return string */ public function getName() { @@ -74,8 +72,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr } /** - * Renames the node - * + * @brief Renames the node * @param string $name The new name * @return void */ @@ -102,7 +99,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr } /** - * Make sure the fileinfo cache is filled. Uses OC_FileCache or a direct stat + * @brief Ensure that the fileinfo cache is filled + & @note Uses OC_FileCache or a direct stat */ protected function getFileinfoCache() { if (!isset($this->fileinfo_cache)) { @@ -121,8 +119,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr } /** - * Returns the last modification time, as a unix timestamp - * + * @brief Returns the last modification time, as a unix timestamp * @return int */ public function getLastModified() { @@ -141,8 +138,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr } /** - * Updates properties on this node, - * + * @brief Updates properties on this node, * @param array $mutations * @see Sabre_DAV_IProperties::updateProperties * @return bool|array @@ -177,15 +173,13 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr } /** - * Returns a list of properties for this nodes.; - * - * The properties list is a list of propertynames the client requested, - * encoded as xmlnamespace#tagName, for example: - * http://www.example.org/namespace#author - * If the array is empty, all properties should be returned - * + * @brief Returns a list of properties for this nodes.; * @param array $properties * @return array + * @note The properties list is a list of propertynames the client + * requested, encoded as xmlnamespace#tagName, for example: + * http://www.example.org/namespace#author If the array is empty, all + * properties should be returned */ public function getProperties($properties) { if (is_null($this->property_cache)) { @@ -211,7 +205,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr } /** - * Creates a ETag for this path. + * @brief Creates a ETag for this path. * @param string $path Path of the file * @return string|null Returns null if the ETag can not effectively be determined */ @@ -225,7 +219,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr } /** - * Returns the ETag surrounded by double-quotes for this path. + * @brief Returns the ETag surrounded by double-quotes for this path. * @param string $path Path of the file * @return string|null Returns null if the ETag can not effectively be determined */ @@ -241,7 +235,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr } /** - * Remove the ETag from the cache. + * @brief Remove the ETag from the cache. * @param string $path Path of the file */ static public function removeETagPropertyForPath($path) { From ab1370277036b337040ce180614f967295ad287a Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 28 Nov 2012 17:57:31 +0100 Subject: [PATCH 18/26] make some checks server-side --- settings/ajax/togglegroups.php | 6 ++++++ settings/js/users.js | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php index de941f9913..931ab2689e 100644 --- a/settings/ajax/togglegroups.php +++ b/settings/ajax/togglegroups.php @@ -7,6 +7,12 @@ $success = true; $username = $_POST["username"]; $group = OC_Util::sanitizeHTML($_POST["group"]); +if($username == OC_User::getUser() && $group == "admin" && OC_Group::inGroup($username, 'admin')){ + $l = OC_L10N::get('core'); + OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group')))); + exit(); +} + if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) { $l = OC_L10N::get('core'); OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); diff --git a/settings/js/users.js b/settings/js/users.js index 517984f924..af83e0321a 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -165,9 +165,6 @@ var UserList={ } if(user){ var checkHandeler=function(group){ - if(user==OC.currentUser && group=='admin'){ - return false; - } if(!isadmin && checked.length == 1 && checked[0] == group){ return false; } From 37e524dc6d12c9a7d8b8f845b5a2a04506783cf1 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 28 Nov 2012 18:30:47 +0100 Subject: [PATCH 19/26] added more unittests for the group file --- tests/lib/group.php | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/tests/lib/group.php b/tests/lib/group.php index 7b9ca3414b..28264b0f16 100644 --- a/tests/lib/group.php +++ b/tests/lib/group.php @@ -3,7 +3,9 @@ * ownCloud * * @author Robin Appelman +* @author Bernhard Posselt * @copyright 2012 Robin Appelman icewind@owncloud.com +* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -62,6 +64,72 @@ class Test_Group extends UnitTestCase { $this->assertFalse(OC_Group::inGroup($user1, $group1)); } + + public function testNoEmptyGIDs(){ + OC_Group::useBackend(new OC_Group_Dummy()); + $emptyGroup = null; + + $this->assertEqual(false, OC_Group::createGroup($emptyGroup)); + } + + + public function testNoGroupsTwice(){ + OC_Group::useBackend(new OC_Group_Dummy()); + $group = uniqid(); + OC_Group::createGroup($group); + + $groupCopy = $group; + + $this->assertEqual(false, OC_Group::createGroup($groupCopy)); + $this->assertEqual(array($group), OC_Group::getGroups()); + } + + + public function testDontDeleteAdminGroup(){ + OC_Group::useBackend(new OC_Group_Dummy()); + $adminGroup = 'admin'; + OC_Group::createGroup($adminGroup); + + $this->assertEqual(false, OC_Group::deleteGroup($adminGroup)); + $this->assertEqual(array($adminGroup), OC_Group::getGroups()); + } + + + public function testDontAddUserToNonexistentGroup(){ + OC_Group::useBackend(new OC_Group_Dummy()); + $groupNonExistent = 'notExistent'; + $user = uniqid(); + + $this->assertEqual(false, OC_Group::addToGroup($user, $groupNonExistent)); + $this->assertEqual(array(), OC_Group::getGroups()); + } + + + public function testUsersInGroup(){ + OC_Group::useBackend(new OC_Group_Dummy()); + $group1 = uniqid(); + $group2 = uniqid(); + $group3 = uniqid(); + $user1 = uniqid(); + $user2 = uniqid(); + $user3 = uniqid(); + OC_Group::createGroup($group1); + OC_Group::createGroup($group2); + OC_Group::createGroup($group3); + + OC_Group::addToGroup($user1, $group1); + OC_Group::addToGroup($user2, $group1); + OC_Group::addToGroup($user3, $group1); + OC_Group::addToGroup($user3, $group2); + + $this->assertEqual(array($user1, $user2, $user3), + OC_Group::usersInGroups(array($group1, $group2, $group3))); + + // FIXME: needs more parameter variation + } + + + function testMultiBackend() { $backend1=new OC_Group_Dummy(); $backend2=new OC_Group_Dummy(); From a5774229a13ef307dabe3142d1a85f12bf41b391 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 28 Nov 2012 18:40:00 +0100 Subject: [PATCH 20/26] fix group and subadmin managing for 'ajax-loaded' users --- settings/js/users.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/settings/js/users.js b/settings/js/users.js index af83e0321a..7c022e5293 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -71,15 +71,10 @@ var UserList={ var tr = $('tbody tr').first().clone(); tr.attr('data-uid', username); tr.find('td.name').text(username); - var groupsSelect = $(''); tr.find('td.groups').empty(); if (tr.find('td.subadmins').length > 0) { - var subadminSelect = $(''); tr.find('td.subadmins').empty(); } var allGroups = String($('#content table').attr('data-groups')).split(', '); From 4c83a4c918f94413bd1a1dcbc64305e3fd25e291 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 28 Nov 2012 18:40:58 +0100 Subject: [PATCH 21/26] add a client side check --- settings/js/users.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/settings/js/users.js b/settings/js/users.js index 7c022e5293..a278b41721 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -160,6 +160,9 @@ var UserList={ } if(user){ var checkHandeler=function(group){ + if(user==OC.currentUser && group=='admin'){ + return false; + } if(!isadmin && checked.length == 1 && checked[0] == group){ return false; } From 6c3f43b06137e30db70424bba21485d40afd991f Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 29 Nov 2012 00:04:57 +0100 Subject: [PATCH 22/26] [tx-robot] updated from transifex --- apps/files_versions/l10n/zh_TW.php | 1 + core/l10n/zh_TW.php | 7 +++++++ l10n/de/files.po | 6 +++--- l10n/de_DE/files.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_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_TW/core.po | 18 +++++++++--------- l10n/zh_TW/files_versions.po | 6 +++--- 16 files changed, 36 insertions(+), 28 deletions(-) diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php index 6f8fdefad0..a21fdc85f8 100644 --- a/apps/files_versions/l10n/zh_TW.php +++ b/apps/files_versions/l10n/zh_TW.php @@ -2,5 +2,6 @@ "Expire all versions" => "所有逾期的版本", "History" => "歷史", "Versions" => "版本", +"Files Versioning" => "檔案版本化中...", "Enable" => "啟用" ); diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index a86dc1235b..2d5bb40708 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -16,17 +16,22 @@ "months ago" => "幾個月前", "last year" => "去年", "years ago" => "幾年前", +"Choose" => "選擇", "Cancel" => "取消", "No" => "No", "Yes" => "Yes", "Ok" => "Ok", "Error" => "錯誤", "Error while sharing" => "分享時發生錯誤", +"Shared with you by {owner}" => "{owner} 已經和您分享", +"Share with" => "與分享", +"Share with link" => "使用連結分享", "Password protect" => "密碼保護", "Password" => "密碼", "Set expiration date" => "設置到期日", "Expiration date" => "到期日", "Share via email:" => "透過email分享:", +"Shared in {item} with {user}" => "已和 {user} 分享 {item}", "Unshare" => "取消共享", "can edit" => "可編輯", "access control" => "存取控制", @@ -39,6 +44,8 @@ "ownCloud password reset" => "ownCloud 密碼重設", "Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: （聯結） ", "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱", +"Reset email send." => "重設郵件已送出.", +"Request failed!" => "請求失敗!", "Username" => "使用者名稱", "Request reset" => "要求重設", "Your password was reset" => "你的密碼已重設", diff --git a/l10n/de/files.po b/l10n/de/files.po index 1a69a4a4cf..5f5f61307b 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-26 00:01+0100\n" -"PO-Revision-Date: 2012-11-25 00:10+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-29 00:04+0100\n" +"PO-Revision-Date: 2012-11-28 12:56+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index 336308b77b..a705358c48 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -25,9 +25,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-26 00:01+0100\n" -"PO-Revision-Date: 2012-11-25 00:13+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-11-29 00:04+0100\n" +"PO-Revision-Date: 2012-11-28 12:56+0000\n" +"Last-Translator: Mirodin \n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index ad4af34712..8a1c04a06d 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"POT-Creation-Date: 2012-11-29 00:04+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 801c9a04eb..707c8bc818 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"POT-Creation-Date: 2012-11-29 00:04+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 3fb6746626..8b46389c37 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"POT-Creation-Date: 2012-11-29 00:04+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 12569fba50..6b17fb8732 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"POT-Creation-Date: 2012-11-29 00:04+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 74f89b6760..9f034486ce 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"POT-Creation-Date: 2012-11-29 00:04+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 62ec669218..28fab4affd 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"POT-Creation-Date: 2012-11-29 00:04+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 9d0e0dd1d2..3b6a9cf92e 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"POT-Creation-Date: 2012-11-29 00:04+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 c6d312fe50..d19a566b06 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"POT-Creation-Date: 2012-11-29 00:04+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 4ccfa1b35b..13058208a1 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"POT-Creation-Date: 2012-11-29 00:04+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 bea089c005..dc48ca4e7a 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" +"POT-Creation-Date: 2012-11-29 00:04+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_TW/core.po b/l10n/zh_TW/core.po index f6f204e212..ae5dc301b3 100644 --- a/l10n/zh_TW/core.po +++ b/l10n/zh_TW/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" -"PO-Revision-Date: 2012-11-27 14:16+0000\n" +"POT-Creation-Date: 2012-11-29 00:04+0100\n" +"PO-Revision-Date: 2012-11-28 01:36+0000\n" "Last-Translator: dw4dev \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -116,7 +116,7 @@ msgstr "幾年前" #: js/oc-dialogs.js:126 msgid "Choose" -msgstr "" +msgstr "選擇" #: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" @@ -171,15 +171,15 @@ msgstr "" #: js/share.js:153 msgid "Shared with you by {owner}" -msgstr "" +msgstr "{owner} 已經和您分享" #: js/share.js:158 msgid "Share with" -msgstr "" +msgstr "與分享" #: js/share.js:163 msgid "Share with link" -msgstr "" +msgstr "使用連結分享" #: js/share.js:164 msgid "Password protect" @@ -212,7 +212,7 @@ msgstr "" #: js/share.js:271 msgid "Shared in {item} with {user}" -msgstr "" +msgstr "已和 {user} 分享 {item}" #: js/share.js:292 msgid "Unshare" @@ -268,11 +268,11 @@ 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:38 #: templates/login.php:20 diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po index 3e9e1fb824..de8f147544 100644 --- a/l10n/zh_TW/files_versions.po +++ b/l10n/zh_TW/files_versions.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-28 00:10+0100\n" -"PO-Revision-Date: 2012-11-27 14:25+0000\n" +"POT-Creation-Date: 2012-11-29 00:04+0100\n" +"PO-Revision-Date: 2012-11-28 01:33+0000\n" "Last-Translator: dw4dev \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "" #: templates/settings.php:3 msgid "Files Versioning" -msgstr "" +msgstr "檔案版本化中..." #: templates/settings.php:4 msgid "Enable" From 1d1ab2a9119361d1566f521b91b519f8bd2ba823 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 29 Nov 2012 13:37:37 +0100 Subject: [PATCH 23/26] Revert "fix group and subadmin managing for 'ajax-loaded' users" This reverts commit a5774229a13ef307dabe3142d1a85f12bf41b391. --- settings/js/users.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/settings/js/users.js b/settings/js/users.js index a278b41721..517984f924 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -71,10 +71,15 @@ var UserList={ var tr = $('tbody tr').first().clone(); tr.attr('data-uid', username); tr.find('td.name').text(username); - var groupsSelect = $(''); + groupsSelect.data('username', username); + groupsSelect.data('userGroups', groups); tr.find('td.groups').empty(); if (tr.find('td.subadmins').length > 0) { - var subadminSelect = $(''); + subadminSelect.data('username', username); + subadminSelect.data('userGroups', groups); + subadminSelect.data('subadmin', subadmin); tr.find('td.subadmins').empty(); } var allGroups = String($('#content table').attr('data-groups')).split(', '); From e5af24d08489fa873380112f5ee081013aee58f3 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 29 Nov 2012 13:56:07 +0100 Subject: [PATCH 24/26] use attr instead of data --- settings/js/users.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/settings/js/users.js b/settings/js/users.js index 517984f924..f2ce69cf31 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -71,15 +71,10 @@ var UserList={ var tr = $('tbody tr').first().clone(); tr.attr('data-uid', username); tr.find('td.name').text(username); - var groupsSelect = $('').attr('data-username', username).attr('data-user-groups', groups); tr.find('td.groups').empty(); if (tr.find('td.subadmins').length > 0) { - var subadminSelect = $('').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin); tr.find('td.subadmins').empty(); } var allGroups = String($('#content table').attr('data-groups')).split(', '); From 59d5aa2cb74b605700c6a142409937fa65e8af72 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 29 Nov 2012 17:58:24 +0100 Subject: [PATCH 25/26] add function to safely end output buffering --- lib/util.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/util.php b/lib/util.php index adec69248d..2ee3f0e4ef 100755 --- a/lib/util.php +++ b/lib/util.php @@ -594,22 +594,31 @@ class OC_Util { $connected = @fsockopen("www.owncloud.org", 80); if ($connected) { fclose($connected); - return true; + return true; }else{ // second try in case one server is down $connected = @fsockopen("apps.owncloud.com", 80); if ($connected) { fclose($connected); - return true; + return true; }else{ - return false; + return false; } } } + /** + * clear all levels of output buffering + */ + public static function obEnd(){ + while (ob_get_level()) { + ob_end_clean(); + } + } + /** * @brief Generates a cryptographical secure pseudorandom string From bcb27c81d479c49613094fe6c147af5bdea3ea3c Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 29 Nov 2012 18:01:21 +0100 Subject: [PATCH 26/26] use new obEnd function instead of ob_end_clean --- apps/files/appinfo/remote.php | 2 +- apps/files/download.php | 2 +- lib/eventsource.php | 2 +- lib/files.php | 2 +- lib/filesystemview.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index 0ab7e7674c..1713bcc22c 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -27,7 +27,7 @@ $RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging'); OC_App::loadApps($RUNTIME_APPTYPES); -ob_end_clean(); +OC_Util::obEnd(); // Backends $authBackend = new OC_Connector_Sabre_Auth(); diff --git a/apps/files/download.php b/apps/files/download.php index 0d632c9b2c..6475afb56e 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -44,5 +44,5 @@ header('Content-Disposition: attachment; filename="'.basename($filename).'"'); OCP\Response::disableCaching(); header('Content-Length: '.OC_Filesystem::filesize($filename)); -@ob_end_clean(); +OC_Util::obEnd(); OC_Filesystem::readfile( $filename ); diff --git a/lib/eventsource.php b/lib/eventsource.php index 578441ee70..1b8033943a 100644 --- a/lib/eventsource.php +++ b/lib/eventsource.php @@ -32,7 +32,7 @@ class OC_EventSource{ private $fallBackId=0; public function __construct() { - @ob_end_clean(); + OC_Util::obEnd(); header('Cache-Control: no-cache'); $this->fallback=isset($_GET['fallback']) and $_GET['fallback']=='true'; if($this->fallback) { diff --git a/lib/files.php b/lib/files.php index 912de5655b..b4a4145a49 100644 --- a/lib/files.php +++ b/lib/files.php @@ -195,7 +195,7 @@ class OC_Files { $zip=false; $filename=$dir.'/'.$files; } - @ob_end_clean(); + OC_Util::obEnd(); if($zip or OC_Filesystem::is_readable($filename)) { header('Content-Disposition: attachment; filename="'.basename($filename).'"'); header('Content-Transfer-Encoding: binary'); diff --git a/lib/filesystemview.php b/lib/filesystemview.php index 0229213ebc..1185c25c24 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -195,7 +195,7 @@ class OC_FilesystemView { return $this->basicOperation('filesize', $path); } public function readfile($path) { - @ob_end_clean(); + OC_Util::obEnd(); $handle=$this->fopen($path, 'rb'); if ($handle) { $chunkSize = 8192;// 8 MB chunks