diff options
Diffstat (limited to 'rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po')
| -rw-r--r-- | rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po | 398 |
1 files changed, 221 insertions, 177 deletions
diff --git a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po index 36751ef8..56afb2b6 100644 --- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-12-03 03:21+0100\n" +"POT-Creation-Date: 2012-12-14 04:02+0100\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" @@ -22,33 +22,33 @@ msgstr "" msgid "All Branches" msgstr "分支" -#: rhodecode/controllers/changeset.py:84 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "" -#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:164 +#: rhodecode/controllers/changeset.py:163 #, fuzzy, python-format msgid "%s line context" msgstr "文件內容" -#: rhodecode/controllers/changeset.py:315 -#: rhodecode/controllers/pullrequests.py:411 +#: rhodecode/controllers/changeset.py:314 +#: rhodecode/controllers/pullrequests.py:417 #, fuzzy, python-format msgid "Status change -> %s" msgstr "最後修改" -#: rhodecode/controllers/changeset.py:346 +#: rhodecode/controllers/changeset.py:345 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "" #: rhodecode/controllers/compare.py:75 -#: rhodecode/controllers/pullrequests.py:117 +#: rhodecode/controllers/pullrequests.py:121 #: rhodecode/controllers/shortlog.py:100 #, fuzzy msgid "There are no changesets yet" @@ -91,8 +91,8 @@ msgid "%s %s feed" msgstr "" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:126 -#: rhodecode/templates/changeset/changeset.html:138 +#: rhodecode/templates/changeset/changeset.html:137 +#: rhodecode/templates/changeset/changeset.html:149 #: rhodecode/templates/compare/compare_diff.html:62 #: rhodecode/templates/compare/compare_diff.html:73 #: rhodecode/templates/pullrequests/pullrequest_show.html:94 @@ -176,17 +176,18 @@ msgstr "未知的存檔類型" msgid "Changesets" msgstr "變更" -#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74 #: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78 #: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "標籤" -#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:92 +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/settings.py:80 +#: rhodecode/controllers/admin/repos.py:92 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -194,7 +195,7 @@ msgid "" "repositories" msgstr "" -#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 +#: rhodecode/controllers/forks.py:134 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -212,13 +213,14 @@ msgstr "forked %s 版本庫為 %s" msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 +#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261 #, fuzzy msgid "public journal" msgstr "公開日誌" -#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265 #: rhodecode/templates/base/base.html:232 +#: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "日誌" @@ -236,33 +238,37 @@ msgid "" "email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" -#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 +#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:186 +#: rhodecode/controllers/pullrequests.py:190 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:188 +#: rhodecode/controllers/pullrequests.py:192 #, fuzzy msgid "error during creation of pull request" msgstr "建立使用者 %s" -#: rhodecode/controllers/pullrequests.py:220 +#: rhodecode/controllers/pullrequests.py:224 #, fuzzy msgid "Successfully opened new pull request" msgstr "成功刪除使用者" -#: rhodecode/controllers/pullrequests.py:223 +#: rhodecode/controllers/pullrequests.py:227 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:256 +#: rhodecode/controllers/pullrequests.py:260 #, fuzzy msgid "Successfully deleted pull request" msgstr "成功刪除使用者" +#: rhodecode/controllers/pullrequests.py:452 +msgid "Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + #: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元" @@ -275,20 +281,20 @@ msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:108 -#: rhodecode/controllers/admin/repos.py:268 +#: rhodecode/controllers/settings.py:124 +#: rhodecode/controllers/admin/repos.py:277 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: rhodecode/controllers/settings.py:126 -#: rhodecode/controllers/admin/repos.py:286 +#: rhodecode/controllers/settings.py:142 +#: rhodecode/controllers/admin/repos.py:295 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:144 -#: rhodecode/controllers/admin/repos.py:304 +#: rhodecode/controllers/settings.py:160 +#: rhodecode/controllers/admin/repos.py:313 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -296,36 +302,36 @@ msgid "" "repositories" msgstr "" -#: rhodecode/controllers/settings.py:156 -#: rhodecode/controllers/admin/repos.py:316 +#: rhodecode/controllers/settings.py:172 +#: rhodecode/controllers/admin/repos.py:325 #, python-format msgid "deleted repository %s" msgstr "刪除版本庫 %s" -#: rhodecode/controllers/settings.py:160 -#: rhodecode/controllers/admin/repos.py:326 -#: rhodecode/controllers/admin/repos.py:332 +#: rhodecode/controllers/settings.py:176 +#: rhodecode/controllers/admin/repos.py:335 +#: rhodecode/controllers/admin/repos.py:341 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/settings.py:179 +#: rhodecode/controllers/settings.py:195 #, fuzzy msgid "unlocked" msgstr "解鎖" -#: rhodecode/controllers/settings.py:182 +#: rhodecode/controllers/settings.py:198 #, fuzzy msgid "locked" msgstr "解鎖" -#: rhodecode/controllers/settings.py:184 +#: rhodecode/controllers/settings.py:200 #, fuzzy, python-format msgid "Repository has been %s" msgstr "forked %s 版本庫為 %s" -#: rhodecode/controllers/settings.py:188 -#: rhodecode/controllers/admin/repos.py:424 +#: rhodecode/controllers/settings.py:204 +#: rhodecode/controllers/admin/repos.py:433 msgid "An error occurred during unlocking" msgstr "" @@ -475,76 +481,76 @@ msgstr "預設權限更新完成" msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:125 +#: rhodecode/controllers/admin/repos.py:126 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:194 +#: rhodecode/controllers/admin/repos.py:195 #, python-format msgid "created repository %s from %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:198 +#: rhodecode/controllers/admin/repos.py:199 #, python-format msgid "created repository %s" msgstr "建立版本庫 %s" -#: rhodecode/controllers/admin/repos.py:229 +#: rhodecode/controllers/admin/repos.py:230 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:321 +#: rhodecode/controllers/admin/repos.py:330 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:350 +#: rhodecode/controllers/admin/repos.py:359 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:378 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:387 +#: rhodecode/controllers/admin/repos.py:396 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:404 +#: rhodecode/controllers/admin/repos.py:413 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:444 +#: rhodecode/controllers/admin/repos.py:453 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:448 +#: rhodecode/controllers/admin/repos.py:457 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:453 rhodecode/model/validators.py:300 +#: rhodecode/controllers/admin/repos.py:462 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:475 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:468 +#: rhodecode/controllers/admin/repos.py:477 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:484 +#: rhodecode/controllers/admin/repos.py:493 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:486 +#: rhodecode/controllers/admin/repos.py:495 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:490 +#: rhodecode/controllers/admin/repos.py:499 msgid "An error occurred during this operation" msgstr "" @@ -785,156 +791,156 @@ msgstr "" msgid "No changes detected" msgstr "尚未有任何變更" -#: rhodecode/lib/helpers.py:373 +#: rhodecode/lib/helpers.py:374 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:485 +#: rhodecode/lib/helpers.py:486 msgid "True" msgstr "真" -#: rhodecode/lib/helpers.py:489 +#: rhodecode/lib/helpers.py:490 msgid "False" msgstr "假" -#: rhodecode/lib/helpers.py:529 +#: rhodecode/lib/helpers.py:530 #, fuzzy, python-format msgid "Deleted branch: %s" msgstr "刪除版本庫 %s" -#: rhodecode/lib/helpers.py:532 +#: rhodecode/lib/helpers.py:533 #, fuzzy, python-format msgid "Created tag: %s" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:546 #, fuzzy msgid "Changeset not found" msgstr "修改" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:589 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:595 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:615 msgid "and" msgstr "和" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:616 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 +#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "修訂" -#: rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:641 #, fuzzy, python-format msgid "fork name %s" msgstr "fork 名稱" -#: rhodecode/lib/helpers.py:653 +#: rhodecode/lib/helpers.py:658 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #: rhodecode/templates/pullrequests/pullrequest_show.html:12 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:659 +#: rhodecode/lib/helpers.py:664 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 +#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:663 +#: rhodecode/lib/helpers.py:668 #, fuzzy msgid "[created] repository as fork" msgstr "建立版本庫 %s" -#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 +#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 +#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:669 +#: rhodecode/lib/helpers.py:674 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:677 +#: rhodecode/lib/helpers.py:682 #, fuzzy msgid "[created] user" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:679 +#: rhodecode/lib/helpers.py:684 #, fuzzy msgid "[updated] user" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:681 +#: rhodecode/lib/helpers.py:686 #, fuzzy msgid "[created] users group" msgstr "建立使用者群組 %s" -#: rhodecode/lib/helpers.py:683 +#: rhodecode/lib/helpers.py:688 #, fuzzy msgid "[updated] users group" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:685 +#: rhodecode/lib/helpers.py:690 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:687 +#: rhodecode/lib/helpers.py:692 #, fuzzy msgid "[commented] on pull request for" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:689 +#: rhodecode/lib/helpers.py:694 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:691 +#: rhodecode/lib/helpers.py:696 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:693 +#: rhodecode/lib/helpers.py:698 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:695 +#: rhodecode/lib/helpers.py:700 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:697 +#: rhodecode/lib/helpers.py:702 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:699 +#: rhodecode/lib/helpers.py:704 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:701 +#: rhodecode/lib/helpers.py:706 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:877 +#: rhodecode/lib/helpers.py:883 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:881 +#: rhodecode/lib/helpers.py:887 msgid "No Files" msgstr "沒有檔案" @@ -1003,98 +1009,98 @@ msgstr "現在" msgid "password reset link" msgstr "您的密碼重設連結已寄出" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1180 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183 #, fuzzy msgid "Repository no access" msgstr "個版本庫" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1181 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184 #, fuzzy msgid "Repository read access" msgstr "這個版本庫已經存在" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1182 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185 #, fuzzy msgid "Repository write access" msgstr "個版本庫" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186 #, fuzzy msgid "Repository admin access" msgstr "個版本庫" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188 #, fuzzy msgid "Repositories Group no access" msgstr "版本庫群組" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189 #, fuzzy msgid "Repositories Group read access" msgstr "版本庫群組" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1187 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190 #, fuzzy msgid "Repositories Group write access" msgstr "版本庫群組" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191 #, fuzzy msgid "Repositories Group admin access" msgstr "版本庫群組" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193 #, fuzzy msgid "RhodeCode Administrator" msgstr "使用者管理員" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194 #, fuzzy msgid "Repository creation disabled" msgstr "版本庫建立" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1192 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195 #, fuzzy msgid "Repository creation enabled" msgstr "版本庫建立" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196 #, fuzzy msgid "Repository forking disabled" msgstr "版本庫建立" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197 #, fuzzy msgid "Repository forking enabled" msgstr "版本庫建立" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198 #, fuzzy msgid "Register disabled" msgstr "停用" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1640 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643 msgid "Not Reviewed" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1641 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644 #, fuzzy msgid "Approved" msgstr "移除" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1642 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645 msgid "Rejected" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646 msgid "Under Review" msgstr "" @@ -1165,21 +1171,21 @@ msgstr "" msgid "latest tip" msgstr "最後登入" -#: rhodecode/model/user.py:230 +#: rhodecode/model/user.py:232 #, fuzzy msgid "new user registration" msgstr "[RhodeCode] 新使用者註冊" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 -#: rhodecode/model/user.py:301 +#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 +#: rhodecode/model/user.py:303 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:325 +#: rhodecode/model/user.py:327 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:331 +#: rhodecode/model/user.py:333 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1304,26 +1310,26 @@ msgstr "您沒有權限瀏覽這個頁面" msgid "This username or users group name is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/validators.py:582 +#: rhodecode/model/validators.py:591 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:606 msgid "This e-mail address is already taken" msgstr "這個郵件位址已經使用了" -#: rhodecode/model/validators.py:617 +#: rhodecode/model/validators.py:626 #, fuzzy, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "這個郵件位址不存在" -#: rhodecode/model/validators.py:654 +#: rhodecode/model/validators.py:663 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/model/validators.py:673 +#: rhodecode/model/validators.py:682 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1339,7 +1345,8 @@ msgstr "儀表板" #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 -#: rhodecode/templates/journal/journal.html:40 +#: rhodecode/templates/journal/journal.html:9 +#: rhodecode/templates/journal/journal.html:48 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "快速過濾..." @@ -1405,8 +1412,8 @@ msgstr "版本庫群組" #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 -#: rhodecode/templates/journal/journal.html:62 -#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal.html:70 +#: rhodecode/templates/journal/journal.html:196 #: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 @@ -1423,7 +1430,7 @@ msgstr "最後修改" #: rhodecode/templates/index_base.html:74 #: rhodecode/templates/index_base.html:179 #: rhodecode/templates/admin/users/user_edit_my_account.html:182 -#: rhodecode/templates/journal/journal.html:170 +#: rhodecode/templates/journal/journal.html:198 msgid "Tip" msgstr "" @@ -1453,7 +1460,7 @@ msgstr "" #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/journal/journal.html:221 #: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "" @@ -1466,7 +1473,7 @@ msgstr "" #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/journal/journal.html:222 #: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "" @@ -1484,7 +1491,7 @@ msgstr "最後修改" #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/journal/journal.html:223 #: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "" @@ -1496,7 +1503,7 @@ msgstr "" #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/journal/journal.html:224 #: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "" @@ -1508,8 +1515,8 @@ msgstr "" #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:54 -#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:225 #: rhodecode/templates/tags/tags.html:81 #, fuzzy msgid "Loading..." @@ -1660,10 +1667,28 @@ msgid "There are no bookmarks yet" msgstr "尚未有任何 fork" #: rhodecode/templates/admin/admin.html:5 -#: rhodecode/templates/admin/admin.html:9 +#: rhodecode/templates/admin/admin.html:13 msgid "Admin journal" msgstr "管理員日誌" +#: rhodecode/templates/admin/admin.html:10 +#, fuzzy +msgid "journal filter..." +msgstr "快速過濾..." + +#: rhodecode/templates/admin/admin.html:12 +#: rhodecode/templates/journal/journal.html:11 +#, fuzzy +msgid "filter" +msgstr "檔案" + +#: rhodecode/templates/admin/admin.html:13 +#: rhodecode/templates/journal/journal.html:12 +#, python-format +msgid "%s entry" +msgid_plural "%s entries" +msgstr[0] "" + #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:74 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 @@ -1692,7 +1717,7 @@ msgstr "時間" msgid "From IP" msgstr "來源IP" -#: rhodecode/templates/admin/admin_log.html:57 +#: rhodecode/templates/admin/admin_log.html:63 msgid "No actions yet" msgstr "" @@ -1764,7 +1789,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:178 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 -#: rhodecode/templates/settings/repo_settings.html:93 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" msgstr "儲存" @@ -2058,7 +2083,7 @@ msgstr "修改於版本庫 %s" #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 -#: rhodecode/templates/settings/repo_settings.html:94 +#: rhodecode/templates/settings/repo_settings.html:95 msgid "Reset" msgstr "重設" @@ -2203,19 +2228,21 @@ msgid "Delete" msgstr "移除" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Remove this repository" msgstr "移除版本庫" #: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/settings/repo_settings.html:115 msgid "Confirm to delete this repository" msgstr "確認移除這個版本庫" #: rhodecode/templates/admin/repos/repo_edit.html:282 +#: rhodecode/templates/settings/repo_settings.html:119 msgid "" "This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems.\n" -" If you need fully delete it from filesystem " -"please do it manually" +"unaccesible for RhodeCode and VCS systems. If you need fully delete it " +"from file system please do it manually" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 @@ -2247,7 +2274,7 @@ msgstr "成員" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/journal/journal.html:95 #: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "私有版本庫" @@ -2774,7 +2801,7 @@ msgid "My permissions" msgstr "權限" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 #, fuzzy msgid "My repos" msgstr "空的版本庫" @@ -2995,7 +3022,6 @@ msgstr "" #: rhodecode/templates/base/base.html:324 #: rhodecode/templates/base/base.html:326 #: rhodecode/templates/journal/journal.html:4 -#: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "日誌" @@ -3131,7 +3157,7 @@ msgid "add another comment" msgstr "新增另ㄧ位成員" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:75 +#: rhodecode/templates/journal/journal.html:83 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "停止追蹤這個版本庫" @@ -3240,7 +3266,7 @@ msgid "Affected number of files, click to show more details" msgstr "" #: rhodecode/templates/changelog/changelog.html:91 -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 #, fuzzy @@ -3253,23 +3279,22 @@ msgid "Click to open associated pull request" msgstr "" #: rhodecode/templates/changelog/changelog.html:104 -#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "" #: rhodecode/templates/changelog/changelog.html:110 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changeset/changeset.html:42 msgid "No parents" msgstr "" #: rhodecode/templates/changelog/changelog.html:115 -#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset.html:106 #: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "合併" #: rhodecode/templates/changelog/changelog.html:118 -#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:109 #: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -3284,7 +3309,7 @@ msgid "bookmark" msgstr "" #: rhodecode/templates/changelog/changelog.html:130 -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:114 #: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "標籤" @@ -3294,26 +3319,26 @@ msgid "There are no changes yet" msgstr "尚未有任何變更" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:73 +#: rhodecode/templates/changeset/changeset.html:94 msgid "removed" msgstr "移除" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:74 +#: rhodecode/templates/changeset/changeset.html:95 msgid "changed" msgstr "修改" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:75 +#: rhodecode/templates/changeset/changeset.html:96 msgid "added" msgstr "新增" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:77 -#: rhodecode/templates/changeset/changeset.html:78 -#: rhodecode/templates/changeset/changeset.html:79 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset.html:99 +#: rhodecode/templates/changeset/changeset.html:100 #, python-format msgid "affected %s files" msgstr "" @@ -3327,36 +3352,40 @@ msgstr "沒有修改" msgid "Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:49 +#: rhodecode/templates/changeset/changeset.html:52 +msgid "No children" +msgstr "" + +#: rhodecode/templates/changeset/changeset.html:70 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "原始差異" -#: rhodecode/templates/changeset/changeset.html:50 +#: rhodecode/templates/changeset/changeset.html:71 #, fuzzy msgid "patch diff" msgstr "原始差異" -#: rhodecode/templates/changeset/changeset.html:51 +#: rhodecode/templates/changeset/changeset.html:72 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "下載差異" -#: rhodecode/templates/changeset/changeset.html:55 +#: rhodecode/templates/changeset/changeset.html:76 #: 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:55 +#: rhodecode/templates/changeset/changeset.html:76 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "" -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changeset/changeset.html:122 #: rhodecode/templates/compare/compare_diff.html:44 #: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, fuzzy, python-format @@ -3364,7 +3393,7 @@ msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "檔案修改" -#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/changeset/changeset.html:124 #: rhodecode/templates/compare/compare_diff.html:46 #: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, python-format @@ -3392,7 +3421,7 @@ msgid "Use @username inside this text to send notification to this RhodeCode use msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:138 +#: rhodecode/templates/changeset/changeset_file_comment.html:143 #, fuzzy msgid "Comment" msgstr "遞交" @@ -3415,16 +3444,16 @@ msgstr "" msgid "Leave a comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:124 +#: rhodecode/templates/changeset/changeset_file_comment.html:125 #, fuzzy msgid "change status" msgstr "變更" -#: rhodecode/templates/changeset/changeset_file_comment.html:140 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 msgid "Comment and close" msgstr "" @@ -3481,19 +3510,19 @@ msgid "Fork" msgstr "分支" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/journal/journal.html:89 #: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Mercurial 版本庫" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/journal/journal.html:91 #: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Git 版本庫" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/journal/journal.html:97 #: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "公開版本庫" @@ -3886,54 +3915,54 @@ msgstr "已建立分支" msgid "There are no forks yet" msgstr "尚未有任何 fork" -#: rhodecode/templates/journal/journal.html:13 +#: rhodecode/templates/journal/journal.html:21 #, fuzzy msgid "ATOM journal feed" msgstr "%s 公開日誌 %s feed" -#: rhodecode/templates/journal/journal.html:14 +#: rhodecode/templates/journal/journal.html:22 #, fuzzy msgid "RSS journal feed" msgstr "%s 公開日誌 %s feed" -#: rhodecode/templates/journal/journal.html:24 +#: rhodecode/templates/journal/journal.html:32 #: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "" -#: rhodecode/templates/journal/journal.html:27 +#: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 msgid "RSS feed" msgstr "" -#: rhodecode/templates/journal/journal.html:30 +#: rhodecode/templates/journal/journal.html:38 #: rhodecode/templates/journal/public_journal.html:27 msgid "ATOM feed" msgstr "" -#: rhodecode/templates/journal/journal.html:41 +#: rhodecode/templates/journal/journal.html:49 #, fuzzy msgid "Watched" msgstr "快取" -#: rhodecode/templates/journal/journal.html:46 +#: rhodecode/templates/journal/journal.html:54 #, fuzzy msgid "ADD" msgstr "新增" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "following user" msgstr "追蹤使用者" -#: rhodecode/templates/journal/journal.html:69 +#: rhodecode/templates/journal/journal.html:77 msgid "user" msgstr "使用者" -#: rhodecode/templates/journal/journal.html:102 +#: rhodecode/templates/journal/journal.html:110 msgid "You are not following any users or repositories" msgstr "您尚未追蹤任何使用者或版本庫" -#: rhodecode/templates/journal/journal_data.html:51 +#: rhodecode/templates/journal/journal_data.html:55 msgid "No entries yet" msgstr "" @@ -4040,6 +4069,11 @@ msgstr "建立使用者 %s" msgid "Compare view" msgstr "比較顯示" +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +#, fuzzy +msgid "reviewer" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 #, fuzzy msgid "all pull requests" @@ -4107,6 +4141,16 @@ msgstr "權限不足" msgid "%s Settings" msgstr "設定" +#: rhodecode/templates/settings/repo_settings.html:102 +#, fuzzy +msgid "Delete repository" +msgstr "刪除版本庫 %s" + +#: rhodecode/templates/settings/repo_settings.html:109 +#, fuzzy +msgid "Remove repo" +msgstr "移除" + #: rhodecode/templates/shortlog/shortlog.html:5 #, fuzzy, python-format msgid "%s Shortlog" |