diff options
56 files changed, 597 insertions, 432 deletions
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index c155e79c211..a0238646b28 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -71,7 +71,7 @@ $TRANSLATIONS = array( "max. possible: " => "največ mogoče:", "Save" => "Shrani", "WebDAV" => "WebDAV", -"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>.", +"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek peko sistema WebDAV</a>.", "New" => "Novo", "New text file" => "Nova besedilna datoteka", "Text file" => "Besedilna datoteka", @@ -85,6 +85,6 @@ $TRANSLATIONS = array( "Upload too large" => "Prekoračenje omejitve velikosti", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.", "Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...", -"Currently scanning" => "Trenutno preverjam" +"Currently scanning" => "Poteka preverjanje" ); $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"; diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php index f8bed2f720b..2c88589bf9d 100644 --- a/apps/files_encryption/l10n/es.php +++ b/apps/files_encryption/l10n/es.php @@ -17,6 +17,7 @@ $TRANSLATIONS = array( "Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:", "Initial encryption started... This can take some time. Please wait." => "Encriptación iniciada..... Esto puede tomar un tiempo. Por favor espere.", "Initial encryption running... Please try again later." => "Cifrado inicial en curso... Inténtelo más tarde.", +"Go directly to your %spersonal settings%s." => "Ir directamente a %sOpciones%s.", "Encryption" => "Cifrado", "Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);", "Recovery key password" => "Contraseña de clave de recuperación", diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php index 0701b47bcfa..70339801f0c 100644 --- a/apps/files_external/l10n/zh_TW.php +++ b/apps/files_external/l10n/zh_TW.php @@ -3,9 +3,18 @@ $TRANSLATIONS = array( "External storage" => "外部儲存", "Local" => "本地", "Location" => "地點", +"Amazon S3" => "Amazon S3", +"Key" => "鑰", +"Secret" => "密", +"Secret Key" => "密鑰", +"Hostname (optional)" => "主機名稱 (選填)", +"Port (optional)" => "埠號 (選填)", +"Region (optional)" => "區域 (選填)", +"Enable SSL" => "啟用 SSL", "Host" => "主機", "Username" => "使用者名稱:", "Password" => "密碼", +"Username (required)" => "使用者名稱 (必填)", "Share" => "分享", "URL" => "URL", "Access granted" => "允許存取", @@ -14,18 +23,28 @@ $TRANSLATIONS = array( "Please provide a valid Dropbox app key and secret." => "請提供有效的 Dropbox app key 和 app secret 。", "Error configuring Google Drive storage" => "設定 Google Drive 儲存時發生錯誤", "Personal" => "個人", +"System" => "系統", "Saved" => "已儲存", +"<b>Note:</b> " => "<b>警告:</b> ", +" and " => "與", +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>警告:</b> PHP 並未啓用 Curl 的支援,因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。", +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>警告</b>:PHP 並未啓用 FTP 的支援,因此無法掛載 %s,請洽您的系統管理員將其安裝並啓用。", +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>警告</b>並未安裝 \"%s\",因此無法掛載 %s。請洽您的系統管理員將其安裝並啓用。", +"You don't have any external storages" => "您沒有任何外部儲存", "Name" => "名稱", "External Storage" => "外部儲存", "Folder name" => "資料夾名稱", "Configuration" => "設定", "Options" => "選項", +"Available for" => "可用的", "Add storage" => "增加儲存區", +"No user or group" => "沒有使用者或群組", "All Users" => "所有使用者", "Groups" => "群組", "Users" => "使用者", "Delete" => "刪除", "Enable User External Storage" => "啓用使用者外部儲存", +"Allow users to mount the following external storage" => "允許使用者自行掛載以下的外部儲存", "SSL root certificates" => "SSL 根憑證", "Import Root Certificate" => "匯入根憑證" ); diff --git a/apps/files_sharing/js/external.js b/apps/files_sharing/js/external.js index 5c476b2d43d..a142819b112 100644 --- a/apps/files_sharing/js/external.js +++ b/apps/files_sharing/js/external.js @@ -8,13 +8,6 @@ * */ (function () { - var getParameterByName = function (query, name) { - name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]"); - var regex = new RegExp("[\\#&]" + name + "=([^&#]*)"), - results = regex.exec(query); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); - }; - var addExternalShare = function (remote, token, owner, name, password) { return $.post(OC.generateUrl('apps/files_sharing/external'), { remote: remote, @@ -25,7 +18,16 @@ }); }; - var showAddExternalDialog = function (remote, token, owner, name, passwordProtected) { + /** + * Shows "add external share" dialog. + * + * @param {String} remote remote server URL + * @param {String} owner owner name + * @param {String} name name of the shared folder + * @param {String} token authentication token + * @param {bool} passwordProtected true if the share is password protected + */ + OCA.Sharing.showAddExternalDialog = function (remote, token, owner, name, passwordProtected) { var remoteClean = (remote.substr(0, 8) === 'https://') ? remote.substr(8) : remote.substr(7); var callback = function (add, password) { password = password || ''; @@ -47,25 +49,23 @@ , 'Add Share', callback, true, 'Password', true); } }; - - OCA.Sharing.showAddExternalDialog = function (hash) { - var remote = getParameterByName(hash, 'remote'); - var owner = getParameterByName(hash, 'owner'); - var name = getParameterByName(hash, 'name'); - var token = getParameterByName(hash, 'token'); - var passwordProtected = parseInt(getParameterByName(hash, 'protected'), 10); - - if (remote && token && owner && name) { - showAddExternalDialog(remote, token, owner, name, passwordProtected); - } - }; })(); $(document).ready(function () { // FIXME: HACK: do not init when running unit tests, need a better way if (!window.TESTING && OCA.Files) {// only run in the files app - var hash = location.hash; - location.hash = ''; - OCA.Sharing.showAddExternalDialog(hash); + var params = OC.Util.History.parseUrlQuery(); + if (params.remote && params.token && params.owner && params.name) { + // clear hash, it is unlikely that it contain any extra parameters + location.hash = ''; + params.passwordProtected = parseInt(params.passwordProtected, 10) === 1; + OCA.Sharing.showAddExternalDialog( + params.remote, + params.token, + params.owner, + params.name, + params.passwordProtected + ); + } } }); diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php index 6e8d055446a..117b97eb942 100644 --- a/apps/files_sharing/l10n/es.php +++ b/apps/files_sharing/l10n/es.php @@ -1,11 +1,14 @@ <?php $TRANSLATIONS = array( +"Server to server sharing is not enabled on this server" => "Compartir entre servidores no está habilitado en este servidor", +"Couldn't add remote share" => "No se puede añadir un compartido remoto", "Shared with you" => "Compartido contigo", "Shared with others" => "Compartido con otros", "Shared by link" => "Compartido por medio de enlaces", "No files have been shared with you yet." => "Aún no han compartido contigo ningún archivo.", "You haven't shared any files yet." => "Aún no has compartido ningún archivo.", "You haven't shared any files by link yet." => "Usted todavía no ha compartido ningún archivo por medio de enlaces.", +"Add {name} from {owner}@{remote}" => "Añadir {name} desde {owner}@{remote}", "No ownCloud installation found at {remote}" => "No se encontró una instalación de ownCloud en {remote}", "Invalid ownCloud url" => "URL de ownCloud inválido", "Shared by {owner}" => "Compartido por {owner}", @@ -27,6 +30,8 @@ $TRANSLATIONS = array( "Download" => "Descargar", "Download %s" => "Descargar %s", "Direct link" => "Enlace directo", -"File Sharing" => "Compartir archivos" +"File Sharing" => "Compartir archivos", +"Allow other instances to mount public links shared from this server" => "Permitir a otros montar enlaces publicos compartidos de este servidor", +"Allow users to mount public link shares" => "Permitir a los usuarios montar enlaces publicos compartidos" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/l10n/ja.php b/apps/files_sharing/l10n/ja.php index 43c8f1c06d6..27fa30005a5 100644 --- a/apps/files_sharing/l10n/ja.php +++ b/apps/files_sharing/l10n/ja.php @@ -2,12 +2,12 @@ $TRANSLATIONS = array( "Server to server sharing is not enabled on this server" => "このサーバーでは、サーバー間の共有が有効ではありません", "Couldn't add remote share" => "リモート共有を追加できませんでした", -"Shared with you" => "あなたと共有", -"Shared with others" => "他人と共有", -"Shared by link" => "URLリンクで共有済", -"No files have been shared with you yet." => "まだ共有を行なっているファイルはありません。", -"You haven't shared any files yet." => "まだ共有を行なっているファイルはありません。", -"You haven't shared any files by link yet." => "まだURLリンクで共有を行なっているファイルはありません。", +"Shared with you" => "他ユーザーがあなたと共有中", +"Shared with others" => "他ユーザーと共有中", +"Shared by link" => "URLリンクで共有中", +"No files have been shared with you yet." => "他のユーザーがあなたと共有しているファイルはありません。", +"You haven't shared any files yet." => "他のユーザーと共有しているファイルはありません。", +"You haven't shared any files by link yet." => "URLリンクで共有しているファイルはありません。", "Add {name} from {owner}@{remote}" => "{owner}@{remote} から {name} を追加", "No ownCloud installation found at {remote}" => "{remote} には ownCloud がインストールされていません", "Invalid ownCloud url" => "無効な ownCloud URL です", @@ -22,7 +22,7 @@ $TRANSLATIONS = array( "Reasons might be:" => "理由は以下の通りと考えられます:", "the item was removed" => "アイテムが削除されました", "the link expired" => "リンクの期限が切れています", -"sharing is disabled" => "共有が無効になっています", +"sharing is disabled" => "共有は無効になっています", "For more info, please ask the person who sent this link." => "不明な点は、こちらのリンクの提供者に確認をお願いします。", "Save to ownCloud" => "ownCloud に保存", "example.com/owncloud" => "example.com/owncloud", @@ -31,7 +31,7 @@ $TRANSLATIONS = array( "Download %s" => "%s をダウンロード", "Direct link" => "リンク", "File Sharing" => "ファイル共有", -"Allow other instances to mount public links shared from this server" => "このサーバの公開共有リンクを他のインスタンスからマウントできるようにする", -"Allow users to mount public link shares" => "ユーザが公開共有リンクをマウントできるようにする" +"Allow other instances to mount public links shared from this server" => "このサーバにおけるURLでの共有を他のインスタンスからマウントできるようにする", +"Allow users to mount public link shares" => "ユーザーがURLでの共有をマウントできるようにする" ); $PLURAL_FORMS = "nplurals=1; plural=0;"; diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php index de6644cd385..0f229d91945 100644 --- a/apps/files_sharing/l10n/nl.php +++ b/apps/files_sharing/l10n/nl.php @@ -1,5 +1,7 @@ <?php $TRANSLATIONS = array( +"Server to server sharing is not enabled on this server" => "Server met server delen is niet geactiveerd op deze server", +"Couldn't add remote share" => "Kon geen externe share toevoegen", "Shared with you" => "Deelde met u", "Shared with others" => "Deelde met anderen", "Shared by link" => "Gedeeld via een link", @@ -7,6 +9,7 @@ $TRANSLATIONS = array( "You haven't shared any files yet." => "U hebt nog geen bestanden gedeeld.", "You haven't shared any files by link yet." => "U hebt nog geen bestanden via een link gedeeld.", "Add {name} from {owner}@{remote}" => "Toevoegen {name} van {owner}@{remote}", +"No ownCloud installation found at {remote}" => "Geen ownCloud installatie gevonden op {remote}", "Invalid ownCloud url" => "Ongeldige ownCloud url", "Shared by {owner}" => "Gedeeld door {owner}", "Shared by" => "Gedeeld door", @@ -27,6 +30,8 @@ $TRANSLATIONS = array( "Download" => "Downloaden", "Download %s" => "Download %s", "Direct link" => "Directe link", -"File Sharing" => "Bestand delen" +"File Sharing" => "Bestand delen", +"Allow other instances to mount public links shared from this server" => "Toestaan dat andere oanClouds openbaar gedeelde links mounten vanaf deze server", +"Allow users to mount public link shares" => "Toestaan dat gebruikers openbaar gedeelde links mounten" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 7a6b70d82b5..6bc9e131949 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -95,9 +95,9 @@ class Shared_Cache extends Cache { } $data['uid_owner'] = $this->storage->getOwner($file); if (isset($data['permissions'])) { - $data['permissions'] &= $this->storage->getPermissions(''); + $data['permissions'] &= $this->storage->getPermissions($file); } else { - $data['permissions'] = $this->storage->getPermissions(''); + $data['permissions'] = $this->storage->getPermissions($file); } return $data; } @@ -163,7 +163,7 @@ class Shared_Cache extends Cache { $sourceFolderContent[$key]['path'] = $dir . $c['name']; $sourceFolderContent[$key]['uid_owner'] = $parent['uid_owner']; $sourceFolderContent[$key]['displayname_owner'] = $parent['uid_owner']; - $sourceFolderContent[$key]['permissions'] = $sourceFolderContent[$key]['permissions'] & $this->storage->getPermissions(''); + $sourceFolderContent[$key]['permissions'] = $sourceFolderContent[$key]['permissions'] & $this->storage->getPermissions($dir . $c['name']); } return $sourceFolderContent; diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php index 2cbc412d261..299e471a3fd 100644 --- a/apps/files_sharing/tests/permissions.php +++ b/apps/files_sharing/tests/permissions.php @@ -145,10 +145,9 @@ class Test_Files_Sharing_Permissions extends Test_Files_Sharing_Base { $this->assertEquals(27, $contents[1]['permissions']); $contents = $this->secondView->getDirectoryContent('files/shareddirrestricted'); $this->assertEquals('subdir', $contents[0]['name']); - $this->assertEquals(7 | \OCP\PERMISSION_DELETE, $contents[0]['permissions']); + $this->assertEquals(7, $contents[0]['permissions']); $this->assertEquals('textfile1.txt', $contents[1]['name']); // 3 is correct because create is reserved to folders only - // delete permissions are added since mount points can always be deleted - $this->assertEquals(3 | \OCP\PERMISSION_DELETE, $contents[1]['permissions']); + $this->assertEquals(3, $contents[1]['permissions']); } } diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php index b80ab6b4f14..27f3b5150d5 100644 --- a/apps/files_sharing/tests/sharedstorage.php +++ b/apps/files_sharing/tests/sharedstorage.php @@ -166,4 +166,35 @@ class Test_Files_Sharing_Storage extends Test_Files_Sharing_Base { $this->assertTrue($result); } + function testGetPermissions() { + $fileinfoFolder = $this->view->getFileInfo($this->folder); + + $result = \OCP\Share::shareItem('folder', $fileinfoFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, + self::TEST_FILES_SHARING_API_USER2, 1); + $this->assertTrue($result); + + self::loginHelper(self::TEST_FILES_SHARING_API_USER2); + + $this->assertTrue(\OC\Files\Filesystem::is_dir($this->folder)); + + // for the share root we expect: + // the shared permissions (1) + // the delete permission (8), to enable unshare + // the update permission (2), to allow renaming of the mount point + $rootInfo = \OC\Files\Filesystem::getFileInfo($this->folder); + $this->assertSame(11, $rootInfo->getPermissions()); + + // for the file within the shared folder we expect: + // the shared permissions (1) + $subfileInfo = \OC\Files\Filesystem::getFileInfo($this->folder . $this->filename); + $this->assertSame(1, $subfileInfo->getPermissions()); + + + //cleanup + self::loginHelper(self::TEST_FILES_SHARING_API_USER1); + $result = \OCP\Share::unshare('folder', $fileinfoFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, + self::TEST_FILES_SHARING_API_USER2); + $this->assertTrue($result); + } + } diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php index d0b6ab8fb0d..60aebba7dcc 100644 --- a/apps/user_ldap/l10n/sl.php +++ b/apps/user_ldap/l10n/sl.php @@ -28,8 +28,11 @@ $TRANSLATIONS = array( "Confirm Deletion" => "Potrdi brisanje", "_%s group found_::_%s groups found_" => array("%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"), "_%s user found_::_%s users found_" => array("%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"), -"Invalid Host" => "Neveljaven gostitelj", "Could not find the desired feature" => "Želene zmožnosti ni mogoče najti", +"Invalid Host" => "Neveljaven gostitelj", +"Server" => "Strežnik", +"User Filter" => "Uporabniški filter", +"Login Filter" => "Filter prijave", "Group Filter" => "Filter skupin", "Save" => "Shrani", "Test Configuration" => "Preizkusne nastavitve", @@ -45,6 +48,7 @@ $TRANSLATIONS = array( "Other Attributes:" => "Drugi atributi:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"", "Add Server Configuration" => "Dodaj nastavitve strežnika", +"Delete Configuration" => "Izbriši nastavitve", "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://", "Port" => "Vrata", diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index d289627bead..ca5d1386995 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -724,10 +724,18 @@ class Access extends LDAPUtility implements user\IUserTools { } /** - * prepares and executes an LDAP search operation - * @param string $filter the LDAP filter for the search - * @param array $base an array containing the LDAP subtree(s) that shall be searched - * @param string|string[] $attr optional, array, one or more attributes that shall be + * returns the number of available groups + * @param string $filter the LDAP search filter + * @param string[] $attr optional + * @param int|null $limit + * @param int|null $offset + * @return int|bool + */ + public function countGroups($filter, $attr = array('dn'), $limit = null, $offset = null) { + return $this->count($filter, $this->connection->ldapBaseGroups, $attr, $limit, $offset); + } + + /** * retrieved. Results will according to the order in the array. * @param int $limit optional, maximum results to be counted * @param int $offset optional, a starting point @@ -827,7 +835,7 @@ class Access extends LDAPUtility implements user\IUserTools { \OCP\Util::writeLog('user_ldap', 'Count filter: '.print_r($filter, true), \OCP\Util::DEBUG); if(is_null($limit)) { - $limit = $this->connection->ldapPagingSize; + $limit = intval($this->connection->ldapPagingSize); } $counter = 0; @@ -1026,9 +1034,10 @@ class Access extends LDAPUtility implements user\IUserTools { } /** - * combines the input filters with AND + * combines the input filters with OR * @param string[] $filters the filters to connect * @return string the combined filter + * Combines Filter arguments with OR */ public function combineFilterWithOr($filters) { return $this->combineFilter($filters, '|'); diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 52f6c5ceb10..bafb0e0b895 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -41,11 +41,13 @@ class Connection extends LDAPUtility { protected $doNotValidate = false; + protected $ignoreValidation = false; + /** * Constructor * @param ILDAPWrapper $ldap * @param string $configPrefix a string with the prefix for the configkey column (appconfig table) - * @param string $configID a string with the value for the appid column (appconfig table) or null for on-the-fly connections + * @param string|null $configID a string with the value for the appid column (appconfig table) or null for on-the-fly connections */ public function __construct(ILDAPWrapper $ldap, $configPrefix = '', $configID = 'user_ldap') { parent::__construct($ldap); @@ -117,6 +119,16 @@ class Connection extends LDAPUtility { } /** + * sets whether the result of the configuration validation shall + * be ignored when establishing the connection. Used by the Wizard + * in early configuration state. + * @param bool $state + */ + public function setIgnoreValidation($state) { + $this->ignoreValidation = (bool)$state; + } + + /** * initializes the LDAP backend * @param bool $force read the config settings no matter what */ @@ -466,7 +478,7 @@ class Connection extends LDAPUtility { if(!$phpLDAPinstalled) { return false; } - if(!$this->configured) { + if(!$this->ignoreValidation && !$this->configured) { \OCP\Util::writeLog('user_ldap', 'Configuration is invalid, cannot connect', \OCP\Util::WARN); diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index b8a0e5ad799..42d612fa736 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -64,39 +64,53 @@ class Wizard extends LDAPUtility { } /** - * @return WizardResult - * @throws \Exception + * counts entries in the LDAP directory + * @param string $filter the LDAP search filter + * @param string $type a string being either 'users' or 'groups'; + * @return int|bool */ - public function countGroups() { - if(!$this->checkRequirements(array('ldapHost', - 'ldapPort', - 'ldapBase', - ))) { - return false; + public function countEntries($filter, $type) { + $reqs = array('ldapHost', 'ldapPort', 'ldapBase'); + if($type === 'users') { + $reqs[] = 'ldapUserFilter'; + } + if(!$this->checkRequirements($reqs)) { + throw new \Exception('Requirements not met', 400); } - $base = $this->configuration->ldapBase[0]; + $ldapAccess = $this->getAccess(); + if($type === 'groups') { + $result = $ldapAccess->countGroups($filter); + } else if($type === 'users') { + $result = $ldapAccess->countUsers($filter); + } else { + throw new \Exception('internal error: invald object type', 500); + } + + return $result; + } + + public function countGroups() { $filter = $this->configuration->ldapGroupFilter; - \OCP\Util::writeLog('user_ldap', 'Wiz: g filter '. print_r($filter, true), \OCP\Util::DEBUG); - $l = \OC_L10N::get('user_ldap'); + if(empty($filter)) { - $output = $l->n('%s group found', '%s groups found', 0, array(0)); + $output = self::$l->n('%s group found', '%s groups found', 0, array(0)); $this->result->addChange('ldap_group_count', $output); return $this->result; } - $cr = $this->getConnection(); - if(!$cr) { - throw new \Exception('Could not connect to LDAP'); - } - $rr = $this->ldap->search($cr, $base, $filter, array('dn')); - if(!$this->ldap->isResource($rr)) { + + try { + $groupsTotal = $this->countEntries($filter, 'groups'); + } catch (\Exception $e) { + //400 can be ignored, 500 is forwarded + if($e->getCode() === 500) { + throw $e; + } return false; } - $entries = $this->ldap->countEntries($cr, $rr); - $entries = ($entries !== false) ? $entries : 0; - $output = $l->n('%s group found', '%s groups found', $entries, $entries); + $groupsTotal = ($groupsTotal !== false) ? $groupsTotal : 0; + $output = self::$l->n('%s group found', '%s groups found', $groupsTotal, $groupsTotal); $this->result->addChange('ldap_group_count', $output); - return $this->result; } @@ -105,31 +119,12 @@ class Wizard extends LDAPUtility { * @throws \Exception */ public function countUsers() { - if(!$this->checkRequirements(array('ldapHost', - 'ldapPort', - 'ldapBase', - 'ldapUserFilter', - ))) { - return false; - } - - $cr = $this->getConnection(); - if(!$cr) { - throw new \Exception('Could not connect to LDAP'); - } - - $base = $this->configuration->ldapBase[0]; $filter = $this->configuration->ldapUserFilter; - $rr = $this->ldap->search($cr, $base, $filter, array('dn')); - if(!$this->ldap->isResource($rr)) { - return false; - } - $entries = $this->ldap->countEntries($cr, $rr); - $entries = ($entries !== false) ? $entries : 0; - $l = \OC_L10N::get('user_ldap'); - $output = $l->n('%s user found', '%s users found', $entries, $entries); - $this->result->addChange('ldap_user_count', $output); + $usersTotal = $this->countEntries($filter, 'users'); + $usersTotal = ($usersTotal !== false) ? $usersTotal : 0; + $output = self::$l->n('%s user found', '%s users found', $usersTotal, $usersTotal); + $this->result->addChange('ldap_user_count', $output); return $this->result; } @@ -273,8 +268,7 @@ class Wizard extends LDAPUtility { throw new \Exception('Could not connect to LDAP'); } - $obClasses = array('posixGroup', 'group', 'zimbraDistributionList', '*'); - $this->determineFeature($obClasses, 'cn', $dbKey, $confKey); + $this->fetchGroups($dbKey, $confKey); if($testMemberOf) { $this->configuration->hasMemberOfFilterSupport = $this->testMemberOf(); @@ -288,9 +282,48 @@ class Wizard extends LDAPUtility { } /** - * @return bool|WizardResult - * @throws \Exception + * fetches all groups from LDAP + * @param string $dbKey + * @param string $confKey */ + public function fetchGroups($dbKey, $confKey) { + $obclasses = array('posixGroup', 'group', 'zimbraDistributionList', 'groupOfNames'); + $ldapAccess = $this->getAccess(); + + $filterParts = array(); + foreach($obclasses as $obclass) { + $filterParts[] = 'objectclass='.$obclass; + } + //we filter for everything + //- that looks like a group and + //- has the group display name set + $filter = $ldapAccess->combineFilterWithOr($filterParts); + $filter = $ldapAccess->combineFilterWithAnd(array($filter, 'cn=*')); + + $limit = 400; + $offset = 0; + do { + $result = $ldapAccess->searchGroups($filter, array('cn'), $limit, $offset); + foreach($result as $item) { + $groups[] = $item[0]; + } + $offset += $limit; + } while (count($groups) > 0 && count($groups) % $limit === 0); + + if(count($groups) > 0) { + natsort($groups); + $this->result->addOptions($dbKey, array_values($groups)); + } else { + throw new \Exception(self::$l->t('Could not find the desired feature')); + } + + $setFeatures = $this->configuration->$confKey; + if(is_array($setFeatures) && !empty($setFeatures)) { + //something is already configured? pre-select it. + $this->result->addChange($dbKey, $setFeatures); + } + } + public function determineGroupMemberAssoc() { if(!$this->checkRequirements(array('ldapHost', 'ldapPort', @@ -909,15 +942,13 @@ class Wizard extends LDAPUtility { * specified attribute * @param string[] $filters array, the filters that shall be used in the search * @param string $attr the attribute of which a list of values shall be returned - * @param bool $lfw whether the last filter is a wildcard which shall not - * be processed if there were already findings, defaults to true * @param int $dnReadLimit the amount of how many DNs should be analyzed. * The lower, the faster * @param string $maxF string. if not null, this variable will have the filter that * yields most result entries * @return array|false an array with the values on success, false otherwise */ - public function cumulativeSearchOnAttribute($filters, $attr, $lfw = true, $dnReadLimit = 3, &$maxF = null) { + public function cumulativeSearchOnAttribute($filters, $attr, $dnReadLimit = 3, &$maxF = null) { $dnRead = array(); $foundItems = array(); $maxEntries = 0; @@ -935,7 +966,7 @@ class Wizard extends LDAPUtility { $lastFilter = $filters[count($filters)-1]; } foreach($filters as $filter) { - if($lfw && $lastFilter === $filter && count($foundItems) > 0) { + if($lastFilter === $filter && count($foundItems) > 0) { //skip when the filter is a wildcard and results were found continue; } @@ -1005,16 +1036,11 @@ class Wizard extends LDAPUtility { //how deep to dig? //When looking for objectclasses, testing few entries is sufficient, - //when looking for group we need to get all names, though. - if(strtolower($attr) === 'objectclass') { - $dig = 3; - } else { - $dig = 0; - } + $dig = 3; $availableFeatures = $this->cumulativeSearchOnAttribute($objectclasses, $attr, - true, $dig, $maxEntryObjC); + $dig, $maxEntryObjC); if(is_array($availableFeatures) && count($availableFeatures) > 0) { natcasesort($availableFeatures); @@ -1073,6 +1099,27 @@ class Wizard extends LDAPUtility { } /** + * creates and returns an Access instance + * @return \OCA\user_ldap\lib\Access + */ + private function getAccess() { + $con = new Connection($this->ldap, '', null); + $con->setConfiguration($this->configuration->getConfiguration()); + $con->ldapConfigurationActive = true; + $con->setIgnoreValidation(true); + + $userManager = new user\Manager( + \OC::$server->getConfig(), + new FilesystemHelper(), + new LogWrapper(), + \OC::$server->getAvatarManager(), + new \OCP\Image()); + + $ldapAccess = new Access($con, $this->ldap, $userManager); + return $ldapAccess; + } + + /** * @return bool|mixed */ private function getConnection() { diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php index 2b5cabc705d..ff5ee010b71 100644 --- a/apps/user_ldap/tests/wizard.php +++ b/apps/user_ldap/tests/wizard.php @@ -127,7 +127,7 @@ class Test_Wizard extends \PHPUnit_Framework_TestCase { # The following expectations are the real test # $filters = array('f1', 'f2', '*'); - $wizard->cumulativeSearchOnAttribute($filters, 'cn', true, 5); + $wizard->cumulativeSearchOnAttribute($filters, 'cn', 5); unset($uidnumber); } @@ -203,8 +203,8 @@ class Test_Wizard extends \PHPUnit_Framework_TestCase { # The following expectations are the real test # $filters = array('f1', 'f2', '*'); - $wizard->cumulativeSearchOnAttribute($filters, 'cn', true, 0); + $wizard->cumulativeSearchOnAttribute($filters, 'cn', 0); unset($uidnumber); } -}
\ No newline at end of file +} diff --git a/core/js/js.js b/core/js/js.js index a8dd9ca889d..544b26647a9 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1411,6 +1411,10 @@ OC.Util.History = { if (pos >= 0) { return hash.substr(pos + 1); } + if (hash.length) { + // remove hash sign + return hash.substr(1); + } return ''; }, diff --git a/core/l10n/es.php b/core/l10n/es.php index 09f8b2c29e7..08d82867383 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -49,6 +49,7 @@ $TRANSLATIONS = array( "years ago" => "hace años", "Couldn't send reset email. Please contact your administrator." => "El mail de reset no pudo ser enviado. Por favor, contacte con su administrador.", "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Un enlace para reestablecer su contraseña ha sido enviado a su email. Si usted no lo recibe en un tiempo razonable, revise tu carpeta spam/correo no deseado.<br>Si no lo encuentra, pregunte a su administrador local.", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Sus archivos están encriptados. Si no ha habilitado la clave de recuperación, no habrá manera de recuperar los datos despues de un reset de la contraseña. .<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?", "I know what I'm doing" => "Yo soy consciente de lo que estoy haciendo", "Reset password" => "Restablecer contraseña", "Password can not be changed. Please contact your administrator." => "La contraseña no se puede cambiar. Por favor, contacte con su administrador.", @@ -125,6 +126,9 @@ $TRANSLATIONS = array( "Please reload the page." => "Recargue/Actualice la página", "The update was unsuccessful." => "Falló la actualización", "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.", +"Couldn't reset password because the token is invalid" => "No se puede restablecer la contraseña porque el token no es válido", +"Couldn't send reset email. Please make sure your username is correct." => "No se pudo resetear su correo electrónico. Por favor, asegúrese de que su nombre de usuario es correcto.", +"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "No se pudo resetear su correo electrónico, porque no hay una dirección de correo electrónico asociada para este nombre de usuario. Por favor, póngase en contacto con su administrador.", "%s password reset" => "%s restablecer contraseña", "Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}", "You will receive a link to reset your password via Email." => "Recibirá un enlace por correo electrónico para restablecer su contraseña", diff --git a/core/l10n/ja.php b/core/l10n/ja.php index d9ef2593c5c..80e83eb6883 100644 --- a/core/l10n/ja.php +++ b/core/l10n/ja.php @@ -87,10 +87,10 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "{owner} と共有中", "Share with user or group …" => "ユーザーもしくはグループと共有 ...", "Share link" => "URLで共有", -"The public link will expire no later than {days} days after it is created" => "公開用リンクは、作成してから {days} 日以内に有効期限切れになります", -"By default the public link will expire after {days} days" => "デフォルトの設定では、公開用リンクは {days} 日後に有効期限切れになります", -"Password protect" => "パスワード保護", -"Choose a password for the public link" => "公開用リンクのパスワードを選択", +"The public link will expire no later than {days} days after it is created" => "URLによる共有は、作成してから {days} 日以内に有効期限切れになります", +"By default the public link will expire after {days} days" => "デフォルトの設定では、URLによる共有は {days} 日後に有効期限切れになります", +"Password protect" => "パスワード保護を有効化", +"Choose a password for the public link" => "URLによる共有のパスワードを入力", "Allow Public Upload" => "アップロードを許可", "Email link to person" => "メールリンク", "Send" => "送信", diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 7c977ae71d7..599f05f4521 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -47,7 +47,12 @@ $TRANSLATIONS = array( "_%n month ago_::_%n months ago_" => array("","%n maanden geleden"), "last year" => "vorig jaar", "years ago" => "jaar geleden", +"Couldn't send reset email. Please contact your administrator." => "Kon herstel e-mail niet versturen. Neem contact op met uw beheerder.", +"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammapje. <br>Als het daar niet in zit, neem dan contact op met uw beheerder.", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, dan is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?", +"I know what I'm doing" => "Ik weet wat ik doe", "Reset password" => "Reset wachtwoord", +"Password can not be changed. Please contact your administrator." => "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.", "Yes" => "Ja", "No" => "Nee", "Choose" => "Kies", @@ -121,6 +126,9 @@ $TRANSLATIONS = array( "Please reload the page." => "Herlaad deze pagina.", "The update was unsuccessful." => "De update is niet geslaagd.", "The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.", +"Couldn't reset password because the token is invalid" => "Kon het wachtwoord niet herstellen omdat het token ongeldig is", +"Couldn't send reset email. Please make sure your username is correct." => "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is.", +"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Kon wachtwoordherstel e-mailbericht niet versturen, omdat er geen e-mailadres bekend is voor deze gebruikersnaam. Neem contact op met uw beheerder.", "%s password reset" => "%s wachtwoord reset", "Use the following link to reset your password: {link}" => "Gebruik de volgende link om uw wachtwoord te resetten: {link}", "You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.", @@ -129,6 +137,7 @@ $TRANSLATIONS = array( "Yes, I really want to reset my password now" => "Ja, ik wil mijn wachtwoord nu echt resetten", "Reset" => "Reset", "New password" => "Nieuw wachtwoord", +"New Password" => "Nieuw wachtwoord", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!", "For the best results, please consider using a GNU/Linux server instead." => "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.", "Personal" => "Persoonlijk", @@ -177,6 +186,7 @@ $TRANSLATIONS = array( "Please change your password to secure your account again." => "Wijzig uw wachtwoord zodat uw account weer beveiligd is.", "Server side authentication failed!" => "Authenticatie bij de server mislukte!", "Please contact your administrator." => "Neem contact op met uw systeembeheerder.", +"Forgot your password? Reset it!" => "Wachtwoord vergeten? Herstel het!", "remember" => "onthoud gegevens", "Log in" => "Meld u aan", "Alternative Logins" => "Alternatieve inlogs", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index 4fe12d76021..0f9f66e3d1e 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -33,6 +33,7 @@ $TRANSLATIONS = array( "File" => "Datoteka", "Folder" => "Mapa", "Image" => "Slika", +"Audio" => "Zvok", "Saving..." => "Poteka shranjevanje ...", "seconds ago" => "pred nekaj sekundami", "_%n minute ago_::_%n minutes ago_" => array("pred %n minuto","pred %n minutama","pred %n minutami","pred %n minutami"), @@ -45,6 +46,7 @@ $TRANSLATIONS = array( "last year" => "lansko leto", "years ago" => "let nazaj", "Reset password" => "Ponastavi geslo", +"Password can not be changed. Please contact your administrator." => "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.", "Yes" => "Da", "No" => "Ne", "Choose" => "Izbor", @@ -111,6 +113,7 @@ $TRANSLATIONS = array( "Error loading dialog template: {error}" => "Napaka nalaganja predloge pogovornega okna: {error}", "No tags selected for deletion." => "Ni izbranih oznak za izbris.", "Please reload the page." => "Stran je treba ponovno naložiti", +"The update was unsuccessful." => "Posodobitev je spodletela", "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.", "%s password reset" => "Ponastavitev gesla %s", "Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}", @@ -120,6 +123,7 @@ $TRANSLATIONS = array( "Yes, I really want to reset my password now" => "Da, potrjujem ponastavitev gesla", "Reset" => "Ponastavi", "New password" => "Novo geslo", +"New Password" => "Novo geslo", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ", "For the best results, please consider using a GNU/Linux server instead." => "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.", "Personal" => "Osebno", @@ -174,6 +178,8 @@ $TRANSLATIONS = array( "This means only administrators can use the instance." => "To pomeni, da lahko oblak uporabljajo le osebe s skrbniškimi dovoljenji.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.", "Thank you for your patience." => "Hvala za potrpežljivost!", +"The theme %s has been disabled." => "Tema %s je onemogočena za uporabo.", +"Start update" => "Začni posodobitev", "This ownCloud instance is currently being updated, which may take a while." => "Nastavitev oblaka ownCloud se trenutno posodablja. Opravilo je lahko dolgotrajno ...", "Please reload this page after a short time to continue using ownCloud." => "Ponovno naložite to stran po krajšem preteku časa in nadaljujte z uporabo oblaka ownCloud." ); diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php index a74558d908c..40f6b983f5c 100644 --- a/core/l10n/zh_TW.php +++ b/core/l10n/zh_TW.php @@ -29,6 +29,7 @@ $TRANSLATIONS = array( "November" => "十一月", "December" => "十二月", "Settings" => "設定", +"File" => "檔案", "Folder" => "資料夾", "Saving..." => "儲存中...", "seconds ago" => "幾秒前", diff --git a/l10n/es/core.po b/l10n/es/core.po index afca4f3698a..dd2f163a9f8 100644 --- a/l10n/es/core.po +++ b/l10n/es/core.po @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-17 01:54-0400\n" -"PO-Revision-Date: 2014-06-16 17:30+0000\n" -"Last-Translator: Carlos Andrés Burgos Urey <business@carlos-burgos.com>\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-25 09:40+0000\n" +"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -249,7 +249,7 @@ msgid "" "will be no way to get your data back after your password is reset.<br />If " "you are not sure what to do, please contact your administrator before you " "continue. <br />Do you really want to continue?" -msgstr "" +msgstr "Sus archivos están encriptados. Si no ha habilitado la clave de recuperación, no habrá manera de recuperar los datos despues de un reset de la contraseña. .<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?" #: js/lostpassword.js:10 msgid "I know what I'm doing" @@ -263,75 +263,75 @@ msgstr "Restablecer contraseña" msgid "Password can not be changed. Please contact your administrator." msgstr "La contraseña no se puede cambiar. Por favor, contacte con su administrador." -#: js/oc-dialogs.js:109 js/oc-dialogs.js:250 +#: js/oc-dialogs.js:109 js/oc-dialogs.js:257 msgid "Yes" msgstr "Sí" -#: js/oc-dialogs.js:119 js/oc-dialogs.js:260 +#: js/oc-dialogs.js:119 js/oc-dialogs.js:267 msgid "No" msgstr "No" -#: js/oc-dialogs.js:198 +#: js/oc-dialogs.js:204 msgid "Choose" msgstr "Seleccionar" -#: js/oc-dialogs.js:224 +#: js/oc-dialogs.js:231 msgid "Error loading file picker template: {error}" msgstr "Error cargando plantilla del seleccionador de archivos: {error}" -#: js/oc-dialogs.js:277 +#: js/oc-dialogs.js:284 msgid "Ok" msgstr "Aceptar" -#: js/oc-dialogs.js:297 +#: js/oc-dialogs.js:304 msgid "Error loading message template: {error}" msgstr "Error cargando plantilla del mensaje: {error}" -#: js/oc-dialogs.js:425 +#: js/oc-dialogs.js:432 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} conflicto de archivo" msgstr[1] "{count} conflictos de archivo" -#: js/oc-dialogs.js:439 +#: js/oc-dialogs.js:446 msgid "One file conflict" msgstr "On conflicto de archivo" -#: js/oc-dialogs.js:445 +#: js/oc-dialogs.js:452 msgid "New Files" msgstr "Nuevos Archivos" -#: js/oc-dialogs.js:446 +#: js/oc-dialogs.js:453 msgid "Already existing files" msgstr "Archivos ya existentes" -#: js/oc-dialogs.js:448 +#: js/oc-dialogs.js:455 msgid "Which files do you want to keep?" msgstr "¿Que archivos deseas mantener?" -#: js/oc-dialogs.js:449 +#: js/oc-dialogs.js:456 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre." -#: js/oc-dialogs.js:457 +#: js/oc-dialogs.js:464 msgid "Cancel" msgstr "Cancelar" -#: js/oc-dialogs.js:467 +#: js/oc-dialogs.js:474 msgid "Continue" msgstr "Continuar" -#: js/oc-dialogs.js:514 js/oc-dialogs.js:527 +#: js/oc-dialogs.js:521 js/oc-dialogs.js:534 msgid "(all selected)" msgstr "(seleccionados todos)" -#: js/oc-dialogs.js:517 js/oc-dialogs.js:531 +#: js/oc-dialogs.js:524 js/oc-dialogs.js:538 msgid "({count} selected)" msgstr "({count} seleccionados)" -#: js/oc-dialogs.js:539 +#: js/oc-dialogs.js:546 msgid "Error loading file exists template" msgstr "Error cargando plantilla de archivo existente" @@ -563,17 +563,17 @@ msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud #: lostpassword/controller/lostcontroller.php:110 msgid "Couldn't reset password because the token is invalid" -msgstr "" +msgstr "No se puede restablecer la contraseña porque el token no es válido" #: lostpassword/controller/lostcontroller.php:136 msgid "Couldn't send reset email. Please make sure your username is correct." -msgstr "" +msgstr "No se pudo resetear su correo electrónico. Por favor, asegúrese de que su nombre de usuario es correcto." #: lostpassword/controller/lostcontroller.php:151 msgid "" "Couldn't send reset email because there is no email address for this " "username. Please contact your administrator." -msgstr "" +msgstr "No se pudo resetear su correo electrónico, porque no hay una dirección de correo electrónico asociada para este nombre de usuario. Por favor, póngase en contacto con su administrador." #: lostpassword/controller/lostcontroller.php:168 #, php-format diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po index 854e008c070..3d55a81083d 100644 --- a/l10n/es/files_encryption.po +++ b/l10n/es/files_encryption.po @@ -10,7 +10,7 @@ # juanman <juanma@kde.org.ar>, 2013 # Maenso <balero_arana@hotmail.com>, 2013 # mikel anabitarte <inactive+mikelanabitarte@transifex.com>, 2013 -# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013 +# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014 # Rubén del Campo Gómez <yo@rubendelcampo.es>, 2013 # Sam Askari <saskarip@gmail.com>, 2013 # William Díaz <wdiazux@gmail.com>, 2013 @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-14 01:54-0400\n" -"PO-Revision-Date: 2014-06-14 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-25 10:31+0000\n" +"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -118,7 +118,7 @@ msgstr "Cifrado inicial en curso... Inténtelo más tarde." #: templates/invalid_private_key.php:8 #, php-format msgid "Go directly to your %spersonal settings%s." -msgstr "" +msgstr "Ir directamente a %sOpciones%s." #: templates/settings-admin.php:2 templates/settings-personal.php:2 msgid "Encryption" diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po index 8557d6c29ce..66f09729949 100644 --- a/l10n/es/files_sharing.po +++ b/l10n/es/files_sharing.po @@ -9,14 +9,15 @@ # Jose Luis <joseluis.tirado@gmail.com>, 2014 # joses <jose_mari_s@hotmail.com>, 2014 # juanman <juanma@kde.org.ar>, 2013 +# Raul Fernandez Garcia <raulfg3@gmail.com>, 2014 # Rubén del Campo Gómez <yo@rubendelcampo.es>, 2013 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-19 01:54-0400\n" -"PO-Revision-Date: 2014-06-18 16:20+0000\n" -"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-25 10:21+0000\n" +"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,21 +27,21 @@ msgstr "" #: ajax/external.php:20 msgid "Server to server sharing is not enabled on this server" -msgstr "" +msgstr "Compartir entre servidores no está habilitado en este servidor" #: ajax/external.php:50 msgid "Couldn't add remote share" -msgstr "" +msgstr "No se puede añadir un compartido remoto" -#: appinfo/app.php:46 js/app.js:34 +#: appinfo/app.php:39 js/app.js:34 msgid "Shared with you" msgstr "Compartido contigo" -#: appinfo/app.php:55 js/app.js:53 +#: appinfo/app.php:48 js/app.js:53 msgid "Shared with others" msgstr "Compartido con otros" -#: appinfo/app.php:64 js/app.js:72 +#: appinfo/app.php:57 js/app.js:72 msgid "Shared by link" msgstr "Compartido por medio de enlaces" @@ -58,7 +59,7 @@ msgstr "Usted todavía no ha compartido ningún archivo por medio de enlaces." #: js/external.js:43 js/external.js:46 msgid "Add {name} from {owner}@{remote}" -msgstr "" +msgstr "Añadir {name} desde {owner}@{remote}" #: js/public.js:200 msgid "No ownCloud installation found at {remote}" @@ -151,8 +152,8 @@ msgstr "Compartir archivos" #: templates/settings-admin.php:7 msgid "Allow other instances to mount public links shared from this server" -msgstr "" +msgstr "Permitir a otros montar enlaces publicos compartidos de este servidor" #: templates/settings-admin.php:11 msgid "Allow users to mount public link shares" -msgstr "" +msgstr "Permitir a los usuarios montar enlaces publicos compartidos" diff --git a/l10n/ja/core.po b/l10n/ja/core.po index e4d6a21511a..700423eb50b 100644 --- a/l10n/ja/core.po +++ b/l10n/ja/core.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-23 01:54-0400\n" -"PO-Revision-Date: 2014-06-22 10:21+0000\n" -"Last-Translator: YANO Tetsu <tetuyano+transi@gmail.com>\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-24 13:54+0000\n" +"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -392,19 +392,19 @@ msgstr "URLで共有" #: js/share.js:340 msgid "" "The public link will expire no later than {days} days after it is created" -msgstr "公開用リンクは、作成してから {days} 日以内に有効期限切れになります" +msgstr "URLによる共有は、作成してから {days} 日以内に有効期限切れになります" #: js/share.js:342 msgid "By default the public link will expire after {days} days" -msgstr "デフォルトの設定では、公開用リンクは {days} 日後に有効期限切れになります" +msgstr "デフォルトの設定では、URLによる共有は {days} 日後に有効期限切れになります" #: js/share.js:347 msgid "Password protect" -msgstr "パスワード保護" +msgstr "パスワード保護を有効化" #: js/share.js:349 msgid "Choose a password for the public link" -msgstr "公開用リンクのパスワードを選択" +msgstr "URLによる共有のパスワードを入力" #: js/share.js:355 msgid "Allow Public Upload" diff --git a/l10n/ja/files_external.po b/l10n/ja/files_external.po index 80509fc24f2..727dfac8300 100644 --- a/l10n/ja/files_external.po +++ b/l10n/ja/files_external.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:20+0000\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-24 13:54+0000\n" "Last-Translator: YANO Tetsu <tetuyano+transi@gmail.com>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -212,7 +212,7 @@ msgstr "個人" msgid "System" msgstr "システム" -#: js/settings.js:318 js/settings.js:325 +#: js/settings.js:320 js/settings.js:327 msgid "Saved" msgstr "保存されました" diff --git a/l10n/ja/files_sharing.po b/l10n/ja/files_sharing.po index 82ed83a9c68..fda695ec228 100644 --- a/l10n/ja/files_sharing.po +++ b/l10n/ja/files_sharing.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" -"PO-Revision-Date: 2014-06-23 11:00+0000\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-24 13:54+0000\n" "Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -32,27 +32,27 @@ msgstr "リモート共有を追加できませんでした" #: appinfo/app.php:39 js/app.js:34 msgid "Shared with you" -msgstr "あなたと共有" +msgstr "他ユーザーがあなたと共有中" #: appinfo/app.php:48 js/app.js:53 msgid "Shared with others" -msgstr "他人と共有" +msgstr "他ユーザーと共有中" #: appinfo/app.php:57 js/app.js:72 msgid "Shared by link" -msgstr "URLリンクで共有済" +msgstr "URLリンクで共有中" #: js/app.js:35 msgid "No files have been shared with you yet." -msgstr "まだ共有を行なっているファイルはありません。" +msgstr "他のユーザーがあなたと共有しているファイルはありません。" #: js/app.js:54 msgid "You haven't shared any files yet." -msgstr "まだ共有を行なっているファイルはありません。" +msgstr "他のユーザーと共有しているファイルはありません。" #: js/app.js:73 msgid "You haven't shared any files by link yet." -msgstr "まだURLリンクで共有を行なっているファイルはありません。" +msgstr "URLリンクで共有しているファイルはありません。" #: js/external.js:43 js/external.js:46 msgid "Add {name} from {owner}@{remote}" @@ -112,7 +112,7 @@ msgstr "リンクの期限が切れています" #: templates/part.404.php:8 msgid "sharing is disabled" -msgstr "共有が無効になっています" +msgstr "共有は無効になっています" #: templates/part.404.php:10 msgid "For more info, please ask the person who sent this link." @@ -149,8 +149,8 @@ msgstr "ファイル共有" #: templates/settings-admin.php:7 msgid "Allow other instances to mount public links shared from this server" -msgstr "このサーバの公開共有リンクを他のインスタンスからマウントできるようにする" +msgstr "このサーバにおけるURLでの共有を他のインスタンスからマウントできるようにする" #: templates/settings-admin.php:11 msgid "Allow users to mount public link shares" -msgstr "ユーザが公開共有リンクをマウントできるようにする" +msgstr "ユーザーがURLでの共有をマウントできるようにする" diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po index 003faecf271..c21eaeb4117 100644 --- a/l10n/ja/settings.po +++ b/l10n/ja/settings.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-23 01:54-0400\n" -"PO-Revision-Date: 2014-06-22 10:31+0000\n" -"Last-Translator: YANO Tetsu <tetuyano+transi@gmail.com>\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-24 13:54+0000\n" +"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -338,7 +338,7 @@ msgstr "グループ" msgid "Group Admin" msgstr "グループ管理者" -#: js/users/users.js:63 templates/users/part.grouplist.php:44 +#: js/users/users.js:63 templates/users/part.grouplist.php:46 #: templates/users/part.userlist.php:108 msgid "Delete" msgstr "削除" @@ -933,9 +933,9 @@ msgstr "グループ" #: templates/users/part.grouplist.php:18 msgid "Everyone" -msgstr "全ての人" +msgstr "すべてのユーザー" -#: templates/users/part.grouplist.php:29 +#: templates/users/part.grouplist.php:31 msgid "Admins" msgstr "管理者" @@ -945,7 +945,7 @@ msgstr "デフォルトのクォータサイズ" #: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" -msgstr "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")" +msgstr "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")" #: templates/users/part.setquota.php:11 templates/users/part.userlist.php:75 msgid "Unlimited" @@ -957,7 +957,7 @@ msgstr "その他" #: templates/users/part.userlist.php:7 msgid "Username" -msgstr "ユーザー名" +msgstr "ユーザーID" #: templates/users/part.userlist.php:14 msgid "Quota" @@ -965,7 +965,7 @@ msgstr "クオータ" #: templates/users/part.userlist.php:15 msgid "Storage Location" -msgstr "ストレージの場所" +msgstr "データの保存場所" #: templates/users/part.userlist.php:16 msgid "Last Login" diff --git a/l10n/nl/core.po b/l10n/nl/core.po index be837b24021..a4eaa002c88 100644 --- a/l10n/nl/core.po +++ b/l10n/nl/core.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-15 01:54-0400\n" -"PO-Revision-Date: 2014-06-15 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-24 13:44+0000\n" +"Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -220,14 +220,14 @@ msgstr "jaar geleden" #: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175 msgid "Couldn't send reset email. Please contact your administrator." -msgstr "" +msgstr "Kon herstel e-mail niet versturen. Neem contact op met uw beheerder." #: js/lostpassword.js:5 msgid "" "The link to reset your password has been sent to your email. If you do not " "receive it within a reasonable amount of time, check your spam/junk " "folders.<br>If it is not there ask your local administrator." -msgstr "" +msgstr "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammapje. <br>Als het daar niet in zit, neem dan contact op met uw beheerder." #: js/lostpassword.js:7 msgid "" @@ -235,11 +235,11 @@ msgid "" "will be no way to get your data back after your password is reset.<br />If " "you are not sure what to do, please contact your administrator before you " "continue. <br />Do you really want to continue?" -msgstr "" +msgstr "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, dan is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?" #: js/lostpassword.js:10 msgid "I know what I'm doing" -msgstr "" +msgstr "Ik weet wat ik doe" #: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9 msgid "Reset password" @@ -247,77 +247,77 @@ msgstr "Reset wachtwoord" #: js/lostpassword.js:16 msgid "Password can not be changed. Please contact your administrator." -msgstr "" +msgstr "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder." -#: js/oc-dialogs.js:109 js/oc-dialogs.js:250 +#: js/oc-dialogs.js:109 js/oc-dialogs.js:257 msgid "Yes" msgstr "Ja" -#: js/oc-dialogs.js:119 js/oc-dialogs.js:260 +#: js/oc-dialogs.js:119 js/oc-dialogs.js:267 msgid "No" msgstr "Nee" -#: js/oc-dialogs.js:198 +#: js/oc-dialogs.js:204 msgid "Choose" msgstr "Kies" -#: js/oc-dialogs.js:224 +#: js/oc-dialogs.js:231 msgid "Error loading file picker template: {error}" msgstr "Fout bij laden bestandenselecteur sjabloon: {error}" -#: js/oc-dialogs.js:277 +#: js/oc-dialogs.js:284 msgid "Ok" msgstr "Ok" -#: js/oc-dialogs.js:297 +#: js/oc-dialogs.js:304 msgid "Error loading message template: {error}" msgstr "Fout bij laden berichtensjabloon: {error}" -#: js/oc-dialogs.js:425 +#: js/oc-dialogs.js:432 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} bestandsconflict" msgstr[1] "{count} bestandsconflicten" -#: js/oc-dialogs.js:439 +#: js/oc-dialogs.js:446 msgid "One file conflict" msgstr "Een bestandsconflict" -#: js/oc-dialogs.js:445 +#: js/oc-dialogs.js:452 msgid "New Files" msgstr "Nieuwe bestanden" -#: js/oc-dialogs.js:446 +#: js/oc-dialogs.js:453 msgid "Already existing files" msgstr "Al aanwezige bestanden" -#: js/oc-dialogs.js:448 +#: js/oc-dialogs.js:455 msgid "Which files do you want to keep?" msgstr "Welke bestanden wilt u bewaren?" -#: js/oc-dialogs.js:449 +#: js/oc-dialogs.js:456 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen." -#: js/oc-dialogs.js:457 +#: js/oc-dialogs.js:464 msgid "Cancel" msgstr "Annuleer" -#: js/oc-dialogs.js:467 +#: js/oc-dialogs.js:474 msgid "Continue" msgstr "Verder" -#: js/oc-dialogs.js:514 js/oc-dialogs.js:527 +#: js/oc-dialogs.js:521 js/oc-dialogs.js:534 msgid "(all selected)" msgstr "(alles geselecteerd)" -#: js/oc-dialogs.js:517 js/oc-dialogs.js:531 +#: js/oc-dialogs.js:524 js/oc-dialogs.js:538 msgid "({count} selected)" msgstr "({count} geselecteerd)" -#: js/oc-dialogs.js:539 +#: js/oc-dialogs.js:546 msgid "Error loading file exists template" msgstr "Fout bij laden bestand bestaat al sjabloon" @@ -549,17 +549,17 @@ msgstr "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud." #: lostpassword/controller/lostcontroller.php:110 msgid "Couldn't reset password because the token is invalid" -msgstr "" +msgstr "Kon het wachtwoord niet herstellen omdat het token ongeldig is" #: lostpassword/controller/lostcontroller.php:136 msgid "Couldn't send reset email. Please make sure your username is correct." -msgstr "" +msgstr "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is." #: lostpassword/controller/lostcontroller.php:151 msgid "" "Couldn't send reset email because there is no email address for this " "username. Please contact your administrator." -msgstr "" +msgstr "Kon wachtwoordherstel e-mailbericht niet versturen, omdat er geen e-mailadres bekend is voor deze gebruikersnaam. Neem contact op met uw beheerder." #: lostpassword/controller/lostcontroller.php:168 #, php-format @@ -602,7 +602,7 @@ msgstr "Nieuw wachtwoord" #: lostpassword/templates/resetpassword.php:6 msgid "New Password" -msgstr "" +msgstr "Nieuw wachtwoord" #: setup/controller.php:140 #, php-format @@ -830,7 +830,7 @@ msgstr "Neem contact op met uw systeembeheerder." #: templates/login.php:50 msgid "Forgot your password? Reset it!" -msgstr "" +msgstr "Wachtwoord vergeten? Herstel het!" #: templates/login.php:55 msgid "remember" diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po index 189af16cc3e..452525402ae 100644 --- a/l10n/nl/files_sharing.po +++ b/l10n/nl/files_sharing.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" -"PO-Revision-Date: 2014-06-23 15:02+0000\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-24 13:44+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" #: ajax/external.php:20 msgid "Server to server sharing is not enabled on this server" -msgstr "" +msgstr "Server met server delen is niet geactiveerd op deze server" #: ajax/external.php:50 msgid "Couldn't add remote share" -msgstr "" +msgstr "Kon geen externe share toevoegen" #: appinfo/app.php:39 js/app.js:34 msgid "Shared with you" @@ -57,7 +57,7 @@ msgstr "Toevoegen {name} van {owner}@{remote}" #: js/public.js:200 msgid "No ownCloud installation found at {remote}" -msgstr "" +msgstr "Geen ownCloud installatie gevonden op {remote}" #: js/public.js:201 msgid "Invalid ownCloud url" @@ -146,8 +146,8 @@ msgstr "Bestand delen" #: templates/settings-admin.php:7 msgid "Allow other instances to mount public links shared from this server" -msgstr "" +msgstr "Toestaan dat andere oanClouds openbaar gedeelde links mounten vanaf deze server" #: templates/settings-admin.php:11 msgid "Allow users to mount public link shares" -msgstr "" +msgstr "Toestaan dat gebruikers openbaar gedeelde links mounten" diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po index 0d17450806f..2bb585d88f7 100644 --- a/l10n/nl/lib.po +++ b/l10n/nl/lib.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" -"PO-Revision-Date: 2014-06-24 05:28+0000\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-24 13:11+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 09c072b5b29..8d2104a06c3 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" -"PO-Revision-Date: 2014-06-24 05:38+0000\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-24 13:11+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -336,7 +336,7 @@ msgstr "Groepen" msgid "Group Admin" msgstr "Groep beheerder" -#: js/users/users.js:63 templates/users/part.grouplist.php:44 +#: js/users/users.js:63 templates/users/part.grouplist.php:46 #: templates/users/part.userlist.php:108 msgid "Delete" msgstr "Verwijder" @@ -933,7 +933,7 @@ msgstr "Groep" msgid "Everyone" msgstr "Iedereen" -#: templates/users/part.grouplist.php:29 +#: templates/users/part.grouplist.php:31 msgid "Admins" msgstr "Beheerders" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index 7aebbccef32..58342da183a 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/core.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-15 01:54-0400\n" -"PO-Revision-Date: 2014-06-15 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-24 14:02+0000\n" +"Last-Translator: Matej Urbančič <>\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" @@ -163,7 +163,7 @@ msgstr "Slika" #: js/js.js:593 msgid "Audio" -msgstr "" +msgstr "Zvok" #: js/js.js:607 msgid "Saving..." @@ -254,33 +254,33 @@ msgstr "Ponastavi geslo" #: js/lostpassword.js:16 msgid "Password can not be changed. Please contact your administrator." -msgstr "" +msgstr "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom." -#: js/oc-dialogs.js:109 js/oc-dialogs.js:250 +#: js/oc-dialogs.js:109 js/oc-dialogs.js:257 msgid "Yes" msgstr "Da" -#: js/oc-dialogs.js:119 js/oc-dialogs.js:260 +#: js/oc-dialogs.js:119 js/oc-dialogs.js:267 msgid "No" msgstr "Ne" -#: js/oc-dialogs.js:198 +#: js/oc-dialogs.js:204 msgid "Choose" msgstr "Izbor" -#: js/oc-dialogs.js:224 +#: js/oc-dialogs.js:231 msgid "Error loading file picker template: {error}" msgstr "Napaka nalaganja predloge izbirnika datotek: {error}" -#: js/oc-dialogs.js:277 +#: js/oc-dialogs.js:284 msgid "Ok" msgstr "V redu" -#: js/oc-dialogs.js:297 +#: js/oc-dialogs.js:304 msgid "Error loading message template: {error}" msgstr "Napaka nalaganja predloge sporočil: {error}" -#: js/oc-dialogs.js:425 +#: js/oc-dialogs.js:432 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} spor datotek" @@ -288,45 +288,45 @@ msgstr[1] "{count} spora datotek" msgstr[2] "{count} spori datotek" msgstr[3] "{count} sporov datotek" -#: js/oc-dialogs.js:439 +#: js/oc-dialogs.js:446 msgid "One file conflict" msgstr "En spor datotek" -#: js/oc-dialogs.js:445 +#: js/oc-dialogs.js:452 msgid "New Files" msgstr "Nove datoteke" -#: js/oc-dialogs.js:446 +#: js/oc-dialogs.js:453 msgid "Already existing files" msgstr "Obstoječe datoteke" -#: js/oc-dialogs.js:448 +#: js/oc-dialogs.js:455 msgid "Which files do you want to keep?" msgstr "Katare datoteke želite ohraniti?" -#: js/oc-dialogs.js:449 +#: js/oc-dialogs.js:456 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka." -#: js/oc-dialogs.js:457 +#: js/oc-dialogs.js:464 msgid "Cancel" msgstr "Prekliči" -#: js/oc-dialogs.js:467 +#: js/oc-dialogs.js:474 msgid "Continue" msgstr "Nadaljuj" -#: js/oc-dialogs.js:514 js/oc-dialogs.js:527 +#: js/oc-dialogs.js:521 js/oc-dialogs.js:534 msgid "(all selected)" msgstr "(vse izbrano)" -#: js/oc-dialogs.js:517 js/oc-dialogs.js:531 +#: js/oc-dialogs.js:524 js/oc-dialogs.js:538 msgid "({count} selected)" msgstr "({count} izbranih)" -#: js/oc-dialogs.js:539 +#: js/oc-dialogs.js:546 msgid "Error loading file exists template" msgstr "Napaka nalaganja predloge obstoječih datotek" @@ -550,7 +550,7 @@ msgstr "Stran je treba ponovno naložiti" #: js/update.js:52 msgid "The update was unsuccessful." -msgstr "" +msgstr "Posodobitev je spodletela" #: js/update.js:61 msgid "The update was successful. Redirecting you to ownCloud now." @@ -611,7 +611,7 @@ msgstr "Novo geslo" #: lostpassword/templates/resetpassword.php:6 msgid "New Password" -msgstr "" +msgstr "Novo geslo" #: setup/controller.php:140 #, php-format @@ -890,7 +890,7 @@ msgstr "" #: templates/update.admin.php:17 #, php-format msgid "The theme %s has been disabled." -msgstr "" +msgstr "Tema %s je onemogočena za uporabo." #: templates/update.admin.php:21 msgid "" @@ -900,7 +900,7 @@ msgstr "" #: templates/update.admin.php:23 msgid "Start update" -msgstr "" +msgstr "Začni posodobitev" #: templates/update.user.php:3 msgid "" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index e4ac751bda7..f868c1361eb 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-19 01:54-0400\n" -"PO-Revision-Date: 2014-06-18 06:12+0000\n" -"Last-Translator: Marko <marko.ambrozic@gmail.com>\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-24 14:02+0000\n" +"Last-Translator: Matej Urbančič <>\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" @@ -45,7 +45,7 @@ msgid "" "allowed." msgstr "Neveljavno ime; znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni." -#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157 +#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:159 #: lib/app.php:77 msgid "The target folder has been moved or deleted." msgstr "Ciljna mapa je premaknjena ali izbrisana." @@ -91,54 +91,54 @@ msgstr "Mapo, v katero boste prenašali dokumente, ni mogoče določiti" msgid "Invalid Token" msgstr "Neveljaven žeton" -#: ajax/upload.php:75 +#: ajax/upload.php:77 msgid "No file was uploaded. Unknown error" msgstr "Ni poslane datoteke. Neznana napaka." -#: ajax/upload.php:82 +#: ajax/upload.php:84 msgid "There is no error, the file uploaded with success" msgstr "Datoteka je uspešno naložena." -#: ajax/upload.php:83 +#: ajax/upload.php:85 msgid "" "The uploaded file exceeds the upload_max_filesize directive in 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:85 +#: ajax/upload.php:87 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form" msgstr "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML." -#: ajax/upload.php:86 +#: ajax/upload.php:88 msgid "The uploaded file was only partially uploaded" msgstr "Poslan je le del datoteke." -#: ajax/upload.php:87 +#: ajax/upload.php:89 msgid "No file was uploaded" msgstr "Ni poslane datoteke" -#: ajax/upload.php:88 +#: ajax/upload.php:90 msgid "Missing a temporary folder" msgstr "Manjka začasna mapa" -#: ajax/upload.php:89 +#: ajax/upload.php:91 msgid "Failed to write to disk" msgstr "Pisanje na disk je spodletelo" -#: ajax/upload.php:109 +#: ajax/upload.php:111 msgid "Not enough storage available" msgstr "Na voljo ni dovolj prostora" -#: ajax/upload.php:171 +#: ajax/upload.php:173 msgid "Upload failed. Could not find uploaded file" msgstr "Pošiljanje je spodletelo. Ni mogoče najti poslane datoteke." -#: ajax/upload.php:181 +#: ajax/upload.php:183 msgid "Upload failed. Could not get file info." msgstr "Pošiljanje je spodletelo. Ni mogoče pridobiti podrobnosti datoteke." -#: ajax/upload.php:196 +#: ajax/upload.php:198 msgid "Invalid directory." msgstr "Neveljavna mapa." @@ -180,7 +180,7 @@ msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošilja msgid "URL cannot be empty" msgstr "Polje naslova URL ne sme biti prazno" -#: js/file-upload.js:559 js/filelist.js:1190 +#: js/file-upload.js:559 js/filelist.js:1192 msgid "{new_name} already exists" msgstr "{new_name} že obstaja" @@ -196,19 +196,19 @@ msgstr "Ni mogoče ustvariti mape" msgid "Error fetching URL" msgstr "Napaka pridobivanja naslova URL" -#: js/fileactions.js:211 +#: js/fileactions.js:213 msgid "Share" msgstr "Souporaba" -#: js/fileactions.js:224 +#: js/fileactions.js:226 msgid "Delete permanently" msgstr "Izbriši dokončno" -#: js/fileactions.js:226 templates/list.php:78 templates/list.php:79 +#: js/fileactions.js:228 templates/list.php:78 templates/list.php:79 msgid "Delete" msgstr "Izbriši" -#: js/fileactions.js:262 +#: js/fileactions.js:264 msgid "Rename" msgstr "Preimenuj" @@ -218,43 +218,43 @@ msgid "" "big." msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, kadar je datoteka zelo velika." -#: js/filelist.js:621 js/filelist.js:1693 +#: js/filelist.js:623 js/filelist.js:1713 msgid "Pending" msgstr "V čakanju ..." -#: js/filelist.js:1141 +#: js/filelist.js:1143 msgid "Error moving file." msgstr "Napaka premikanja datoteke." -#: js/filelist.js:1149 +#: js/filelist.js:1151 msgid "Error moving file" msgstr "Napaka premikanja datoteke" -#: js/filelist.js:1149 +#: js/filelist.js:1151 msgid "Error" msgstr "Napaka" -#: js/filelist.js:1227 +#: js/filelist.js:1240 msgid "Could not rename file" msgstr "Ni mogoče preimenovati datoteke" -#: js/filelist.js:1348 +#: js/filelist.js:1358 msgid "Error deleting file." msgstr "Napaka brisanja datoteke." -#: js/filelist.js:1451 templates/list.php:62 +#: js/filelist.js:1461 templates/list.php:62 msgid "Name" msgstr "Ime" -#: js/filelist.js:1452 templates/list.php:73 +#: js/filelist.js:1462 templates/list.php:73 msgid "Size" msgstr "Velikost" -#: js/filelist.js:1453 templates/list.php:76 +#: js/filelist.js:1463 templates/list.php:76 msgid "Modified" msgstr "Spremenjeno" -#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168 +#: js/filelist.js:1473 js/filesummary.js:141 js/filesummary.js:168 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "%n mapa" @@ -262,7 +262,7 @@ msgstr[1] "%n mapi" msgstr[2] "%n mape" msgstr[3] "%n map" -#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169 +#: js/filelist.js:1479 js/filesummary.js:142 js/filesummary.js:169 msgid "%n file" msgid_plural "%n files" msgstr[0] "%n datoteka" @@ -270,7 +270,7 @@ msgstr[1] "%n datoteki" msgstr[2] "%n datoteke" msgstr[3] "%n datotek" -#: js/filelist.js:1601 js/filelist.js:1640 +#: js/filelist.js:1606 js/filelist.js:1645 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "Posodabljanje %n datoteke" @@ -348,7 +348,7 @@ msgstr "WebDAV" msgid "" "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via " "WebDAV</a>" -msgstr "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>." +msgstr "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek peko sistema WebDAV</a>." #: templates/list.php:5 msgid "New" @@ -406,4 +406,4 @@ msgstr "Poteka preučevanje datotek, počakajte ..." #: templates/list.php:102 msgid "Currently scanning" -msgstr "Trenutno preverjam" +msgstr "Poteka preverjanje" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index 95b11fc95c1..fdc995d6cad 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-17 01:54-0400\n" -"PO-Revision-Date: 2014-06-17 05:54+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-24 14:02+0000\n" +"Last-Translator: Matej Urbančič <>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -49,15 +49,15 @@ msgstr "Elektronska pošta je poslana" msgid "You need to set your user email before being able to send test emails." msgstr "" -#: admin/controller.php:116 templates/admin.php:350 +#: admin/controller.php:116 templates/admin.php:337 msgid "Send mode" msgstr "Način pošiljanja" -#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144 +#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144 msgid "Encryption" msgstr "Šifriranje" -#: admin/controller.php:120 templates/admin.php:387 +#: admin/controller.php:120 templates/admin.php:374 msgid "Authentication method" msgstr "Način overitve" @@ -195,7 +195,7 @@ msgstr "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodo msgid "Unable to change password" msgstr "Ni mogoče spremeniti gesla" -#: js/admin.js:126 +#: js/admin.js:127 msgid "Sending..." msgstr "Poteka pošiljanje ..." @@ -265,7 +265,7 @@ msgstr "" #: js/apps.js:237 templates/apps.php:56 msgid "Uninstall" -msgstr "" +msgstr "Odstrani namestitev" #: js/personal.js:256 msgid "Select a profile picture" @@ -319,11 +319,11 @@ msgstr "" msgid "deleted {groupName}" msgstr "" -#: js/users/groups.js:206 js/users/users.js:255 +#: js/users/groups.js:206 js/users/users.js:265 msgid "undo" msgstr "razveljavi" -#: js/users/users.js:37 templates/admin.php:302 +#: js/users/users.js:37 templates/admin.php:292 #: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10 #: templates/users/part.userlist.php:41 msgid "Groups" @@ -334,36 +334,36 @@ msgstr "Skupine" msgid "Group Admin" msgstr "Skrbnik skupine" -#: js/users/users.js:63 templates/users/part.grouplist.php:44 +#: js/users/users.js:63 templates/users/part.grouplist.php:46 #: templates/users/part.userlist.php:108 msgid "Delete" msgstr "Izbriši" -#: js/users/users.js:84 templates/users/part.userlist.php:98 +#: js/users/users.js:85 templates/users/part.userlist.php:98 msgid "never" msgstr "nikoli" -#: js/users/users.js:254 +#: js/users/users.js:264 msgid "deleted {userName}" msgstr "" -#: js/users/users.js:371 +#: js/users/users.js:381 msgid "add group" msgstr "dodaj skupino" -#: js/users/users.js:568 +#: js/users/users.js:578 msgid "A valid username must be provided" msgstr "Navedeno mora biti veljavno uporabniško ime" -#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590 +#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600 msgid "Error creating user" msgstr "Napaka ustvarjanja uporabnika" -#: js/users/users.js:574 +#: js/users/users.js:584 msgid "A valid password must be provided" msgstr "Navedeno mora biti veljavno geslo" -#: js/users/users.js:598 +#: js/users/users.js:608 msgid "Warning: Home directory for user \"{user}\" already exists" msgstr "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja" @@ -566,23 +566,23 @@ msgstr "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 1 msgid "Sharing" msgstr "Souporaba" -#: templates/admin.php:240 +#: templates/admin.php:238 msgid "Allow apps to use the Share API" msgstr "Dovoli programom uporabo vmesnika API souporabe" -#: templates/admin.php:247 +#: templates/admin.php:243 msgid "Allow users to share via link" msgstr "" -#: templates/admin.php:251 +#: templates/admin.php:249 msgid "Enforce password protection" msgstr "" -#: templates/admin.php:254 +#: templates/admin.php:252 msgid "Allow public uploads" msgstr "Dovoli javno pošiljanje datotek v oblak" -#: templates/admin.php:258 +#: templates/admin.php:256 msgid "Set default expiration date" msgstr "" @@ -598,116 +598,116 @@ msgstr "" msgid "Enforce expiration date" msgstr "" -#: templates/admin.php:276 +#: templates/admin.php:271 msgid "Allow resharing" msgstr "Dovoli nadaljnjo souporabo" -#: templates/admin.php:283 +#: templates/admin.php:276 msgid "Restrict users to only share with users in their groups" msgstr "" -#: templates/admin.php:290 +#: templates/admin.php:281 msgid "Allow users to send mail notification for shared files" msgstr "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti." -#: templates/admin.php:297 +#: templates/admin.php:286 msgid "Exclude groups from sharing" msgstr "" -#: templates/admin.php:308 +#: templates/admin.php:298 msgid "" "These groups will still be able to receive shares, but not to initiate them." msgstr "" -#: templates/admin.php:316 +#: templates/admin.php:303 msgid "Security" msgstr "Varnost" -#: templates/admin.php:327 +#: templates/admin.php:314 msgid "Enforce HTTPS" msgstr "Zahtevaj uporabo HTTPS" -#: templates/admin.php:329 +#: templates/admin.php:316 #, php-format msgid "Forces the clients to connect to %s via an encrypted connection." msgstr "Vsili povezavo odjemalca z %s preko šifrirane povezave." -#: templates/admin.php:335 +#: templates/admin.php:322 #, php-format msgid "" "Please connect to your %s via HTTPS to enable or disable the SSL " "enforcement." msgstr "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS." -#: templates/admin.php:345 +#: templates/admin.php:332 msgid "Email Server" msgstr "Poštni strežnik" -#: templates/admin.php:347 +#: templates/admin.php:334 msgid "This is used for sending out notifications." msgstr "" -#: templates/admin.php:378 +#: templates/admin.php:365 msgid "From address" msgstr "" -#: templates/admin.php:379 +#: templates/admin.php:366 msgid "mail" msgstr "" -#: templates/admin.php:400 +#: templates/admin.php:387 msgid "Authentication required" msgstr "Zahtevana je overitev" -#: templates/admin.php:404 +#: templates/admin.php:391 msgid "Server address" msgstr "Naslov strežnika" -#: templates/admin.php:408 +#: templates/admin.php:395 msgid "Port" msgstr "Vrata" -#: templates/admin.php:413 +#: templates/admin.php:400 msgid "Credentials" msgstr "Poverila" -#: templates/admin.php:414 +#: templates/admin.php:401 msgid "SMTP Username" msgstr "Uporabniško ime SMTP" -#: templates/admin.php:417 +#: templates/admin.php:404 msgid "SMTP Password" msgstr "Geslo SMTP" -#: templates/admin.php:421 +#: templates/admin.php:408 msgid "Test email settings" msgstr "Preizkus nastavitev elektronske pošte" -#: templates/admin.php:422 +#: templates/admin.php:409 msgid "Send email" msgstr "Pošlji elektronsko sporočilo" -#: templates/admin.php:427 +#: templates/admin.php:414 msgid "Log" msgstr "Dnevnik" -#: templates/admin.php:428 +#: templates/admin.php:415 msgid "Log level" msgstr "Raven beleženja" -#: templates/admin.php:460 +#: templates/admin.php:447 msgid "More" msgstr "Več" -#: templates/admin.php:461 +#: templates/admin.php:448 msgid "Less" msgstr "Manj" -#: templates/admin.php:467 templates/personal.php:196 +#: templates/admin.php:454 templates/personal.php:196 msgid "Version" msgstr "Različica" -#: templates/admin.php:471 templates/personal.php:199 +#: templates/admin.php:458 templates/personal.php:199 msgid "" "Developed by the <a href=\"http://ownCloud.org/contact\" " "target=\"_blank\">ownCloud community</a>, the <a " @@ -921,7 +921,7 @@ msgstr "" #: templates/users/part.grouplist.php:5 msgid "Add Group" -msgstr "" +msgstr "Dodaj skupino" #: templates/users/part.grouplist.php:10 msgid "Group" @@ -929,11 +929,11 @@ msgstr "Skupina" #: templates/users/part.grouplist.php:18 msgid "Everyone" -msgstr "" +msgstr "Vsi" -#: templates/users/part.grouplist.php:29 +#: templates/users/part.grouplist.php:31 msgid "Admins" -msgstr "" +msgstr "Skrbniki" #: templates/users/part.setquota.php:7 msgid "Default Quota" diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po index f4c2e5c59f3..61de6ea40da 100644 --- a/l10n/sl/user_ldap.po +++ b/l10n/sl/user_ldap.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-19 01:54-0400\n" -"PO-Revision-Date: 2014-06-18 06:12+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-24 14:02+0000\n" +"Last-Translator: Matej Urbančič <>\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" @@ -144,7 +144,7 @@ msgstr "Ali res želite izbrisati trenutne nastavitve strežnika?" msgid "Confirm Deletion" msgstr "Potrdi brisanje" -#: lib/wizard.php:83 lib/wizard.php:97 +#: lib/wizard.php:97 lib/wizard.php:112 #, php-format msgid "%s group found" msgid_plural "%s groups found" @@ -153,7 +153,7 @@ msgstr[1] "%s najdeni skupini" msgstr[2] "%s najdene skupine" msgstr[3] "%s najdenih skupin" -#: lib/wizard.php:130 +#: lib/wizard.php:126 #, php-format msgid "%s user found" msgid_plural "%s users found" @@ -162,25 +162,25 @@ msgstr[1] "%s najdena uporabnika" msgstr[2] "%s najdeni uporabniki" msgstr[3] "%s najdenih uporabnikov" -#: lib/wizard.php:825 lib/wizard.php:837 -msgid "Invalid Host" -msgstr "Neveljaven gostitelj" - -#: lib/wizard.php:1025 +#: lib/wizard.php:317 lib/wizard.php:1051 msgid "Could not find the desired feature" msgstr "Želene zmožnosti ni mogoče najti" +#: lib/wizard.php:858 lib/wizard.php:870 +msgid "Invalid Host" +msgstr "Neveljaven gostitelj" + #: settings.php:52 msgid "Server" -msgstr "" +msgstr "Strežnik" #: settings.php:53 msgid "User Filter" -msgstr "" +msgstr "Uporabniški filter" #: settings.php:54 msgid "Login Filter" -msgstr "" +msgstr "Filter prijave" #: settings.php:55 msgid "Group Filter" @@ -273,7 +273,7 @@ msgstr "Dodaj nastavitve strežnika" #: templates/part.wizard-server.php:21 msgid "Delete Configuration" -msgstr "" +msgstr "Izbriši nastavitve" #: templates/part.wizard-server.php:30 msgid "Host" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index c1fa8fe7e66..c95de0dd32b 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\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.pot b/l10n/templates/files.pot index 2a7162f185c..b158bfe045f 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\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_encryption.pot b/l10n/templates/files_encryption.pot index 39b08bbc1f9..027e60dc234 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\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 001b2ee18c5..6b5f26eaca3 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\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_sharing.pot b/l10n/templates/files_sharing.pot index 73e58990b36..2b4dbe175f9 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\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 07a5c3b8281..bdf0714e25c 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\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 92c9b2fce33..2de432ea00e 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\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 ae90ba902d3..ba97379a304 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\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/private.pot b/l10n/templates/private.pot index 2a8ffe0b547..5beb3a07951 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\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 3ca9395f8f3..c7a39fd19fe 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\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" @@ -331,7 +331,7 @@ msgstr "" msgid "Group Admin" msgstr "" -#: js/users/users.js:63 templates/users/part.grouplist.php:44 +#: js/users/users.js:63 templates/users/part.grouplist.php:46 #: templates/users/part.userlist.php:108 msgid "Delete" msgstr "" @@ -927,7 +927,7 @@ msgstr "" msgid "Everyone" msgstr "" -#: templates/users/part.grouplist.php:29 +#: templates/users/part.grouplist.php:31 msgid "Admins" msgstr "" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 6de0a346057..a7ee7d904ad 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\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" @@ -143,26 +143,26 @@ msgstr "" msgid "Confirm Deletion" msgstr "" -#: lib/wizard.php:83 lib/wizard.php:97 +#: lib/wizard.php:97 lib/wizard.php:112 #, php-format msgid "%s group found" msgid_plural "%s groups found" msgstr[0] "" msgstr[1] "" -#: lib/wizard.php:130 +#: lib/wizard.php:126 #, php-format msgid "%s user found" msgid_plural "%s users found" msgstr[0] "" msgstr[1] "" -#: lib/wizard.php:825 lib/wizard.php:837 -msgid "Invalid Host" +#: lib/wizard.php:317 lib/wizard.php:1051 +msgid "Could not find the desired feature" msgstr "" -#: lib/wizard.php:1025 -msgid "Could not find the desired feature" +#: lib/wizard.php:858 lib/wizard.php:870 +msgid "Invalid Host" msgstr "" #: settings.php:52 diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index cbfce751206..68e70b5d4ed 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-24 01:54-0400\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\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/zh_TW/core.po b/l10n/zh_TW/core.po index d3d1dc1331a..1df932cf3bd 100644 --- a/l10n/zh_TW/core.po +++ b/l10n/zh_TW/core.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-15 01:54-0400\n" -"PO-Revision-Date: 2014-06-15 05:54+0000\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-25 03:41+0000\n" "Last-Translator: I Robot\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -151,7 +151,7 @@ msgstr "設定" #: js/js.js:590 msgid "File" -msgstr "" +msgstr "檔案" #: js/js.js:591 msgid "Folder" @@ -244,74 +244,74 @@ msgstr "重設密碼" msgid "Password can not be changed. Please contact your administrator." msgstr "" -#: js/oc-dialogs.js:109 js/oc-dialogs.js:250 +#: js/oc-dialogs.js:109 js/oc-dialogs.js:257 msgid "Yes" msgstr "是" -#: js/oc-dialogs.js:119 js/oc-dialogs.js:260 +#: js/oc-dialogs.js:119 js/oc-dialogs.js:267 msgid "No" msgstr "否" -#: js/oc-dialogs.js:198 +#: js/oc-dialogs.js:204 msgid "Choose" msgstr "選擇" -#: js/oc-dialogs.js:224 +#: js/oc-dialogs.js:231 msgid "Error loading file picker template: {error}" msgstr "載入檔案選擇器樣板出錯: {error}" -#: js/oc-dialogs.js:277 +#: js/oc-dialogs.js:284 msgid "Ok" msgstr "好" -#: js/oc-dialogs.js:297 +#: js/oc-dialogs.js:304 msgid "Error loading message template: {error}" msgstr "載入訊息樣板出錯: {error}" -#: js/oc-dialogs.js:425 +#: js/oc-dialogs.js:432 msgid "{count} file conflict" msgid_plural "{count} file conflicts" msgstr[0] "{count} 個檔案衝突" -#: js/oc-dialogs.js:439 +#: js/oc-dialogs.js:446 msgid "One file conflict" msgstr "一個檔案衝突" -#: js/oc-dialogs.js:445 +#: js/oc-dialogs.js:452 msgid "New Files" msgstr "新檔案" -#: js/oc-dialogs.js:446 +#: js/oc-dialogs.js:453 msgid "Already existing files" msgstr "" -#: js/oc-dialogs.js:448 +#: js/oc-dialogs.js:455 msgid "Which files do you want to keep?" msgstr "您要保留哪一個檔案?" -#: js/oc-dialogs.js:449 +#: js/oc-dialogs.js:456 msgid "" "If you select both versions, the copied file will have a number added to its" " name." msgstr "如果您同時選擇兩個版本,被複製的那個檔案名稱後面會加上編號" -#: js/oc-dialogs.js:457 +#: js/oc-dialogs.js:464 msgid "Cancel" msgstr "取消" -#: js/oc-dialogs.js:467 +#: js/oc-dialogs.js:474 msgid "Continue" msgstr "繼續" -#: js/oc-dialogs.js:514 js/oc-dialogs.js:527 +#: js/oc-dialogs.js:521 js/oc-dialogs.js:534 msgid "(all selected)" msgstr "(已全選)" -#: js/oc-dialogs.js:517 js/oc-dialogs.js:531 +#: js/oc-dialogs.js:524 js/oc-dialogs.js:538 msgid "({count} selected)" msgstr "(已選 {count} 項)" -#: js/oc-dialogs.js:539 +#: js/oc-dialogs.js:546 msgid "Error loading file exists template" msgstr "載入檔案存在樣板出錯" diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po index d09fc3bbabc..43c95b009bb 100644 --- a/l10n/zh_TW/files_external.po +++ b/l10n/zh_TW/files_external.po @@ -4,13 +4,14 @@ # # Translators: # Pellaeon Lin <nfsmwlin@gmail.com>, 2013 +# Flymok <transifex@flymok.net>, 2014 msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-06-08 01:54-0400\n" -"PO-Revision-Date: 2014-06-07 06:12+0000\n" -"Last-Translator: I Robot\n" +"POT-Creation-Date: 2014-06-25 06:33-0400\n" +"PO-Revision-Date: 2014-06-25 03:20+0000\n" +"Last-Translator: Flymok <transifex@flymok.net>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,15 +33,15 @@ msgstr "地點" #: appinfo/app.php:51 msgid "Amazon S3" -msgstr "" +msgstr "Amazon S3" #: appinfo/app.php:54 msgid "Key" -msgstr "" +msgstr "鑰" #: appinfo/app.php:55 msgid "Secret" -msgstr "" +msgstr "密" #: appinfo/app.php:56 appinfo/app.php:65 msgid "Bucket" @@ -56,23 +57,23 @@ msgstr "" #: appinfo/app.php:64 msgid "Secret Key" -msgstr "" +msgstr "密鑰" #: appinfo/app.php:66 msgid "Hostname (optional)" -msgstr "" +msgstr "主機名稱 (選填)" #: appinfo/app.php:67 msgid "Port (optional)" -msgstr "" +msgstr "埠號 (選填)" #: appinfo/app.php:68 msgid "Region (optional)" -msgstr "" +msgstr "區域 (選填)" #: appinfo/app.php:69 msgid "Enable SSL" -msgstr "" +msgstr "啟用 SSL" #: appinfo/app.php:70 msgid "Enable Path Style" @@ -124,7 +125,7 @@ msgstr "" #: appinfo/app.php:112 msgid "Username (required)" -msgstr "" +msgstr "使用者名稱 (必填)" #: appinfo/app.php:113 msgid "Bucket (required)" @@ -208,44 +209,44 @@ msgstr "個人" #: js/mountsfilelist.js:36 msgid "System" -msgstr "" +msgstr "系統" -#: js/settings.js:318 js/settings.js:325 +#: js/settings.js:320 js/settings.js:327 msgid "Saved" msgstr "已儲存" #: lib/config.php:703 msgid "<b>Note:</b> " -msgstr "" +msgstr "<b>警告:</b> " #: lib/config.php:713 msgid " and " -msgstr "" +msgstr "與" #: lib/config.php:735 #, php-format msgid "" "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting " "of %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>警告:</b> PHP 並未啓用 Curl 的支援,因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。" #: lib/config.php:737 #, php-format msgid "" "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of" " %s is not possible. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>警告</b>:PHP 並未啓用 FTP 的支援,因此無法掛載 %s,請洽您的系統管理員將其安裝並啓用。" #: lib/config.php:739 #, php-format msgid "" "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please" " ask your system administrator to install it." -msgstr "" +msgstr "<b>警告</b>並未安裝 \"%s\",因此無法掛載 %s。請洽您的系統管理員將其安裝並啓用。" #: templates/list.php:7 msgid "You don't have any external storages" -msgstr "" +msgstr "您沒有任何外部儲存" #: templates/list.php:16 msgid "Name" @@ -277,7 +278,7 @@ msgstr "選項" #: templates/settings.php:12 msgid "Available for" -msgstr "" +msgstr "可用的" #: templates/settings.php:32 msgid "Add storage" @@ -285,7 +286,7 @@ msgstr "增加儲存區" #: templates/settings.php:92 msgid "No user or group" -msgstr "" +msgstr "沒有使用者或群組" #: templates/settings.php:95 msgid "All Users" @@ -310,7 +311,7 @@ msgstr "啓用使用者外部儲存" #: templates/settings.php:135 msgid "Allow users to mount the following external storage" -msgstr "" +msgstr "允許使用者自行掛載以下的外部儲存" #: templates/settings.php:150 msgid "SSL root certificates" diff --git a/lib/base.php b/lib/base.php index ca2e49bed64..eef094737b6 100644 --- a/lib/base.php +++ b/lib/base.php @@ -693,6 +693,7 @@ class OC { if (!OC_Config::getValue('maintenance', false) && !\OCP\Util::needUpgrade()) { OC_App::loadApps(array('authentication')); OC_App::loadApps(array('filesystem', 'logging')); + OC_App::loadApps(); } self::checkSingleUserMode(); OC::$server->getRouter()->match(OC_Request::getRawPathInfo()); diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php index f2578e3c097..54596db3c47 100644 --- a/lib/private/connector/sabre/objecttree.php +++ b/lib/private/connector/sabre/objecttree.php @@ -135,10 +135,7 @@ class ObjectTree extends \Sabre\DAV\ObjectTree { throw new \Sabre\DAV\Exception\Forbidden(); } if ($sourceDir !== $destinationDir) { - if (!$this->fileView->isUpdatable($sourceDir)) { - throw new \Sabre\DAV\Exception\Forbidden(); - } - if (!$this->fileView->isUpdatable($destinationDir)) { + if (!$this->fileView->isCreatable($destinationDir)) { throw new \Sabre\DAV\Exception\Forbidden(); } if (!$this->fileView->isDeletable($sourcePath) && !$isMovableMount) { diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 91d7ea260d3..ff3cb9ee68b 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -896,7 +896,7 @@ class View { return false; } - if ($mount instanceof MoveableMount) { + if ($mount instanceof MoveableMount && $internalPath === '') { $data['permissions'] |= \OCP\PERMISSION_DELETE | \OCP\PERMISSION_UPDATE; } diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php index 7c55e4da429..6fa25a32cad 100644 --- a/settings/l10n/ja.php +++ b/settings/l10n/ja.php @@ -207,15 +207,15 @@ $TRANSLATIONS = array( "Search Users and Groups" => "ユーザーとグループを検索", "Add Group" => "グループを追加", "Group" => "グループ", -"Everyone" => "全ての人", +"Everyone" => "すべてのユーザー", "Admins" => "管理者", "Default Quota" => "デフォルトのクォータサイズ", -"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")", +"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")", "Unlimited" => "無制限", "Other" => "その他", -"Username" => "ユーザー名", +"Username" => "ユーザーID", "Quota" => "クオータ", -"Storage Location" => "ストレージの場所", +"Storage Location" => "データの保存場所", "Last Login" => "最終ログイン", "change full name" => "名前を変更", "set new password" => "新しいパスワードを設定", diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php index f0ac6eea30b..9383e565fd6 100644 --- a/settings/l10n/sl.php +++ b/settings/l10n/sl.php @@ -48,6 +48,7 @@ $TRANSLATIONS = array( "Error" => "Napaka", "Update" => "Posodobi", "Updated" => "Posodobljeno", +"Uninstall" => "Odstrani namestitev", "Select a profile picture" => "Izbor slike profila", "Very weak password" => "Zelo šibko geslo", "Weak password" => "Šibko geslo", @@ -166,7 +167,10 @@ $TRANSLATIONS = array( "Create" => "Ustvari", "Admin Recovery Password" => "Obnovitev skrbniškega gesla", "Enter the recovery password in order to recover the users files during password change" => "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla", +"Add Group" => "Dodaj skupino", "Group" => "Skupina", +"Everyone" => "Vsi", +"Admins" => "Skrbniki", "Default Quota" => "Privzeta količinska omejitev", "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")", "Unlimited" => "Neomejeno", diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php index a88e23bbe2f..fc9f802066f 100644 --- a/tests/lib/connector/sabre/objecttree.php +++ b/tests/lib/connector/sabre/objecttree.php @@ -25,6 +25,10 @@ class TestDoubleFileView extends \OC\Files\View{ return $this->updatables[$path]; } + public function isCreatable($path) { + return $this->updatables[$path]; + } + public function isDeletable($path) { return $this->deletables[$path]; } |