Mercurial > kallithea
diff rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po @ 2534:7dd87a2f7831 beta
Updated i18n
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 02 Jul 2012 19:32:24 +0200 |
| parents | 679363531571 |
| children | 4c820ff6ed3c |
line wrap: on
line diff
--- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Mon Jul 02 00:59:46 2012 +0200 +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Mon Jul 02 19:32:24 2012 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-06-03 01:06+0200\n" +"POT-Creation-Date: 2012-07-02 11:58+0200\n" "PO-Revision-Date: 2012-05-09 22:23+0800\n" "Last-Translator: Nansen <nansenat16@gmail.com>\n" "Language-Team: zh_TW <LL@li.org>\n" @@ -17,26 +17,26 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:95 +#: rhodecode/controllers/changelog.py:94 #, fuzzy msgid "All Branches" msgstr "分支" -#: rhodecode/controllers/changeset.py:80 +#: rhodecode/controllers/changeset.py:81 msgid "show white space" msgstr "" -#: rhodecode/controllers/changeset.py:87 rhodecode/controllers/changeset.py:94 +#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95 msgid "ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:154 +#: rhodecode/controllers/changeset.py:155 #, fuzzy, python-format msgid "%s line context" msgstr "文件內容" -#: rhodecode/controllers/changeset.py:324 -#: rhodecode/controllers/changeset.py:339 rhodecode/lib/diffs.py:62 +#: rhodecode/controllers/changeset.py:331 +#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69 msgid "binary file" msgstr "二進位檔" @@ -66,16 +66,22 @@ "fulfilling the request." msgstr "" -#: rhodecode/controllers/feed.py:48 +#: rhodecode/controllers/feed.py:49 #, python-format msgid "Changes on %s repository" msgstr "修改於版本庫 %s" -#: rhodecode/controllers/feed.py:49 +#: rhodecode/controllers/feed.py:50 #, python-format msgid "%s %s feed" msgstr "" +#: rhodecode/controllers/feed.py:75 +#, fuzzy +#| msgid "commit" +msgid "commited on" +msgstr "遞交" + #: rhodecode/controllers/files.py:86 #: rhodecode/templates/admin/repos/repo_add.html:13 msgid "add new" @@ -86,74 +92,73 @@ msgid "There are no files yet %s" msgstr "尚未有任何檔案" -#: rhodecode/controllers/files.py:247 +#: rhodecode/controllers/files.py:256 #, python-format msgid "Edited %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:252 +#: rhodecode/controllers/files.py:261 msgid "No changes" msgstr "沒有修改" -#: rhodecode/controllers/files.py:263 rhodecode/controllers/files.py:316 +#: rhodecode/controllers/files.py:272 rhodecode/controllers/files.py:326 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: rhodecode/controllers/files.py:268 rhodecode/controllers/files.py:322 +#: rhodecode/controllers/files.py:277 rhodecode/controllers/files.py:332 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:288 +#: rhodecode/controllers/files.py:298 #, fuzzy, python-format msgid "Added %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:302 +#: rhodecode/controllers/files.py:312 #, fuzzy msgid "No content" msgstr "文件內容" -#: rhodecode/controllers/files.py:306 +#: rhodecode/controllers/files.py:316 #, fuzzy msgid "No filename" msgstr "檔案名稱" -#: rhodecode/controllers/files.py:347 +#: rhodecode/controllers/files.py:358 msgid "downloads disabled" msgstr "下載已關閉" -#: rhodecode/controllers/files.py:358 +#: rhodecode/controllers/files.py:369 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: rhodecode/controllers/files.py:360 +#: rhodecode/controllers/files.py:371 msgid "Empty repository" msgstr "空的版本庫" -#: rhodecode/controllers/files.py:362 +#: rhodecode/controllers/files.py:373 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: rhodecode/controllers/files.py:461 -#: rhodecode/templates/changeset/changeset_range.html:5 +#: rhodecode/controllers/files.py:474 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "變更" -#: rhodecode/controllers/files.py:462 rhodecode/controllers/summary.py:230 -#: rhodecode/templates/branches/branches.html:5 +#: rhodecode/controllers/files.py:475 rhodecode/controllers/pullrequests.py:65 +#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:463 rhodecode/controllers/summary.py:231 -#: rhodecode/templates/tags/tags.html:5 +#: rhodecode/controllers/files.py:476 rhodecode/controllers/pullrequests.py:69 +#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508 msgid "Tags" msgstr "標籤" -#: rhodecode/controllers/forks.py:69 rhodecode/controllers/admin/repos.py:86 +#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -161,7 +166,7 @@ "repositories" msgstr "" -#: rhodecode/controllers/forks.py:128 rhodecode/controllers/settings.py:69 +#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -169,29 +174,27 @@ "repositories" msgstr "" -#: rhodecode/controllers/forks.py:163 +#: rhodecode/controllers/forks.py:166 #, python-format msgid "forked %s repository as %s" msgstr "forked %s 版本庫為 %s" -#: rhodecode/controllers/forks.py:177 +#: rhodecode/controllers/forks.py:180 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:53 -#, python-format -msgid "%s public journal %s feed" -msgstr "%s 公開日誌 %s feed" - -#: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:223 -#: rhodecode/templates/admin/repos/repo_edit.html:177 -#: rhodecode/templates/base/base.html:307 -#: rhodecode/templates/base/base.html:309 -#: rhodecode/templates/base/base.html:311 -msgid "Public journal" +#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 +#, fuzzy +#| msgid "Public journal" +msgid "public journal" msgstr "公開日誌" +#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 +#: rhodecode/templates/base/base.html:217 +msgid "journal" +msgstr "日誌" + #: rhodecode/controllers/login.py:116 msgid "You have successfully registered into rhodecode" msgstr "您已經成功註冊rhodecode" @@ -206,6 +209,25 @@ "email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" +#: rhodecode/controllers/pullrequests.py:67 rhodecode/model/scm.py:503 +msgid "Bookmarks" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:117 +#, python-format +msgid "%s (owner)" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:142 +#, fuzzy +#| msgid "successfully deleted user" +msgid "Successfully opened new pull request" +msgstr "成功刪除使用者" + +#: rhodecode/controllers/pullrequests.py:145 +msgid "Error occurred during sending pull request" +msgstr "" + #: rhodecode/controllers/search.py:114 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元" @@ -218,20 +240,20 @@ msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:103 -#: rhodecode/controllers/admin/repos.py:213 +#: rhodecode/controllers/settings.py:107 +#: rhodecode/controllers/admin/repos.py:221 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: rhodecode/controllers/settings.py:121 -#: rhodecode/controllers/admin/repos.py:231 +#: rhodecode/controllers/settings.py:125 +#: rhodecode/controllers/admin/repos.py:239 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:139 -#: rhodecode/controllers/admin/repos.py:249 +#: rhodecode/controllers/settings.py:143 +#: rhodecode/controllers/admin/repos.py:257 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -239,15 +261,15 @@ "repositories" msgstr "" -#: rhodecode/controllers/settings.py:151 -#: rhodecode/controllers/admin/repos.py:261 +#: rhodecode/controllers/settings.py:155 +#: rhodecode/controllers/admin/repos.py:269 #, python-format msgid "deleted repository %s" msgstr "刪除版本庫 %s" -#: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:271 -#: rhodecode/controllers/admin/repos.py:277 +#: rhodecode/controllers/settings.py:159 +#: rhodecode/controllers/admin/repos.py:279 +#: rhodecode/controllers/admin/repos.py:285 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -257,7 +279,7 @@ msgstr "" #: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:139 +#: rhodecode/templates/summary/summary.html:144 msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" @@ -348,9 +370,9 @@ #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:326 -#: rhodecode/templates/base/base.html:328 -#: rhodecode/templates/base/base.html:330 +#: rhodecode/templates/base/base.html:334 +#: rhodecode/templates/base/base.html:336 +#: rhodecode/templates/base/base.html:338 msgid "Admin" msgstr "管理" @@ -382,76 +404,76 @@ msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:116 +#: rhodecode/controllers/admin/repos.py:121 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:144 +#: rhodecode/controllers/admin/repos.py:151 #, python-format msgid "created repository %s from %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:148 +#: rhodecode/controllers/admin/repos.py:155 #, python-format msgid "created repository %s" msgstr "建立版本庫 %s" -#: rhodecode/controllers/admin/repos.py:179 +#: rhodecode/controllers/admin/repos.py:186 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/admin/repos.py:274 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:295 +#: rhodecode/controllers/admin/repos.py:303 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/admin/repos.py:322 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:331 +#: rhodecode/controllers/admin/repos.py:339 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:347 +#: rhodecode/controllers/admin/repos.py:355 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:367 +#: rhodecode/controllers/admin/repos.py:375 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:371 +#: rhodecode/controllers/admin/repos.py:379 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:376 rhodecode/model/forms.py:54 +#: rhodecode/controllers/admin/repos.py:384 rhodecode/model/validators.py:269 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:389 +#: rhodecode/controllers/admin/repos.py:397 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:391 +#: rhodecode/controllers/admin/repos.py:399 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:407 +#: rhodecode/controllers/admin/repos.py:415 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:409 +#: rhodecode/controllers/admin/repos.py:417 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:413 +#: rhodecode/controllers/admin/repos.py:421 msgid "An error occurred during this operation" msgstr "" @@ -517,80 +539,95 @@ msgstr "更新應用設定" #: rhodecode/controllers/admin/settings.py:159 -#: rhodecode/controllers/admin/settings.py:226 +#: rhodecode/controllers/admin/settings.py:227 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:221 +#: rhodecode/controllers/admin/settings.py:222 msgid "Updated mercurial settings" msgstr "更新 mercurial 設定" -#: rhodecode/controllers/admin/settings.py:246 +#: rhodecode/controllers/admin/settings.py:247 msgid "Added new hook" msgstr "新增hook" -#: rhodecode/controllers/admin/settings.py:258 +#: rhodecode/controllers/admin/settings.py:259 msgid "Updated hooks" msgstr "更新hook" -#: rhodecode/controllers/admin/settings.py:262 +#: rhodecode/controllers/admin/settings.py:263 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:281 +#: rhodecode/controllers/admin/settings.py:282 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:336 +#: rhodecode/controllers/admin/settings.py:337 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:367 +#: rhodecode/controllers/admin/settings.py:368 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: rhodecode/controllers/admin/settings.py:387 -#: rhodecode/controllers/admin/users.py:138 +#: rhodecode/controllers/admin/settings.py:388 +#: rhodecode/controllers/admin/users.py:142 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:83 +#: rhodecode/controllers/admin/users.py:84 #, python-format msgid "created user %s" msgstr "建立使用者 %s" -#: rhodecode/controllers/admin/users.py:95 +#: rhodecode/controllers/admin/users.py:96 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:124 +#: rhodecode/controllers/admin/users.py:125 msgid "User updated successfully" msgstr "使用者更新完成" -#: rhodecode/controllers/admin/users.py:155 +#: rhodecode/controllers/admin/users.py:159 msgid "successfully deleted user" msgstr "成功刪除使用者" -#: rhodecode/controllers/admin/users.py:160 +#: rhodecode/controllers/admin/users.py:164 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:175 +#: rhodecode/controllers/admin/users.py:178 msgid "You can't edit this user" msgstr "您無法編輯這位使用者" -#: rhodecode/controllers/admin/users.py:205 +#: rhodecode/controllers/admin/users.py:210 #: rhodecode/controllers/admin/users_groups.py:219 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:214 +#: rhodecode/controllers/admin/users.py:219 #: rhodecode/controllers/admin/users_groups.py:229 msgid "Revoked 'repository create' permission to user" msgstr "" +#: rhodecode/controllers/admin/users.py:235 +#, python-format +msgid "Added email %s to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:241 +msgid "An error occurred during email saving" +msgstr "" + +#: rhodecode/controllers/admin/users.py:251 +#, fuzzy, python-format +#| msgid "removed repos group %s" +msgid "Removed email from user" +msgstr "移除版本庫群組 %s" + #: rhodecode/controllers/admin/users_groups.py:84 #, python-format msgid "created users group %s" @@ -627,136 +664,141 @@ msgid "You need to be a signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" -#: rhodecode/lib/diffs.py:78 +#: rhodecode/lib/diffs.py:85 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:88 +#: rhodecode/lib/diffs.py:95 msgid "No changes detected" msgstr "尚未有任何變更" -#: rhodecode/lib/helpers.py:415 +#: rhodecode/lib/helpers.py:369 +#, python-format +msgid "%a, %d %b %Y %H:%M:%S" +msgstr "" + +#: rhodecode/lib/helpers.py:442 msgid "True" msgstr "真" -#: rhodecode/lib/helpers.py:419 +#: rhodecode/lib/helpers.py:446 msgid "False" msgstr "假" -#: rhodecode/lib/helpers.py:463 +#: rhodecode/lib/helpers.py:490 #, fuzzy msgid "Changeset not found" msgstr "修改" -#: rhodecode/lib/helpers.py:486 +#: rhodecode/lib/helpers.py:513 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:492 +#: rhodecode/lib/helpers.py:519 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:512 +#: rhodecode/lib/helpers.py:539 msgid "and" msgstr "和" -#: rhodecode/lib/helpers.py:513 +#: rhodecode/lib/helpers.py:540 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:514 rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46 msgid "revisions" msgstr "修訂" -#: rhodecode/lib/helpers.py:537 +#: rhodecode/lib/helpers.py:564 msgid "fork name " msgstr "fork 名稱" -#: rhodecode/lib/helpers.py:550 +#: rhodecode/lib/helpers.py:577 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:552 rhodecode/lib/helpers.py:562 +#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:554 +#: rhodecode/lib/helpers.py:581 #, fuzzy msgid "[created] repository as fork" msgstr "建立版本庫 %s" -#: rhodecode/lib/helpers.py:556 rhodecode/lib/helpers.py:564 +#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:558 rhodecode/lib/helpers.py:566 +#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:560 +#: rhodecode/lib/helpers.py:587 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:568 -#, fuzzy, python-format -#| msgid "created user %s" +#: rhodecode/lib/helpers.py:595 +#, fuzzy msgid "[created] user" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:570 -#, fuzzy, python-format -#| msgid "updated users group %s" +#: rhodecode/lib/helpers.py:597 +#, fuzzy msgid "[updated] user" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:572 -#, fuzzy, python-format -#| msgid "created users group %s" +#: rhodecode/lib/helpers.py:599 +#, fuzzy msgid "[created] users group" msgstr "建立使用者群組 %s" -#: rhodecode/lib/helpers.py:574 -#, fuzzy, python-format -#| msgid "updated users group %s" +#: rhodecode/lib/helpers.py:601 +#, fuzzy msgid "[updated] users group" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:576 +#: rhodecode/lib/helpers.py:603 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:578 +#: rhodecode/lib/helpers.py:605 +msgid "[commented] on pull request" +msgstr "" + +#: rhodecode/lib/helpers.py:607 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:580 +#: rhodecode/lib/helpers.py:609 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:582 +#: rhodecode/lib/helpers.py:611 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:584 +#: rhodecode/lib/helpers.py:613 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:586 +#: rhodecode/lib/helpers.py:615 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:617 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:752 +#: rhodecode/lib/helpers.py:781 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:756 +#: rhodecode/lib/helpers.py:785 msgid "No Files" msgstr "沒有檔案" @@ -815,199 +857,343 @@ msgid "password reset link" msgstr "您的密碼重設連結已寄出" -#: rhodecode/model/comment.py:85 +#: rhodecode/model/comment.py:109 #, python-format msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:113 +#: rhodecode/model/comment.py:146 msgid "[Mention]" msgstr "" -#: rhodecode/model/forms.py:72 -msgid "Invalid username" -msgstr "無效的使用者名稱" - -#: rhodecode/model/forms.py:80 -msgid "This username already exists" -msgstr "使用者名稱已存在" - -#: rhodecode/model/forms.py:85 -msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with alphanumeric character" -msgstr "使用者名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" - -#: rhodecode/model/forms.py:101 -msgid "Invalid group name" -msgstr "無效的群組名稱" - -#: rhodecode/model/forms.py:111 -msgid "This users group already exists" -msgstr "這個使用者群組已存在" - -#: rhodecode/model/forms.py:117 +#: rhodecode/model/db.py:1062 #, fuzzy -msgid "" -"RepoGroup name may only contain alphanumeric characters underscores, " -"periods or dashes and must begin with alphanumeric character" -msgstr "群組名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" - -#: rhodecode/model/forms.py:145 -msgid "Cannot assign this group as parent" -msgstr "" - -#: rhodecode/model/forms.py:164 -msgid "This group already exists" -msgstr "這個群組已存在" - -#: rhodecode/model/forms.py:176 +#| msgid "repositories" +msgid "Repository no access" +msgstr "個版本庫" + +#: rhodecode/model/db.py:1063 #, fuzzy -msgid "Repository with this name already exists" +#| msgid "This repository already exists" +msgid "Repository read access" msgstr "這個版本庫已經存在" -#: rhodecode/model/forms.py:195 rhodecode/model/forms.py:204 -#: rhodecode/model/forms.py:213 -msgid "Invalid characters in password" -msgstr "無效的字元在密碼中" - -#: rhodecode/model/forms.py:226 -msgid "Passwords do not match" -msgstr "密碼不相符" - -#: rhodecode/model/forms.py:232 -msgid "invalid password" -msgstr "無效的密碼" - -#: rhodecode/model/forms.py:233 -msgid "invalid user name" -msgstr "無效的使用者名稱" - -#: rhodecode/model/forms.py:234 -msgid "Your account is disabled" -msgstr "您的帳號已被停用" - -#: rhodecode/model/forms.py:274 -msgid "This username is not valid" -msgstr "無效的使用者名稱" - -#: rhodecode/model/forms.py:287 -msgid "This repository name is disallowed" -msgstr "不允許的版本庫名稱" - -#: rhodecode/model/forms.py:310 -#, fuzzy, python-format -msgid "This repository already exists in a group \"%s\"" -msgstr "這個版本庫已存在於群組 \"%s\"" - -#: rhodecode/model/forms.py:317 -#, python-format -msgid "There is a group with this name already \"%s\"" +#: rhodecode/model/db.py:1064 +#, fuzzy +#| msgid "repositories" +msgid "Repository write access" +msgstr "個版本庫" + +#: rhodecode/model/db.py:1065 +#, fuzzy +#| msgid "repositories" +msgid "Repository admin access" +msgstr "個版本庫" + +#: rhodecode/model/db.py:1067 +#, fuzzy +#| msgid "repositories groups" +msgid "Repositories Group no access" +msgstr "版本庫群組" + +#: rhodecode/model/db.py:1068 +#, fuzzy +#| msgid "repositories groups" +msgid "Repositories Group read access" +msgstr "版本庫群組" + +#: rhodecode/model/db.py:1069 +#, fuzzy +#| msgid "repositories groups" +msgid "Repositories Group write access" +msgstr "版本庫群組" + +#: rhodecode/model/db.py:1070 +#, fuzzy +#| msgid "repositories groups" +msgid "Repositories Group admin access" +msgstr "版本庫群組" + +#: rhodecode/model/db.py:1072 +#, fuzzy +#| msgid "Users administration" +msgid "RhodeCode Administrator" +msgstr "使用者管理員" + +#: rhodecode/model/db.py:1073 +#, fuzzy +#| msgid "Repository creation" +msgid "Repository creation disabled" +msgstr "版本庫建立" + +#: rhodecode/model/db.py:1074 +#, fuzzy +#| msgid "Repository creation" +msgid "Repository creation enabled" +msgstr "版本庫建立" + +#: rhodecode/model/db.py:1075 +#, fuzzy +#| msgid "disabled" +msgid "Register disabled" +msgstr "停用" + +#: rhodecode/model/db.py:1076 +msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/forms.py:324 -msgid "This repository already exists" -msgstr "這個版本庫已經存在" - -#: rhodecode/model/forms.py:367 -msgid "invalid clone url" -msgstr "無效的複製URL" - -#: rhodecode/model/forms.py:384 -msgid "Invalid clone url, provide a valid clone http\\s url" +#: rhodecode/model/db.py:1079 +msgid "Register new user with RhodeCode with auto activation" +msgstr "" + +#: rhodecode/model/db.py:1479 +msgid "Not Reviewed" msgstr "" -#: rhodecode/model/forms.py:398 -msgid "Fork have to be the same type as original" -msgstr "Fork 必須使用相同的版本庫類型" - -#: rhodecode/model/forms.py:414 -msgid "This username or users group name is not valid" -msgstr "使用者名稱或群組名稱無效" - -#: rhodecode/model/forms.py:480 -msgid "This is not a valid path" -msgstr "不是一個有效的路徑" - -#: rhodecode/model/forms.py:494 -msgid "This e-mail address is already taken" -msgstr "這個郵件位址已經使用了" - -#: rhodecode/model/forms.py:507 -msgid "This e-mail address doesn't exist." -msgstr "這個郵件位址不存在" - -#: rhodecode/model/forms.py:530 -msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name " -"of the attribute that is equivalent to 'username'" +#: rhodecode/model/db.py:1480 +#, fuzzy +#| msgid "removed" +msgid "Approved" +msgstr "移除" + +#: rhodecode/model/db.py:1481 +msgid "Rejected" msgstr "" -#: rhodecode/model/forms.py:549 +#: rhodecode/model/db.py:1482 +msgid "Under Review" +msgstr "" + +#: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "請登入" -#: rhodecode/model/forms.py:550 +#: rhodecode/model/forms.py:44 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: rhodecode/model/forms.py:558 +#: rhodecode/model/forms.py:52 msgid "Please enter a password" msgstr "請輸入密碼" -#: rhodecode/model/forms.py:559 +#: rhodecode/model/forms.py:53 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:175 +#: rhodecode/model/notification.py:203 msgid "commented on commit" msgstr "" -#: rhodecode/model/notification.py:176 +#: rhodecode/model/notification.py:204 #, fuzzy msgid "sent message" msgstr "遞交資訊" -#: rhodecode/model/notification.py:177 +#: rhodecode/model/notification.py:205 msgid "mentioned you" msgstr "" -#: rhodecode/model/notification.py:178 +#: rhodecode/model/notification.py:206 #, fuzzy msgid "registered in RhodeCode" msgstr "您已經成功註冊rhodecode" -#: rhodecode/model/user.py:235 +#: rhodecode/model/notification.py:207 +msgid "opened new pull request" +msgstr "" + +#: rhodecode/model/notification.py:208 +msgid "commented on pull request" +msgstr "" + +#: rhodecode/model/pull_request.py:75 +#, python-format +msgid "%(user)s wants you to review pull request #%(pr_id)s" +msgstr "" + +#: rhodecode/model/scm.py:489 +#, fuzzy +#| msgid "last login" +msgid "latest tip" +msgstr "最後登入" + +#: rhodecode/model/user.py:238 #, fuzzy msgid "new user registration" msgstr "[RhodeCode] 新使用者註冊" -#: rhodecode/model/user.py:259 rhodecode/model/user.py:279 +#: rhodecode/model/user.py:263 rhodecode/model/user.py:284 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:300 +#: rhodecode/model/user.py:306 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:306 +#: rhodecode/model/user.py:312 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "這個使用者擁有 %s 個版本庫所以無法移除，請先變更版本庫擁有者或者刪除版本庫" +#: rhodecode/model/validators.py:52 +#, fuzzy, python-format +#| msgid "This username already exists" +msgid "Username \"%(username)s\" already exists" +msgstr "使用者名稱已存在" + +#: rhodecode/model/validators.py:54 +#, python-format +msgid "Username \"%(username)s\" is forbidden" +msgstr "" + +#: rhodecode/model/validators.py:56 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character" +msgstr "使用者名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" + +#: rhodecode/model/validators.py:84 +#, fuzzy, python-format +#| msgid "This username or users group name is not valid" +msgid "Username %(username)s is not valid" +msgstr "使用者名稱或群組名稱無效" + +#: rhodecode/model/validators.py:103 +#, fuzzy +#| msgid "invalid user name" +msgid "Invalid users group name" +msgstr "無效的使用者名稱" + +#: rhodecode/model/validators.py:104 +#, fuzzy, python-format +#| msgid "This users group already exists" +msgid "Users group \"%(usersgroup)s\" already exists" +msgstr "這個使用者群組已存在" + +#: rhodecode/model/validators.py:106 +#, fuzzy +#| msgid "" "RepoGroup name may only contain alphanumeric characters +#| underscores, " "periods or dashes and must begin with alphanumeric +#| character" +msgid "" +"users group name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" +msgstr "群組名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" + +#: rhodecode/model/validators.py:144 +msgid "Cannot assign this group as parent" +msgstr "" + +#: rhodecode/model/validators.py:145 +#, fuzzy, python-format +#| msgid "This username already exists" +msgid "Group \"%(group_name)s\" already exists" +msgstr "使用者名稱已存在" + +#: rhodecode/model/validators.py:147 +#, fuzzy, python-format +#| msgid "Repository with this name already exists" +msgid "Repository with name \"%(group_name)s\" already exists" +msgstr "這個版本庫已經存在" + +#: rhodecode/model/validators.py:205 +#, fuzzy +#| msgid "Invalid characters in password" +msgid "Invalid characters (non-ascii) in password" +msgstr "無效的字元在密碼中" + +#: rhodecode/model/validators.py:220 +msgid "Passwords do not match" +msgstr "密碼不相符" + +#: rhodecode/model/validators.py:237 +msgid "invalid password" +msgstr "無效的密碼" + +#: rhodecode/model/validators.py:238 +msgid "invalid user name" +msgstr "無效的使用者名稱" + +#: rhodecode/model/validators.py:239 +msgid "Your account is disabled" +msgstr "您的帳號已被停用" + +#: rhodecode/model/validators.py:283 +#, fuzzy, python-format +#| msgid "This repository name is disallowed" +msgid "Repository name %(repo)s is disallowed" +msgstr "不允許的版本庫名稱" + +#: rhodecode/model/validators.py:285 +#, fuzzy, python-format +#| msgid "Repository with this name already exists" +msgid "Repository named %(repo)s already exists" +msgstr "這個版本庫已經存在" + +#: rhodecode/model/validators.py:286 +#, fuzzy, python-format +#| msgid "This repository already exists in a group \"%s\"" +msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" +msgstr "這個版本庫已存在於群組 \"%s\"" + +#: rhodecode/model/validators.py:288 +#, fuzzy, python-format +#| msgid "Repository with this name already exists" +msgid "Repositories group with name \"%(repo)s\" already exists" +msgstr "這個版本庫已經存在" + +#: rhodecode/model/validators.py:386 +msgid "invalid clone url" +msgstr "無效的複製URL" + +#: rhodecode/model/validators.py:387 +msgid "Invalid clone url, provide a valid clone http\\s url" +msgstr "" + +#: rhodecode/model/validators.py:418 +#, fuzzy +#| msgid "Fork have to be the same type as original" +msgid "Fork have to be the same type as parent" +msgstr "Fork 必須使用相同的版本庫類型" + +#: rhodecode/model/validators.py:439 +msgid "This username or users group name is not valid" +msgstr "使用者名稱或群組名稱無效" + +#: rhodecode/model/validators.py:509 +msgid "This is not a valid path" +msgstr "不是一個有效的路徑" + +#: rhodecode/model/validators.py:524 +msgid "This e-mail address is already taken" +msgstr "這個郵件位址已經使用了" + +#: rhodecode/model/validators.py:544 +#, fuzzy, python-format +#| msgid "This e-mail address doesn't exist." +msgid "e-mail \"%(email)s\" does not exist." +msgstr "這個郵件位址不存在" + +#: rhodecode/model/validators.py:581 +msgid "" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" + #: rhodecode/templates/index.html:3 msgid "Dashboard" msgstr "儀表板" #: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/repo_switcher_list.html:4 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 -#: rhodecode/templates/journal/journal.html:31 +#: rhodecode/templates/journal/journal.html:40 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "快速過濾..." @@ -1035,16 +1221,16 @@ #: rhodecode/templates/index_base.html:67 #: rhodecode/templates/index_base.html:132 #: rhodecode/templates/index_base.html:158 -#: rhodecode/templates/admin/repos/repo_add_base.html:47 -#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repo_add_base.html:56 +#: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:37 #: rhodecode/templates/admin/repos/repos.html:84 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 -#: rhodecode/templates/forks/fork.html:49 +#: rhodecode/templates/forks/fork.html:59 #: rhodecode/templates/settings/repo_settings.html:57 -#: rhodecode/templates/summary/summary.html:100 +#: rhodecode/templates/summary/summary.html:105 msgid "Description" msgstr "描述" @@ -1059,20 +1245,21 @@ #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:36 #: rhodecode/templates/admin/repos/repos.html:82 +#: rhodecode/templates/admin/users/user_edit.html:170 #: rhodecode/templates/admin/users/user_edit_my_account.html:49 #: rhodecode/templates/admin/users/user_edit_my_account.html:99 #: rhodecode/templates/admin/users/user_edit_my_account.html:165 #: rhodecode/templates/admin/users/user_edit_my_account.html:200 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 -#: rhodecode/templates/branches/branches.html:36 +#: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:50 -#: rhodecode/templates/journal/journal.html:98 -#: rhodecode/templates/journal/journal.html:177 +#: rhodecode/templates/journal/journal.html:59 +#: rhodecode/templates/journal/journal.html:107 +#: rhodecode/templates/journal/journal.html:186 #: rhodecode/templates/settings/repo_settings.html:31 -#: rhodecode/templates/summary/summary.html:38 -#: rhodecode/templates/summary/summary.html:114 +#: rhodecode/templates/summary/summary.html:43 +#: rhodecode/templates/summary/summary.html:119 #: rhodecode/templates/tags/tags.html:36 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" @@ -1088,26 +1275,24 @@ #: rhodecode/templates/admin/repos/repos.html:39 #: rhodecode/templates/admin/repos/repos.html:87 #: rhodecode/templates/admin/users/user_edit_my_account.html:167 -#: rhodecode/templates/journal/journal.html:179 +#: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "" #: rhodecode/templates/index_base.html:70 #: rhodecode/templates/index_base.html:163 -#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repo_edit.html:112 #: rhodecode/templates/admin/repos/repos.html:89 msgid "Owner" msgstr "擁有者" #: rhodecode/templates/index_base.html:71 -#: rhodecode/templates/journal/public_journal.html:20 -#: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:46 +#: rhodecode/templates/summary/summary.html:48 +#: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "" #: rhodecode/templates/index_base.html:72 -#: rhodecode/templates/journal/public_journal.html:23 msgid "Atom" msgstr "" @@ -1133,8 +1318,8 @@ #: rhodecode/templates/admin/repos/repos.html:112 #: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:60 -#: rhodecode/templates/journal/journal.html:202 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:211 #: rhodecode/templates/tags/tags.html:60 msgid "Click to sort ascending" msgstr "" @@ -1144,8 +1329,8 @@ #: rhodecode/templates/admin/repos/repos.html:113 #: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:61 -#: rhodecode/templates/journal/journal.html:203 +#: rhodecode/templates/branches/branches.html:78 +#: rhodecode/templates/journal/journal.html:212 #: rhodecode/templates/tags/tags.html:61 msgid "Click to sort descending" msgstr "" @@ -1160,8 +1345,8 @@ #: rhodecode/templates/admin/repos/repos.html:114 #: rhodecode/templates/admin/users/user_edit_my_account.html:188 #: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:62 -#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/branches/branches.html:79 +#: rhodecode/templates/journal/journal.html:213 #: rhodecode/templates/tags/tags.html:62 msgid "No records found." msgstr "" @@ -1170,8 +1355,8 @@ #: rhodecode/templates/admin/repos/repos.html:115 #: rhodecode/templates/admin/users/user_edit_my_account.html:189 #: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:63 -#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/branches/branches.html:80 +#: rhodecode/templates/journal/journal.html:214 #: rhodecode/templates/tags/tags.html:63 msgid "Data error." msgstr "" @@ -1180,8 +1365,8 @@ #: rhodecode/templates/admin/repos/repos.html:116 #: rhodecode/templates/admin/users/user_edit_my_account.html:190 #: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:64 -#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/branches/branches.html:81 +#: rhodecode/templates/journal/journal.html:215 #: rhodecode/templates/tags/tags.html:64 #, fuzzy msgid "Loading..." @@ -1201,7 +1386,7 @@ #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:113 +#: rhodecode/templates/summary/summary.html:118 msgid "Username" msgstr "帳號" @@ -1275,7 +1460,7 @@ #: rhodecode/templates/admin/users/user_add.html:77 #: rhodecode/templates/admin/users/user_edit.html:104 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:115 +#: rhodecode/templates/summary/summary.html:120 msgid "Email" msgstr "電子郵件" @@ -1288,8 +1473,8 @@ msgstr "您的帳號註冊後將等待管理員啟用" #: rhodecode/templates/repo_switcher_list.html:11 -#: rhodecode/templates/admin/repos/repo_add_base.html:56 -#: rhodecode/templates/admin/repos/repo_edit.html:76 +#: rhodecode/templates/admin/repos/repo_add_base.html:65 +#: rhodecode/templates/admin/repos/repo_edit.html:85 #: rhodecode/templates/settings/repo_settings.html:67 msgid "Private repository" msgstr "私有的版本庫" @@ -1304,7 +1489,7 @@ msgstr "分支" #: rhodecode/templates/switch_to_list.html:10 -#: rhodecode/templates/branches/branches_data.html:51 +#: rhodecode/templates/branches/branches_data.html:57 msgid "There are no branches yet" msgstr "沒有任何分支" @@ -1340,8 +1525,8 @@ #: rhodecode/templates/admin/repos/repos.html:90 #: rhodecode/templates/admin/users/user_edit_my_account.html:51 #: rhodecode/templates/admin/users/user_edit_my_account.html:52 -#: rhodecode/templates/journal/journal.html:52 -#: rhodecode/templates/journal/journal.html:53 +#: rhodecode/templates/journal/journal.html:61 +#: rhodecode/templates/journal/journal.html:62 msgid "Action" msgstr "動作" @@ -1352,7 +1537,7 @@ #: rhodecode/templates/admin/admin_log.html:8 #: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:37 +#: rhodecode/templates/branches/branches.html:52 #: rhodecode/templates/tags/tags.html:37 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" @@ -1455,10 +1640,26 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:29 +msgid "All" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications.html:30 +#, fuzzy +#| msgid "commits" +msgid "Comments" +msgstr "遞交" + +#: rhodecode/templates/admin/notifications/notifications.html:31 +#: rhodecode/templates/base/base.html:251 +#: rhodecode/templates/base/base.html:253 +msgid "Pull requests" +msgstr "" + +#: rhodecode/templates/admin/notifications/notifications.html:35 msgid "Mark all read" msgstr "" -#: rhodecode/templates/admin/notifications/notifications_data.html:38 +#: rhodecode/templates/admin/notifications/notifications_data.html:34 msgid "No notifications here yet" msgstr "" @@ -1478,7 +1679,7 @@ msgstr "權限管理員" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: rhodecode/templates/admin/repos/repo_edit.html:125 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 #: rhodecode/templates/admin/users/user_edit.html:139 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 @@ -1518,7 +1719,7 @@ msgstr "版本庫建立" #: rhodecode/templates/admin/permissions/permissions.html:71 -#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/admin/repos/repo_edit.html:227 msgid "set" msgstr "設定" @@ -1535,8 +1736,8 @@ msgstr "版本庫" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:90 -#: rhodecode/templates/summary/summary.html:91 +#: rhodecode/templates/summary/summary.html:95 +#: rhodecode/templates/summary/summary.html:96 msgid "Clone from" msgstr "複製由" @@ -1549,15 +1750,14 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:29 #: rhodecode/templates/admin/repos/repo_edit.html:49 #: rhodecode/templates/admin/repos_groups/repos_groups.html:4 -#: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/forks/fork.html:50 #: rhodecode/templates/settings/repo_settings.html:48 msgid "Repository group" msgstr "版本庫群組" #: rhodecode/templates/admin/repos/repo_add_base.html:33 -#: rhodecode/templates/admin/repos/repo_edit.html:53 -#: rhodecode/templates/settings/repo_settings.html:52 -msgid "Optional select a group to put this repository into." +#: rhodecode/templates/forks/fork.html:54 +msgid "Optionaly select a group to put this repository into." msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:38 @@ -1570,21 +1770,37 @@ msgid "Type of repository to create." msgstr "版本庫建立" +#: rhodecode/templates/admin/repos/repo_add_base.html:47 +#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/forks/fork.html:41 +#, fuzzy +#| msgid "next revision" +msgid "Landing revision" +msgstr "下一個修訂" + #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 +#: rhodecode/templates/forks/fork.html:45 +msgid "Default revision for files page, downloads, whoosh and readme" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.html:60 +#: rhodecode/templates/admin/repos/repo_edit.html:79 +#: rhodecode/templates/forks/fork.html:63 #: rhodecode/templates/settings/repo_settings.html:61 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:60 -#: rhodecode/templates/admin/repos/repo_edit.html:80 +#: rhodecode/templates/admin/repos/repo_add_base.html:69 +#: rhodecode/templates/admin/repos/repo_edit.html:89 +#: rhodecode/templates/forks/fork.html:72 #: rhodecode/templates/settings/repo_settings.html:71 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:64 +#: rhodecode/templates/admin/repos/repo_add_base.html:73 msgid "add" msgstr "新增" @@ -1600,8 +1816,8 @@ #: rhodecode/templates/admin/users/user_edit.html:13 #: rhodecode/templates/admin/users/user_edit_my_account.html:71 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/files/files_source.html:32 -#: rhodecode/templates/journal/journal.html:72 +#: rhodecode/templates/files/files_source.html:44 +#: rhodecode/templates/journal/journal.html:81 msgid "edit" msgstr "編輯" @@ -1610,103 +1826,115 @@ msgid "Clone uri" msgstr "複製URL" -#: rhodecode/templates/admin/repos/repo_edit.html:85 -msgid "Enable statistics" -msgstr "啟用統計" - -#: rhodecode/templates/admin/repos/repo_edit.html:89 -msgid "Enable statistics window on summary page." +#: rhodecode/templates/admin/repos/repo_edit.html:53 +#: rhodecode/templates/settings/repo_settings.html:52 +msgid "Optional select a group to put this repository into." msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:94 -msgid "Enable downloads" -msgstr "啟用下載" +msgid "Enable statistics" +msgstr "啟用統計" #: rhodecode/templates/admin/repos/repo_edit.html:98 +msgid "Enable statistics window on summary page." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:103 +msgid "Enable downloads" +msgstr "啟用下載" + +#: rhodecode/templates/admin/repos/repo_edit.html:107 msgid "Enable download menu on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:108 +#: rhodecode/templates/admin/repos/repo_edit.html:117 #, fuzzy msgid "Change owner of this repository." msgstr "修改於版本庫 %s" -#: rhodecode/templates/admin/repos/repo_edit.html:134 +#: rhodecode/templates/admin/repos/repo_edit.html:143 msgid "Administration" msgstr "管理者" -#: rhodecode/templates/admin/repos/repo_edit.html:137 +#: rhodecode/templates/admin/repos/repo_edit.html:146 msgid "Statistics" msgstr "統計" -#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos/repo_edit.html:150 msgid "Reset current statistics" msgstr "重設目前的統計" -#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos/repo_edit.html:150 msgid "Confirm to remove current statistics" msgstr "確認移除目前的統計" -#: rhodecode/templates/admin/repos/repo_edit.html:144 +#: rhodecode/templates/admin/repos/repo_edit.html:153 msgid "Fetched to rev" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:145 +#: rhodecode/templates/admin/repos/repo_edit.html:154 msgid "Stats gathered" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:153 +#: rhodecode/templates/admin/repos/repo_edit.html:162 msgid "Remote" msgstr "遠端" -#: rhodecode/templates/admin/repos/repo_edit.html:157 +#: rhodecode/templates/admin/repos/repo_edit.html:166 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:157 +#: rhodecode/templates/admin/repos/repo_edit.html:166 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:168 +#: rhodecode/templates/admin/repos/repo_edit.html:177 msgid "Cache" msgstr "快取" -#: rhodecode/templates/admin/repos/repo_edit.html:172 +#: rhodecode/templates/admin/repos/repo_edit.html:181 msgid "Invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:172 +#: rhodecode/templates/admin/repos/repo_edit.html:181 msgid "Confirm to invalidate repository cache" msgstr "確認廢止版本庫快取" -#: rhodecode/templates/admin/repos/repo_edit.html:183 +#: rhodecode/templates/admin/repos/repo_edit.html:186 +#: rhodecode/templates/base/base.html:315 +#: rhodecode/templates/base/base.html:317 +#: rhodecode/templates/base/base.html:319 +msgid "Public journal" +msgstr "公開日誌" + +#: rhodecode/templates/admin/repos/repo_edit.html:192 msgid "Remove from public journal" msgstr "從公開日誌移除" -#: rhodecode/templates/admin/repos/repo_edit.html:185 +#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Add to public journal" msgstr "新增至公開日誌" -#: rhodecode/templates/admin/repos/repo_edit.html:190 +#: rhodecode/templates/admin/repos/repo_edit.html:199 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:197 -#: rhodecode/templates/changeset/changeset_file_comment.html:19 +#: rhodecode/templates/admin/repos/repo_edit.html:206 +#: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "移除" -#: rhodecode/templates/admin/repos/repo_edit.html:201 +#: rhodecode/templates/admin/repos/repo_edit.html:210 msgid "Remove this repository" msgstr "移除版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:201 +#: rhodecode/templates/admin/repos/repo_edit.html:210 msgid "Confirm to delete this repository" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:205 +#: rhodecode/templates/admin/repos/repo_edit.html:214 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -1714,12 +1942,12 @@ "please do it manually" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:213 -msgid "Set as fork" +#: rhodecode/templates/admin/repos/repo_edit.html:222 +msgid "Set as fork of" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:222 -msgid "Manually set this repository as a fork of another" +#: rhodecode/templates/admin/repos/repo_edit.html:231 +msgid "Manually set this repository as a fork of another from the list" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 @@ -1751,11 +1979,19 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:61 -#: rhodecode/templates/journal/journal.html:123 -#: rhodecode/templates/summary/summary.html:71 +#: rhodecode/templates/journal/journal.html:132 +#: rhodecode/templates/summary/summary.html:76 msgid "private repository" msgstr "私有版本庫" +#: rhodecode/templates/admin/repos/repo_edit_perms.html:19 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:28 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18 +#, fuzzy +#| msgid "delete" +msgid "default" +msgstr "刪除" + #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 @@ -1783,12 +2019,13 @@ msgstr "版本庫管理員" #: rhodecode/templates/admin/repos/repos.html:40 -#: rhodecode/templates/summary/summary.html:107 +#: rhodecode/templates/summary/summary.html:112 msgid "Contact" msgstr "聯絡方式" #: rhodecode/templates/admin/repos/repos.html:68 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/users/user_edit.html:222 #: rhodecode/templates/admin/users/users.html:55 #: rhodecode/templates/admin/users_groups/users_groups.html:44 msgid "delete" @@ -1846,10 +2083,12 @@ #: rhodecode/templates/admin/settings/settings.html:177 #: rhodecode/templates/admin/users/user_edit.html:130 #: rhodecode/templates/admin/users/user_edit.html:155 +#: rhodecode/templates/admin/users/user_edit.html:245 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 #: rhodecode/templates/admin/users_groups/users_group_edit.html:116 #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 +#: rhodecode/templates/pullrequests/pullrequest.html:135 #: rhodecode/templates/settings/repo_settings.html:85 msgid "Reset" msgstr "重設" @@ -1889,7 +2128,6 @@ #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:9 -#: rhodecode/templates/settings/repo_settings.html:5 #: rhodecode/templates/settings/repo_settings.html:13 msgid "Settings" msgstr "設定" @@ -2108,6 +2346,37 @@ msgid "Create repositories" msgstr "建立版本庫" +#: rhodecode/templates/admin/users/user_edit.html:171 +#: rhodecode/templates/admin/users/user_edit_my_account.html:100 +#: rhodecode/templates/admin/users/user_edit_my_account.html:201 +#, fuzzy +msgid "Permission" +msgstr "權限" + +#: rhodecode/templates/admin/users/user_edit.html:210 +#, fuzzy +#| msgid "Email address" +msgid "Email addresses" +msgstr "郵件位址" + +#: rhodecode/templates/admin/users/user_edit.html:223 +#, fuzzy, python-format +#| msgid "Confirm to delete this user: %s" +msgid "Confirm to delete this email: %s" +msgstr "確認刪除這個使用者" + +#: rhodecode/templates/admin/users/user_edit.html:237 +#, fuzzy +#| msgid "Email address" +msgid "New email address" +msgstr "郵件位址" + +#: rhodecode/templates/admin/users/user_edit.html:244 +#, fuzzy +#| msgid "add" +msgid "Add" +msgstr "新增" + #: rhodecode/templates/admin/users/user_edit_my_account.html:5 #: rhodecode/templates/base/base.html:124 msgid "My account" @@ -2118,7 +2387,7 @@ msgstr "我的帳號" #: rhodecode/templates/admin/users/user_edit_my_account.html:32 -#: rhodecode/templates/journal/journal.html:32 +#: rhodecode/templates/journal/journal.html:41 #, fuzzy msgid "My repos" msgstr "空的版本庫" @@ -2129,7 +2398,7 @@ msgstr "權限" #: rhodecode/templates/admin/users/user_edit_my_account.html:37 -#: rhodecode/templates/journal/journal.html:37 +#: rhodecode/templates/journal/journal.html:46 #, fuzzy msgid "ADD" msgstr "新增" @@ -2137,34 +2406,28 @@ #: rhodecode/templates/admin/users/user_edit_my_account.html:50 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 -#: rhodecode/templates/branches/branches.html:40 -#: rhodecode/templates/journal/journal.html:51 +#: rhodecode/templates/branches/branches.html:55 +#: rhodecode/templates/journal/journal.html:60 #: rhodecode/templates/tags/tags.html:40 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "修訂" #: rhodecode/templates/admin/users/user_edit_my_account.html:71 -#: rhodecode/templates/journal/journal.html:72 +#: rhodecode/templates/journal/journal.html:81 msgid "private" msgstr "私有" #: rhodecode/templates/admin/users/user_edit_my_account.html:81 -#: rhodecode/templates/journal/journal.html:85 +#: rhodecode/templates/journal/journal.html:94 msgid "No repositories yet" msgstr "沒有任何版本庫" #: rhodecode/templates/admin/users/user_edit_my_account.html:83 -#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/journal/journal.html:96 msgid "create one now" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:201 -#, fuzzy -msgid "Permission" -msgstr "權限" - #: rhodecode/templates/admin/users/users.html:5 msgid "Users administration" msgstr "使用者管理員" @@ -2235,6 +2498,7 @@ msgstr "選擇群組成員" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 +#: rhodecode/templates/pullrequests/pullrequest.html:81 msgid "Remove all elements" msgstr "移除所有元素" @@ -2243,6 +2507,7 @@ msgstr "啟用的成員" #: rhodecode/templates/admin/users_groups/users_group_edit.html:79 +#: rhodecode/templates/pullrequests/pullrequest.html:99 msgid "Add all elements" msgstr "新增索有元素" @@ -2295,18 +2560,37 @@ msgstr "" #: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:289 -#: rhodecode/templates/base/base.html:291 -#: rhodecode/templates/base/base.html:293 +#: rhodecode/templates/base/base.html:297 +#: rhodecode/templates/base/base.html:299 +#: rhodecode/templates/base/base.html:301 +#: rhodecode/templates/bookmarks/bookmarks.html:11 +#: rhodecode/templates/branches/branches.html:10 +#: rhodecode/templates/changelog/changelog.html:10 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/compare/compare_diff.html:9 +#: rhodecode/templates/files/file_diff.html:8 +#: rhodecode/templates/files/files.html:8 +#: rhodecode/templates/files/files_add.html:15 +#: rhodecode/templates/files/files_edit.html:15 +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/pullrequests/pullrequest.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 +#: rhodecode/templates/settings/repo_settings.html:9 +#: rhodecode/templates/shortlog/shortlog.html:10 +#: rhodecode/templates/summary/summary.html:8 +#: rhodecode/templates/tags/tags.html:11 msgid "Home" msgstr "首頁" #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:298 -#: rhodecode/templates/base/base.html:300 -#: rhodecode/templates/base/base.html:302 +#: rhodecode/templates/base/base.html:306 +#: rhodecode/templates/base/base.html:308 +#: rhodecode/templates/base/base.html:310 #: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/journal.html:17 +#: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "日誌" @@ -2334,14 +2618,12 @@ #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 -#: rhodecode/templates/summary/summary.html:4 msgid "Summary" msgstr "概況" #: rhodecode/templates/base/base.html:166 #: rhodecode/templates/base/base.html:168 #: rhodecode/templates/base/base.html:170 -#: rhodecode/templates/changelog/changelog.html:6 #: rhodecode/templates/changelog/changelog.html:15 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 @@ -2361,7 +2643,6 @@ #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 -#: rhodecode/templates/files/files.html:4 #: rhodecode/templates/files/files.html:40 msgid "Files" msgstr "檔案" @@ -2387,10 +2668,6 @@ msgid "search" msgstr "搜尋" -#: rhodecode/templates/base/base.html:217 -msgid "journal" -msgstr "日誌" - #: rhodecode/templates/base/base.html:219 msgid "repositories groups" msgstr "版本庫群組" @@ -2409,22 +2686,18 @@ #: rhodecode/templates/base/base.html:235 #: rhodecode/templates/base/base.html:237 -#: rhodecode/templates/followers/followers.html:5 msgid "Followers" msgstr "追蹤者" #: rhodecode/templates/base/base.html:243 #: rhodecode/templates/base/base.html:245 -#: rhodecode/templates/forks/forks.html:5 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:316 -#: rhodecode/templates/base/base.html:318 -#: rhodecode/templates/base/base.html:320 -#: rhodecode/templates/search/search.html:4 -#: rhodecode/templates/search/search.html:24 -#: rhodecode/templates/search/search.html:46 +#: rhodecode/templates/base/base.html:324 +#: rhodecode/templates/base/base.html:326 +#: rhodecode/templates/base/base.html:328 +#: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "搜尋" @@ -2434,13 +2707,13 @@ msgstr "新增另ㄧ位成員" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:111 -#: rhodecode/templates/summary/summary.html:52 +#: rhodecode/templates/journal/journal.html:120 +#: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "停止追蹤這個版本庫" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/summary/summary.html:56 +#: rhodecode/templates/summary/summary.html:61 msgid "Start following this repository" msgstr "開始追蹤這個版本庫" @@ -2448,19 +2721,48 @@ msgid "Group" msgstr "群組" +#: rhodecode/templates/base/root.html:47 +msgid "search truncated" +msgstr "" + +#: rhodecode/templates/base/root.html:48 +msgid "no matching files" +msgstr "無符合的檔案" + #: rhodecode/templates/bookmarks/bookmarks.html:5 -msgid "Bookmarks" +#, python-format +msgid "%s Bookmarks" msgstr "" #: rhodecode/templates/bookmarks/bookmarks.html:39 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:39 +#: rhodecode/templates/branches/branches.html:54 #: rhodecode/templates/tags/tags.html:39 #: rhodecode/templates/tags/tags_data.html:8 #, fuzzy msgid "Author" msgstr "作者" +#: rhodecode/templates/branches/branches.html:5 +#, fuzzy, python-format +#| msgid "branches" +msgid "%s Branches" +msgstr "分支" + +#: rhodecode/templates/branches/branches.html:29 +#, fuzzy +#| msgid "branches" +msgid "Compare branches" +msgstr "分支" + +#: rhodecode/templates/branches/branches.html:57 +#: rhodecode/templates/compare/compare_diff.html:5 +#: rhodecode/templates/compare/compare_diff.html:13 +#, fuzzy +#| msgid "Compare View" +msgid "Compare" +msgstr "比較顯示" + #: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "日期" @@ -2475,42 +2777,80 @@ msgid "revision" msgstr "修訂" +#: rhodecode/templates/branches/branches_data.html:10 +#, fuzzy +#| msgid "Compare View" +msgid "compare" +msgstr "比較顯示" + +#: rhodecode/templates/changelog/changelog.html:6 +#, fuzzy, python-format +#| msgid "Changelog" +msgid "%s Changelog" +msgstr "修改紀錄" + #: rhodecode/templates/changelog/changelog.html:15 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" -#: rhodecode/templates/changelog/changelog.html:38 +#: rhodecode/templates/changelog/changelog.html:37 +#, python-format +msgid "compare fork with %s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:37 +msgid "Compare fork" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:39 +msgid "Open new pull request" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:44 msgid "Show" msgstr "顯示" -#: rhodecode/templates/changelog/changelog.html:64 -#: rhodecode/templates/summary/summary.html:352 +#: rhodecode/templates/changelog/changelog.html:70 +#: rhodecode/templates/summary/summary.html:357 msgid "show more" msgstr "顯示更多" -#: rhodecode/templates/changelog/changelog.html:68 +#: rhodecode/templates/changelog/changelog.html:74 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:82 -#: rhodecode/templates/changeset/changeset.html:72 +#: rhodecode/templates/changelog/changelog.html:87 +#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changeset/changeset_file_comment.html:20 +#: rhodecode/templates/changeset/changeset_range.html:46 +#, fuzzy +#| msgid "Changesets" +msgid "Changeset status" +msgstr "變更" + +#: rhodecode/templates/changelog/changelog.html:90 +msgid "Click to open associated pull request" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:100 +#: rhodecode/templates/changeset/changeset.html:78 msgid "Parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:88 -#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changelog/changelog.html:106 +#: rhodecode/templates/changeset/changeset.html:84 msgid "No parents" msgstr "" -#: rhodecode/templates/changelog/changelog.html:93 -#: rhodecode/templates/changeset/changeset.html:82 +#: rhodecode/templates/changelog/changelog.html:111 +#: rhodecode/templates/changeset/changeset.html:88 msgid "merge" msgstr "合併" -#: rhodecode/templates/changelog/changelog.html:96 -#: rhodecode/templates/changeset/changeset.html:85 +#: rhodecode/templates/changelog/changelog.html:114 +#: rhodecode/templates/changeset/changeset.html:91 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 @@ -2518,134 +2858,158 @@ msgid "branch" msgstr "分支" -#: rhodecode/templates/changelog/changelog.html:102 +#: rhodecode/templates/changelog/changelog.html:120 msgid "bookmark" msgstr "" -#: rhodecode/templates/changelog/changelog.html:108 -#: rhodecode/templates/changeset/changeset.html:90 +#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changeset/changeset.html:96 msgid "tag" msgstr "標籤" -#: rhodecode/templates/changelog/changelog.html:144 +#: rhodecode/templates/changelog/changelog.html:162 msgid "Show selected changes __S -> __E" msgstr "" -#: rhodecode/templates/changelog/changelog.html:235 +#: rhodecode/templates/changelog/changelog.html:253 msgid "There are no changes yet" msgstr "尚未有任何變更" -#: rhodecode/templates/changelog/changelog_details.html:2 -#: rhodecode/templates/changeset/changeset.html:60 +#: rhodecode/templates/changelog/changelog_details.html:4 +#: rhodecode/templates/changeset/changeset.html:66 msgid "removed" msgstr "移除" -#: rhodecode/templates/changelog/changelog_details.html:3 -#: rhodecode/templates/changeset/changeset.html:61 +#: rhodecode/templates/changelog/changelog_details.html:5 +#: rhodecode/templates/changeset/changeset.html:67 msgid "changed" msgstr "修改" -#: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:62 +#: rhodecode/templates/changelog/changelog_details.html:6 +#: rhodecode/templates/changeset/changeset.html:68 msgid "added" msgstr "新增" -#: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changelog/changelog_details.html:7 #: rhodecode/templates/changelog/changelog_details.html:8 -#: rhodecode/templates/changeset/changeset.html:64 -#: rhodecode/templates/changeset/changeset.html:65 -#: rhodecode/templates/changeset/changeset.html:66 +#: rhodecode/templates/changelog/changelog_details.html:9 +#: rhodecode/templates/changelog/changelog_details.html:10 +#: rhodecode/templates/changeset/changeset.html:70 +#: rhodecode/templates/changeset/changeset.html:71 +#: rhodecode/templates/changeset/changeset.html:72 #, python-format msgid "affected %s files" msgstr "" #: rhodecode/templates/changeset/changeset.html:6 +#, fuzzy, python-format +#| msgid "No changes" +msgid "%s Changeset" +msgstr "沒有修改" + #: rhodecode/templates/changeset/changeset.html:14 msgid "Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:37 +#: rhodecode/templates/changeset/changeset.html:43 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "原始差異" -#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changeset/changeset.html:44 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "下載差異" -#: rhodecode/templates/changeset/changeset.html:42 -#: rhodecode/templates/changeset/changeset_file_comment.html:71 +#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:82 #, fuzzy, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "遞交" -#: rhodecode/templates/changeset/changeset.html:42 -#: rhodecode/templates/changeset/changeset_file_comment.html:71 +#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "" -#: rhodecode/templates/changeset/changeset.html:97 +#: rhodecode/templates/changeset/changeset.html:103 #, python-format msgid "%s files affected with %s insertions and %s deletions:" msgstr "" -#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/changeset/changeset.html:119 msgid "Changeset was too big and was cut off..." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:35 +#: rhodecode/templates/changeset/changeset_file_comment.html:42 msgid "Submitting..." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:38 +#: rhodecode/templates/changeset/changeset_file_comment.html:45 msgid "Commenting on line {1}." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:39 -#: rhodecode/templates/changeset/changeset_file_comment.html:102 +#: rhodecode/templates/changeset/changeset_file_comment.html:46 +#: rhodecode/templates/changeset/changeset_file_comment.html:115 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:41 -#: rhodecode/templates/changeset/changeset_file_comment.html:104 +#: rhodecode/templates/changeset/changeset_file_comment.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:117 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:49 -#: rhodecode/templates/changeset/changeset_file_comment.html:110 +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +#: rhodecode/templates/changeset/changeset_file_comment.html:132 #, fuzzy msgid "Comment" msgstr "遞交" -#: rhodecode/templates/changeset/changeset_file_comment.html:50 -#: rhodecode/templates/changeset/changeset_file_comment.html:61 +#: rhodecode/templates/changeset/changeset_file_comment.html:60 +#: rhodecode/templates/changeset/changeset_file_comment.html:71 msgid "Hide" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:57 +#: rhodecode/templates/changeset/changeset_file_comment.html:67 #, fuzzy msgid "You need to be logged in to comment." msgstr "您必須登入後才能瀏覽這個頁面" -#: rhodecode/templates/changeset/changeset_file_comment.html:57 +#: rhodecode/templates/changeset/changeset_file_comment.html:67 msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:99 +#: rhodecode/templates/changeset/changeset_file_comment.html:112 msgid "Leave a comment" msgstr "" +#: rhodecode/templates/changeset/changeset_file_comment.html:118 +msgid "Check this to change current status of code-review for this changeset" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#, fuzzy +#| msgid "Changesets" +msgid "change status" +msgstr "變更" + +#: rhodecode/templates/changeset/changeset_range.html:5 +#, fuzzy, python-format +#| msgid "Changesets" +msgid "%s Changesets" +msgstr "變更" + #: rhodecode/templates/changeset/changeset_range.html:29 +#: rhodecode/templates/compare/compare_diff.html:29 msgid "Compare View" msgstr "比較顯示" -#: rhodecode/templates/changeset/changeset_range.html:49 +#: rhodecode/templates/changeset/changeset_range.html:54 +#: rhodecode/templates/compare/compare_diff.html:41 +#: rhodecode/templates/pullrequests/pullrequest_show.html:71 msgid "Files affected" msgstr "" @@ -2658,34 +3022,45 @@ msgid "show inline comments" msgstr "文件內容" +#: rhodecode/templates/compare/compare_cs.html:5 +#, fuzzy +#| msgid "No changesets yet" +msgid "No changesets" +msgstr "尚未有任何變更" + +#: rhodecode/templates/compare/compare_diff.html:37 +#, fuzzy +#| msgid "No changesets yet" +msgid "Outgoing changesets" +msgstr "尚未有任何變更" + #: rhodecode/templates/data_table/_dt_elements.html:33 #: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/data_table/_dt_elements.html:37 -#: rhodecode/templates/forks/fork.html:5 msgid "Fork" msgstr "分支" #: rhodecode/templates/data_table/_dt_elements.html:54 -#: rhodecode/templates/journal/journal.html:117 -#: rhodecode/templates/summary/summary.html:63 +#: rhodecode/templates/journal/journal.html:126 +#: rhodecode/templates/summary/summary.html:68 msgid "Mercurial repository" msgstr "Mercurial 版本庫" #: rhodecode/templates/data_table/_dt_elements.html:56 -#: rhodecode/templates/journal/journal.html:119 -#: rhodecode/templates/summary/summary.html:66 +#: rhodecode/templates/journal/journal.html:128 +#: rhodecode/templates/summary/summary.html:71 msgid "Git repository" msgstr "Git 版本庫" #: rhodecode/templates/data_table/_dt_elements.html:63 -#: rhodecode/templates/journal/journal.html:125 -#: rhodecode/templates/summary/summary.html:73 +#: rhodecode/templates/journal/journal.html:134 +#: rhodecode/templates/summary/summary.html:78 msgid "public repository" msgstr "公開版本庫" #: rhodecode/templates/data_table/_dt_elements.html:74 -#: rhodecode/templates/summary/summary.html:82 -#: rhodecode/templates/summary/summary.html:83 +#: rhodecode/templates/summary/summary.html:87 +#: rhodecode/templates/summary/summary.html:88 msgid "Fork of" msgstr "" @@ -2697,32 +3072,37 @@ msgid "This is an notification from RhodeCode." msgstr "" -#: rhodecode/templates/errors/error_document.html:44 +#: rhodecode/templates/errors/error_document.html:46 #, python-format msgid "You will be redirected to %s in %s seconds" msgstr "" #: rhodecode/templates/files/file_diff.html:4 +#, fuzzy, python-format +#| msgid "File diff" +msgid "%s File diff" +msgstr "檔案差異" + #: rhodecode/templates/files/file_diff.html:12 msgid "File diff" msgstr "檔案差異" +#: rhodecode/templates/files/files.html:4 +#, fuzzy, python-format +#| msgid "files" +msgid "%s Files" +msgstr "檔案" + #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:328 +#: rhodecode/templates/summary/summary.html:333 msgid "files" msgstr "檔案" -#: rhodecode/templates/files/files.html:44 -msgid "search truncated" -msgstr "" - -#: rhodecode/templates/files/files.html:45 -msgid "no matching files" -msgstr "無符合的檔案" - #: rhodecode/templates/files/files_add.html:4 #: rhodecode/templates/files/files_edit.html:4 -msgid "Edit file" +#, fuzzy, python-format +#| msgid "edit file" +msgid "%s Edit file" msgstr "編輯檔案" #: rhodecode/templates/files/files_add.html:19 @@ -2834,18 +3214,18 @@ msgstr "編輯檔案" #: rhodecode/templates/files/files_edit.html:49 -#: rhodecode/templates/files/files_source.html:26 +#: rhodecode/templates/files/files_source.html:38 msgid "show annotation" msgstr "險是註釋" #: rhodecode/templates/files/files_edit.html:50 -#: rhodecode/templates/files/files_source.html:28 -#: rhodecode/templates/files/files_source.html:56 +#: rhodecode/templates/files/files_source.html:40 +#: rhodecode/templates/files/files_source.html:68 msgid "show as raw" msgstr "顯示原始文件" #: rhodecode/templates/files/files_edit.html:51 -#: rhodecode/templates/files/files_source.html:29 +#: rhodecode/templates/files/files_source.html:41 msgid "download as raw" msgstr "下載原始文件" @@ -2863,20 +3243,39 @@ msgid "History" msgstr "歷史" -#: rhodecode/templates/files/files_source.html:24 +#: rhodecode/templates/files/files_source.html:9 +#, fuzzy +#| msgid "next revision" +msgid "diff to revision" +msgstr "下一個修訂" + +#: rhodecode/templates/files/files_source.html:10 +#, fuzzy +#| msgid "next revision" +msgid "show at revision" +msgstr "下一個修訂" + +#: rhodecode/templates/files/files_source.html:14 +#, fuzzy, python-format +#| msgid "author" +msgid "%s author" +msgid_plural "%s authors" +msgstr[0] "作者" + +#: rhodecode/templates/files/files_source.html:36 msgid "show source" msgstr "顯示原始碼" -#: rhodecode/templates/files/files_source.html:47 +#: rhodecode/templates/files/files_source.html:59 #, python-format msgid "Binary file (%s)" msgstr "二進位檔 (%s)" -#: rhodecode/templates/files/files_source.html:56 +#: rhodecode/templates/files/files_source.html:68 msgid "File is too big to display" msgstr "顯示的檔案太大" -#: rhodecode/templates/files/files_source.html:112 +#: rhodecode/templates/files/files_source.html:124 msgid "Selection link" msgstr "" @@ -2893,35 +3292,63 @@ msgid "No files at given path" msgstr "" +#: rhodecode/templates/followers/followers.html:5 +#, fuzzy, python-format +#| msgid "followers" +msgid "%s Followers" +msgstr "追蹤者" + #: rhodecode/templates/followers/followers.html:13 msgid "followers" msgstr "追蹤者" #: rhodecode/templates/followers/followers_data.html:12 -msgid "Started following" +#, fuzzy +#| msgid "Started following" +msgid "Started following -" msgstr "開始追蹤" +#: rhodecode/templates/forks/fork.html:5 +#, fuzzy, python-format +#| msgid "forks" +msgid "%s Fork" +msgstr "分支" + #: rhodecode/templates/forks/fork.html:31 msgid "Fork name" msgstr "分支名稱" -#: rhodecode/templates/forks/fork.html:57 +#: rhodecode/templates/forks/fork.html:68 msgid "Private" msgstr "私有" -#: rhodecode/templates/forks/fork.html:65 +#: rhodecode/templates/forks/fork.html:77 #, fuzzy msgid "Copy permissions" msgstr "權限" -#: rhodecode/templates/forks/fork.html:73 +#: rhodecode/templates/forks/fork.html:81 +msgid "Copy permissions from forked repository" +msgstr "" + +#: rhodecode/templates/forks/fork.html:86 msgid "Update after clone" msgstr "" -#: rhodecode/templates/forks/fork.html:80 +#: rhodecode/templates/forks/fork.html:90 +msgid "Checkout source after making a clone" +msgstr "" + +#: rhodecode/templates/forks/fork.html:94 msgid "fork this repository" msgstr "fork 這個版本庫" +#: rhodecode/templates/forks/forks.html:5 +#, fuzzy, python-format +#| msgid "forks" +msgid "%s Forks" +msgstr "分支" + #: rhodecode/templates/forks/forks.html:13 msgid "forks" msgstr "分支" @@ -2934,24 +3361,47 @@ msgid "There are no forks yet" msgstr "尚未有任何 fork" -#: rhodecode/templates/journal/journal.html:20 +#: rhodecode/templates/journal/journal.html:13 +#, fuzzy, python-format +#| msgid "%s public journal %s feed" +msgid "ATOM journal feed" +msgstr "%s 公開日誌 %s feed" + +#: rhodecode/templates/journal/journal.html:14 +#, fuzzy, python-format +#| msgid "%s public journal %s feed" +msgid "RSS journal feed" +msgstr "%s 公開日誌 %s feed" + +#: rhodecode/templates/journal/journal.html:24 +#: rhodecode/templates/pullrequests/pullrequest.html:27 msgid "Refresh" msgstr "" -#: rhodecode/templates/journal/journal.html:32 +#: rhodecode/templates/journal/journal.html:27 +#: rhodecode/templates/journal/public_journal.html:24 +msgid "RSS feed" +msgstr "" + +#: rhodecode/templates/journal/journal.html:30 +#: rhodecode/templates/journal/public_journal.html:27 +msgid "ATOM feed" +msgstr "" + +#: rhodecode/templates/journal/journal.html:41 #, fuzzy msgid "Watched" msgstr "快取" -#: rhodecode/templates/journal/journal.html:105 +#: rhodecode/templates/journal/journal.html:114 msgid "following user" msgstr "追蹤使用者" -#: rhodecode/templates/journal/journal.html:105 +#: rhodecode/templates/journal/journal.html:114 msgid "user" msgstr "使用者" -#: rhodecode/templates/journal/journal.html:138 +#: rhodecode/templates/journal/journal.html:147 msgid "You are not following any users or repositories" msgstr "您尚未追蹤任何使用者或版本庫" @@ -2959,33 +3409,147 @@ msgid "No entries yet" msgstr "" -#: rhodecode/templates/journal/public_journal.html:17 +#: rhodecode/templates/journal/public_journal.html:13 +#, fuzzy, python-format +#| msgid "%s public journal %s feed" +msgid "ATOM public journal feed" +msgstr "%s 公開日誌 %s feed" + +#: rhodecode/templates/journal/public_journal.html:14 +#, fuzzy, python-format +#| msgid "%s public journal %s feed" +msgid "RSS public journal feed" +msgstr "%s 公開日誌 %s feed" + +#: rhodecode/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "開放日誌" -#: rhodecode/templates/search/search.html:7 -#: rhodecode/templates/search/search.html:26 -msgid "in repository: " +#: rhodecode/templates/pullrequests/pullrequest.html:4 +#: rhodecode/templates/pullrequests/pullrequest.html:12 +msgid "New pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:28 +msgid "refresh overview" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:66 +#, fuzzy +#| msgid "Compare View" +msgid "Detailed compare view" +msgstr "比較顯示" + +#: rhodecode/templates/pullrequests/pullrequest.html:70 +#: rhodecode/templates/pullrequests/pullrequest_show.html:40 +msgid "Pull request reviewers" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:78 +msgid "Chosen reviewers" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:95 +#, fuzzy +#| msgid "Available members" +msgid "Available reviewers" +msgstr "啟用的成員" + +#: rhodecode/templates/pullrequests/pullrequest.html:108 +#, fuzzy +#| msgid "Create new file" +msgid "Create new pull request" +msgstr "建立使用者 %s" + +#: rhodecode/templates/pullrequests/pullrequest.html:117 +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#, fuzzy +#| msgid "write" +msgid "Title" +msgstr "寫" + +#: rhodecode/templates/pullrequests/pullrequest.html:126 +#, fuzzy +#| msgid "Description" +msgid "description" +msgstr "描述" + +#: rhodecode/templates/pullrequests/pullrequest.html:134 +msgid "Send pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#, python-format +msgid "Pull request #%s" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:26 +msgid "Pull request status" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:33 +#, fuzzy +#| msgid "[created] user" +msgid "Created on" +msgstr "建立使用者 %s" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#, fuzzy +#| msgid "Compare View" +msgid "Compare view" +msgstr "比較顯示" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:67 +#, fuzzy +#| msgid "No changesets yet" +msgid "Incoming changesets" +msgstr "尚未有任何變更" + +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 +msgid "All pull requests" +msgstr "" + +#: rhodecode/templates/search/search.html:6 +#, fuzzy, python-format +#| msgid "in repository: " +msgid "Search \"%s\" in repository: %s" msgstr "於版本庫:" -#: rhodecode/templates/search/search.html:9 -#: rhodecode/templates/search/search.html:28 -msgid "in all repositories" +#: rhodecode/templates/search/search.html:8 +#, fuzzy, python-format +#| msgid "in all repositories" +msgid "Search \"%s\" in all repositories" msgstr "於所有的版本庫" -#: rhodecode/templates/search/search.html:42 +#: rhodecode/templates/search/search.html:12 +#: rhodecode/templates/search/search.html:32 +#, fuzzy, python-format +#| msgid "in repository: " +msgid "Search in repository: %s" +msgstr "於版本庫:" + +#: rhodecode/templates/search/search.html:14 +#: rhodecode/templates/search/search.html:34 +#, fuzzy +#| msgid "in all repositories" +msgid "Search in all repositories" +msgstr "於所有的版本庫" + +#: rhodecode/templates/search/search.html:48 msgid "Search term" msgstr "搜尋關鍵字" -#: rhodecode/templates/search/search.html:54 +#: rhodecode/templates/search/search.html:60 msgid "Search in" msgstr "搜尋範圍" -#: rhodecode/templates/search/search.html:57 +#: rhodecode/templates/search/search.html:63 msgid "File contents" msgstr "文件內容" -#: rhodecode/templates/search/search.html:59 +#: rhodecode/templates/search/search.html:65 msgid "File names" msgstr "檔案名稱" @@ -2994,9 +3558,16 @@ msgid "Permission denied" msgstr "權限不足" +#: rhodecode/templates/settings/repo_settings.html:5 +#, fuzzy, python-format +#| msgid "settings" +msgid "%s Settings" +msgstr "設定" + #: rhodecode/templates/shortlog/shortlog.html:5 -#: rhodecode/templates/summary/summary.html:209 -msgid "Shortlog" +#, fuzzy, python-format +#| msgid "shortlog" +msgid "%s Shortlog" msgstr "簡短紀錄" #: rhodecode/templates/shortlog/shortlog.html:14 @@ -3025,126 +3596,185 @@ msgid "Existing repository?" msgstr "Git 版本庫" +#: rhodecode/templates/summary/summary.html:4 +#, fuzzy, python-format +#| msgid "summary" +msgid "%s Summary" +msgstr "概況" + #: rhodecode/templates/summary/summary.html:12 msgid "summary" msgstr "概況" -#: rhodecode/templates/summary/summary.html:44 -#: rhodecode/templates/summary/summary.html:47 +#: rhodecode/templates/summary/summary.html:20 +#, fuzzy, python-format +#| msgid "Subscribe to %s atom feed" +msgid "repo %s ATOM feed" +msgstr "訂閱 %s atom" + +#: rhodecode/templates/summary/summary.html:21 +#, fuzzy, python-format +#| msgid "Subscribe to %s rss feed" +msgid "repo %s RSS feed" +msgstr "訂閱 %s rss" + +#: rhodecode/templates/summary/summary.html:49 +#: rhodecode/templates/summary/summary.html:52 #, fuzzy msgid "ATOM" msgstr "作者" -#: rhodecode/templates/summary/summary.html:77 +#: rhodecode/templates/summary/summary.html:82 #, fuzzy, python-format msgid "Non changable ID %s" msgstr "沒有修改" -#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:87 msgid "public" msgstr "公開" -#: rhodecode/templates/summary/summary.html:90 +#: rhodecode/templates/summary/summary.html:95 msgid "remote clone" msgstr "遠端複製" -#: rhodecode/templates/summary/summary.html:121 +#: rhodecode/templates/summary/summary.html:126 msgid "Clone url" msgstr "複製連結" -#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/summary/summary.html:129 #, fuzzy msgid "Show by Name" msgstr "顯示更多" -#: rhodecode/templates/summary/summary.html:125 +#: rhodecode/templates/summary/summary.html:130 msgid "Show by ID" msgstr "" -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/summary/summary.html:138 #, fuzzy msgid "Trending files" msgstr "編輯檔案" -#: rhodecode/templates/summary/summary.html:141 -#: rhodecode/templates/summary/summary.html:157 -#: rhodecode/templates/summary/summary.html:185 +#: rhodecode/templates/summary/summary.html:146 +#: rhodecode/templates/summary/summary.html:162 +#: rhodecode/templates/summary/summary.html:190 msgid "enable" msgstr "啟用" -#: rhodecode/templates/summary/summary.html:149 +#: rhodecode/templates/summary/summary.html:154 msgid "Download" msgstr "下載" -#: rhodecode/templates/summary/summary.html:153 +#: rhodecode/templates/summary/summary.html:158 msgid "There are no downloads yet" msgstr "沒有任何下載" -#: rhodecode/templates/summary/summary.html:155 +#: rhodecode/templates/summary/summary.html:160 msgid "Downloads are disabled for this repository" msgstr "這個版本庫的下載已停用" -#: rhodecode/templates/summary/summary.html:164 +#: rhodecode/templates/summary/summary.html:166 +#, fuzzy +#| msgid "download as raw" +msgid "Download as zip" +msgstr "下載原始文件" + +#: rhodecode/templates/summary/summary.html:169 msgid "Check this to download archive with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:164 +#: rhodecode/templates/summary/summary.html:169 msgid "with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:177 +#: rhodecode/templates/summary/summary.html:182 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:188 +#: rhodecode/templates/summary/summary.html:193 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:211 +#: rhodecode/templates/summary/summary.html:214 +msgid "Shortlog" +msgstr "簡短紀錄" + +#: rhodecode/templates/summary/summary.html:216 #, fuzzy msgid "Quick start" msgstr "快速過濾..." -#: rhodecode/templates/summary/summary.html:281 +#: rhodecode/templates/summary/summary.html:286 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" -#: rhodecode/templates/summary/summary.html:638 +#: rhodecode/templates/summary/summary.html:643 msgid "commits" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:639 +#: rhodecode/templates/summary/summary.html:644 msgid "files added" msgstr "多個檔案新增" -#: rhodecode/templates/summary/summary.html:640 +#: rhodecode/templates/summary/summary.html:645 msgid "files changed" msgstr "多個檔案修改" -#: rhodecode/templates/summary/summary.html:641 +#: rhodecode/templates/summary/summary.html:646 msgid "files removed" msgstr "移除多個檔案" -#: rhodecode/templates/summary/summary.html:644 +#: rhodecode/templates/summary/summary.html:649 msgid "commit" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:645 +#: rhodecode/templates/summary/summary.html:650 msgid "file added" msgstr "檔案新增" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:651 msgid "file changed" msgstr "檔案修改" -#: rhodecode/templates/summary/summary.html:647 +#: rhodecode/templates/summary/summary.html:652 msgid "file removed" msgstr "移除檔案" -#~ msgid "[committed via RhodeCode] into" +#: rhodecode/templates/tags/tags.html:5 +#, fuzzy, python-format +#| msgid "%s ago" +msgid "%s Tags" +msgstr "之前" + +#~ msgid "Invalid username" +#~ msgstr "無效的使用者名稱" + +#~ msgid "Invalid group name" +#~ msgstr "無效的群組名稱" + +#~ msgid "This group already exists" +#~ msgstr "這個群組已存在" + +#~ msgid "This username is not valid" +#~ msgstr "無效的使用者名稱" + +#~ msgid "There is a group with this name already \"%s\"" #~ msgstr "" -#~ msgid "[pulled from remote] into" +#~ msgid "" +#~ "The LDAP Login attribute of the CN" +#~ " must be specified - this is " +#~ "the name of the attribute that is" +#~ " equivalent to 'username'" #~ msgstr "" +#~ msgid "Set as fork" +#~ msgstr "" + +#~ msgid "Manually set this repository as a fork of another" +#~ msgstr "" + +#~ msgid "Edit file" +#~ msgstr "編輯檔案" +