diff options
38 files changed, 264 insertions, 152 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 717951c70e9..566ae39f92c 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -13,7 +13,7 @@ .file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:0;} .file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; } #new { background-color:#5bb75b; float:left; border-top-right-radius:0; border-bottom-right-radius:0; margin:0 0 0 1em; border-right:none; z-index:1010; height:1.3em; } -#new:hover { background-color:#4b964b; } +#new:hover, a.file_upload_button_wrapper:hover + button.file_upload_filename { background-color:#4b964b; } #new.active { border-bottom-left-radius:0; border-bottom:none; } #new>a { padding:.5em 1.2em .3em; color:#fff; text-shadow:0 1px 0 #51a351; } #new>ul { display:none; position:fixed; text-align:left; padding:.5em; background:#f8f8f8; margin-top:0.075em; border:1px solid #ddd; min-width:7em; margin-left:-.5em; z-index:-1; } diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index d72e73adf00..fd8ec94895e 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -25,6 +25,8 @@ "Upload cancelled." => "Igoera ezeztatuta", "File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.", "Invalid name, '/' is not allowed." => "Baliogabeko izena, '/' ezin da erabili. ", +"files scanned" => "fitxategiak eskaneatuta", +"error while scanning" => "errore bat egon da eskaneatzen zen bitartean", "Size" => "Tamaina", "Modified" => "Aldatuta", "folder" => "karpeta", diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 6d278c3f0fb..84d671a938d 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -25,6 +25,8 @@ "Upload cancelled." => "アップロードはキャンセルされました。", "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", "Invalid name, '/' is not allowed." => "無効な名前、'/' は使用できません。", +"files scanned" => "ファイルをスキャンしました", +"error while scanning" => "スキャン中のエラー", "Size" => "サイズ", "Modified" => "更新日時", "folder" => "フォルダ", diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index dfd681c2a7c..aff484f0a7a 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -16,9 +16,9 @@ <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload"> <input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)"> <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir"> - <button class="file_upload_filename"></button> <input class="file_upload_start" type="file" name='files[]'/> - <a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a> + <a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a> + <button class="file_upload_filename"></button> <iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe> </form> </div> diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index eec31ec2ef9..f87a042b386 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -270,6 +270,7 @@ class OC_Mount_Config { fclose($fh); if (strpos($data, 'BEGIN CERTIFICATE')) { fwrite($fh_certs, $data); + fwrite($fh_certs, "\r\n"); } } diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index eabd1167c97..5ef7a8bbb9c 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -1,6 +1,7 @@ <?php $installedVersion = OCP\Config::getAppValue('files_sharing', 'installed_version'); if (version_compare($installedVersion, '0.3', '<')) { + $update_error = false; $query = OCP\DB::prepare('SELECT * FROM `*PREFIX*sharing`'); $result = $query->execute(); $groupShares = array(); @@ -38,10 +39,19 @@ if (version_compare($installedVersion, '0.3', '<')) { $shareWith = $row['uid_shared_with']; } OC_User::setUserId($row['uid_owner']); - OCP\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions); + try { + OCP\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions); + } + catch (Exception $e) { + $update_error = true; + echo 'Skipping sharing "'.$row['source'].'" to "'.$shareWith.'" (error is "'.$e->getMessage().'")<br/>'; + } } } + if ($update_error) { + throw new Exception('There were some problems upgrading the sharing of files'); + } // NOTE: Let's drop the table after more testing // $query = OCP\DB::prepare('DROP TABLE `*PREFIX*sharing`'); // $query->execute(); -}
\ No newline at end of file +} diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index b120cc167f3..074ca9928d4 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -72,8 +72,16 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { // Only 1 item should come through for this format call return array('path' => $items[key($items)]['path'], 'permissions' => $items[key($items)]['permissions']); } else if ($format == self::FORMAT_FILE_APP) { + if (isset($parameters['mimetype_filter']) && $parameters['mimetype_filter']) { + $mimetype_filter = $parameters['mimetype_filter']; + } $files = array(); foreach ($items as $item) { + if (isset($mimetype_filter) + && strpos($item['mimetype'], $mimetype_filter) !== 0 + && $item['mimetype'] != 'httpd/unix-directory') { + continue; + } $file = array(); $file['id'] = $item['file_source']; $file['path'] = $item['file_target']; @@ -116,4 +124,4 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { return array(); } -}
\ No newline at end of file +} diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php index 889e762c6b9..d4353c96cd6 100644 --- a/apps/files_versions/l10n/eu.php +++ b/apps/files_versions/l10n/eu.php @@ -1,5 +1,7 @@ <?php $TRANSLATIONS = array( "Expire all versions" => "Iraungi bertsio guztiak", "Versions" => "Bertsioak", -"This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu" +"This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu", +"Files Versioning" => "Fitxategien Bertsioak", +"Enable" => "Gaitu" ); diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php index 7a00d0b4dad..8a4e0ab245d 100644 --- a/apps/files_versions/l10n/ja_JP.php +++ b/apps/files_versions/l10n/ja_JP.php @@ -1,5 +1,7 @@ <?php $TRANSLATIONS = array( "Expire all versions" => "すべてのバージョンを削除する", "Versions" => "バージョン", -"This will delete all existing backup versions of your files" => "これは、あなたのファイルのすべてのバックアップバージョンを削除します" +"This will delete all existing backup versions of your files" => "これは、あなたのファイルのすべてのバックアップバージョンを削除します", +"Files Versioning" => "ファイルのバージョン管理", +"Enable" => "有効化" ); diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php new file mode 100644 index 00000000000..9c0eb23a34c --- /dev/null +++ b/apps/user_ldap/l10n/ru_RU.php @@ -0,0 +1,15 @@ +<?php $TRANSLATIONS = array( +"Host" => "Хост", +"Base DN" => "База DN", +"User DN" => "DN пользователя", +"Password" => "Пароль", +"For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте поля DN и пароль пустыми.", +"Group Filter" => "Групповой фильтр", +"Port" => "Порт", +"Use TLS" => "Использовать TLS", +"Do not use it for SSL connections, it will fail." => "Не используйте это SSL-соединений, это не будет выполнено.", +"Turn off SSL certificate validation." => "Выключить проверку сертификата SSL.", +"in bytes" => "в байтах", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут.", +"Help" => "Помощь" +); diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 53619ab4c1d..d855ae2a163 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -206,21 +206,17 @@ abstract class Access { $dn = $this->sanitizeDN($dn); $table = $this->getMapTable($isUser); if($isUser) { + $fncFindMappedName = 'findMappedUser'; $nameAttribute = $this->connection->ldapUserDisplayName; } else { + $fncFindMappedName = 'findMappedGroup'; $nameAttribute = $this->connection->ldapGroupDisplayName; } - $query = \OCP\DB::prepare(' - SELECT `owncloud_name` - FROM `'.$table.'` - WHERE `ldap_dn` = ? - '); - //let's try to retrieve the ownCloud name from the mappings table - $component = $query->execute(array($dn))->fetchOne(); - if($component) { - return $component; + $ocname = $this->$fncFindMappedName($dn); + if($ocname) { + return $ocname; } //second try: get the UUID and check if it is known. Then, update the DN and return the name. @@ -295,25 +291,48 @@ abstract class Access { return $this->ldap2ownCloudNames($ldapGroups, false); } + private function findMappedUser($dn) { + static $query = null; + if(is_null($query)) { + $query = \OCP\DB::prepare(' + SELECT `owncloud_name` + FROM `'.$this->getMapTable(true).'` + WHERE `ldap_dn` = ?' + ); + } + $res = $query->execute(array($dn))->fetchOne(); + if($res) { + return $res; + } + return false; + } + + private function findMappedGroup($dn) { + static $query = null; + if(is_null($query)) { + $query = \OCP\DB::prepare(' + SELECT `owncloud_name` + FROM `'.$this->getMapTable(false).'` + WHERE `ldap_dn` = ?' + ); + } + $res = $query->execute(array($dn))->fetchOne(); + if($res) { + return $res; + } + return false; + } + + private function ldap2ownCloudNames($ldapObjects, $isUsers) { if($isUsers) { - $knownObjects = $this->mappedUsers(); $nameAttribute = $this->connection->ldapUserDisplayName; } else { - $knownObjects = $this->mappedGroups(); $nameAttribute = $this->connection->ldapGroupDisplayName; } $ownCloudNames = array(); foreach($ldapObjects as $ldapObject) { - $key = \OCP\Util::recursiveArraySearch($knownObjects, $ldapObject['dn']); - - //everything is fine when we know the group - if($key !== false) { - $ownCloudNames[] = $knownObjects[$key]['owncloud_name']; - continue; - } - $ocname = $this->dn2ocname($ldapObject['dn'], $ldapObject[$nameAttribute], $isUsers); if($ocname) { $ownCloudNames[] = $ocname; diff --git a/db_structure.xml b/db_structure.xml index b35a6c7cdc2..b1e620f8499 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -405,7 +405,7 @@ </field> <index> - <name>preferences_userid_appid_key_index</name> + <name>pref_userid_appid_key_index</name> <field> <name>userid</name> <sorting>ascending</sorting> diff --git a/l10n/eu/files.po b/l10n/eu/files.po index c90216557e3..18b25b4e1f1 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-18 02:01+0200\n" -"PO-Revision-Date: 2012-09-18 00:01+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 09:47+0000\n" +"Last-Translator: asieriko <asieriko@gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,39 +61,39 @@ msgstr "Ez partekatu" msgid "Delete" msgstr "Ezabatu" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "already exists" msgstr "dagoeneko existitzen da" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "replace" msgstr "ordeztu" -#: js/filelist.js:186 +#: js/filelist.js:188 msgid "suggest name" msgstr "aholkatu izena" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "cancel" msgstr "ezeztatu" -#: js/filelist.js:235 js/filelist.js:237 +#: js/filelist.js:237 js/filelist.js:239 msgid "replaced" msgstr "ordeztua" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:267 js/filelist.js:269 +#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273 msgid "undo" msgstr "desegin" -#: js/filelist.js:237 +#: js/filelist.js:239 msgid "with" msgstr "honekin" -#: js/filelist.js:267 +#: js/filelist.js:271 msgid "unshared" msgstr "Ez partekatuta" -#: js/filelist.js:269 +#: js/filelist.js:273 msgid "deleted" msgstr "ezabatuta" @@ -109,7 +109,7 @@ msgstr "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu" msgid "Upload Error" msgstr "Igotzean errore bat suertatu da" -#: js/files.js:236 js/files.js:341 js/files.js:370 +#: js/files.js:236 js/files.js:341 js/files.js:371 msgid "Pending" msgstr "Zain" @@ -117,44 +117,44 @@ msgstr "Zain" msgid "Upload cancelled." msgstr "Igoera ezeztatuta" -#: js/files.js:423 +#: js/files.js:424 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du." -#: js/files.js:493 +#: js/files.js:494 msgid "Invalid name, '/' is not allowed." msgstr "Baliogabeko izena, '/' ezin da erabili. " -#: js/files.js:666 +#: js/files.js:667 msgid "files scanned" -msgstr "" +msgstr "fitxategiak eskaneatuta" -#: js/files.js:674 +#: js/files.js:675 msgid "error while scanning" -msgstr "" +msgstr "errore bat egon da eskaneatzen zen bitartean" -#: js/files.js:748 templates/index.php:56 +#: js/files.js:749 templates/index.php:56 msgid "Size" msgstr "Tamaina" -#: js/files.js:749 templates/index.php:58 +#: js/files.js:750 templates/index.php:58 msgid "Modified" msgstr "Aldatuta" -#: js/files.js:776 +#: js/files.js:777 msgid "folder" msgstr "karpeta" -#: js/files.js:778 +#: js/files.js:779 msgid "folders" msgstr "Karpetak" -#: js/files.js:786 +#: js/files.js:787 msgid "file" msgstr "fitxategia" -#: js/files.js:788 +#: js/files.js:789 msgid "files" msgstr "fitxategiak" diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po index c77fa0cef96..0d1dde9b907 100644 --- a/l10n/eu/files_versions.po +++ b/l10n/eu/files_versions.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-17 02:02+0200\n" -"PO-Revision-Date: 2012-09-17 00:04+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 08:37+0000\n" +"Last-Translator: asieriko <asieriko@gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,8 +32,8 @@ msgstr "Honek zure fitxategien bertsio guztiak ezabatuko ditu" #: templates/settings.php:3 msgid "Files Versioning" -msgstr "" +msgstr "Fitxategien Bertsioak" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "Gaitu" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index b581d579cc3..6b7e9ae2ff5 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 09:46+0000\n" +"Last-Translator: asieriko <asieriko@gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -114,7 +114,7 @@ msgstr "Cron" #: templates/admin.php:37 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "Exekutatu zeregin bat orri karga bakoitzean" #: templates/admin.php:43 msgid "" @@ -126,11 +126,11 @@ msgstr "cron.php webcron zerbitzu batean erregistratua dago. Deitu cron.php orri msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "Erabili sistemaren cron zerbitzua. Deitu cron.php fitxategia owncloud karpetan minuturo sistemaren cron lan baten bidez." #: templates/admin.php:56 msgid "Sharing" -msgstr "" +msgstr "Partekatzea" #: templates/admin.php:61 msgid "Enable Share API" @@ -225,7 +225,7 @@ msgstr "Erantzun" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "Eskuragarri dituzun <strong>%s</strong>etik <strong>%s</strong> erabili duzu" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -237,7 +237,7 @@ msgstr "Deskargatu" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Zere pasahitza aldatu da" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index 3d51946792b..32e588ad004 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 18:06+0000\n" +"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -225,7 +225,7 @@ msgstr "Vastaus" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "Käytössäsi on <strong>%s</strong>/<strong>%s<strong>" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -237,7 +237,7 @@ msgstr "Lataa" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Salasanasi vaihdettiin" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index 18748ab64d8..cdb813f426e 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-18 02:01+0200\n" -"PO-Revision-Date: 2012-09-18 00:01+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 01:00+0000\n" +"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.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" @@ -61,39 +61,39 @@ msgstr "共有しない" msgid "Delete" msgstr "削除" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "already exists" msgstr "既に存在します" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "replace" msgstr "置き換え" -#: js/filelist.js:186 +#: js/filelist.js:188 msgid "suggest name" msgstr "推奨名称" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "cancel" msgstr "キャンセル" -#: js/filelist.js:235 js/filelist.js:237 +#: js/filelist.js:237 js/filelist.js:239 msgid "replaced" msgstr "置換：" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:267 js/filelist.js:269 +#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273 msgid "undo" msgstr "元に戻す" -#: js/filelist.js:237 +#: js/filelist.js:239 msgid "with" msgstr "←" -#: js/filelist.js:267 +#: js/filelist.js:271 msgid "unshared" msgstr "未共有" -#: js/filelist.js:269 +#: js/filelist.js:273 msgid "deleted" msgstr "削除" @@ -109,7 +109,7 @@ msgstr "アップロード使用としているファイルがディレクトリ msgid "Upload Error" msgstr "アップロードエラー" -#: js/files.js:236 js/files.js:341 js/files.js:370 +#: js/files.js:236 js/files.js:341 js/files.js:371 msgid "Pending" msgstr "保留" @@ -117,44 +117,44 @@ msgstr "保留" msgid "Upload cancelled." msgstr "アップロードはキャンセルされました。" -#: js/files.js:423 +#: js/files.js:424 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。" -#: js/files.js:493 +#: js/files.js:494 msgid "Invalid name, '/' is not allowed." msgstr "無効な名前、'/' は使用できません。" -#: js/files.js:666 +#: js/files.js:667 msgid "files scanned" -msgstr "" +msgstr "ファイルをスキャンしました" -#: js/files.js:674 +#: js/files.js:675 msgid "error while scanning" -msgstr "" +msgstr "スキャン中のエラー" -#: js/files.js:748 templates/index.php:56 +#: js/files.js:749 templates/index.php:56 msgid "Size" msgstr "サイズ" -#: js/files.js:749 templates/index.php:58 +#: js/files.js:750 templates/index.php:58 msgid "Modified" msgstr "更新日時" -#: js/files.js:776 +#: js/files.js:777 msgid "folder" msgstr "フォルダ" -#: js/files.js:778 +#: js/files.js:779 msgid "folders" msgstr "フォルダ" -#: js/files.js:786 +#: js/files.js:787 msgid "file" msgstr "ファイル" -#: js/files.js:788 +#: js/files.js:789 msgid "files" msgstr "ファイル" diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po index 2923fe476f9..b68d6c033b4 100644 --- a/l10n/ja_JP/files_versions.po +++ b/l10n/ja_JP/files_versions.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-17 02:02+0200\n" -"PO-Revision-Date: 2012-09-17 00:04+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 01:06+0000\n" +"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.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" @@ -32,8 +32,8 @@ msgstr "これは、あなたのファイルのすべてのバックアップバ #: templates/settings.php:3 msgid "Files Versioning" -msgstr "" +msgstr "ファイルのバージョン管理" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "有効化" diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po index 0a0ccd1a44f..073691da01e 100644 --- a/l10n/ja_JP/settings.po +++ b/l10n/ja_JP/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 01:05+0000\n" +"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.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" @@ -113,7 +113,7 @@ msgstr "cron(自動定期実行)" #: templates/admin.php:37 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "各ページの読み込み時にタスクを1つ実行する" #: templates/admin.php:43 msgid "" @@ -125,11 +125,11 @@ msgstr "cron.php は webcron サービスとして登録されています。HTT msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "システムのcronサービスを利用する。1分に1回の頻度でシステムのcronジョブによりowncloudフォルダ内のcron.phpファイルを呼び出してください。" #: templates/admin.php:56 msgid "Sharing" -msgstr "" +msgstr "共有中" #: templates/admin.php:61 msgid "Enable Share API" @@ -224,7 +224,7 @@ msgstr "解答" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "現在､<strong>%s</strong> / <strong>%s<strong> を利用しています" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -236,7 +236,7 @@ msgstr "ダウンロード" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "パスワードを変更しました" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po index 13c174b7807..d021721a7d3 100644 --- a/l10n/ru_RU/user_ldap.po +++ b/l10n/ru_RU/user_ldap.po @@ -3,23 +3,24 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <cdewqazxsqwe@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-30 02:02+0200\n" -"PO-Revision-Date: 2012-08-12 22:45+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 13:17+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru_RU\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/settings.php:8 msgid "Host" -msgstr "" +msgstr "Хост" #: templates/settings.php:8 msgid "" @@ -28,7 +29,7 @@ msgstr "" #: templates/settings.php:9 msgid "Base DN" -msgstr "" +msgstr "База DN" #: templates/settings.php:9 msgid "You can specify Base DN for users and groups in the Advanced tab" @@ -36,7 +37,7 @@ msgstr "" #: templates/settings.php:10 msgid "User DN" -msgstr "" +msgstr "DN пользователя" #: templates/settings.php:10 msgid "" @@ -47,11 +48,11 @@ msgstr "" #: templates/settings.php:11 msgid "Password" -msgstr "" +msgstr "Пароль" #: templates/settings.php:11 msgid "For anonymous access, leave DN and Password empty." -msgstr "" +msgstr "Для анонимного доступа оставьте поля DN и пароль пустыми." #: templates/settings.php:12 msgid "User Login Filter" @@ -83,7 +84,7 @@ msgstr "" #: templates/settings.php:14 msgid "Group Filter" -msgstr "" +msgstr "Групповой фильтр" #: templates/settings.php:14 msgid "Defines the filter to apply, when retrieving groups." @@ -95,7 +96,7 @@ msgstr "" #: templates/settings.php:17 msgid "Port" -msgstr "" +msgstr "Порт" #: templates/settings.php:18 msgid "Base User Tree" @@ -111,11 +112,11 @@ msgstr "" #: templates/settings.php:21 msgid "Use TLS" -msgstr "" +msgstr "Использовать TLS" #: templates/settings.php:21 msgid "Do not use it for SSL connections, it will fail." -msgstr "" +msgstr "Не используйте это SSL-соединений, это не будет выполнено." #: templates/settings.php:22 msgid "Case insensitve LDAP server (Windows)" @@ -123,7 +124,7 @@ msgstr "" #: templates/settings.php:23 msgid "Turn off SSL certificate validation." -msgstr "" +msgstr "Выключить проверку сертификата SSL." #: templates/settings.php:23 msgid "" @@ -153,7 +154,7 @@ msgstr "" #: templates/settings.php:27 msgid "in bytes" -msgstr "" +msgstr "в байтах" #: templates/settings.php:29 msgid "in seconds. A change empties the cache." @@ -163,8 +164,8 @@ msgstr "" msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." -msgstr "" +msgstr "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут." #: templates/settings.php:32 msgid "Help" -msgstr "" +msgstr "Помощь" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 7391f99e6b2..3da643204cc 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\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 ff0cb9a5710..5988309ac79 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\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" @@ -107,7 +107,7 @@ msgstr "" msgid "Upload Error" msgstr "" -#: js/files.js:236 js/files.js:341 js/files.js:370 +#: js/files.js:236 js/files.js:341 js/files.js:371 msgid "Pending" msgstr "" @@ -115,44 +115,44 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/files.js:423 +#: js/files.js:424 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:493 +#: js/files.js:494 msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:666 +#: js/files.js:667 msgid "files scanned" msgstr "" -#: js/files.js:674 +#: js/files.js:675 msgid "error while scanning" msgstr "" -#: js/files.js:748 templates/index.php:56 +#: js/files.js:749 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:749 templates/index.php:58 +#: js/files.js:750 templates/index.php:58 msgid "Modified" msgstr "" -#: js/files.js:776 +#: js/files.js:777 msgid "folder" msgstr "" -#: js/files.js:778 +#: js/files.js:779 msgid "folders" msgstr "" -#: js/files.js:786 +#: js/files.js:787 msgid "file" msgstr "" -#: js/files.js:788 +#: js/files.js:789 msgid "files" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 391fd753d63..daeb636e2e8 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\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 f5b8185406b..47e75c8fd4e 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\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 aa0115ee16b..38e3593cbc7 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\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 6bf3900d871..fcea4a7c6a0 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\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 3ade2ddccf9..8afa66abbda 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\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 335b3816eea..80c99fad1cc 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index e797a28d7e1..0450ef1b723 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\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/lib/app.php b/lib/app.php index 8c3016d7800..288f82d054b 100755 --- a/lib/app.php +++ b/lib/app.php @@ -622,7 +622,13 @@ class OC_App{ $installedVersion = $versions[$app]; if (version_compare($currentVersion, $installedVersion, '>')) { OC_Log::write($app, 'starting app upgrade from '.$installedVersion.' to '.$currentVersion, OC_Log::DEBUG); - OC_App::updateApp($app); + try { + OC_App::updateApp($app); + } + catch (Exception $e) { + echo 'Failed to upgrade "'.$app.'". Exception="'.$e->getMessage().'"'; + die; + } OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app)); } } diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php index bbc615c0b16..413efef73b7 100644 --- a/lib/connector/sabre/directory.php +++ b/lib/connector/sabre/directory.php @@ -93,10 +93,12 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa $path = $this->path . '/' . $name; if (is_null($info)) { - $info = OC_FileCache::get($path); + $info = OC_Files::getFileInfo($path); } - if (!$info) throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located'); + if (!$info) { + throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located'); + } if ($info['mimetype'] == 'httpd/unix-directory') { $node = new OC_Connector_Sabre_Directory($path); @@ -115,7 +117,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa */ public function getChildren() { - $folder_content = OC_FileCache::getFolderContent($this->path); + $folder_content = OC_Files::getDirectoryContent($this->path); $paths = array(); foreach($folder_content as $info) { $paths[] = $this->path.'/'.$info['name']; diff --git a/lib/db.php b/lib/db.php index 9c10512350f..1f0593b0804 100644 --- a/lib/db.php +++ b/lib/db.php @@ -226,6 +226,7 @@ class OC_DB { 'phptype' => 'oci8', 'username' => $user, 'password' => $pass, + 'charset' => 'AL32UTF8', ); if ($host != '') { $dsn['hostspec'] = $host; diff --git a/lib/filecache.php b/lib/filecache.php index adcf97753ed..07099bcccd5 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -481,7 +481,7 @@ class OC_FileCache{ */ public static function clear($user='') { if($user) { - $query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE user=?'); + $query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE `user`=?'); $query->execute(array($user)); }else{ $query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache`'); diff --git a/lib/files.php b/lib/files.php index 63dd96b9509..360614caec9 100644 --- a/lib/files.php +++ b/lib/files.php @@ -29,6 +29,35 @@ class OC_Files { static $tmpFiles=array(); /** + * get the filesystem info + * @param string path + * @return array + * + * returns an associative array with the following keys: + * - size + * - mtime + * - ctime + * - mimetype + * - encrypted + * - versioned + */ + public static function getFileInfo($path) { + if (($path == '/Shared' || substr($path, 0, 8) == '/Shared/') && OC_App::isEnabled('files_sharing')) { + if ($path == '/Shared') { + $info = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT); + } + else { + $info = OCP\Share::getItemSharedWith('file', '/'.$name, OC_Share_Backend_File::FORMAT_FILE_APP); + } + $info = $info[0]; + } + else { + $info = OC_FileCache::get($path); + } + return $info; + } + + /** * get the content of a directory * @param dir $directory path under datadirectory */ diff --git a/lib/filesystem.php b/lib/filesystem.php index ce4d3a0cf48..f5c10923b32 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -357,7 +357,7 @@ class OC_Filesystem{ * @return string */ static public function getLocalPath($path) { - $datadir = OC_User::getHome($user).'/files'; + $datadir = OC_User::getHome(OC_User::getUser()).'/files'; $newpath = $path; if (strncmp($newpath, $datadir, strlen($datadir)) == 0) { $newpath = substr($path, strlen($datadir)); diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php index 29633cc4b93..4320b8ae693 100644 --- a/settings/l10n/eu.php +++ b/settings/l10n/eu.php @@ -20,7 +20,10 @@ "Security Warning" => "Segurtasun abisua", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.", "Cron" => "Cron", +"Execute one task with each page loaded" => "Exekutatu zeregin bat orri karga bakoitzean", "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php webcron zerbitzu batean erregistratua dago. Deitu cron.php orria ownclouden erroan minuturo http bidez.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Erabili sistemaren cron zerbitzua. Deitu cron.php fitxategia owncloud karpetan minuturo sistemaren cron lan baten bidez.", +"Sharing" => "Partekatzea", "Enable Share API" => "Gaitu Partekatze APIa", "Allow apps to use the Share API" => "Baimendu aplikazioak Partekatze APIa erabiltzeko", "Allow links" => "Baimendu loturak", @@ -42,8 +45,10 @@ "Problems connecting to help database." => "Arazoak daude laguntza datubasera konektatzeko.", "Go there manually." => "Joan hara eskuz.", "Answer" => "Erantzun", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Eskuragarri dituzun <strong>%s</strong>etik <strong>%s</strong> erabili duzu", "Desktop and Mobile Syncing Clients" => "Mahaigain eta mugikorren sinkronizazio bezeroak", "Download" => "Deskargatu", +"Your password was changed" => "Zere pasahitza aldatu da", "Unable to change your password" => "Ezin izan da zure pasahitza aldatu", "Current password" => "Uneko pasahitza", "New password" => "Pasahitz berria", diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php index 0a313738da3..0969b6e3654 100644 --- a/settings/l10n/fi_FI.php +++ b/settings/l10n/fi_FI.php @@ -42,8 +42,10 @@ "Problems connecting to help database." => "Virhe yhdistettäessä tietokantaan.", "Go there manually." => "Ohje löytyy sieltä.", "Answer" => "Vastaus", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s<strong>", "Desktop and Mobile Syncing Clients" => "Tietokoneen ja mobiililaitteiden synkronointisovellukset", "Download" => "Lataa", +"Your password was changed" => "Salasanasi vaihdettiin", "Unable to change your password" => "Salasanaasi ei voitu vaihtaa", "Current password" => "Nykyinen salasana", "New password" => "Uusi salasana", diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php index 49ed57f4a9a..72f79837d90 100644 --- a/settings/l10n/ja_JP.php +++ b/settings/l10n/ja_JP.php @@ -20,7 +20,10 @@ "Security Warning" => "セキュリティ警告", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。", "Cron" => "cron(自動定期実行)", +"Execute one task with each page loaded" => "各ページの読み込み時にタスクを1つ実行する", "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php は webcron サービスとして登録されています。HTTP経由で1分間に1回の頻度で owncloud のルートページ内の cron.php ページを呼び出します。", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "システムのcronサービスを利用する。1分に1回の頻度でシステムのcronジョブによりowncloudフォルダ内のcron.phpファイルを呼び出してください。", +"Sharing" => "共有中", "Enable Share API" => "Share APIを有効", "Allow apps to use the Share API" => "Share APIの使用をアプリケーションに許可", "Allow links" => "リンクを許可", @@ -42,8 +45,10 @@ "Problems connecting to help database." => "ヘルプデータベースへの接続時に問題が発生しました", "Go there manually." => "手動で移動してください。", "Answer" => "解答", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "現在､<strong>%s</strong> / <strong>%s<strong> を利用しています", "Desktop and Mobile Syncing Clients" => "デスクトップおよびモバイル用の同期クライアント", "Download" => "ダウンロード", +"Your password was changed" => "パスワードを変更しました", "Unable to change your password" => "パスワードを変更することができません", "Current password" => "現在のパスワード", "New password" => "新しいパスワード", |