diff options
129 files changed, 2014 insertions, 1487 deletions
diff --git a/.gitignore b/.gitignore index 40d6e6ca0fe..b0cc783123c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ owncloud config/config.php config/mount.php apps/inc.php -3rdparty # ignore all apps except core ones apps/* diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000000..b9c1a3702cf --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "3rdparty"] + path = 3rdparty + url = git://github.com/owncloud/3rdparty.git diff --git a/.htaccess b/.htaccess index 616118b2ce8..463b49993e6 100755 --- a/.htaccess +++ b/.htaccess @@ -1,5 +1,4 @@ <IfModule mod_fcgid.c> -php_value cgi.fix_pathinfo 1 <IfModule mod_setenvif.c> <IfModule mod_headers.c> SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1 diff --git a/3rdparty b/3rdparty new file mode 160000 +Subproject 63cb2847921d668c2b48b572872cfddbcf41bea diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 38f5bab6f73..f3264da5a12 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -112,7 +112,7 @@ var FileActions = { addAction(name, action); } }); - if(actions.Share){ + if(actions.Share && !($('#dir').val() === '/' && file === 'Shared')){ addAction('Share', actions.Share); } diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php index f16385a652d..6cd7c026922 100644 --- a/apps/files/l10n/es_AR.php +++ b/apps/files/l10n/es_AR.php @@ -61,6 +61,7 @@ "From link" => "Desde enlace", "Deleted files" => "Archivos Borrados", "Cancel upload" => "Cancelar subida", +"You don’t have write permissions here." => "No tenés permisos de escritura acá.", "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!", "Download" => "Descargar", "Unshare" => "Dejar de compartir", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 9849184441d..5e53f5ab024 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -61,6 +61,7 @@ "From link" => "Depuis le lien", "Deleted files" => "Fichiers supprimés", "Cancel upload" => "Annuler l'envoi", +"You don’t have write permissions here." => "Vous n'avez pas le droit d'écriture ici.", "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)", "Download" => "Télécharger", "Unshare" => "Ne plus partager", diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index 9c86ffcfefd..01405530ffa 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -2,9 +2,9 @@ "Could not move %s - File with this name already exists" => "Ni mogoče premakniti %s - datoteka s tem imenom že obstaja", "Could not move %s" => "Ni mogoče premakniti %s", "Unable to rename file" => "Ni mogoče preimenovati datoteke", -"No file was uploaded. Unknown error" => "Nobena datoteka ni naložena. Neznana napaka.", +"No file was uploaded. Unknown error" => "Ni poslane nobene datoteke. Neznana napaka.", "There is no error, the file uploaded with success" => "Datoteka je uspešno poslana.", -"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Naložena datoteka presega dovoljeno velikost. Le-ta je določena z vrstico upload_max_filesize v datoteki php.ini:", +"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML.", "The uploaded file was only partially uploaded" => "Datoteka je le delno naložena", "No file was uploaded" => "Nobena datoteka ni bila naložena", @@ -21,24 +21,24 @@ "replace" => "zamenjaj", "suggest name" => "predlagaj ime", "cancel" => "prekliči", -"replaced {new_name} with {old_name}" => "zamenjano ime {new_name} z imenom {old_name}", +"replaced {new_name} with {old_name}" => "preimenovano ime {new_name} z imenom {old_name}", "undo" => "razveljavi", "perform delete operation" => "izvedi opravilo brisanja", "'.' is an invalid file name." => "'.' je neveljavno ime datoteke.", -"File name cannot be empty." => "Ime datoteke ne sme biti prazno.", +"File name cannot be empty." => "Ime datoteke ne sme biti prazno polje.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.", "Your storage is full, files can not be updated or synced anymore!" => "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!", "Your storage is almost full ({usedSpacePercent}%)" => "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)", -"Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen.", +"Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika.", "Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov.", "Upload Error" => "Napaka med pošiljanjem", "Close" => "Zapri", "1 file uploading" => "Pošiljanje 1 datoteke", -"{count} files uploading" => "nalagam {count} datotek", +"{count} files uploading" => "pošiljanje {count} datotek", "Upload cancelled." => "Pošiljanje je preklicano.", "File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.", -"URL cannot be empty." => "Naslov URL ne sme biti prazen.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud", +"URL cannot be empty." => "Naslov URL ne sme biti prazna vrednost.", +"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud.", "Name" => "Ime", "Size" => "Velikost", "Modified" => "Spremenjeno", diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php index bcbef8daf35..547b490330a 100644 --- a/apps/files/l10n/tr.php +++ b/apps/files/l10n/tr.php @@ -61,6 +61,7 @@ "From link" => "Bağlantıdan", "Deleted files" => "Dosyalar silindi", "Cancel upload" => "Yüklemeyi iptal et", +"You don’t have write permissions here." => "Buraya erişim hakkınız yok.", "Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!", "Download" => "İndir", "Unshare" => "Paylaşılmayan", diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index 88fdc537c3a..2923126d10f 100644 --- a/apps/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php @@ -10,8 +10,10 @@ "No file was uploaded" => "文件没有上传", "Missing a temporary folder" => "缺少临时目录", "Failed to write to disk" => "写入磁盘失败", +"Not enough storage available" => "没有足够的存储空间", "Invalid directory." => "无效文件夹。", "Files" => "文件", +"Delete permanently" => "永久删除", "Delete" => "删除", "Rename" => "重命名", "Pending" => "操作等待中", @@ -21,9 +23,12 @@ "cancel" => "取消", "replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}", "undo" => "撤销", +"perform delete operation" => "进行删除操作", "'.' is an invalid file name." => "'.' 是一个无效的文件名。", "File name cannot be empty." => "文件名不能为空。", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。", +"Your storage is full, files can not be updated or synced anymore!" => "您的存储空间已满，文件将无法更新或同步！", +"Your storage is almost full ({usedSpacePercent}%)" => "您的存储空间即将用完 ({usedSpacePercent}%)", "Your download is being prepared. This might take some time if the files are big." => "下载正在准备中。如果文件较大可能会花费一些时间。", "Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件，因为它是一个目录或者大小为 0 字节", "Upload Error" => "上传错误", @@ -54,12 +59,15 @@ "Text file" => "文本文件", "Folder" => "文件夹", "From link" => "来自链接", +"Deleted files" => "删除文件", "Cancel upload" => "取消上传", +"You don’t have write permissions here." => "您没有写权限", "Nothing in here. Upload something!" => "这里还什么都没有。上传些东西吧！", "Download" => "下载", "Unshare" => "取消分享", "Upload too large" => "上传文件过大", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制", "Files are being scanned, please wait." => "文件正在被扫描，请稍候。", -"Current scanning" => "当前扫描" +"Current scanning" => "当前扫描", +"Upgrading filesystem cache..." => "正在更新文件系统缓存..." ); diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php new file mode 100644 index 00000000000..4eaa908476b --- /dev/null +++ b/apps/files/l10n/zh_HK.php @@ -0,0 +1,9 @@ +<?php $TRANSLATIONS = array( +"Files" => "文件", +"Delete" => "刪除", +"Name" => "名稱", +"Upload" => "上傳", +"Save" => "儲存", +"Download" => "下載", +"Unshare" => "取消分享" +); diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php index 39a5a0d40f8..4754e21214e 100644 --- a/apps/files_encryption/l10n/sl.php +++ b/apps/files_encryption/l10n/sl.php @@ -2,6 +2,6 @@ "Encryption" => "Šifriranje", "File encryption is enabled." => "Šifriranje datotek je omogočeno.", "The following file types will not be encrypted:" => "Navedene vrste datotek ne bodo šifrirane:", -"Exclude the following file types from encryption:" => "Izloči navedene vrste datotek med šifriranjem:", +"Exclude the following file types from encryption:" => "Ne šifriraj navedenih vrst datotek:", "None" => "Brez" ); diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php index 867d000f2ed..13fa95203e4 100644 --- a/apps/files_encryption/l10n/zh_CN.php +++ b/apps/files_encryption/l10n/zh_CN.php @@ -1,4 +1,7 @@ <?php $TRANSLATIONS = array( "Encryption" => "加密", -"None" => "None" +"File encryption is enabled." => "文件加密已启用.", +"The following file types will not be encrypted:" => "如下的文件类型将不会被加密:", +"Exclude the following file types from encryption:" => "从加密中排除如下的文件类型:", +"None" => "无" ); diff --git a/apps/files_encryption/l10n/zh_HK.php b/apps/files_encryption/l10n/zh_HK.php new file mode 100644 index 00000000000..0c0b709fdc1 --- /dev/null +++ b/apps/files_encryption/l10n/zh_HK.php @@ -0,0 +1,6 @@ +<?php $TRANSLATIONS = array( +"Encryption" => "加密", +"File encryption is enabled." => "檔案加密已開啟", +"The following file types will not be encrypted:" => "以下文件類別將不會被加密", +"None" => "空" +); diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php index db4140b483d..c42c89f8572 100644 --- a/apps/files_external/l10n/fr.php +++ b/apps/files_external/l10n/fr.php @@ -8,9 +8,11 @@ "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas disponible. Contactez votre administrateur système pour l'installer.", "External Storage" => "Stockage externe", "Folder name" => "Nom du dossier", +"External storage" => "Stockage externe", "Configuration" => "Configuration", "Options" => "Options", "Applicable" => "Disponible", +"Add storage" => "Ajouter un support de stockage", "None set" => "Aucun spécifié", "All Users" => "Tous les utilisateurs", "Groups" => "Groupes", diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php index 5614c93585a..4ff2eed3bf0 100644 --- a/apps/files_external/l10n/sl.php +++ b/apps/files_external/l10n/sl.php @@ -2,21 +2,23 @@ "Access granted" => "Dostop je odobren", "Error configuring Dropbox storage" => "Napaka nastavljanja shrambe Dropbox", "Grant access" => "Odobri dostop", -"Please provide a valid Dropbox app key and secret." => "Vpišite veljaven ključ programa in kodo za Dropbox", +"Please provide a valid Dropbox app key and secret." => "Vpisati je treba veljaven ključ programa in kodo za Dropbox", "Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive", -"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> \"smbclient\" ni nameščen. Priklapljanje CIFS/SMB pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če ga namesti.", -"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> FTP podpora v PHP ni omogočena ali nameščena. Priklapljanje FTP pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če jo namesti ali omogoči.", +"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> paket \"smbclient\" ni nameščen. Priklapljanje pogonov CIFS/SMB ne bo mogoče.", +"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> podpora FTP v PHP ni omogočena ali pa ni nameščena. Priklapljanje pogonov FTP zato ni mogoče.", "External Storage" => "Zunanja podatkovna shramba", "Folder name" => "Ime mape", +"External storage" => "Zunanja shramba", "Configuration" => "Nastavitve", "Options" => "Možnosti", "Applicable" => "Se uporablja", +"Add storage" => "Dodaj shrambo", "None set" => "Ni nastavljeno", "All Users" => "Vsi uporabniki", "Groups" => "Skupine", "Users" => "Uporabniki", "Delete" => "Izbriši", -"Enable User External Storage" => "Omogoči uporabo zunanje podatkovne shrambe za uporabnike", +"Enable User External Storage" => "Omogoči uporabniško zunanjo podatkovno shrambo", "Allow users to mount their own external storage" => "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe", "SSL root certificates" => "Korenska potrdila SSL", "Import Root Certificate" => "Uvozi korensko potrdilo" diff --git a/apps/files_external/l10n/zh_HK.php b/apps/files_external/l10n/zh_HK.php new file mode 100644 index 00000000000..a85b5a03b8a --- /dev/null +++ b/apps/files_external/l10n/zh_HK.php @@ -0,0 +1,5 @@ +<?php $TRANSLATIONS = array( +"Groups" => "群組", +"Users" => "用戶", +"Delete" => "刪除" +); diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 430269e03d9..11d24045fd9 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -307,8 +307,9 @@ class OC_Mount_Config { $phpFile = OC_User::getHome(OCP\User::getUser()).'/mount.php'; $jsonFile = OC_User::getHome(OCP\User::getUser()).'/mount.json'; } else { + $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); $phpFile = OC::$SERVERROOT.'/config/mount.php'; - $jsonFile = OC::$SERVERROOT.'/config/mount.json'; + $jsonFile = $datadir . '/mount.json'; } if (is_file($jsonFile)) { $mountPoints = json_decode(file_get_contents($jsonFile), true); @@ -333,7 +334,8 @@ class OC_Mount_Config { if ($isPersonal) { $file = OC_User::getHome(OCP\User::getUser()).'/mount.json'; } else { - $file = OC::$SERVERROOT.'/config/mount.json'; + $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); + $file = $datadir . '/mount.json'; } $content = json_encode($data); @file_put_contents($file, $content); diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 86492699fc2..b3b94a1dafd 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -155,7 +155,7 @@ </tbody> </table> <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']); ?>"> - <input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;"> + <input type="file" id="rootcert_import" name="rootcert_import"> <input type="submit" name="cert_import" value="<?php p($l->t('Import Root Certificate')); ?>" /> </fieldset> </form> diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 5b5893abc93..9363a5431fa 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -5,8 +5,14 @@ OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php' OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php'; OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'files_sharing/lib/cache.php'; OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'files_sharing/lib/permissions.php'; +OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'files_sharing/lib/updater.php'; OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'files_sharing/lib/watcher.php'; OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup'); OCP\Share::registerBackend('file', 'OC_Share_Backend_File'); OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file'); OCP\Util::addScript('files_sharing', 'share'); +\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook'); +\OC_Hook::connect('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook'); +\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook'); +\OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook'); +\OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook');
\ No newline at end of file diff --git a/apps/files_sharing/l10n/zh_HK.php b/apps/files_sharing/l10n/zh_HK.php new file mode 100644 index 00000000000..7ef0f19ca43 --- /dev/null +++ b/apps/files_sharing/l10n/zh_HK.php @@ -0,0 +1,4 @@ +<?php $TRANSLATIONS = array( +"Password" => "密碼", +"Download" => "下載" +); diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index fb0f6c7b5a6..9fccd0b46f3 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -28,10 +28,11 @@ namespace OC\Files\Cache; */ class Shared_Cache extends Cache { + private $storage; private $files = array(); public function __construct($storage) { - + $this->storage = $storage; } /** @@ -41,16 +42,19 @@ class Shared_Cache extends Cache { */ private function getSourceCache($target) { $source = \OC_Share_Backend_File::getSource($target); - if (isset($source['path'])) { - $source['path'] = '/' . $source['uid_owner'] . '/' . $source['path']; - \OC\Files\Filesystem::initMountPoints($source['uid_owner']); - list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source['path']); - if ($storage) { - $this->files[$target] = $internalPath; - $cache = $storage->getCache(); - $this->storageId = $storage->getId(); - $this->numericId = $cache->getNumericStorageId(); - return $cache; + if (isset($source['path']) && isset($source['fileOwner'])) { + \OC\Files\Filesystem::initMountPoints($source['fileOwner']); + $mount = \OC\Files\Mount::findByNumericId($source['storage']); + if ($mount) { + $fullPath = $mount->getMountPoint().$source['path']; + list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($fullPath); + if ($storage) { + $this->files[$target] = $internalPath; + $cache = $storage->getCache(); + $this->storageId = $storage->getId(); + $this->numericId = $cache->getNumericStorageId(); + return $cache; + } } } return false; @@ -64,7 +68,14 @@ class Shared_Cache extends Cache { */ public function get($file) { if ($file == '') { - return \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT); + $data = \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT); + $etag = \OCP\Config::getUserValue(\OCP\User::getUser(), 'files_sharing', 'etag'); + if (!isset($etag)) { + $etag = $this->storage->getETag(''); + \OCP\Config::setUserValue(\OCP\User::getUser(), 'files_sharing', 'etag', $etag); + } + $data['etag'] = $etag; + return $data; } else if (is_string($file)) { if ($cache = $this->getSourceCache($file)) { return $cache->get($this->files[$file]); @@ -118,7 +129,9 @@ class Shared_Cache extends Cache { * @return int file id */ public function put($file, array $data) { - if ($cache = $this->getSourceCache($file)) { + if ($file === '' && isset($data['etag'])) { + return \OCP\Config::setUserValue(\OCP\User::getUser(), 'files_sharing', 'etag', $data['etag']); + } else if ($cache = $this->getSourceCache($file)) { return $cache->put($this->files[$file], $data); } return false; diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index fa43e87b49e..62948651806 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -93,6 +93,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { $file['size'] = $item['size']; $file['mtime'] = $item['mtime']; $file['encrypted'] = $item['encrypted']; + $file['etag'] = $item['etag']; $files[] = $file; } return $files; diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index be0e59e6732..ffd4e5ced22 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -45,7 +45,18 @@ class Shared extends \OC\Files\Storage\Common { */ private function getFile($target) { if (!isset($this->files[$target])) { - $this->files[$target] = \OC_Share_Backend_File::getSource($target); + // Check for partial files + if (pathinfo($target, PATHINFO_EXTENSION) === 'part') { + $source = \OC_Share_Backend_File::getSource(substr($target, 0, -5)); + if ($source) { + $source['path'] .= '.part'; + // All partial files have delete permission + $source['permissions'] |= \OCP\PERMISSION_DELETE; + } + } else { + $source = \OC_Share_Backend_File::getSource($target); + } + $this->files[$target] = $source; } return $this->files[$target]; } @@ -280,34 +291,43 @@ class Shared extends \OC\Files\Storage\Common { } public function rename($path1, $path2) { - // Renaming/moving is only allowed within shared folders - $pos1 = strpos($path1, '/', 1); - $pos2 = strpos($path2, '/', 1); - if ($pos1 !== false && $pos2 !== false && ($oldSource = $this->getSourcePath($path1))) { - $newSource = $this->getSourcePath(dirname($path2)).'/'.basename($path2); - if (dirname($path1) == dirname($path2)) { - // Rename the file if UPDATE permission is granted - if ($this->isUpdatable($path1)) { - list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource); - list( , $newInternalPath) = \OC\Files\Filesystem::resolvePath($newSource); - return $storage->rename($oldInternalPath, $newInternalPath); - } - } else { - // Move the file if DELETE and CREATE permissions are granted - if ($this->isDeletable($path1) && $this->isCreatable(dirname($path2))) { - // Get the root shared folder - $folder1 = substr($path1, 0, $pos1); - $folder2 = substr($path2, 0, $pos2); - // Copy and unlink the file if it exists in a different shared folder - if ($folder1 != $folder2) { - if ($this->copy($path1, $path2)) { - return $this->unlink($path1); - } - } else { + // Check for partial files + if (pathinfo($path1, PATHINFO_EXTENSION) === 'part') { + if ($oldSource = $this->getSourcePath($path1)) { + list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource); + $newInternalPath = substr($oldInternalPath, 0, -5); + return $storage->rename($oldInternalPath, $newInternalPath); + } + } else { + // Renaming/moving is only allowed within shared folders + $pos1 = strpos($path1, '/', 1); + $pos2 = strpos($path2, '/', 1); + if ($pos1 !== false && $pos2 !== false && ($oldSource = $this->getSourcePath($path1))) { + $newSource = $this->getSourcePath(dirname($path2)).'/'.basename($path2); + if (dirname($path1) == dirname($path2)) { + // Rename the file if UPDATE permission is granted + if ($this->isUpdatable($path1)) { list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource); list( , $newInternalPath) = \OC\Files\Filesystem::resolvePath($newSource); return $storage->rename($oldInternalPath, $newInternalPath); } + } else { + // Move the file if DELETE and CREATE permissions are granted + if ($this->isDeletable($path1) && $this->isCreatable(dirname($path2))) { + // Get the root shared folder + $folder1 = substr($path1, 0, $pos1); + $folder2 = substr($path2, 0, $pos2); + // Copy and unlink the file if it exists in a different shared folder + if ($folder1 != $folder2) { + if ($this->copy($path1, $path2)) { + return $this->unlink($path1); + } + } else { + list($storage, $oldInternalPath) = \OC\Files\Filesystem::resolvePath($oldSource); + list( , $newInternalPath) = \OC\Files\Filesystem::resolvePath($newSource); + return $storage->rename($oldInternalPath, $newInternalPath); + } + } } } } @@ -371,7 +391,7 @@ class Shared extends \OC\Files\Storage\Common { public function free_space($path) { if ($path == '') { - return -1; + return \OC\Files\FREE_SPACE_UNKNOWN; } $source = $this->getSourcePath($path); if ($source) { diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php new file mode 100644 index 00000000000..73e7808f24a --- /dev/null +++ b/apps/files_sharing/lib/updater.php @@ -0,0 +1,102 @@ +<?php +/** + * ownCloud + * + * @author Michael Gapczynski + * @copyright 2013 Michael Gapczynski mtgap@owncloud.com + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + +namespace OC\Files\Cache; + +class Shared_Updater { + + /** + * Correct the parent folders' ETags for all users shared the file at $target + * + * @param string $target + */ + static public function correctFolders($target) { + $uid = \OCP\User::getUser(); + $uidOwner = \OC\Files\Filesystem::getOwner($target); + $info = \OC\Files\Filesystem::getFileInfo($target); + // Correct Shared folders of other users shared with + $users = \OCP\Share::getUsersItemShared('file', $info['fileid'], $uidOwner, true); + if (!empty($users)) { + while (!empty($users)) { + $reshareUsers = array(); + foreach ($users as $user) { + $etag = \OC\Files\Filesystem::getETag(''); + \OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag); + // Look for reshares + $reshareUsers = array_merge($reshareUsers, \OCP\Share::getUsersItemShared('file', $info['fileid'], $user, true)); + } + $users = $reshareUsers; + } + // Correct folders of shared file owner + $target = substr($target, 8); + if ($uidOwner !== $uid && $source = \OC_Share_Backend_File::getSource($target)) { + \OC\Files\Filesystem::initMountPoints($uidOwner); + $source = '/'.$uidOwner.'/'.$source['path']; + \OC\Files\Cache\Updater::correctFolder($source, $info['mtime']); + } + } + } + + /** + * @param array $params + */ + static public function writeHook($params) { + self::correctFolders($params['path']); + } + + /** + * @param array $params + */ + static public function renameHook($params) { + self::correctFolders($params['oldpath']); + self::correctFolders($params['newpath']); + } + + /** + * @param array $params + */ + static public function deleteHook($params) { + self::correctFolders($params['path']); + } + + /** + * @param array $params + */ + static public function shareHook($params) { + if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') { + $uidOwner = \OCP\User::getUser(); + $users = \OCP\Share::getUsersItemShared($params['itemType'], $params['fileSource'], $uidOwner, true); + if (!empty($users)) { + while (!empty($users)) { + $reshareUsers = array(); + foreach ($users as $user) { + $etag = \OC\Files\Filesystem::getETag(''); + \OCP\Config::setUserValue($user, 'files_sharing', 'etag', $etag); + // Look for reshares + $reshareUsers = array_merge($reshareUsers, \OCP\Share::getUsersItemShared('file', $params['fileSource'], $user, true)); + } + $users = $reshareUsers; + } + } + } + } + +} diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 24ccd8c4609..8a5875b9ce6 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -43,7 +43,7 @@ if ($dir) { } else { $dirlisting = false; - $query = \OC_DB::prepare('SELECT `id`,`location`,`timestamp`,`type`,`mime` FROM `*PREFIX*files_trash` WHERE user = ?'); + $query = \OC_DB::prepare('SELECT `id`,`location`,`timestamp`,`type`,`mime` FROM `*PREFIX*files_trash` WHERE `user` = ?'); $result = $query->execute(array($user))->fetchAll(); } diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php index b1c9e13defb..60a0e40d455 100644 --- a/apps/files_trashbin/l10n/de.php +++ b/apps/files_trashbin/l10n/de.php @@ -3,7 +3,7 @@ "Couldn't restore %s" => "Konnte %s nicht wiederherstellen", "perform restore operation" => "Wiederherstellung ausführen", "delete file permanently" => "Datei dauerhaft löschen", -"Delete permanently" => "Permanent löschen", +"Delete permanently" => "Endgültig löschen", "Name" => "Name", "Deleted" => "gelöscht", "1 folder" => "1 Ordner", diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php index 48d1425ded7..802a110fd18 100644 --- a/apps/files_trashbin/l10n/de_DE.php +++ b/apps/files_trashbin/l10n/de_DE.php @@ -13,5 +13,5 @@ "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!", "Restore" => "Wiederherstellen", "Delete" => "Löschen", -"Deleted Files" => "gelöschte Dateien" +"Deleted Files" => "Gelöschte Dateien" ); diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php index 9c158c2b9ec..1d86190daa3 100644 --- a/apps/files_trashbin/l10n/hu_HU.php +++ b/apps/files_trashbin/l10n/hu_HU.php @@ -12,5 +12,6 @@ "{count} files" => "{count} fájl", "Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!", "Restore" => "Visszaállítás", -"Delete" => "Törlés" +"Delete" => "Törlés", +"Deleted Files" => "Törölt fájlok" ); diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php index 17bbe93f2b5..c2cc1f123e2 100644 --- a/apps/files_trashbin/l10n/zh_CN.php +++ b/apps/files_trashbin/l10n/zh_CN.php @@ -1,9 +1,17 @@ <?php $TRANSLATIONS = array( +"Couldn't delete %s permanently" => "无法彻底删除文件%s", +"Couldn't restore %s" => "无法恢复%s", +"perform restore operation" => "执行恢复操作", +"delete file permanently" => "彻底删除文件", +"Delete permanently" => "永久删除", "Name" => "名称", +"Deleted" => "已删除", "1 folder" => "1个文件夹", "{count} folders" => "{count} 个文件夹", "1 file" => "1 个文件", "{count} files" => "{count} 个文件", +"Nothing in here. Your trash bin is empty!" => "这里没有东西. 你的回收站是空的!", +"Restore" => "恢复", "Delete" => "删除", "Deleted Files" => "已删除文件" ); diff --git a/apps/files_trashbin/l10n/zh_HK.php b/apps/files_trashbin/l10n/zh_HK.php new file mode 100644 index 00000000000..6967e190355 --- /dev/null +++ b/apps/files_trashbin/l10n/zh_HK.php @@ -0,0 +1,4 @@ +<?php $TRANSLATIONS = array( +"Name" => "名稱", +"Delete" => "刪除" +); diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 2fc8a8bc3c6..33abe608d8f 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -64,7 +64,7 @@ class Trashbin { $trashbinSize += self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view); if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) { - $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)"); + $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)"); $result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user)); if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin. $view->deleteAll('files_trashbin/files/'.$deleted.'.d'.$timestamp); @@ -144,8 +144,8 @@ class Trashbin { $trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin')); } if ( $timestamp ) { - $query = \OC_DB::prepare('SELECT location,type FROM *PREFIX*files_trash' - .' WHERE user=? AND id=? AND timestamp=?'); + $query = \OC_DB::prepare('SELECT `location`,`type` FROM *PREFIX*files_trash' + .' WHERE `user`=? AND `id`=? AND `timestamp`=?'); $result = $query->execute(array($user,$filename,$timestamp))->fetchAll(); if ( count($result) != 1 ) { \OC_Log::write('files_trashbin', 'trash bin database inconsistent!', \OC_Log::ERROR); @@ -228,7 +228,7 @@ class Trashbin { } if ( $timestamp ) { - $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?'); + $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE `user`=? AND `id`=? AND `timestamp`=?'); $query->execute(array($user,$filename,$timestamp)); } @@ -259,7 +259,7 @@ class Trashbin { } if ( $timestamp ) { - $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?'); + $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE `user`=? AND `id`=? AND `timestamp`=?'); $query->execute(array($user,$filename,$timestamp)); $file = $filename.'.d'.$timestamp; } else { @@ -344,7 +344,7 @@ class Trashbin { $view = new \OC\Files\View('/'.$user); $size = 0; - $query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash WHERE user=?'); + $query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM *PREFIX*files_trash WHERE `user`=?'); $result = $query->execute(array($user))->fetchAll(); $retention_obligation = \OC_Config::getValue('trashbin_retention_obligation', @@ -362,8 +362,8 @@ class Trashbin { $availableSpace = $availableSpace + $size; // if size limit for trash bin reached, delete oldest files in trash bin if ($availableSpace < 0) { - $query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash' - .' WHERE user=? ORDER BY timestamp ASC'); + $query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM *PREFIX*files_trash' + .' WHERE `user`=? ORDER BY `timestamp` ASC'); $result = $query->execute(array($user))->fetchAll(); $length = count($result); $i = 0; @@ -490,7 +490,7 @@ class Trashbin { * @return mixed trash bin size or false if no trash bin size is stored */ private static function getTrashbinSize($user) { - $query = \OC_DB::prepare('SELECT size FROM *PREFIX*files_trashsize WHERE user=?'); + $query = \OC_DB::prepare('SELECT `size` FROM *PREFIX*files_trashsize WHERE `user`=?'); $result = $query->execute(array($user))->fetchAll(); if ($result) { @@ -507,9 +507,9 @@ class Trashbin { */ private static function setTrashbinSize($user, $size) { if ( self::getTrashbinSize($user) === false) { - $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_trashsize (size, user) VALUES (?, ?)'); + $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_trashsize (`size`, `user`) VALUES (?, ?)'); }else { - $query = \OC_DB::prepare('UPDATE *PREFIX*files_trashsize SET size=? WHERE user=?'); + $query = \OC_DB::prepare('UPDATE *PREFIX*files_trashsize SET `size`=? WHERE `user`=?'); } $query->execute(array($size, $user)); } diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php index 76ad8fc97a6..e2698c5c4aa 100644 --- a/apps/files_versions/l10n/fr.php +++ b/apps/files_versions/l10n/fr.php @@ -6,5 +6,6 @@ "File %s could not be reverted to version %s" => "Le fichier %s ne peut être restauré dans sa version %s", "No old versions available" => "Aucune ancienne version n'est disponible", "No path specified" => "Aucun chemin spécifié", +"Versions" => "Versions", "Revert a file to a previous version by clicking on its revert button" => "Restaurez un fichier dans une version antérieure en cliquant sur son bouton de restauration" ); diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php index d6dfbee6aaf..2df00fc8264 100644 --- a/apps/files_versions/l10n/sl.php +++ b/apps/files_versions/l10n/sl.php @@ -3,7 +3,7 @@ "success" => "uspešno", "File %s was reverted to version %s" => "Datoteka %s je povrnjena na različico %s.", "failure" => "spodletelo", -"File %s could not be reverted to version %s" => "Datoteka %s ni mogoče povrniti na različico %s.", +"File %s could not be reverted to version %s" => "Datoteke %s ni mogoče povrniti na različico %s.", "No old versions available" => "Ni starejših različic.", "No path specified" => "Ni določene poti", "Versions" => "Različice", diff --git a/apps/files_versions/l10n/zh_HK.php b/apps/files_versions/l10n/zh_HK.php new file mode 100644 index 00000000000..71bd3bbbd94 --- /dev/null +++ b/apps/files_versions/l10n/zh_HK.php @@ -0,0 +1,6 @@ +<?php $TRANSLATIONS = array( +"success" => "成功", +"failure" => "失敗", +"No old versions available" => "沒有以往版本", +"Versions" => "版本" +); diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 20611c61ec7..6da0e434541 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -53,7 +53,7 @@ class Storage { * @return mixed versions size or false if no versions size is stored */ private static function getVersionsSize($user) { - $query = \OC_DB::prepare('SELECT size FROM *PREFIX*files_versions WHERE user=?'); + $query = \OC_DB::prepare('SELECT `size` FROM *PREFIX*files_versions WHERE `user`=?'); $result = $query->execute(array($user))->fetchAll(); if ($result) { @@ -70,9 +70,9 @@ class Storage { */ private static function setVersionsSize($user, $size) { if ( self::getVersionsSize($user) === false) { - $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_versions (size, user) VALUES (?, ?)'); + $query = \OC_DB::prepare('INSERT INTO *PREFIX*files_versions (`size`, `user`) VALUES (?, ?)'); }else { - $query = \OC_DB::prepare('UPDATE *PREFIX*files_versions SET size=? WHERE user=?'); + $query = \OC_DB::prepare('UPDATE *PREFIX*files_versions SET `size`=? WHERE `user`=?'); } $query->execute(array($size, $user)); } @@ -156,11 +156,18 @@ class Storage { /** * rename versions of a file */ - public static function rename($oldpath, $newpath) { - list($uid, $oldpath) = self::getUidAndFilename($oldpath); - list($uidn, $newpath) = self::getUidAndFilename($newpath); + public static function rename($old_path, $new_path) { + list($uid, $oldpath) = self::getUidAndFilename($old_path); + list($uidn, $newpath) = self::getUidAndFilename($new_path); $versions_view = new \OC\Files\View('/'.$uid .'/files_versions'); $files_view = new \OC\Files\View('/'.$uid .'/files'); + + // if the file already exists than it was a upload of a existing file + // over the web interface -> store() is the right function we need here + if ($files_view->file_exists($newpath)) { + return self::store($new_path); + } + $abs_newpath = $versions_view->getLocalFile($newpath); if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) { diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version index e619108dd63..60a2d3e96c8 100644 --- a/apps/user_ldap/appinfo/version +++ b/apps/user_ldap/appinfo/version @@ -1 +1 @@ -0.3.9.5
\ No newline at end of file +0.4.0
\ No newline at end of file diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php index 6217a6d4821..399bfdc037a 100644 --- a/apps/user_ldap/l10n/de.php +++ b/apps/user_ldap/l10n/de.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.", "Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.", +"Cache Time-To-Live" => "Speichere Time-To-Live zwischen", "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.", "Directory Settings" => "Ordnereinstellungen", "User Display Name Field" => "Feld für den Anzeigenamen des Benutzers", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Gruppensucheigenschaften", "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer", "Special Attributes" => "Spezielle Eigenschaften", +"Quota Field" => "Kontingent Feld", +"Quota Default" => "Kontingent Standard", "in bytes" => "in Bytes", +"Email Field" => "E-Mail Feld", +"User Home Folder Naming Rule" => "Benennungsregel für das Heimatverzeichnis des Benutzers", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.", +"Test Configuration" => "Testkonfiguration", "Help" => "Hilfe" ); diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php index b0e7ec12b21..c8aec0cd41b 100644 --- a/apps/user_ldap/l10n/es_AR.php +++ b/apps/user_ldap/l10n/es_AR.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Desactivar la validación por certificado SSL.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud.", "Not recommended, use for testing only." => "No recomendado, sólo para pruebas.", +"Cache Time-To-Live" => "Tiempo de vida del caché", "in seconds. A change empties the cache." => "en segundos. Cambiarlo vacía la cache.", "Directory Settings" => "Configuración de Directorio", "User Display Name Field" => "Campo de nombre de usuario a mostrar", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Atributos de búsqueda de grupo", "Group-Member association" => "Asociación Grupo-Miembro", "Special Attributes" => "Atributos Especiales", +"Quota Field" => "Campo de cuota", +"Quota Default" => "Cuota por defecto", "in bytes" => "en bytes", +"Email Field" => "Campo de e-mail", +"User Home Folder Naming Rule" => "Regla de nombre de los directorios de usuario", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.", +"Test Configuration" => "Probar configuración", "Help" => "Ayuda" ); diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php index abe13635698..990658e147e 100644 --- a/apps/user_ldap/l10n/fr.php +++ b/apps/user_ldap/l10n/fr.php @@ -48,6 +48,7 @@ "Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud.", "Not recommended, use for testing only." => "Non recommandé, utilisation pour tests uniquement.", +"Cache Time-To-Live" => "Durée de vie du cache", "in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.", "Directory Settings" => "Paramètres du répertoire", "User Display Name Field" => "Champ \"nom d'affichage\" de l'utilisateur", @@ -63,7 +64,12 @@ "Group Search Attributes" => "Recherche des attributs du groupe", "Group-Member association" => "Association groupe-membre", "Special Attributes" => "Attributs spéciaux", +"Quota Field" => "Champ du quota", +"Quota Default" => "Quota par défaut", "in bytes" => "en octets", +"Email Field" => "Champ Email", +"User Home Folder Naming Rule" => "Convention de nommage du répertoire utilisateur", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ", +"Test Configuration" => "Tester la configuration", "Help" => "Aide" ); diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php index 9508d495578..8ff1fd53440 100644 --- a/apps/user_ldap/l10n/sl.php +++ b/apps/user_ldap/l10n/sl.php @@ -1,15 +1,24 @@ <?php $TRANSLATIONS = array( "Failed to delete the server configuration" => "Brisanje nastavitev strežnika je spodletelo.", +"The configuration is valid and the connection could be established!" => "Nastavitev je veljavna, zato je povezavo mogoče vzpostaviti!", +"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Nastavitev je veljavna, vendar pa je vez Bind spodletela. Preveriti je treba nastavitve strežnika in ustreznost poveril.", +"The configuration is invalid. Please look in the ownCloud log for further details." => "Nastavitev je veljavna. Več podrobnosti je zapisanih v dnevniku ownCloud.", "Deletion failed" => "Brisanje je spodletelo.", +"Take over settings from recent server configuration?" => "Ali naj se prevzame nastavitve nedavne nastavitve strežnika?", "Keep settings?" => "Ali nas se nastavitve ohranijo?", +"Cannot add server configuration" => "Ni mogoče dodati nastavitev strežnika", +"Connection test succeeded" => "Preizkus povezave je uspešno končan.", +"Connection test failed" => "Preizkus povezave je spodletel.", "Do you really want to delete the current Server Configuration?" => "Ali res želite izbrisati trenutne nastavitve strežnika?", "Confirm Deletion" => "Potrdi brisanje", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Opozorilo:</b> možnosti user_ldap in user_webdavauth nista združljivi. Pri uporabi je mogoče nepričakovano obnašanje sistema. Eno izmed možnosti je priporočeno onemgočiti.", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Opozorilo:</b> modul PHP LDAP mora biti nameščen, sicer vmesnik ne bo deloval. Paket je treba namestiti.", +"Server configuration" => "Nastavitev strežnika", "Add Server Configuration" => "Dodaj nastavitve strežnika", "Host" => "Gostitelj", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://", "Base DN" => "Osnovni DN", +"One Base DN per line" => "En osnovni DN na vrstico", "You can specify Base DN for users and groups in the Advanced tab" => "Osnovni DN za uporabnike in skupine lahko določite v zavihku naprednih možnosti.", "User DN" => "Uporabnik DN", "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za brezimni dostop sta polji DN in geslo prazni.", @@ -25,19 +34,29 @@ "Defines the filter to apply, when retrieving groups." => "Določi filter za uporabo med pridobivanjem skupin.", "without any placeholder, e.g. \"objectClass=posixGroup\"." => "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\".", "Connection Settings" => "Nastavitve povezave", +"Configuration Active" => "Dejavna nastavitev", +"When unchecked, this configuration will be skipped." => "Neizbrana možnost preskoči nastavitev.", "Port" => "Vrata", +"Backup (Replica) Host" => "Varnostna kopija (replika) podatkov gostitelja", +"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD.", +"Backup (Replica) Port" => "Varnostna kopija (replika) podatka vrat", "Disable Main Server" => "Onemogoči glavni strežnik", +"When switched on, ownCloud will only connect to the replica server." => "Ob priklopu bo strežnik ownCloud povezan le s kopijo (repliko) strežnika.", "Use TLS" => "Uporabi TLS", +"Do not use it additionally for LDAPS connections, it will fail." => "Strežnika ni priporočljivo uporabljati za povezave LDAPS. Povezava bo spodletela.", "Case insensitve LDAP server (Windows)" => "Strežnik LDAP ne upošteva velikosti črk (Windows)", "Turn off SSL certificate validation." => "Onemogoči določanje veljavnosti potrdila SSL.", "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Kadar deluje povezava le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud.", "Not recommended, use for testing only." => "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja.", +"Cache Time-To-Live" => "Predpomni podatke TTL", "in seconds. A change empties the cache." => "v sekundah. Sprememba izprazni predpomnilnik.", "Directory Settings" => "Nastavitve mape", "User Display Name Field" => "Polje za uporabnikovo prikazano ime", "The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud.", "Base User Tree" => "Osnovno uporabniško drevo", "One User Base DN per line" => "Eno osnovno uporabniško ime DN na vrstico", +"User Search Attributes" => "Uporabi atribute iskanja", +"Optional; one attribute per line" => "Izbirno; en atribut na vrstico", "Group Display Name Field" => "Polje za prikazano ime skupine", "The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud.", "Base Group Tree" => "Osnovno drevo skupine", @@ -49,6 +68,7 @@ "Quota Default" => "Privzeta količinska omejitev", "in bytes" => "v bajtih", "Email Field" => "Polje elektronske pošte", +"User Home Folder Naming Rule" => "Pravila poimenovanja uporabniške osebne mape", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD.", "Test Configuration" => "Preizkusne nastavitve", "Help" => "Pomoč" diff --git a/apps/user_ldap/l10n/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php new file mode 100644 index 00000000000..190e4eba798 --- /dev/null +++ b/apps/user_ldap/l10n/zh_HK.php @@ -0,0 +1,5 @@ +<?php $TRANSLATIONS = array( +"Password" => "密碼", +"Port" => "連接埠", +"Help" => "幫助" +); diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index a8cfd45bf4d..90d026962db 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -84,7 +84,7 @@ abstract class Access { for($i=0;$i<$result[$attr]['count'];$i++) { if($this->resemblesDN($attr)) { $values[] = $this->sanitizeDN($result[$attr][$i]); - } elseif(strtolower($attr) == 'objectguid') { + } elseif(strtolower($attr) == 'objectguid' || strtolower($attr) == 'guid') { $values[] = $this->convertObjectGUID2Str($result[$attr][$i]); } else { $values[] = $result[$attr][$i]; @@ -895,7 +895,7 @@ abstract class Access { } //for now, supported (known) attributes are entryUUID, nsuniqueid, objectGUID - $testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid'); + $testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid'); foreach($testAttributes as $attribute) { \OCP\Util::writeLog('user_ldap', 'Testing '.$attribute.' as UUID attr', \OCP\Util::DEBUG); diff --git a/core/ajax/share.php b/core/ajax/share.php index 9201b48cb95..5854b65aa03 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -95,12 +95,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo // setup the email $subject = (string)$l->t('User %s shared a file with you', $displayName); - if ($type === 'dir') + if ($type === 'folder') $subject = (string)$l->t('User %s shared a folder with you', $displayName); $text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($displayName, $file, $link)); - if ($type === 'dir') + if ($type === 'folder') $text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($displayName, $file, $link)); @@ -110,7 +110,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo // send it out now try { - OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $user); + OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $displayName); OCP\JSON::success(); } catch (Exception $exception) { OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($exception->getMessage())))); diff --git a/core/js/share.js b/core/js/share.js index 34f24da4df7..8e767663f12 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -10,8 +10,9 @@ OC.Share={ // Load all share icons $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) { if (result && result.status === 'success') { - $.each(result.data, function(item, hasLink) { - OC.Share.statuses[item] = hasLink; + $.each(result.data, function(item, data) { + OC.Share.statuses[item] = data; + var hasLink = data['link']; // Links override shared in terms of icon display if (hasLink) { var image = OC.imagePath('core', 'actions/public'); @@ -21,30 +22,33 @@ OC.Share={ if (itemType != 'file' && itemType != 'folder') { $('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center'); } else { - var file = $('tr').filterAttr('data-file', OC.basename(item)); + var file = $('tr').filterAttr('data-id', item); if (file.length > 0) { var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); var img = action.find('img').attr('src', image); action.addClass('permanent'); action.html(' '+t('core', 'Shared')).prepend(img); - } - var dir = $('#dir').val(); - if (dir.length > 1) { - var last = ''; - var path = dir; - // Search for possible parent folders that are shared - while (path != last) { - if (path == item) { - var action = $('.fileactions .action').filterAttr('data-action', 'Share'); - var img = action.find('img'); - if (img.attr('src') != OC.imagePath('core', 'actions/public')) { - img.attr('src', image); - action.addClass('permanent'); - action.html(' '+t('core', 'Shared')).prepend(img); + } else { + var dir = $('#dir').val(); + if (dir.length > 1) { + var last = ''; + var path = dir; + // Search for possible parent folders that are shared + while (path != last) { + if (path == data['path']) { + var actions = $('.fileactions .action').filterAttr('data-action', 'Share'); + $.each(actions, function(index, action) { + var img = $(action).find('img'); + if (img.attr('src') != OC.imagePath('core', 'actions/public')) { + img.attr('src', image); + $(action).addClass('permanent'); + $(action).html(' '+t('core', 'Shared')).prepend(img); + } + }); } + last = path; + path = OC.Share.dirname(path); } - last = path; - path = OC.Share.dirname(path); } } } @@ -53,15 +57,6 @@ OC.Share={ }); }, updateIcon:function(itemType, itemSource) { - if (itemType == 'file' || itemType == 'folder') { - var file = $('tr').filterAttr('data-id', String(itemSource)); - var filename = file.data('file'); - if ($('#dir').val() == '/') { - itemSource = $('#dir').val() + filename; - } else { - itemSource = $('#dir').val() + '/' + filename; - } - } var shares = false; var link = false; var image = OC.imagePath('core', 'actions/share'); @@ -83,18 +78,21 @@ OC.Share={ if (itemType != 'file' && itemType != 'folder') { $('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center'); } else { - var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); - var img = action.find('img').attr('src', image); - if (shares) { - action.addClass('permanent'); - action.html(' '+t('core', 'Shared')).prepend(img); - } else { - action.removeClass('permanent'); - action.html(' '+t('core', 'Share')).prepend(img); + var file = $('tr').filterAttr('data-id', String(itemSource)); + if (file.length > 0) { + var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share'); + var img = action.find('img').attr('src', image); + if (shares) { + action.addClass('permanent'); + action.html(' '+ escapeHTML(t('core', 'Shared'))).prepend(img); + } else { + action.removeClass('permanent'); + action.html(' '+ escapeHTML(t('core', 'Share'))).prepend(img); + } } } if (shares) { - OC.Share.statuses[itemSource] = link; + OC.Share.statuses[itemSource]['link'] = link; } else { delete OC.Share.statuses[itemSource]; } @@ -102,21 +100,7 @@ OC.Share={ loadItem:function(itemType, itemSource) { var data = ''; var checkReshare = true; - // Switch file sources to path to check if status is set - if (itemType == 'file' || itemType == 'folder') { - var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file'); - if ($('#dir').val() == '/') { - var item = $('#dir').val() + filename; - } else { - var item = $('#dir').val() + '/' + filename; - } - if (item.substring(0, 8) != '/Shared/') { - checkReshare = false; - } - } else { - var item = itemSource; - } - if (typeof OC.Share.statuses[item] === 'undefined') { + if (typeof OC.Share.statuses[itemSource] === 'undefined') { // NOTE: Check does not always work and misses some shares, fix later checkShares = true; } else { diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index afd55d42bf4..cbe48f6b683 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -128,7 +128,7 @@ "If you did not change your password recently, your account may be compromised!" => "V nedávné době jste nezměnili své heslo, Váš účet může být kompromitován.", "Please change your password to secure your account again." => "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu.", "Lost your password?" => "Ztratili jste své heslo?", -"remember" => "zapamatovat si", +"remember" => "zapamatovat", "Log in" => "Přihlásit", "Alternative Logins" => "Alternativní přihlášení", "prev" => "předchozí", diff --git a/core/l10n/fa.php b/core/l10n/fa.php index 2420ee67df5..9cd3a5e9785 100644 --- a/core/l10n/fa.php +++ b/core/l10n/fa.php @@ -109,6 +109,8 @@ "Security Warning" => "اخطار امنیتی", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "هیچ مولد تصادفی امن در دسترس نیست، لطفا فرمت PHP OpenSSL را فعال نمایید.", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "بدون وجود یک تولید کننده اعداد تصادفی امن ، یک مهاجم ممکن است این قابلیت را داشته باشد که پیشگویی کند پسوورد های راه انداز گرفته شده و کنترلی روی حساب کاربری شما داشته باشد .", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.", +"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "برای مطلع شدن از چگونگی تنظیم سرورتان،لطفا <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">این</a> را ببینید.", "Create an <strong>admin account</strong>" => "لطفا یک <strong> شناسه برای مدیر</strong> بسازید", "Advanced" => "حرفه ای", "Data folder" => "پوشه اطلاعاتی", @@ -128,6 +130,7 @@ "Lost your password?" => "آیا گذرواژه تان را به یاد نمی آورید؟", "remember" => "بیاد آوری", "Log in" => "ورود", +"Alternative Logins" => "ورود متناوب", "prev" => "بازگشت", "next" => "بعدی", "Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد." diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 747aa1c2a21..502a37cb31e 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -1,16 +1,16 @@ <?php $TRANSLATIONS = array( -"User %s shared a file with you" => "Uporanik %s je dal datoteko v souporabo z vami", -"User %s shared a folder with you" => "Uporanik %s je dal mapo v souporabo z vami", -"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s", -"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s", +"User %s shared a file with you" => "Uporabnik %s je omogočil souporabo datoteke", +"User %s shared a folder with you" => "Uporabnik %s je omogočil souporabo mape", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporabnik %s je omogočil souporabo datoteke \"%s\". Prejmete jo lahko preko povezave: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporabnik %s je omogočil souporabo mape \"%s\". Prejmete jo lahko preko povezave: %s", "Category type not provided." => "Vrsta kategorije ni podana.", -"No category to add?" => "Ni kategorije za dodajanje?", +"No category to add?" => "Ali ni kategorije za dodajanje?", "This category already exists: %s" => "Kategorija že obstaja: %s", "Object type not provided." => "Vrsta predmeta ni podana.", -"%s ID not provided." => "%s ID ni podan.", -"Error adding %s to favorites." => "Napaka pri dodajanju %s med priljubljene.", +"%s ID not provided." => "ID %s ni podan.", +"Error adding %s to favorites." => "Napaka dodajanja %s med priljubljene predmete.", "No categories selected for deletion." => "Za izbris ni izbrana nobena kategorija.", -"Error removing %s from favorites." => "Napaka pri odstranjevanju %s iz priljubljenih.", +"Error removing %s from favorites." => "Napaka odstranjevanja %s iz priljubljenih predmetov.", "Sunday" => "nedelja", "Monday" => "ponedeljek", "Tuesday" => "torek", @@ -51,7 +51,7 @@ "Ok" => "V redu", "The object type is not specified." => "Vrsta predmeta ni podana.", "Error" => "Napaka", -"The app name is not specified." => "Ime aplikacije ni podano.", +"The app name is not specified." => "Ime programa ni podano.", "The required file {file} is not installed!" => "Zahtevana datoteka {file} ni nameščena!", "Shared" => "V souporabi", "Share" => "Souporaba", @@ -61,16 +61,16 @@ "Shared with you and the group {group} by {owner}" => "V souporabi z vami in skupino {group}. Lastnik je {owner}.", "Shared with you by {owner}" => "V souporabi z vami. Lastnik je {owner}.", "Share with" => "Omogoči souporabo z", -"Share with link" => "Omogoči souporabo s povezavo", +"Share with link" => "Omogoči souporabo preko povezave", "Password protect" => "Zaščiti z geslom", "Password" => "Geslo", -"Email link to person" => "Posreduj povezavo po e-pošti", +"Email link to person" => "Posreduj povezavo po elektronski pošti", "Send" => "Pošlji", "Set expiration date" => "Nastavi datum preteka", "Expiration date" => "Datum preteka", "Share via email:" => "Souporaba preko elektronske pošte:", "No people found" => "Ni najdenih uporabnikov", -"Resharing is not allowed" => "Ponovna souporaba ni omogočena", +"Resharing is not allowed" => "Nadaljnja souporaba ni dovoljena", "Shared in {item} with {user}" => "V souporabi v {item} z {user}", "Unshare" => "Odstrani souporabo", "can edit" => "lahko ureja", @@ -83,14 +83,14 @@ "Error unsetting expiration date" => "Napaka brisanja datuma preteka", "Error setting expiration date" => "Napaka med nastavljanjem datuma preteka", "Sending ..." => "Pošiljanje ...", -"Email sent" => "E-pošta je bila poslana", +"Email sent" => "Elektronska pošta je poslana", "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.", "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.", -"ownCloud password reset" => "Ponastavitev gesla ownCloud", -"Use the following link to reset your password: {link}" => "Uporabite naslednjo povezavo za ponastavitev gesla: {link}", +"ownCloud password reset" => "Ponastavitev gesla za oblak ownCloud", +"Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}", "You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.", -"Reset email send." => "E-pošta za ponastavitev je bila poslana.", -"Request failed!" => "Zahtevek je spodletel!", +"Reset email send." => "Sporočilo z navodili za ponastavitev gesla je poslana na vaš elektronski naslov.", +"Request failed!" => "Zahteva je spodletela!", "Username" => "Uporabniško Ime", "Request reset" => "Zahtevaj ponovno nastavitev", "Your password was reset" => "Geslo je ponovno nastavljeno", @@ -107,10 +107,10 @@ "Edit categories" => "Uredi kategorije", "Add" => "Dodaj", "Security Warning" => "Varnostno opozorilo", -"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni varnega generatorja naključnih števil. Prosimo, če omogočite PHP OpenSSL razširitev.", -"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega generatorja naključnih števil lahko napadalec napove žetone za ponastavitev gesla, kar mu omogoča, da prevzame vaš račun.", +"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni nobenega varnega ustvarjalnika naključnih števil. Omogočiti je treba razširitev PHP OpenSSL.", +"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega ustvarjalnika naključnih števil je mogoče napovedati žetone za ponastavitev gesla, s čimer je mogoče prevzeti nadzor nad računom.", "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.", -"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Navodila, kako pravilno namestiti strežnik, so na straneh <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentacije</a>.", +"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Navodila, kako pravilno namestiti strežnik, so na straneh <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacije</a>.", "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>", "Advanced" => "Napredne možnosti", "Data folder" => "Podatkovna mapa", @@ -125,10 +125,10 @@ "web services under your control" => "spletne storitve pod vašim nadzorom", "Log out" => "Odjava", "Automatic logon rejected!" => "Samodejno prijavljanje je zavrnjeno!", -"If you did not change your password recently, your account may be compromised!" => "Če vašega gesla niste nedavno spremenili, je vaš račun lahko ogrožen!", +"If you did not change your password recently, your account may be compromised!" => "V primeru, da gesla za dostop že nekaj časa niste spremenili, je račun lahko ogrožen!", "Please change your password to secure your account again." => "Spremenite geslo za izboljšanje zaščite računa.", "Lost your password?" => "Ali ste pozabili geslo?", -"remember" => "Zapomni si me", +"remember" => "zapomni si", "Log in" => "Prijava", "Alternative Logins" => "Druge prijavne možnosti", "prev" => "nazaj", diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php index 6a2c2e35a48..631baf7cef9 100644 --- a/core/l10n/zh_CN.php +++ b/core/l10n/zh_CN.php @@ -5,6 +5,7 @@ "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "用户 %s 与您共享了文件夹\"%s\"。文件夹下载地址：%s", "Category type not provided." => "未提供分类类型。", "No category to add?" => "没有可添加分类？", +"This category already exists: %s" => "此分类已存在：%s", "Object type not provided." => "未提供对象类型。", "%s ID not provided." => "%s ID未提供。", "Error adding %s to favorites." => "向收藏夹中新增%s时出错。", @@ -83,6 +84,8 @@ "Error setting expiration date" => "设置过期日期时出错", "Sending ..." => "正在发送...", "Email sent" => "邮件已发送", +"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新不成功。请汇报将此问题汇报给 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。", +"The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。", "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." => "您将会收到包含可以重置密码链接的邮件。", @@ -106,6 +109,8 @@ "Security Warning" => "安全警告", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "随机数生成器无效，请启用PHP的OpenSSL扩展", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "没有安全随机码生成器，攻击者可能会猜测密码重置信息从而窃取您的账户", +"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。", +"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "关于如何配置服务器，请参见 <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">此文档</a>。", "Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>", "Advanced" => "高级", "Data folder" => "数据目录", @@ -125,6 +130,7 @@ "Lost your password?" => "忘记密码？", "remember" => "记住", "Log in" => "登录", +"Alternative Logins" => "其他登录方式", "prev" => "上一页", "next" => "下一页", "Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s，这可能需要一些时间。" diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php index f55da4d3ef9..d02b7be6601 100644 --- a/core/l10n/zh_HK.php +++ b/core/l10n/zh_HK.php @@ -1,3 +1,90 @@ <?php $TRANSLATIONS = array( -"You are logged out." => "你已登出。" +"Sunday" => "星期日", +"Monday" => "星期一", +"Tuesday" => "星期二", +"Wednesday" => "星期三", +"Thursday" => "星期四", +"Friday" => "星期五", +"Saturday" => "星期六", +"January" => "一月", +"February" => "二月", +"March" => "三月", +"April" => "四月", +"May" => "五月", +"June" => "六月", +"July" => "七月", +"August" => "八月", +"September" => "九月", +"October" => "十月", +"November" => "十一月", +"December" => "十二月", +"Settings" => "設定", +"today" => "今日", +"yesterday" => "昨日", +"last month" => "前一月", +"months ago" => "個月之前", +"Cancel" => "取消", +"No" => "No", +"Yes" => "Yes", +"Ok" => "OK", +"Error" => "錯誤", +"Shared" => "已分享", +"Share" => "分享", +"Error while sharing" => "分享時發生錯誤", +"Error while unsharing" => "取消分享時發生錯誤", +"Error while changing permissions" => "更改權限時發生錯誤", +"Shared with you and the group {group} by {owner}" => "{owner}與你及群組的分享", +"Shared with you by {owner}" => "{owner}與你的分享", +"Share with" => "分享", +"Share with link" => "以連結分享", +"Password protect" => "密碼保護", +"Password" => "密碼", +"Send" => "傳送", +"Set expiration date" => "設定分享期限", +"Expiration date" => "分享期限", +"Share via email:" => "以電郵分享", +"No people found" => "找不到", +"Unshare" => "取消分享", +"create" => "新增", +"update" => "更新", +"delete" => "刪除", +"share" => "分享", +"Password protected" => "密碼保護", +"Sending ..." => "傳送中", +"Email sent" => "郵件已傳", +"The update was successful. Redirecting you to ownCloud now." => "更新成功, 正", +"Use the following link to reset your password: {link}" => "請用以下連結重設你的密碼: {link}", +"You will receive a link to reset your password via Email." => "你將收到一封電郵", +"Reset email send." => "重設密碼郵件已傳", +"Request failed!" => "請求失敗", +"Username" => "用戶名稱", +"Request reset" => "重設", +"Your password was reset" => "你的密碼已被重設", +"To login page" => "前往登入版面", +"New password" => "新密碼", +"Reset password" => "重設密碼", +"Personal" => "個人", +"Users" => "用戶", +"Apps" => "軟件", +"Admin" => "管理", +"Help" => "幫助", +"Cloud not found" => "未找到Cloud", +"Add" => "加入", +"Create an <strong>admin account</strong>" => "建立管理員帳戶", +"Advanced" => "進階", +"Configure the database" => "設定資料庫", +"will be used" => "將被使用", +"Database user" => "資料庫帳戶", +"Database password" => "資料庫密碼", +"Database name" => "資料庫名稱", +"Log out" => "登出", +"Automatic logon rejected!" => "自動登入被拒", +"If you did not change your password recently, your account may be compromised!" => "如果你近期未曾更改密碼, 你的帳號可能被洩露!", +"Please change your password to secure your account again." => "請更改你的密碼以保護你的帳戶", +"Lost your password?" => "忘記密碼", +"remember" => "記住", +"Log in" => "登入", +"prev" => "前一步", +"next" => "下一步", +"Updating ownCloud to version %s, this may take a while." => "ownCloud (ver. %s)更新中, 請耐心等侯" ); diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po index b8c1d4424b3..21b3ee0cc4a 100644 --- a/l10n/cs_CZ/core.po +++ b/l10n/cs_CZ/core.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-22 00:06+0100\n" -"PO-Revision-Date: 2013-02-20 23:20+0000\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 13:50+0000\n" "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -21,24 +21,24 @@ msgstr "" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ajax/share.php:85 +#: ajax/share.php:97 #, php-format msgid "User %s shared a file with you" msgstr "Uživatel %s s vámi sdílí soubor" -#: ajax/share.php:87 +#: ajax/share.php:99 #, php-format msgid "User %s shared a folder with you" msgstr "Uživatel %s s vámi sdílí složku" -#: ajax/share.php:89 +#: ajax/share.php:101 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" msgstr "Uživatel %s s vámi sdílí soubor \"%s\". Můžete jej stáhnout zde: %s" -#: ajax/share.php:91 +#: ajax/share.php:104 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " @@ -84,79 +84,79 @@ msgstr "Žádné kategorie nebyly vybrány ke smazání." msgid "Error removing %s from favorites." msgstr "Chyba při odebírání %s z oblíbených." -#: js/config.php:32 +#: js/config.php:34 msgid "Sunday" msgstr "Neděle" -#: js/config.php:32 +#: js/config.php:35 msgid "Monday" msgstr "Pondělí" -#: js/config.php:32 +#: js/config.php:36 msgid "Tuesday" msgstr "Úterý" -#: js/config.php:32 +#: js/config.php:37 msgid "Wednesday" msgstr "Středa" -#: js/config.php:32 +#: js/config.php:38 msgid "Thursday" msgstr "Čtvrtek" -#: js/config.php:32 +#: js/config.php:39 msgid "Friday" msgstr "Pátek" -#: js/config.php:32 +#: js/config.php:40 msgid "Saturday" msgstr "Sobota" -#: js/config.php:33 +#: js/config.php:45 msgid "January" msgstr "Leden" -#: js/config.php:33 +#: js/config.php:46 msgid "February" msgstr "Únor" -#: js/config.php:33 +#: js/config.php:47 msgid "March" msgstr "Březen" -#: js/config.php:33 +#: js/config.php:48 msgid "April" msgstr "Duben" -#: js/config.php:33 +#: js/config.php:49 msgid "May" msgstr "Květen" -#: js/config.php:33 +#: js/config.php:50 msgid "June" msgstr "Červen" -#: js/config.php:33 +#: js/config.php:51 msgid "July" msgstr "Červenec" -#: js/config.php:33 +#: js/config.php:52 msgid "August" msgstr "Srpen" -#: js/config.php:33 +#: js/config.php:53 msgid "September" msgstr "Září" -#: js/config.php:33 +#: js/config.php:54 msgid "October" msgstr "Říjen" -#: js/config.php:33 +#: js/config.php:55 msgid "November" msgstr "Listopad" -#: js/config.php:33 +#: js/config.php:56 msgid "December" msgstr "Prosinec" @@ -164,55 +164,55 @@ msgstr "Prosinec" msgid "Settings" msgstr "Nastavení" -#: js/js.js:767 +#: js/js.js:777 msgid "seconds ago" msgstr "před pár vteřinami" -#: js/js.js:768 +#: js/js.js:778 msgid "1 minute ago" msgstr "před minutou" -#: js/js.js:769 +#: js/js.js:779 msgid "{minutes} minutes ago" msgstr "před {minutes} minutami" -#: js/js.js:770 +#: js/js.js:780 msgid "1 hour ago" msgstr "před hodinou" -#: js/js.js:771 +#: js/js.js:781 msgid "{hours} hours ago" msgstr "před {hours} hodinami" -#: js/js.js:772 +#: js/js.js:782 msgid "today" msgstr "dnes" -#: js/js.js:773 +#: js/js.js:783 msgid "yesterday" msgstr "včera" -#: js/js.js:774 +#: js/js.js:784 msgid "{days} days ago" msgstr "před {days} dny" -#: js/js.js:775 +#: js/js.js:785 msgid "last month" msgstr "minulý mesíc" -#: js/js.js:776 +#: js/js.js:786 msgid "{months} months ago" msgstr "před {months} měsíci" -#: js/js.js:777 +#: js/js.js:787 msgid "months ago" msgstr "před měsíci" -#: js/js.js:778 +#: js/js.js:788 msgid "last year" msgstr "minulý rok" -#: js/js.js:779 +#: js/js.js:789 msgid "years ago" msgstr "před lety" @@ -242,8 +242,8 @@ msgid "The object type is not specified." msgstr "Není určen typ objektu." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582 -#: js/share.js:594 +#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566 +#: js/share.js:578 msgid "Error" msgstr "Chyba" @@ -255,127 +255,127 @@ msgstr "Není určen název aplikace." msgid "The required file {file} is not installed!" msgstr "Požadovaný soubor {file} není nainstalován." -#: js/share.js:29 js/share.js:43 js/share.js:90 +#: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" msgstr "Sdílené" -#: js/share.js:93 +#: js/share.js:90 msgid "Share" msgstr "Sdílet" -#: js/share.js:141 js/share.js:622 +#: js/share.js:125 js/share.js:606 msgid "Error while sharing" msgstr "Chyba při sdílení" -#: js/share.js:152 +#: js/share.js:136 msgid "Error while unsharing" msgstr "Chyba při rušení sdílení" -#: js/share.js:159 +#: js/share.js:143 msgid "Error while changing permissions" msgstr "Chyba při změně oprávnění" -#: js/share.js:168 +#: js/share.js:152 msgid "Shared with you and the group {group} by {owner}" msgstr "S Vámi a skupinou {group} sdílí {owner}" -#: js/share.js:170 +#: js/share.js:154 msgid "Shared with you by {owner}" msgstr "S Vámi sdílí {owner}" -#: js/share.js:175 +#: js/share.js:159 msgid "Share with" msgstr "Sdílet s" -#: js/share.js:180 +#: js/share.js:164 msgid "Share with link" msgstr "Sdílet s odkazem" -#: js/share.js:183 +#: js/share.js:167 msgid "Password protect" msgstr "Chránit heslem" -#: js/share.js:185 templates/installation.php:44 templates/login.php:35 +#: js/share.js:169 templates/installation.php:47 templates/login.php:35 msgid "Password" msgstr "Heslo" -#: js/share.js:189 +#: js/share.js:173 msgid "Email link to person" msgstr "Odeslat osobě odkaz e-mailem" -#: js/share.js:190 +#: js/share.js:174 msgid "Send" msgstr "Odeslat" -#: js/share.js:194 +#: js/share.js:178 msgid "Set expiration date" msgstr "Nastavit datum vypršení platnosti" -#: js/share.js:195 +#: js/share.js:179 msgid "Expiration date" msgstr "Datum vypršení platnosti" -#: js/share.js:227 +#: js/share.js:211 msgid "Share via email:" msgstr "Sdílet e-mailem:" -#: js/share.js:229 +#: js/share.js:213 msgid "No people found" msgstr "Žádní lidé nenalezeni" -#: js/share.js:256 +#: js/share.js:240 msgid "Resharing is not allowed" msgstr "Sdílení již sdílené položky není povoleno" -#: js/share.js:292 +#: js/share.js:276 msgid "Shared in {item} with {user}" msgstr "Sdíleno v {item} s {user}" -#: js/share.js:313 +#: js/share.js:297 msgid "Unshare" msgstr "Zrušit sdílení" -#: js/share.js:325 +#: js/share.js:309 msgid "can edit" msgstr "lze upravovat" -#: js/share.js:327 +#: js/share.js:311 msgid "access control" msgstr "řízení přístupu" -#: js/share.js:330 +#: js/share.js:314 msgid "create" msgstr "vytvořit" -#: js/share.js:333 +#: js/share.js:317 msgid "update" msgstr "aktualizovat" -#: js/share.js:336 +#: js/share.js:320 msgid "delete" msgstr "smazat" -#: js/share.js:339 +#: js/share.js:323 msgid "share" msgstr "sdílet" -#: js/share.js:373 js/share.js:569 +#: js/share.js:357 js/share.js:553 msgid "Password protected" msgstr "Chráněno heslem" -#: js/share.js:582 +#: js/share.js:566 msgid "Error unsetting expiration date" msgstr "Chyba při odstraňování data vypršení platnosti" -#: js/share.js:594 +#: js/share.js:578 msgid "Error setting expiration date" msgstr "Chyba při nastavení data vypršení platnosti" -#: js/share.js:609 +#: js/share.js:593 msgid "Sending ..." msgstr "Odesílám..." -#: js/share.js:620 +#: js/share.js:604 msgid "Email sent" msgstr "E-mail odeslán" @@ -410,7 +410,7 @@ msgstr "Obnovovací e-mail odeslán." msgid "Request failed!" msgstr "Požadavek selhal." -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41 #: templates/login.php:28 msgid "Username" msgstr "Uživatelské jméno" @@ -471,85 +471,86 @@ msgstr "Upravit kategorie" msgid "Add" msgstr "Přidat" -#: templates/installation.php:23 templates/installation.php:30 +#: templates/installation.php:24 templates/installation.php:31 msgid "Security Warning" msgstr "Bezpečnostní upozornění" -#: templates/installation.php:24 +#: templates/installation.php:25 msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." msgstr "Není dostupný žádný bezpečný generátor náhodných čísel. Povolte, prosím, rozšíření OpenSSL v PHP." -#: templates/installation.php:25 +#: templates/installation.php:26 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." msgstr "Bez bezpečného generátoru náhodných čísel může útočník předpovědět token pro obnovu hesla a převzít kontrolu nad Vaším účtem." -#: templates/installation.php:31 +#: templates/installation.php:32 msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." msgstr "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje." -#: templates/installation.php:32 +#: templates/installation.php:33 msgid "" "For information how to properly configure your server, please see the <a " "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" " "target=\"_blank\">documentation</a>." msgstr "Pro informace jak správně nastavit váš server se podívejte do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentace</a>." -#: templates/installation.php:36 +#: templates/installation.php:37 msgid "Create an <strong>admin account</strong>" msgstr "Vytvořit <strong>účet správce</strong>" -#: templates/installation.php:52 +#: templates/installation.php:55 msgid "Advanced" msgstr "Pokročilé" -#: templates/installation.php:54 +#: templates/installation.php:57 msgid "Data folder" msgstr "Složka s daty" -#: templates/installation.php:61 +#: templates/installation.php:66 msgid "Configure the database" msgstr "Nastavit databázi" -#: templates/installation.php:66 templates/installation.php:77 -#: templates/installation.php:87 templates/installation.php:97 +#: templates/installation.php:71 templates/installation.php:83 +#: templates/installation.php:94 templates/installation.php:105 +#: templates/installation.php:117 msgid "will be used" msgstr "bude použito" -#: templates/installation.php:109 +#: templates/installation.php:129 msgid "Database user" msgstr "Uživatel databáze" -#: templates/installation.php:113 +#: templates/installation.php:134 msgid "Database password" msgstr "Heslo databáze" -#: templates/installation.php:117 +#: templates/installation.php:139 msgid "Database name" msgstr "Název databáze" -#: templates/installation.php:125 +#: templates/installation.php:149 msgid "Database tablespace" msgstr "Tabulkový prostor databáze" -#: templates/installation.php:131 +#: templates/installation.php:156 msgid "Database host" msgstr "Hostitel databáze" -#: templates/installation.php:136 +#: templates/installation.php:162 msgid "Finish setup" msgstr "Dokončit nastavení" -#: templates/layout.guest.php:33 +#: templates/layout.guest.php:40 msgid "web services under your control" msgstr "webové služby pod Vaší kontrolou" -#: templates/layout.user.php:48 +#: templates/layout.user.php:58 msgid "Log out" msgstr "Odhlásit se" @@ -573,7 +574,7 @@ msgstr "Ztratili jste své heslo?" #: templates/login.php:41 msgid "remember" -msgstr "zapamatovat si" +msgstr "zapamatovat" #: templates/login.php:43 msgid "Log in" diff --git a/l10n/de/files.po b/l10n/de/files.po index 12c0a5d4504..3be42e89c97 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -28,9 +28,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-05 00:18+0100\n" -"PO-Revision-Date: 2013-03-04 13:20+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 15:30+0000\n" +"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -95,7 +95,7 @@ msgstr "Nicht genug Speicherplatz verfügbar" msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" msgstr "Dateien" @@ -111,8 +111,8 @@ msgstr "Löschen" msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 -#: js/files.js:439 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409 +#: js/files.js:440 msgid "Pending" msgstr "Ausstehend" @@ -166,74 +166,74 @@ msgstr "Ihr Speicherplatz ist voll, Dateien können nicht mehr aktualisiert oder msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ihr Speicherplatz ist fast aufgebraucht ({usedSpacePercent}%)" -#: js/files.js:225 +#: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern." -#: js/files.js:262 +#: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist." -#: js/files.js:262 +#: js/files.js:263 msgid "Upload Error" msgstr "Fehler beim Upload" -#: js/files.js:273 +#: js/files.js:274 msgid "Close" msgstr "Schließen" -#: js/files.js:312 +#: js/files.js:313 msgid "1 file uploading" msgstr "Eine Datei wird hoch geladen" -#: js/files.js:315 js/files.js:370 js/files.js:385 +#: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" msgstr "{count} Dateien werden hochgeladen" -#: js/files.js:388 js/files.js:423 +#: js/files.js:389 js/files.js:424 msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/files.js:497 +#: js/files.js:498 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen." -#: js/files.js:570 +#: js/files.js:571 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/files.js:575 +#: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten." -#: js/files.js:953 templates/index.php:68 +#: js/files.js:954 templates/index.php:68 msgid "Name" msgstr "Name" -#: js/files.js:954 templates/index.php:79 +#: js/files.js:955 templates/index.php:79 msgid "Size" msgstr "Größe" -#: js/files.js:955 templates/index.php:81 +#: js/files.js:956 templates/index.php:81 msgid "Modified" msgstr "Bearbeitet" -#: js/files.js:974 +#: js/files.js:975 msgid "1 folder" msgstr "1 Ordner" -#: js/files.js:976 +#: js/files.js:977 msgid "{count} folders" msgstr "{count} Ordner" -#: js/files.js:984 +#: js/files.js:985 msgid "1 file" msgstr "1 Datei" -#: js/files.js:986 +#: js/files.js:987 msgid "{count} files" msgstr "{count} Dateien" diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po index ef49bcedfad..b78f37fc547 100644 --- a/l10n/de/files_trashbin.po +++ b/l10n/de/files_trashbin.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-07 23:40+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 15:30+0000\n" +"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,7 +41,7 @@ msgstr "Datei dauerhaft löschen" #: js/trash.js:121 msgid "Delete permanently" -msgstr "Permanent löschen" +msgstr "Endgültig löschen" #: js/trash.js:174 templates/index.php:17 msgid "Name" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 76f41d6da2a..fc4b5c8344d 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -21,14 +21,15 @@ # <thomas.mueller@tmit.eu>, 2012. # <transifex.3.mensaje@spamgourmet.com>, 2012. # Tristan <blobbyjj@ymail.com>, 2013. +# <uu.kabum@gmail.com>, 2013. # <wachhund@wachhund.to>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-01 00:05+0100\n" -"PO-Revision-Date: 2013-02-28 08:40+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 14:41+0000\n" +"Last-Translator: kabum <uu.kabum@gmail.com>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -232,7 +233,7 @@ msgid "" "This ownCloud server can't set system locale to %s. This means that there " "might be problems with certain characters in file names. We strongly suggest" " to install the required packages on your system to support %s." -msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für %s benötigten Pakete auf ihrem System zu installieren." +msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für %s benötigten Pakete auf ihrem System zu installieren." #: templates/admin.php:75 msgid "Internet connection not working" diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po index f11912dee7c..7bdb91c81f7 100644 --- a/l10n/de/user_ldap.po +++ b/l10n/de/user_ldap.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 18:30+0000\n" +"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n" "Language-Team: German <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -96,248 +96,248 @@ msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird d msgid "Server configuration" msgstr "Serverkonfiguration" -#: templates/settings.php:18 +#: templates/settings.php:31 msgid "Add Server Configuration" msgstr "Serverkonfiguration hinzufügen" -#: templates/settings.php:23 +#: templates/settings.php:36 msgid "Host" msgstr "Host" -#: templates/settings.php:25 +#: templates/settings.php:38 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://" -#: templates/settings.php:26 +#: templates/settings.php:39 msgid "Base DN" msgstr "Basis-DN" -#: templates/settings.php:27 +#: templates/settings.php:40 msgid "One Base DN per line" msgstr "Ein Base DN pro Zeile" -#: templates/settings.php:28 +#: templates/settings.php:41 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren" -#: templates/settings.php:30 +#: templates/settings.php:43 msgid "User DN" msgstr "Benutzer-DN" -#: templates/settings.php:32 +#: templates/settings.php:45 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer." -#: templates/settings.php:33 +#: templates/settings.php:46 msgid "Password" msgstr "Passwort" -#: templates/settings.php:36 +#: templates/settings.php:49 msgid "For anonymous access, leave DN and Password empty." msgstr "Lasse die Felder von DN und Passwort für anonymen Zugang leer." -#: templates/settings.php:37 +#: templates/settings.php:50 msgid "User Login Filter" msgstr "Benutzer-Login-Filter" -#: templates/settings.php:40 +#: templates/settings.php:53 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch." -#: templates/settings.php:41 +#: templates/settings.php:54 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"" -#: templates/settings.php:42 +#: templates/settings.php:55 msgid "User List Filter" msgstr "Benutzer-Filter-Liste" -#: templates/settings.php:45 +#: templates/settings.php:58 msgid "Defines the filter to apply, when retrieving users." msgstr "Definiert den Filter für die Anfrage der Benutzer." -#: templates/settings.php:46 +#: templates/settings.php:59 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "ohne Platzhalter, z.B.: \"objectClass=person\"" -#: templates/settings.php:47 +#: templates/settings.php:60 msgid "Group Filter" msgstr "Gruppen-Filter" -#: templates/settings.php:50 +#: templates/settings.php:63 msgid "Defines the filter to apply, when retrieving groups." msgstr "Definiert den Filter für die Anfrage der Gruppen." -#: templates/settings.php:51 +#: templates/settings.php:64 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"" -#: templates/settings.php:55 +#: templates/settings.php:68 msgid "Connection Settings" msgstr "Verbindungseinstellungen" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "Configuration Active" msgstr "Konfiguration aktiv" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "When unchecked, this configuration will be skipped." msgstr "Konfiguration wird übersprungen wenn deaktiviert" -#: templates/settings.php:58 +#: templates/settings.php:71 msgid "Port" msgstr "Port" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "Backup (Replica) Host" msgstr "Backup Host (Kopie)" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln." -#: templates/settings.php:60 +#: templates/settings.php:73 msgid "Backup (Replica) Port" msgstr "Backup Port" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "Disable Main Server" msgstr "Hauptserver deaktivieren" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden." -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Use TLS" msgstr "Nutze TLS" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen." -#: templates/settings.php:63 +#: templates/settings.php:76 msgid "Case insensitve LDAP server (Windows)" msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Turn off SSL certificate validation." msgstr "Schalte die SSL-Zertifikatsprüfung aus." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Not recommended, use for testing only." msgstr "Nicht empfohlen, nur zu Testzwecken." -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Speichere Time-To-Live zwischen" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "in seconds. A change empties the cache." msgstr "in Sekunden. Eine Änderung leert den Cache." -#: templates/settings.php:67 +#: templates/settings.php:80 msgid "Directory Settings" msgstr "Ordnereinstellungen" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "User Display Name Field" msgstr "Feld für den Anzeigenamen des Benutzers" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. " -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "Base User Tree" msgstr "Basis-Benutzerbaum" -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "One User Base DN per line" msgstr "Ein Benutzer Base DN pro Zeile" -#: templates/settings.php:71 +#: templates/settings.php:84 msgid "User Search Attributes" msgstr "Benutzersucheigenschaften" -#: templates/settings.php:71 templates/settings.php:74 +#: templates/settings.php:84 templates/settings.php:87 msgid "Optional; one attribute per line" msgstr "Optional; eine Eigenschaft pro Zeile" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "Group Display Name Field" msgstr "Feld für den Anzeigenamen der Gruppe" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. " -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "Base Group Tree" msgstr "Basis-Gruppenbaum" -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "One Group Base DN per line" msgstr "Ein Gruppen Base DN pro Zeile" -#: templates/settings.php:74 +#: templates/settings.php:87 msgid "Group Search Attributes" msgstr "Gruppensucheigenschaften" -#: templates/settings.php:75 +#: templates/settings.php:88 msgid "Group-Member association" msgstr "Assoziation zwischen Gruppe und Benutzer" -#: templates/settings.php:77 +#: templates/settings.php:90 msgid "Special Attributes" msgstr "Spezielle Eigenschaften" -#: templates/settings.php:79 +#: templates/settings.php:92 msgid "Quota Field" -msgstr "" +msgstr "Kontingent Feld" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "Quota Default" -msgstr "" +msgstr "Kontingent Standard" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "in bytes" msgstr "in Bytes" -#: templates/settings.php:81 +#: templates/settings.php:94 msgid "Email Field" -msgstr "" +msgstr "E-Mail Feld" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Benennungsregel für das Heimatverzeichnis des Benutzers" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein." -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Test Configuration" -msgstr "" +msgstr "Testkonfiguration" -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Help" msgstr "Hilfe" diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po index 0b1891ce182..d6ee9818e35 100644 --- a/l10n/de_DE/files.po +++ b/l10n/de_DE/files.po @@ -33,9 +33,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-06 00:07+0100\n" -"PO-Revision-Date: 2013-03-05 21:30+0000\n" -"Last-Translator: a.tangemann <a.tangemann@web.de>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 15:20+0000\n" +"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -100,7 +100,7 @@ msgstr "Nicht genug Speicher vorhanden." msgid "Invalid directory." msgstr "Ungültiges Verzeichnis." -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" msgstr "Dateien" @@ -116,8 +116,8 @@ msgstr "Löschen" msgid "Rename" msgstr "Umbenennen" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 -#: js/files.js:439 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409 +#: js/files.js:440 msgid "Pending" msgstr "Ausstehend" @@ -171,74 +171,74 @@ msgstr "Ihr Speicher ist voll. Daher können keine Dateien mehr aktualisiert ode msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)" -#: js/files.js:225 +#: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien einen Moment dauern." -#: js/files.js:262 +#: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist." -#: js/files.js:262 +#: js/files.js:263 msgid "Upload Error" msgstr "Fehler beim Upload" -#: js/files.js:273 +#: js/files.js:274 msgid "Close" msgstr "Schließen" -#: js/files.js:312 +#: js/files.js:313 msgid "1 file uploading" msgstr "1 Datei wird hochgeladen" -#: js/files.js:315 js/files.js:370 js/files.js:385 +#: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" msgstr "{count} Dateien wurden hochgeladen" -#: js/files.js:388 js/files.js:423 +#: js/files.js:389 js/files.js:424 msgid "Upload cancelled." msgstr "Upload abgebrochen." -#: js/files.js:497 +#: js/files.js:498 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen." -#: js/files.js:570 +#: js/files.js:571 msgid "URL cannot be empty." msgstr "Die URL darf nicht leer sein." -#: js/files.js:575 +#: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten" -#: js/files.js:953 templates/index.php:68 +#: js/files.js:954 templates/index.php:68 msgid "Name" msgstr "Name" -#: js/files.js:954 templates/index.php:79 +#: js/files.js:955 templates/index.php:79 msgid "Size" msgstr "Größe" -#: js/files.js:955 templates/index.php:81 +#: js/files.js:956 templates/index.php:81 msgid "Modified" msgstr "Bearbeitet" -#: js/files.js:974 +#: js/files.js:975 msgid "1 folder" msgstr "1 Ordner" -#: js/files.js:976 +#: js/files.js:977 msgid "{count} folders" msgstr "{count} Ordner" -#: js/files.js:984 +#: js/files.js:985 msgid "1 file" msgstr "1 Datei" -#: js/files.js:986 +#: js/files.js:987 msgid "{count} files" msgstr "{count} Dateien" diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po index cc95fb352c2..c02de29c291 100644 --- a/l10n/de_DE/files_trashbin.po +++ b/l10n/de_DE/files_trashbin.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-07 23:40+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 15:20+0000\n" +"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -84,4 +84,4 @@ msgstr "Löschen" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "gelöschte Dateien" +msgstr "Gelöschte Dateien" diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po index dada42976f1..34e569650fc 100644 --- a/l10n/de_DE/settings.po +++ b/l10n/de_DE/settings.po @@ -31,8 +31,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-06 00:07+0100\n" -"PO-Revision-Date: 2013-03-05 21:30+0000\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 14:41+0000\n" "Last-Translator: a.tangemann <a.tangemann@web.de>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po index 4e357c00924..1f3877df3ce 100644 --- a/l10n/es_AR/files.po +++ b/l10n/es_AR/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 09:50+0000\n" +"Last-Translator: cjtess <claudio.tessone@gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,7 +78,7 @@ msgstr "No hay suficiente capacidad de almacenamiento" msgid "Invalid directory." msgstr "Directorio invalido." -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" msgstr "Archivos" @@ -94,8 +94,8 @@ msgstr "Borrar" msgid "Rename" msgstr "Cambiar nombre" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 -#: js/files.js:439 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409 +#: js/files.js:440 msgid "Pending" msgstr "Pendiente" @@ -149,74 +149,74 @@ msgstr "El almacenamiento está lleno, los archivos no se pueden seguir actualiz msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)" -#: js/files.js:225 +#: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes." -#: js/files.js:262 +#: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes" -#: js/files.js:262 +#: js/files.js:263 msgid "Upload Error" msgstr "Error al subir el archivo" -#: js/files.js:273 +#: js/files.js:274 msgid "Close" msgstr "Cerrar" -#: js/files.js:312 +#: js/files.js:313 msgid "1 file uploading" msgstr "Subiendo 1 archivo" -#: js/files.js:315 js/files.js:370 js/files.js:385 +#: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" msgstr "Subiendo {count} archivos" -#: js/files.js:388 js/files.js:423 +#: js/files.js:389 js/files.js:424 msgid "Upload cancelled." msgstr "La subida fue cancelada" -#: js/files.js:497 +#: js/files.js:498 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará." -#: js/files.js:570 +#: js/files.js:571 msgid "URL cannot be empty." msgstr "La URL no puede estar vacía" -#: js/files.js:575 +#: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud" -#: js/files.js:953 templates/index.php:68 +#: js/files.js:954 templates/index.php:68 msgid "Name" msgstr "Nombre" -#: js/files.js:954 templates/index.php:79 +#: js/files.js:955 templates/index.php:79 msgid "Size" msgstr "Tamaño" -#: js/files.js:955 templates/index.php:81 +#: js/files.js:956 templates/index.php:81 msgid "Modified" msgstr "Modificado" -#: js/files.js:974 +#: js/files.js:975 msgid "1 folder" msgstr "1 directorio" -#: js/files.js:976 +#: js/files.js:977 msgid "{count} folders" msgstr "{count} directorios" -#: js/files.js:984 +#: js/files.js:985 msgid "1 file" msgstr "1 archivo" -#: js/files.js:986 +#: js/files.js:987 msgid "{count} files" msgstr "{count} archivos" @@ -282,7 +282,7 @@ msgstr "Cancelar subida" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "No tenés permisos de escritura acá." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po index 6f51b5e9509..e73aafc61c7 100644 --- a/l10n/es_AR/user_ldap.po +++ b/l10n/es_AR/user_ldap.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 10:01+0000\n" +"Last-Translator: cjtess <claudio.tessone@gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,248 +89,248 @@ msgstr "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento msgid "Server configuration" msgstr "Configuración del Servidor" -#: templates/settings.php:18 +#: templates/settings.php:31 msgid "Add Server Configuration" msgstr "Añadir Configuración del Servidor" -#: templates/settings.php:23 +#: templates/settings.php:36 msgid "Host" msgstr "Servidor" -#: templates/settings.php:25 +#: templates/settings.php:38 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://" -#: templates/settings.php:26 +#: templates/settings.php:39 msgid "Base DN" msgstr "DN base" -#: templates/settings.php:27 +#: templates/settings.php:40 msgid "One Base DN per line" msgstr "Una DN base por línea" -#: templates/settings.php:28 +#: templates/settings.php:41 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"" -#: templates/settings.php:30 +#: templates/settings.php:43 msgid "User DN" msgstr "DN usuario" -#: templates/settings.php:32 +#: templates/settings.php:45 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos." -#: templates/settings.php:33 +#: templates/settings.php:46 msgid "Password" msgstr "Contraseña" -#: templates/settings.php:36 +#: templates/settings.php:49 msgid "For anonymous access, leave DN and Password empty." msgstr "Para acceso anónimo, dejá DN y contraseña vacíos." -#: templates/settings.php:37 +#: templates/settings.php:50 msgid "User Login Filter" msgstr "Filtro de inicio de sesión de usuario" -#: templates/settings.php:40 +#: templates/settings.php:53 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión." -#: templates/settings.php:41 +#: templates/settings.php:54 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\"" -#: templates/settings.php:42 +#: templates/settings.php:55 msgid "User List Filter" msgstr "Lista de filtros de usuario" -#: templates/settings.php:45 +#: templates/settings.php:58 msgid "Defines the filter to apply, when retrieving users." msgstr "Define el filtro a aplicar, cuando se obtienen usuarios." -#: templates/settings.php:46 +#: templates/settings.php:59 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "Sin plantilla, p. ej.: \"objectClass=person\"." -#: templates/settings.php:47 +#: templates/settings.php:60 msgid "Group Filter" msgstr "Filtro de grupo" -#: templates/settings.php:50 +#: templates/settings.php:63 msgid "Defines the filter to apply, when retrieving groups." msgstr "Define el filtro a aplicar cuando se obtienen grupos." -#: templates/settings.php:51 +#: templates/settings.php:64 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"." -#: templates/settings.php:55 +#: templates/settings.php:68 msgid "Connection Settings" msgstr "Configuración de Conección" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "Configuration Active" msgstr "Configuración activa" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "When unchecked, this configuration will be skipped." msgstr "Si no está seleccionada, esta configuración será omitida." -#: templates/settings.php:58 +#: templates/settings.php:71 msgid "Port" msgstr "Puerto" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "Backup (Replica) Host" msgstr "Host para copia de seguridad (réplica)" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD." -#: templates/settings.php:60 +#: templates/settings.php:73 msgid "Backup (Replica) Port" msgstr "Puerto para copia de seguridad (réplica)" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "Disable Main Server" msgstr "Deshabilitar el Servidor Principal" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "Al comenzar, ownCloud se conectará únicamente al servidor réplica" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Use TLS" msgstr "Usar TLS" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "No usar adicionalmente para conexiones LDAPS, las mismas fallarán" -#: templates/settings.php:63 +#: templates/settings.php:76 msgid "Case insensitve LDAP server (Windows)" msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Turn off SSL certificate validation." msgstr "Desactivar la validación por certificado SSL." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Not recommended, use for testing only." msgstr "No recomendado, sólo para pruebas." -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Tiempo de vida del caché" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "in seconds. A change empties the cache." msgstr "en segundos. Cambiarlo vacía la cache." -#: templates/settings.php:67 +#: templates/settings.php:80 msgid "Directory Settings" msgstr "Configuración de Directorio" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "User Display Name Field" msgstr "Campo de nombre de usuario a mostrar" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud." -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "Base User Tree" msgstr "Árbol base de usuario" -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "One User Base DN per line" msgstr "Una DN base de usuario por línea" -#: templates/settings.php:71 +#: templates/settings.php:84 msgid "User Search Attributes" msgstr "Atributos de la búsqueda de usuario" -#: templates/settings.php:71 templates/settings.php:74 +#: templates/settings.php:84 templates/settings.php:87 msgid "Optional; one attribute per line" msgstr "Opcional; un atributo por linea" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "Group Display Name Field" msgstr "Campo de nombre de grupo a mostrar" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud." -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "Base Group Tree" msgstr "Árbol base de grupo" -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "One Group Base DN per line" msgstr "Una DN base de grupo por línea" -#: templates/settings.php:74 +#: templates/settings.php:87 msgid "Group Search Attributes" msgstr "Atributos de búsqueda de grupo" -#: templates/settings.php:75 +#: templates/settings.php:88 msgid "Group-Member association" msgstr "Asociación Grupo-Miembro" -#: templates/settings.php:77 +#: templates/settings.php:90 msgid "Special Attributes" msgstr "Atributos Especiales" -#: templates/settings.php:79 +#: templates/settings.php:92 msgid "Quota Field" -msgstr "" +msgstr "Campo de cuota" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "Quota Default" -msgstr "" +msgstr "Cuota por defecto" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "in bytes" msgstr "en bytes" -#: templates/settings.php:81 +#: templates/settings.php:94 msgid "Email Field" -msgstr "" +msgstr "Campo de e-mail" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Regla de nombre de los directorios de usuario" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD." -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Test Configuration" -msgstr "" +msgstr "Probar configuración" -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Help" msgstr "Ayuda" diff --git a/l10n/fa/core.po b/l10n/fa/core.po index e800192efd3..7f82989ac31 100644 --- a/l10n/fa/core.po +++ b/l10n/fa/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 00:08+0100\n" -"PO-Revision-Date: 2013-02-26 07:50+0000\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 06:00+0000\n" "Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -162,55 +162,55 @@ msgstr "دسامبر" msgid "Settings" msgstr "تنظیمات" -#: js/js.js:768 +#: js/js.js:777 msgid "seconds ago" msgstr "ثانیهها پیش" -#: js/js.js:769 +#: js/js.js:778 msgid "1 minute ago" msgstr "1 دقیقه پیش" -#: js/js.js:770 +#: js/js.js:779 msgid "{minutes} minutes ago" msgstr "{دقیقه ها} دقیقه های پیش" -#: js/js.js:771 +#: js/js.js:780 msgid "1 hour ago" msgstr "1 ساعت پیش" -#: js/js.js:772 +#: js/js.js:781 msgid "{hours} hours ago" msgstr "{ساعت ها} ساعت ها پیش" -#: js/js.js:773 +#: js/js.js:782 msgid "today" msgstr "امروز" -#: js/js.js:774 +#: js/js.js:783 msgid "yesterday" msgstr "دیروز" -#: js/js.js:775 +#: js/js.js:784 msgid "{days} days ago" msgstr "{روزها} روزهای پیش" -#: js/js.js:776 +#: js/js.js:785 msgid "last month" msgstr "ماه قبل" -#: js/js.js:777 +#: js/js.js:786 msgid "{months} months ago" msgstr "{ماه ها} ماه ها پیش" -#: js/js.js:778 +#: js/js.js:787 msgid "months ago" msgstr "ماههای قبل" -#: js/js.js:779 +#: js/js.js:788 msgid "last year" msgstr "سال قبل" -#: js/js.js:780 +#: js/js.js:789 msgid "years ago" msgstr "سالهای قبل" @@ -240,8 +240,8 @@ msgid "The object type is not specified." msgstr "نوع شی تعیین نشده است." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582 -#: js/share.js:594 +#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566 +#: js/share.js:578 msgid "Error" msgstr "خطا" @@ -253,127 +253,127 @@ msgstr "نام برنامه تعیین نشده است." msgid "The required file {file} is not installed!" msgstr "پرونده { پرونده} درخواست شده نصب نشده است !" -#: js/share.js:29 js/share.js:43 js/share.js:90 +#: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" msgstr "اشتراک گذاشته شده" -#: js/share.js:93 +#: js/share.js:90 msgid "Share" msgstr "اشتراکگزاری" -#: js/share.js:141 js/share.js:622 +#: js/share.js:125 js/share.js:606 msgid "Error while sharing" msgstr "خطا درحال به اشتراک گذاشتن" -#: js/share.js:152 +#: js/share.js:136 msgid "Error while unsharing" msgstr "خطا درحال لغو اشتراک" -#: js/share.js:159 +#: js/share.js:143 msgid "Error while changing permissions" msgstr "خطا در حال تغییر مجوز" -#: js/share.js:168 +#: js/share.js:152 msgid "Shared with you and the group {group} by {owner}" msgstr "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}" -#: js/share.js:170 +#: js/share.js:154 msgid "Shared with you by {owner}" msgstr "به اشتراک گذاشته شده با شما توسط { دارنده}" -#: js/share.js:175 +#: js/share.js:159 msgid "Share with" msgstr "به اشتراک گذاشتن با" -#: js/share.js:180 +#: js/share.js:164 msgid "Share with link" msgstr "به اشتراک گذاشتن با پیوند" -#: js/share.js:183 +#: js/share.js:167 msgid "Password protect" msgstr "نگهداری کردن رمز عبور" -#: js/share.js:185 templates/installation.php:47 templates/login.php:35 +#: js/share.js:169 templates/installation.php:47 templates/login.php:35 msgid "Password" msgstr "گذرواژه" -#: js/share.js:189 +#: js/share.js:173 msgid "Email link to person" msgstr "پیوند ایمیل برای شخص." -#: js/share.js:190 +#: js/share.js:174 msgid "Send" msgstr "ارسال" -#: js/share.js:194 +#: js/share.js:178 msgid "Set expiration date" msgstr "تنظیم تاریخ انقضا" -#: js/share.js:195 +#: js/share.js:179 msgid "Expiration date" msgstr "تاریخ انقضا" -#: js/share.js:227 +#: js/share.js:211 msgid "Share via email:" msgstr "از طریق ایمیل به اشتراک بگذارید :" -#: js/share.js:229 +#: js/share.js:213 msgid "No people found" msgstr "کسی یافت نشد" -#: js/share.js:256 +#: js/share.js:240 msgid "Resharing is not allowed" msgstr "اشتراک گذاری مجدد مجاز نمی باشد" -#: js/share.js:292 +#: js/share.js:276 msgid "Shared in {item} with {user}" msgstr "به اشتراک گذاشته شده در {بخش} با {کاربر}" -#: js/share.js:313 +#: js/share.js:297 msgid "Unshare" msgstr "لغو اشتراک" -#: js/share.js:325 +#: js/share.js:309 msgid "can edit" msgstr "می توان ویرایش کرد" -#: js/share.js:327 +#: js/share.js:311 msgid "access control" msgstr "کنترل دسترسی" -#: js/share.js:330 +#: js/share.js:314 msgid "create" msgstr "ایجاد" -#: js/share.js:333 +#: js/share.js:317 msgid "update" msgstr "به روز" -#: js/share.js:336 +#: js/share.js:320 msgid "delete" msgstr "پاک کردن" -#: js/share.js:339 +#: js/share.js:323 msgid "share" msgstr "به اشتراک گذاشتن" -#: js/share.js:373 js/share.js:569 +#: js/share.js:357 js/share.js:553 msgid "Password protected" msgstr "نگهداری از رمز عبور" -#: js/share.js:582 +#: js/share.js:566 msgid "Error unsetting expiration date" msgstr "خطا در تنظیم نکردن تاریخ انقضا " -#: js/share.js:594 +#: js/share.js:578 msgid "Error setting expiration date" msgstr "خطا در تنظیم تاریخ انقضا" -#: js/share.js:609 +#: js/share.js:593 msgid "Sending ..." msgstr "درحال ارسال ..." -#: js/share.js:620 +#: js/share.js:604 msgid "Email sent" msgstr "ایمیل ارسال شد" @@ -489,14 +489,14 @@ msgstr "بدون وجود یک تولید کننده اعداد تصادفی ا msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند." #: templates/installation.php:33 msgid "" "For information how to properly configure your server, please see the <a " "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" " "target=\"_blank\">documentation</a>." -msgstr "" +msgstr "برای مطلع شدن از چگونگی تنظیم سرورتان،لطفا <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">این</a> را ببینید." #: templates/installation.php:37 msgid "Create an <strong>admin account</strong>" @@ -544,11 +544,11 @@ msgstr "هاست پایگاه داده" msgid "Finish setup" msgstr "اتمام نصب" -#: templates/layout.guest.php:35 +#: templates/layout.guest.php:40 msgid "web services under your control" msgstr "سرویس وب تحت کنترل شما" -#: templates/layout.user.php:53 +#: templates/layout.user.php:58 msgid "Log out" msgstr "خروج" @@ -580,7 +580,7 @@ msgstr "ورود" #: templates/login.php:49 msgid "Alternative Logins" -msgstr "" +msgstr "ورود متناوب" #: templates/part.pagenavi.php:3 msgid "prev" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index f7ba7a03081..64ca95eab05 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -18,13 +18,14 @@ # Robert Di Rosa <>, 2012-2013. # <rom1dep@gmail.com>, 2011. # Romain DEP. <rom1dep@gmail.com>, 2012-2013. +# <zrk951@gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 19:10+0000\n" +"Last-Translator: Zertrin <zrk951@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -89,7 +90,7 @@ msgstr "Plus assez d'espace de stockage disponible" msgid "Invalid directory." msgstr "Dossier invalide." -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" msgstr "Fichiers" @@ -105,8 +106,8 @@ msgstr "Supprimer" msgid "Rename" msgstr "Renommer" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 -#: js/files.js:439 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409 +#: js/files.js:440 msgid "Pending" msgstr "En cours" @@ -160,74 +161,74 @@ msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus être t msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)" -#: js/files.js:225 +#: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux." -#: js/files.js:262 +#: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet." -#: js/files.js:262 +#: js/files.js:263 msgid "Upload Error" msgstr "Erreur de chargement" -#: js/files.js:273 +#: js/files.js:274 msgid "Close" msgstr "Fermer" -#: js/files.js:312 +#: js/files.js:313 msgid "1 file uploading" msgstr "1 fichier en cours de téléchargement" -#: js/files.js:315 js/files.js:370 js/files.js:385 +#: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" msgstr "{count} fichiers téléversés" -#: js/files.js:388 js/files.js:423 +#: js/files.js:389 js/files.js:424 msgid "Upload cancelled." msgstr "Chargement annulé." -#: js/files.js:497 +#: js/files.js:498 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier." -#: js/files.js:570 +#: js/files.js:571 msgid "URL cannot be empty." msgstr "L'URL ne peut-être vide" -#: js/files.js:575 +#: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud" -#: js/files.js:953 templates/index.php:68 +#: js/files.js:954 templates/index.php:68 msgid "Name" msgstr "Nom" -#: js/files.js:954 templates/index.php:79 +#: js/files.js:955 templates/index.php:79 msgid "Size" msgstr "Taille" -#: js/files.js:955 templates/index.php:81 +#: js/files.js:956 templates/index.php:81 msgid "Modified" msgstr "Modifié" -#: js/files.js:974 +#: js/files.js:975 msgid "1 folder" msgstr "1 dossier" -#: js/files.js:976 +#: js/files.js:977 msgid "{count} folders" msgstr "{count} dossiers" -#: js/files.js:984 +#: js/files.js:985 msgid "1 file" msgstr "1 fichier" -#: js/files.js:986 +#: js/files.js:987 msgid "{count} files" msgstr "{count} fichiers" @@ -293,7 +294,7 @@ msgstr "Annuler l'envoi" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Vous n'avez pas le droit d'écriture ici." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po index fd92856f84a..6a690785e21 100644 --- a/l10n/fr/files_external.po +++ b/l10n/fr/files_external.po @@ -5,13 +5,14 @@ # Translators: # <nicolas@shivaserv.fr>, 2012. # Romain DEP. <rom1dep@gmail.com>, 2012. +# <zrk951@gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-01 00:05+0100\n" -"PO-Revision-Date: 2013-02-27 23:20+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 19:21+0000\n" +"Last-Translator: Zertrin <zrk951@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,13 +40,13 @@ msgstr "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de pas msgid "Error configuring Google Drive storage" msgstr "Erreur lors de la configuration du support de stockage Google Drive" -#: lib/config.php:421 +#: lib/config.php:423 msgid "" "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." msgstr "<b>Attention : </b> \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur système pour l'installer." -#: lib/config.php:424 +#: lib/config.php:426 msgid "" "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " @@ -62,7 +63,7 @@ msgstr "Nom du dossier" #: templates/settings.php:10 msgid "External storage" -msgstr "" +msgstr "Stockage externe" #: templates/settings.php:11 msgid "Configuration" @@ -78,7 +79,7 @@ msgstr "Disponible" #: templates/settings.php:33 msgid "Add storage" -msgstr "" +msgstr "Ajouter un support de stockage" #: templates/settings.php:90 msgid "None set" diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po index 7b7b6fa9a66..abef94b52e3 100644 --- a/l10n/fr/files_versions.po +++ b/l10n/fr/files_versions.po @@ -4,13 +4,14 @@ # # Translators: # Romain DEP. <rom1dep@gmail.com>, 2012-2013. +# <zrk951@gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-28 00:04+0100\n" -"PO-Revision-Date: 2013-02-27 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 19:21+0000\n" +"Last-Translator: Zertrin <zrk951@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,17 +42,17 @@ msgstr "échec" msgid "File %s could not be reverted to version %s" msgstr "Le fichier %s ne peut être restauré dans sa version %s" -#: history.php:68 +#: history.php:69 msgid "No old versions available" msgstr "Aucune ancienne version n'est disponible" -#: history.php:73 +#: history.php:74 msgid "No path specified" msgstr "Aucun chemin spécifié" #: js/versions.js:6 msgid "Versions" -msgstr "" +msgstr "Versions" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po index 177014bd976..2e8c1298c1d 100644 --- a/l10n/fr/user_ldap.po +++ b/l10n/fr/user_ldap.po @@ -9,14 +9,15 @@ # Romain DEP. <rom1dep@gmail.com>, 2012-2013. # <thomash76@gmail.com>, 2013. # <windes@tructor.net>, 2012. +# <zrk951@gmail.com>, 2013. # <zrk951@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 19:21+0000\n" +"Last-Translator: Zertrin <zrk951@gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,248 +94,248 @@ msgstr "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséque msgid "Server configuration" msgstr "Configuration du serveur" -#: templates/settings.php:18 +#: templates/settings.php:31 msgid "Add Server Configuration" msgstr "Ajouter une configuration du serveur" -#: templates/settings.php:23 +#: templates/settings.php:36 msgid "Host" msgstr "Hôte" -#: templates/settings.php:25 +#: templates/settings.php:38 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://" -#: templates/settings.php:26 +#: templates/settings.php:39 msgid "Base DN" msgstr "DN Racine" -#: templates/settings.php:27 +#: templates/settings.php:40 msgid "One Base DN per line" msgstr "Un DN racine par ligne" -#: templates/settings.php:28 +#: templates/settings.php:41 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé" -#: templates/settings.php:30 +#: templates/settings.php:43 msgid "User DN" msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)" -#: templates/settings.php:32 +#: templates/settings.php:45 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "DN de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides." -#: templates/settings.php:33 +#: templates/settings.php:46 msgid "Password" msgstr "Mot de passe" -#: templates/settings.php:36 +#: templates/settings.php:49 msgid "For anonymous access, leave DN and Password empty." msgstr "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides." -#: templates/settings.php:37 +#: templates/settings.php:50 msgid "User Login Filter" msgstr "Modèle d'authentification utilisateurs" -#: templates/settings.php:40 +#: templates/settings.php:53 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion." -#: templates/settings.php:41 +#: templates/settings.php:54 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\"" -#: templates/settings.php:42 +#: templates/settings.php:55 msgid "User List Filter" msgstr "Filtre d'utilisateurs" -#: templates/settings.php:45 +#: templates/settings.php:58 msgid "Defines the filter to apply, when retrieving users." msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs." -#: templates/settings.php:46 +#: templates/settings.php:59 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "sans élément de substitution, par exemple \"objectClass=person\"." -#: templates/settings.php:47 +#: templates/settings.php:60 msgid "Group Filter" msgstr "Filtre de groupes" -#: templates/settings.php:50 +#: templates/settings.php:63 msgid "Defines the filter to apply, when retrieving groups." msgstr "Définit le filtre à appliquer lors de la récupération des groupes." -#: templates/settings.php:51 +#: templates/settings.php:64 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"." -#: templates/settings.php:55 +#: templates/settings.php:68 msgid "Connection Settings" msgstr "Paramètres de connexion" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "Configuration Active" msgstr "Configuration active" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "When unchecked, this configuration will be skipped." msgstr "Lorsque non cochée, la configuration sera ignorée." -#: templates/settings.php:58 +#: templates/settings.php:71 msgid "Port" msgstr "Port" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "Backup (Replica) Host" msgstr "Serveur de backup (réplique)" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "Fournir un serveur de backup optionnel. Il doit s'agir d'une réplique du serveur LDAP/AD principal." -#: templates/settings.php:60 +#: templates/settings.php:73 msgid "Backup (Replica) Port" msgstr "Port du serveur de backup (réplique)" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "Disable Main Server" msgstr "Désactiver le serveur principal" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "Lorsqu'activé, ownCloud ne se connectera qu'au serveur répliqué." -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Use TLS" msgstr "Utiliser TLS" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "À ne pas utiliser pour les connexions LDAPS (cela échouera)." -#: templates/settings.php:63 +#: templates/settings.php:76 msgid "Case insensitve LDAP server (Windows)" msgstr "Serveur LDAP insensible à la casse (Windows)" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Turn off SSL certificate validation." msgstr "Désactiver la validation du certificat SSL." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud." -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Not recommended, use for testing only." msgstr "Non recommandé, utilisation pour tests uniquement." -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Durée de vie du cache" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "in seconds. A change empties the cache." msgstr "en secondes. Tout changement vide le cache." -#: templates/settings.php:67 +#: templates/settings.php:80 msgid "Directory Settings" msgstr "Paramètres du répertoire" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "User Display Name Field" msgstr "Champ \"nom d'affichage\" de l'utilisateur" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud." -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "Base User Tree" msgstr "DN racine de l'arbre utilisateurs" -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "One User Base DN per line" msgstr "Un DN racine utilisateur par ligne" -#: templates/settings.php:71 +#: templates/settings.php:84 msgid "User Search Attributes" msgstr "Recherche des attributs utilisateur" -#: templates/settings.php:71 templates/settings.php:74 +#: templates/settings.php:84 templates/settings.php:87 msgid "Optional; one attribute per line" msgstr "Optionnel, un attribut par ligne" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "Group Display Name Field" msgstr "Champ \"nom d'affichage\" du groupe" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud." -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "Base Group Tree" msgstr "DN racine de l'arbre groupes" -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "One Group Base DN per line" msgstr "Un DN racine groupe par ligne" -#: templates/settings.php:74 +#: templates/settings.php:87 msgid "Group Search Attributes" msgstr "Recherche des attributs du groupe" -#: templates/settings.php:75 +#: templates/settings.php:88 msgid "Group-Member association" msgstr "Association groupe-membre" -#: templates/settings.php:77 +#: templates/settings.php:90 msgid "Special Attributes" msgstr "Attributs spéciaux" -#: templates/settings.php:79 +#: templates/settings.php:92 msgid "Quota Field" -msgstr "" +msgstr "Champ du quota" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "Quota Default" -msgstr "" +msgstr "Quota par défaut" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "in bytes" msgstr "en octets" -#: templates/settings.php:81 +#: templates/settings.php:94 msgid "Email Field" -msgstr "" +msgstr "Champ Email" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Convention de nommage du répertoire utilisateur" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "Laisser vide " -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Test Configuration" -msgstr "" +msgstr "Tester la configuration" -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Help" msgstr "Aide" diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po index 3496d44486b..0206e4346fa 100644 --- a/l10n/hu_HU/files_trashbin.po +++ b/l10n/hu_HU/files_trashbin.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Akos <nagy.akos@libreoffice.ro>, 2013. # Laszlo Tornoci <torlasz@gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-10 13:10+0000\n" +"Last-Translator: akoscomp <nagy.akos@libreoffice.ro>\n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,4 +79,4 @@ msgstr "Törlés" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" -msgstr "" +msgstr "Törölt fájlok" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index f067101a9af..a979c84ecf4 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/core.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" -"PO-Revision-Date: 2013-03-09 09:30+0000\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 21:40+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -26,26 +26,26 @@ msgstr "" #: ajax/share.php:97 #, php-format msgid "User %s shared a file with you" -msgstr "Uporanik %s je dal datoteko v souporabo z vami" +msgstr "Uporabnik %s je omogočil souporabo datoteke" #: ajax/share.php:99 #, php-format msgid "User %s shared a folder with you" -msgstr "Uporanik %s je dal mapo v souporabo z vami" +msgstr "Uporabnik %s je omogočil souporabo mape" #: ajax/share.php:101 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" -msgstr "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s" +msgstr "Uporabnik %s je omogočil souporabo datoteke \"%s\". Prejmete jo lahko preko povezave: %s" #: ajax/share.php:104 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " "here: %s" -msgstr "Uporanik %s je dal mapo \"%s\" v souporabo z vami. Prenesete je lahko tukaj: %s" +msgstr "Uporabnik %s je omogočil souporabo mape \"%s\". Prejmete jo lahko preko povezave: %s" #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25 msgid "Category type not provided." @@ -53,7 +53,7 @@ msgstr "Vrsta kategorije ni podana." #: ajax/vcategories/add.php:30 msgid "No category to add?" -msgstr "Ni kategorije za dodajanje?" +msgstr "Ali ni kategorije za dodajanje?" #: ajax/vcategories/add.php:37 #, php-format @@ -70,12 +70,12 @@ msgstr "Vrsta predmeta ni podana." #: ajax/vcategories/removeFromFavorites.php:30 #, php-format msgid "%s ID not provided." -msgstr "%s ID ni podan." +msgstr "ID %s ni podan." #: ajax/vcategories/addToFavorites.php:35 #, php-format msgid "Error adding %s to favorites." -msgstr "Napaka pri dodajanju %s med priljubljene." +msgstr "Napaka dodajanja %s med priljubljene predmete." #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136 msgid "No categories selected for deletion." @@ -84,7 +84,7 @@ msgstr "Za izbris ni izbrana nobena kategorija." #: ajax/vcategories/removeFromFavorites.php:35 #, php-format msgid "Error removing %s from favorites." -msgstr "Napaka pri odstranjevanju %s iz priljubljenih." +msgstr "Napaka odstranjevanja %s iz priljubljenih predmetov." #: js/config.php:34 msgid "Sunday" @@ -244,142 +244,142 @@ msgid "The object type is not specified." msgstr "Vrsta predmeta ni podana." #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582 -#: js/share.js:594 +#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566 +#: js/share.js:578 msgid "Error" msgstr "Napaka" #: js/oc-vcategories.js:179 msgid "The app name is not specified." -msgstr "Ime aplikacije ni podano." +msgstr "Ime programa ni podano." #: js/oc-vcategories.js:194 msgid "The required file {file} is not installed!" msgstr "Zahtevana datoteka {file} ni nameščena!" -#: js/share.js:29 js/share.js:43 js/share.js:90 +#: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" msgstr "V souporabi" -#: js/share.js:93 +#: js/share.js:90 msgid "Share" msgstr "Souporaba" -#: js/share.js:141 js/share.js:622 +#: js/share.js:125 js/share.js:606 msgid "Error while sharing" msgstr "Napaka med souporabo" -#: js/share.js:152 +#: js/share.js:136 msgid "Error while unsharing" msgstr "Napaka med odstranjevanjem souporabe" -#: js/share.js:159 +#: js/share.js:143 msgid "Error while changing permissions" msgstr "Napaka med spreminjanjem dovoljenj" -#: js/share.js:168 +#: js/share.js:152 msgid "Shared with you and the group {group} by {owner}" msgstr "V souporabi z vami in skupino {group}. Lastnik je {owner}." -#: js/share.js:170 +#: js/share.js:154 msgid "Shared with you by {owner}" msgstr "V souporabi z vami. Lastnik je {owner}." -#: js/share.js:175 +#: js/share.js:159 msgid "Share with" msgstr "Omogoči souporabo z" -#: js/share.js:180 +#: js/share.js:164 msgid "Share with link" -msgstr "Omogoči souporabo s povezavo" +msgstr "Omogoči souporabo preko povezave" -#: js/share.js:183 +#: js/share.js:167 msgid "Password protect" msgstr "Zaščiti z geslom" -#: js/share.js:185 templates/installation.php:47 templates/login.php:35 +#: js/share.js:169 templates/installation.php:47 templates/login.php:35 msgid "Password" msgstr "Geslo" -#: js/share.js:189 +#: js/share.js:173 msgid "Email link to person" -msgstr "Posreduj povezavo po e-pošti" +msgstr "Posreduj povezavo po elektronski pošti" -#: js/share.js:190 +#: js/share.js:174 msgid "Send" msgstr "Pošlji" -#: js/share.js:194 +#: js/share.js:178 msgid "Set expiration date" msgstr "Nastavi datum preteka" -#: js/share.js:195 +#: js/share.js:179 msgid "Expiration date" msgstr "Datum preteka" -#: js/share.js:227 +#: js/share.js:211 msgid "Share via email:" msgstr "Souporaba preko elektronske pošte:" -#: js/share.js:229 +#: js/share.js:213 msgid "No people found" msgstr "Ni najdenih uporabnikov" -#: js/share.js:256 +#: js/share.js:240 msgid "Resharing is not allowed" -msgstr "Ponovna souporaba ni omogočena" +msgstr "Nadaljnja souporaba ni dovoljena" -#: js/share.js:292 +#: js/share.js:276 msgid "Shared in {item} with {user}" msgstr "V souporabi v {item} z {user}" -#: js/share.js:313 +#: js/share.js:297 msgid "Unshare" msgstr "Odstrani souporabo" -#: js/share.js:325 +#: js/share.js:309 msgid "can edit" msgstr "lahko ureja" -#: js/share.js:327 +#: js/share.js:311 msgid "access control" msgstr "nadzor dostopa" -#: js/share.js:330 +#: js/share.js:314 msgid "create" msgstr "ustvari" -#: js/share.js:333 +#: js/share.js:317 msgid "update" msgstr "posodobi" -#: js/share.js:336 +#: js/share.js:320 msgid "delete" msgstr "izbriši" -#: js/share.js:339 +#: js/share.js:323 msgid "share" msgstr "določi souporabo" -#: js/share.js:373 js/share.js:569 +#: js/share.js:357 js/share.js:553 msgid "Password protected" msgstr "Zaščiteno z geslom" -#: js/share.js:582 +#: js/share.js:566 msgid "Error unsetting expiration date" msgstr "Napaka brisanja datuma preteka" -#: js/share.js:594 +#: js/share.js:578 msgid "Error setting expiration date" msgstr "Napaka med nastavljanjem datuma preteka" -#: js/share.js:609 +#: js/share.js:593 msgid "Sending ..." msgstr "Pošiljanje ..." -#: js/share.js:620 +#: js/share.js:604 msgid "Email sent" -msgstr "E-pošta je bila poslana" +msgstr "Elektronska pošta je poslana" #: js/update.js:14 msgid "" @@ -394,11 +394,11 @@ msgstr "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownClou #: lostpassword/controller.php:48 msgid "ownCloud password reset" -msgstr "Ponastavitev gesla ownCloud" +msgstr "Ponastavitev gesla za oblak ownCloud" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" -msgstr "Uporabite naslednjo povezavo za ponastavitev gesla: {link}" +msgstr "Za ponastavitev gesla uporabite povezavo: {link}" #: lostpassword/templates/lostpassword.php:3 msgid "You will receive a link to reset your password via Email." @@ -406,11 +406,11 @@ msgstr "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "E-pošta za ponastavitev je bila poslana." +msgstr "Sporočilo z navodili za ponastavitev gesla je poslana na vaš elektronski naslov." #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "Zahtevek je spodletel!" +msgstr "Zahteva je spodletela!" #: lostpassword/templates/lostpassword.php:11 templates/installation.php:41 #: templates/login.php:28 @@ -481,13 +481,13 @@ msgstr "Varnostno opozorilo" msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." -msgstr "Na voljo ni varnega generatorja naključnih števil. Prosimo, če omogočite PHP OpenSSL razširitev." +msgstr "Na voljo ni nobenega varnega ustvarjalnika naključnih števil. Omogočiti je treba razširitev PHP OpenSSL." #: templates/installation.php:26 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." -msgstr "Brez varnega generatorja naključnih števil lahko napadalec napove žetone za ponastavitev gesla, kar mu omogoča, da prevzame vaš račun." +msgstr "Brez varnega ustvarjalnika naključnih števil je mogoče napovedati žetone za ponastavitev gesla, s čimer je mogoče prevzeti nadzor nad računom." #: templates/installation.php:32 msgid "" @@ -500,7 +500,7 @@ msgid "" "For information how to properly configure your server, please see the <a " "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" " "target=\"_blank\">documentation</a>." -msgstr "Navodila, kako pravilno namestiti strežnik, so na straneh <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentacije</a>." +msgstr "Navodila, kako pravilno namestiti strežnik, so na straneh <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacije</a>." #: templates/installation.php:37 msgid "Create an <strong>admin account</strong>" @@ -564,7 +564,7 @@ msgstr "Samodejno prijavljanje je zavrnjeno!" msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "Če vašega gesla niste nedavno spremenili, je vaš račun lahko ogrožen!" +msgstr "V primeru, da gesla za dostop že nekaj časa niste spremenili, je račun lahko ogrožen!" #: templates/login.php:13 msgid "Please change your password to secure your account again." @@ -576,7 +576,7 @@ msgstr "Ali ste pozabili geslo?" #: templates/login.php:41 msgid "remember" -msgstr "Zapomni si me" +msgstr "zapomni si" #: templates/login.php:43 msgid "Log in" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index 001412ad69c..e12cdc3cf88 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" -"PO-Revision-Date: 2013-03-09 21:40+0000\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 18:00+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "Ni mogoče preimenovati datoteke" #: ajax/upload.php:19 msgid "No file was uploaded. Unknown error" -msgstr "Nobena datoteka ni naložena. Neznana napaka." +msgstr "Ni poslane nobene datoteke. Neznana napaka." #: ajax/upload.php:26 msgid "There is no error, the file uploaded with success" @@ -47,7 +47,7 @@ msgstr "Datoteka je uspešno poslana." #: ajax/upload.php:27 msgid "" "The uploaded file exceeds the upload_max_filesize directive in php.ini: " -msgstr "Naložena datoteka presega dovoljeno velikost. Le-ta je določena z vrstico upload_max_filesize v datoteki php.ini:" +msgstr "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:" #: ajax/upload.php:29 msgid "" @@ -79,7 +79,7 @@ msgstr "Na voljo ni dovolj prostora" msgid "Invalid directory." msgstr "Neveljavna mapa." -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" msgstr "Datoteke" @@ -118,7 +118,7 @@ msgstr "prekliči" #: js/filelist.js:298 msgid "replaced {new_name} with {old_name}" -msgstr "zamenjano ime {new_name} z imenom {old_name}" +msgstr "preimenovano ime {new_name} z imenom {old_name}" #: js/filelist.js:298 msgid "undo" @@ -134,7 +134,7 @@ msgstr "'.' je neveljavno ime datoteke." #: js/files.js:56 msgid "File name cannot be empty." -msgstr "Ime datoteke ne sme biti prazno." +msgstr "Ime datoteke ne sme biti prazno polje." #: js/files.js:64 msgid "" @@ -154,7 +154,7 @@ msgstr "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)" msgid "" "Your download is being prepared. This might take some time if the files are " "big." -msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen." +msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika." #: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" @@ -174,7 +174,7 @@ msgstr "Pošiljanje 1 datoteke" #: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" -msgstr "nalagam {count} datotek" +msgstr "pošiljanje {count} datotek" #: js/files.js:389 js/files.js:424 msgid "Upload cancelled." @@ -187,11 +187,11 @@ msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošilja #: js/files.js:571 msgid "URL cannot be empty." -msgstr "Naslov URL ne sme biti prazen." +msgstr "Naslov URL ne sme biti prazna vrednost." #: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" -msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud" +msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud." #: js/files.js:954 templates/index.php:68 msgid "Name" diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po index f35ef4641db..05ce9505eb2 100644 --- a/l10n/sl/files_encryption.po +++ b/l10n/sl/files_encryption.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-08 21:52+0000\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 14:30+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgstr "Navedene vrste datotek ne bodo šifrirane:" #: templates/settings.php:7 msgid "Exclude the following file types from encryption:" -msgstr "Izloči navedene vrste datotek med šifriranjem:" +msgstr "Ne šifriraj navedenih vrst datotek:" #: templates/settings.php:12 msgid "None" diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po index 1eb81c77089..d76b4df657e 100644 --- a/l10n/sl/files_external.po +++ b/l10n/sl/files_external.po @@ -4,14 +4,15 @@ # # Translators: # <>, 2012. +# Matej Urbančič <>, 2013. # Peter Peroša <peter.perosa@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-01 00:05+0100\n" -"PO-Revision-Date: 2013-02-27 23:20+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 14:31+0000\n" +"Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,24 +34,24 @@ msgstr "Odobri dostop" #: js/dropbox.js:101 msgid "Please provide a valid Dropbox app key and secret." -msgstr "Vpišite veljaven ključ programa in kodo za Dropbox" +msgstr "Vpisati je treba veljaven ključ programa in kodo za Dropbox" #: js/google.js:36 js/google.js:93 msgid "Error configuring Google Drive storage" msgstr "Napaka nastavljanja shrambe Google Drive" -#: lib/config.php:421 +#: lib/config.php:423 msgid "" "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." -msgstr "<b>Opozorilo:</b> \"smbclient\" ni nameščen. Priklapljanje CIFS/SMB pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če ga namesti." +msgstr "<b>Opozorilo:</b> paket \"smbclient\" ni nameščen. Priklapljanje pogonov CIFS/SMB ne bo mogoče." -#: lib/config.php:424 +#: lib/config.php:426 msgid "" "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " "install it." -msgstr "<b>Opozorilo:</b> FTP podpora v PHP ni omogočena ali nameščena. Priklapljanje FTP pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če jo namesti ali omogoči." +msgstr "<b>Opozorilo:</b> podpora FTP v PHP ni omogočena ali pa ni nameščena. Priklapljanje pogonov FTP zato ni mogoče." #: templates/settings.php:3 msgid "External Storage" @@ -62,7 +63,7 @@ msgstr "Ime mape" #: templates/settings.php:10 msgid "External storage" -msgstr "" +msgstr "Zunanja shramba" #: templates/settings.php:11 msgid "Configuration" @@ -78,7 +79,7 @@ msgstr "Se uporablja" #: templates/settings.php:33 msgid "Add storage" -msgstr "" +msgstr "Dodaj shrambo" #: templates/settings.php:90 msgid "None set" @@ -103,7 +104,7 @@ msgstr "Izbriši" #: templates/settings.php:129 msgid "Enable User External Storage" -msgstr "Omogoči uporabo zunanje podatkovne shrambe za uporabnike" +msgstr "Omogoči uporabniško zunanjo podatkovno shrambo" #: templates/settings.php:130 msgid "Allow users to mount their own external storage" diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po index 9d62304a4d6..2080303af5a 100644 --- a/l10n/sl/files_sharing.po +++ b/l10n/sl/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" -"PO-Revision-Date: 2013-03-09 18:42+0000\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 14:21+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po index a5026ce9b2f..5810bb0297c 100644 --- a/l10n/sl/files_versions.po +++ b/l10n/sl/files_versions.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-08 21:30+0000\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 14:30+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgstr "spodletelo" #: history.php:51 #, php-format msgid "File %s could not be reverted to version %s" -msgstr "Datoteka %s ni mogoče povrniti na različico %s." +msgstr "Datoteke %s ni mogoče povrniti na različico %s." #: history.php:69 msgid "No old versions available" diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po index 29df321b546..291699bf84d 100644 --- a/l10n/sl/lib.po +++ b/l10n/sl/lib.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-10 00:06+0100\n" -"PO-Revision-Date: 2013-03-09 07:30+0000\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 08:50+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ msgstr "Skrbništvo" #: files.php:209 msgid "ZIP download is turned off." -msgstr "Prejem datotek ZIP je onemogočen." +msgstr "Prejemanje datotek v paketu ZIP je onemogočeno." #: files.php:210 msgid "Files need to be downloaded one by one." @@ -236,7 +236,7 @@ msgstr "Pred %d meseci" #: template.php:123 msgid "last year" -msgstr "lani" +msgstr "lansko leto" #: template.php:124 msgid "years ago" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index b754bc79929..efba9dfb340 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/settings.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-10 00:06+0100\n" -"PO-Revision-Date: 2013-03-09 22:50+0000\n" +"POT-Creation-Date: 2013-03-12 00:13+0100\n" +"PO-Revision-Date: 2013-03-11 13:00+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" #: ajax/apps/ocs.php:20 msgid "Unable to load list from App Store" -msgstr "Ni mogoče naložiti seznama iz App Store" +msgstr "Ni mogoče naložiti seznama iz središča App Store" #: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17 #: ajax/togglegroups.php:20 @@ -74,7 +74,7 @@ msgstr "Neveljavna zahteva" #: ajax/togglegroups.php:12 msgid "Admins can't remove themself from the admin group" -msgstr "Skrbniki se ne morejo odstraniti iz skupine admin" +msgstr "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)" #: ajax/togglegroups.php:30 #, php-format @@ -233,7 +233,7 @@ msgid "" "remote and sending of notification emails might also not work. We suggest to" " enable internet connection for this server if you want to have all features" " of ownCloud." -msgstr "" +msgstr "Strežnik ownCloud je brez delujoče internetne povezave. To pomeni, da bodo nekatere možnosti onemogočene. Ne bo mogoče priklapljati zunanjih priklopnih točk, ne bo obvestil o posodobitvah ali namestitvah programske opreme, prav tako najverjetneje ne bo mogoče pošiljati obvestilnih sporočil preko elektronske pošte. Za uporabo vseh zmožnosti oblaka ownCloud, mora biti internetna povezava vzpostavljena in delujoča." #: templates/admin.php:92 msgid "Cron" @@ -247,13 +247,13 @@ msgstr "Izvedi eno nalogo z vsako naloženo stranjo." msgid "" "cron.php is registered at a webcron service. Call the cron.php page in the " "owncloud root once a minute over http." -msgstr "" +msgstr "Datoteka cron.php je vpisana pri storitvi webcron. Preko protokola HTTP je datoteka cron.php, ki se nahaja v korenski mapi ownCloud, klicana enkrat na minuto." #: templates/admin.php:121 msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "Uporaba sistemske storitve cron. Preko sistemskega posla cron je datoteka cron.php, ki se nahaja v mapi ownCloud, klicana enkrat na minuto." #: templates/admin.php:128 msgid "Sharing" @@ -346,7 +346,7 @@ msgstr "Več programov" #: templates/apps.php:28 msgid "Select an App" -msgstr "Izberite program" +msgstr "Izbor programa" #: templates/apps.php:34 msgid "See application page at apps.owncloud.com" @@ -403,7 +403,7 @@ msgstr "Geslo" #: templates/personal.php:38 msgid "Your password was changed" -msgstr "Vaše geslo je spremenjeno" +msgstr "Geslo je spremenjeno" #: templates/personal.php:39 msgid "Unable to change your password" @@ -463,7 +463,7 @@ msgstr "WebDAV" #: templates/personal.php:93 msgid "Use this address to connect to your ownCloud in your file manager" -msgstr "Ta naslov uporabite za povezavo z oblakom ownCloud iz vašega upravljalnika datotek." +msgstr "Ta naslov uporabite za povezavo upravljalnika datotek z oblakom ownCloud." #: templates/users.php:21 templates/users.php:77 msgid "Login Name" diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po index 033d3980891..6811f4f0265 100644 --- a/l10n/sl/user_ldap.po +++ b/l10n/sl/user_ldap.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" -"PO-Revision-Date: 2013-03-09 13:10+0000\n" +"POT-Creation-Date: 2013-03-13 00:05+0100\n" +"PO-Revision-Date: 2013-03-12 14:30+0000\n" "Last-Translator: mateju <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" @@ -26,19 +26,19 @@ msgstr "Brisanje nastavitev strežnika je spodletelo." #: ajax/testConfiguration.php:36 msgid "The configuration is valid and the connection could be established!" -msgstr "" +msgstr "Nastavitev je veljavna, zato je povezavo mogoče vzpostaviti!" #: ajax/testConfiguration.php:39 msgid "" "The configuration is valid, but the Bind failed. Please check the server " "settings and credentials." -msgstr "" +msgstr "Nastavitev je veljavna, vendar pa je vez Bind spodletela. Preveriti je treba nastavitve strežnika in ustreznost poveril." #: ajax/testConfiguration.php:43 msgid "" "The configuration is invalid. Please look in the ownCloud log for further " "details." -msgstr "" +msgstr "Nastavitev je veljavna. Več podrobnosti je zapisanih v dnevniku ownCloud." #: js/settings.js:66 msgid "Deletion failed" @@ -46,7 +46,7 @@ msgstr "Brisanje je spodletelo." #: js/settings.js:82 msgid "Take over settings from recent server configuration?" -msgstr "" +msgstr "Ali naj se prevzame nastavitve nedavne nastavitve strežnika?" #: js/settings.js:83 msgid "Keep settings?" @@ -54,15 +54,15 @@ msgstr "Ali nas se nastavitve ohranijo?" #: js/settings.js:97 msgid "Cannot add server configuration" -msgstr "" +msgstr "Ni mogoče dodati nastavitev strežnika" #: js/settings.js:121 msgid "Connection test succeeded" -msgstr "" +msgstr "Preizkus povezave je uspešno končan." #: js/settings.js:126 msgid "Connection test failed" -msgstr "" +msgstr "Preizkus povezave je spodletel." #: js/settings.js:136 msgid "Do you really want to delete the current Server Configuration?" @@ -87,7 +87,7 @@ msgstr "<b>Opozorilo:</b> modul PHP LDAP mora biti nameščen, sicer vmesnik ne #: templates/settings.php:15 msgid "Server configuration" -msgstr "" +msgstr "Nastavitev strežnika" #: templates/settings.php:31 msgid "Add Server Configuration" @@ -108,7 +108,7 @@ msgstr "Osnovni DN" #: templates/settings.php:40 msgid "One Base DN per line" -msgstr "" +msgstr "En osnovni DN na vrstico" #: templates/settings.php:41 msgid "You can specify Base DN for users and groups in the Advanced tab" @@ -179,11 +179,11 @@ msgstr "Nastavitve povezave" #: templates/settings.php:70 msgid "Configuration Active" -msgstr "" +msgstr "Dejavna nastavitev" #: templates/settings.php:70 msgid "When unchecked, this configuration will be skipped." -msgstr "" +msgstr "Neizbrana možnost preskoči nastavitev." #: templates/settings.php:71 msgid "Port" @@ -191,17 +191,17 @@ msgstr "Vrata" #: templates/settings.php:72 msgid "Backup (Replica) Host" -msgstr "" +msgstr "Varnostna kopija (replika) podatkov gostitelja" #: templates/settings.php:72 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." -msgstr "" +msgstr "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD." #: templates/settings.php:73 msgid "Backup (Replica) Port" -msgstr "" +msgstr "Varnostna kopija (replika) podatka vrat" #: templates/settings.php:74 msgid "Disable Main Server" @@ -209,7 +209,7 @@ msgstr "Onemogoči glavni strežnik" #: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." -msgstr "" +msgstr "Ob priklopu bo strežnik ownCloud povezan le s kopijo (repliko) strežnika." #: templates/settings.php:75 msgid "Use TLS" @@ -217,7 +217,7 @@ msgstr "Uporabi TLS" #: templates/settings.php:75 msgid "Do not use it additionally for LDAPS connections, it will fail." -msgstr "" +msgstr "Strežnika ni priporočljivo uporabljati za povezave LDAPS. Povezava bo spodletela." #: templates/settings.php:76 msgid "Case insensitve LDAP server (Windows)" @@ -239,7 +239,7 @@ msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanj #: templates/settings.php:78 msgid "Cache Time-To-Live" -msgstr "" +msgstr "Predpomni podatke TTL" #: templates/settings.php:78 msgid "in seconds. A change empties the cache." @@ -267,11 +267,11 @@ msgstr "Eno osnovno uporabniško ime DN na vrstico" #: templates/settings.php:84 msgid "User Search Attributes" -msgstr "" +msgstr "Uporabi atribute iskanja" #: templates/settings.php:84 templates/settings.php:87 msgid "Optional; one attribute per line" -msgstr "" +msgstr "Izbirno; en atribut na vrstico" #: templates/settings.php:85 msgid "Group Display Name Field" @@ -319,7 +319,7 @@ msgstr "Polje elektronske pošte" #: templates/settings.php:95 msgid "User Home Folder Naming Rule" -msgstr "" +msgstr "Pravila poimenovanja uporabniške osebne mape" #: templates/settings.php:95 msgid "" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index feab728aed8..71347fa976b 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -238,8 +238,8 @@ msgid "The object type is not specified." msgstr "" #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582 -#: js/share.js:594 +#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566 +#: js/share.js:578 msgid "Error" msgstr "" @@ -251,127 +251,127 @@ msgstr "" msgid "The required file {file} is not installed!" msgstr "" -#: js/share.js:29 js/share.js:43 js/share.js:90 +#: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" msgstr "" -#: js/share.js:93 +#: js/share.js:90 msgid "Share" msgstr "" -#: js/share.js:141 js/share.js:622 +#: js/share.js:125 js/share.js:606 msgid "Error while sharing" msgstr "" -#: js/share.js:152 +#: js/share.js:136 msgid "Error while unsharing" msgstr "" -#: js/share.js:159 +#: js/share.js:143 msgid "Error while changing permissions" msgstr "" -#: js/share.js:168 +#: js/share.js:152 msgid "Shared with you and the group {group} by {owner}" msgstr "" -#: js/share.js:170 +#: js/share.js:154 msgid "Shared with you by {owner}" msgstr "" -#: js/share.js:175 +#: js/share.js:159 msgid "Share with" msgstr "" -#: js/share.js:180 +#: js/share.js:164 msgid "Share with link" msgstr "" -#: js/share.js:183 +#: js/share.js:167 msgid "Password protect" msgstr "" -#: js/share.js:185 templates/installation.php:47 templates/login.php:35 +#: js/share.js:169 templates/installation.php:47 templates/login.php:35 msgid "Password" msgstr "" -#: js/share.js:189 +#: js/share.js:173 msgid "Email link to person" msgstr "" -#: js/share.js:190 +#: js/share.js:174 msgid "Send" msgstr "" -#: js/share.js:194 +#: js/share.js:178 msgid "Set expiration date" msgstr "" -#: js/share.js:195 +#: js/share.js:179 msgid "Expiration date" msgstr "" -#: js/share.js:227 +#: js/share.js:211 msgid "Share via email:" msgstr "" -#: js/share.js:229 +#: js/share.js:213 msgid "No people found" msgstr "" -#: js/share.js:256 +#: js/share.js:240 msgid "Resharing is not allowed" msgstr "" -#: js/share.js:292 +#: js/share.js:276 msgid "Shared in {item} with {user}" msgstr "" -#: js/share.js:313 +#: js/share.js:297 msgid "Unshare" msgstr "" -#: js/share.js:325 +#: js/share.js:309 msgid "can edit" msgstr "" -#: js/share.js:327 +#: js/share.js:311 msgid "access control" msgstr "" -#: js/share.js:330 +#: js/share.js:314 msgid "create" msgstr "" -#: js/share.js:333 +#: js/share.js:317 msgid "update" msgstr "" -#: js/share.js:336 +#: js/share.js:320 msgid "delete" msgstr "" -#: js/share.js:339 +#: js/share.js:323 msgid "share" msgstr "" -#: js/share.js:373 js/share.js:569 +#: js/share.js:357 js/share.js:553 msgid "Password protected" msgstr "" -#: js/share.js:582 +#: js/share.js:566 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:594 +#: js/share.js:578 msgid "Error setting expiration date" msgstr "" -#: js/share.js:609 +#: js/share.js:593 msgid "Sending ..." msgstr "" -#: js/share.js:620 +#: js/share.js:604 msgid "Email sent" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index caa14bb36cd..11068c6144f 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -74,7 +74,7 @@ msgstr "" msgid "Invalid directory." msgstr "" -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 9474683d87f..d09ca11ec25 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 46611588b06..69603f84d7d 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -37,13 +37,13 @@ msgstr "" msgid "Error configuring Google Drive storage" msgstr "" -#: lib/config.php:421 +#: lib/config.php:423 msgid "" "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:424 +#: lib/config.php:426 msgid "" "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting " "of FTP shares is not possible. Please ask your system administrator to " diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index f13a7902624..0d442a8a416 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index 894026db9a7..eb9fdf84596 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 700851f2ac4..3084b6ee6fd 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index fc63c0fa4de..99241a5c250 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:06+0100\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index bd0d0eef804..59a76e07b18 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:06+0100\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 2c349216ff2..ea58fc87f7f 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index 3ba0952c2d4..c3ade802cc1 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 5.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2013-03-10 00:05+0100\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/tr/files.po b/l10n/tr/files.po index e64be58b17a..fdab97fa16c 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -14,15 +14,15 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 09:20+0000\n" +"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: tr\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ajax/move.php:17 #, php-format @@ -81,7 +81,7 @@ msgstr "Yeterli disk alanı yok" msgid "Invalid directory." msgstr "Geçersiz dizin." -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" msgstr "Dosyalar" @@ -97,8 +97,8 @@ msgstr "Sil" msgid "Rename" msgstr "İsim değiştir." -#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 -#: js/files.js:439 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409 +#: js/files.js:440 msgid "Pending" msgstr "Bekliyor" @@ -152,74 +152,74 @@ msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkron msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)" -#: js/files.js:225 +#: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir." -#: js/files.js:262 +#: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi" -#: js/files.js:262 +#: js/files.js:263 msgid "Upload Error" msgstr "Yükleme hatası" -#: js/files.js:273 +#: js/files.js:274 msgid "Close" msgstr "Kapat" -#: js/files.js:312 +#: js/files.js:313 msgid "1 file uploading" msgstr "1 dosya yüklendi" -#: js/files.js:315 js/files.js:370 js/files.js:385 +#: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" msgstr "{count} dosya yükleniyor" -#: js/files.js:388 js/files.js:423 +#: js/files.js:389 js/files.js:424 msgid "Upload cancelled." msgstr "Yükleme iptal edildi." -#: js/files.js:497 +#: js/files.js:498 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur." -#: js/files.js:570 +#: js/files.js:571 msgid "URL cannot be empty." msgstr "URL boş olamaz." -#: js/files.js:575 +#: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir." -#: js/files.js:953 templates/index.php:68 +#: js/files.js:954 templates/index.php:68 msgid "Name" msgstr "Ad" -#: js/files.js:954 templates/index.php:79 +#: js/files.js:955 templates/index.php:79 msgid "Size" msgstr "Boyut" -#: js/files.js:955 templates/index.php:81 +#: js/files.js:956 templates/index.php:81 msgid "Modified" msgstr "Değiştirilme" -#: js/files.js:974 +#: js/files.js:975 msgid "1 folder" msgstr "1 dizin" -#: js/files.js:976 +#: js/files.js:977 msgid "{count} folders" msgstr "{count} dizin" -#: js/files.js:984 +#: js/files.js:985 msgid "1 file" msgstr "1 dosya" -#: js/files.js:986 +#: js/files.js:987 msgid "{count} files" msgstr "{count} dosya" @@ -285,7 +285,7 @@ msgstr "Yüklemeyi iptal et" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "Buraya erişim hakkınız yok." #: templates/index.php:60 msgid "Nothing in here. Upload something!" diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po index d11aba5798c..553525407bc 100644 --- a/l10n/tr/lib.po +++ b/l10n/tr/lib.po @@ -9,15 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 09:41+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: tr\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: app.php:349 msgid "Help" @@ -43,19 +43,19 @@ msgstr "Uygulamalar" msgid "Admin" msgstr "Yönetici" -#: files.php:202 +#: files.php:209 msgid "ZIP download is turned off." msgstr "ZIP indirmeleri kapatılmıştır." -#: files.php:203 +#: files.php:210 msgid "Files need to be downloaded one by one." msgstr "Dosyaların birer birer indirilmesi gerekmektedir." -#: files.php:204 files.php:231 +#: files.php:211 files.php:244 msgid "Back to Files" msgstr "Dosyalara dön" -#: files.php:228 +#: files.php:241 msgid "Selected files too large to generate zip file." msgstr "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür." @@ -182,7 +182,7 @@ msgstr "" msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor." #: setup.php:850 #, php-format diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po index 43a285d6b95..9beab0beacf 100644 --- a/l10n/tr/settings.po +++ b/l10n/tr/settings.po @@ -6,21 +6,22 @@ # Aranel Surion <aranel@aranelsurion.org>, 2011-2013. # Emre <emresaracoglu@live.com>, 2012. # <info@beyboo.de>, 2012. +# ismail yenigul <ismail.yenigul@surgate.com>, 2013. # Necdet Yücel <necdetyucel@gmail.com>, 2012. # Tolga Gezginiş <tgezginis@gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 09:41+0000\n" +"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: tr\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ajax/apps/ocs.php:20 msgid "Unable to load list from App Store" @@ -191,7 +192,7 @@ msgstr "Kurulum Uyarısı" msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor." #: templates/admin.php:33 #, php-format @@ -210,7 +211,7 @@ msgstr "" #: templates/admin.php:58 msgid "Locale not working" -msgstr "" +msgstr "Locale çalışmıyor." #: templates/admin.php:63 #, php-format @@ -222,7 +223,7 @@ msgstr "" #: templates/admin.php:75 msgid "Internet connection not working" -msgstr "" +msgstr "İnternet bağlantısı çalışmıyor" #: templates/admin.php:78 msgid "" @@ -236,7 +237,7 @@ msgstr "" #: templates/admin.php:92 msgid "Cron" -msgstr "" +msgstr "Cron" #: templates/admin.php:101 msgid "Execute one task with each page loaded" @@ -256,23 +257,23 @@ msgstr "" #: templates/admin.php:128 msgid "Sharing" -msgstr "" +msgstr "Paylaşım" #: templates/admin.php:134 msgid "Enable Share API" -msgstr "" +msgstr "Paylaşım API'sini etkinleştir." #: templates/admin.php:135 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "Uygulamaların paylaşım API'sini kullanmasına izin ver" #: templates/admin.php:142 msgid "Allow links" -msgstr "" +msgstr "Bağlantıları izin ver." #: templates/admin.php:143 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "Kullanıcıların nesneleri paylaşımı için herkese açık bağlantılara izin ver" #: templates/admin.php:150 msgid "Allow resharing" @@ -296,7 +297,7 @@ msgstr "Güvenlik" #: templates/admin.php:181 msgid "Enforce HTTPS" -msgstr "" +msgstr "HTTPS bağlantısına zorla" #: templates/admin.php:182 msgid "" @@ -315,7 +316,7 @@ msgstr "Kayıtlar" #: templates/admin.php:196 msgid "Log level" -msgstr "" +msgstr "Günlük seviyesi" #: templates/admin.php:223 msgid "More" @@ -386,7 +387,7 @@ msgstr "Ticari Destek" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>" -msgstr "" +msgstr "Kullandığınız:<strong>%s</strong> seçilebilecekler: <strong>%s</strong>" #: templates/personal.php:15 msgid "Get the apps to sync your files" diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po index b1f593bcc25..5ad45ec6931 100644 --- a/l10n/zh_CN/core.po +++ b/l10n/zh_CN/core.po @@ -8,14 +8,15 @@ # Phoenix Nemo <>, 2012. # <rainofchaos@gmail.com>, 2013. # <suiy02@gmail.com>, 2012. +# <wengxt@gmail.com>, 2013. # <wengxt@gmail.com>, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-22 00:06+0100\n" -"PO-Revision-Date: 2013-02-20 23:20+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 18:12+0000\n" +"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,24 +24,24 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/share.php:85 +#: ajax/share.php:97 #, php-format msgid "User %s shared a file with you" msgstr "用户 %s 与您共享了一个文件" -#: ajax/share.php:87 +#: ajax/share.php:99 #, php-format msgid "User %s shared a folder with you" msgstr "用户 %s 与您共享了一个文件夹" -#: ajax/share.php:89 +#: ajax/share.php:101 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" msgstr "用户 %s 与您共享了文件\"%s\"。文件下载地址：%s" -#: ajax/share.php:91 +#: ajax/share.php:104 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " @@ -58,7 +59,7 @@ msgstr "没有可添加分类？" #: ajax/vcategories/add.php:37 #, php-format msgid "This category already exists: %s" -msgstr "" +msgstr "此分类已存在：%s" #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27 #: ajax/vcategories/favorites.php:24 @@ -86,79 +87,79 @@ msgstr "没有选择要删除的类别" msgid "Error removing %s from favorites." msgstr "从收藏夹中移除%s时出错。" -#: js/config.php:32 +#: js/config.php:34 msgid "Sunday" msgstr "星期日" -#: js/config.php:32 +#: js/config.php:35 msgid "Monday" msgstr "星期一" -#: js/config.php:32 +#: js/config.php:36 msgid "Tuesday" msgstr "星期二" -#: js/config.php:32 +#: js/config.php:37 msgid "Wednesday" msgstr "星期三" -#: js/config.php:32 +#: js/config.php:38 msgid "Thursday" msgstr "星期四" -#: js/config.php:32 +#: js/config.php:39 msgid "Friday" msgstr "星期五" -#: js/config.php:32 +#: js/config.php:40 msgid "Saturday" msgstr "星期六" -#: js/config.php:33 +#: js/config.php:45 msgid "January" msgstr "一月" -#: js/config.php:33 +#: js/config.php:46 msgid "February" msgstr "二月" -#: js/config.php:33 +#: js/config.php:47 msgid "March" msgstr "三月" -#: js/config.php:33 +#: js/config.php:48 msgid "April" msgstr "四月" -#: js/config.php:33 +#: js/config.php:49 msgid "May" msgstr "五月" -#: js/config.php:33 +#: js/config.php:50 msgid "June" msgstr "六月" -#: js/config.php:33 +#: js/config.php:51 msgid "July" msgstr "七月" -#: js/config.php:33 +#: js/config.php:52 msgid "August" msgstr "八月" -#: js/config.php:33 +#: js/config.php:53 msgid "September" msgstr "九月" -#: js/config.php:33 +#: js/config.php:54 msgid "October" msgstr "十月" -#: js/config.php:33 +#: js/config.php:55 msgid "November" msgstr "十一月" -#: js/config.php:33 +#: js/config.php:56 msgid "December" msgstr "十二月" @@ -166,55 +167,55 @@ msgstr "十二月" msgid "Settings" msgstr "设置" -#: js/js.js:767 +#: js/js.js:777 msgid "seconds ago" msgstr "秒前" -#: js/js.js:768 +#: js/js.js:778 msgid "1 minute ago" msgstr "一分钟前" -#: js/js.js:769 +#: js/js.js:779 msgid "{minutes} minutes ago" msgstr "{minutes} 分钟前" -#: js/js.js:770 +#: js/js.js:780 msgid "1 hour ago" msgstr "1小时前" -#: js/js.js:771 +#: js/js.js:781 msgid "{hours} hours ago" msgstr "{hours} 小时前" -#: js/js.js:772 +#: js/js.js:782 msgid "today" msgstr "今天" -#: js/js.js:773 +#: js/js.js:783 msgid "yesterday" msgstr "昨天" -#: js/js.js:774 +#: js/js.js:784 msgid "{days} days ago" msgstr "{days} 天前" -#: js/js.js:775 +#: js/js.js:785 msgid "last month" msgstr "上月" -#: js/js.js:776 +#: js/js.js:786 msgid "{months} months ago" msgstr "{months} 月前" -#: js/js.js:777 +#: js/js.js:787 msgid "months ago" msgstr "月前" -#: js/js.js:778 +#: js/js.js:788 msgid "last year" msgstr "去年" -#: js/js.js:779 +#: js/js.js:789 msgid "years ago" msgstr "年前" @@ -244,8 +245,8 @@ msgid "The object type is not specified." msgstr "未指定对象类型。" #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582 -#: js/share.js:594 +#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566 +#: js/share.js:578 msgid "Error" msgstr "错误" @@ -257,127 +258,127 @@ msgstr "未指定App名称。" msgid "The required file {file} is not installed!" msgstr "所需文件{file}未安装！" -#: js/share.js:29 js/share.js:43 js/share.js:90 +#: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" msgstr "已共享" -#: js/share.js:93 +#: js/share.js:90 msgid "Share" msgstr "共享" -#: js/share.js:141 js/share.js:622 +#: js/share.js:125 js/share.js:606 msgid "Error while sharing" msgstr "共享时出错" -#: js/share.js:152 +#: js/share.js:136 msgid "Error while unsharing" msgstr "取消共享时出错" -#: js/share.js:159 +#: js/share.js:143 msgid "Error while changing permissions" msgstr "修改权限时出错" -#: js/share.js:168 +#: js/share.js:152 msgid "Shared with you and the group {group} by {owner}" msgstr "{owner}共享给您及{group}组" -#: js/share.js:170 +#: js/share.js:154 msgid "Shared with you by {owner}" msgstr " {owner}与您共享" -#: js/share.js:175 +#: js/share.js:159 msgid "Share with" msgstr "共享" -#: js/share.js:180 +#: js/share.js:164 msgid "Share with link" msgstr "共享链接" -#: js/share.js:183 +#: js/share.js:167 msgid "Password protect" msgstr "密码保护" -#: js/share.js:185 templates/installation.php:44 templates/login.php:35 +#: js/share.js:169 templates/installation.php:47 templates/login.php:35 msgid "Password" msgstr "密码" -#: js/share.js:189 +#: js/share.js:173 msgid "Email link to person" msgstr "发送链接到个人" -#: js/share.js:190 +#: js/share.js:174 msgid "Send" msgstr "发送" -#: js/share.js:194 +#: js/share.js:178 msgid "Set expiration date" msgstr "设置过期日期" -#: js/share.js:195 +#: js/share.js:179 msgid "Expiration date" msgstr "过期日期" -#: js/share.js:227 +#: js/share.js:211 msgid "Share via email:" msgstr "通过Email共享" -#: js/share.js:229 +#: js/share.js:213 msgid "No people found" msgstr "未找到此人" -#: js/share.js:256 +#: js/share.js:240 msgid "Resharing is not allowed" msgstr "不允许二次共享" -#: js/share.js:292 +#: js/share.js:276 msgid "Shared in {item} with {user}" msgstr "在{item} 与 {user}共享。" -#: js/share.js:313 +#: js/share.js:297 msgid "Unshare" msgstr "取消共享" -#: js/share.js:325 +#: js/share.js:309 msgid "can edit" msgstr "可以修改" -#: js/share.js:327 +#: js/share.js:311 msgid "access control" msgstr "访问控制" -#: js/share.js:330 +#: js/share.js:314 msgid "create" msgstr "创建" -#: js/share.js:333 +#: js/share.js:317 msgid "update" msgstr "更新" -#: js/share.js:336 +#: js/share.js:320 msgid "delete" msgstr "删除" -#: js/share.js:339 +#: js/share.js:323 msgid "share" msgstr "共享" -#: js/share.js:373 js/share.js:569 +#: js/share.js:357 js/share.js:553 msgid "Password protected" msgstr "密码已受保护" -#: js/share.js:582 +#: js/share.js:566 msgid "Error unsetting expiration date" msgstr "取消设置过期日期时出错" -#: js/share.js:594 +#: js/share.js:578 msgid "Error setting expiration date" msgstr "设置过期日期时出错" -#: js/share.js:609 +#: js/share.js:593 msgid "Sending ..." msgstr "正在发送..." -#: js/share.js:620 +#: js/share.js:604 msgid "Email sent" msgstr "邮件已发送" @@ -386,11 +387,11 @@ msgid "" "The update was unsuccessful. Please report this issue to the <a " "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud " "community</a>." -msgstr "" +msgstr "更新不成功。请汇报将此问题汇报给 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。" #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "更新成功。正在重定向至 ownCloud。" #: lostpassword/controller.php:48 msgid "ownCloud password reset" @@ -412,7 +413,7 @@ msgstr "重置邮件已发送。" msgid "Request failed!" msgstr "请求失败！" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41 #: templates/login.php:28 msgid "Username" msgstr "用户名" @@ -473,85 +474,86 @@ msgstr "编辑分类" msgid "Add" msgstr "添加" -#: templates/installation.php:23 templates/installation.php:30 +#: templates/installation.php:24 templates/installation.php:31 msgid "Security Warning" msgstr "安全警告" -#: templates/installation.php:24 +#: templates/installation.php:25 msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." msgstr "随机数生成器无效，请启用PHP的OpenSSL扩展" -#: templates/installation.php:25 +#: templates/installation.php:26 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." msgstr "没有安全随机码生成器，攻击者可能会猜测密码重置信息从而窃取您的账户" -#: templates/installation.php:31 +#: templates/installation.php:32 msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." -msgstr "" +msgstr "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。" -#: templates/installation.php:32 +#: templates/installation.php:33 msgid "" "For information how to properly configure your server, please see the <a " "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" " "target=\"_blank\">documentation</a>." -msgstr "" +msgstr "关于如何配置服务器，请参见 <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">此文档</a>。" -#: templates/installation.php:36 +#: templates/installation.php:37 msgid "Create an <strong>admin account</strong>" msgstr "创建<strong>管理员账号</strong>" -#: templates/installation.php:52 +#: templates/installation.php:55 msgid "Advanced" msgstr "高级" -#: templates/installation.php:54 +#: templates/installation.php:57 msgid "Data folder" msgstr "数据目录" -#: templates/installation.php:61 +#: templates/installation.php:66 msgid "Configure the database" msgstr "配置数据库" -#: templates/installation.php:66 templates/installation.php:77 -#: templates/installation.php:87 templates/installation.php:97 +#: templates/installation.php:71 templates/installation.php:83 +#: templates/installation.php:94 templates/installation.php:105 +#: templates/installation.php:117 msgid "will be used" msgstr "将被使用" -#: templates/installation.php:109 +#: templates/installation.php:129 msgid "Database user" msgstr "数据库用户" -#: templates/installation.php:113 +#: templates/installation.php:134 msgid "Database password" msgstr "数据库密码" -#: templates/installation.php:117 +#: templates/installation.php:139 msgid "Database name" msgstr "数据库名" -#: templates/installation.php:125 +#: templates/installation.php:149 msgid "Database tablespace" msgstr "数据库表空间" -#: templates/installation.php:131 +#: templates/installation.php:156 msgid "Database host" msgstr "数据库主机" -#: templates/installation.php:136 +#: templates/installation.php:162 msgid "Finish setup" msgstr "安装完成" -#: templates/layout.guest.php:33 +#: templates/layout.guest.php:40 msgid "web services under your control" msgstr "由您掌控的网络服务" -#: templates/layout.user.php:48 +#: templates/layout.user.php:58 msgid "Log out" msgstr "注销" @@ -583,7 +585,7 @@ msgstr "登录" #: templates/login.php:49 msgid "Alternative Logins" -msgstr "" +msgstr "其他登录方式" #: templates/part.pagenavi.php:3 msgid "prev" diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po index c62eacf1cb1..1ff4b293e7a 100644 --- a/l10n/zh_CN/files.po +++ b/l10n/zh_CN/files.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 03:20+0000\n" +"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,19 +75,19 @@ msgstr "写入磁盘失败" #: ajax/upload.php:51 msgid "Not enough storage available" -msgstr "" +msgstr "没有足够的存储空间" #: ajax/upload.php:82 msgid "Invalid directory." msgstr "无效文件夹。" -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" msgstr "文件" #: js/fileactions.js:125 msgid "Delete permanently" -msgstr "" +msgstr "永久删除" #: js/fileactions.js:127 templates/index.php:92 templates/index.php:93 msgid "Delete" @@ -97,8 +97,8 @@ msgstr "删除" msgid "Rename" msgstr "重命名" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 -#: js/files.js:439 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409 +#: js/files.js:440 msgid "Pending" msgstr "操作等待中" @@ -128,7 +128,7 @@ msgstr "撤销" #: js/filelist.js:323 msgid "perform delete operation" -msgstr "" +msgstr "进行删除操作" #: js/files.js:52 msgid "'.' is an invalid file name." @@ -146,80 +146,80 @@ msgstr "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被 #: js/files.js:78 msgid "Your storage is full, files can not be updated or synced anymore!" -msgstr "" +msgstr "您的存储空间已满，文件将无法更新或同步！" #: js/files.js:82 msgid "Your storage is almost full ({usedSpacePercent}%)" -msgstr "" +msgstr "您的存储空间即将用完 ({usedSpacePercent}%)" -#: js/files.js:225 +#: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "下载正在准备中。如果文件较大可能会花费一些时间。" -#: js/files.js:262 +#: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "无法上传文件，因为它是一个目录或者大小为 0 字节" -#: js/files.js:262 +#: js/files.js:263 msgid "Upload Error" msgstr "上传错误" -#: js/files.js:273 +#: js/files.js:274 msgid "Close" msgstr "关闭" -#: js/files.js:312 +#: js/files.js:313 msgid "1 file uploading" msgstr "1个文件上传中" -#: js/files.js:315 js/files.js:370 js/files.js:385 +#: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" msgstr "{count} 个文件上传中" -#: js/files.js:388 js/files.js:423 +#: js/files.js:389 js/files.js:424 msgid "Upload cancelled." msgstr "上传已取消" -#: js/files.js:497 +#: js/files.js:498 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。" -#: js/files.js:570 +#: js/files.js:571 msgid "URL cannot be empty." msgstr "URL不能为空" -#: js/files.js:575 +#: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。" -#: js/files.js:953 templates/index.php:68 +#: js/files.js:954 templates/index.php:68 msgid "Name" msgstr "名称" -#: js/files.js:954 templates/index.php:79 +#: js/files.js:955 templates/index.php:79 msgid "Size" msgstr "大小" -#: js/files.js:955 templates/index.php:81 +#: js/files.js:956 templates/index.php:81 msgid "Modified" msgstr "修改日期" -#: js/files.js:974 +#: js/files.js:975 msgid "1 folder" msgstr "1个文件夹" -#: js/files.js:976 +#: js/files.js:977 msgid "{count} folders" msgstr "{count} 个文件夹" -#: js/files.js:984 +#: js/files.js:985 msgid "1 file" msgstr "1 个文件" -#: js/files.js:986 +#: js/files.js:987 msgid "{count} files" msgstr "{count} 个文件" @@ -277,7 +277,7 @@ msgstr "来自链接" #: templates/index.php:40 msgid "Deleted files" -msgstr "" +msgstr "删除文件" #: templates/index.php:46 msgid "Cancel upload" @@ -285,7 +285,7 @@ msgstr "取消上传" #: templates/index.php:53 msgid "You don’t have write permissions here." -msgstr "" +msgstr "您没有写权限" #: templates/index.php:60 msgid "Nothing in here. Upload something!" @@ -319,4 +319,4 @@ msgstr "当前扫描" #: templates/upgrade.php:2 msgid "Upgrading filesystem cache..." -msgstr "" +msgstr "正在更新文件系统缓存..." diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po index b9d48e1dcec..1807d6a5f39 100644 --- a/l10n/zh_CN/files_encryption.po +++ b/l10n/zh_CN/files_encryption.po @@ -4,13 +4,14 @@ # # Translators: # <appweb.cn@gmail.com>, 2012. +# CyberCowBoy <ccb3275@gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-10 00:08+0100\n" -"PO-Revision-Date: 2013-02-09 23:09+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 08:40+0000\n" +"Last-Translator: ccb <ccb3275@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,16 +25,16 @@ msgstr "加密" #: templates/settings-personal.php:7 msgid "File encryption is enabled." -msgstr "" +msgstr "文件加密已启用." #: templates/settings-personal.php:11 msgid "The following file types will not be encrypted:" -msgstr "" +msgstr "如下的文件类型将不会被加密:" #: templates/settings.php:7 msgid "Exclude the following file types from encryption:" -msgstr "" +msgstr "从加密中排除如下的文件类型:" #: templates/settings.php:12 msgid "None" -msgstr "None" +msgstr "无" diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po index b711f925b48..0b6373114e7 100644 --- a/l10n/zh_CN/files_trashbin.po +++ b/l10n/zh_CN/files_trashbin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# CyberCowBoy <ccb3275@gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-09 00:05+0100\n" -"PO-Revision-Date: 2013-03-07 23:40+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 08:50+0000\n" +"Last-Translator: ccb <ccb3275@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,24 +21,24 @@ msgstr "" #: ajax/delete.php:40 #, php-format msgid "Couldn't delete %s permanently" -msgstr "" +msgstr "无法彻底删除文件%s" #: ajax/undelete.php:41 #, php-format msgid "Couldn't restore %s" -msgstr "" +msgstr "无法恢复%s" #: js/trash.js:7 js/trash.js:96 msgid "perform restore operation" -msgstr "" +msgstr "执行恢复操作" #: js/trash.js:34 msgid "delete file permanently" -msgstr "" +msgstr "彻底删除文件" #: js/trash.js:121 msgid "Delete permanently" -msgstr "" +msgstr "永久删除" #: js/trash.js:174 templates/index.php:17 msgid "Name" @@ -45,7 +46,7 @@ msgstr "名称" #: js/trash.js:175 templates/index.php:27 msgid "Deleted" -msgstr "" +msgstr "已删除" #: js/trash.js:184 msgid "1 folder" @@ -65,11 +66,11 @@ msgstr "{count} 个文件" #: templates/index.php:9 msgid "Nothing in here. Your trash bin is empty!" -msgstr "" +msgstr "这里没有东西. 你的回收站是空的!" #: templates/index.php:20 templates/index.php:22 msgid "Restore" -msgstr "" +msgstr "恢复" #: templates/index.php:30 templates/index.php:31 msgid "Delete" diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po index 55b00867f9f..cc78ca65bf9 100644 --- a/l10n/zh_CN/lib.po +++ b/l10n/zh_CN/lib.po @@ -4,14 +4,15 @@ # # Translators: # <appweb.cn@gmail.com>, 2012. +# marguerite su <i@marguerite.su>, 2013. # <rainofchaos@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 18:12+0000\n" +"Last-Translator: marguerite su <i@marguerite.su>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,33 +44,33 @@ msgstr "应用" msgid "Admin" msgstr "管理" -#: files.php:202 +#: files.php:209 msgid "ZIP download is turned off." msgstr "ZIP 下载已经关闭" -#: files.php:203 +#: files.php:210 msgid "Files need to be downloaded one by one." msgstr "需要逐一下载文件" -#: files.php:204 files.php:231 +#: files.php:211 files.php:244 msgid "Back to Files" msgstr "回到文件" -#: files.php:228 +#: files.php:241 msgid "Selected files too large to generate zip file." msgstr "选择的文件太大，无法生成 zip 文件。" #: helper.php:228 msgid "couldn't be determined" -msgstr "" +msgstr "无法确定" #: json.php:28 msgid "Application is not enabled" -msgstr "不需要程序" +msgstr "应用程序未启用" #: json.php:39 json.php:62 json.php:73 msgid "Authentication error" -msgstr "认证错误" +msgstr "认证出错" #: json.php:51 msgid "Token expired. Please reload page." @@ -85,55 +86,55 @@ msgstr "文本" #: search/provider/file.php:29 msgid "Images" -msgstr "图像" +msgstr "图片" #: setup.php:34 msgid "Set an admin username." -msgstr "" +msgstr "请设置一个管理员用户名。" #: setup.php:37 msgid "Set an admin password." -msgstr "" +msgstr "请设置一个管理员密码。" #: setup.php:40 msgid "Specify a data folder." -msgstr "" +msgstr "请指定一个数据目录。" #: setup.php:55 #, php-format msgid "%s enter the database username." -msgstr "" +msgstr "%s 输入数据库用户名。" #: setup.php:58 #, php-format msgid "%s enter the database name." -msgstr "" +msgstr "%s 输入数据库名称。" #: setup.php:61 #, php-format msgid "%s you may not use dots in the database name" -msgstr "" +msgstr "%s 您不能在数据库名称中使用英文句号。" #: setup.php:64 #, php-format msgid "%s set the database host." -msgstr "" +msgstr "%s 设置数据库所在主机。" #: setup.php:128 setup.php:320 setup.php:365 msgid "PostgreSQL username and/or password not valid" -msgstr "" +msgstr "PostgreSQL 数据库用户名和/或密码无效" #: setup.php:129 setup.php:152 setup.php:229 msgid "You need to enter either an existing account or the administrator." -msgstr "" +msgstr "你需要输入一个数据库中已有的账户或管理员账户。" #: setup.php:151 setup.php:453 setup.php:520 msgid "Oracle username and/or password not valid" -msgstr "" +msgstr "Oracle 数据库用户名和/或密码无效" #: setup.php:228 msgid "MySQL username and/or password not valid" -msgstr "" +msgstr "MySQL 数据库用户名和/或密码无效" #: setup.php:282 setup.php:386 setup.php:395 setup.php:413 setup.php:423 #: setup.php:432 setup.php:461 setup.php:527 setup.php:553 setup.php:560 @@ -141,53 +142,53 @@ msgstr "" #: setup.php:610 #, php-format msgid "DB Error: \"%s\"" -msgstr "" +msgstr "数据库错误：\"%s\"" #: setup.php:283 setup.php:387 setup.php:396 setup.php:414 setup.php:424 #: setup.php:433 setup.php:462 setup.php:528 setup.php:554 setup.php:561 #: setup.php:572 setup.php:588 setup.php:596 setup.php:605 #, php-format msgid "Offending command was: \"%s\"" -msgstr "" +msgstr "冲突命令为：\"%s\"" #: setup.php:299 #, php-format msgid "MySQL user '%s'@'localhost' exists already." -msgstr "" +msgstr "MySQL 用户 '%s'@'localhost' 已存在。" #: setup.php:300 msgid "Drop this user from MySQL" -msgstr "" +msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户" #: setup.php:305 #, php-format msgid "MySQL user '%s'@'%%' already exists" -msgstr "" +msgstr "MySQL 用户 '%s'@'%%' 已存在" #: setup.php:306 msgid "Drop this user from MySQL." -msgstr "" +msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户。" #: setup.php:579 setup.php:611 #, php-format msgid "Offending command was: \"%s\", name: %s, password: %s" -msgstr "" +msgstr "冲突命令为：\"%s\"，名称：%s，密码：%s" #: setup.php:631 #, php-format msgid "MS SQL username and/or password not valid: %s" -msgstr "" +msgstr "MS SQL 用户名和/或密码无效：%s" #: setup.php:849 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏." #: setup.php:850 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." -msgstr "" +msgstr "请认真检查<a href='%s'>安装指南</a>." #: template.php:113 msgid "seconds ago" @@ -235,7 +236,7 @@ msgstr "%d 月前" #: template.php:123 msgid "last year" -msgstr "上年" +msgstr "去年" #: template.php:124 msgid "years ago" @@ -244,7 +245,7 @@ msgstr "几年前" #: updater.php:78 #, php-format msgid "%s is available. Get <a href=\"%s\">more information</a>" -msgstr "%s 已存在. 点此 <a href=\"%s\">获取更多信息</a>" +msgstr "%s 已存在。点此 <a href=\"%s\">获取更多信息</a>" #: updater.php:81 msgid "up to date" @@ -252,7 +253,7 @@ msgstr "已更新。" #: updater.php:84 msgid "updates check is disabled" -msgstr "检查更新功能被关闭。" +msgstr "更新检查功能被禁用。" #: vcategories.php:188 vcategories.php:249 #, php-format diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po index 2262b78d951..2fd9d8ee34c 100644 --- a/l10n/zh_CN/settings.po +++ b/l10n/zh_CN/settings.po @@ -4,18 +4,20 @@ # # Translators: # <appweb.cn@gmail.com>, 2012. +# CyberCowBoy <ccb3275@gmail.com>, 2013. # Dianjin Wang <1132321739qq@gmail.com>, 2012-2013. # Phoenix Nemo <>, 2012. # <rainofchaos@gmail.com>, 2012. # <suiy02@gmail.com>, 2012. +# <wengxt@gmail.com>, 2013. # <wengxt@gmail.com>, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 09:21+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 18:12+0000\n" +"Last-Translator: ccb <ccb3275@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +36,7 @@ msgstr "认证错误" #: ajax/changedisplayname.php:32 msgid "Unable to change display name" -msgstr "" +msgstr "无法修改显示名称" #: ajax/creategroup.php:10 msgid "Group already exists" @@ -88,11 +90,11 @@ msgstr "无法从组%s中移除用户" #: ajax/updateapp.php:14 msgid "Couldn't update app." -msgstr "" +msgstr "无法更新 app。" #: js/apps.js:30 msgid "Update to {appversion}" -msgstr "" +msgstr "更新至 {appversion}" #: js/apps.js:36 js/apps.js:76 msgid "Disable" @@ -104,15 +106,15 @@ msgstr "启用" #: js/apps.js:55 msgid "Please wait...." -msgstr "" +msgstr "请稍等...." #: js/apps.js:84 msgid "Updating...." -msgstr "" +msgstr "正在更新...." #: js/apps.js:87 msgid "Error while updating app" -msgstr "" +msgstr "更新 app 时出错" #: js/apps.js:87 msgid "Error" @@ -120,7 +122,7 @@ msgstr "错误" #: js/apps.js:90 msgid "Updated" -msgstr "" +msgstr "已更新" #: js/personal.js:99 msgid "Saving..." @@ -136,7 +138,7 @@ msgstr "撤销" #: js/users.js:62 msgid "Unable to remove user" -msgstr "" +msgstr "无法移除用户" #: js/users.js:75 templates/users.php:26 templates/users.php:80 #: templates/users.php:105 @@ -153,19 +155,19 @@ msgstr "删除" #: js/users.js:191 msgid "add group" -msgstr "" +msgstr "添加组" #: js/users.js:352 msgid "A valid username must be provided" -msgstr "" +msgstr "必须提供合法的用户名" #: js/users.js:353 js/users.js:359 js/users.js:374 msgid "Error creating user" -msgstr "" +msgstr "创建用户出错" #: js/users.js:358 msgid "A valid password must be provided" -msgstr "" +msgstr "必须提供合法的密码" #: personal.php:29 personal.php:30 msgid "__language_name__" @@ -186,32 +188,32 @@ msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的. #: templates/admin.php:29 msgid "Setup Warning" -msgstr "" +msgstr "设置警告" #: templates/admin.php:32 msgid "" "Your web server is not yet properly setup to allow files synchronization " "because the WebDAV interface seems to be broken." -msgstr "" +msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏." #: templates/admin.php:33 #, php-format msgid "Please double check the <a href='%s'>installation guides</a>." -msgstr "" +msgstr "请认真检查<a href='%s'>安装指南</a>." #: templates/admin.php:44 msgid "Module 'fileinfo' missing" -msgstr "" +msgstr "模块'文件信息'丢失" #: templates/admin.php:47 msgid "" "The PHP module 'fileinfo' is missing. We strongly recommend to enable this " "module to get best results with mime-type detection." -msgstr "" +msgstr "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果." #: templates/admin.php:58 msgid "Locale not working" -msgstr "" +msgstr "本地化无法工作" #: templates/admin.php:63 #, php-format @@ -219,11 +221,11 @@ msgid "" "This ownCloud server can't set system locale to %s. This means that there " "might be problems with certain characters in file names. We strongly suggest" " to install the required packages on your system to support %s." -msgstr "" +msgstr "此ownCloud服务器无法设置系统本地化到%s. 这意味着可能文件名中有一些字符引起问题. 我们强烈建议在你系统上安装所需的软件包来支持%s" #: templates/admin.php:75 msgid "Internet connection not working" -msgstr "" +msgstr "因特网连接无法工作" #: templates/admin.php:78 msgid "" @@ -233,90 +235,90 @@ msgid "" "remote and sending of notification emails might also not work. We suggest to" " enable internet connection for this server if you want to have all features" " of ownCloud." -msgstr "" +msgstr "此ownCloud服务器上没有可用的因特网连接. 这意味着某些特性例如挂载外部存储器, 提醒更新或安装第三方应用无法工作. 从远程访问文件和发送提醒电子邮件可能也无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接." #: templates/admin.php:92 msgid "Cron" -msgstr "" +msgstr "计划任务" #: templates/admin.php:101 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "每个页面加载后执行一个任务" #: templates/admin.php:111 msgid "" "cron.php is registered at a webcron service. Call the cron.php page in the " "owncloud root once a minute over http." -msgstr "" +msgstr "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。" #: templates/admin.php:121 msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "使用系统定时任务服务。每分钟通过系统定时任务调用owncloud文件夹中的cron.php文件" #: templates/admin.php:128 msgid "Sharing" -msgstr "" +msgstr "共享" #: templates/admin.php:134 msgid "Enable Share API" -msgstr "" +msgstr "启用共享API" #: templates/admin.php:135 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "允许应用软件使用共享API" #: templates/admin.php:142 msgid "Allow links" -msgstr "" +msgstr "允许链接" #: templates/admin.php:143 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "允许用户使用连接公开共享项目" #: templates/admin.php:150 msgid "Allow resharing" -msgstr "" +msgstr "允许再次共享" #: templates/admin.php:151 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "允许用户将共享给他们的项目再次共享" #: templates/admin.php:158 msgid "Allow users to share with anyone" -msgstr "" +msgstr "允许用户向任何人共享" #: templates/admin.php:161 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "允许用户只向同组用户共享" #: templates/admin.php:168 msgid "Security" -msgstr "" +msgstr "安全" #: templates/admin.php:181 msgid "Enforce HTTPS" -msgstr "" +msgstr "强制使用 HTTPS" #: templates/admin.php:182 msgid "" "Enforces the clients to connect to ownCloud via an encrypted connection." -msgstr "" +msgstr "强制客户端通过加密连接连接到 ownCloud。" #: templates/admin.php:185 msgid "" "Please connect to this ownCloud instance via HTTPS to enable or disable the " "SSL enforcement." -msgstr "" +msgstr "请经由HTTPS连接到这个ownCloud实例来启用或禁用强制SSL." #: templates/admin.php:195 msgid "Log" -msgstr "" +msgstr "日志" #: templates/admin.php:196 msgid "Log level" -msgstr "" +msgstr "日志级别" #: templates/admin.php:223 msgid "More" @@ -395,7 +397,7 @@ msgstr "安装应用进行文件同步" #: templates/personal.php:26 msgid "Show First Run Wizard again" -msgstr "" +msgstr "再次显示首次运行向导" #: templates/personal.php:37 templates/users.php:23 templates/users.php:79 msgid "Password" @@ -423,19 +425,19 @@ msgstr "修改密码" #: templates/personal.php:56 templates/users.php:78 msgid "Display Name" -msgstr "" +msgstr "显示名称" #: templates/personal.php:57 msgid "Your display name was changed" -msgstr "" +msgstr "您的显示名称已修改" #: templates/personal.php:58 msgid "Unable to change your display name" -msgstr "" +msgstr "无法修改您的显示名称" #: templates/personal.php:61 msgid "Change display name" -msgstr "" +msgstr "修改显示名称" #: templates/personal.php:70 msgid "Email" @@ -467,7 +469,7 @@ msgstr "用该地址来连接文件管理器中的 ownCloud" #: templates/users.php:21 templates/users.php:77 msgid "Login Name" -msgstr "" +msgstr "登录名称" #: templates/users.php:32 msgid "Create" @@ -491,11 +493,11 @@ msgstr "存储" #: templates/users.php:95 msgid "change display name" -msgstr "" +msgstr "修改显示名称" #: templates/users.php:99 msgid "set new password" -msgstr "" +msgstr "设置新密码" #: templates/users.php:134 msgid "Default" diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po index 65b41b0aeee..407c8e9b18e 100644 --- a/l10n/zh_HK/core.po +++ b/l10n/zh_HK/core.po @@ -4,13 +4,14 @@ # # Translators: # <amanda.shuuemura@gmail.com>, 2012. +# Dennis <dtsang29@hotmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-09 00:12+0100\n" -"PO-Revision-Date: 2013-02-08 23:12+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 06:10+0000\n" +"Last-Translator: dtsang29 <dtsang29@hotmail.com>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,24 +19,24 @@ msgstr "" "Language: zh_HK\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ajax/share.php:85 +#: ajax/share.php:97 #, php-format msgid "User %s shared a file with you" msgstr "" -#: ajax/share.php:87 +#: ajax/share.php:99 #, php-format msgid "User %s shared a folder with you" msgstr "" -#: ajax/share.php:89 +#: ajax/share.php:101 #, php-format msgid "" "User %s shared the file \"%s\" with you. It is available for download here: " "%s" msgstr "" -#: ajax/share.php:91 +#: ajax/share.php:104 #, php-format msgid "" "User %s shared the folder \"%s\" with you. It is available for download " @@ -81,135 +82,135 @@ msgstr "" msgid "Error removing %s from favorites." msgstr "" -#: js/config.php:32 +#: js/config.php:34 msgid "Sunday" -msgstr "" +msgstr "星期日" -#: js/config.php:32 +#: js/config.php:35 msgid "Monday" -msgstr "" +msgstr "星期一" -#: js/config.php:32 +#: js/config.php:36 msgid "Tuesday" -msgstr "" +msgstr "星期二" -#: js/config.php:32 +#: js/config.php:37 msgid "Wednesday" -msgstr "" +msgstr "星期三" -#: js/config.php:32 +#: js/config.php:38 msgid "Thursday" -msgstr "" +msgstr "星期四" -#: js/config.php:32 +#: js/config.php:39 msgid "Friday" -msgstr "" +msgstr "星期五" -#: js/config.php:32 +#: js/config.php:40 msgid "Saturday" -msgstr "" +msgstr "星期六" -#: js/config.php:33 +#: js/config.php:45 msgid "January" -msgstr "" +msgstr "一月" -#: js/config.php:33 +#: js/config.php:46 msgid "February" -msgstr "" +msgstr "二月" -#: js/config.php:33 +#: js/config.php:47 msgid "March" -msgstr "" +msgstr "三月" -#: js/config.php:33 +#: js/config.php:48 msgid "April" -msgstr "" +msgstr "四月" -#: js/config.php:33 +#: js/config.php:49 msgid "May" -msgstr "" +msgstr "五月" -#: js/config.php:33 +#: js/config.php:50 msgid "June" -msgstr "" +msgstr "六月" -#: js/config.php:33 +#: js/config.php:51 msgid "July" -msgstr "" +msgstr "七月" -#: js/config.php:33 +#: js/config.php:52 msgid "August" -msgstr "" +msgstr "八月" -#: js/config.php:33 +#: js/config.php:53 msgid "September" -msgstr "" +msgstr "九月" -#: js/config.php:33 +#: js/config.php:54 msgid "October" -msgstr "" +msgstr "十月" -#: js/config.php:33 +#: js/config.php:55 msgid "November" -msgstr "" +msgstr "十一月" -#: js/config.php:33 +#: js/config.php:56 msgid "December" -msgstr "" +msgstr "十二月" -#: js/js.js:284 +#: js/js.js:286 msgid "Settings" -msgstr "" +msgstr "設定" -#: js/js.js:764 +#: js/js.js:777 msgid "seconds ago" msgstr "" -#: js/js.js:765 +#: js/js.js:778 msgid "1 minute ago" msgstr "" -#: js/js.js:766 +#: js/js.js:779 msgid "{minutes} minutes ago" msgstr "" -#: js/js.js:767 +#: js/js.js:780 msgid "1 hour ago" msgstr "" -#: js/js.js:768 +#: js/js.js:781 msgid "{hours} hours ago" msgstr "" -#: js/js.js:769 +#: js/js.js:782 msgid "today" -msgstr "" +msgstr "今日" -#: js/js.js:770 +#: js/js.js:783 msgid "yesterday" -msgstr "" +msgstr "昨日" -#: js/js.js:771 +#: js/js.js:784 msgid "{days} days ago" msgstr "" -#: js/js.js:772 +#: js/js.js:785 msgid "last month" -msgstr "" +msgstr "前一月" -#: js/js.js:773 +#: js/js.js:786 msgid "{months} months ago" msgstr "" -#: js/js.js:774 +#: js/js.js:787 msgid "months ago" -msgstr "" +msgstr "個月之前" -#: js/js.js:775 +#: js/js.js:788 msgid "last year" msgstr "" -#: js/js.js:776 +#: js/js.js:789 msgid "years ago" msgstr "" @@ -219,19 +220,19 @@ msgstr "" #: js/oc-dialogs.js:146 js/oc-dialogs.js:166 msgid "Cancel" -msgstr "" +msgstr "取消" #: js/oc-dialogs.js:162 msgid "No" -msgstr "" +msgstr "No" #: js/oc-dialogs.js:163 msgid "Yes" -msgstr "" +msgstr "Yes" #: js/oc-dialogs.js:180 msgid "Ok" -msgstr "" +msgstr "OK" #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162 @@ -239,10 +240,10 @@ msgid "The object type is not specified." msgstr "" #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136 -#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571 -#: js/share.js:583 +#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566 +#: js/share.js:578 msgid "Error" -msgstr "" +msgstr "錯誤" #: js/oc-vcategories.js:179 msgid "The app name is not specified." @@ -252,129 +253,129 @@ msgstr "" msgid "The required file {file} is not installed!" msgstr "" -#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93 -msgid "Share" -msgstr "" - -#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93 +#: js/share.js:30 js/share.js:45 js/share.js:87 msgid "Shared" -msgstr "" +msgstr "已分享" -#: js/share.js:141 js/share.js:611 +#: js/share.js:90 +msgid "Share" +msgstr "分享" + +#: js/share.js:125 js/share.js:606 msgid "Error while sharing" -msgstr "" +msgstr "分享時發生錯誤" -#: js/share.js:152 +#: js/share.js:136 msgid "Error while unsharing" -msgstr "" +msgstr "取消分享時發生錯誤" -#: js/share.js:159 +#: js/share.js:143 msgid "Error while changing permissions" -msgstr "" +msgstr "更改權限時發生錯誤" -#: js/share.js:168 +#: js/share.js:152 msgid "Shared with you and the group {group} by {owner}" -msgstr "" +msgstr "{owner}與你及群組的分享" -#: js/share.js:170 +#: js/share.js:154 msgid "Shared with you by {owner}" -msgstr "" +msgstr "{owner}與你的分享" -#: js/share.js:175 +#: js/share.js:159 msgid "Share with" -msgstr "" +msgstr "分享" -#: js/share.js:180 +#: js/share.js:164 msgid "Share with link" -msgstr "" +msgstr "以連結分享" -#: js/share.js:183 +#: js/share.js:167 msgid "Password protect" -msgstr "" +msgstr "密碼保護" -#: js/share.js:185 templates/installation.php:44 templates/login.php:35 +#: js/share.js:169 templates/installation.php:47 templates/login.php:35 msgid "Password" -msgstr "" +msgstr "密碼" -#: js/share.js:189 +#: js/share.js:173 msgid "Email link to person" msgstr "" -#: js/share.js:190 +#: js/share.js:174 msgid "Send" -msgstr "" +msgstr "傳送" -#: js/share.js:194 +#: js/share.js:178 msgid "Set expiration date" -msgstr "" +msgstr "設定分享期限" -#: js/share.js:195 +#: js/share.js:179 msgid "Expiration date" -msgstr "" +msgstr "分享期限" -#: js/share.js:227 +#: js/share.js:211 msgid "Share via email:" -msgstr "" +msgstr "以電郵分享" -#: js/share.js:229 +#: js/share.js:213 msgid "No people found" -msgstr "" +msgstr "找不到" -#: js/share.js:256 +#: js/share.js:240 msgid "Resharing is not allowed" msgstr "" -#: js/share.js:292 +#: js/share.js:276 msgid "Shared in {item} with {user}" msgstr "" -#: js/share.js:313 +#: js/share.js:297 msgid "Unshare" -msgstr "" +msgstr "取消分享" -#: js/share.js:325 +#: js/share.js:309 msgid "can edit" msgstr "" -#: js/share.js:327 +#: js/share.js:311 msgid "access control" msgstr "" -#: js/share.js:330 +#: js/share.js:314 msgid "create" -msgstr "" +msgstr "新增" -#: js/share.js:333 +#: js/share.js:317 msgid "update" -msgstr "" +msgstr "更新" -#: js/share.js:336 +#: js/share.js:320 msgid "delete" -msgstr "" +msgstr "刪除" -#: js/share.js:339 +#: js/share.js:323 msgid "share" -msgstr "" +msgstr "分享" -#: js/share.js:373 js/share.js:558 +#: js/share.js:357 js/share.js:553 msgid "Password protected" -msgstr "" +msgstr "密碼保護" -#: js/share.js:571 +#: js/share.js:566 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:583 +#: js/share.js:578 msgid "Error setting expiration date" msgstr "" -#: js/share.js:598 +#: js/share.js:593 msgid "Sending ..." -msgstr "" +msgstr "傳送中" -#: js/share.js:609 +#: js/share.js:604 msgid "Email sent" -msgstr "" +msgstr "郵件已傳" #: js/update.js:14 msgid "" @@ -385,72 +386,72 @@ msgstr "" #: js/update.js:18 msgid "The update was successful. Redirecting you to ownCloud now." -msgstr "" +msgstr "更新成功, 正" -#: lostpassword/controller.php:47 +#: lostpassword/controller.php:48 msgid "ownCloud password reset" msgstr "" #: lostpassword/templates/email.php:2 msgid "Use the following link to reset your password: {link}" -msgstr "" +msgstr "請用以下連結重設你的密碼: {link}" #: lostpassword/templates/lostpassword.php:3 msgid "You will receive a link to reset your password via Email." -msgstr "" +msgstr "你將收到一封電郵" #: lostpassword/templates/lostpassword.php:5 msgid "Reset email send." -msgstr "" +msgstr "重設密碼郵件已傳" #: lostpassword/templates/lostpassword.php:8 msgid "Request failed!" -msgstr "" +msgstr "請求失敗" -#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39 +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:41 #: templates/login.php:28 msgid "Username" -msgstr "" +msgstr "用戶名稱" #: lostpassword/templates/lostpassword.php:14 msgid "Request reset" -msgstr "" +msgstr "重設" #: lostpassword/templates/resetpassword.php:4 msgid "Your password was reset" -msgstr "" +msgstr "你的密碼已被重設" #: lostpassword/templates/resetpassword.php:5 msgid "To login page" -msgstr "" +msgstr "前往登入版面" #: lostpassword/templates/resetpassword.php:8 msgid "New password" -msgstr "" +msgstr "新密碼" #: lostpassword/templates/resetpassword.php:11 msgid "Reset password" -msgstr "" +msgstr "重設密碼" #: strings.php:5 msgid "Personal" -msgstr "" +msgstr "個人" #: strings.php:6 msgid "Users" -msgstr "" +msgstr "用戶" #: strings.php:7 msgid "Apps" -msgstr "" +msgstr "軟件" #: strings.php:8 msgid "Admin" -msgstr "" +msgstr "管理" #: strings.php:9 msgid "Help" -msgstr "" +msgstr "幫助" #: templates/403.php:12 msgid "Access forbidden" @@ -458,7 +459,7 @@ msgstr "" #: templates/404.php:12 msgid "Cloud not found" -msgstr "" +msgstr "未找到Cloud" #: templates/edit_categories_dialog.php:4 msgid "Edit categories" @@ -466,115 +467,116 @@ msgstr "" #: templates/edit_categories_dialog.php:16 msgid "Add" -msgstr "" +msgstr "加入" -#: templates/installation.php:23 templates/installation.php:30 +#: templates/installation.php:24 templates/installation.php:31 msgid "Security Warning" msgstr "" -#: templates/installation.php:24 +#: templates/installation.php:25 msgid "" "No secure random number generator is available, please enable the PHP " "OpenSSL extension." msgstr "" -#: templates/installation.php:25 +#: templates/installation.php:26 msgid "" "Without a secure random number generator an attacker may be able to predict " "password reset tokens and take over your account." msgstr "" -#: templates/installation.php:31 +#: templates/installation.php:32 msgid "" "Your data directory and files are probably accessible from the internet " "because the .htaccess file does not work." msgstr "" -#: templates/installation.php:32 +#: templates/installation.php:33 msgid "" "For information how to properly configure your server, please see the <a " "href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" " "target=\"_blank\">documentation</a>." msgstr "" -#: templates/installation.php:36 +#: templates/installation.php:37 msgid "Create an <strong>admin account</strong>" -msgstr "" +msgstr "建立管理員帳戶" -#: templates/installation.php:52 +#: templates/installation.php:55 msgid "Advanced" -msgstr "" +msgstr "進階" -#: templates/installation.php:54 +#: templates/installation.php:57 msgid "Data folder" msgstr "" -#: templates/installation.php:61 +#: templates/installation.php:66 msgid "Configure the database" -msgstr "" +msgstr "設定資料庫" -#: templates/installation.php:66 templates/installation.php:77 -#: templates/installation.php:87 templates/installation.php:97 +#: templates/installation.php:71 templates/installation.php:83 +#: templates/installation.php:94 templates/installation.php:105 +#: templates/installation.php:117 msgid "will be used" -msgstr "" +msgstr "將被使用" -#: templates/installation.php:109 +#: templates/installation.php:129 msgid "Database user" -msgstr "" +msgstr "資料庫帳戶" -#: templates/installation.php:113 +#: templates/installation.php:134 msgid "Database password" -msgstr "" +msgstr "資料庫密碼" -#: templates/installation.php:117 +#: templates/installation.php:139 msgid "Database name" -msgstr "" +msgstr "資料庫名稱" -#: templates/installation.php:125 +#: templates/installation.php:149 msgid "Database tablespace" msgstr "" -#: templates/installation.php:131 +#: templates/installation.php:156 msgid "Database host" msgstr "" -#: templates/installation.php:136 +#: templates/installation.php:162 msgid "Finish setup" msgstr "" -#: templates/layout.guest.php:33 +#: templates/layout.guest.php:40 msgid "web services under your control" msgstr "" -#: templates/layout.user.php:48 +#: templates/layout.user.php:58 msgid "Log out" -msgstr "" +msgstr "登出" #: templates/login.php:10 msgid "Automatic logon rejected!" -msgstr "" +msgstr "自動登入被拒" #: templates/login.php:11 msgid "" "If you did not change your password recently, your account may be " "compromised!" -msgstr "" +msgstr "如果你近期未曾更改密碼, 你的帳號可能被洩露!" #: templates/login.php:13 msgid "Please change your password to secure your account again." -msgstr "" +msgstr "請更改你的密碼以保護你的帳戶" #: templates/login.php:19 msgid "Lost your password?" -msgstr "" +msgstr "忘記密碼" #: templates/login.php:41 msgid "remember" -msgstr "" +msgstr "記住" #: templates/login.php:43 msgid "Log in" -msgstr "" +msgstr "登入" #: templates/login.php:49 msgid "Alternative Logins" @@ -582,13 +584,13 @@ msgstr "" #: templates/part.pagenavi.php:3 msgid "prev" -msgstr "" +msgstr "前一步" #: templates/part.pagenavi.php:20 msgid "next" -msgstr "" +msgstr "下一步" #: templates/update.php:3 #, php-format msgid "Updating ownCloud to version %s, this may take a while." -msgstr "" +msgstr "ownCloud (ver. %s)更新中, 請耐心等侯" diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po index 6fb648527a3..5da5b0dba7d 100644 --- a/l10n/zh_HK/files.po +++ b/l10n/zh_HK/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-04 00:06+0100\n" -"PO-Revision-Date: 2013-03-03 23:06+0000\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 09:20+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -74,9 +74,9 @@ msgstr "" msgid "Invalid directory." msgstr "" -#: appinfo/app.php:10 +#: appinfo/app.php:12 msgid "Files" -msgstr "" +msgstr "文件" #: js/fileactions.js:125 msgid "Delete permanently" @@ -84,14 +84,14 @@ msgstr "" #: js/fileactions.js:127 templates/index.php:92 templates/index.php:93 msgid "Delete" -msgstr "" +msgstr "刪除" #: js/fileactions.js:193 msgid "Rename" msgstr "" -#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408 -#: js/files.js:439 +#: js/filelist.js:49 js/filelist.js:52 js/files.js:293 js/files.js:409 +#: js/files.js:440 msgid "Pending" msgstr "" @@ -145,80 +145,80 @@ msgstr "" msgid "Your storage is almost full ({usedSpacePercent}%)" msgstr "" -#: js/files.js:225 +#: js/files.js:226 msgid "" "Your download is being prepared. This might take some time if the files are " "big." msgstr "" -#: js/files.js:262 +#: js/files.js:263 msgid "Unable to upload your file as it is a directory or has 0 bytes" msgstr "" -#: js/files.js:262 +#: js/files.js:263 msgid "Upload Error" msgstr "" -#: js/files.js:273 +#: js/files.js:274 msgid "Close" msgstr "" -#: js/files.js:312 +#: js/files.js:313 msgid "1 file uploading" msgstr "" -#: js/files.js:315 js/files.js:370 js/files.js:385 +#: js/files.js:316 js/files.js:371 js/files.js:386 msgid "{count} files uploading" msgstr "" -#: js/files.js:388 js/files.js:423 +#: js/files.js:389 js/files.js:424 msgid "Upload cancelled." msgstr "" -#: js/files.js:497 +#: js/files.js:498 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:570 +#: js/files.js:571 msgid "URL cannot be empty." msgstr "" -#: js/files.js:575 +#: js/files.js:576 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" msgstr "" -#: js/files.js:953 templates/index.php:68 +#: js/files.js:954 templates/index.php:68 msgid "Name" -msgstr "" +msgstr "名稱" -#: js/files.js:954 templates/index.php:79 +#: js/files.js:955 templates/index.php:79 msgid "Size" msgstr "" -#: js/files.js:955 templates/index.php:81 +#: js/files.js:956 templates/index.php:81 msgid "Modified" msgstr "" -#: js/files.js:974 +#: js/files.js:975 msgid "1 folder" msgstr "" -#: js/files.js:976 +#: js/files.js:977 msgid "{count} folders" msgstr "" -#: js/files.js:984 +#: js/files.js:985 msgid "1 file" msgstr "" -#: js/files.js:986 +#: js/files.js:987 msgid "{count} files" msgstr "" #: lib/helper.php:11 templates/index.php:18 msgid "Upload" -msgstr "" +msgstr "上傳" #: templates/admin.php:5 msgid "File handling" @@ -250,7 +250,7 @@ msgstr "" #: templates/admin.php:26 msgid "Save" -msgstr "" +msgstr "儲存" #: templates/index.php:7 msgid "New" @@ -286,11 +286,11 @@ msgstr "" #: templates/index.php:74 msgid "Download" -msgstr "" +msgstr "下載" #: templates/index.php:86 templates/index.php:87 msgid "Unshare" -msgstr "" +msgstr "取消分享" #: templates/index.php:106 msgid "Upload too large" diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po index b213e0bbd8d..c1002a17a4f 100644 --- a/l10n/zh_HK/files_encryption.po +++ b/l10n/zh_HK/files_encryption.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dennis <dtsang29@hotmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-10 00:08+0100\n" -"PO-Revision-Date: 2013-02-09 23:09+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 09:10+0000\n" +"Last-Translator: dtsang29 <dtsang29@hotmail.com>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,15 +20,15 @@ msgstr "" #: templates/settings-personal.php:4 templates/settings.php:5 msgid "Encryption" -msgstr "" +msgstr "加密" #: templates/settings-personal.php:7 msgid "File encryption is enabled." -msgstr "" +msgstr "檔案加密已開啟" #: templates/settings-personal.php:11 msgid "The following file types will not be encrypted:" -msgstr "" +msgstr "以下文件類別將不會被加密" #: templates/settings.php:7 msgid "Exclude the following file types from encryption:" @@ -35,4 +36,4 @@ msgstr "" #: templates/settings.php:12 msgid "None" -msgstr "" +msgstr "空" diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po index 95bd8e76a91..f5a0dad8428 100644 --- a/l10n/zh_HK/files_external.po +++ b/l10n/zh_HK/files_external.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-28 00:04+0100\n" -"PO-Revision-Date: 2013-02-27 23:04+0000\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 02:10+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -37,13 +37,13 @@ msgstr "" msgid "Error configuring Google Drive storage" msgstr "" -#: lib/config.php:421 +#: lib/config.php:423 msgid "" "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares " "is not possible. Please ask your system administrator to install it." msgstr "" -#: lib/config.php:424 +#: lib/config.php:426 msgid "" "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting" " of FTP shares is not possible. Please ask your system administrator to " @@ -88,16 +88,16 @@ msgstr "" #: templates/settings.php:92 msgid "Groups" -msgstr "" +msgstr "群組" #: templates/settings.php:100 msgid "Users" -msgstr "" +msgstr "用戶" #: templates/settings.php:113 templates/settings.php:114 #: templates/settings.php:149 templates/settings.php:150 msgid "Delete" -msgstr "" +msgstr "刪除" #: templates/settings.php:129 msgid "Enable User External Storage" diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po index 4721ae096c2..792810587f7 100644 --- a/l10n/zh_HK/files_sharing.po +++ b/l10n/zh_HK/files_sharing.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-11-19 00:01+0100\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" "PO-Revision-Date: 2012-08-12 22:35+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" @@ -19,30 +19,30 @@ msgstr "" #: templates/authenticate.php:4 msgid "Password" -msgstr "" +msgstr "密碼" #: templates/authenticate.php:6 msgid "Submit" msgstr "" -#: templates/public.php:9 +#: templates/public.php:10 #, php-format msgid "%s shared the folder %s with you" msgstr "" -#: templates/public.php:11 +#: templates/public.php:13 #, php-format msgid "%s shared the file %s with you" msgstr "" -#: templates/public.php:14 templates/public.php:30 +#: templates/public.php:19 templates/public.php:37 msgid "Download" -msgstr "" +msgstr "下載" -#: templates/public.php:29 +#: templates/public.php:34 msgid "No preview available for" msgstr "" -#: templates/public.php:35 +#: templates/public.php:43 msgid "web services under your control" msgstr "" diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po index efeae3b8e6c..3199622577b 100644 --- a/l10n/zh_HK/files_trashbin.po +++ b/l10n/zh_HK/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-08 00:25+0100\n" -"PO-Revision-Date: 2013-03-07 23:25+0000\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 09:20+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgstr "" #: js/trash.js:174 templates/index.php:17 msgid "Name" -msgstr "" +msgstr "名稱" #: js/trash.js:175 templates/index.php:27 msgid "Deleted" @@ -73,7 +73,7 @@ msgstr "" #: templates/index.php:30 templates/index.php:31 msgid "Delete" -msgstr "" +msgstr "刪除" #: templates/part.breadcrumb.php:9 msgid "Deleted Files" diff --git a/l10n/zh_HK/files_versions.po b/l10n/zh_HK/files_versions.po index 893fb184e9b..9d6dd7c46ee 100644 --- a/l10n/zh_HK/files_versions.po +++ b/l10n/zh_HK/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dennis <dtsang29@hotmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-28 00:04+0100\n" -"PO-Revision-Date: 2013-02-27 23:04+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 09:10+0000\n" +"Last-Translator: dtsang29 <dtsang29@hotmail.com>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgstr "" #: history.php:40 msgid "success" -msgstr "" +msgstr "成功" #: history.php:42 #, php-format @@ -33,24 +34,24 @@ msgstr "" #: history.php:49 msgid "failure" -msgstr "" +msgstr "失敗" #: history.php:51 #, php-format msgid "File %s could not be reverted to version %s" msgstr "" -#: history.php:68 +#: history.php:69 msgid "No old versions available" -msgstr "" +msgstr "沒有以往版本" -#: history.php:73 +#: history.php:74 msgid "No path specified" msgstr "" #: js/versions.js:6 msgid "Versions" -msgstr "" +msgstr "版本" #: templates/history.php:20 msgid "Revert a file to a previous version by clicking on its revert button" diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po index 17cc0100415..0314f6fd2b9 100644 --- a/l10n/zh_HK/lib.po +++ b/l10n/zh_HK/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 06:00+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -19,41 +19,41 @@ msgstr "" #: app.php:349 msgid "Help" -msgstr "" +msgstr "幫助" #: app.php:362 msgid "Personal" -msgstr "" +msgstr "個人" #: app.php:373 msgid "Settings" -msgstr "" +msgstr "設定" #: app.php:385 msgid "Users" -msgstr "" +msgstr "用戶" #: app.php:398 msgid "Apps" -msgstr "" +msgstr "軟件" #: app.php:406 msgid "Admin" -msgstr "" +msgstr "管理" -#: files.php:202 +#: files.php:209 msgid "ZIP download is turned off." msgstr "" -#: files.php:203 +#: files.php:210 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:204 files.php:231 +#: files.php:211 files.php:244 msgid "Back to Files" msgstr "" -#: files.php:228 +#: files.php:241 msgid "Selected files too large to generate zip file." msgstr "" @@ -75,11 +75,11 @@ msgstr "" #: search/provider/file.php:17 search/provider/file.php:35 msgid "Files" -msgstr "" +msgstr "文件" #: search/provider/file.php:26 search/provider/file.php:33 msgid "Text" -msgstr "" +msgstr "文字" #: search/provider/file.php:29 msgid "Images" @@ -211,11 +211,11 @@ msgstr "" #: template.php:118 msgid "today" -msgstr "" +msgstr "今日" #: template.php:119 msgid "yesterday" -msgstr "" +msgstr "昨日" #: template.php:120 #, php-format @@ -224,7 +224,7 @@ msgstr "" #: template.php:121 msgid "last month" -msgstr "" +msgstr "前一月" #: template.php:122 #, php-format diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po index 5650c789106..4420bb1820b 100644 --- a/l10n/zh_HK/settings.po +++ b/l10n/zh_HK/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-27 14:35+0100\n" -"PO-Revision-Date: 2013-02-27 13:35+0000\n" +"POT-Creation-Date: 2013-03-14 00:05+0100\n" +"PO-Revision-Date: 2013-03-13 02:20+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -110,7 +110,7 @@ msgstr "" #: js/apps.js:87 msgid "Error" -msgstr "" +msgstr "錯誤" #: js/apps.js:90 msgid "Updated" @@ -135,7 +135,7 @@ msgstr "" #: js/users.js:75 templates/users.php:26 templates/users.php:80 #: templates/users.php:105 msgid "Groups" -msgstr "" +msgstr "群組" #: js/users.js:78 templates/users.php:82 templates/users.php:119 msgid "Group Admin" @@ -143,7 +143,7 @@ msgstr "" #: js/users.js:99 templates/users.php:161 msgid "Delete" -msgstr "" +msgstr "刪除" #: js/users.js:191 msgid "add group" @@ -393,7 +393,7 @@ msgstr "" #: templates/personal.php:37 templates/users.php:23 templates/users.php:79 msgid "Password" -msgstr "" +msgstr "密碼" #: templates/personal.php:38 msgid "Your password was changed" @@ -409,7 +409,7 @@ msgstr "" #: templates/personal.php:42 msgid "New password" -msgstr "" +msgstr "新密碼" #: templates/personal.php:44 msgid "Change password" @@ -433,7 +433,7 @@ msgstr "" #: templates/personal.php:70 msgid "Email" -msgstr "" +msgstr "電郵" #: templates/personal.php:72 msgid "Your email address" diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po index 55843162a94..dfcf588c574 100644 --- a/l10n/zh_HK/user_ldap.po +++ b/l10n/zh_HK/user_ldap.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-03-02 00:03+0100\n" -"PO-Revision-Date: 2013-03-01 23:04+0000\n" +"POT-Creation-Date: 2013-03-15 00:05+0100\n" +"PO-Revision-Date: 2013-03-14 02:50+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -86,248 +86,248 @@ msgstr "" msgid "Server configuration" msgstr "" -#: templates/settings.php:18 +#: templates/settings.php:31 msgid "Add Server Configuration" msgstr "" -#: templates/settings.php:23 +#: templates/settings.php:36 msgid "Host" msgstr "" -#: templates/settings.php:25 +#: templates/settings.php:38 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" msgstr "" -#: templates/settings.php:26 +#: templates/settings.php:39 msgid "Base DN" msgstr "" -#: templates/settings.php:27 +#: templates/settings.php:40 msgid "One Base DN per line" msgstr "" -#: templates/settings.php:28 +#: templates/settings.php:41 msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" -#: templates/settings.php:30 +#: templates/settings.php:43 msgid "User DN" msgstr "" -#: templates/settings.php:32 +#: templates/settings.php:45 msgid "" "The DN of the client user with which the bind shall be done, e.g. " "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " "empty." msgstr "" -#: templates/settings.php:33 +#: templates/settings.php:46 msgid "Password" -msgstr "" +msgstr "密碼" -#: templates/settings.php:36 +#: templates/settings.php:49 msgid "For anonymous access, leave DN and Password empty." msgstr "" -#: templates/settings.php:37 +#: templates/settings.php:50 msgid "User Login Filter" msgstr "" -#: templates/settings.php:40 +#: templates/settings.php:53 #, php-format msgid "" "Defines the filter to apply, when login is attempted. %%uid replaces the " "username in the login action." msgstr "" -#: templates/settings.php:41 +#: templates/settings.php:54 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" msgstr "" -#: templates/settings.php:42 +#: templates/settings.php:55 msgid "User List Filter" msgstr "" -#: templates/settings.php:45 +#: templates/settings.php:58 msgid "Defines the filter to apply, when retrieving users." msgstr "" -#: templates/settings.php:46 +#: templates/settings.php:59 msgid "without any placeholder, e.g. \"objectClass=person\"." msgstr "" -#: templates/settings.php:47 +#: templates/settings.php:60 msgid "Group Filter" msgstr "" -#: templates/settings.php:50 +#: templates/settings.php:63 msgid "Defines the filter to apply, when retrieving groups." msgstr "" -#: templates/settings.php:51 +#: templates/settings.php:64 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." msgstr "" -#: templates/settings.php:55 +#: templates/settings.php:68 msgid "Connection Settings" msgstr "" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "Configuration Active" msgstr "" -#: templates/settings.php:57 +#: templates/settings.php:70 msgid "When unchecked, this configuration will be skipped." msgstr "" -#: templates/settings.php:58 +#: templates/settings.php:71 msgid "Port" -msgstr "" +msgstr "連接埠" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "Backup (Replica) Host" msgstr "" -#: templates/settings.php:59 +#: templates/settings.php:72 msgid "" "Give an optional backup host. It must be a replica of the main LDAP/AD " "server." msgstr "" -#: templates/settings.php:60 +#: templates/settings.php:73 msgid "Backup (Replica) Port" msgstr "" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "Disable Main Server" msgstr "" -#: templates/settings.php:61 +#: templates/settings.php:74 msgid "When switched on, ownCloud will only connect to the replica server." msgstr "" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Use TLS" msgstr "" -#: templates/settings.php:62 +#: templates/settings.php:75 msgid "Do not use it additionally for LDAPS connections, it will fail." msgstr "" -#: templates/settings.php:63 +#: templates/settings.php:76 msgid "Case insensitve LDAP server (Windows)" msgstr "" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Turn off SSL certificate validation." msgstr "" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "" "If connection only works with this option, import the LDAP server's SSL " "certificate in your ownCloud server." msgstr "" -#: templates/settings.php:64 +#: templates/settings.php:77 msgid "Not recommended, use for testing only." msgstr "" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "Cache Time-To-Live" msgstr "" -#: templates/settings.php:65 +#: templates/settings.php:78 msgid "in seconds. A change empties the cache." msgstr "" -#: templates/settings.php:67 +#: templates/settings.php:80 msgid "Directory Settings" msgstr "" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "User Display Name Field" msgstr "" -#: templates/settings.php:69 +#: templates/settings.php:82 msgid "The LDAP attribute to use to generate the user`s ownCloud name." msgstr "" -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "Base User Tree" msgstr "" -#: templates/settings.php:70 +#: templates/settings.php:83 msgid "One User Base DN per line" msgstr "" -#: templates/settings.php:71 +#: templates/settings.php:84 msgid "User Search Attributes" msgstr "" -#: templates/settings.php:71 templates/settings.php:74 +#: templates/settings.php:84 templates/settings.php:87 msgid "Optional; one attribute per line" msgstr "" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "Group Display Name Field" msgstr "" -#: templates/settings.php:72 +#: templates/settings.php:85 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." msgstr "" -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "Base Group Tree" msgstr "" -#: templates/settings.php:73 +#: templates/settings.php:86 msgid "One Group Base DN per line" msgstr "" -#: templates/settings.php:74 +#: templates/settings.php:87 msgid "Group Search Attributes" msgstr "" -#: templates/settings.php:75 +#: templates/settings.php:88 msgid "Group-Member association" msgstr "" -#: templates/settings.php:77 +#: templates/settings.php:90 msgid "Special Attributes" msgstr "" -#: templates/settings.php:79 +#: templates/settings.php:92 msgid "Quota Field" msgstr "" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "Quota Default" msgstr "" -#: templates/settings.php:80 +#: templates/settings.php:93 msgid "in bytes" msgstr "" -#: templates/settings.php:81 +#: templates/settings.php:94 msgid "Email Field" msgstr "" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "User Home Folder Naming Rule" msgstr "" -#: templates/settings.php:82 +#: templates/settings.php:95 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." msgstr "" -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Test Configuration" msgstr "" -#: templates/settings.php:86 +#: templates/settings.php:99 msgid "Help" -msgstr "" +msgstr "幫助" diff --git a/lib/config.php b/lib/config.php index 0bd497b8e50..c94eb278159 100644 --- a/lib/config.php +++ b/lib/config.php @@ -155,7 +155,11 @@ class OC_Config{ */ public static function writeData() { // Create a php file ... - $content = "<?php\n\$CONFIG = "; + $content = "<?php\n "; + if (defined('DEBUG') && DEBUG) { + $content .= "define('DEBUG',true);\n"; + } + $content .= "\$CONFIG = "; $content .= var_export(self::$cache, true); $content .= ";\n"; diff --git a/lib/db.php b/lib/db.php index 347deac8519..9699b216f6f 100644 --- a/lib/db.php +++ b/lib/db.php @@ -292,8 +292,10 @@ class OC_DB { 'username' => $user, 'password' => $pass, 'hostspec' => $host, - 'database' => $name - ); + 'database' => $name, + 'charset' => 'UTF-8' + ); + $options['portability'] = $options['portability'] - MDB2_PORTABILITY_EMPTY_TO_NULL; break; default: return false; diff --git a/lib/files.php b/lib/files.php index 2433502444c..04ba51d9d24 100644 --- a/lib/files.php +++ b/lib/files.php @@ -50,7 +50,7 @@ class OC_Files { $xsendfile = true; } - if (count($files) == 1) { + if (is_array($files) && count($files) == 1) { $files = $files[0]; } diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php index f288919df74..91bcb73a55d 100644 --- a/lib/files/cache/cache.php +++ b/lib/files/cache/cache.php @@ -203,7 +203,10 @@ class Cache { $query = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache`(' . implode(', ', $queryParts) . ')' . ' VALUES(' . implode(', ', $valuesPlaceholder) . ')'); - $query->execute($params); + $result = $query->execute($params); + if (\OC_DB::isError($result)) { + \OCP\Util::writeLog('cache', 'Insert to cache failed: '.$result, \OCP\Util::ERROR); + } return (int)\OC_DB::insertid('*PREFIX*filecache'); } diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php index 88f208547f6..f285f3bed11 100644 --- a/lib/files/cache/scanner.php +++ b/lib/files/cache/scanner.php @@ -151,6 +151,7 @@ class Scanner { private function isIgnoredFile($file) { if ($file === '.' || $file === '..' || pathinfo($file, PATHINFO_EXTENSION) === 'part' + || \OC\Files\Filesystem::isFileBlacklisted($file) ) { return true; } diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php index 0bbd7550d74..d32e082ade9 100644 --- a/lib/files/filesystem.php +++ b/lib/files/filesystem.php @@ -221,11 +221,16 @@ class Filesystem { $root = \OC_User::getHome($user); self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user); + $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); + //move config file to it's new position + if (is_file(\OC::$SERVERROOT . '/config/mount.json')) { + rename(\OC::$SERVERROOT . '/config/mount.json', $datadir . '/mount.json'); + } // Load system mount points - if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file(\OC::$SERVERROOT . '/config/mount.json')) { - if (is_file(\OC::$SERVERROOT . '/config/mount.json')) { - $mountConfig = json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mount.json'), true); + if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file($datadir . '/mount.json')) { + if (is_file($datadir . '/mount.json')) { + $mountConfig = json_decode(file_get_contents($datadir . '/mount.json'), true); } elseif (is_file(\OC::$SERVERROOT . '/config/mount.php')) { $mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php')); } @@ -249,7 +254,7 @@ class Filesystem { } if (isset($mountConfig['user'])) { foreach ($mountConfig['user'] as $mountUser => $mounts) { - if ($user === 'all' or strtolower($mountUser) === strtolower($user)) { + if ($mountUser === 'all' or strtolower($mountUser) === strtolower($user)) { foreach ($mounts as $mountPoint => $options) { $mountPoint = self::setUserVars($user, $mountPoint); foreach ($options as &$option) { diff --git a/lib/files/mapper.php b/lib/files/mapper.php index 520fadbd8c6..179e28e5e76 100644 --- a/lib/files/mapper.php +++ b/lib/files/mapper.php @@ -77,7 +77,9 @@ class Mapper $result = $query->execute(array($path1.'%')); $updateQuery = \OC_DB::prepare('UPDATE `*PREFIX*file_map`' .' SET `logic_path` = ?' - .' AND `physic_path` = ?' + .' , `logic_path_hash` = ?' + .' , `physic_path` = ?' + .' , `physic_path_hash` = ?' .' WHERE `logic_path` = ?'); while( $row = $result->fetchRow()) { $currentLogic = $row['logic_path']; @@ -86,7 +88,7 @@ class Mapper $newPhysic = $physicPath2.$this->stripRootFolder($currentPhysic, $physicPath1); if ($path1 !== $currentLogic) { try { - $updateQuery->execute(array($newLogic, $newPhysic, $currentLogic)); + $updateQuery->execute(array($newLogic, md5($newLogic), $newPhysic, md5($newPhysic), $currentLogic)); } catch (\Exception $e) { error_log('Mapper::Copy failed '.$currentLogic.' -> '.$newLogic.'\n'.$e); throw $e; @@ -149,7 +151,7 @@ class Mapper // detect duplicates while ($this->resolvePhysicalPath($physicalPath) !== null) { - $physicalPath = $this->slugifyPath($physicalPath, $index++); + $physicalPath = $this->slugifyPath($logicPath, $index++); } // insert the new path mapping if requested @@ -190,7 +192,7 @@ class Mapper array_push($sluggedElements, $last.'-'.$index); } - $sluggedPath = $this->unchangedPhysicalRoot.implode(DIRECTORY_SEPARATOR, $sluggedElements); + $sluggedPath = $this->unchangedPhysicalRoot.implode('/', $sluggedElements); return $this->stripLast($sluggedPath); } @@ -210,7 +212,7 @@ class Mapper // transliterate if (function_exists('iconv')) { - $text = iconv('utf-8', 'us-ascii//TRANSLIT', $text); + $text = iconv('utf-8', 'us-ascii//TRANSLIT//IGNORE', $text); } // lowercase @@ -219,10 +221,8 @@ class Mapper // remove unwanted characters $text = preg_replace('~[^-\w]+~', '', $text); - if (empty($text)) - { - // TODO: we better generate a guid in this case - return 'n-a'; + if (empty($text)) { + return uniqid(); } return $text; diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php index da6597c8057..7b637a97059 100644 --- a/lib/files/storage/local.php +++ b/lib/files/storage/local.php @@ -218,7 +218,11 @@ class Local extends \OC\Files\Storage\Common{ } public function free_space($path) { - return @disk_free_space($this->datadir.$path); + $space = @disk_free_space($this->datadir.$path); + if($space === false){ + return \OC\Files\FREE_SPACE_UNKNOWN; + } + return $space; } public function search($query) { diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php index 434c10bcbf7..ba3fcdc5c9e 100644 --- a/lib/files/storage/mappedlocal.php +++ b/lib/files/storage/mappedlocal.php @@ -50,7 +50,7 @@ class MappedLocal extends \OC\Files\Storage\Common{ continue; } - $logicalFilePath = $this->mapper->physicalToLogic($physicalPath.DIRECTORY_SEPARATOR.$file); + $logicalFilePath = $this->mapper->physicalToLogic($physicalPath.'/'.$file); $file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath); $file = $this->stripLeading($file); @@ -130,7 +130,7 @@ class MappedLocal extends \OC\Files\Storage\Common{ public function file_get_contents($path) { return file_get_contents($this->buildPath($path)); } - public function file_put_contents($path, $data) {//trigger_error("$path = ".var_export($path, 1)); + public function file_put_contents($path, $data) { return file_put_contents($this->buildPath($path), $data); } public function unlink($path) { @@ -280,7 +280,7 @@ class MappedLocal extends \OC\Files\Storage\Common{ foreach (scandir($physicalDir) as $item) { if ($item == '.' || $item == '..') continue; - $physicalItem = $this->mapper->physicalToLogic($physicalDir.DIRECTORY_SEPARATOR.$item); + $physicalItem = $this->mapper->physicalToLogic($physicalDir.'/'.$item); $item = substr($physicalItem, strlen($physicalDir)+1); if(strstr(strtolower($item), strtolower($query)) !== false) { @@ -331,6 +331,9 @@ class MappedLocal extends \OC\Files\Storage\Common{ if(strpos($path, '/') === 0) { $path = substr($path, 1); } + if(strpos($path, '\\') === 0) { + $path = substr($path, 1); + } if ($path === false) { return ''; } diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php index 58c3ddf141d..c0363031979 100644 --- a/lib/l10n/sl.php +++ b/lib/l10n/sl.php @@ -5,7 +5,7 @@ "Users" => "Uporabniki", "Apps" => "Programi", "Admin" => "Skrbništvo", -"ZIP download is turned off." => "Prejem datotek ZIP je onemogočen.", +"ZIP download is turned off." => "Prejemanje datotek v paketu ZIP je onemogočeno.", "Files need to be downloaded one by one." => "Datoteke je mogoče prejeti le posamično.", "Back to Files" => "Nazaj na datoteke", "Selected files too large to generate zip file." => "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip.", @@ -47,7 +47,7 @@ "%d days ago" => "pred %d dnevi", "last month" => "prejšnji mesec", "%d months ago" => "Pred %d meseci", -"last year" => "lani", +"last year" => "lansko leto", "years ago" => "pred nekaj leti", "%s is available. Get <a href=\"%s\">more information</a>" => "%s je na voljo. <a href=\"%s\">Več podrobnosti.</a>", "up to date" => "posodobljeno", diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php index e55caa15972..ab237cfe2e7 100644 --- a/lib/l10n/tr.php +++ b/lib/l10n/tr.php @@ -16,6 +16,7 @@ "Files" => "Dosyalar", "Text" => "Metin", "Images" => "Resimler", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.", "seconds ago" => "saniye önce", "1 minute ago" => "1 dakika önce", "%d minutes ago" => "%d dakika önce", diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php index c3af288b727..b79fdfcca1d 100644 --- a/lib/l10n/zh_CN.php +++ b/lib/l10n/zh_CN.php @@ -9,12 +9,34 @@ "Files need to be downloaded one by one." => "需要逐一下载文件", "Back to Files" => "回到文件", "Selected files too large to generate zip file." => "选择的文件太大，无法生成 zip 文件。", -"Application is not enabled" => "不需要程序", -"Authentication error" => "认证错误", +"couldn't be determined" => "无法确定", +"Application is not enabled" => "应用程序未启用", +"Authentication error" => "认证出错", "Token expired. Please reload page." => "Token 过期，请刷新页面。", "Files" => "文件", "Text" => "文本", -"Images" => "图像", +"Images" => "图片", +"Set an admin username." => "请设置一个管理员用户名。", +"Set an admin password." => "请设置一个管理员密码。", +"Specify a data folder." => "请指定一个数据目录。", +"%s enter the database username." => "%s 输入数据库用户名。", +"%s enter the database name." => "%s 输入数据库名称。", +"%s you may not use dots in the database name" => "%s 您不能在数据库名称中使用英文句号。", +"%s set the database host." => "%s 设置数据库所在主机。", +"PostgreSQL username and/or password not valid" => "PostgreSQL 数据库用户名和/或密码无效", +"You need to enter either an existing account or the administrator." => "你需要输入一个数据库中已有的账户或管理员账户。", +"Oracle username and/or password not valid" => "Oracle 数据库用户名和/或密码无效", +"MySQL username and/or password not valid" => "MySQL 数据库用户名和/或密码无效", +"DB Error: \"%s\"" => "数据库错误：\"%s\"", +"Offending command was: \"%s\"" => "冲突命令为：\"%s\"", +"MySQL user '%s'@'localhost' exists already." => "MySQL 用户 '%s'@'localhost' 已存在。", +"Drop this user from MySQL" => "建议从 MySQL 数据库中丢弃 Drop 此用户", +"MySQL user '%s'@'%%' already exists" => "MySQL 用户 '%s'@'%%' 已存在", +"Drop this user from MySQL." => "建议从 MySQL 数据库中丢弃 Drop 此用户。", +"Offending command was: \"%s\", name: %s, password: %s" => "冲突命令为：\"%s\"，名称：%s，密码：%s", +"MS SQL username and/or password not valid: %s" => "MS SQL 用户名和/或密码无效：%s", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.", +"Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.", "seconds ago" => "几秒前", "1 minute ago" => "1分钟前", "%d minutes ago" => "%d 分钟前", @@ -25,10 +47,10 @@ "%d days ago" => "%d 天前", "last month" => "上月", "%d months ago" => "%d 月前", -"last year" => "上年", +"last year" => "去年", "years ago" => "几年前", -"%s is available. Get <a href=\"%s\">more information</a>" => "%s 已存在. 点此 <a href=\"%s\">获取更多信息</a>", +"%s is available. Get <a href=\"%s\">more information</a>" => "%s 已存在。点此 <a href=\"%s\">获取更多信息</a>", "up to date" => "已更新。", -"updates check is disabled" => "检查更新功能被关闭。", +"updates check is disabled" => "更新检查功能被禁用。", "Could not find category \"%s\"" => "无法找到分类 \"%s\"" ); diff --git a/lib/l10n/zh_HK.php b/lib/l10n/zh_HK.php new file mode 100644 index 00000000000..cfa33ec36f5 --- /dev/null +++ b/lib/l10n/zh_HK.php @@ -0,0 +1,13 @@ +<?php $TRANSLATIONS = array( +"Help" => "幫助", +"Personal" => "個人", +"Settings" => "設定", +"Users" => "用戶", +"Apps" => "軟件", +"Admin" => "管理", +"Files" => "文件", +"Text" => "文字", +"today" => "今日", +"yesterday" => "昨日", +"last month" => "前一月" +); diff --git a/lib/migrate.php b/lib/migrate.php index a0a329705a3..0b319177400 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -246,11 +246,20 @@ class OC_Migrate{ OC_Log::write( 'migration', 'User doesn\'t exist', OC_Log::ERROR ); return json_encode( array( 'success' => false ) ); } + + // Check if the username is valid + if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $json->exporteduser )) { + OC_Log::write( 'migration', 'Username is not valid', OC_Log::ERROR ); + return json_encode( array( 'success' => false ) ); + } + // Copy data $userfolder = $extractpath . $json->exporteduser; $newuserfolder = $datadir . '/' . self::$uid; foreach(scandir($userfolder) as $file){ if($file !== '.' && $file !== '..' && is_dir($file)) { + $file = str_replace(array('/', '\\'), '', $file); + // Then copy the folder over OC_Helper::copyr($userfolder.'/'.$file, $newuserfolder.'/'.$file); } diff --git a/lib/public/share.php b/lib/public/share.php index 59f41a9bfd6..8b8a41d47c0 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -199,6 +199,29 @@ class Share { } /** + * Get all users an item is shared with + * @param string Item type + * @param string Item source + * @param string Owner + * @param bool Include collections + * @return Return array of users + */ + public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false) { + $users = array(); + $items = self::getItems($itemType, $itemSource, null, null, $uidOwner, self::FORMAT_NONE, null, -1, $includeCollections); + if ($items) { + foreach ($items as $item) { + if ((int)$item['share_type'] === self::SHARE_TYPE_USER) { + $users[] = $item['share_with']; + } else if ((int)$item['share_type'] === self::SHARE_TYPE_GROUP) { + $users = array_merge($users, \OC_Group::usersInGroup($item['share_with'])); + } + } + } + return $users; + } + + /** * @brief Share an item with a user, group, or via private link * @param string Item type * @param string Item source @@ -383,6 +406,7 @@ class Share { \OC_Hook::emit('OCP\Share', 'pre_unshare', array( 'itemType' => $itemType, 'itemSource' => $itemSource, + 'fileSource' => $item['file_source'], 'shareType' => $shareType, 'shareWith' => $shareWith, )); @@ -759,7 +783,7 @@ class Share { if ($format == self::FORMAT_STATUSES) { if ($itemType == 'file' || $itemType == 'folder') { $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,' - .' `share_type`, `file_source`, `path`, `expiration`'; + .' `share_type`, `file_source`, `path`, `expiration`, `storage`'; } else { $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `expiration`'; } @@ -768,7 +792,7 @@ class Share { if ($itemType == 'file' || $itemType == 'folder') { $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`,' .' `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`,' - .' `expiration`, `token`'; + .' `expiration`, `token`, `storage`'; } else { $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`,' .' `stime`, `file_source`, `expiration`, `token`'; @@ -804,6 +828,7 @@ class Share { $items = array(); $targets = array(); $switchedItems = array(); + $mounts = array(); while ($row = $result->fetchRow()) { // Filter out duplicate group shares for users with unique targets if ($row['share_type'] == self::$shareTypeGroupUserUnique && isset($items[$row['parent']])) { @@ -848,8 +873,13 @@ class Share { if (isset($row['parent'])) { $row['path'] = '/Shared/'.basename($row['path']); } else { - // Strip 'files' from path - $row['path'] = substr($row['path'], 5); + if (!isset($mounts[$row['storage']])) { + $mounts[$row['storage']] = \OC\Files\Mount::findByNumericId($row['storage']); + } + if ($mounts[$row['storage']]) { + $path = $mounts[$row['storage']]->getMountPoint().$row['path']; + $row['path'] = substr($path, $root); + } } } if (isset($row['expiration'])) { @@ -957,15 +987,14 @@ class Share { return $items; } else if ($format == self::FORMAT_STATUSES) { $statuses = array(); - // Switch column to path for files and folders, used for determining statuses inside of folders - if ($itemType == 'file' || $itemType == 'folder') { - $column = 'path'; - } foreach ($items as $item) { if ($item['share_type'] == self::SHARE_TYPE_LINK) { - $statuses[$item[$column]] = true; + $statuses[$item[$column]]['link'] = true; } else if (!isset($statuses[$item[$column]])) { - $statuses[$item[$column]] = false; + $statuses[$item[$column]]['link'] = false; + } + if ($itemType == 'file' || $itemType == 'folder') { + $statuses[$item[$column]]['path'] = $item['path']; } } return $statuses; @@ -1102,20 +1131,6 @@ class Share { } else { $fileTarget = null; } - \OC_Hook::emit('OCP\Share', 'post_shared', array( - 'itemType' => $itemType, - 'itemSource' => $itemSource, - 'itemTarget' => $itemTarget, - 'parent' => $parent, - 'shareType' => self::$shareTypeGroupUserUnique, - 'shareWith' => $uid, - 'uidOwner' => $uidOwner, - 'permissions' => $permissions, - 'fileSource' => $fileSource, - 'fileTarget' => $fileTarget, - 'id' => $parent, - 'token' => $token - )); // Insert an extra row for the group share if the item or file target is unique for this user if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) { $query->execute(array($itemType, $itemSource, $itemTarget, $parent, @@ -1124,6 +1139,20 @@ class Share { $id = \OC_DB::insertid('*PREFIX*share'); } } + \OC_Hook::emit('OCP\Share', 'post_shared', array( + 'itemType' => $itemType, + 'itemSource' => $itemSource, + 'itemTarget' => $groupItemTarget, + 'parent' => $parent, + 'shareType' => $shareType, + 'shareWith' => $uid, + 'uidOwner' => $uidOwner, + 'permissions' => $permissions, + 'fileSource' => $fileSource, + 'fileTarget' => $groupFileTarget, + 'id' => $parent, + 'token' => $token + )); if ($parentFolder === true) { // Return parent folders to preserve file target paths for potential children return $parentFolders; diff --git a/lib/util.php b/lib/util.php index d8adfd99a47..e79daae8a0a 100755 --- a/lib/util.php +++ b/lib/util.php @@ -75,7 +75,7 @@ class OC_Util { public static function getVersion() { // hint: We only can count up. Reset minor/patchlevel when // updating major/minor version number. - return array(4, 97, 10); + return array(5, 80, 00); } /** @@ -83,7 +83,7 @@ class OC_Util { * @return string */ public static function getVersionString() { - return '5.0 RC 3'; + return '6.0 pre alpha'; } /** diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 6307bdc61b5..cf3d97da085 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -43,7 +43,7 @@ "Module 'fileinfo' missing" => "Modul 'fileinfo' fehlt ", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.", "Locale not working" => "Ländereinstellung funktioniert nicht", -"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für %s benötigten Pakete auf ihrem System zu installieren.", +"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für %s benötigten Pakete auf ihrem System zu installieren.", "Internet connection not working" => "Keine Netzwerkverbindung", "This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Du alle Funktionen von ownCloud nutzen möchtest.", "Cron" => "Cron", diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php index 13547c1430c..4406a722975 100644 --- a/settings/l10n/sl.php +++ b/settings/l10n/sl.php @@ -1,5 +1,5 @@ <?php $TRANSLATIONS = array( -"Unable to load list from App Store" => "Ni mogoče naložiti seznama iz App Store", +"Unable to load list from App Store" => "Ni mogoče naložiti seznama iz središča App Store", "Authentication error" => "Napaka overitve", "Unable to change display name" => "Prikazanega imena ni mogoče spremeniti.", "Group already exists" => "Skupina že obstaja", @@ -11,7 +11,7 @@ "Unable to delete user" => "Uporabnika ni mogoče izbrisati", "Language changed" => "Jezik je spremenjen", "Invalid request" => "Neveljavna zahteva", -"Admins can't remove themself from the admin group" => "Skrbniki se ne morejo odstraniti iz skupine admin", +"Admins can't remove themself from the admin group" => "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)", "Unable to add user to group %s" => "Uporabnika ni mogoče dodati k skupini %s", "Unable to remove user from group %s" => "Uporabnika ni mogoče odstraniti iz skupine %s", "Couldn't update app." => "Programa ni mogoče posodobiti.", @@ -45,8 +45,11 @@ "Locale not working" => "Jezikovne prilagoditve ne delujejo.", "This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Na strežniku ownCloud ni mogoče nastaviti jezikovnih določil na jezik %s. Najverjetneje so težave s posebnimi znaki v imenih datotek. Priporočljivo je namestiti zahtevane pakete za podporo jeziku %s.", "Internet connection not working" => "Internetna povezava ne deluje.", +"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Strežnik ownCloud je brez delujoče internetne povezave. To pomeni, da bodo nekatere možnosti onemogočene. Ne bo mogoče priklapljati zunanjih priklopnih točk, ne bo obvestil o posodobitvah ali namestitvah programske opreme, prav tako najverjetneje ne bo mogoče pošiljati obvestilnih sporočil preko elektronske pošte. Za uporabo vseh zmožnosti oblaka ownCloud, mora biti internetna povezava vzpostavljena in delujoča.", "Cron" => "Cron", "Execute one task with each page loaded" => "Izvedi eno nalogo z vsako naloženo stranjo.", +"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Datoteka cron.php je vpisana pri storitvi webcron. Preko protokola HTTP je datoteka cron.php, ki se nahaja v korenski mapi ownCloud, klicana enkrat na minuto.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Uporaba sistemske storitve cron. Preko sistemskega posla cron je datoteka cron.php, ki se nahaja v mapi ownCloud, klicana enkrat na minuto.", "Sharing" => "Souporaba", "Enable Share API" => "Omogoči API souporabe", "Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe", @@ -67,7 +70,7 @@ "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.", "Add your App" => "Dodaj program", "More Apps" => "Več programov", -"Select an App" => "Izberite program", +"Select an App" => "Izbor programa", "See application page at apps.owncloud.com" => "Obiščite spletno stran programa na apps.owncloud.com", "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-z dovoljenjem <span class=\"author\"></span>", "Update" => "Posodobi", @@ -81,7 +84,7 @@ "Get the apps to sync your files" => "Pridobi programe za usklajevanje datotek", "Show First Run Wizard again" => "Zaženi čarovnika prvega zagona", "Password" => "Geslo", -"Your password was changed" => "Vaše geslo je spremenjeno", +"Your password was changed" => "Geslo je spremenjeno", "Unable to change your password" => "Gesla ni mogoče spremeniti.", "Current password" => "Trenutno geslo", "New password" => "Novo geslo", @@ -96,7 +99,7 @@ "Language" => "Jezik", "Help translate" => "Sodelujte pri prevajanju", "WebDAV" => "WebDAV", -"Use this address to connect to your ownCloud in your file manager" => "Ta naslov uporabite za povezavo z oblakom ownCloud iz vašega upravljalnika datotek.", +"Use this address to connect to your ownCloud in your file manager" => "Ta naslov uporabite za povezavo upravljalnika datotek z oblakom ownCloud.", "Login Name" => "Prijavno ime", "Create" => "Ustvari", "Default Storage" => "Privzeta shramba", diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index dd70366557f..02b02f2066f 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -38,10 +38,21 @@ "Security Warning" => "Güvenlik Uyarisi", "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." => "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. Owncloud tarafından sağlanan .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz.", "Setup Warning" => "Kurulum Uyarısı", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.", "Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp", +"Locale not working" => "Locale çalışmıyor.", +"Internet connection not working" => "İnternet bağlantısı çalışmıyor", +"Cron" => "Cron", +"Sharing" => "Paylaşım", +"Enable Share API" => "Paylaşım API'sini etkinleştir.", +"Allow apps to use the Share API" => "Uygulamaların paylaşım API'sini kullanmasına izin ver", +"Allow links" => "Bağlantıları izin ver.", +"Allow users to share items to the public with links" => "Kullanıcıların nesneleri paylaşımı için herkese açık bağlantılara izin ver", "Allow resharing" => "Paylaşıma izin ver", "Security" => "Güvenlik", +"Enforce HTTPS" => "HTTPS bağlantısına zorla", "Log" => "Kayıtlar", +"Log level" => "Günlük seviyesi", "More" => "Daha fazla", "Version" => "Sürüm", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Geliştirilen Taraf<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is altında lisanslanmıştır <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", @@ -57,6 +68,7 @@ "Forum" => "Forum", "Bugtracker" => "Hata Takip Sistemi", "Commercial Support" => "Ticari Destek", +"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Kullandığınız:<strong>%s</strong> seçilebilecekler: <strong>%s</strong>", "Get the apps to sync your files" => "Dosyalarınızı senkronize etmek için uygulamayı indirin", "Show First Run Wizard again" => "İlk Çalıştırma Sihirbazını yeniden göster", "Password" => "Parola", diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php index 226ffb58bc7..a4b4ae7c579 100644 --- a/settings/l10n/zh_CN.php +++ b/settings/l10n/zh_CN.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "Unable to load list from App Store" => "无法从应用商店载入列表", "Authentication error" => "认证错误", +"Unable to change display name" => "无法修改显示名称", "Group already exists" => "已存在该组", "Unable to add group" => "无法添加组", "Could not enable app. " => "无法开启App", @@ -13,18 +14,57 @@ "Admins can't remove themself from the admin group" => "管理员不能将自己移出管理组。", "Unable to add user to group %s" => "无法把用户添加到组 %s", "Unable to remove user from group %s" => "无法从组%s中移除用户", +"Couldn't update app." => "无法更新 app。", +"Update to {appversion}" => "更新至 {appversion}", "Disable" => "禁用", "Enable" => "启用", +"Please wait...." => "请稍等....", +"Updating...." => "正在更新....", +"Error while updating app" => "更新 app 时出错", "Error" => "错误", +"Updated" => "已更新", "Saving..." => "正在保存", "deleted" => "已经删除", "undo" => "撤销", +"Unable to remove user" => "无法移除用户", "Groups" => "组", "Group Admin" => "组管理员", "Delete" => "删除", +"add group" => "添加组", +"A valid username must be provided" => "必须提供合法的用户名", +"Error creating user" => "创建用户出错", +"A valid password must be provided" => "必须提供合法的密码", "__language_name__" => "简体中文", "Security Warning" => "安全警告", "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." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器根目录以外。", +"Setup Warning" => "设置警告", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.", +"Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.", +"Module 'fileinfo' missing" => "模块'文件信息'丢失", +"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.", +"Locale not working" => "本地化无法工作", +"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "此ownCloud服务器无法设置系统本地化到%s. 这意味着可能文件名中有一些字符引起问题. 我们强烈建议在你系统上安装所需的软件包来支持%s", +"Internet connection not working" => "因特网连接无法工作", +"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "此ownCloud服务器上没有可用的因特网连接. 这意味着某些特性例如挂载外部存储器, 提醒更新或安装第三方应用无法工作. 从远程访问文件和发送提醒电子邮件可能也无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.", +"Cron" => "计划任务", +"Execute one task with each page loaded" => "每个页面加载后执行一个任务", +"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "使用系统定时任务服务。每分钟通过系统定时任务调用owncloud文件夹中的cron.php文件", +"Sharing" => "共享", +"Enable Share API" => "启用共享API", +"Allow apps to use the Share API" => "允许应用软件使用共享API", +"Allow links" => "允许链接", +"Allow users to share items to the public with links" => "允许用户使用连接公开共享项目", +"Allow resharing" => "允许再次共享", +"Allow users to share items shared with them again" => "允许用户将共享给他们的项目再次共享", +"Allow users to share with anyone" => "允许用户向任何人共享", +"Allow users to only share with users in their groups" => "允许用户只向同组用户共享", +"Security" => "安全", +"Enforce HTTPS" => "强制使用 HTTPS", +"Enforces the clients to connect to ownCloud via an encrypted connection." => "强制客户端通过加密连接连接到 ownCloud。", +"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "请经由HTTPS连接到这个ownCloud实例来启用或禁用强制SSL.", +"Log" => "日志", +"Log level" => "日志级别", "More" => "更多", "Version" => "版本", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发， <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。", @@ -42,12 +82,17 @@ "Commercial Support" => "商业支持", "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>", "Get the apps to sync your files" => "安装应用进行文件同步", +"Show First Run Wizard again" => "再次显示首次运行向导", "Password" => "密码", "Your password was changed" => "密码已修改", "Unable to change your password" => "无法修改密码", "Current password" => "当前密码", "New password" => "新密码", "Change password" => "修改密码", +"Display Name" => "显示名称", +"Your display name was changed" => "您的显示名称已修改", +"Unable to change your display name" => "无法修改您的显示名称", +"Change display name" => "修改显示名称", "Email" => "电子邮件", "Your email address" => "您的电子邮件", "Fill in an email address to enable password recovery" => "填写电子邮件地址以启用密码恢复功能", @@ -55,10 +100,13 @@ "Help translate" => "帮助翻译", "WebDAV" => "WebDAV", "Use this address to connect to your ownCloud in your file manager" => "用该地址来连接文件管理器中的 ownCloud", +"Login Name" => "登录名称", "Create" => "创建", "Default Storage" => "默认存储", "Unlimited" => "无限", "Other" => "其它", "Storage" => "存储", +"change display name" => "修改显示名称", +"set new password" => "设置新密码", "Default" => "默认" ); diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php new file mode 100644 index 00000000000..843a41c9c10 --- /dev/null +++ b/settings/l10n/zh_HK.php @@ -0,0 +1,8 @@ +<?php $TRANSLATIONS = array( +"Error" => "錯誤", +"Groups" => "群組", +"Delete" => "刪除", +"Password" => "密碼", +"New password" => "新密碼", +"Email" => "電郵" +); diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php index 51de004813a..e66a8740879 100644 --- a/tests/lib/archive/tar.php +++ b/tests/lib/archive/tar.php @@ -8,6 +8,7 @@ require_once 'archive.php'; +if (!OC_Util::runningOnWindows()) { class Test_Archive_TAR extends Test_Archive { protected function getExisting() { $dir = OC::$SERVERROOT . '/tests/data'; @@ -18,3 +19,4 @@ class Test_Archive_TAR extends Test_Archive { return new OC_Archive_TAR(OCP\Files::tmpFile('.tar.gz')); } } +} diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php index adddf81ee1b..e049a899d88 100644 --- a/tests/lib/archive/zip.php +++ b/tests/lib/archive/zip.php @@ -8,6 +8,7 @@ require_once 'archive.php'; +if (!OC_Util::runningOnWindows()) { class Test_Archive_ZIP extends Test_Archive { protected function getExisting() { $dir = OC::$SERVERROOT . '/tests/data'; @@ -18,3 +19,4 @@ class Test_Archive_ZIP extends Test_Archive { return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip')); } } +}
\ No newline at end of file diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php index f78f66d8b8a..3d68efea5fc 100644 --- a/tests/lib/files/storage/storage.php +++ b/tests/lib/files/storage/storage.php @@ -224,8 +224,7 @@ abstract class Storage extends \PHPUnit_Framework_TestCase { } public function testSearchInSubFolder() { - $this->instance->mkdir('sub') - ; + $this->instance->mkdir('sub'); $textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt'; $this->instance->file_put_contents('/sub/lorem.txt', file_get_contents($textFile, 'r')); $pngFile = \OC::$SERVERROOT . '/tests/data/logo-wide.png'; |