# HG changeset patch # User xpol # Date 2012-10-02 05:48:03 # Node ID b78e6f7f3ab9f74496964c8a7f0d2aa993e1cc20 # Parent 1f2c4bf348ad7b48ac24baa0097557c23d372988 Change the translated term for 'fork', its now translated as '复刻'. (Thanks Hanlei Qin ) diff --git a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo index 52185c12cecd51c8c881c5cfe91fcbae598c8497..edf8e1b29ae13e51ab5aec704a0ad472010a5399 GIT binary patch literal 54454 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%0DFdnGI;CO5iGijRN;Ip#R4j z_ z)(hMx@Oh#8#U|+0KX1ag{LF* z_?3~(sQ=(*XFl3Ea_$e(jNT zMH=*QF@ICq)71MRi$ zfc|<-=>EL}cFP$%vCqG`6Z3t|PVpCaO1}l(EAW1SzMU9PXeY+KU?=R5Wjj&-YRTUq z_3jtC4#A(0dfu1(4+Z{H=+4+B_W=ZccNfZCE$P9#KsQX%nY%$5!#=q|(vzCOPq{)@D)=f%uafk7sjsOS?HrQ)7X+SY zh8%xe^8Y3Hb6Z5N2)w)n`2$)ok3Vezzf5XD`MehN=ZO~dv$+L)`A!Swom6ZT+zr|!Y{i-o>c=$rRoe%tq;KhNzEyHnEtl6t5OV1Sg2mkLgP7;Zha`S@NaW@r z)L$;?Wrx6@^@m{39h3a`4q?21I)r&W?=bLJ3%rrwD1t*IU2_=q)gQ*ZZ9I(mIdB+u z@pF>@)mG47DA3gkd`c_Yzp)kiH?vjrrqG32F`mZ-u5LyD4z?mL_O{gXX)E}mPn+yh zffoq8v<>U$YD4`u3qGw4^Dw4O_^l20bGhWN5&Wh$w0}_Qc|+2FXv04HO1svowOy~JJ zf_jb}LA%EV{#xKil7Hq=q|ZN!^c9l6R^V+%5jVV#;KKyVj$*vsM{#fM%nrmWZ|VU4 z;SR{TM+hDxxT*u|^x%^i$DAiIj>n%Ae@ftT$=@RR+n+>zyPrfmuRJOD(4Is;FF7W0 z34wzI-YGES802i$F|6yNV;E2KG0fjn#}Gd|aSZKzD)@_^!a2oNPk}!7DcP@2!H$~u z6y(9Srw~UvPB6&pFLVz+jrKiHqy6yH=}ee(?V z#f8scpIq?_=4;3^=+E$HAP;h$fxKBJ=^X-pF8D7$3wiO~XR)u-pT#`nK8t#mJd6J9 ze-`6=^;wkr@LA~Pv!26x-uxWq?S4r|o&z5)c@BF1jptDA-RH26{_-5^`||UMdtdWB z_C@;h@Y^4LUhWYKzD(dsfja~qc^+}(6VJ;%0D&J%J$+vQ{Pqi=AM^t19VY3qFJL}> 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 N>$u7m38gEI{{`d&r+5GW diff --git a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po @@ -8,17 +8,16 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-09-21 14:39+0800\n" -"PO-Revision-Date: 2012-09-21 15:20+0800\n" +"POT-Creation-Date: 2012-10-02 13:34+0800\n" +"PO-Revision-Date: 2012-10-02 13:44+0800\n" "Last-Translator: xpol \n" "Language-Team: mikespook\n" "Plural-Forms: nplurals=1; plural=0;\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" "X-Generator: Poedit 1.5.3\n" -"X-Poedit-Basepath: E:\\home\\rhodecode\n" #: rhodecode/controllers/changelog.py:95 msgid "All Branches" @@ -43,9 +42,8 @@ msgid "binary file" msgstr "二进制文件" #: rhodecode/controllers/changeset.py:381 -#: rhodecode/controllers/pullrequests.py:368 +#: rhodecode/controllers/pullrequests.py:376 #, python-format -#| msgid "Last change" msgid "Status change -> %s" msgstr "状态改变 -> %s" @@ -56,6 +54,7 @@ msgid "" msgstr "不允许修改已关闭拉取请求的修订集状态" #: rhodecode/controllers/compare.py:72 +#: rhodecode/controllers/pullrequests.py:114 msgid "There are no changesets yet" msgstr "还没有修订集" @@ -173,13 +172,13 @@ msgstr "未知包类型" msgid "Changesets" msgstr "修订集" -#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 -#: rhodecode/controllers/summary.py:234 rhodecode/model/scm.py:543 +#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:73 +#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:543 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 -#: rhodecode/controllers/summary.py:235 rhodecode/model/scm.py:554 +#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:77 +#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:554 msgid "Tags" msgstr "标签" @@ -204,12 +203,12 @@ msgstr "" #: rhodecode/controllers/forks.py:168 #, python-format msgid "forked %s repository as %s" -msgstr "版本库 %s 被分支到 %s" +msgstr "版本库 %s 被复刻到 %s" #: rhodecode/controllers/forks.py:182 #, python-format msgid "An error occurred during repository forking %s" -msgstr "在分支版本库 %s 的时候发生错误" +msgstr "在复刻版本库 %s 的时候发生错误" #: rhodecode/controllers/journal.py:203 rhodecode/controllers/journal.py:240 msgid "public journal" @@ -233,27 +232,27 @@ msgid "" "Your password reset was successful, new password has been sent to your email" msgstr "密码已经成功重置,新密码已经发送到你的邮箱" -#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 +#: rhodecode/controllers/pullrequests.py:75 rhodecode/model/scm.py:549 msgid "Bookmarks" msgstr "书签" -#: rhodecode/controllers/pullrequests.py:174 +#: rhodecode/controllers/pullrequests.py:182 msgid "Pull request requires a title with min. 3 chars" msgstr "拉取请求的标题至少 3 个字符" -#: rhodecode/controllers/pullrequests.py:176 +#: rhodecode/controllers/pullrequests.py:184 msgid "error during creation of pull request" msgstr "提交拉取请求时发生错误" -#: rhodecode/controllers/pullrequests.py:197 +#: rhodecode/controllers/pullrequests.py:205 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: rhodecode/controllers/pullrequests.py:200 +#: rhodecode/controllers/pullrequests.py:208 msgid "Error occurred during sending pull request" msgstr "提交拉取请求时发生错误" -#: rhodecode/controllers/pullrequests.py:233 +#: rhodecode/controllers/pullrequests.py:241 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" @@ -305,18 +304,15 @@ msgid "An error occurred during deletion msgstr "在删除 %s 的时候发生错误" #: rhodecode/controllers/settings.py:179 -#| msgid "unlock" msgid "unlocked" msgstr "未锁" #: rhodecode/controllers/settings.py:182 -#| msgid "unlock" msgid "locked" msgstr "已锁" #: rhodecode/controllers/settings.py:184 #, python-format -#| msgid "forked %s repository as %s" msgid "Repository has been %s" msgstr "版本库已经 %s" @@ -325,11 +321,11 @@ msgstr "版本库已经 %s" msgid "An error occurred during unlocking" msgstr "解锁时发生错误" -#: rhodecode/controllers/summary.py:138 +#: rhodecode/controllers/summary.py:140 msgid "No data loaded yet" msgstr "数据未加载" -#: rhodecode/controllers/summary.py:142 +#: rhodecode/controllers/summary.py:144 #: rhodecode/templates/summary/summary.html:148 msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" @@ -459,7 +455,7 @@ msgstr "更新权限时发生错误" #: rhodecode/controllers/admin/repos.py:123 msgid "--REMOVE FORK--" -msgstr "-- 移除分支 --" +msgstr "-- 移除复刻 --" #: rhodecode/controllers/admin/repos.py:192 #, python-format @@ -479,7 +475,7 @@ msgstr "创建版本库时发生错误 %s" #: rhodecode/controllers/admin/repos.py:319 #, python-format msgid "Cannot delete %s it still contains attached forks" -msgstr "无法删除 %s 因为它还有其他分支版本库" +msgstr "无法删除 %s 因为它还有其他分复刻本库" #: rhodecode/controllers/admin/repos.py:348 msgid "An error occurred during deletion of repository user" @@ -524,7 +520,7 @@ msgstr "无" #: rhodecode/controllers/admin/repos.py:484 #, python-format msgid "Marked repo %s as fork of %s" -msgstr "成功将版本库 %s 标记为从 %s 分支" +msgstr "成功将版本库 %s 标记为复刻自 %s" #: rhodecode/controllers/admin/repos.py:488 msgid "An error occurred during this operation" @@ -674,11 +670,11 @@ msgstr "已撤销用户‘创建版本库’的权限" #: rhodecode/controllers/admin/users.py:277 msgid "Granted 'repository fork' permission to user" -msgstr "成功授予了用户“分支版本库”权限" +msgstr "成功授予了用户“复刻版本库”权限" #: rhodecode/controllers/admin/users.py:282 msgid "Revoked 'repository fork' permission to user" -msgstr "成功撤销用户“分支版本库”权限" +msgstr "成功撤销用户“复刻版本库”权限" #: rhodecode/controllers/admin/users.py:288 #: rhodecode/controllers/admin/users_groups.py:255 @@ -736,11 +732,11 @@ msgstr "已撤销用户组‘创建版本库’的权限" #: rhodecode/controllers/admin/users_groups.py:244 msgid "Granted 'repository fork' permission to users group" -msgstr "已授予用户组‘分支版本库’的权限" +msgstr "已授予用户组‘复刻版本库’的权限" #: rhodecode/controllers/admin/users_groups.py:249 msgid "Revoked 'repository fork' permission to users group" -msgstr "已撤销用户组‘分支版本库’的权限" +msgstr "已撤销用户组‘复刻版本库’的权限" #: rhodecode/lib/auth.py:499 msgid "You need to be a registered user to perform this action" @@ -795,13 +791,13 @@ msgid "%s more" msgstr "%s 个" #: rhodecode/lib/helpers.py:584 -#: rhodecode/templates/changelog/changelog.html:48 +#: rhodecode/templates/changelog/changelog.html:49 msgid "revisions" msgstr "修订" #: rhodecode/lib/helpers.py:607 msgid "fork name " -msgstr "分支名称" +msgstr "复刻名称" #: rhodecode/lib/helpers.py:621 #: rhodecode/templates/pullrequests/pullrequest_show.html:4 @@ -820,11 +816,11 @@ msgstr "[创建]版本库" #: rhodecode/lib/helpers.py:631 msgid "[created] repository as fork" -msgstr "[创建]分支版本库" +msgstr "[创建]复刻版本库" #: rhodecode/lib/helpers.py:633 rhodecode/lib/helpers.py:641 msgid "[forked] repository" -msgstr "[分支]版本库" +msgstr "[复刻]版本库" #: rhodecode/lib/helpers.py:635 rhodecode/lib/helpers.py:643 msgid "[updated] repository" @@ -1004,11 +1000,11 @@ msgstr "允许创建版本库" #: rhodecode/model/db.py:1177 msgid "Repository forking disabled" -msgstr "禁用分支 版本库" +msgstr "禁用复刻版本库" #: rhodecode/model/db.py:1178 msgid "Repository forking enabled" -msgstr "允许分支版本库" +msgstr "允许复刻版本库" #: rhodecode/model/db.py:1179 msgid "Register disabled" @@ -1217,10 +1213,9 @@ msgstr "无效的克隆地址,提供一个有效的克隆 http(s) 或 svn+http(s) 地址" #: rhodecode/model/validators.py:458 msgid "Fork have to be the same type as parent" -msgstr "分支必须使用和父版本库相同的类型" +msgstr "复刻版本库必须和父版本库类型相同" #: rhodecode/model/validators.py:473 -#| msgid "You don't have permission to view this page" msgid "You don't have permissions to create repository in this group" msgstr "没有在这个组里面创建版本库的权限" @@ -1317,8 +1312,8 @@ msgstr "版本库组" #: rhodecode/templates/admin/repos/repos.html:70 #: rhodecode/templates/admin/users/user_edit.html:192 #: 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:181 +#: rhodecode/templates/admin/users/user_edit_my_account.html:217 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 @@ -1341,7 +1336,7 @@ 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/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "Tip" @@ -1382,7 +1377,7 @@ msgstr "组名" #: rhodecode/templates/index_base.html:158 #: rhodecode/templates/index_base.html:198 #: 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:203 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 @@ -1394,7 +1389,7 @@ msgstr "点击以升序排列" #: rhodecode/templates/index_base.html:159 #: rhodecode/templates/index_base.html:199 #: 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:204 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 @@ -1409,7 +1404,7 @@ msgstr "最后修改" #: rhodecode/templates/index_base.html:200 #: 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:205 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 @@ -1420,7 +1415,7 @@ msgstr "没有找到记录" #: rhodecode/templates/index_base.html:201 #: 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:206 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 @@ -1431,7 +1426,7 @@ msgstr "数据错误" #: rhodecode/templates/index_base.html:202 #: 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:207 #: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 @@ -1783,7 +1778,7 @@ msgstr "建立版本库" #: rhodecode/templates/admin/permissions/permissions.html:71 msgid "Repository forking" -msgstr "版本库分支" +msgstr "版本库复刻" #: rhodecode/templates/admin/permissions/permissions.html:78 #: rhodecode/templates/admin/repos/repo_edit.html:255 @@ -1944,7 +1939,7 @@ msgstr "修改这个版本库的所有者" #: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 -#: rhodecode/templates/pullrequests/pullrequest.html:124 +#: rhodecode/templates/pullrequests/pullrequest.html:122 #: rhodecode/templates/settings/repo_settings.html:94 msgid "Reset" msgstr "重置" @@ -2059,11 +2054,11 @@ msgstr "强制锁定版本库。只有在禁止匿名访问时候才有效" #: rhodecode/templates/admin/repos/repo_edit.html:250 msgid "Set as fork of" -msgstr "设置 fork 自" +msgstr "设置复刻自" #: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "Manually set this repository as a fork of another from the list" -msgstr "从列表中手动设置这个版本库 fork 自另一版本库" +msgstr "从列表中手动设置这个版本库复刻自另一版本库" #: rhodecode/templates/admin/repos/repo_edit.html:265 #: rhodecode/templates/changeset/changeset_file_comment.html:26 @@ -2219,7 +2214,7 @@ msgstr "上级组" #: 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:117 msgid "save" msgstr "保存" @@ -2574,7 +2569,7 @@ msgstr "创建版本库" #: rhodecode/templates/admin/users/user_edit.html:166 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127 msgid "Fork repositories" -msgstr "分支版本库" +msgstr "复刻版本库" #: rhodecode/templates/admin/users/user_edit.html:186 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 @@ -2584,7 +2579,7 @@ msgstr "无条目" #: rhodecode/templates/admin/users/user_edit.html:193 #: 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:218 msgid "Permission" msgstr "权限" @@ -2883,7 +2878,6 @@ msgstr "选项" #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#| msgid "Repository creation" msgid "repository settings" msgstr "版本库设置" @@ -2891,10 +2885,10 @@ msgstr "版本库设置" #: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" -msgstr "分支" +msgstr "复刻" #: rhodecode/templates/base/base.html:212 -#: rhodecode/templates/changelog/changelog.html:40 +#: rhodecode/templates/changelog/changelog.html:41 msgid "Open new pull request" msgstr "新建拉取请求" @@ -2903,7 +2897,6 @@ msgid "search" msgstr "搜索" #: rhodecode/templates/base/base.html:220 -#| msgid "unlock" msgid "lock" msgstr "锁定" @@ -2931,7 +2924,7 @@ msgstr "关注者" #: rhodecode/templates/base/base.html:255 #: rhodecode/templates/base/base.html:257 msgid "Forks" -msgstr "分支" +msgstr "复刻" #: rhodecode/templates/base/base.html:336 #: rhodecode/templates/base/base.html:338 @@ -3028,18 +3021,18 @@ msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "显示 %2d 中的 %1d 个版本" -#: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/changelog/changelog.html:38 #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" -msgstr "与 %s 比较" - -#: rhodecode/templates/changelog/changelog.html:37 +msgstr "比较复刻和%s" + +#: rhodecode/templates/changelog/changelog.html:38 #: rhodecode/templates/forks/forks_data.html:21 msgid "Compare fork" -msgstr "比较分支" - -#: rhodecode/templates/changelog/changelog.html:46 +msgstr "比较复刻" + +#: rhodecode/templates/changelog/changelog.html:47 msgid "Show" msgstr "显示" @@ -3060,6 +3053,7 @@ msgid "Changeset status" msgstr "修订集状态" #: rhodecode/templates/changelog/changelog.html:92 +#: rhodecode/templates/shortlog/shortlog_data.html:20 msgid "Click to open associated pull request" msgstr "点击建立相关的拉取请求" @@ -3233,7 +3227,7 @@ msgstr "比较显示" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:69 +#: rhodecode/templates/pullrequests/pullrequest_show.html:73 msgid "Files affected" msgstr "影响文件" @@ -3257,7 +3251,7 @@ msgstr "传出修订集" #: rhodecode/templates/data_table/_dt_elements.html:41 #: rhodecode/templates/data_table/_dt_elements.html:43 msgid "Fork" -msgstr "分支" +msgstr "复刻" #: rhodecode/templates/data_table/_dt_elements.html:60 #: rhodecode/templates/journal/journal.html:126 @@ -3281,7 +3275,7 @@ msgstr "公共版本库" #: rhodecode/templates/summary/summary.html:87 #: rhodecode/templates/summary/summary.html:88 msgid "Fork of" -msgstr "分支自" +msgstr "复刻自" #: rhodecode/templates/data_table/_dt_elements.html:92 msgid "No changesets yet" @@ -3321,6 +3315,11 @@ msgstr "%s 文件" msgid "files" msgstr "文件" +#: rhodecode/templates/files/files.html:92 +#: rhodecode/templates/files/files_source.html:124 +msgid "Selection link" +msgstr "选择链接" + #: rhodecode/templates/files/files_add.html:4 #: rhodecode/templates/files/files_edit.html:4 #, python-format @@ -3395,7 +3394,7 @@ msgid "search file list" msgstr "搜索文件列表" #: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:65 +#: rhodecode/templates/shortlog/shortlog_data.html:80 msgid "add new file" msgstr "新建文件" @@ -3482,10 +3481,6 @@ msgstr "二进制文件(%s)" 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 msgid "annotation" msgstr "显示注释" @@ -3514,11 +3509,11 @@ msgstr "开始关注 - " #: rhodecode/templates/forks/fork.html:5 #, python-format msgid "%s Fork" -msgstr "%s 的分支" +msgstr "%s的复刻" #: rhodecode/templates/forks/fork.html:31 msgid "Fork name" -msgstr "分支名" +msgstr "复刻名称" #: rhodecode/templates/forks/fork.html:68 msgid "Private" @@ -3530,7 +3525,7 @@ msgstr "拷贝权限" #: rhodecode/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" -msgstr "从被分支版本库拷贝权限" +msgstr "从被复刻版本库拷贝权限" #: rhodecode/templates/forks/fork.html:86 msgid "Update after clone" @@ -3542,24 +3537,24 @@ msgstr "完成克隆后检出源代码" #: rhodecode/templates/forks/fork.html:94 msgid "fork this repository" -msgstr "对该版本库建立分支" +msgstr "复刻该版本库" #: rhodecode/templates/forks/forks.html:5 #, python-format msgid "%s Forks" -msgstr "%s 的分支" +msgstr "%s个复刻" #: rhodecode/templates/forks/forks.html:13 msgid "forks" -msgstr "分支" +msgstr "复刻" #: rhodecode/templates/forks/forks_data.html:17 msgid "forked" -msgstr "已有分支" +msgstr "已有复刻" #: rhodecode/templates/forks/forks_data.html:38 msgid "There are no forks yet" -msgstr "无分支" +msgstr "无复刻" #: rhodecode/templates/journal/journal.html:13 msgid "ATOM journal feed" @@ -3570,7 +3565,7 @@ msgid "RSS journal feed" msgstr "订阅日志 RSS" #: rhodecode/templates/journal/journal.html:24 -#: rhodecode/templates/pullrequests/pullrequest.html:27 +#: rhodecode/templates/pullrequests/pullrequest.html:53 msgid "Refresh" msgstr "刷新" @@ -3625,44 +3620,44 @@ msgstr "公共日志" msgid "New pull request" msgstr "新建拉取请求" -#: rhodecode/templates/pullrequests/pullrequest.html:28 +#: rhodecode/templates/pullrequests/pullrequest.html:52 msgid "refresh overview" msgstr "刷新概览" -#: rhodecode/templates/pullrequests/pullrequest.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:64 msgid "Detailed compare view" msgstr "详细比较显示" -#: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:82 +#: rhodecode/templates/pullrequests/pullrequest.html:68 +#: rhodecode/templates/pullrequests/pullrequest_show.html:86 msgid "Pull request reviewers" msgstr "拉取请求检视人员" -#: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:94 +#: rhodecode/templates/pullrequests/pullrequest.html:77 +#: rhodecode/templates/pullrequests/pullrequest_show.html:98 msgid "owner" msgstr "所有者" -#: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:109 +#: rhodecode/templates/pullrequests/pullrequest.html:89 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 msgid "Add reviewer to this pull request." msgstr "为这个拉取请求增加检视人员" -#: rhodecode/templates/pullrequests/pullrequest.html:97 +#: rhodecode/templates/pullrequests/pullrequest.html:95 msgid "Create new pull request" msgstr "创建新的拉取请求" -#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest.html:104 #: rhodecode/templates/pullrequests/pullrequest_show.html:25 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 msgid "Title" msgstr "标题" -#: rhodecode/templates/pullrequests/pullrequest.html:115 +#: rhodecode/templates/pullrequests/pullrequest.html:113 msgid "description" msgstr "描述" -#: rhodecode/templates/pullrequests/pullrequest.html:123 +#: rhodecode/templates/pullrequests/pullrequest.html:121 msgid "Send pull request" msgstr "发送拉取请求" @@ -3688,21 +3683,26 @@ msgstr "拉取请求状态" 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] "%d 个检视者" -#: rhodecode/templates/pullrequests/pullrequest_show.html:54 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +#| msgid "Pull request reviewers" +msgid "pull request was reviewed by all reviewers" +msgstr "拉取请求已经被所有检视人员检视" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:58 msgid "Created on" msgstr "创建于 %s" -#: rhodecode/templates/pullrequests/pullrequest_show.html:61 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 msgid "Compare view" msgstr "比较显示" -#: rhodecode/templates/pullrequests/pullrequest_show.html:65 +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Incoming changesets" msgstr "传入修订集" @@ -3783,19 +3783,19 @@ msgstr "简短日志" msgid "age" msgstr "时间" -#: rhodecode/templates/shortlog/shortlog_data.html:18 +#: rhodecode/templates/shortlog/shortlog_data.html:33 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 直接添加或者上传文件" -#: rhodecode/templates/shortlog/shortlog_data.html:71 +#: rhodecode/templates/shortlog/shortlog_data.html:86 msgid "Push new repo" msgstr "Push 新版本库" -#: rhodecode/templates/shortlog/shortlog_data.html:79 +#: rhodecode/templates/shortlog/shortlog_data.html:94 msgid "Existing repository?" msgstr "现有版本库?" @@ -3952,6 +3952,3 @@ msgstr "文件已删除" #, python-format msgid "%s Tags" msgstr "%s 标签" - -#~ msgid "Groups" -#~ msgstr "组"