Mercurial > kallithea
diff rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po @ 2671:8990d58fb22f beta
i18n update
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 26 Jul 2012 23:38:16 +0200 |
| parents | f9603966f100 |
| children | 4bc4e53fd6fe |
line wrap: on
line diff
--- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Thu Jul 26 23:12:33 2012 +0200 +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Thu Jul 26 23:38:16 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-07-08 15:39+0200\n" +"POT-Creation-Date: 2012-07-26 23:35+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" @@ -40,6 +40,11 @@ msgid "binary file" msgstr "二進位檔" +#: rhodecode/controllers/compare.py:69 +#, fuzzy +msgid "There are no changesets yet" +msgstr "尚未有任何變更" + #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "首頁" @@ -147,17 +152,17 @@ msgid "Changesets" msgstr "變更" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:66 -#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497 +#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508 +#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 msgid "Tags" msgstr "標籤" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88 +#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -173,12 +178,12 @@ "repositories" msgstr "" -#: rhodecode/controllers/forks.py:166 +#: rhodecode/controllers/forks.py:164 #, python-format msgid "forked %s repository as %s" msgstr "forked %s 版本庫為 %s" -#: rhodecode/controllers/forks.py:180 +#: rhodecode/controllers/forks.py:178 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -193,64 +198,59 @@ msgid "journal" msgstr "日誌" -#: rhodecode/controllers/login.py:116 +#: rhodecode/controllers/login.py:130 msgid "You have successfully registered into rhodecode" msgstr "您已經成功註冊rhodecode" -#: rhodecode/controllers/login.py:137 +#: rhodecode/controllers/login.py:151 msgid "Your password reset link was sent" msgstr "您的密碼重設連結已寄出" -#: rhodecode/controllers/login.py:157 +#: rhodecode/controllers/login.py:171 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" -#: rhodecode/controllers/pullrequests.py:68 rhodecode/model/scm.py:503 +#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:136 -#, python-format -msgid "%s (owner)" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:161 +#: rhodecode/controllers/pullrequests.py:160 #, fuzzy msgid "Successfully opened new pull request" msgstr "成功刪除使用者" -#: rhodecode/controllers/pullrequests.py:164 +#: rhodecode/controllers/pullrequests.py:163 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/search.py:114 +#: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元" -#: rhodecode/controllers/search.py:119 +#: rhodecode/controllers/search.py:136 msgid "There is no index to search in. Please run whoosh indexer" msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" -#: rhodecode/controllers/search.py:123 +#: rhodecode/controllers/search.py:140 msgid "An error occurred during this search operation" msgstr "" #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:221 +#: rhodecode/controllers/admin/repos.py:264 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" #: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:239 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "error occurred during update of repository %s" msgstr "" #: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:257 +#: rhodecode/controllers/admin/repos.py:300 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -259,14 +259,14 @@ msgstr "" #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:269 +#: rhodecode/controllers/admin/repos.py:312 #, python-format msgid "deleted repository %s" msgstr "刪除版本庫 %s" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:279 -#: rhodecode/controllers/admin/repos.py:285 +#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:328 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -280,59 +280,59 @@ msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" -#: rhodecode/controllers/admin/ldap_settings.py:49 +#: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:50 -msgid "ONELEVEL" -msgstr "" - #: rhodecode/controllers/admin/ldap_settings.py:51 -msgid "SUBTREE" +msgid "ONELEVEL" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:55 -msgid "NEVER" +#: rhodecode/controllers/admin/ldap_settings.py:52 +msgid "SUBTREE" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:56 -msgid "ALLOW" +msgid "NEVER" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:57 -msgid "TRY" +msgid "ALLOW" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:58 -msgid "DEMAND" +msgid "TRY" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:59 +msgid "DEMAND" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:60 msgid "HARD" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:63 +#: rhodecode/controllers/admin/ldap_settings.py:64 msgid "No encryption" msgstr "無加密" -#: rhodecode/controllers/admin/ldap_settings.py:64 -msgid "LDAPS connection" -msgstr "" - #: rhodecode/controllers/admin/ldap_settings.py:65 +msgid "LDAPS connection" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:66 msgid "START_TLS on LDAP connection" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:125 +#: rhodecode/controllers/admin/ldap_settings.py:126 msgid "Ldap settings updated successfully" msgstr "LDAP設定更新完成" -#: rhodecode/controllers/admin/ldap_settings.py:129 +#: rhodecode/controllers/admin/ldap_settings.py:130 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "無法啟用LDAP。找不到python-ldap函式庫" -#: rhodecode/controllers/admin/ldap_settings.py:146 +#: rhodecode/controllers/admin/ldap_settings.py:147 msgid "error occurred during update of ldap settings" msgstr "" @@ -353,7 +353,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:9 #: rhodecode/templates/admin/repos/repo_add.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:9 -#: rhodecode/templates/admin/repos/repos.html:10 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 @@ -401,76 +401,76 @@ msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:121 +#: rhodecode/controllers/admin/repos.py:123 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:151 +#: rhodecode/controllers/admin/repos.py:191 #, python-format msgid "created repository %s from %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:155 +#: rhodecode/controllers/admin/repos.py:195 #, python-format msgid "created repository %s" msgstr "建立版本庫 %s" -#: rhodecode/controllers/admin/repos.py:186 +#: rhodecode/controllers/admin/repos.py:226 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:317 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:303 +#: rhodecode/controllers/admin/repos.py:346 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:365 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:339 +#: rhodecode/controllers/admin/repos.py:382 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:355 +#: rhodecode/controllers/admin/repos.py:398 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos.py:418 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:379 +#: rhodecode/controllers/admin/repos.py:422 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:384 rhodecode/model/validators.py:269 +#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:397 +#: rhodecode/controllers/admin/repos.py:440 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:399 +#: rhodecode/controllers/admin/repos.py:442 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:415 +#: rhodecode/controllers/admin/repos.py:458 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:417 +#: rhodecode/controllers/admin/repos.py:460 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:421 +#: rhodecode/controllers/admin/repos.py:464 msgid "An error occurred during this operation" msgstr "" @@ -522,7 +522,7 @@ msgid "An error occurred during deletion of group users groups" msgstr "" -#: rhodecode/controllers/admin/settings.py:120 +#: rhodecode/controllers/admin/settings.py:121 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "" @@ -531,95 +531,95 @@ msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" -#: rhodecode/controllers/admin/settings.py:154 +#: rhodecode/controllers/admin/settings.py:160 msgid "Updated application settings" msgstr "更新應用設定" -#: rhodecode/controllers/admin/settings.py:159 -#: rhodecode/controllers/admin/settings.py:227 +#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:230 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:226 msgid "Updated mercurial settings" msgstr "更新 mercurial 設定" -#: rhodecode/controllers/admin/settings.py:247 +#: rhodecode/controllers/admin/settings.py:240 msgid "Added new hook" msgstr "新增hook" -#: rhodecode/controllers/admin/settings.py:259 +#: rhodecode/controllers/admin/settings.py:252 msgid "Updated hooks" msgstr "更新hook" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:256 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:275 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:337 +#: rhodecode/controllers/admin/settings.py:330 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:361 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: rhodecode/controllers/admin/settings.py:387 -#: rhodecode/controllers/admin/users.py:143 +#: rhodecode/controllers/admin/settings.py:376 +#: rhodecode/controllers/admin/users.py:186 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:84 +#: rhodecode/controllers/admin/users.py:127 #, python-format msgid "created user %s" msgstr "建立使用者 %s" -#: rhodecode/controllers/admin/users.py:96 +#: rhodecode/controllers/admin/users.py:139 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:125 +#: rhodecode/controllers/admin/users.py:168 msgid "User updated successfully" msgstr "使用者更新完成" -#: rhodecode/controllers/admin/users.py:159 +#: rhodecode/controllers/admin/users.py:202 msgid "successfully deleted user" msgstr "成功刪除使用者" -#: rhodecode/controllers/admin/users.py:164 +#: rhodecode/controllers/admin/users.py:207 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:178 +#: rhodecode/controllers/admin/users.py:221 msgid "You can't edit this user" msgstr "您無法編輯這位使用者" -#: rhodecode/controllers/admin/users.py:210 +#: rhodecode/controllers/admin/users.py:253 #: rhodecode/controllers/admin/users_groups.py:219 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:219 +#: rhodecode/controllers/admin/users.py:262 #: rhodecode/controllers/admin/users_groups.py:229 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:235 +#: rhodecode/controllers/admin/users.py:278 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:241 +#: rhodecode/controllers/admin/users.py:284 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:251 +#: rhodecode/controllers/admin/users.py:294 #, fuzzy msgid "Removed email from user" msgstr "移除版本庫群組 %s" @@ -712,89 +712,101 @@ msgid "fork name " msgstr "fork 名稱" -#: rhodecode/lib/helpers.py:577 +#: rhodecode/lib/helpers.py:578 +#: 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:584 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:588 #, fuzzy msgid "[created] repository as fork" msgstr "建立版本庫 %s" -#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591 +#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593 +#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:587 +#: rhodecode/lib/helpers.py:594 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:602 #, fuzzy msgid "[created] user" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:597 +#: rhodecode/lib/helpers.py:604 #, fuzzy msgid "[updated] user" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:599 +#: rhodecode/lib/helpers.py:606 #, fuzzy msgid "[created] users group" msgstr "建立使用者群組 %s" -#: rhodecode/lib/helpers.py:601 +#: rhodecode/lib/helpers.py:608 #, fuzzy msgid "[updated] users group" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:603 +#: rhodecode/lib/helpers.py:610 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:605 -msgid "[commented] on pull request" +#: rhodecode/lib/helpers.py:612 +#, fuzzy +msgid "[commented] on pull request for" +msgstr "建立使用者 %s" + +#: rhodecode/lib/helpers.py:614 +msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:607 +#: rhodecode/lib/helpers.py:616 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:609 +#: rhodecode/lib/helpers.py:618 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:611 +#: rhodecode/lib/helpers.py:620 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:613 +#: rhodecode/lib/helpers.py:622 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:624 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:617 +#: rhodecode/lib/helpers.py:626 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:781 +#: rhodecode/lib/helpers.py:790 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:785 +#: rhodecode/lib/helpers.py:794 msgid "No Files" msgstr "沒有檔案" @@ -862,88 +874,88 @@ msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1072 +#: rhodecode/model/db.py:1063 #, fuzzy msgid "Repository no access" msgstr "個版本庫" -#: rhodecode/model/db.py:1073 +#: rhodecode/model/db.py:1064 #, fuzzy msgid "Repository read access" msgstr "這個版本庫已經存在" -#: rhodecode/model/db.py:1074 +#: rhodecode/model/db.py:1065 #, fuzzy msgid "Repository write access" msgstr "個版本庫" -#: rhodecode/model/db.py:1075 +#: rhodecode/model/db.py:1066 #, fuzzy msgid "Repository admin access" msgstr "個版本庫" -#: rhodecode/model/db.py:1077 +#: rhodecode/model/db.py:1068 #, fuzzy msgid "Repositories Group no access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1078 +#: rhodecode/model/db.py:1069 #, fuzzy msgid "Repositories Group read access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1079 +#: rhodecode/model/db.py:1070 #, fuzzy msgid "Repositories Group write access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1080 +#: rhodecode/model/db.py:1071 #, fuzzy msgid "Repositories Group admin access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1082 +#: rhodecode/model/db.py:1073 #, fuzzy msgid "RhodeCode Administrator" msgstr "使用者管理員" -#: rhodecode/model/db.py:1083 +#: rhodecode/model/db.py:1074 #, fuzzy msgid "Repository creation disabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1084 +#: rhodecode/model/db.py:1075 #, fuzzy msgid "Repository creation enabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1085 +#: rhodecode/model/db.py:1076 #, fuzzy msgid "Register disabled" msgstr "停用" -#: rhodecode/model/db.py:1086 +#: rhodecode/model/db.py:1077 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1089 +#: rhodecode/model/db.py:1080 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1489 +#: rhodecode/model/db.py:1481 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1490 +#: rhodecode/model/db.py:1482 #, fuzzy msgid "Approved" msgstr "移除" -#: rhodecode/model/db.py:1491 +#: rhodecode/model/db.py:1483 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1492 +#: rhodecode/model/db.py:1484 msgid "Under Review" msgstr "" @@ -965,38 +977,38 @@ msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:203 +#: rhodecode/model/notification.py:220 msgid "commented on commit" msgstr "" -#: rhodecode/model/notification.py:204 +#: rhodecode/model/notification.py:221 #, fuzzy msgid "sent message" msgstr "遞交資訊" -#: rhodecode/model/notification.py:205 +#: rhodecode/model/notification.py:222 msgid "mentioned you" msgstr "" -#: rhodecode/model/notification.py:206 +#: rhodecode/model/notification.py:223 #, fuzzy msgid "registered in RhodeCode" msgstr "您已經成功註冊rhodecode" -#: rhodecode/model/notification.py:207 +#: rhodecode/model/notification.py:224 msgid "opened new pull request" msgstr "" -#: rhodecode/model/notification.py:208 +#: rhodecode/model/notification.py:225 msgid "commented on pull request" msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:84 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:489 +#: rhodecode/model/scm.py:526 #, fuzzy msgid "latest tip" msgstr "最後登入" @@ -1007,14 +1019,15 @@ msgstr "[RhodeCode] 新使用者註冊" #: rhodecode/model/user.py:265 rhodecode/model/user.py:287 +#: rhodecode/model/user.py:309 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:311 +#: rhodecode/model/user.py:333 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:317 +#: rhodecode/model/user.py:339 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1155,7 +1168,9 @@ #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/repo_switcher_list.html:4 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 +#: 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 @@ -1163,13 +1178,15 @@ msgid "quick filter..." msgstr "快速過濾..." -#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:219 +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/repos/repos.html:9 +#: rhodecode/templates/base/base.html:219 msgid "repositories" msgstr "個版本庫" #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:15 -#: rhodecode/templates/admin/repos/repos.html:22 +#: rhodecode/templates/admin/repos/repos.html:21 msgid "ADD REPOSITORY" msgstr "新增版本庫" @@ -1188,13 +1205,12 @@ #: rhodecode/templates/index_base.html:158 #: 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/repos.html:72 #: 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:59 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/settings/repo_settings.html:66 #: rhodecode/templates/summary/summary.html:105 msgid "Description" msgstr "描述" @@ -1208,13 +1224,12 @@ #: rhodecode/templates/index_base.html:156 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: 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/admin/repos/repos.html:70 +#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit_my_account.html:59 +#: rhodecode/templates/admin/users/user_edit_my_account.html:154 +#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: rhodecode/templates/branches/branches.html:51 @@ -1231,15 +1246,12 @@ msgstr "名稱" #: rhodecode/templates/index_base.html:68 -#: rhodecode/templates/admin/repos/repos.html:38 msgid "Last change" msgstr "最後修改" #: rhodecode/templates/index_base.html:69 #: rhodecode/templates/index_base.html:161 -#: 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/admin/users/user_edit_my_account.html:156 #: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "" @@ -1247,7 +1259,7 @@ #: rhodecode/templates/index_base.html:70 #: rhodecode/templates/index_base.html:163 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos/repos.html:89 +#: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "擁有者" @@ -1280,8 +1292,9 @@ #: rhodecode/templates/index_base.html:148 #: rhodecode/templates/index_base.html:188 -#: rhodecode/templates/admin/repos/repos.html:112 -#: rhodecode/templates/admin/users/user_edit_my_account.html:186 +#: rhodecode/templates/admin/repos/repos.html:94 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:105 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1291,8 +1304,9 @@ #: rhodecode/templates/index_base.html:149 #: rhodecode/templates/index_base.html:189 -#: rhodecode/templates/admin/repos/repos.html:113 -#: rhodecode/templates/admin/users/user_edit_my_account.html:187 +#: rhodecode/templates/admin/repos/repos.html:95 +#: rhodecode/templates/admin/users/user_edit_my_account.html:177 +#: rhodecode/templates/admin/users/users.html:106 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1301,14 +1315,14 @@ msgstr "" #: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/admin/repos/repos.html:85 #, fuzzy msgid "Last Change" msgstr "最後修改" #: rhodecode/templates/index_base.html:190 -#: rhodecode/templates/admin/repos/repos.html:114 -#: rhodecode/templates/admin/users/user_edit_my_account.html:188 +#: rhodecode/templates/admin/repos/repos.html:96 +#: rhodecode/templates/admin/users/user_edit_my_account.html:178 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1317,8 +1331,9 @@ msgstr "" #: rhodecode/templates/index_base.html:191 -#: rhodecode/templates/admin/repos/repos.html:115 -#: rhodecode/templates/admin/users/user_edit_my_account.html:189 +#: rhodecode/templates/admin/repos/repos.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1327,8 +1342,9 @@ msgstr "" #: rhodecode/templates/index_base.html:192 -#: rhodecode/templates/admin/repos/repos.html:116 -#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/repos/repos.html:98 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1440,7 +1456,7 @@ #: rhodecode/templates/repo_switcher_list.html:11 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:67 +#: rhodecode/templates/settings/repo_settings.html:76 msgid "Private repository" msgstr "私有的版本庫" @@ -1486,10 +1502,9 @@ msgstr "管理員日誌" #: rhodecode/templates/admin/admin_log.html:6 -#: rhodecode/templates/admin/repos/repos.html:41 -#: 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/admin/repos/repos.html:74 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 #: rhodecode/templates/journal/journal.html:61 #: rhodecode/templates/journal/journal.html:62 msgid "Action" @@ -1596,7 +1611,7 @@ #: rhodecode/templates/admin/users/user_edit.html:154 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:115 -#: rhodecode/templates/settings/repo_settings.html:84 +#: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "儲存" @@ -1624,7 +1639,7 @@ msgid "Mark all read" msgstr "" -#: rhodecode/templates/admin/notifications/notifications_data.html:34 +#: rhodecode/templates/admin/notifications/notifications_data.html:39 msgid "No notifications here yet" msgstr "" @@ -1648,7 +1663,7 @@ #: 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 -#: rhodecode/templates/settings/repo_settings.html:77 +#: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" msgstr "權限" @@ -1695,7 +1710,6 @@ #: rhodecode/templates/admin/repos/repo_add.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos/repos.html:10 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 msgid "Repositories" msgstr "版本庫" @@ -1738,6 +1752,7 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 #: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:57 #, fuzzy msgid "Landing revision" msgstr "下一個修訂" @@ -1745,20 +1760,21 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 #: rhodecode/templates/forks/fork.html:45 +#: rhodecode/templates/settings/repo_settings.html:61 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 +#: rhodecode/templates/settings/repo_settings.html:70 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: 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 +#: rhodecode/templates/settings/repo_settings.html:80 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1778,7 +1794,9 @@ #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit_my_account.html:71 +#: rhodecode/templates/admin/users/user_edit.html:204 +#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 #: rhodecode/templates/files/files_source.html:44 #: rhodecode/templates/journal/journal.html:81 @@ -1818,17 +1836,17 @@ #: rhodecode/templates/admin/repos/repo_edit.html:133 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/settings/settings.html:113 +#: rhodecode/templates/admin/settings/settings.html:180 #: 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.html:258 #: 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 +#: rhodecode/templates/pullrequests/pullrequest.html:124 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Reset" msgstr "重設" @@ -1911,6 +1929,7 @@ msgstr "移除版本庫" #: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "確認移除這個版本庫" @@ -1947,7 +1966,7 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 -#: rhodecode/templates/admin/users/users.html:38 +#: rhodecode/templates/admin/users/users.html:83 #: rhodecode/templates/base/base.html:215 msgid "admin" msgstr "管理員" @@ -1958,7 +1977,7 @@ msgstr "成員" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/data_table/_dt_elements.html:67 #: rhodecode/templates/journal/journal.html:132 #: rhodecode/templates/summary/summary.html:76 msgid "private repository" @@ -1997,25 +2016,6 @@ msgid "Repositories administration" msgstr "版本庫管理員" -#: rhodecode/templates/admin/repos/repos.html:40 -#: 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" -msgstr "刪除" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/users/user_edit_my_account.html:74 -#, fuzzy, python-format -msgid "Confirm to delete this repository: %s" -msgstr "確認移除這個版本庫" - #: rhodecode/templates/admin/repos_groups/repos_groups.html:8 msgid "Groups" msgstr "群組" @@ -2046,6 +2046,7 @@ #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 +#: rhodecode/templates/pullrequests/pullrequest_show.html:93 msgid "save" msgstr "儲存" @@ -2071,12 +2072,20 @@ msgstr "版本庫數量" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:40 +#: rhodecode/templates/admin/users/users.html:85 #: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "action" msgstr "動作" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/data_table/_dt_elements.html:103 +msgid "delete" +msgstr "刪除" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #, fuzzy, python-format msgid "Confirm to delete this group: %s" msgstr "確認刪除這個群組" @@ -2131,117 +2140,137 @@ msgid "destroy old data" msgstr "移除舊資料" -#: rhodecode/templates/admin/settings/settings.html:45 +#: rhodecode/templates/admin/settings/settings.html:41 +msgid "" +"Rescan repositories location for new repositories. Also deletes obsolete " +"if `destroy` flag is checked " +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:46 msgid "Rescan repositories" msgstr "重新掃描版本庫" -#: rhodecode/templates/admin/settings/settings.html:51 +#: rhodecode/templates/admin/settings/settings.html:52 msgid "Whoosh indexing" msgstr "Whoosh 索引" -#: rhodecode/templates/admin/settings/settings.html:59 +#: rhodecode/templates/admin/settings/settings.html:60 msgid "index build option" msgstr "索引選項" -#: rhodecode/templates/admin/settings/settings.html:64 +#: rhodecode/templates/admin/settings/settings.html:65 msgid "build from scratch" msgstr "重頭建立索引" -#: rhodecode/templates/admin/settings/settings.html:70 +#: rhodecode/templates/admin/settings/settings.html:71 msgid "Reindex" msgstr "重新索引" -#: rhodecode/templates/admin/settings/settings.html:76 +#: rhodecode/templates/admin/settings/settings.html:77 msgid "Global application settings" msgstr "全域設定" -#: rhodecode/templates/admin/settings/settings.html:85 +#: rhodecode/templates/admin/settings/settings.html:86 msgid "Application name" msgstr "應用名稱" -#: rhodecode/templates/admin/settings/settings.html:94 +#: rhodecode/templates/admin/settings/settings.html:95 msgid "Realm text" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:103 +#: rhodecode/templates/admin/settings/settings.html:104 msgid "GA code" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:111 -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:179 msgid "Save settings" msgstr "儲存設定" -#: rhodecode/templates/admin/settings/settings.html:118 -msgid "Mercurial settings" -msgstr "Mercurial 設定" - -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:119 +#, fuzzy +msgid "VCS settings" +msgstr "設定" + +#: rhodecode/templates/admin/settings/settings.html:128 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:132 -msgid "require ssl for pushing" +#: rhodecode/templates/admin/settings/settings.html:133 +#, fuzzy +msgid "require ssl for vcs operations" msgstr "推送時要求使用SSL" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:135 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " +"will return HTTP Error 406: Not Acceptable" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:146 msgid "Update repository after push (hg update)" msgstr "push後更新版本庫 (hg update)" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:150 msgid "Show repository size after push" msgstr "push 後顯示版本庫大小" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:154 msgid "Log user push commands" msgstr "紀錄使用者推送命令" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:158 msgid "Log user pull commands" msgstr "紀錄使用者抓取命令" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:162 msgid "advanced setup" msgstr "進階設定" -#: rhodecode/templates/admin/settings/settings.html:165 +#: rhodecode/templates/admin/settings/settings.html:167 msgid "Repositories location" msgstr "版本庫路徑" -#: rhodecode/templates/admin/settings/settings.html:170 +#: rhodecode/templates/admin/settings/settings.html:172 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " "take effect. Click this label to unlock." msgstr "這是一個關鍵的設定，如果您確定要修改這個設定，請重新啟動應用程式以套用設定" -#: rhodecode/templates/admin/settings/settings.html:171 +#: rhodecode/templates/admin/settings/settings.html:173 msgid "unlock" msgstr "解鎖" -#: rhodecode/templates/admin/settings/settings.html:191 +#: rhodecode/templates/admin/settings/settings.html:174 +msgid "" +"Location where repositories are stored. After changing this value a " +"restart, and rescan is required" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:194 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:199 +#: rhodecode/templates/admin/settings/settings.html:202 #, fuzzy msgid "Email to" msgstr "電子郵件" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:210 #, fuzzy msgid "Send" msgstr "秒" -#: rhodecode/templates/admin/settings/settings.html:213 +#: rhodecode/templates/admin/settings/settings.html:216 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:219 #, fuzzy msgid "show" msgstr "顯示" @@ -2252,7 +2281,6 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/admin/users/users.html:9 msgid "Users" msgstr "使用者" @@ -2310,29 +2338,39 @@ 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 +#: rhodecode/templates/admin/users/user_edit.html:166 +#, fuzzy +msgid "Nothing here yet" +msgstr "尚未有任何變更" + +#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit_my_account.html:60 +#: rhodecode/templates/admin/users/user_edit_my_account.html:191 #, fuzzy msgid "Permission" msgstr "權限" -#: rhodecode/templates/admin/users/user_edit.html:210 +#: rhodecode/templates/admin/users/user_edit.html:174 +#, fuzzy +msgid "Edit Permission" +msgstr "版本庫權限" + +#: rhodecode/templates/admin/users/user_edit.html:223 #, fuzzy msgid "Email addresses" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:236 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "確認刪除這個使用者" -#: rhodecode/templates/admin/users/user_edit.html:237 +#: rhodecode/templates/admin/users/user_edit.html:250 #, fuzzy msgid "New email address" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/users/user_edit.html:257 #, fuzzy msgid "Add" msgstr "新增" @@ -2346,24 +2384,47 @@ msgid "My Account" msgstr "我的帳號" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit_my_account.html:35 +#, fuzzy +msgid "My permissions" +msgstr "權限" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:38 #: rhodecode/templates/journal/journal.html:41 #, fuzzy msgid "My repos" msgstr "空的版本庫" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit_my_account.html:41 +#, fuzzy +msgid "My pull requests" +msgstr "建立使用者 %s" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:45 #, fuzzy -msgid "My permissions" -msgstr "權限" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:37 -#: rhodecode/templates/journal/journal.html:46 -#, fuzzy -msgid "ADD" +msgid "Add repo" msgstr "新增" -#: rhodecode/templates/admin/users/user_edit_my_account.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +msgid "Opened by me" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#, python-format +msgid "Pull request #%s opened on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +msgid "I participate in" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#, python-format +msgid "Pull request #%s opened by %s on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:55 @@ -2373,17 +2434,23 @@ msgid "Revision" msgstr "修訂" -#: rhodecode/templates/admin/users/user_edit_my_account.html:71 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/journal/journal.html:81 msgid "private" msgstr "私有" -#: rhodecode/templates/admin/users/user_edit_my_account.html:81 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#, fuzzy, python-format +msgid "Confirm to delete this repository: %s" +msgstr "確認移除這個版本庫" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 #: rhodecode/templates/journal/journal.html:94 msgid "No repositories yet" msgstr "沒有任何版本庫" -#: rhodecode/templates/admin/users/user_edit_my_account.html:83 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 #: rhodecode/templates/journal/journal.html:96 msgid "create one now" msgstr "" @@ -2392,42 +2459,42 @@ msgid "Users administration" msgstr "使用者管理員" +#: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/base/base.html:221 +msgid "users" +msgstr "使用者" + #: rhodecode/templates/admin/users/users.html:23 msgid "ADD NEW USER" msgstr "新增使用者" -#: rhodecode/templates/admin/users/users.html:33 +#: rhodecode/templates/admin/users/users.html:76 msgid "username" msgstr "使用者名稱" -#: rhodecode/templates/admin/users/users.html:34 -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "名字" - -#: rhodecode/templates/admin/users/users.html:35 +#: rhodecode/templates/admin/users/users.html:79 +#, fuzzy +msgid "firstname" +msgstr "名" + +#: rhodecode/templates/admin/users/users.html:80 msgid "lastname" msgstr "姓" -#: rhodecode/templates/admin/users/users.html:36 +#: rhodecode/templates/admin/users/users.html:81 msgid "last login" msgstr "最後登入" -#: rhodecode/templates/admin/users/users.html:37 +#: rhodecode/templates/admin/users/users.html:82 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "啟用" -#: rhodecode/templates/admin/users/users.html:39 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/base/base.html:224 msgid "ldap" msgstr "" -#: rhodecode/templates/admin/users/users.html:56 -#, fuzzy, python-format -msgid "Confirm to delete this user: %s" -msgstr "確認刪除這個使用者" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 msgid "Add users group" msgstr "新增使用者群組" @@ -2458,7 +2525,6 @@ msgstr "選擇群組成員" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 -#: rhodecode/templates/pullrequests/pullrequest.html:81 msgid "Remove all elements" msgstr "移除所有元素" @@ -2467,7 +2533,6 @@ msgstr "啟用的成員" #: rhodecode/templates/admin/users_groups/users_group_edit.html:79 -#: rhodecode/templates/pullrequests/pullrequest.html:99 msgid "Add all elements" msgstr "新增索有元素" @@ -2575,9 +2640,9 @@ #: rhodecode/templates/base/base.html:158 #: rhodecode/templates/base/base.html:160 #: rhodecode/templates/base/base.html:162 -#: 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/data_table/_dt_elements.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 msgid "Summary" msgstr "概況" @@ -2585,9 +2650,9 @@ #: rhodecode/templates/base/base.html:168 #: rhodecode/templates/base/base.html:170 #: rhodecode/templates/changelog/changelog.html:15 -#: rhodecode/templates/data_table/_dt_elements.html:17 -#: rhodecode/templates/data_table/_dt_elements.html:19 -#: rhodecode/templates/data_table/_dt_elements.html:21 +#: rhodecode/templates/data_table/_dt_elements.html:23 +#: rhodecode/templates/data_table/_dt_elements.html:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 msgid "Changelog" msgstr "修改紀錄" @@ -2600,9 +2665,9 @@ #: rhodecode/templates/base/base.html:186 #: rhodecode/templates/base/base.html:188 #: rhodecode/templates/base/base.html:190 -#: 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/data_table/_dt_elements.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/files/files.html:40 msgid "Files" msgstr "檔案" @@ -2619,7 +2684,7 @@ msgstr "設定" #: rhodecode/templates/base/base.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "" @@ -2637,10 +2702,6 @@ msgid "repositories groups" msgstr "版本庫群組" -#: rhodecode/templates/base/base.html:221 -msgid "users" -msgstr "使用者" - #: rhodecode/templates/base/base.html:222 msgid "users groups" msgstr "使用者群組" @@ -2725,6 +2786,10 @@ msgid "Compare" msgstr "比較顯示" +#: rhodecode/templates/branches/branches_data.html:6 +msgid "name" +msgstr "名字" + #: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "日期" @@ -2756,11 +2821,13 @@ msgstr[0] "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "" @@ -2769,7 +2836,7 @@ msgstr "顯示" #: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:357 +#: rhodecode/templates/summary/summary.html:360 msgid "show more" msgstr "顯示更多" @@ -2906,18 +2973,18 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:46 -#: rhodecode/templates/changeset/changeset_file_comment.html:115 +#: rhodecode/templates/changeset/changeset_file_comment.html:121 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:48 -#: rhodecode/templates/changeset/changeset_file_comment.html:117 +#: rhodecode/templates/changeset/changeset_file_comment.html:123 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:132 +#: rhodecode/templates/changeset/changeset_file_comment.html:138 #, fuzzy msgid "Comment" msgstr "遞交" @@ -2936,19 +3003,23 @@ msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:112 +#: rhodecode/templates/changeset/changeset_file_comment.html:118 msgid "Leave a comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 #, fuzzy msgid "change status" msgstr "變更" +#: rhodecode/templates/changeset/changeset_file_comment.html:140 +msgid "Comment and close" +msgstr "" + #: rhodecode/templates/changeset/changeset_range.html:5 #, fuzzy, python-format msgid "%s Changesets" @@ -2961,7 +3032,7 @@ #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:71 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 msgid "Files affected" msgstr "" @@ -2984,40 +3055,45 @@ 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/data_table/_dt_elements.html:39 +#: rhodecode/templates/data_table/_dt_elements.html:41 +#: rhodecode/templates/data_table/_dt_elements.html:43 msgid "Fork" msgstr "分支" -#: rhodecode/templates/data_table/_dt_elements.html:54 +#: rhodecode/templates/data_table/_dt_elements.html:60 #: 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/data_table/_dt_elements.html:62 #: 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/data_table/_dt_elements.html:69 #: 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/data_table/_dt_elements.html:80 #: rhodecode/templates/summary/summary.html:87 #: rhodecode/templates/summary/summary.html:88 msgid "Fork of" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:86 +#: rhodecode/templates/data_table/_dt_elements.html:92 msgid "No changesets yet" msgstr "尚未有任何變更" +#: rhodecode/templates/data_table/_dt_elements.html:104 +#, fuzzy, python-format +msgid "Confirm to delete this user: %s" +msgstr "確認刪除這個使用者" + #: rhodecode/templates/email_templates/main.html:8 msgid "This is an notification from RhodeCode." msgstr "" @@ -3042,7 +3118,7 @@ msgstr "檔案" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:333 +#: rhodecode/templates/summary/summary.html:336 msgid "files" msgstr "檔案" @@ -3297,7 +3373,7 @@ msgid "forked" msgstr "已建立分支" -#: rhodecode/templates/forks/forks_data.html:34 +#: rhodecode/templates/forks/forks_data.html:38 msgid "There are no forks yet" msgstr "尚未有任何 fork" @@ -3331,6 +3407,11 @@ msgid "Watched" msgstr "快取" +#: rhodecode/templates/journal/journal.html:46 +#, fuzzy +msgid "ADD" +msgstr "新增" + #: rhodecode/templates/journal/journal.html:114 msgid "following user" msgstr "追蹤使用者" @@ -3376,69 +3457,79 @@ msgstr "比較顯示" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:63 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:78 -msgid "Chosen reviewers" +#: rhodecode/templates/pullrequests/pullrequest.html:79 +#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#, fuzzy +msgid "owner" +msgstr "擁有者" + +#: rhodecode/templates/pullrequests/pullrequest.html:91 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:95 -#, fuzzy -msgid "Available reviewers" -msgstr "啟用的成員" - -#: rhodecode/templates/pullrequests/pullrequest.html:108 +#: rhodecode/templates/pullrequests/pullrequest.html:97 #, fuzzy msgid "Create new pull request" msgstr "建立使用者 %s" -#: rhodecode/templates/pullrequests/pullrequest.html:117 -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 #, fuzzy msgid "Title" msgstr "寫" -#: rhodecode/templates/pullrequests/pullrequest.html:126 +#: rhodecode/templates/pullrequests/pullrequest.html:115 #, fuzzy msgid "description" msgstr "描述" -#: rhodecode/templates/pullrequests/pullrequest.html:134 +#: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, python-format -msgid "Pull request #%s" +msgid "Closed %s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:26 +#: rhodecode/templates/pullrequests/pullrequest_show.html:28 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 #, fuzzy msgid "Created on" msgstr "建立使用者 %s" -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 #, fuzzy msgid "Compare view" msgstr "比較顯示" -#: rhodecode/templates/pullrequests/pullrequest_show.html:67 +#: rhodecode/templates/pullrequests/pullrequest_show.html:46 #, fuzzy msgid "Incoming changesets" msgstr "尚未有任何變更" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 +#, fuzzy +msgid "all pull requests" +msgstr "建立使用者 %s" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 msgid "All pull requests" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 +msgid "Closed" +msgstr "" + #: rhodecode/templates/search/search.html:6 #, fuzzy, python-format msgid "Search \"%s\" in repository: %s" @@ -3473,10 +3564,16 @@ msgid "File contents" msgstr "文件內容" +#: rhodecode/templates/search/search.html:64 +#, fuzzy +msgid "Commit messages" +msgstr "遞交資訊" + #: rhodecode/templates/search/search.html:65 msgid "File names" msgstr "檔案名稱" +#: rhodecode/templates/search/search_commit.html:34 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3556,6 +3653,10 @@ msgid "remote clone" msgstr "遠端複製" +#: rhodecode/templates/summary/summary.html:112 +msgid "Contact" +msgstr "聯絡方式" + #: rhodecode/templates/summary/summary.html:126 msgid "Clone url" msgstr "複製連結" @@ -3622,40 +3723,49 @@ msgid "Quick start" msgstr "快速過濾..." -#: rhodecode/templates/summary/summary.html:286 +#: rhodecode/templates/summary/summary.html:229 +#, python-format +msgid "Readme file at revision '%s'" +msgstr "" + +#: rhodecode/templates/summary/summary.html:232 +msgid "Permalink to this readme" +msgstr "" + +#: rhodecode/templates/summary/summary.html:289 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" -#: rhodecode/templates/summary/summary.html:643 +#: rhodecode/templates/summary/summary.html:646 msgid "commits" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:644 +#: rhodecode/templates/summary/summary.html:647 msgid "files added" msgstr "多個檔案新增" -#: rhodecode/templates/summary/summary.html:645 +#: rhodecode/templates/summary/summary.html:648 msgid "files changed" msgstr "多個檔案修改" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:649 msgid "files removed" msgstr "移除多個檔案" -#: rhodecode/templates/summary/summary.html:649 +#: rhodecode/templates/summary/summary.html:652 msgid "commit" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:653 msgid "file added" msgstr "檔案新增" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:654 msgid "file changed" msgstr "檔案修改" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:655 msgid "file removed" msgstr "移除檔案"