Mercurial > kallithea
diff rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po @ 3242:fbb756225bb2 beta
translation updates
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 28 Jan 2013 00:25:12 +0100 |
| parents | 2dd0e1d92386 |
| children | 0065f7fe60f6 |
line wrap: on
line diff
--- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Mon Jan 28 00:13:01 2013 +0100 +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Mon Jan 28 00:25:12 2013 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-12-14 04:19+0100\n" +"POT-Creation-Date: 2013-01-28 00:24+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" @@ -35,15 +35,15 @@ msgid "%s line context" msgstr "文件內容" -#: rhodecode/controllers/changeset.py:314 -#: rhodecode/controllers/pullrequests.py:417 +#: rhodecode/controllers/changeset.py:329 +#: rhodecode/controllers/pullrequests.py:416 #, fuzzy, python-format msgid "Status change -> %s" msgstr "最後修改" -#: rhodecode/controllers/changeset.py:345 +#: rhodecode/controllers/changeset.py:360 msgid "" -"Changing status on a changeset associated witha closed pull request is " +"Changing status on a changeset associated with a closed pull request is " "not allowed" msgstr "" @@ -95,8 +95,8 @@ #: 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 -#: rhodecode/templates/pullrequests/pullrequest_show.html:153 +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +#: rhodecode/templates/pullrequests/pullrequest_show.html:171 msgid "Changeset was too big and was cut off..." msgstr "" @@ -115,113 +115,117 @@ msgid "There are no files yet %s" msgstr "尚未有任何檔案" -#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325 +#: rhodecode/controllers/files.py:269 rhodecode/controllers/files.py:338 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:292 -#, python-format -msgid "Edited %s via RhodeCode" +#: rhodecode/controllers/files.py:281 +msgid "You can only edit files with revision being a valid branch " +msgstr "" + +#: rhodecode/controllers/files.py:295 +#, fuzzy, python-format +msgid "Edited file %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:297 +#: rhodecode/controllers/files.py:311 msgid "No changes" msgstr "沒有修改" -#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372 +#: rhodecode/controllers/files.py:321 rhodecode/controllers/files.py:384 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378 +#: rhodecode/controllers/files.py:326 rhodecode/controllers/files.py:390 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:344 -#, fuzzy, python-format -msgid "Added %s via RhodeCode" +#: rhodecode/controllers/files.py:350 +#, fuzzy +msgid "Added file via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:358 +#: rhodecode/controllers/files.py:370 #, fuzzy msgid "No content" msgstr "文件內容" -#: rhodecode/controllers/files.py:362 +#: rhodecode/controllers/files.py:374 #, fuzzy msgid "No filename" msgstr "檔案名稱" -#: rhodecode/controllers/files.py:404 +#: rhodecode/controllers/files.py:416 msgid "downloads disabled" msgstr "下載已關閉" -#: rhodecode/controllers/files.py:415 +#: rhodecode/controllers/files.py:427 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: rhodecode/controllers/files.py:417 +#: rhodecode/controllers/files.py:429 msgid "Empty repository" msgstr "空的版本庫" -#: rhodecode/controllers/files.py:419 +#: rhodecode/controllers/files.py:431 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: rhodecode/controllers/files.py:564 +#: rhodecode/controllers/files.py:576 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "變更" -#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 +#: rhodecode/controllers/files.py:577 rhodecode/controllers/pullrequests.py:74 +#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:564 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78 -#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 +#: rhodecode/controllers/files.py:578 rhodecode/controllers/pullrequests.py:78 +#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:575 msgid "Tags" msgstr "標籤" -#: rhodecode/controllers/forks.py:158 +#: rhodecode/controllers/forks.py:165 #, python-format msgid "forked %s repository as %s" msgstr "forked %s 版本庫為 %s" -#: rhodecode/controllers/forks.py:172 +#: rhodecode/controllers/forks.py:179 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261 +#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318 #, fuzzy msgid "public journal" msgstr "公開日誌" -#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265 -#: rhodecode/templates/base/base.html:232 +#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 +#: rhodecode/templates/base/base.html:238 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "日誌" -#: rhodecode/controllers/login.py:143 +#: rhodecode/controllers/login.py:142 msgid "You have successfully registered into rhodecode" msgstr "您已經成功註冊rhodecode" -#: rhodecode/controllers/login.py:164 +#: rhodecode/controllers/login.py:163 msgid "Your password reset link was sent" msgstr "您的密碼重設連結已寄出" -#: rhodecode/controllers/login.py:184 +#: rhodecode/controllers/login.py:183 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" -#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556 +#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:570 msgid "Bookmarks" msgstr "" @@ -248,7 +252,7 @@ msgid "Successfully deleted pull request" msgstr "成功刪除使用者" -#: rhodecode/controllers/pullrequests.py:452 +#: rhodecode/controllers/pullrequests.py:451 msgid "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" @@ -264,48 +268,48 @@ msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:119 -#: rhodecode/controllers/admin/repos.py:272 +#: rhodecode/controllers/settings.py:120 +#: rhodecode/controllers/admin/repos.py:254 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: rhodecode/controllers/settings.py:137 -#: rhodecode/controllers/admin/repos.py:290 +#: rhodecode/controllers/settings.py:138 +#: rhodecode/controllers/admin/repos.py:272 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:162 -#: rhodecode/controllers/admin/repos.py:315 +#: rhodecode/controllers/settings.py:163 +#: rhodecode/controllers/admin/repos.py:297 #, python-format msgid "deleted repository %s" msgstr "刪除版本庫 %s" -#: rhodecode/controllers/settings.py:166 -#: rhodecode/controllers/admin/repos.py:325 -#: rhodecode/controllers/admin/repos.py:331 +#: rhodecode/controllers/settings.py:167 +#: rhodecode/controllers/admin/repos.py:307 +#: rhodecode/controllers/admin/repos.py:313 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/settings.py:185 +#: rhodecode/controllers/settings.py:186 #, fuzzy msgid "unlocked" msgstr "解鎖" -#: rhodecode/controllers/settings.py:188 +#: rhodecode/controllers/settings.py:189 #, fuzzy msgid "locked" msgstr "解鎖" -#: rhodecode/controllers/settings.py:190 +#: rhodecode/controllers/settings.py:191 #, fuzzy, python-format msgid "Repository has been %s" msgstr "forked %s 版本庫為 %s" -#: rhodecode/controllers/settings.py:194 -#: rhodecode/controllers/admin/repos.py:423 +#: rhodecode/controllers/settings.py:195 +#: rhodecode/controllers/admin/repos.py:405 msgid "An error occurred during unlocking" msgstr "" @@ -383,23 +387,23 @@ msgid "error occurred during update of ldap settings" msgstr "" -#: rhodecode/controllers/admin/permissions.py:59 -#: rhodecode/controllers/admin/permissions.py:63 +#: rhodecode/controllers/admin/permissions.py:60 +#: rhodecode/controllers/admin/permissions.py:64 msgid "None" msgstr "無" -#: rhodecode/controllers/admin/permissions.py:60 -#: rhodecode/controllers/admin/permissions.py:64 -msgid "Read" -msgstr "讀" - #: rhodecode/controllers/admin/permissions.py:61 #: rhodecode/controllers/admin/permissions.py:65 -msgid "Write" -msgstr "寫" +msgid "Read" +msgstr "讀" #: rhodecode/controllers/admin/permissions.py:62 #: rhodecode/controllers/admin/permissions.py:66 +msgid "Write" +msgstr "寫" + +#: rhodecode/controllers/admin/permissions.py:63 +#: rhodecode/controllers/admin/permissions.py:67 #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 @@ -413,227 +417,227 @@ #: rhodecode/templates/admin/settings/settings.html:9 #: rhodecode/templates/admin/users/user_add.html:8 #: rhodecode/templates/admin/users/user_edit.html:9 -#: rhodecode/templates/admin/users/user_edit.html:126 +#: rhodecode/templates/admin/users/user_edit.html:130 #: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/admin/users_groups/users_group_add.html:8 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 -#: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:350 -#: rhodecode/templates/base/base.html:352 -#: rhodecode/templates/base/base.html:354 +#: rhodecode/templates/base/base.html:203 +#: rhodecode/templates/base/base.html:324 +#: rhodecode/templates/base/base.html:326 +#: rhodecode/templates/base/base.html:328 msgid "Admin" msgstr "管理" -#: rhodecode/controllers/admin/permissions.py:69 +#: rhodecode/controllers/admin/permissions.py:70 msgid "disabled" msgstr "停用" -#: rhodecode/controllers/admin/permissions.py:71 +#: rhodecode/controllers/admin/permissions.py:72 msgid "allowed with manual account activation" msgstr "允許手動啟用帳號" -#: rhodecode/controllers/admin/permissions.py:73 +#: rhodecode/controllers/admin/permissions.py:74 msgid "allowed with automatic account activation" msgstr "允許自動啟用帳號" -#: rhodecode/controllers/admin/permissions.py:75 -#: rhodecode/controllers/admin/permissions.py:78 -msgid "Disabled" -msgstr "停用" - #: rhodecode/controllers/admin/permissions.py:76 #: rhodecode/controllers/admin/permissions.py:79 +msgid "Disabled" +msgstr "停用" + +#: rhodecode/controllers/admin/permissions.py:77 +#: rhodecode/controllers/admin/permissions.py:80 msgid "Enabled" msgstr "啟用" -#: rhodecode/controllers/admin/permissions.py:122 +#: rhodecode/controllers/admin/permissions.py:128 msgid "Default permissions updated successfully" msgstr "預設權限更新完成" -#: rhodecode/controllers/admin/permissions.py:136 +#: rhodecode/controllers/admin/permissions.py:142 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:190 +#: rhodecode/controllers/admin/repos.py:162 #, python-format msgid "created repository %s from %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:194 +#: rhodecode/controllers/admin/repos.py:166 #, python-format msgid "created repository %s" msgstr "建立版本庫 %s" -#: rhodecode/controllers/admin/repos.py:225 +#: rhodecode/controllers/admin/repos.py:197 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:320 +#: rhodecode/controllers/admin/repos.py:302 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:349 +#: rhodecode/controllers/admin/repos.py:331 msgid "An error occurred during deletion of repository user" msgstr "" +#: rhodecode/controllers/admin/repos.py:350 +msgid "An error occurred during deletion of repository users groups" +msgstr "" + #: rhodecode/controllers/admin/repos.py:368 -msgid "An error occurred during deletion of repository users groups" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:403 +#: rhodecode/controllers/admin/repos.py:385 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:443 +#: rhodecode/controllers/admin/repos.py:425 msgid "Updated repository visibility in public journal" msgstr "" +#: rhodecode/controllers/admin/repos.py:429 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:434 rhodecode/model/validators.py:301 +msgid "Token mismatch" +msgstr "" + #: rhodecode/controllers/admin/repos.py:447 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 -msgid "Token mismatch" +msgid "Pulled from remote location" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:449 +msgid "An error occurred during pull from remote location" msgstr "" #: rhodecode/controllers/admin/repos.py:465 -msgid "Pulled from remote location" +msgid "Nothing" msgstr "" #: rhodecode/controllers/admin/repos.py:467 -msgid "An error occurred during pull from remote location" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:483 -msgid "Nothing" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:485 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:489 +#: rhodecode/controllers/admin/repos.py:471 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:120 +#: rhodecode/controllers/admin/repos_groups.py:136 #, python-format msgid "created repos group %s" msgstr "建立版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:133 +#: rhodecode/controllers/admin/repos_groups.py:148 #, python-format msgid "error occurred during creation of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:167 +#: rhodecode/controllers/admin/repos_groups.py:205 #, python-format msgid "updated repos group %s" msgstr "更新版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:180 +#: rhodecode/controllers/admin/repos_groups.py:220 #, python-format msgid "error occurred during update of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:198 +#: rhodecode/controllers/admin/repos_groups.py:238 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:206 +#: rhodecode/controllers/admin/repos_groups.py:246 #, python-format msgid "removed repos group %s" msgstr "移除版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:212 +#: rhodecode/controllers/admin/repos_groups.py:252 msgid "Cannot delete this group it still contains subgroups" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:217 -#: rhodecode/controllers/admin/repos_groups.py:222 +#: rhodecode/controllers/admin/repos_groups.py:257 +#: rhodecode/controllers/admin/repos_groups.py:262 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:243 +#: rhodecode/controllers/admin/repos_groups.py:283 msgid "An error occurred during deletion of group user" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:264 +#: rhodecode/controllers/admin/repos_groups.py:304 msgid "An error occurred during deletion of group users groups" msgstr "" -#: rhodecode/controllers/admin/settings.py:123 +#: rhodecode/controllers/admin/settings.py:124 #, python-format -msgid "Repositories successfully rescanned added: %s,removed: %s" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:131 +msgid "Repositories successfully rescanned added: %s ; removed: %s" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:133 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" -#: rhodecode/controllers/admin/settings.py:162 +#: rhodecode/controllers/admin/settings.py:164 msgid "Updated application settings" msgstr "更新應用設定" -#: rhodecode/controllers/admin/settings.py:166 -#: rhodecode/controllers/admin/settings.py:299 +#: rhodecode/controllers/admin/settings.py:168 +#: rhodecode/controllers/admin/settings.py:301 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:207 +#: rhodecode/controllers/admin/settings.py:209 #, fuzzy msgid "Updated visualisation settings" msgstr "更新應用設定" -#: rhodecode/controllers/admin/settings.py:212 +#: rhodecode/controllers/admin/settings.py:214 msgid "error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:295 +#: rhodecode/controllers/admin/settings.py:297 #, fuzzy msgid "Updated VCS settings" msgstr "更新 mercurial 設定" -#: rhodecode/controllers/admin/settings.py:309 +#: rhodecode/controllers/admin/settings.py:311 msgid "Added new hook" msgstr "新增hook" -#: rhodecode/controllers/admin/settings.py:321 +#: rhodecode/controllers/admin/settings.py:323 msgid "Updated hooks" msgstr "更新hook" -#: rhodecode/controllers/admin/settings.py:325 +#: rhodecode/controllers/admin/settings.py:327 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:344 +#: rhodecode/controllers/admin/settings.py:346 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:399 +#: rhodecode/controllers/admin/settings.py:408 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:430 +#: rhodecode/controllers/admin/settings.py:448 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: rhodecode/controllers/admin/settings.py:445 -#: rhodecode/controllers/admin/users.py:196 +#: rhodecode/controllers/admin/settings.py:463 +#: rhodecode/controllers/admin/users.py:198 #, python-format msgid "error occurred during update of user %s" msgstr "" @@ -652,55 +656,69 @@ msgid "User updated successfully" msgstr "使用者更新完成" -#: rhodecode/controllers/admin/users.py:212 +#: rhodecode/controllers/admin/users.py:214 msgid "successfully deleted user" msgstr "成功刪除使用者" -#: rhodecode/controllers/admin/users.py:217 +#: rhodecode/controllers/admin/users.py:219 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:231 +#: rhodecode/controllers/admin/users.py:233 msgid "You can't edit this user" msgstr "您無法編輯這位使用者" -#: rhodecode/controllers/admin/users.py:272 +#: rhodecode/controllers/admin/users.py:276 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:277 +#: rhodecode/controllers/admin/users.py:281 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:283 +#: rhodecode/controllers/admin/users.py:287 #, fuzzy msgid "Granted 'repository fork' permission to user" msgstr "版本庫權限" -#: rhodecode/controllers/admin/users.py:288 +#: rhodecode/controllers/admin/users.py:292 #, fuzzy msgid "Revoked 'repository fork' permission to user" msgstr "版本庫權限" -#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users.py:298 #: rhodecode/controllers/admin/users_groups.py:279 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/controllers/admin/users.py:309 +#: rhodecode/controllers/admin/users.py:312 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:315 +#: rhodecode/controllers/admin/users.py:318 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:325 +#: rhodecode/controllers/admin/users.py:328 #, fuzzy msgid "Removed email from user" msgstr "移除版本庫群組 %s" +#: rhodecode/controllers/admin/users.py:341 +#, python-format +msgid "Added ip %s to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:347 +msgid "An error occurred during ip saving" +msgstr "" + +#: rhodecode/controllers/admin/users.py:359 +#, fuzzy +msgid "Removed ip from user" +msgstr "移除版本庫群組 %s" + #: rhodecode/controllers/admin/users_groups.py:86 #, python-format msgid "created users group %s" @@ -745,11 +763,16 @@ msgid "Revoked 'repository fork' permission to users group" msgstr "" -#: rhodecode/lib/auth.py:499 +#: rhodecode/lib/auth.py:509 +#, fuzzy, python-format +msgid "IP %s not allowed" +msgstr "追蹤者" + +#: rhodecode/lib/auth.py:558 msgid "You need to be a registered user to perform this action" msgstr "您必須是註冊使用者才能執行這個動作" -#: rhodecode/lib/auth.py:540 +#: rhodecode/lib/auth.py:599 msgid "You need to be a signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" @@ -909,16 +932,16 @@ msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:883 +#: rhodecode/lib/helpers.py:884 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:887 +#: rhodecode/lib/helpers.py:888 msgid "No Files" msgstr "沒有檔案" -#: rhodecode/lib/helpers.py:1163 +#: rhodecode/lib/helpers.py:1164 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -991,107 +1014,127 @@ msgid "password reset link" msgstr "您的密碼重設連結已寄出" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 rhodecode/model/db.py:1313 #, fuzzy msgid "Repository no access" msgstr "個版本庫" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 rhodecode/model/db.py:1314 #, fuzzy msgid "Repository read access" msgstr "這個版本庫已經存在" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 rhodecode/model/db.py:1315 #, fuzzy msgid "Repository write access" msgstr "個版本庫" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 rhodecode/model/db.py:1316 #, fuzzy msgid "Repository admin access" msgstr "個版本庫" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 rhodecode/model/db.py:1318 #, fuzzy msgid "Repositories Group no access" msgstr "版本庫群組" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 rhodecode/model/db.py:1319 #, fuzzy msgid "Repositories Group read access" msgstr "版本庫群組" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 rhodecode/model/db.py:1320 #, fuzzy msgid "Repositories Group write access" msgstr "版本庫群組" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 rhodecode/model/db.py:1321 #, fuzzy msgid "Repositories Group admin access" msgstr "版本庫群組" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 rhodecode/model/db.py:1323 #, fuzzy msgid "RhodeCode Administrator" msgstr "使用者管理員" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 rhodecode/model/db.py:1324 #, fuzzy msgid "Repository creation disabled" msgstr "版本庫建立" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 rhodecode/model/db.py:1325 #, fuzzy msgid "Repository creation enabled" msgstr "版本庫建立" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 rhodecode/model/db.py:1326 #, fuzzy msgid "Repository forking disabled" msgstr "版本庫建立" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 rhodecode/model/db.py:1327 #, fuzzy msgid "Repository forking enabled" msgstr "版本庫建立" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 rhodecode/model/db.py:1328 #, fuzzy msgid "Register disabled" msgstr "停用" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 rhodecode/model/db.py:1329 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 rhodecode/model/db.py:1332 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 rhodecode/model/db.py:1776 msgid "Not Reviewed" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 rhodecode/model/db.py:1777 #, fuzzy msgid "Approved" msgstr "移除" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 rhodecode/model/db.py:1778 msgid "Rejected" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646 +#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 rhodecode/model/db.py:1779 msgid "Under Review" msgstr "" -#: rhodecode/model/comment.py:110 +#: rhodecode/model/comment.py:109 #, python-format msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:173 +#: rhodecode/model/comment.py:176 msgid "[Mention]" msgstr "" @@ -1143,179 +1186,192 @@ msgid "commented on pull request at %(when)s" msgstr "建立使用者 %s" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:100 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:542 +#: rhodecode/model/scm.py:556 #, fuzzy msgid "latest tip" msgstr "最後登入" -#: rhodecode/model/user.py:232 +#: rhodecode/model/user.py:231 #, fuzzy msgid "new user registration" msgstr "[RhodeCode] 新使用者註冊" -#: rhodecode/model/user.py:257 rhodecode/model/user.py:281 -#: rhodecode/model/user.py:303 +#: rhodecode/model/user.py:256 rhodecode/model/user.py:280 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:327 +#: rhodecode/model/user.py:302 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:333 +#: rhodecode/model/user.py:308 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "這個使用者擁有 %s 個版本庫所以無法移除，請先變更版本庫擁有者或者刪除版本庫" -#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 +#: rhodecode/model/validators.py:37 rhodecode/model/validators.py:38 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:83 +#: rhodecode/model/validators.py:84 #, fuzzy, python-format msgid "Username \"%(username)s\" already exists" msgstr "使用者名稱已存在" -#: rhodecode/model/validators.py:85 +#: rhodecode/model/validators.py:86 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:87 +#: rhodecode/model/validators.py:88 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "使用者名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" -#: rhodecode/model/validators.py:115 +#: rhodecode/model/validators.py:116 #, fuzzy, python-format msgid "Username %(username)s is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/validators.py:134 +#: rhodecode/model/validators.py:135 #, fuzzy msgid "Invalid users group name" msgstr "無效的使用者名稱" -#: rhodecode/model/validators.py:135 +#: rhodecode/model/validators.py:136 #, fuzzy, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "這個使用者群組已存在" -#: rhodecode/model/validators.py:137 +#: rhodecode/model/validators.py:138 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "群組名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" -#: rhodecode/model/validators.py:175 +#: rhodecode/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "" -#: rhodecode/model/validators.py:176 +#: rhodecode/model/validators.py:177 #, fuzzy, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "使用者名稱已存在" -#: rhodecode/model/validators.py:178 +#: rhodecode/model/validators.py:179 #, fuzzy, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:236 +#: rhodecode/model/validators.py:237 #, fuzzy msgid "Invalid characters (non-ascii) in password" msgstr "無效的字元在密碼中" -#: rhodecode/model/validators.py:251 +#: rhodecode/model/validators.py:252 msgid "Passwords do not match" msgstr "密碼不相符" -#: rhodecode/model/validators.py:268 -msgid "invalid password" -msgstr "無效的密碼" - #: rhodecode/model/validators.py:269 -msgid "invalid user name" -msgstr "無效的使用者名稱" +msgid "invalid password" +msgstr "無效的密碼" #: rhodecode/model/validators.py:270 +msgid "invalid user name" +msgstr "無效的使用者名稱" + +#: rhodecode/model/validators.py:271 msgid "Your account is disabled" msgstr "您的帳號已被停用" -#: rhodecode/model/validators.py:314 +#: rhodecode/model/validators.py:315 #, fuzzy, python-format msgid "Repository name %(repo)s is disallowed" msgstr "不允許的版本庫名稱" -#: rhodecode/model/validators.py:316 +#: rhodecode/model/validators.py:317 #, fuzzy, python-format msgid "Repository named %(repo)s already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:317 +#: rhodecode/model/validators.py:318 #, fuzzy, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "這個版本庫已存在於群組 \"%s\"" -#: rhodecode/model/validators.py:319 +#: rhodecode/model/validators.py:320 #, fuzzy, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:432 +#: rhodecode/model/validators.py:433 msgid "invalid clone url" msgstr "無效的複製URL" -#: rhodecode/model/validators.py:433 +#: rhodecode/model/validators.py:434 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: rhodecode/model/validators.py:458 +#: rhodecode/model/validators.py:459 #, fuzzy msgid "Fork have to be the same type as parent" msgstr "Fork 必須使用相同的版本庫類型" -#: rhodecode/model/validators.py:473 +#: rhodecode/model/validators.py:474 #, fuzzy msgid "You don't have permissions to create repository in this group" msgstr "您沒有權限瀏覽這個頁面" -#: rhodecode/model/validators.py:498 +#: rhodecode/model/validators.py:501 +#, fuzzy +msgid "You don't have permissions to create a group in this location" +msgstr "您沒有權限瀏覽這個頁面" + +#: rhodecode/model/validators.py:540 msgid "This username or users group name is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/validators.py:591 +#: rhodecode/model/validators.py:636 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: rhodecode/model/validators.py:606 +#: rhodecode/model/validators.py:651 msgid "This e-mail address is already taken" msgstr "這個郵件位址已經使用了" -#: rhodecode/model/validators.py:626 +#: rhodecode/model/validators.py:671 #, fuzzy, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "這個郵件位址不存在" -#: rhodecode/model/validators.py:663 +#: rhodecode/model/validators.py:708 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:682 +#: rhodecode/model/validators.py:727 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" +#: rhodecode/model/validators.py:759 +msgid "Please enter a valid IPv4 or IpV6 address" +msgstr "" + +#: rhodecode/model/validators.py:760 +#, python-format +msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + #: rhodecode/templates/index.html:3 msgid "Dashboard" msgstr "儀表板" @@ -1328,43 +1384,55 @@ #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:9 -#: rhodecode/templates/journal/journal.html:48 +#: rhodecode/templates/journal/journal.html:49 +#: rhodecode/templates/journal/journal.html:50 #: rhodecode/templates/tags/tags.html:10 msgid "quick filter..." msgstr "快速過濾..." #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:233 +#: rhodecode/templates/base/base.html:239 msgid "repositories" msgstr "個版本庫" -#: rhodecode/templates/index_base.html:13 -#: rhodecode/templates/index_base.html:15 +#: rhodecode/templates/index_base.html:14 +#: rhodecode/templates/index_base.html:17 +#: rhodecode/templates/admin/repos/repo_add.html:5 +#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 #: rhodecode/templates/admin/repos/repos.html:21 -msgid "ADD REPOSITORY" +msgid "Add repository" msgstr "新增版本庫" -#: rhodecode/templates/index_base.html:29 -#: rhodecode/templates/index_base.html:136 +#: rhodecode/templates/index_base.html:23 +#, fuzzy +msgid "Edit group" +msgstr "編輯版本庫群組" + +#: rhodecode/templates/index_base.html:23 +msgid "You have admin right to this group, and can edit it" +msgstr "" + +#: rhodecode/templates/index_base.html:36 +#: rhodecode/templates/index_base.html:140 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:37 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33 #: rhodecode/templates/admin/users_groups/users_group_add.html:32 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33 msgid "Group name" msgstr "群組名稱" -#: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:72 -#: rhodecode/templates/index_base.html:138 -#: rhodecode/templates/index_base.html:176 -#: rhodecode/templates/index_base.html:266 +#: rhodecode/templates/index_base.html:37 +#: rhodecode/templates/index_base.html:79 +#: rhodecode/templates/index_base.html:142 +#: rhodecode/templates/index_base.html:180 +#: rhodecode/templates/index_base.html:273 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 -#: rhodecode/templates/admin/repos/repos.html:72 +#: rhodecode/templates/admin/repos/repos.html:73 #: 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_edit.html:46 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 #: rhodecode/templates/settings/repo_settings.html:66 @@ -1372,31 +1440,29 @@ msgid "Description" msgstr "描述" -#: rhodecode/templates/index_base.html:40 +#: rhodecode/templates/index_base.html:47 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 msgid "Repositories group" msgstr "版本庫群組" -#: rhodecode/templates/index_base.html:71 -#: rhodecode/templates/index_base.html:174 -#: rhodecode/templates/index_base.html:264 +#: rhodecode/templates/index_base.html:78 +#: rhodecode/templates/index_base.html:178 +#: rhodecode/templates/index_base.html:271 +#: rhodecode/templates/admin/permissions/permissions.html:117 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 -#: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:196 -#: rhodecode/templates/admin/users/user_edit_my_account.html:59 -#: rhodecode/templates/admin/users/user_edit_my_account.html:180 -#: rhodecode/templates/admin/users/user_edit_my_account.html:216 -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 +#: rhodecode/templates/admin/repos/repos.html:71 +#: rhodecode/templates/admin/users/user_edit.html:200 +#: rhodecode/templates/admin/users/user_edit_my_account.html:60 +#: rhodecode/templates/admin/users/user_edit_my_account.html:211 #: rhodecode/templates/admin/users_groups/users_group_edit.html:184 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: 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:70 -#: rhodecode/templates/journal/journal.html:196 -#: rhodecode/templates/journal/journal_page_repos.html:7 +#: rhodecode/templates/journal/journal.html:201 +#: rhodecode/templates/journal/journal.html:305 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 #: rhodecode/templates/summary/summary.html:132 @@ -1405,100 +1471,108 @@ msgid "Name" msgstr "名稱" -#: rhodecode/templates/index_base.html:73 +#: rhodecode/templates/index_base.html:80 msgid "Last change" 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:198 +#: rhodecode/templates/index_base.html:81 +#: rhodecode/templates/index_base.html:183 +#: rhodecode/templates/index_base.html:276 +#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/users/user_edit_my_account.html:213 +#: rhodecode/templates/journal/journal.html:203 +#: rhodecode/templates/journal/journal.html:307 msgid "Tip" msgstr "" -#: rhodecode/templates/index_base.html:75 -#: rhodecode/templates/index_base.html:181 -#: rhodecode/templates/index_base.html:269 +#: rhodecode/templates/index_base.html:82 +#: rhodecode/templates/index_base.html:185 +#: rhodecode/templates/index_base.html:278 #: rhodecode/templates/admin/repos/repo_edit.html:121 -#: rhodecode/templates/admin/repos/repos.html:73 +#: rhodecode/templates/admin/repos/repos.html:76 msgid "Owner" msgstr "擁有者" -#: rhodecode/templates/index_base.html:76 +#: rhodecode/templates/index_base.html:83 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "" -#: rhodecode/templates/index_base.html:77 +#: rhodecode/templates/index_base.html:84 msgid "Atom" msgstr "" -#: rhodecode/templates/index_base.html:167 -#: rhodecode/templates/index_base.html:207 -#: rhodecode/templates/index_base.html:291 -#: rhodecode/templates/admin/repos/repos.html:94 -#: rhodecode/templates/admin/users/user_edit_my_account.html:202 +#: rhodecode/templates/index_base.html:171 +#: rhodecode/templates/index_base.html:211 +#: rhodecode/templates/index_base.html:300 +#: rhodecode/templates/admin/repos/repos.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account.html:235 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:221 +#: rhodecode/templates/journal/journal.html:225 +#: rhodecode/templates/journal/journal.html:329 #: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "" -#: rhodecode/templates/index_base.html:168 -#: rhodecode/templates/index_base.html:208 -#: rhodecode/templates/index_base.html:292 -#: rhodecode/templates/admin/repos/repos.html:95 -#: rhodecode/templates/admin/users/user_edit_my_account.html:203 +#: rhodecode/templates/index_base.html:172 +#: rhodecode/templates/index_base.html:212 +#: rhodecode/templates/index_base.html:301 +#: rhodecode/templates/admin/repos/repos.html:98 +#: rhodecode/templates/admin/users/user_edit_my_account.html:236 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:222 +#: rhodecode/templates/journal/journal.html:226 +#: rhodecode/templates/journal/journal.html:330 #: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:177 -#: rhodecode/templates/index_base.html:267 +#: rhodecode/templates/index_base.html:181 +#: rhodecode/templates/index_base.html:274 #, fuzzy msgid "Last Change" msgstr "最後修改" -#: rhodecode/templates/index_base.html:209 -#: rhodecode/templates/index_base.html:293 -#: rhodecode/templates/admin/repos/repos.html:96 -#: rhodecode/templates/admin/users/user_edit_my_account.html:204 +#: rhodecode/templates/index_base.html:213 +#: rhodecode/templates/index_base.html:302 +#: rhodecode/templates/admin/repos/repos.html:99 +#: rhodecode/templates/admin/users/user_edit_my_account.html:237 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:223 +#: rhodecode/templates/journal/journal.html:227 +#: rhodecode/templates/journal/journal.html:331 #: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "" -#: rhodecode/templates/index_base.html:210 -#: rhodecode/templates/index_base.html:294 -#: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:205 +#: rhodecode/templates/index_base.html:214 +#: rhodecode/templates/index_base.html:303 +#: rhodecode/templates/admin/repos/repos.html:100 +#: rhodecode/templates/admin/users/user_edit_my_account.html:238 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:224 +#: rhodecode/templates/journal/journal.html:228 +#: rhodecode/templates/journal/journal.html:332 #: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:211 -#: rhodecode/templates/index_base.html:295 -#: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:206 +#: rhodecode/templates/index_base.html:215 +#: rhodecode/templates/index_base.html:304 +#: rhodecode/templates/admin/repos/repos.html:101 +#: rhodecode/templates/admin/users/user_edit_my_account.html:105 +#: rhodecode/templates/admin/users/user_edit_my_account.html:239 #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:62 -#: rhodecode/templates/journal/journal.html:225 +#: rhodecode/templates/journal/journal.html:229 +#: rhodecode/templates/journal/journal.html:333 #: rhodecode/templates/tags/tags.html:81 #, fuzzy msgid "Loading..." @@ -1515,9 +1589,9 @@ #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 #: rhodecode/templates/admin/users/user_add.html:32 -#: rhodecode/templates/admin/users/user_edit.html:50 +#: rhodecode/templates/admin/users/user_edit.html:54 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 -#: rhodecode/templates/base/base.html:83 +#: rhodecode/templates/base/base.html:89 #: rhodecode/templates/summary/summary.html:131 msgid "Username" msgstr "帳號" @@ -1525,7 +1599,7 @@ #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 #: rhodecode/templates/admin/ldap/ldap.html:46 #: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:92 +#: rhodecode/templates/base/base.html:98 msgid "Password" msgstr "密碼" @@ -1538,7 +1612,7 @@ msgid "Forgot your password ?" msgstr "忘記您的密碼?" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:109 msgid "Don't have an account ?" msgstr "沒有帳號?" @@ -1576,22 +1650,22 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:90 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 +#: rhodecode/templates/admin/users/user_edit.html:94 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:57 msgid "First Name" msgstr "名" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:99 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 +#: rhodecode/templates/admin/users/user_edit.html:103 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:66 msgid "Last Name" msgstr "姓" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:108 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 +#: rhodecode/templates/admin/users/user_edit.html:112 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:75 #: rhodecode/templates/summary/summary.html:133 msgid "Email" msgstr "電子郵件" @@ -1672,11 +1746,10 @@ 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 -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 -#: rhodecode/templates/journal/journal_page_repos.html:9 -#: rhodecode/templates/journal/journal_page_repos.html:10 +#: rhodecode/templates/admin/repos/repos.html:77 +#: rhodecode/templates/admin/users/user_edit_my_account.html:215 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/journal/journal.html:309 msgid "Action" msgstr "動作" @@ -1752,7 +1825,7 @@ #: rhodecode/templates/admin/defaults/defaults.html:75 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:71 #, fuzzy msgid "Enable locking" msgstr "啟用" @@ -1764,12 +1837,13 @@ #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 +#: rhodecode/templates/admin/permissions/permissions.html:92 #: rhodecode/templates/admin/repos/repo_edit.html:141 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:79 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:133 -#: rhodecode/templates/admin/users/user_edit.html:178 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 +#: rhodecode/templates/admin/users/user_edit.html:137 +#: rhodecode/templates/admin/users/user_edit.html:182 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:83 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:94 msgid "Save" @@ -1862,8 +1936,8 @@ msgstr "遞交" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:267 -#: rhodecode/templates/base/base.html:269 +#: rhodecode/templates/base/base.html:272 +#: rhodecode/templates/base/base.html:274 msgid "Pull requests" msgstr "" @@ -1892,8 +1966,8 @@ #: rhodecode/templates/admin/permissions/permissions.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:134 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 -#: rhodecode/templates/admin/users/user_edit.html:143 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:63 +#: rhodecode/templates/admin/users/user_edit.html:147 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 #: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" @@ -1948,19 +2022,114 @@ msgid "Repository forking" msgstr "版本庫建立" -#: rhodecode/templates/admin/permissions/permissions.html:92 -#: rhodecode/templates/admin/repos/repo_edit.html:264 -msgid "set" -msgstr "設定" - -#: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5 -msgid "Add repository" -msgstr "新增版本庫" +#: rhodecode/templates/admin/permissions/permissions.html:93 +#: rhodecode/templates/admin/permissions/permissions.html:209 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 +#: rhodecode/templates/admin/settings/settings.html:113 +#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/users/user_edit.html:138 +#: rhodecode/templates/admin/users/user_edit.html:183 +#: rhodecode/templates/admin/users/user_edit.html:286 +#: rhodecode/templates/admin/users/user_edit.html:334 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:84 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 +#: 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:95 +msgid "Reset" +msgstr "重設" + +#: rhodecode/templates/admin/permissions/permissions.html:103 +#, fuzzy +msgid "Default User Permissions" +msgstr "預設權限" + +#: rhodecode/templates/admin/permissions/permissions.html:111 +#: rhodecode/templates/admin/users/user_edit.html:194 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 +#, fuzzy +msgid "Nothing here yet" +msgstr "尚未有任何變更" + +#: rhodecode/templates/admin/permissions/permissions.html:118 +#: rhodecode/templates/admin/users/user_edit.html:201 +#: rhodecode/templates/admin/users/user_edit_my_account.html:61 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 +#, fuzzy +msgid "Permission" +msgstr "權限" + +#: rhodecode/templates/admin/permissions/permissions.html:119 +#: rhodecode/templates/admin/users/user_edit.html:202 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 +#, fuzzy +msgid "Edit Permission" +msgstr "版本庫權限" + +#: rhodecode/templates/admin/permissions/permissions.html:149 +#: rhodecode/templates/admin/permissions/permissions.html:151 +#: rhodecode/templates/admin/repos/repo_edit.html:13 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#: rhodecode/templates/admin/users/user_edit.html:13 +#: rhodecode/templates/admin/users/user_edit.html:232 +#: rhodecode/templates/admin/users/user_edit.html:234 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 +#: rhodecode/templates/data_table/_dt_elements.html:116 +#: rhodecode/templates/data_table/_dt_elements.html:117 +msgid "edit" +msgstr "編輯" + +#: rhodecode/templates/admin/permissions/permissions.html:168 +#: rhodecode/templates/admin/users/user_edit.html:295 +#, fuzzy +msgid "Allowed IP addresses" +msgstr "郵件位址" + +#: rhodecode/templates/admin/permissions/permissions.html:182 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 +#: rhodecode/templates/admin/users/user_edit.html:263 +#: rhodecode/templates/admin/users/user_edit.html:308 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/data_table/_dt_elements.html:122 +#: rhodecode/templates/data_table/_dt_elements.html:130 +msgid "delete" +msgstr "刪除" + +#: rhodecode/templates/admin/permissions/permissions.html:183 +#: rhodecode/templates/admin/users/user_edit.html:309 +#, fuzzy, python-format +msgid "Confirm to delete this ip: %s" +msgstr "確認刪除這個使用者" + +#: rhodecode/templates/admin/permissions/permissions.html:189 +#: rhodecode/templates/admin/users/user_edit.html:315 +msgid "All IP addresses are allowed" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:200 +#: rhodecode/templates/admin/users/user_edit.html:326 +#, fuzzy +msgid "New ip address" +msgstr "郵件位址" + +#: rhodecode/templates/admin/permissions/permissions.html:208 +#: rhodecode/templates/admin/users/user_edit.html:285 +#: rhodecode/templates/admin/users/user_edit.html:333 +#, fuzzy +msgid "Add" +msgstr "新增" #: rhodecode/templates/admin/repos/repo_add.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 +#: rhodecode/templates/base/base.html:154 msgid "Repositories" msgstr "版本庫" @@ -2024,19 +2193,6 @@ msgid "Edit repository" msgstr "編輯版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:228 -#: rhodecode/templates/admin/users/user_edit.html:230 -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:207 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:209 -#: rhodecode/templates/files/files_source.html:29 -#: rhodecode/templates/journal/journal_page_repos.html:29 -msgid "edit" -msgstr "編輯" - #: rhodecode/templates/admin/repos/repo_edit.html:40 #: rhodecode/templates/settings/repo_settings.html:39 msgid "Clone uri" @@ -2052,23 +2208,6 @@ msgid "Change owner of this repository." msgstr "修改於版本庫 %s" -#: rhodecode/templates/admin/repos/repo_edit.html:142 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 -#: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:179 -#: rhodecode/templates/admin/settings/settings.html:269 -#: rhodecode/templates/admin/users/user_edit.html:134 -#: rhodecode/templates/admin/users/user_edit.html:179 -#: rhodecode/templates/admin/users/user_edit.html:282 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 -#: 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:95 -msgid "Reset" -msgstr "重設" - #: rhodecode/templates/admin/repos/repo_edit.html:152 msgid "Administration" msgstr "管理者" @@ -2137,16 +2276,16 @@ #: rhodecode/templates/admin/repos/repo_edit.html:203 #: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:117 +#: rhodecode/templates/admin/users/user_edit.html:121 #: rhodecode/templates/admin/users_groups/users_group_add.html:41 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42 msgid "Active" msgstr "啟用" #: rhodecode/templates/admin/repos/repo_edit.html:218 -#: rhodecode/templates/base/base.html:331 -#: rhodecode/templates/base/base.html:333 -#: rhodecode/templates/base/base.html:335 +#: rhodecode/templates/base/base.html:306 +#: rhodecode/templates/base/base.html:308 +#: rhodecode/templates/base/base.html:310 msgid "Public journal" msgstr "公開日誌" @@ -2200,12 +2339,16 @@ msgid "Set as fork of" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:264 +msgid "set" +msgstr "設定" + #: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Manually set this repository as a fork of another from the list" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:274 -#: rhodecode/templates/changeset/changeset_file_comment.html:26 +#: rhodecode/templates/changeset/changeset_file_comment.html:41 msgid "Delete" msgstr "移除" @@ -2245,7 +2388,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:85 -#: rhodecode/templates/base/base.html:229 +#: rhodecode/templates/base/base.html:235 msgid "admin" msgstr "管理員" @@ -2255,8 +2398,7 @@ msgstr "成員" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:95 +#: rhodecode/templates/data_table/_dt_elements.html:61 #: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "私有版本庫" @@ -2300,15 +2442,12 @@ #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74 msgid "" -"Set or revoke permission to all children of that group, including " -"repositories and other groups" +"Set or revoke permission to all children of that group, including non-" +"private repositories and other groups" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 -#: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:313 -#: rhodecode/templates/base/base.html:315 -#: rhodecode/templates/base/base.html:317 +#: rhodecode/templates/base/base.html:128 #: rhodecode/templates/bookmarks/bookmarks.html:11 #: rhodecode/templates/branches/branches.html:10 #: rhodecode/templates/changelog/changelog.html:10 @@ -2349,7 +2488,7 @@ msgstr "新增版本庫群組" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:55 msgid "Group parent" msgstr "父群組" @@ -2357,7 +2496,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:131 +#: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "save" msgstr "儲存" @@ -2369,7 +2508,12 @@ msgid "edit repos group" msgstr "編輯版本庫群組" -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:26 +#, fuzzy +msgid "Add new child group" +msgstr "新增使用者群組" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -2380,8 +2524,9 @@ msgstr "版本庫群組管理員" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22 -msgid "ADD NEW GROUP" -msgstr "新增群組" +#, fuzzy +msgid "Add new group" +msgstr "新增使用者群組" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35 #, fuzzy @@ -2394,21 +2539,13 @@ msgid "action" msgstr "動作" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 -#: rhodecode/templates/admin/users/user_edit.html:259 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 -#: rhodecode/templates/data_table/_dt_elements.html:7 -#: rhodecode/templates/data_table/_dt_elements.html:121 -msgid "delete" -msgstr "刪除" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:60 #, fuzzy, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" msgstr[0] "確認移除這個版本庫" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:68 msgid "There are no repositories groups yet" msgstr "沒有任何版本庫群組" @@ -2618,7 +2755,7 @@ msgstr "這是一個關鍵的設定，如果您確定要修改這個設定，請重新啟動應用程式以套用設定" #: rhodecode/templates/admin/settings/settings.html:262 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:227 msgid "unlock" msgstr "解鎖" @@ -2688,27 +2825,31 @@ msgid "API key" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:63 +#: rhodecode/templates/admin/users/user_edit.html:48 +msgid "Your IP" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:67 msgid "LDAP DN" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:72 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:35 +#: rhodecode/templates/admin/users/user_edit.html:76 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:39 msgid "New password" msgstr "新密碼" -#: rhodecode/templates/admin/users/user_edit.html:81 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 +#: rhodecode/templates/admin/users/user_edit.html:85 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:48 msgid "New password confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:151 +#: rhodecode/templates/admin/users/user_edit.html:155 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 #, fuzzy msgid "Inherit default permissions" msgstr "預設權限" -#: rhodecode/templates/admin/users/user_edit.html:156 +#: rhodecode/templates/admin/users/user_edit.html:160 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2716,60 +2857,34 @@ "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:162 +#: rhodecode/templates/admin/users/user_edit.html:166 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "建立版本庫" -#: rhodecode/templates/admin/users/user_edit.html:170 +#: rhodecode/templates/admin/users/user_edit.html:174 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 #, fuzzy msgid "Fork repositories" msgstr "個版本庫" -#: rhodecode/templates/admin/users/user_edit.html:190 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 -#, fuzzy -msgid "Nothing here yet" -msgstr "尚未有任何變更" - -#: rhodecode/templates/admin/users/user_edit.html:197 -#: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:217 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:185 -#, fuzzy -msgid "Permission" -msgstr "權限" - -#: rhodecode/templates/admin/users/user_edit.html:198 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:186 -#, fuzzy -msgid "Edit Permission" -msgstr "版本庫權限" - -#: rhodecode/templates/admin/users/user_edit.html:247 +#: rhodecode/templates/admin/users/user_edit.html:251 #, fuzzy msgid "Email addresses" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:260 +#: rhodecode/templates/admin/users/user_edit.html:264 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "確認刪除這個使用者" -#: rhodecode/templates/admin/users/user_edit.html:274 +#: rhodecode/templates/admin/users/user_edit.html:278 #, fuzzy msgid "New email address" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:281 -#, fuzzy -msgid "Add" -msgstr "新增" - #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/base/base.html:130 msgid "My account" msgstr "我的帳號" @@ -2783,7 +2898,7 @@ msgstr "權限" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 -#: rhodecode/templates/journal/journal.html:49 +#: rhodecode/templates/journal/journal.html:57 #, fuzzy msgid "My repos" msgstr "空的版本庫" @@ -2794,6 +2909,7 @@ msgstr "建立使用者 %s" #: rhodecode/templates/admin/users/user_edit_my_account.html:45 +#: rhodecode/templates/journal/journal.html:61 #, fuzzy msgid "Add repo" msgstr "新增" @@ -2822,50 +2938,18 @@ 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:54 -#: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/journal/journal_page_repos.html:8 -#: rhodecode/templates/tags/tags.html:55 -#: rhodecode/templates/tags/tags_data.html:9 -msgid "Revision" -msgstr "修訂" - -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 -#: rhodecode/templates/journal/journal_page_repos.html:29 -msgid "private" -msgstr "私有" - -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 -#: rhodecode/templates/data_table/_dt_elements.html:7 -#: rhodecode/templates/journal/journal_page_repos.html:32 -#, 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_page_repos.html:42 -msgid "No repositories yet" -msgstr "沒有任何版本庫" - -#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 -#: rhodecode/templates/journal/journal_page_repos.html:44 -msgid "create one now" -msgstr "" - #: rhodecode/templates/admin/users/users.html:5 msgid "Users administration" msgstr "使用者管理員" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:235 +#: rhodecode/templates/base/base.html:241 msgid "users" msgstr "使用者" #: rhodecode/templates/admin/users/users.html:23 -msgid "ADD NEW USER" +#, fuzzy +msgid "Add new user" msgstr "新增使用者" #: rhodecode/templates/admin/users/users.html:77 @@ -2891,7 +2975,7 @@ msgstr "啟用" #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:238 +#: rhodecode/templates/base/base.html:244 msgid "ldap" msgstr "" @@ -2961,8 +3045,9 @@ msgstr "使用者群組管理員" #: rhodecode/templates/admin/users_groups/users_groups.html:23 -msgid "ADD NEW USER GROUP" -msgstr "建立新的使用者群組" +#, fuzzy +msgid "Add new user group" +msgstr "新增使用者群組" #: rhodecode/templates/admin/users_groups/users_groups.html:32 msgid "group name" @@ -2982,153 +3067,159 @@ msgid "Submit a bug" msgstr "回報錯誤" -#: rhodecode/templates/base/base.html:77 +#: rhodecode/templates/base/base.html:76 +#, fuzzy +msgid "Not logged in" +msgstr "最後登入" + +#: rhodecode/templates/base/base.html:83 msgid "Login to your account" msgstr "" -#: rhodecode/templates/base/base.html:100 +#: rhodecode/templates/base/base.html:106 msgid "Forgot password ?" msgstr "忘記密碼?" -#: rhodecode/templates/base/base.html:107 +#: rhodecode/templates/base/base.html:113 #, fuzzy msgid "Log In" msgstr "登入" -#: rhodecode/templates/base/base.html:118 +#: rhodecode/templates/base/base.html:124 msgid "Inbox" msgstr "" -#: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:322 -#: rhodecode/templates/base/base.html:324 -#: rhodecode/templates/base/base.html:326 +#: rhodecode/templates/base/base.html:129 +#: rhodecode/templates/base/base.html:297 +#: rhodecode/templates/base/base.html:299 +#: rhodecode/templates/base/base.html:301 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/public_journal.html:4 msgid "Journal" msgstr "日誌" -#: rhodecode/templates/base/base.html:125 +#: rhodecode/templates/base/base.html:131 msgid "Log Out" msgstr "登出" -#: rhodecode/templates/base/base.html:144 +#: rhodecode/templates/base/base.html:150 msgid "Switch repository" msgstr "切換版本庫" -#: rhodecode/templates/base/base.html:146 -msgid "Products" -msgstr "" - #: rhodecode/templates/base/base.html:152 -#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47 -msgid "loading..." -msgstr "載入中..." +msgid "Products" +msgstr "" #: 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:15 -#: rhodecode/templates/data_table/_dt_elements.html:17 -#: rhodecode/templates/data_table/_dt_elements.html:19 -msgid "Summary" -msgstr "概況" +#: rhodecode/templates/base/base.html:189 rhodecode/templates/base/root.html:47 +msgid "loading..." +msgstr "載入中..." #: rhodecode/templates/base/base.html:166 #: rhodecode/templates/base/base.html:168 #: rhodecode/templates/base/base.html:170 +#: rhodecode/templates/data_table/_dt_elements.html:9 +#: rhodecode/templates/data_table/_dt_elements.html:11 +#: rhodecode/templates/data_table/_dt_elements.html:13 +msgid "Summary" +msgstr "概況" + +#: rhodecode/templates/base/base.html:174 +#: rhodecode/templates/base/base.html:176 +#: rhodecode/templates/base/base.html:178 #: rhodecode/templates/changelog/changelog.html:15 -#: rhodecode/templates/data_table/_dt_elements.html:23 -#: rhodecode/templates/data_table/_dt_elements.html:25 -#: rhodecode/templates/data_table/_dt_elements.html:27 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 +#: rhodecode/templates/data_table/_dt_elements.html:21 msgid "Changelog" msgstr "修改紀錄" -#: rhodecode/templates/base/base.html:175 -#: rhodecode/templates/base/base.html:177 -#: rhodecode/templates/base/base.html:179 +#: rhodecode/templates/base/base.html:182 +#: rhodecode/templates/base/base.html:184 +#: rhodecode/templates/base/base.html:186 msgid "Switch to" msgstr "切換至" -#: 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:31 -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/base/base.html:193 +#: rhodecode/templates/base/base.html:195 +#: rhodecode/templates/base/base.html:197 +#: rhodecode/templates/data_table/_dt_elements.html:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 +#: rhodecode/templates/data_table/_dt_elements.html:29 msgid "Files" msgstr "檔案" -#: rhodecode/templates/base/base.html:195 -#: rhodecode/templates/base/base.html:199 +#: rhodecode/templates/base/base.html:201 +#: rhodecode/templates/base/base.html:205 msgid "Options" msgstr "選項" -#: rhodecode/templates/base/base.html:204 -#: rhodecode/templates/base/base.html:206 +#: rhodecode/templates/base/base.html:210 +#: rhodecode/templates/base/base.html:212 #, fuzzy msgid "repository settings" msgstr "版本庫建立" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/data_table/_dt_elements.html:80 +#: rhodecode/templates/base/base.html:216 +#: rhodecode/templates/data_table/_dt_elements.html:74 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "" -#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50 +#: rhodecode/templates/base/base.html:218 #: rhodecode/templates/changelog/changelog.html:43 -msgid "Open new pull request" -msgstr "" - -#: rhodecode/templates/base/base.html:215 -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "" - -#: rhodecode/templates/base/base.html:217 +#, fuzzy +msgid "open new pull request" +msgstr "建立使用者 %s" + +#: rhodecode/templates/base/base.html:221 +#, fuzzy +msgid "compare fork" +msgstr "比較顯示" + +#: rhodecode/templates/base/base.html:223 msgid "search" msgstr "搜尋" -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:229 #, fuzzy msgid "lock" msgstr "解鎖" -#: rhodecode/templates/base/base.html:234 +#: rhodecode/templates/base/base.html:240 msgid "repositories groups" msgstr "版本庫群組" -#: rhodecode/templates/base/base.html:236 +#: rhodecode/templates/base/base.html:242 msgid "users groups" msgstr "使用者群組" -#: rhodecode/templates/base/base.html:237 +#: rhodecode/templates/base/base.html:243 msgid "permissions" msgstr "權限" -#: rhodecode/templates/base/base.html:239 +#: rhodecode/templates/base/base.html:245 #, fuzzy msgid "defaults" msgstr "刪除" -#: rhodecode/templates/base/base.html:240 +#: rhodecode/templates/base/base.html:246 msgid "settings" msgstr "設定" -#: rhodecode/templates/base/base.html:251 -#: rhodecode/templates/base/base.html:253 +#: rhodecode/templates/base/base.html:256 +#: rhodecode/templates/base/base.html:258 msgid "Followers" msgstr "追蹤者" -#: rhodecode/templates/base/base.html:259 -#: rhodecode/templates/base/base.html:261 +#: rhodecode/templates/base/base.html:264 +#: rhodecode/templates/base/base.html:266 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:340 -#: rhodecode/templates/base/base.html:342 -#: rhodecode/templates/base/base.html:344 +#: rhodecode/templates/base/base.html:315 +#: rhodecode/templates/base/base.html:317 +#: rhodecode/templates/base/base.html:319 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "搜尋" @@ -3139,7 +3230,7 @@ msgstr "新增另ㄧ位成員" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/data_table/_dt_elements.html:140 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "停止追蹤這個版本庫" @@ -3161,6 +3252,10 @@ msgid "no matching files" msgstr "無符合的檔案" +#: rhodecode/templates/base/root.html:50 +msgid "Open new pull request" +msgstr "" + #: rhodecode/templates/base/root.html:51 msgid "Open new pull request for selected changesets" msgstr "" @@ -3188,6 +3283,15 @@ msgid "Author" msgstr "作者" +#: rhodecode/templates/bookmarks/bookmarks.html:40 +#: rhodecode/templates/bookmarks/bookmarks_data.html:9 +#: rhodecode/templates/branches/branches.html:54 +#: rhodecode/templates/branches/branches_data.html:9 +#: rhodecode/templates/tags/tags.html:55 +#: rhodecode/templates/tags/tags_data.html:9 +msgid "Revision" +msgstr "修訂" + #: rhodecode/templates/branches/branches.html:5 #, fuzzy, python-format msgid "%s Branches" @@ -3257,7 +3361,8 @@ #: rhodecode/templates/changelog/changelog.html:94 #: rhodecode/templates/shortlog/shortlog_data.html:20 -msgid "Click to open associated pull request" +#, python-format +msgid "Click to open associated pull request #%s" msgstr "" #: rhodecode/templates/changelog/changelog.html:104 @@ -3296,7 +3401,7 @@ msgid "tag" msgstr "標籤" -#: rhodecode/templates/changelog/changelog.html:301 +#: rhodecode/templates/changelog/changelog.html:302 msgid "There are no changes yet" msgstr "尚未有任何變更" @@ -3354,14 +3459,14 @@ msgstr "下載差異" #: rhodecode/templates/changeset/changeset.html:76 -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:97 #, fuzzy, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "遞交" #: rhodecode/templates/changeset/changeset.html:76 -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:97 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" @@ -3369,7 +3474,7 @@ #: rhodecode/templates/changeset/changeset.html:122 #: rhodecode/templates/compare/compare_diff.html:44 -#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 #, fuzzy, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -3377,65 +3482,75 @@ #: rhodecode/templates/changeset/changeset.html:124 #: rhodecode/templates/compare/compare_diff.html:46 -#: rhodecode/templates/pullrequests/pullrequest_show.html:78 +#: rhodecode/templates/pullrequests/pullrequest_show.html:96 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" -#: rhodecode/templates/changeset/changeset_file_comment.html:42 +#: rhodecode/templates/changeset/changeset_file_comment.html:30 +#, fuzzy, python-format +msgid "Status from pull request %s" +msgstr "建立使用者 %s" + +#: rhodecode/templates/changeset/changeset_file_comment.html:32 +#, fuzzy, python-format +msgid "Comment from pull request %s" +msgstr "建立使用者 %s" + +#: rhodecode/templates/changeset/changeset_file_comment.html:57 msgid "Submitting..." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:45 +#: rhodecode/templates/changeset/changeset_file_comment.html:60 msgid "Commenting on line {1}." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:46 -#: rhodecode/templates/changeset/changeset_file_comment.html:121 +#: rhodecode/templates/changeset/changeset_file_comment.html:61 +#: rhodecode/templates/changeset/changeset_file_comment.html:140 #, 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:123 +#: rhodecode/templates/changeset/changeset_file_comment.html:63 +#: rhodecode/templates/changeset/changeset_file_comment.html:142 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:143 +#: rhodecode/templates/changeset/changeset_file_comment.html:74 +#: rhodecode/templates/changeset/changeset_file_comment.html:162 #, fuzzy msgid "Comment" msgstr "遞交" -#: rhodecode/templates/changeset/changeset_file_comment.html:60 -#: rhodecode/templates/changeset/changeset_file_comment.html:71 +#: rhodecode/templates/changeset/changeset_file_comment.html:75 +#: rhodecode/templates/changeset/changeset_file_comment.html:86 msgid "Hide" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:67 +#: rhodecode/templates/changeset/changeset_file_comment.html:82 #, fuzzy msgid "You need to be logged in to comment." msgstr "您必須登入後才能瀏覽這個頁面" -#: rhodecode/templates/changeset/changeset_file_comment.html:67 +#: rhodecode/templates/changeset/changeset_file_comment.html:82 msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:137 msgid "Leave a comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:125 +#: rhodecode/templates/changeset/changeset_file_comment.html:144 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:125 +#: rhodecode/templates/changeset/changeset_file_comment.html:144 #, fuzzy msgid "change status" msgstr "變更" -#: rhodecode/templates/changeset/changeset_file_comment.html:145 +#: rhodecode/templates/changeset/changeset_file_comment.html:164 msgid "Comment and close" msgstr "" @@ -3473,66 +3588,68 @@ msgstr "尚未有任何變更" #: rhodecode/templates/compare/compare_diff.html:37 -#: rhodecode/templates/pullrequests/pullrequest_show.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:87 #, fuzzy, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "文件內容" #: rhodecode/templates/compare/compare_diff.html:52 -#: rhodecode/templates/pullrequests/pullrequest_show.html:84 +#: rhodecode/templates/pullrequests/pullrequest_show.html:102 #, fuzzy msgid "No files" msgstr "檔案" -#: rhodecode/templates/data_table/_dt_elements.html:39 -#: rhodecode/templates/data_table/_dt_elements.html:41 -#: rhodecode/templates/data_table/_dt_elements.html:43 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 +#: rhodecode/templates/data_table/_dt_elements.html:37 msgid "Fork" msgstr "分支" -#: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/data_table/_dt_elements.html:54 #: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Mercurial 版本庫" -#: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:91 +#: rhodecode/templates/data_table/_dt_elements.html:56 #: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Git 版本庫" -#: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:97 +#: rhodecode/templates/data_table/_dt_elements.html:63 #: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "公開版本庫" -#: rhodecode/templates/data_table/_dt_elements.html:80 +#: rhodecode/templates/data_table/_dt_elements.html:74 #: rhodecode/templates/summary/summary.html:96 #: rhodecode/templates/summary/summary.html:97 msgid "Fork of" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:94 +#: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" msgstr "尚未有任何變更" -#: rhodecode/templates/data_table/_dt_elements.html:101 -#: rhodecode/templates/data_table/_dt_elements.html:103 +#: rhodecode/templates/data_table/_dt_elements.html:95 +#: rhodecode/templates/data_table/_dt_elements.html:97 #, python-format msgid "Subscribe to %s rss feed" msgstr "訂閱 %s rss" -#: rhodecode/templates/data_table/_dt_elements.html:109 -#: rhodecode/templates/data_table/_dt_elements.html:111 +#: rhodecode/templates/data_table/_dt_elements.html:103 +#: rhodecode/templates/data_table/_dt_elements.html:105 #, python-format msgid "Subscribe to %s atom feed" msgstr "訂閱 %s atom" #: rhodecode/templates/data_table/_dt_elements.html:122 #, fuzzy, python-format +msgid "Confirm to delete this repository: %s" +msgstr "確認移除這個版本庫" + +#: rhodecode/templates/data_table/_dt_elements.html:131 +#, fuzzy, python-format msgid "Confirm to delete this user: %s" msgstr "確認刪除這個使用者" @@ -3579,15 +3696,15 @@ msgid "description" msgstr "描述" -#: rhodecode/templates/email_templates/pull_request.html:11 -msgid "revisions for reviewing" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request.html:18 +#: rhodecode/templates/email_templates/pull_request.html:7 #, fuzzy msgid "View this pull request here" msgstr "確認移除這個版本庫" +#: rhodecode/templates/email_templates/pull_request.html:12 +msgid "revisions for reviewing" +msgstr "" + #: rhodecode/templates/email_templates/pull_request_comment.html:4 #, fuzzy, python-format msgid "User %s commented on pull request #%s for repository %s" @@ -3757,7 +3874,7 @@ #: rhodecode/templates/files/files_edit.html:50 #: rhodecode/templates/files/files_source.html:25 -#: rhodecode/templates/files/files_source.html:53 +#: rhodecode/templates/files/files_source.html:55 msgid "show as raw" msgstr "顯示原始文件" @@ -3810,12 +3927,25 @@ msgid "show source" msgstr "顯示原始碼" -#: rhodecode/templates/files/files_source.html:44 +#: rhodecode/templates/files/files_source.html:29 +#, fuzzy, python-format +msgid "edit on branch:%s" +msgstr "刪除版本庫 %s" + +#: rhodecode/templates/files/files_source.html:31 +msgid "edit on branch:?" +msgstr "" + +#: rhodecode/templates/files/files_source.html:31 +msgid "Editing files allowed only when on branch head revision" +msgstr "" + +#: rhodecode/templates/files/files_source.html:46 #, python-format msgid "Binary file (%s)" msgstr "二進位檔 (%s)" -#: rhodecode/templates/files/files_source.html:53 +#: rhodecode/templates/files/files_source.html:55 msgid "File is too big to display" msgstr "顯示的檔案太大" @@ -3893,6 +4023,10 @@ msgid "forked" msgstr "已建立分支" +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "" + #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "尚未有任何 fork" @@ -3922,28 +4056,11 @@ msgid "ATOM feed" msgstr "" -#: rhodecode/templates/journal/journal.html:49 +#: rhodecode/templates/journal/journal.html:54 #, fuzzy msgid "Watched" msgstr "快取" -#: rhodecode/templates/journal/journal.html:54 -#, fuzzy -msgid "ADD" -msgstr "新增" - -#: rhodecode/templates/journal/journal.html:77 -msgid "following user" -msgstr "追蹤使用者" - -#: rhodecode/templates/journal/journal.html:77 -msgid "user" -msgstr "使用者" - -#: rhodecode/templates/journal/journal.html:110 -msgid "You are not following any users or repositories" -msgstr "您尚未追蹤任何使用者或版本庫" - #: rhodecode/templates/journal/journal_data.html:55 msgid "No entries yet" msgstr "" @@ -3977,18 +4094,18 @@ msgstr "比較顯示" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:100 +#: rhodecode/templates/pullrequests/pullrequest_show.html:118 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +#: rhodecode/templates/pullrequests/pullrequest_show.html:130 #, fuzzy msgid "owner" msgstr "擁有者" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:127 +#: rhodecode/templates/pullrequests/pullrequest_show.html:145 msgid "Add reviewer to this pull request." msgstr "" @@ -4041,17 +4158,22 @@ msgid "pull request was reviewed by all reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:58 +#: rhodecode/templates/pullrequests/pullrequest_show.html:56 +#, fuzzy +msgid "Origin repository" +msgstr "Git 版本庫" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:76 #, fuzzy msgid "Created on" msgstr "建立使用者 %s" -#: rhodecode/templates/pullrequests/pullrequest_show.html:65 +#: rhodecode/templates/pullrequests/pullrequest_show.html:83 #, fuzzy msgid "Compare view" msgstr "比較顯示" -#: rhodecode/templates/pullrequests/pullrequest_show.html:112 +#: rhodecode/templates/pullrequests/pullrequest_show.html:130 #, fuzzy msgid "reviewer" msgstr "" @@ -4342,19 +4464,3 @@ msgid "Compare tags" msgstr "比較顯示" -#~ msgid "" -#~ "%s repository is not mapped to db" -#~ " perhaps it was created or renamed" -#~ " from the file system please run " -#~ "the application again in order to " -#~ "rescan repositories" -#~ msgstr "" - -#~ msgid "" -#~ "%s repository is not mapped to db" -#~ " perhaps it was moved or renamed " -#~ "from the filesystem please run the " -#~ "application again in order to rescan " -#~ "repositories" -#~ msgstr "" -