Mercurial > kallithea
diff rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po @ 3033:0cbbbad17a7e beta
General translation updates.
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 27 Nov 2012 20:56:57 +0100 |
parents | 4bc4e53fd6fe |
children | 2987e2107637 |
line wrap: on
line diff
--- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Mon Nov 26 20:39:45 2012 +0100 +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Tue Nov 27 20:56:57 2012 +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-09-02 20:30+0200\n" +"POT-Creation-Date: 2012-11-27 20:56+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" @@ -17,36 +17,38 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:94 +#: rhodecode/controllers/changelog.py:95 #, fuzzy msgid "All Branches" msgstr "分支" -#: rhodecode/controllers/changeset.py:83 +#: rhodecode/controllers/changeset.py:84 msgid "show white space" msgstr "" -#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 +#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 msgid "ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:157 +#: rhodecode/controllers/changeset.py:164 #, fuzzy, python-format msgid "%s line context" msgstr "文件內容" -#: rhodecode/controllers/changeset.py:333 -#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 -msgid "binary file" -msgstr "二進位檔" - -#: rhodecode/controllers/changeset.py:408 +#: rhodecode/controllers/changeset.py:315 +#: rhodecode/controllers/pullrequests.py:411 +#, fuzzy, python-format +msgid "Status change -> %s" +msgstr "最後修改" + +#: rhodecode/controllers/changeset.py:346 msgid "" "Changing status on a changeset associated witha closed pull request is " "not allowed" msgstr "" -#: rhodecode/controllers/compare.py:69 +#: rhodecode/controllers/compare.py:75 +#: rhodecode/controllers/pullrequests.py:117 #, fuzzy msgid "There are no changesets yet" msgstr "尚未有任何變更" @@ -77,103 +79,113 @@ "fulfilling the request." msgstr "" -#: rhodecode/controllers/feed.py:49 +#: rhodecode/controllers/feed.py:52 #, python-format msgid "Changes on %s repository" msgstr "修改於版本庫 %s" -#: rhodecode/controllers/feed.py:50 +#: rhodecode/controllers/feed.py:53 #, python-format msgid "%s %s feed" msgstr "" -#: rhodecode/controllers/feed.py:75 +#: rhodecode/controllers/feed.py:86 +#: rhodecode/templates/changeset/changeset.html:126 +#: rhodecode/templates/changeset/changeset.html:138 +#: 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 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: rhodecode/controllers/feed.py:92 #, fuzzy msgid "commited on" msgstr "遞交" -#: rhodecode/controllers/files.py:84 +#: rhodecode/controllers/files.py:86 #, fuzzy msgid "click here to add new file" msgstr "新增使用者" -#: rhodecode/controllers/files.py:85 +#: rhodecode/controllers/files.py:87 #, fuzzy, python-format msgid "There are no files yet %s" msgstr "尚未有任何檔案" -#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:266 +#: rhodecode/controllers/files.py:292 #, python-format msgid "Edited %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:271 +#: rhodecode/controllers/files.py:297 msgid "No changes" msgstr "沒有修改" -#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 +#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 +#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:318 +#: rhodecode/controllers/files.py:344 #, fuzzy, python-format msgid "Added %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:332 +#: rhodecode/controllers/files.py:358 #, fuzzy msgid "No content" msgstr "文件內容" -#: rhodecode/controllers/files.py:336 +#: rhodecode/controllers/files.py:362 #, fuzzy msgid "No filename" msgstr "檔案名稱" -#: rhodecode/controllers/files.py:378 +#: rhodecode/controllers/files.py:404 msgid "downloads disabled" msgstr "下載已關閉" -#: rhodecode/controllers/files.py:389 +#: rhodecode/controllers/files.py:415 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: rhodecode/controllers/files.py:391 +#: rhodecode/controllers/files.py:417 msgid "Empty repository" msgstr "空的版本庫" -#: rhodecode/controllers/files.py:393 +#: rhodecode/controllers/files.py:419 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: rhodecode/controllers/files.py:494 +#: rhodecode/controllers/files.py:564 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "變更" -#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 +#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 +#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:80 +#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561 msgid "Tags" msgstr "標籤" -#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:91 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -181,7 +193,7 @@ "repositories" msgstr "" -#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:134 rhodecode/controllers/settings.py:73 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -189,23 +201,23 @@ "repositories" msgstr "" -#: rhodecode/controllers/forks.py:167 +#: rhodecode/controllers/forks.py:168 #, python-format msgid "forked %s repository as %s" msgstr "forked %s 版本庫為 %s" -#: rhodecode/controllers/forks.py:181 +#: rhodecode/controllers/forks.py:182 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:202 rhodecode/controllers/journal.py:239 +#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 #, fuzzy msgid "public journal" msgstr "公開日誌" -#: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:220 +#: rhodecode/controllers/journal.py:210 rhodecode/controllers/journal.py:247 +#: rhodecode/templates/base/base.html:232 msgid "journal" msgstr "日誌" @@ -223,59 +235,59 @@ "email" msgstr "您的密碼重設動作已完成,新的密碼已寄至您的信箱" -#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 +#: rhodecode/controllers/pullrequests.py:78 rhodecode/model/scm.py:556 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:158 +#: rhodecode/controllers/pullrequests.py:186 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:160 +#: rhodecode/controllers/pullrequests.py:188 #, fuzzy msgid "error during creation of pull request" msgstr "建立使用者 %s" -#: rhodecode/controllers/pullrequests.py:181 +#: rhodecode/controllers/pullrequests.py:220 #, fuzzy msgid "Successfully opened new pull request" msgstr "成功刪除使用者" -#: rhodecode/controllers/pullrequests.py:184 +#: rhodecode/controllers/pullrequests.py:223 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:217 +#: rhodecode/controllers/pullrequests.py:256 #, fuzzy msgid "Successfully deleted pull request" msgstr "成功刪除使用者" -#: rhodecode/controllers/search.py:131 +#: rhodecode/controllers/search.py:134 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元" -#: rhodecode/controllers/search.py:136 +#: rhodecode/controllers/search.py:139 msgid "There is no index to search in. Please run whoosh indexer" msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" -#: rhodecode/controllers/search.py:140 +#: rhodecode/controllers/search.py:143 msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:266 +#: rhodecode/controllers/settings.py:108 +#: rhodecode/controllers/admin/repos.py:267 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:284 +#: rhodecode/controllers/settings.py:126 +#: rhodecode/controllers/admin/repos.py:285 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:302 +#: rhodecode/controllers/settings.py:144 +#: rhodecode/controllers/admin/repos.py:303 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -283,25 +295,45 @@ "repositories" msgstr "" -#: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:314 +#: rhodecode/controllers/settings.py:156 +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "deleted repository %s" msgstr "刪除版本庫 %s" -#: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:324 -#: rhodecode/controllers/admin/repos.py:330 +#: rhodecode/controllers/settings.py:160 +#: rhodecode/controllers/admin/repos.py:325 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/summary.py:138 +#: rhodecode/controllers/settings.py:179 +#, fuzzy +msgid "unlocked" +msgstr "解鎖" + +#: rhodecode/controllers/settings.py:182 +#, fuzzy +msgid "locked" +msgstr "解鎖" + +#: rhodecode/controllers/settings.py:184 +#, fuzzy, python-format +msgid "Repository has been %s" +msgstr "forked %s 版本庫為 %s" + +#: rhodecode/controllers/settings.py:188 +#: rhodecode/controllers/admin/repos.py:423 +msgid "An error occurred during unlocking" +msgstr "" + +#: rhodecode/controllers/summary.py:140 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:148 +#: rhodecode/controllers/summary.py:144 +#: rhodecode/templates/summary/summary.html:157 msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" @@ -386,15 +418,15 @@ #: 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:122 +#: rhodecode/templates/admin/users/user_edit.html:126 #: 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:337 -#: rhodecode/templates/base/base.html:339 -#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:349 +#: rhodecode/templates/base/base.html:351 +#: rhodecode/templates/base/base.html:353 msgid "Admin" msgstr "管理" @@ -428,189 +460,185 @@ msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:123 +#: rhodecode/controllers/admin/repos.py:124 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:192 +#: rhodecode/controllers/admin/repos.py:193 #, python-format msgid "created repository %s from %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:196 +#: rhodecode/controllers/admin/repos.py:197 #, python-format msgid "created repository %s" msgstr "建立版本庫 %s" -#: rhodecode/controllers/admin/repos.py:227 +#: rhodecode/controllers/admin/repos.py:228 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:348 +#: rhodecode/controllers/admin/repos.py:349 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:367 +#: rhodecode/controllers/admin/repos.py:368 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:385 +#: rhodecode/controllers/admin/repos.py:386 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:402 +#: rhodecode/controllers/admin/repos.py:403 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:422 -msgid "An error occurred during unlocking" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:442 +#: rhodecode/controllers/admin/repos.py:443 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:446 +#: rhodecode/controllers/admin/repos.py:447 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 +#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:464 +#: rhodecode/controllers/admin/repos.py:465 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:466 +#: rhodecode/controllers/admin/repos.py:467 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:482 +#: rhodecode/controllers/admin/repos.py:483 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:484 +#: 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:488 +#: rhodecode/controllers/admin/repos.py:489 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:116 +#: rhodecode/controllers/admin/repos_groups.py:120 #, python-format msgid "created repos group %s" msgstr "建立版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:129 +#: rhodecode/controllers/admin/repos_groups.py:133 #, python-format msgid "error occurred during creation of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:163 +#: rhodecode/controllers/admin/repos_groups.py:167 #, python-format msgid "updated repos group %s" msgstr "更新版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:176 +#: rhodecode/controllers/admin/repos_groups.py:180 #, python-format msgid "error occurred during update of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:194 +#: rhodecode/controllers/admin/repos_groups.py:198 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:202 +#: rhodecode/controllers/admin/repos_groups.py:206 #, python-format msgid "removed repos group %s" msgstr "移除版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:208 +#: rhodecode/controllers/admin/repos_groups.py:212 msgid "Cannot delete this group it still contains subgroups" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:213 -#: rhodecode/controllers/admin/repos_groups.py:218 +#: rhodecode/controllers/admin/repos_groups.py:217 +#: rhodecode/controllers/admin/repos_groups.py:222 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:238 +#: rhodecode/controllers/admin/repos_groups.py:243 msgid "An error occurred during deletion of group user" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:258 +#: rhodecode/controllers/admin/repos_groups.py:264 msgid "An error occurred during deletion of group users groups" msgstr "" -#: rhodecode/controllers/admin/settings.py:121 +#: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:129 +#: rhodecode/controllers/admin/settings.py:131 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" -#: rhodecode/controllers/admin/settings.py:160 +#: rhodecode/controllers/admin/settings.py:162 msgid "Updated application settings" msgstr "更新應用設定" -#: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:299 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:200 +#: rhodecode/controllers/admin/settings.py:207 #, fuzzy msgid "Updated visualisation settings" msgstr "更新應用設定" -#: rhodecode/controllers/admin/settings.py:205 +#: rhodecode/controllers/admin/settings.py:212 msgid "error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:271 +#: rhodecode/controllers/admin/settings.py:295 #, fuzzy msgid "Updated VCS settings" msgstr "更新 mercurial 設定" -#: rhodecode/controllers/admin/settings.py:285 +#: rhodecode/controllers/admin/settings.py:309 msgid "Added new hook" msgstr "新增hook" -#: rhodecode/controllers/admin/settings.py:297 +#: rhodecode/controllers/admin/settings.py:321 msgid "Updated hooks" msgstr "更新hook" -#: rhodecode/controllers/admin/settings.py:301 +#: rhodecode/controllers/admin/settings.py:325 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:320 +#: rhodecode/controllers/admin/settings.py:344 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:375 +#: rhodecode/controllers/admin/settings.py:399 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:406 +#: rhodecode/controllers/admin/settings.py:430 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: rhodecode/controllers/admin/settings.py:421 -#: rhodecode/controllers/admin/users.py:191 +#: rhodecode/controllers/admin/settings.py:445 +#: rhodecode/controllers/admin/users.py:196 #, python-format msgid "error occurred during update of user %s" msgstr "" @@ -625,100 +653,100 @@ msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:171 +#: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "使用者更新完成" -#: rhodecode/controllers/admin/users.py:207 -msgid "successfully deleted user" -msgstr "成功刪除使用者" - #: rhodecode/controllers/admin/users.py:212 +msgid "successfully deleted user" +msgstr "成功刪除使用者" + +#: rhodecode/controllers/admin/users.py:217 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:226 +#: rhodecode/controllers/admin/users.py:231 msgid "You can't edit this user" msgstr "您無法編輯這位使用者" -#: rhodecode/controllers/admin/users.py:266 +#: rhodecode/controllers/admin/users.py:272 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:271 -msgid "Revoked 'repository create' permission to user" -msgstr "" - #: rhodecode/controllers/admin/users.py:277 +msgid "Revoked 'repository create' permission to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:283 #, fuzzy msgid "Granted 'repository fork' permission to user" msgstr "版本庫權限" -#: rhodecode/controllers/admin/users.py:282 +#: rhodecode/controllers/admin/users.py:288 #, fuzzy msgid "Revoked 'repository fork' permission to user" msgstr "版本庫權限" -#: rhodecode/controllers/admin/users.py:288 -#: rhodecode/controllers/admin/users_groups.py:255 +#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users_groups.py:279 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/controllers/admin/users.py:303 -#, python-format -msgid "Added email %s to user" -msgstr "" - #: rhodecode/controllers/admin/users.py:309 +#, python-format +msgid "Added email %s to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:315 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:319 +#: rhodecode/controllers/admin/users.py:325 #, fuzzy msgid "Removed email from user" msgstr "移除版本庫群組 %s" -#: rhodecode/controllers/admin/users_groups.py:84 +#: rhodecode/controllers/admin/users_groups.py:86 #, python-format msgid "created users group %s" msgstr "建立使用者群組 %s" -#: rhodecode/controllers/admin/users_groups.py:95 +#: rhodecode/controllers/admin/users_groups.py:97 #, python-format msgid "error occurred during creation of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:135 +#: rhodecode/controllers/admin/users_groups.py:164 #, python-format msgid "updated users group %s" msgstr "更新使用者群組 %s" -#: rhodecode/controllers/admin/users_groups.py:157 +#: rhodecode/controllers/admin/users_groups.py:186 #, python-format msgid "error occurred during update of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:203 msgid "successfully deleted users group" msgstr "成功移除使用者群組" -#: rhodecode/controllers/admin/users_groups.py:179 +#: rhodecode/controllers/admin/users_groups.py:208 msgid "An error occurred during deletion of users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:233 +#: rhodecode/controllers/admin/users_groups.py:257 msgid "Granted 'repository create' permission to users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:238 +#: rhodecode/controllers/admin/users_groups.py:262 msgid "Revoked 'repository create' permission to users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:244 +#: rhodecode/controllers/admin/users_groups.py:268 msgid "Granted 'repository fork' permission to users group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:249 +#: rhodecode/controllers/admin/users_groups.py:273 msgid "Revoked 'repository fork' permission to users group" msgstr "" @@ -730,207 +758,232 @@ msgid "You need to be a signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" -#: rhodecode/lib/diffs.py:86 +#: rhodecode/lib/diffs.py:74 +msgid "binary file" +msgstr "二進位檔" + +#: rhodecode/lib/diffs.py:90 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:96 +#: rhodecode/lib/diffs.py:100 msgid "No changes detected" msgstr "尚未有任何變更" -#: rhodecode/lib/helpers.py:372 +#: rhodecode/lib/helpers.py:373 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:484 +#: rhodecode/lib/helpers.py:485 msgid "True" msgstr "真" -#: rhodecode/lib/helpers.py:488 +#: rhodecode/lib/helpers.py:489 msgid "False" msgstr "假" +#: rhodecode/lib/helpers.py:529 +#, fuzzy, python-format +msgid "Deleted branch: %s" +msgstr "刪除版本庫 %s" + #: rhodecode/lib/helpers.py:532 +#, fuzzy, python-format +msgid "Created tag: %s" +msgstr "建立使用者 %s" + +#: rhodecode/lib/helpers.py:545 #, fuzzy msgid "Changeset not found" msgstr "修改" -#: rhodecode/lib/helpers.py:555 +#: rhodecode/lib/helpers.py:588 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:561 +#: rhodecode/lib/helpers.py:594 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:614 msgid "and" msgstr "和" -#: rhodecode/lib/helpers.py:582 +#: rhodecode/lib/helpers.py:615 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 +#: rhodecode/lib/helpers.py:616 rhodecode/templates/changelog/changelog.html:51 msgid "revisions" msgstr "修訂" -#: rhodecode/lib/helpers.py:606 -msgid "fork name " +#: rhodecode/lib/helpers.py:640 +#, fuzzy, python-format +msgid "fork name %s" msgstr "fork 名稱" -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:653 #: 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:626 +#: rhodecode/lib/helpers.py:659 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 +#: rhodecode/lib/helpers.py:661 rhodecode/lib/helpers.py:671 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:630 +#: rhodecode/lib/helpers.py:663 #, fuzzy msgid "[created] repository as fork" msgstr "建立版本庫 %s" -#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 +#: rhodecode/lib/helpers.py:665 rhodecode/lib/helpers.py:673 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:667 rhodecode/lib/helpers.py:675 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:636 +#: rhodecode/lib/helpers.py:669 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:644 +#: rhodecode/lib/helpers.py:677 #, fuzzy msgid "[created] user" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:646 +#: rhodecode/lib/helpers.py:679 #, fuzzy msgid "[updated] user" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:648 +#: rhodecode/lib/helpers.py:681 #, fuzzy msgid "[created] users group" msgstr "建立使用者群組 %s" -#: rhodecode/lib/helpers.py:650 +#: rhodecode/lib/helpers.py:683 #, fuzzy msgid "[updated] users group" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:652 +#: rhodecode/lib/helpers.py:685 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:654 +#: rhodecode/lib/helpers.py:687 #, fuzzy msgid "[commented] on pull request for" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:656 +#: rhodecode/lib/helpers.py:689 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:658 +#: rhodecode/lib/helpers.py:691 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:660 +#: rhodecode/lib/helpers.py:693 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:662 +#: rhodecode/lib/helpers.py:695 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:664 +#: rhodecode/lib/helpers.py:697 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:666 +#: rhodecode/lib/helpers.py:699 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:668 +#: rhodecode/lib/helpers.py:701 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:840 +#: rhodecode/lib/helpers.py:877 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:844 +#: rhodecode/lib/helpers.py:881 msgid "No Files" msgstr "沒有檔案" -#: rhodecode/lib/utils2.py:335 +#: rhodecode/lib/utils2.py:403 #, fuzzy, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "年" -#: rhodecode/lib/utils2.py:336 +#: rhodecode/lib/utils2.py:404 #, fuzzy, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "月" -#: rhodecode/lib/utils2.py:337 +#: rhodecode/lib/utils2.py:405 #, fuzzy, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "日" -#: rhodecode/lib/utils2.py:338 +#: rhodecode/lib/utils2.py:406 #, fuzzy, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "時" -#: rhodecode/lib/utils2.py:339 +#: rhodecode/lib/utils2.py:407 #, fuzzy, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "分" -#: rhodecode/lib/utils2.py:340 +#: rhodecode/lib/utils2.py:408 #, fuzzy, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "秒" -#: rhodecode/lib/utils2.py:355 +#: rhodecode/lib/utils2.py:424 +#, python-format +msgid "in %s" +msgstr "" + +#: rhodecode/lib/utils2.py:426 #, fuzzy, python-format msgid "%s ago" msgstr "之前" -#: rhodecode/lib/utils2.py:357 +#: rhodecode/lib/utils2.py:428 +#, fuzzy, python-format +msgid "in %s and %s" +msgstr "下載 %s 為 %s" + +#: rhodecode/lib/utils2.py:431 #, python-format msgid "%s and %s ago" msgstr "" -#: rhodecode/lib/utils2.py:360 +#: rhodecode/lib/utils2.py:434 msgid "just now" msgstr "現在" -#: rhodecode/lib/celerylib/tasks.py:269 +#: rhodecode/lib/celerylib/tasks.py:270 #, fuzzy msgid "password reset link" msgstr "您的密碼重設連結已寄出" @@ -940,102 +993,102 @@ msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:157 +#: rhodecode/model/comment.py:173 msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1140 +#: rhodecode/model/db.py:1163 #, fuzzy msgid "Repository no access" msgstr "個版本庫" -#: rhodecode/model/db.py:1141 +#: rhodecode/model/db.py:1164 #, fuzzy msgid "Repository read access" msgstr "這個版本庫已經存在" -#: rhodecode/model/db.py:1142 +#: rhodecode/model/db.py:1165 #, fuzzy msgid "Repository write access" msgstr "個版本庫" -#: rhodecode/model/db.py:1143 +#: rhodecode/model/db.py:1166 #, fuzzy msgid "Repository admin access" msgstr "個版本庫" -#: rhodecode/model/db.py:1145 +#: rhodecode/model/db.py:1168 #, fuzzy msgid "Repositories Group no access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1146 +#: rhodecode/model/db.py:1169 #, fuzzy msgid "Repositories Group read access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1147 +#: rhodecode/model/db.py:1170 #, fuzzy msgid "Repositories Group write access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1148 +#: rhodecode/model/db.py:1171 #, fuzzy msgid "Repositories Group admin access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1150 +#: rhodecode/model/db.py:1173 #, fuzzy msgid "RhodeCode Administrator" msgstr "使用者管理員" -#: rhodecode/model/db.py:1151 +#: rhodecode/model/db.py:1174 #, fuzzy msgid "Repository creation disabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1152 +#: rhodecode/model/db.py:1175 #, fuzzy msgid "Repository creation enabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1153 +#: rhodecode/model/db.py:1176 #, fuzzy msgid "Repository forking disabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1154 +#: rhodecode/model/db.py:1177 #, fuzzy msgid "Repository forking enabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1155 +#: rhodecode/model/db.py:1178 #, fuzzy msgid "Register disabled" msgstr "停用" -#: rhodecode/model/db.py:1156 +#: rhodecode/model/db.py:1179 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1159 +#: rhodecode/model/db.py:1182 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1579 +#: rhodecode/model/db.py:1623 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1580 +#: rhodecode/model/db.py:1624 #, fuzzy msgid "Approved" msgstr "移除" -#: rhodecode/model/db.py:1581 +#: rhodecode/model/db.py:1625 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1582 +#: rhodecode/model/db.py:1626 msgid "Under Review" msgstr "" @@ -1058,37 +1111,41 @@ msgstr "" #: rhodecode/model/notification.py:220 -msgid "commented on commit" +#, python-format +msgid "commented on commit at %(when)s" msgstr "" #: rhodecode/model/notification.py:221 -#, fuzzy -msgid "sent message" +#, fuzzy, python-format +msgid "sent message at %(when)s" msgstr "遞交資訊" #: rhodecode/model/notification.py:222 -msgid "mentioned you" +#, python-format +msgid "mentioned you at %(when)s" msgstr "" #: rhodecode/model/notification.py:223 -#, fuzzy -msgid "registered in RhodeCode" +#, fuzzy, python-format +msgid "registered in RhodeCode at %(when)s" msgstr "您已經成功註冊rhodecode" #: rhodecode/model/notification.py:224 -msgid "opened new pull request" -msgstr "" +#, fuzzy, python-format +msgid "opened new pull request at %(when)s" +msgstr "建立使用者 %s" #: rhodecode/model/notification.py:225 -msgid "commented on pull request" -msgstr "" - -#: rhodecode/model/pull_request.py:84 +#, fuzzy, python-format +msgid "commented on pull request at %(when)s" +msgstr "建立使用者 %s" + +#: rhodecode/model/pull_request.py:90 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:535 +#: rhodecode/model/scm.py:542 #, fuzzy msgid "latest tip" msgstr "最後登入" @@ -1098,155 +1155,160 @@ msgid "new user registration" msgstr "[RhodeCode] 新使用者註冊" -#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 -#: rhodecode/model/user.py:299 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:279 +#: rhodecode/model/user.py:301 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者,因為他是系統帳號" -#: rhodecode/model/user.py:323 +#: rhodecode/model/user.py:325 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者,因為他是系統帳號" -#: rhodecode/model/user.py:329 +#: rhodecode/model/user.py:331 #, 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:35 rhodecode/model/validators.py:36 +#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37 msgid "Value cannot be an empty list" msgstr "" -#: rhodecode/model/validators.py:82 +#: rhodecode/model/validators.py:83 #, fuzzy, python-format msgid "Username \"%(username)s\" already exists" msgstr "使用者名稱已存在" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:85 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:86 +#: rhodecode/model/validators.py:87 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "使用者名稱只能使用字母數字、底線、小數點或破折號,且必須使用數字或字母開頭" -#: rhodecode/model/validators.py:114 +#: rhodecode/model/validators.py:115 #, fuzzy, python-format msgid "Username %(username)s is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/validators.py:133 +#: rhodecode/model/validators.py:134 #, fuzzy msgid "Invalid users group name" msgstr "無效的使用者名稱" -#: rhodecode/model/validators.py:134 +#: rhodecode/model/validators.py:135 #, fuzzy, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "這個使用者群組已存在" -#: rhodecode/model/validators.py:136 +#: rhodecode/model/validators.py:137 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "群組名稱只能使用字母數字、底線、小數點或破折號,且必須使用數字或字母開頭" -#: rhodecode/model/validators.py:174 +#: rhodecode/model/validators.py:175 msgid "Cannot assign this group as parent" msgstr "" -#: rhodecode/model/validators.py:175 +#: rhodecode/model/validators.py:176 #, fuzzy, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "使用者名稱已存在" -#: rhodecode/model/validators.py:177 +#: rhodecode/model/validators.py:178 #, fuzzy, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:235 +#: rhodecode/model/validators.py:236 #, fuzzy msgid "Invalid characters (non-ascii) in password" msgstr "無效的字元在密碼中" -#: rhodecode/model/validators.py:250 +#: rhodecode/model/validators.py:251 msgid "Passwords do not match" msgstr "密碼不相符" -#: rhodecode/model/validators.py:267 -msgid "invalid password" -msgstr "無效的密碼" - #: rhodecode/model/validators.py:268 -msgid "invalid user name" -msgstr "無效的使用者名稱" +msgid "invalid password" +msgstr "無效的密碼" #: rhodecode/model/validators.py:269 +msgid "invalid user name" +msgstr "無效的使用者名稱" + +#: rhodecode/model/validators.py:270 msgid "Your account is disabled" msgstr "您的帳號已被停用" -#: rhodecode/model/validators.py:313 +#: rhodecode/model/validators.py:314 #, fuzzy, python-format msgid "Repository name %(repo)s is disallowed" msgstr "不允許的版本庫名稱" -#: rhodecode/model/validators.py:315 +#: rhodecode/model/validators.py:316 #, fuzzy, python-format msgid "Repository named %(repo)s already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:316 +#: rhodecode/model/validators.py:317 #, fuzzy, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "這個版本庫已存在於群組 \"%s\"" -#: rhodecode/model/validators.py:318 +#: rhodecode/model/validators.py:319 #, fuzzy, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:431 +#: rhodecode/model/validators.py:432 msgid "invalid clone url" msgstr "無效的複製URL" -#: rhodecode/model/validators.py:432 +#: rhodecode/model/validators.py:433 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: rhodecode/model/validators.py:457 +#: rhodecode/model/validators.py:458 #, fuzzy msgid "Fork have to be the same type as parent" msgstr "Fork 必須使用相同的版本庫類型" -#: rhodecode/model/validators.py:478 +#: rhodecode/model/validators.py:473 +#, fuzzy +msgid "You don't have permissions to create repository in this group" +msgstr "您沒有權限瀏覽這個頁面" + +#: rhodecode/model/validators.py:498 msgid "This username or users group name is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/validators.py:562 +#: rhodecode/model/validators.py:582 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: rhodecode/model/validators.py:577 +#: rhodecode/model/validators.py:597 msgid "This e-mail address is already taken" msgstr "這個郵件位址已經使用了" -#: rhodecode/model/validators.py:597 +#: rhodecode/model/validators.py:617 #, fuzzy, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "這個郵件位址不存在" -#: rhodecode/model/validators.py:634 +#: rhodecode/model/validators.py:654 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:653 +#: rhodecode/model/validators.py:673 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" @@ -1269,7 +1331,7 @@ #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:233 msgid "repositories" msgstr "個版本庫" @@ -1280,6 +1342,7 @@ msgstr "新增版本庫" #: rhodecode/templates/index_base.html:29 +#: rhodecode/templates/index_base.html:136 #: 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_show.html:33 @@ -1289,9 +1352,10 @@ msgstr "群組名稱" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:71 -#: rhodecode/templates/index_base.html:142 -#: rhodecode/templates/index_base.html:168 +#: 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/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1300,144 +1364,138 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 #: rhodecode/templates/settings/repo_settings.html:66 -#: rhodecode/templates/summary/summary.html:105 +#: rhodecode/templates/summary/summary.html:114 msgid "Description" msgstr "描述" #: rhodecode/templates/index_base.html:40 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47 msgid "Repositories group" msgstr "版本庫群組" -#: rhodecode/templates/index_base.html:70 -#: rhodecode/templates/index_base.html:166 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:174 +#: rhodecode/templates/index_base.html:264 #: 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:192 +#: 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:157 -#: rhodecode/templates/admin/users/user_edit_my_account.html:193 +#: 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/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:51 +#: 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:59 -#: rhodecode/templates/journal/journal.html:107 -#: rhodecode/templates/journal/journal.html:186 +#: rhodecode/templates/journal/journal.html:62 +#: rhodecode/templates/journal/journal.html:168 +#: rhodecode/templates/journal/journal_page_repos.html:7 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:123 -#: rhodecode/templates/tags/tags.html:36 +#: rhodecode/templates/summary/summary.html:132 +#: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "名稱" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:73 msgid "Last change" msgstr "最後修改" -#: rhodecode/templates/index_base.html:73 -#: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:159 -#: rhodecode/templates/journal/journal.html:188 +#: rhodecode/templates/index_base.html:74 +#: rhodecode/templates/index_base.html:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/journal/journal.html:170 msgid "Tip" msgstr "" -#: rhodecode/templates/index_base.html:74 -#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:181 +#: rhodecode/templates/index_base.html:269 #: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "擁有者" -#: rhodecode/templates/index_base.html:75 +#: rhodecode/templates/index_base.html:76 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "" -#: rhodecode/templates/index_base.html:76 +#: rhodecode/templates/index_base.html:77 msgid "Atom" msgstr "" -#: rhodecode/templates/index_base.html:110 -#: rhodecode/templates/index_base.html:112 -#, python-format -msgid "Subscribe to %s rss feed" -msgstr "訂閱 %s rss" - -#: rhodecode/templates/index_base.html:117 -#: rhodecode/templates/index_base.html:119 -#, python-format -msgid "Subscribe to %s atom feed" -msgstr "訂閱 %s atom" - -#: rhodecode/templates/index_base.html:140 -#, fuzzy -msgid "Group Name" -msgstr "群組名稱" - -#: rhodecode/templates/index_base.html:158 -#: rhodecode/templates/index_base.html:198 +#: 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:179 +#: rhodecode/templates/admin/users/user_edit_my_account.html:202 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:211 -#: rhodecode/templates/tags/tags.html:60 +#: rhodecode/templates/branches/branches.html:76 +#: rhodecode/templates/journal/journal.html:193 +#: rhodecode/templates/tags/tags.html:77 msgid "Click to sort ascending" msgstr "" -#: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/index_base.html:199 +#: 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:180 +#: rhodecode/templates/admin/users/user_edit_my_account.html:203 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 -#: rhodecode/templates/branches/branches.html:78 -#: rhodecode/templates/journal/journal.html:212 -#: rhodecode/templates/tags/tags.html:61 +#: rhodecode/templates/branches/branches.html:77 +#: rhodecode/templates/journal/journal.html:194 +#: rhodecode/templates/tags/tags.html:78 msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:169 +#: rhodecode/templates/index_base.html:177 +#: rhodecode/templates/index_base.html:267 #, fuzzy msgid "Last Change" msgstr "最後修改" -#: rhodecode/templates/index_base.html:200 +#: 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:181 +#: rhodecode/templates/admin/users/user_edit_my_account.html:204 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 -#: rhodecode/templates/branches/branches.html:79 -#: rhodecode/templates/journal/journal.html:213 -#: rhodecode/templates/tags/tags.html:62 +#: rhodecode/templates/branches/branches.html:78 +#: rhodecode/templates/journal/journal.html:195 +#: rhodecode/templates/tags/tags.html:79 msgid "No records found." msgstr "" -#: rhodecode/templates/index_base.html:201 +#: 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:182 +#: rhodecode/templates/admin/users/user_edit_my_account.html:205 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 -#: rhodecode/templates/branches/branches.html:80 -#: rhodecode/templates/journal/journal.html:214 -#: rhodecode/templates/tags/tags.html:63 +#: rhodecode/templates/branches/branches.html:79 +#: rhodecode/templates/journal/journal.html:196 +#: rhodecode/templates/tags/tags.html:80 msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:202 +#: 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:183 +#: rhodecode/templates/admin/users/user_edit_my_account.html:206 #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 -#: rhodecode/templates/branches/branches.html:81 -#: rhodecode/templates/journal/journal.html:215 -#: rhodecode/templates/tags/tags.html:64 +#: rhodecode/templates/branches/branches.html:80 +#: rhodecode/templates/journal/journal.html:54 +#: rhodecode/templates/journal/journal.html:197 +#: rhodecode/templates/tags/tags.html:81 #, fuzzy msgid "Loading..." msgstr "載入中..." @@ -1456,7 +1514,7 @@ #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:122 +#: rhodecode/templates/summary/summary.html:131 msgid "Username" msgstr "帳號" @@ -1514,23 +1572,23 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 -#: rhodecode/templates/admin/users/user_edit.html:86 +#: rhodecode/templates/admin/users/user_edit.html:90 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "First Name" msgstr "名" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 -#: rhodecode/templates/admin/users/user_edit.html:95 +#: rhodecode/templates/admin/users/user_edit.html:99 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "Last Name" msgstr "姓" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 -#: rhodecode/templates/admin/users/user_edit.html:104 +#: rhodecode/templates/admin/users/user_edit.html:108 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:124 +#: rhodecode/templates/summary/summary.html:133 msgid "Email" msgstr "電子郵件" @@ -1570,7 +1628,7 @@ msgstr "標籤" #: rhodecode/templates/switch_to_list.html:22 -#: rhodecode/templates/tags/tags_data.html:33 +#: rhodecode/templates/tags/tags_data.html:38 msgid "There are no tags yet" msgstr "沒有任何標籤" @@ -1594,8 +1652,8 @@ #: 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 +#: rhodecode/templates/journal/journal_page_repos.html:9 +#: rhodecode/templates/journal/journal_page_repos.html:10 msgid "Action" msgstr "動作" @@ -1606,8 +1664,9 @@ #: rhodecode/templates/admin/admin_log.html:8 #: rhodecode/templates/bookmarks/bookmarks.html:37 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 -#: rhodecode/templates/branches/branches.html:52 -#: rhodecode/templates/tags/tags.html:37 +#: rhodecode/templates/branches/branches.html:51 +#: rhodecode/templates/branches/branches_data.html:7 +#: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:7 msgid "Date" msgstr "時間" @@ -1616,7 +1675,7 @@ msgid "From IP" msgstr "來源IP" -#: rhodecode/templates/admin/admin_log.html:53 +#: rhodecode/templates/admin/admin_log.html:57 msgid "No actions yet" msgstr "" @@ -1696,8 +1755,8 @@ #: rhodecode/templates/admin/repos/repo_edit.html:141 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 -#: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:174 +#: 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_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 @@ -1719,8 +1778,8 @@ msgstr "遞交" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:254 -#: rhodecode/templates/base/base.html:256 +#: rhodecode/templates/base/base.html:266 +#: rhodecode/templates/base/base.html:268 msgid "Pull requests" msgstr "" @@ -1750,7 +1809,7 @@ #: 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:139 +#: rhodecode/templates/admin/users/user_edit.html:143 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 #: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" @@ -1793,7 +1852,7 @@ msgstr "版本庫建立" #: rhodecode/templates/admin/permissions/permissions.html:78 -#: rhodecode/templates/admin/repos/repo_edit.html:241 +#: rhodecode/templates/admin/repos/repo_edit.html:264 msgid "set" msgstr "設定" @@ -1813,8 +1872,8 @@ msgstr "新增" #: rhodecode/templates/admin/repos/repo_add_base.html:20 -#: rhodecode/templates/summary/summary.html:95 -#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:104 +#: rhodecode/templates/summary/summary.html:105 msgid "Clone from" msgstr "複製由" @@ -1892,12 +1951,14 @@ #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:224 -#: rhodecode/templates/admin/users/user_edit.html:226 +#: 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/files/files_source.html:44 -#: rhodecode/templates/journal/journal.html:81 +#: 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 "編輯" @@ -1945,11 +2006,11 @@ #: 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:168 -#: rhodecode/templates/admin/settings/settings.html:258 -#: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:175 -#: rhodecode/templates/admin/users/user_edit.html:278 +#: 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 @@ -2007,82 +2068,107 @@ msgid "Confirm to invalidate repository cache" msgstr "確認廢止版本庫快取" -#: rhodecode/templates/admin/repos/repo_edit.html:195 -#: rhodecode/templates/base/base.html:318 -#: rhodecode/templates/base/base.html:320 -#: rhodecode/templates/base/base.html:322 -msgid "Public journal" -msgstr "公開日誌" +#: rhodecode/templates/admin/repos/repo_edit.html:193 +msgid "" +"Manually invalidate cache for this repository. On first access repository" +" will be cached again" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:198 +msgid "List of cached values" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:201 -msgid "Remove from public journal" -msgstr "從公開日誌移除" +msgid "Prefix" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:202 +msgid "Key" +msgstr "" #: 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_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:330 +#: rhodecode/templates/base/base.html:332 +#: rhodecode/templates/base/base.html:334 +msgid "Public journal" +msgstr "公開日誌" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +msgid "Remove from public journal" +msgstr "從公開日誌移除" + +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Add to public journal" msgstr "新增至公開日誌" -#: rhodecode/templates/admin/repos/repo_edit.html:208 +#: rhodecode/templates/admin/repos/repo_edit.html:231 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:215 +#: rhodecode/templates/admin/repos/repo_edit.html:238 #, fuzzy msgid "Locking" msgstr "解鎖" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:220 +#: rhodecode/templates/admin/repos/repo_edit.html:243 #, fuzzy msgid "Confirm to unlock repository" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 msgid "lock repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:223 +#: rhodecode/templates/admin/repos/repo_edit.html:246 #, fuzzy msgid "Confirm to lock repository" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:224 +#: rhodecode/templates/admin/repos/repo_edit.html:247 #, fuzzy msgid "Repository is not locked" msgstr "個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:229 +#: rhodecode/templates/admin/repos/repo_edit.html:252 msgid "Force locking on repository. Works only when anonymous access is disabled" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:236 +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "Set as fork of" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:245 +#: 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:251 +#: rhodecode/templates/admin/repos/repo_edit.html:274 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "移除" -#: rhodecode/templates/admin/repos/repo_edit.html:255 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Remove this repository" msgstr "移除版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:255 -#: rhodecode/templates/journal/journal.html:84 +#: rhodecode/templates/admin/repos/repo_edit.html:278 msgid "Confirm to delete this repository" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:259 +#: rhodecode/templates/admin/repos/repo_edit.html:282 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -2108,7 +2194,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:217 +#: rhodecode/templates/base/base.html:229 msgid "admin" msgstr "管理員" @@ -2119,8 +2205,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 #: rhodecode/templates/data_table/_dt_elements.html:67 -#: rhodecode/templates/journal/journal.html:132 -#: rhodecode/templates/summary/summary.html:76 +#: rhodecode/templates/journal/journal.html:87 +#: rhodecode/templates/summary/summary.html:85 msgid "private repository" msgstr "私有版本庫" @@ -2144,12 +2230,12 @@ msgstr "新增另ㄧ位成員" #: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "Failed to remove user" msgstr "移除使用者失敗" #: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103 msgid "Failed to remove users group" msgstr "移除使用者群組失敗" @@ -2157,11 +2243,44 @@ msgid "Repositories administration" msgstr "版本庫管理員" -#: rhodecode/templates/admin/repos_groups/repos_groups.html:8 -msgid "Groups" -msgstr "群組" - -#: rhodecode/templates/admin/repos_groups/repos_groups.html:12 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73 +msgid "apply to children" +msgstr "" + +#: 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" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:9 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/base/base.html:312 +#: rhodecode/templates/base/base.html:314 +#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/bookmarks/bookmarks.html:11 +#: rhodecode/templates/branches/branches.html:10 +#: rhodecode/templates/changelog/changelog.html:10 +#: rhodecode/templates/changeset/changeset.html:10 +#: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/compare/compare_diff.html:9 +#: rhodecode/templates/files/file_diff.html:8 +#: rhodecode/templates/files/files.html:8 +#: rhodecode/templates/files/files_add.html:15 +#: rhodecode/templates/files/files_edit.html:15 +#: rhodecode/templates/followers/followers.html:9 +#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 +#: rhodecode/templates/pullrequests/pullrequest.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show.html:8 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 +#: rhodecode/templates/settings/repo_settings.html:9 +#: rhodecode/templates/shortlog/shortlog.html:10 +#: rhodecode/templates/summary/summary.html:8 +#: rhodecode/templates/tags/tags.html:11 +msgid "Home" +msgstr "首頁" + +#: rhodecode/templates/admin/repos_groups/repos_groups.html:13 msgid "with" msgstr "" @@ -2187,7 +2306,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:113 +#: rhodecode/templates/pullrequests/pullrequest_show.html:131 msgid "save" msgstr "儲存" @@ -2224,20 +2343,21 @@ msgid "action" msgstr "動作" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:255 +#: 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:103 +#: rhodecode/templates/data_table/_dt_elements.html:121 msgid "delete" msgstr "刪除" -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55 #, fuzzy, python-format -msgid "Confirm to delete this group: %s" -msgstr "確認刪除這個群組" - -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62 +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 msgid "There are no repositories groups yet" msgstr "沒有任何版本庫群組" @@ -2330,8 +2450,8 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:167 -#: rhodecode/templates/admin/settings/settings.html:257 +#: rhodecode/templates/admin/settings/settings.html:178 +#: rhodecode/templates/admin/settings/settings.html:268 msgid "Save settings" msgstr "儲存設定" @@ -2340,132 +2460,142 @@ msgid "Visualisation settings" msgstr "全域設定" -#: rhodecode/templates/admin/settings/settings.html:128 +#: rhodecode/templates/admin/settings/settings.html:127 +#, fuzzy +msgid "General" +msgstr "啟用" + +#: rhodecode/templates/admin/settings/settings.html:132 +msgid "Use lightweight dashboard" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 #, fuzzy msgid "Icons" msgstr "選項" -#: rhodecode/templates/admin/settings/settings.html:133 +#: rhodecode/templates/admin/settings/settings.html:144 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:137 +#: rhodecode/templates/admin/settings/settings.html:148 #, fuzzy msgid "Show private repo icon on repositories" msgstr "私有版本庫" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:155 #, fuzzy msgid "Meta-Tagging" msgstr "設定" -#: rhodecode/templates/admin/settings/settings.html:149 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:187 #, fuzzy msgid "VCS settings" msgstr "設定" -#: rhodecode/templates/admin/settings/settings.html:185 +#: rhodecode/templates/admin/settings/settings.html:196 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:190 +#: rhodecode/templates/admin/settings/settings.html:201 #, fuzzy msgid "require ssl for vcs operations" msgstr "推送時要求使用SSL" -#: rhodecode/templates/admin/settings/settings.html:192 +#: rhodecode/templates/admin/settings/settings.html:203 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:198 +#: rhodecode/templates/admin/settings/settings.html:209 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:203 +#: rhodecode/templates/admin/settings/settings.html:214 msgid "Update repository after push (hg update)" msgstr "push後更新版本庫 (hg update)" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Show repository size after push" msgstr "push 後顯示版本庫大小" -#: rhodecode/templates/admin/settings/settings.html:211 +#: rhodecode/templates/admin/settings/settings.html:222 msgid "Log user push commands" msgstr "紀錄使用者推送命令" -#: rhodecode/templates/admin/settings/settings.html:215 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Log user pull commands" msgstr "紀錄使用者抓取命令" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:230 msgid "advanced setup" msgstr "進階設定" -#: rhodecode/templates/admin/settings/settings.html:224 +#: rhodecode/templates/admin/settings/settings.html:235 #, fuzzy msgid "Mercurial Extensions" msgstr "Mercurial 版本庫" -#: rhodecode/templates/admin/settings/settings.html:229 +#: rhodecode/templates/admin/settings/settings.html:240 msgid "largefiles extensions" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:233 +#: rhodecode/templates/admin/settings/settings.html:244 msgid "hgsubversion extensions" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:235 +#: rhodecode/templates/admin/settings/settings.html:246 msgid "" "Requires hgsubversion library installed. Allows clonning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:245 +#: rhodecode/templates/admin/settings/settings.html:256 msgid "Repositories location" msgstr "版本庫路徑" -#: rhodecode/templates/admin/settings/settings.html:250 +#: rhodecode/templates/admin/settings/settings.html:261 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:251 +#: rhodecode/templates/admin/settings/settings.html:262 +#: rhodecode/templates/base/base.html:221 msgid "unlock" msgstr "解鎖" -#: rhodecode/templates/admin/settings/settings.html:252 +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:272 +#: rhodecode/templates/admin/settings/settings.html:283 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/admin/settings/settings.html:291 #, fuzzy msgid "Email to" msgstr "電子郵件" -#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/settings/settings.html:299 #, fuzzy msgid "Send" msgstr "秒" -#: rhodecode/templates/admin/settings/settings.html:294 +#: rhodecode/templates/admin/settings/settings.html:305 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:297 +#: rhodecode/templates/admin/settings/settings.html:308 #, fuzzy msgid "show" msgstr "顯示" @@ -2488,13 +2618,6 @@ msgid "Password confirmation" msgstr "密碼不相符" -#: rhodecode/templates/admin/users/user_add.html:86 -#: rhodecode/templates/admin/users/user_edit.html:113 -#: 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/users/user_edit.html:5 msgid "Edit user" msgstr "編輯使用者" @@ -2514,27 +2637,27 @@ msgid "API key" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:59 +#: rhodecode/templates/admin/users/user_edit.html:63 msgid "LDAP DN" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:68 +#: rhodecode/templates/admin/users/user_edit.html:72 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:35 msgid "New password" msgstr "新密碼" -#: rhodecode/templates/admin/users/user_edit.html:77 +#: rhodecode/templates/admin/users/user_edit.html:81 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:147 +#: rhodecode/templates/admin/users/user_edit.html:151 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 #, fuzzy msgid "Inherit default permissions" msgstr "預設權限" -#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users/user_edit.html:156 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113 #, python-format msgid "" @@ -2542,52 +2665,54 @@ "options does not have any action" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users/user_edit.html:162 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "建立版本庫" -#: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users/user_edit.html:170 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 #, fuzzy msgid "Fork repositories" msgstr "個版本庫" -#: rhodecode/templates/admin/users/user_edit.html:186 +#: 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:193 +#: 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:194 +#: 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:194 +#: 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:243 +#: rhodecode/templates/admin/users/user_edit.html:247 #, fuzzy msgid "Email addresses" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:256 +#: rhodecode/templates/admin/users/user_edit.html:260 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "確認刪除這個使用者" -#: rhodecode/templates/admin/users/user_edit.html:270 +#: rhodecode/templates/admin/users/user_edit.html:274 #, fuzzy msgid "New email address" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:277 +#: rhodecode/templates/admin/users/user_edit.html:281 #, fuzzy msgid "Add" msgstr "新增" @@ -2649,31 +2774,33 @@ #: 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 -#: rhodecode/templates/journal/journal.html:60 -#: rhodecode/templates/tags/tags.html:40 +#: 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.html:81 +#: 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.html:94 +#: 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.html:96 +#: rhodecode/templates/journal/journal_page_repos.html:44 msgid "create one now" msgstr "" @@ -2682,7 +2809,7 @@ msgstr "使用者管理員" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:235 msgid "users" msgstr "使用者" @@ -2713,7 +2840,7 @@ msgstr "啟用" #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:226 +#: rhodecode/templates/base/base.html:238 msgid "ldap" msgstr "" @@ -2763,6 +2890,21 @@ msgid "Group members" msgstr "選擇群組成員" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:163 +#, fuzzy +msgid "No members yet" +msgstr "成員" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:171 +#, fuzzy +msgid "Permissions defined for this group" +msgstr "權限管理員" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:178 +#, fuzzy +msgid "No permissions set yet" +msgstr "權限" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "Users groups administration" msgstr "使用者群組管理員" @@ -2806,36 +2948,10 @@ msgid "Inbox" msgstr "" -#: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:300 -#: rhodecode/templates/base/base.html:302 -#: rhodecode/templates/base/base.html:304 -#: rhodecode/templates/bookmarks/bookmarks.html:11 -#: rhodecode/templates/branches/branches.html:10 -#: rhodecode/templates/changelog/changelog.html:10 -#: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/changeset/changeset_range.html:9 -#: rhodecode/templates/compare/compare_diff.html:9 -#: rhodecode/templates/files/file_diff.html:8 -#: rhodecode/templates/files/files.html:8 -#: rhodecode/templates/files/files_add.html:15 -#: rhodecode/templates/files/files_edit.html:15 -#: rhodecode/templates/followers/followers.html:9 -#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9 -#: rhodecode/templates/pullrequests/pullrequest.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show.html:8 -#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 -#: rhodecode/templates/settings/repo_settings.html:9 -#: rhodecode/templates/shortlog/shortlog.html:10 -#: rhodecode/templates/summary/summary.html:8 -#: rhodecode/templates/tags/tags.html:11 -msgid "Home" -msgstr "首頁" - #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:309 -#: rhodecode/templates/base/base.html:311 -#: rhodecode/templates/base/base.html:313 +#: rhodecode/templates/base/base.html:321 +#: rhodecode/templates/base/base.html:323 +#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2855,7 +2971,7 @@ msgstr "" #: rhodecode/templates/base/base.html:152 -#: rhodecode/templates/base/base.html:182 +#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47 msgid "loading..." msgstr "載入中..." @@ -2900,50 +3016,64 @@ #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:227 -msgid "settings" -msgstr "設定" - -#: rhodecode/templates/base/base.html:209 +#, fuzzy +msgid "repository settings" +msgstr "版本庫建立" + +#: rhodecode/templates/base/base.html:210 #: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "" -#: rhodecode/templates/base/base.html:211 -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50 +#: rhodecode/templates/changelog/changelog.html:43 msgid "Open new pull request" msgstr "" -#: rhodecode/templates/base/base.html:213 +#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "" + +#: rhodecode/templates/base/base.html:217 msgid "search" msgstr "搜尋" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:223 +#, fuzzy +msgid "lock" +msgstr "解鎖" + +#: rhodecode/templates/base/base.html:234 msgid "repositories groups" msgstr "版本庫群組" -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/base/base.html:236 msgid "users groups" msgstr "使用者群組" -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:237 msgid "permissions" msgstr "權限" -#: rhodecode/templates/base/base.html:238 -#: rhodecode/templates/base/base.html:240 +#: rhodecode/templates/base/base.html:239 +msgid "settings" +msgstr "設定" + +#: rhodecode/templates/base/base.html:250 +#: rhodecode/templates/base/base.html:252 msgid "Followers" msgstr "追蹤者" -#: rhodecode/templates/base/base.html:246 -#: rhodecode/templates/base/base.html:248 +#: rhodecode/templates/base/base.html:258 +#: rhodecode/templates/base/base.html:260 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:327 -#: rhodecode/templates/base/base.html:329 -#: rhodecode/templates/base/base.html:331 +#: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 +#: rhodecode/templates/base/base.html:343 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "搜尋" @@ -2954,7 +3084,7 @@ msgstr "新增另ㄧ位成員" #: rhodecode/templates/base/root.html:43 -#: rhodecode/templates/journal/journal.html:120 +#: rhodecode/templates/journal/journal.html:75 #: rhodecode/templates/summary/summary.html:57 msgid "Stop following this repository" msgstr "停止追蹤這個版本庫" @@ -2968,14 +3098,26 @@ msgid "Group" msgstr "群組" -#: rhodecode/templates/base/root.html:47 +#: rhodecode/templates/base/root.html:48 msgid "search truncated" msgstr "" -#: rhodecode/templates/base/root.html:48 +#: rhodecode/templates/base/root.html:49 msgid "no matching files" msgstr "無符合的檔案" +#: rhodecode/templates/base/root.html:51 +msgid "Open new pull request for selected changesets" +msgstr "" + +#: rhodecode/templates/base/root.html:52 +msgid "Show selected changes __S -> __E" +msgstr "" + +#: rhodecode/templates/base/root.html:53 +msgid "Selection link" +msgstr "" + #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" @@ -2983,8 +3125,9 @@ #: rhodecode/templates/bookmarks/bookmarks.html:39 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 -#: rhodecode/templates/branches/branches.html:54 -#: rhodecode/templates/tags/tags.html:39 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:8 +#: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:8 #, fuzzy msgid "Author" @@ -3000,36 +3143,16 @@ msgid "Compare branches" msgstr "分支" -#: rhodecode/templates/branches/branches.html:57 +#: rhodecode/templates/branches/branches.html:56 +#: rhodecode/templates/branches/branches_data.html:10 #: rhodecode/templates/compare/compare_diff.html:5 #: rhodecode/templates/compare/compare_diff.html:13 +#: rhodecode/templates/tags/tags.html:57 +#: rhodecode/templates/tags/tags_data.html:10 #, fuzzy msgid "Compare" msgstr "比較顯示" -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "名字" - -#: rhodecode/templates/branches/branches_data.html:7 -msgid "date" -msgstr "日期" - -#: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 -msgid "author" -msgstr "作者" - -#: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 -msgid "revision" -msgstr "修訂" - -#: rhodecode/templates/branches/branches_data.html:10 -#, fuzzy -msgid "compare" -msgstr "比較顯示" - #: rhodecode/templates/changelog/changelog.html:6 #, fuzzy, python-format msgid "%s Changelog" @@ -3042,58 +3165,65 @@ msgstr[0] "" #: rhodecode/templates/changelog/changelog.html:37 +#, fuzzy +msgid "Clear selection" +msgstr "搜尋選項" + +#: rhodecode/templates/changelog/changelog.html:40 #: 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 "" - -#: rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/templates/changelog/changelog.html:40 +msgid "Compare fork with parent" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:49 msgid "Show" msgstr "顯示" -#: rhodecode/templates/changelog/changelog.html:72 -#: rhodecode/templates/summary/summary.html:364 +#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/summary/summary.html:375 msgid "show more" msgstr "顯示更多" -#: rhodecode/templates/changelog/changelog.html:76 +#: rhodecode/templates/changelog/changelog.html:78 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:89 -#: rhodecode/templates/changeset/changeset.html:38 +#: rhodecode/templates/changelog/changelog.html:91 +#: rhodecode/templates/changeset/changeset.html:44 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 #, fuzzy msgid "Changeset status" msgstr "變更" -#: rhodecode/templates/changelog/changelog.html:92 +#: rhodecode/templates/changelog/changelog.html:94 +#: rhodecode/templates/shortlog/shortlog_data.html:20 msgid "Click to open associated pull request" msgstr "" -#: rhodecode/templates/changelog/changelog.html:102 -#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changelog/changelog.html:104 +#: rhodecode/templates/changeset/changeset.html:85 msgid "Parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:108 -#: rhodecode/templates/changeset/changeset.html:84 +#: rhodecode/templates/changelog/changelog.html:110 +#: rhodecode/templates/changeset/changeset.html:91 msgid "No parents" msgstr "" -#: rhodecode/templates/changelog/changelog.html:113 -#: rhodecode/templates/changeset/changeset.html:88 +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changeset/changeset.html:95 +#: rhodecode/templates/changeset/changeset_range.html:79 msgid "merge" msgstr "合併" -#: rhodecode/templates/changelog/changelog.html:116 -#: rhodecode/templates/changeset/changeset.html:91 +#: rhodecode/templates/changelog/changelog.html:118 +#: rhodecode/templates/changeset/changeset.html:98 +#: rhodecode/templates/changeset/changeset_range.html:82 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 #: rhodecode/templates/files/files_edit.html:33 @@ -3101,44 +3231,42 @@ msgid "branch" msgstr "分支" -#: rhodecode/templates/changelog/changelog.html:122 +#: rhodecode/templates/changelog/changelog.html:124 +#: rhodecode/templates/changeset/changeset_range.html:88 msgid "bookmark" msgstr "" -#: rhodecode/templates/changelog/changelog.html:128 -#: rhodecode/templates/changeset/changeset.html:96 +#: rhodecode/templates/changelog/changelog.html:130 +#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset_range.html:94 msgid "tag" msgstr "標籤" -#: rhodecode/templates/changelog/changelog.html:164 -msgid "Show selected changes __S -> __E" -msgstr "" - -#: rhodecode/templates/changelog/changelog.html:255 +#: rhodecode/templates/changelog/changelog.html:301 msgid "There are no changes yet" msgstr "尚未有任何變更" #: rhodecode/templates/changelog/changelog_details.html:4 -#: rhodecode/templates/changeset/changeset.html:66 +#: rhodecode/templates/changeset/changeset.html:73 msgid "removed" msgstr "移除" #: rhodecode/templates/changelog/changelog_details.html:5 -#: rhodecode/templates/changeset/changeset.html:67 +#: rhodecode/templates/changeset/changeset.html:74 msgid "changed" msgstr "修改" #: rhodecode/templates/changelog/changelog_details.html:6 -#: rhodecode/templates/changeset/changeset.html:68 +#: rhodecode/templates/changeset/changeset.html:75 msgid "added" msgstr "新增" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 #: rhodecode/templates/changelog/changelog_details.html:10 -#: rhodecode/templates/changeset/changeset.html:70 -#: rhodecode/templates/changeset/changeset.html:71 -#: rhodecode/templates/changeset/changeset.html:72 +#: rhodecode/templates/changeset/changeset.html:77 +#: rhodecode/templates/changeset/changeset.html:78 +#: rhodecode/templates/changeset/changeset.html:79 #, python-format msgid "affected %s files" msgstr "" @@ -3152,38 +3280,50 @@ msgid "Changeset" msgstr "" -#: rhodecode/templates/changeset/changeset.html:43 +#: rhodecode/templates/changeset/changeset.html:49 #: rhodecode/templates/changeset/diff_block.html:20 msgid "raw diff" msgstr "原始差異" -#: rhodecode/templates/changeset/changeset.html:44 +#: rhodecode/templates/changeset/changeset.html:50 +#, fuzzy +msgid "patch diff" +msgstr "原始差異" + +#: rhodecode/templates/changeset/changeset.html:51 #: rhodecode/templates/changeset/diff_block.html:21 msgid "download diff" msgstr "下載差異" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, fuzzy, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "遞交" -#: rhodecode/templates/changeset/changeset.html:48 +#: rhodecode/templates/changeset/changeset.html:55 #: rhodecode/templates/changeset/changeset_file_comment.html:82 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "" -#: rhodecode/templates/changeset/changeset.html:103 +#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/compare/compare_diff.html:44 +#: rhodecode/templates/pullrequests/pullrequest_show.html:76 +#, fuzzy, python-format +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "檔案修改" + +#: rhodecode/templates/changeset/changeset.html:113 +#: rhodecode/templates/compare/compare_diff.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:78 #, python-format -msgid "%s files affected with %s insertions and %s deletions:" -msgstr "" - -#: rhodecode/templates/changeset/changeset.html:119 -msgid "Changeset was too big and was cut off..." -msgstr "" +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 msgid "Submitting..." @@ -3251,15 +3391,18 @@ msgid "Compare View" msgstr "比較顯示" +#: rhodecode/templates/changeset/changeset_range.html:29 +#, fuzzy +msgid "Show combined compare" +msgstr "文件內容" + #: rhodecode/templates/changeset/changeset_range.html:54 -#: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "" #: rhodecode/templates/changeset/diff_block.html:19 -msgid "diff" -msgstr "差異" +msgid "show full diff for this file" +msgstr "" #: rhodecode/templates/changeset/diff_block.html:27 #, fuzzy @@ -3272,9 +3415,17 @@ msgstr "尚未有任何變更" #: rhodecode/templates/compare/compare_diff.html:37 +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 +#, 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 #, fuzzy -msgid "Outgoing changesets" -msgstr "尚未有任何變更" +msgid "No files" +msgstr "檔案" #: rhodecode/templates/data_table/_dt_elements.html:39 #: rhodecode/templates/data_table/_dt_elements.html:41 @@ -3283,40 +3434,52 @@ msgstr "分支" #: rhodecode/templates/data_table/_dt_elements.html:60 -#: rhodecode/templates/journal/journal.html:126 -#: rhodecode/templates/summary/summary.html:68 +#: rhodecode/templates/journal/journal.html:81 +#: rhodecode/templates/summary/summary.html:77 msgid "Mercurial repository" msgstr "Mercurial 版本庫" #: rhodecode/templates/data_table/_dt_elements.html:62 -#: rhodecode/templates/journal/journal.html:128 -#: rhodecode/templates/summary/summary.html:71 +#: rhodecode/templates/journal/journal.html:83 +#: rhodecode/templates/summary/summary.html:80 msgid "Git repository" msgstr "Git 版本庫" #: rhodecode/templates/data_table/_dt_elements.html:69 -#: rhodecode/templates/journal/journal.html:134 -#: rhodecode/templates/summary/summary.html:78 +#: rhodecode/templates/journal/journal.html:89 +#: rhodecode/templates/summary/summary.html:87 msgid "public repository" msgstr "公開版本庫" #: rhodecode/templates/data_table/_dt_elements.html:80 -#: rhodecode/templates/summary/summary.html:87 -#: rhodecode/templates/summary/summary.html:88 +#: rhodecode/templates/summary/summary.html:96 +#: rhodecode/templates/summary/summary.html:97 msgid "Fork of" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:92 +#: rhodecode/templates/data_table/_dt_elements.html:94 msgid "No changesets yet" msgstr "尚未有任何變更" -#: rhodecode/templates/data_table/_dt_elements.html:104 +#: rhodecode/templates/data_table/_dt_elements.html:101 +#: rhodecode/templates/data_table/_dt_elements.html:103 +#, 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 +#, 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 user: %s" msgstr "確認刪除這個使用者" #: rhodecode/templates/email_templates/main.html:8 -msgid "This is an notification from RhodeCode." +msgid "This is a notification from RhodeCode." msgstr "" #: rhodecode/templates/errors/error_document.html:46 @@ -3334,13 +3497,13 @@ msgstr "檔案差異" #: rhodecode/templates/files/files.html:4 -#: rhodecode/templates/files/files.html:72 +#: rhodecode/templates/files/files.html:74 #, fuzzy, python-format msgid "%s files" msgstr "檔案" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:340 +#: rhodecode/templates/summary/summary.html:351 msgid "files" msgstr "檔案" @@ -3424,7 +3587,7 @@ msgstr "搜尋檔案列表" #: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:65 +#: rhodecode/templates/shortlog/shortlog_data.html:80 #, fuzzy msgid "add new file" msgstr "新增使用者" @@ -3459,18 +3622,18 @@ msgstr "編輯檔案" #: rhodecode/templates/files/files_edit.html:49 -#: rhodecode/templates/files/files_source.html:38 +#: rhodecode/templates/files/files_source.html:23 msgid "show annotation" msgstr "險是註釋" #: rhodecode/templates/files/files_edit.html:50 -#: rhodecode/templates/files/files_source.html:40 -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:53 msgid "show as raw" msgstr "顯示原始文件" #: rhodecode/templates/files/files_edit.html:51 -#: rhodecode/templates/files/files_source.html:41 +#: rhodecode/templates/files/files_source.html:26 msgid "download as raw" msgstr "下載原始文件" @@ -3484,43 +3647,44 @@ msgid "Editing file" msgstr "編輯檔案" -#: rhodecode/templates/files/files_source.html:2 +#: rhodecode/templates/files/files_history_box.html:2 msgid "History" msgstr "歷史" -#: rhodecode/templates/files/files_source.html:9 +#: rhodecode/templates/files/files_history_box.html:9 #, fuzzy msgid "diff to revision" msgstr "下一個修訂" -#: rhodecode/templates/files/files_source.html:10 +#: rhodecode/templates/files/files_history_box.html:10 #, fuzzy msgid "show at revision" msgstr "下一個修訂" -#: rhodecode/templates/files/files_source.html:14 +#: rhodecode/templates/files/files_history_box.html:15 #, fuzzy, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "作者" -#: rhodecode/templates/files/files_source.html:36 +#: rhodecode/templates/files/files_source.html:6 +#, fuzzy +msgid "Load file history" +msgstr "載入檔案列表..." + +#: rhodecode/templates/files/files_source.html:21 msgid "show source" msgstr "顯示原始碼" -#: rhodecode/templates/files/files_source.html:59 +#: rhodecode/templates/files/files_source.html:44 #, python-format msgid "Binary file (%s)" msgstr "二進位檔 (%s)" -#: rhodecode/templates/files/files_source.html:68 +#: rhodecode/templates/files/files_source.html:53 msgid "File is too big to display" msgstr "顯示的檔案太大" -#: rhodecode/templates/files/files_source.html:124 -msgid "Selection link" -msgstr "" - #: rhodecode/templates/files/files_ypjax.html:5 #, fuzzy msgid "annotation" @@ -3595,7 +3759,7 @@ msgid "forked" msgstr "已建立分支" -#: rhodecode/templates/forks/forks_data.html:38 +#: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "尚未有任何 fork" @@ -3610,7 +3774,7 @@ msgstr "%s 公開日誌 %s feed" #: rhodecode/templates/journal/journal.html:24 -#: rhodecode/templates/pullrequests/pullrequest.html:27 +#: rhodecode/templates/pullrequests/pullrequest.html:55 msgid "Refresh" msgstr "" @@ -3634,19 +3798,19 @@ msgid "ADD" msgstr "新增" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "following user" msgstr "追蹤使用者" -#: rhodecode/templates/journal/journal.html:114 +#: rhodecode/templates/journal/journal.html:69 msgid "user" msgstr "使用者" -#: rhodecode/templates/journal/journal.html:147 +#: rhodecode/templates/journal/journal.html:102 msgid "You are not following any users or repositories" msgstr "您尚未追蹤任何使用者或版本庫" -#: rhodecode/templates/journal/journal_data.html:47 +#: rhodecode/templates/journal/journal_data.html:51 msgid "No entries yet" msgstr "" @@ -3669,7 +3833,7 @@ msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:28 +#: rhodecode/templates/pullrequests/pullrequest.html:54 msgid "refresh overview" msgstr "" @@ -3679,18 +3843,18 @@ msgstr "比較顯示" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:82 +#: rhodecode/templates/pullrequests/pullrequest_show.html:100 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest_show.html:112 #, fuzzy msgid "owner" msgstr "擁有者" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:109 +#: rhodecode/templates/pullrequests/pullrequest_show.html:127 msgid "Add reviewer to this pull request." msgstr "" @@ -3720,6 +3884,11 @@ msgid "Closed %s" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#, python-format +msgid "with status %s" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.html:31 #, fuzzy msgid "Status" @@ -3733,27 +3902,26 @@ msgid "Still not reviewed by" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#: rhodecode/templates/pullrequests/pullrequest_show.html:48 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:54 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +msgid "pull request was reviewed by all reviewers" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:58 #, fuzzy msgid "Created on" msgstr "建立使用者 %s" -#: rhodecode/templates/pullrequests/pullrequest_show.html:61 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Compare view" msgstr "比較顯示" -#: rhodecode/templates/pullrequests/pullrequest_show.html:65 -#, fuzzy -msgid "Incoming changesets" -msgstr "尚未有任何變更" - #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 #, fuzzy msgid "all pull requests" @@ -3830,24 +3998,32 @@ msgid "shortlog" msgstr "簡短紀錄" +#: rhodecode/templates/shortlog/shortlog_data.html:5 +msgid "revision" +msgstr "修訂" + #: rhodecode/templates/shortlog/shortlog_data.html:7 msgid "age" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:18 +#: rhodecode/templates/shortlog/shortlog_data.html:8 +msgid "author" +msgstr "作者" + +#: rhodecode/templates/shortlog/shortlog_data.html:33 #, fuzzy msgid "No commit message" msgstr "遞交資訊" -#: rhodecode/templates/shortlog/shortlog_data.html:62 +#: rhodecode/templates/shortlog/shortlog_data.html:77 msgid "Add or upload files directly via RhodeCode" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:71 +#: rhodecode/templates/shortlog/shortlog_data.html:86 msgid "Push new repo" msgstr "" -#: rhodecode/templates/shortlog/shortlog_data.html:79 +#: rhodecode/templates/shortlog/shortlog_data.html:94 #, fuzzy msgid "Existing repository?" msgstr "Git 版本庫" @@ -3877,132 +4053,142 @@ msgid "ATOM" msgstr "作者" -#: rhodecode/templates/summary/summary.html:82 +#: rhodecode/templates/summary/summary.html:70 +#, fuzzy, python-format +msgid "Repository locked by %s" +msgstr "個版本庫" + +#: rhodecode/templates/summary/summary.html:72 +#, fuzzy +msgid "Repository unlocked" +msgstr "個版本庫" + +#: rhodecode/templates/summary/summary.html:91 #, fuzzy, python-format msgid "Non changable ID %s" msgstr "沒有修改" -#: rhodecode/templates/summary/summary.html:87 +#: rhodecode/templates/summary/summary.html:96 msgid "public" msgstr "公開" -#: rhodecode/templates/summary/summary.html:95 +#: rhodecode/templates/summary/summary.html:104 msgid "remote clone" msgstr "遠端複製" -#: rhodecode/templates/summary/summary.html:116 +#: rhodecode/templates/summary/summary.html:125 msgid "Contact" msgstr "聯絡方式" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:139 msgid "Clone url" msgstr "複製連結" -#: rhodecode/templates/summary/summary.html:133 +#: rhodecode/templates/summary/summary.html:142 #, fuzzy msgid "Show by Name" msgstr "顯示更多" -#: rhodecode/templates/summary/summary.html:134 +#: rhodecode/templates/summary/summary.html:143 msgid "Show by ID" msgstr "" -#: rhodecode/templates/summary/summary.html:142 +#: rhodecode/templates/summary/summary.html:151 #, fuzzy msgid "Trending files" msgstr "編輯檔案" -#: rhodecode/templates/summary/summary.html:150 -#: rhodecode/templates/summary/summary.html:166 -#: rhodecode/templates/summary/summary.html:194 +#: rhodecode/templates/summary/summary.html:159 +#: rhodecode/templates/summary/summary.html:175 +#: rhodecode/templates/summary/summary.html:203 msgid "enable" msgstr "啟用" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:167 msgid "Download" msgstr "下載" -#: rhodecode/templates/summary/summary.html:162 +#: rhodecode/templates/summary/summary.html:171 msgid "There are no downloads yet" msgstr "沒有任何下載" -#: rhodecode/templates/summary/summary.html:164 +#: rhodecode/templates/summary/summary.html:173 msgid "Downloads are disabled for this repository" msgstr "這個版本庫的下載已停用" -#: rhodecode/templates/summary/summary.html:170 +#: rhodecode/templates/summary/summary.html:179 #, fuzzy msgid "Download as zip" msgstr "下載原始文件" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:182 msgid "Check this to download archive with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:173 +#: rhodecode/templates/summary/summary.html:182 msgid "with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:186 +#: rhodecode/templates/summary/summary.html:195 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:197 +#: rhodecode/templates/summary/summary.html:206 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:218 +#: rhodecode/templates/summary/summary.html:227 msgid "Shortlog" msgstr "簡短紀錄" -#: rhodecode/templates/summary/summary.html:220 +#: rhodecode/templates/summary/summary.html:229 #, fuzzy msgid "Quick start" msgstr "快速過濾..." -#: rhodecode/templates/summary/summary.html:233 +#: rhodecode/templates/summary/summary.html:243 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:236 +#: rhodecode/templates/summary/summary.html:246 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:293 +#: rhodecode/templates/summary/summary.html:304 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:661 msgid "commits" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:662 msgid "files added" msgstr "多個檔案新增" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:663 msgid "files changed" msgstr "多個檔案修改" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:664 msgid "files removed" msgstr "移除多個檔案" -#: rhodecode/templates/summary/summary.html:656 +#: rhodecode/templates/summary/summary.html:667 msgid "commit" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:657 +#: rhodecode/templates/summary/summary.html:668 msgid "file added" msgstr "檔案新增" -#: rhodecode/templates/summary/summary.html:658 +#: rhodecode/templates/summary/summary.html:669 msgid "file changed" msgstr "檔案修改" -#: rhodecode/templates/summary/summary.html:659 +#: rhodecode/templates/summary/summary.html:670 msgid "file removed" msgstr "移除檔案" @@ -4011,3 +4197,8 @@ msgid "%s Tags" msgstr "之前" +#: rhodecode/templates/tags/tags.html:29 +#, fuzzy +msgid "Compare tags" +msgstr "比較顯示" +