kallithea Changeset - b78e6f7f3ab9

Changeset - b78e6f7f3ab9

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

xpol - 13 years ago 2012-10-02 07:48:03

Change the translated term for 'fork', its now translated as '复刻'. (Thanks Hanlei Qin <qinhanlei@gmail.com>)

2 files changed with 102 insertions and 105 deletions:

rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo

bin+mod

rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po

102

105

0 comments (0 inline, 0 general)

rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo

➞

Show inline comments

binary diff not shown

rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po

➞

Show inline comments

 # Chinese (China) translations for RhodeCode.
 # Copyright (C) 2011 ORGANIZATION
 # This file is distributed under the same license as the RhodeCode project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
 # mikespook <mikespook@gmail.com>, 2012.
 # xpol <xpolife@gmail.com>, 2012.
 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 <xpolife@gmail.com>\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"
 msgstr "所有分支"
 #: rhodecode/controllers/changeset.py:83
 msgid "show white space"
 msgstr "显示空白字符"
 #: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
 msgid "ignore white space"
 msgstr "忽略空白字符"
 #: rhodecode/controllers/changeset.py:157
 #, python-format
 msgid "%s line context"
 msgstr "%s 行上下文"
 #: rhodecode/controllers/changeset.py:333
 #: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:71
 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"
 #: rhodecode/controllers/changeset.py:412
 msgid ""
 "Changing status on a changeset associated witha closed pull request is not "
 "allowed"
 msgstr "不允许修改已关闭拉取请求的修订集状态"
 #: rhodecode/controllers/compare.py:72
 #: rhodecode/controllers/pullrequests.py:114
 msgid "There are no changesets yet"
 msgstr "还没有修订集"
 #: rhodecode/controllers/error.py:69
 msgid "Home page"
 msgstr "主页"
 #: rhodecode/controllers/error.py:98
 msgid ""
 "The request could not be understood by the server due to malformed syntax."
 msgstr "由于错误的语法，服务器无法对请求进行响应。"
 #: rhodecode/controllers/error.py:101
 msgid "Unauthorized access to resource"
 msgstr "未授权的资源访问"
 #: rhodecode/controllers/error.py:103
 msgid "You don't have permission to view this page"
 msgstr "无权访问该页面"
 #: rhodecode/controllers/error.py:105
 msgid "The resource could not be found"
 msgstr "资源未找到"
@@ @@ -152,129 +151,129 @@ msgstr "无文件名" @@
 #: rhodecode/controllers/files.py:378
 msgid "downloads disabled"
 msgstr "禁止下载"
 #: rhodecode/controllers/files.py:389
 #, python-format
 msgid "Unknown revision %s"
 msgstr "未知版本 %s"
 #: rhodecode/controllers/files.py:391
 msgid "Empty repository"
 msgstr "空版本库"
 #: rhodecode/controllers/files.py:393
 msgid "Unknown archive type"
 msgstr "未知包类型"
 #: rhodecode/controllers/files.py:494
 #: 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: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 "标签"
 #: rhodecode/controllers/forks.py:74 rhodecode/controllers/admin/repos.py:90
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from the "
 "filesystem please run the application again in order to rescan repositories"
 msgstr ""
 "版本库 %s 没有映射到数据库，可能是从文件系统创建或者重命名，请重启 RhodeCode "
 "以重新扫描版本库"
 #: 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 the "
 "file system please run the application again in order to rescan repositories"
 msgstr ""
 " 版本库 %s 没有映射到数据库，可能是从文件系统创建或者重命名，请重启 "
 "RhodeCode 以重新扫描版本库"
 #: 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"
 msgstr "公共日志"
 #: rhodecode/controllers/journal.py:207 rhodecode/controllers/journal.py:244
 #: rhodecode/templates/base/base.html:229
 msgid "journal"
 msgstr "日志"
 #: rhodecode/controllers/login.py:143
 msgid "You have successfully registered into rhodecode"
 msgstr "成功注册到 rhodecode"
 #: rhodecode/controllers/login.py:164
 msgid "Your password reset link was sent"
 msgstr "密码重置链接已经发送"
 #: rhodecode/controllers/login.py:184
 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 "成功删除拉取请求"
 #: rhodecode/controllers/search.py:132
 msgid "Invalid search query. Try quoting it."
 msgstr "错误的搜索。请尝试用引号包含它。"
 #: rhodecode/controllers/search.py:137
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr "没有索引用于搜索。请运行 whoosh 索引器"
 #: rhodecode/controllers/search.py:141
 msgid "An error occurred during this search operation"
 msgstr "在搜索操作中发生异常"
 #: rhodecode/controllers/settings.py:108
 #: rhodecode/controllers/admin/repos.py:266
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr "版本库 %s 成功更新"
 #: rhodecode/controllers/settings.py:126
 #: rhodecode/controllers/admin/repos.py:284
 #, python-format
@@ @@ -284,73 +283,70 @@ msgstr "在更新版本库 %s 的时候发生错误" @@
 #: rhodecode/controllers/settings.py:144
 #: rhodecode/controllers/admin/repos.py:302
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was moved or renamed  from the "
 "filesystem please run the application again in order to rescan repositories"
 msgstr ""
 "版本库 %s 没有映射到数据库，可能是从文件系统创建或者重命名，请重启 RhodeCode "
 "以重新扫描版本库"
 #: rhodecode/controllers/settings.py:156
 #: rhodecode/controllers/admin/repos.py:314
 #, python-format
 msgid "deleted repository %s"
 msgstr "已经删除版本库 %s"
 #: rhodecode/controllers/settings.py:160
 #: rhodecode/controllers/admin/repos.py:324
 #: rhodecode/controllers/admin/repos.py:330
 #, python-format
 msgid "An error occurred during deletion of %s"
 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"
 #: rhodecode/controllers/settings.py:188
 #: rhodecode/controllers/admin/repos.py:422
 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 "该版本库统计功能已经禁用"
 #: rhodecode/controllers/admin/ldap_settings.py:50
 msgid "BASE"
 msgstr "BASE"
 #: rhodecode/controllers/admin/ldap_settings.py:51
 msgid "ONELEVEL"
 msgstr "ONELEVEL"
 #: rhodecode/controllers/admin/ldap_settings.py:52
 msgid "SUBTREE"
 msgstr "SUBTREE"
 #: rhodecode/controllers/admin/ldap_settings.py:56
 msgid "NEVER"
 msgstr "NEVER"
 #: rhodecode/controllers/admin/ldap_settings.py:57
 msgid "ALLOW"
 msgstr "ALLOW"
@@ @@ -438,114 +434,114 @@ msgstr "允许手工启用帐号" @@
 #: rhodecode/controllers/admin/permissions.py:69
 msgid "allowed with automatic account activation"
 msgstr "允许自动启用帐号"
 #: rhodecode/controllers/admin/permissions.py:71
 #: rhodecode/controllers/admin/permissions.py:74
 msgid "Disabled"
 msgstr "停用"
 #: rhodecode/controllers/admin/permissions.py:72
 #: rhodecode/controllers/admin/permissions.py:75
 msgid "Enabled"
 msgstr "启用"
 #: rhodecode/controllers/admin/permissions.py:116
 msgid "Default permissions updated successfully"
 msgstr "成功更新默认权限"
 #: rhodecode/controllers/admin/permissions.py:130
 msgid "error occurred during update of permissions"
 msgstr "更新权限时发生错误"
 #: rhodecode/controllers/admin/repos.py:123
 msgid "--REMOVE FORK--"
-msgstr "-- 移除分支 --"
+msgstr "-- 移除复刻 --"
 #: rhodecode/controllers/admin/repos.py:192
 #, python-format
 msgid "created repository %s from %s"
 msgstr "新版本库 %s 基于 %s 建立。"
 #: rhodecode/controllers/admin/repos.py:196
 #, python-format
 msgid "created repository %s"
 msgstr "建立版本库 %s"
 #: rhodecode/controllers/admin/repos.py:227
 #, python-format
 msgid "error occurred during creation of repository %s"
 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"
 msgstr "删除版本库用户时发生错误"
 #: rhodecode/controllers/admin/repos.py:367
 msgid "An error occurred during deletion of repository users groups"
 msgstr "删除版本库用户组时发生错误"
 #: rhodecode/controllers/admin/repos.py:385
 msgid "An error occurred during deletion of repository stats"
 msgstr "删除版本库统计时发生错误"
 #: rhodecode/controllers/admin/repos.py:402
 msgid "An error occurred during cache invalidation"
 msgstr "清除缓存时发生错误"
 #: rhodecode/controllers/admin/repos.py:442
 msgid "Updated repository visibility in public journal"
 msgstr "成功更新在公共日志中的可见性"
 #: rhodecode/controllers/admin/repos.py:446
 msgid "An error occurred during setting this repository in public journal"
 msgstr "设置版本库到公共日志时发生错误"
 #: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:300
 msgid "Token mismatch"
 msgstr "令牌不匹配"
 #: rhodecode/controllers/admin/repos.py:464
 msgid "Pulled from remote location"
 msgstr "成功拉取自远程路径"
 #: rhodecode/controllers/admin/repos.py:466
 msgid "An error occurred during pull from remote location"
 msgstr "从远程路径拉取时发生错误"
 #: rhodecode/controllers/admin/repos.py:482
 msgid "Nothing"
 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"
 msgstr "在搜索操作中发生错误"
 #: rhodecode/controllers/admin/repos_groups.py:117
 #, python-format
 msgid "created repos group %s"
 msgstr "建立版本库组 %s"
 #: rhodecode/controllers/admin/repos_groups.py:130
 #, python-format
 msgid "error occurred during creation of repos group %s"
 msgstr "创建版本库组时发生错误 %s"
 #: rhodecode/controllers/admin/repos_groups.py:164
 #, python-format
 msgid "updated repos group %s"
 msgstr "更新版本库组 %s"
 #: rhodecode/controllers/admin/repos_groups.py:177
 #, python-format
 msgid "error occurred during update of repos group %s"
 msgstr "更新版本库组时发生错误 %s"
@@ @@ -653,53 +649,53 @@ msgid "User updated successfully" @@
 msgstr "用户更新成功"
 #: rhodecode/controllers/admin/users.py:207
 msgid "successfully deleted user"
 msgstr "用户删除成功"
 #: rhodecode/controllers/admin/users.py:212
 msgid "An error occurred during deletion of user"
 msgstr "删除用户时发生错误"
 #: rhodecode/controllers/admin/users.py:226
 msgid "You can't edit this user"
 msgstr "无法编辑该用户"
 #: rhodecode/controllers/admin/users.py:266
 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 "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
 msgid "An error occurred during permissions saving"
 msgstr "保存权限时发生错误"
 #: rhodecode/controllers/admin/users.py:303
 #, python-format
 msgid "Added email %s to user"
 msgstr "已为用户添加电子邮件 %s"
 #: rhodecode/controllers/admin/users.py:309
 msgid "An error occurred during email saving"
 msgstr "保存电子邮件时发生错误"
 #: rhodecode/controllers/admin/users.py:319
 msgid "Removed email from user"
 msgstr "成功删除用户电子邮件"
 #: rhodecode/controllers/admin/users_groups.py:84
 #, python-format
 msgid "created users group %s"
 msgstr "建立用户组 %s"
@@ @@ -715,53 +711,53 @@ msgstr "更新用户组 %s" @@
 #: rhodecode/controllers/admin/users_groups.py:157
 #, python-format
 msgid "error occurred during update of users group %s"
 msgstr "更新用户组 %s 时发生错误"
 #: rhodecode/controllers/admin/users_groups.py:174
 msgid "successfully deleted users group"
 msgstr "删除用户组成功"
 #: rhodecode/controllers/admin/users_groups.py:179
 msgid "An error occurred during deletion of users group"
 msgstr "删除用户组时发生错误"
 #: rhodecode/controllers/admin/users_groups.py:233
 msgid "Granted 'repository create' permission to users group"
 msgstr "已授予用户组‘创建版本库’的权限"
 #: rhodecode/controllers/admin/users_groups.py:238
 msgid "Revoked 'repository create' permission to users group"
 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"
 msgstr "必须是注册用户才能进行此操作"
 #: rhodecode/lib/auth.py:540
 msgid "You need to be a signed in to view this page"
 msgstr "必须登录才能访问该页面"
 #: rhodecode/lib/diffs.py:87
 msgid ""
 "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr "修订集因过大而被截断，可查看原始修订集作为替代"
 #: rhodecode/lib/diffs.py:97
 msgid "No changes detected"
 msgstr "未发现差异"
 #: rhodecode/lib/helpers.py:373
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr "%Y/%b/%d %H:%M:%S %a"
 #: rhodecode/lib/helpers.py:485
@@ @@ -774,78 +770,78 @@ msgstr "否" @@
 #: rhodecode/lib/helpers.py:533
 msgid "Changeset not found"
 msgstr "未找到修订集"
 #: rhodecode/lib/helpers.py:556
 #, python-format
 msgid "Show all combined changesets %s->%s"
 msgstr "显示合并的修订集 %s->%s"
 #: rhodecode/lib/helpers.py:562
 msgid "compare view"
 msgstr "比较显示"
 #: rhodecode/lib/helpers.py:582
 msgid "and"
 msgstr "还有"
 #: rhodecode/lib/helpers.py:583
 #, python-format
 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
 #: rhodecode/templates/pullrequests/pullrequest_show.html:12
 #, python-format
 msgid "Pull request #%s"
 msgstr "拉取请求 #%s"
 #: rhodecode/lib/helpers.py:627
 msgid "[deleted] repository"
 msgstr "[删除]版本库"
 #: rhodecode/lib/helpers.py:629 rhodecode/lib/helpers.py:639
 msgid "[created] repository"
 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"
 msgstr "[更新]版本库"
 #: rhodecode/lib/helpers.py:637
 msgid "[delete] repository"
 msgstr "[删除]版本库"
 #: rhodecode/lib/helpers.py:645
 msgid "[created] user"
 msgstr "[创建]用户"
 #: rhodecode/lib/helpers.py:647
 msgid "[updated] user"
 msgstr "[更新]用户"
 #: rhodecode/lib/helpers.py:649
 msgid "[created] users group"
 msgstr "[创建]用户组"
 #: rhodecode/lib/helpers.py:651
 msgid "[updated] users group"
 msgstr "[更新]用户组"
@@ @@ -983,53 +979,53 @@ msgid "Repositories Group read access" @@
 msgstr "版本库组读取权限"
 #: rhodecode/model/db.py:1171
 msgid "Repositories Group write access"
 msgstr "版本库组写入"
 #: rhodecode/model/db.py:1172
 msgid "Repositories Group admin access"
 msgstr "版本库组管理权限"
 #: rhodecode/model/db.py:1174
 msgid "RhodeCode Administrator"
 msgstr "RhodeCode 管理员"
 #: rhodecode/model/db.py:1175
 msgid "Repository creation disabled"
 msgstr "禁用创建版本库"
 #: rhodecode/model/db.py:1176
 msgid "Repository creation enabled"
 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"
 msgstr "禁用注册"
 #: rhodecode/model/db.py:1180
 msgid "Register new user with RhodeCode with manual activation"
 msgstr "用手动激活注册新用户"
 #: rhodecode/model/db.py:1183
 msgid "Register new user with RhodeCode with auto activation"
 msgstr "用自动激活注册新用户"
 #: rhodecode/model/db.py:1611
 msgid "Not Reviewed"
 msgstr "未检视"
 #: rhodecode/model/db.py:1612
 msgid "Approved"
 msgstr "已批准"
 #: rhodecode/model/db.py:1613
 msgid "Rejected"
 msgstr "驳回"
@@ @@ -1196,52 +1192,51 @@ msgstr "版本库名称不能为 %(repo)s" @@
 #, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr "已经存在版本库 %(repo)s"
 #: rhodecode/model/validators.py:317
 #, python-format
 msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
 msgstr "版本库组 \"%(group)s\" 中已经存在版本库 \"%(repo)s\""
 #: rhodecode/model/validators.py:319
 #, python-format
 msgid "Repositories group with name \"%(repo)s\" already exists"
 msgstr "已经存在名为 \"%(repo)s\" 的版本库组"
 #: rhodecode/model/validators.py:432
 msgid "invalid clone url"
 msgstr "无效的克隆地址"
 #: rhodecode/model/validators.py:433
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 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 "没有在这个组里面创建版本库的权限"
 #: rhodecode/model/validators.py:498
 msgid "This username or users group name is not valid"
 msgstr "用户或用户组名称无效"
 #: rhodecode/model/validators.py:582
 msgid "This is not a valid path"
 msgstr "不是一个合法的路径"
 #: rhodecode/model/validators.py:597
 msgid "This e-mail address is already taken"
 msgstr "该邮件地址已被使用"
 #: rhodecode/model/validators.py:617
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr "邮件地址  \"%(email)s\" 不存在"
 #: 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\""
@@ @@ -1296,163 +1291,163 @@ msgstr "组名" @@
 #: rhodecode/templates/admin/repos/repo_add_base.html:56
 #: rhodecode/templates/admin/repos/repo_edit.html:75
 #: rhodecode/templates/admin/repos/repos.html:72
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
 #: rhodecode/templates/forks/fork.html:59
 #: rhodecode/templates/settings/repo_settings.html:66
 #: rhodecode/templates/summary/summary.html:105
 msgid "Description"
 msgstr "描述"
 #: rhodecode/templates/index_base.html:40
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
 msgid "Repositories group"
 msgstr "版本库组"
 #: rhodecode/templates/index_base.html:70
 #: rhodecode/templates/index_base.html:166
 #: 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_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
 #: rhodecode/templates/branches/branches.html:51
 #: 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/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/tags/tags_data.html:6
 msgid "Name"
 msgstr "名称"
 #: rhodecode/templates/index_base.html:72
 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/admin/users/user_edit_my_account.html:183
 #: rhodecode/templates/journal/journal.html:188
 msgid "Tip"
 msgstr "Tip"
 #: rhodecode/templates/index_base.html:74
 #: rhodecode/templates/index_base.html:173
 #: 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/summary/summary.html:48
 #: rhodecode/templates/summary/summary.html:51
 msgid "RSS"
 msgstr "RSS"
 #: rhodecode/templates/index_base.html:76
 msgid "Atom"
 msgstr "Atom"
 #: 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
 msgid "Group Name"
 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
 #: rhodecode/templates/journal/journal.html:211
 #: rhodecode/templates/tags/tags.html:60
 msgid "Click to sort ascending"
 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
 #: rhodecode/templates/journal/journal.html:212
 #: rhodecode/templates/tags/tags.html:61
 msgid "Click to sort descending"
 msgstr "点击以降序排列"
 #: rhodecode/templates/index_base.html:169
 msgid "Last Change"
 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
 #: rhodecode/templates/journal/journal.html:213
 #: rhodecode/templates/tags/tags.html:62
 msgid "No records found."
 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
 #: rhodecode/templates/journal/journal.html:214
 #: rhodecode/templates/tags/tags.html:63
 msgid "Data error."
 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
 #: rhodecode/templates/journal/journal.html:215
 #: rhodecode/templates/tags/tags.html:64
 msgid "Loading..."
 msgstr "载入中..."
 #: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
 msgid "Sign In"
 msgstr "登录"
 #: rhodecode/templates/login.html:21
 msgid "Sign In to"
 msgstr "登录到"
 #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
 #: rhodecode/templates/admin/admin_log.html:5
 #: rhodecode/templates/admin/users/user_add.html:32
 #: rhodecode/templates/admin/users/user_edit.html:50
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
 #: rhodecode/templates/base/base.html:83
 #: rhodecode/templates/summary/summary.html:122
 msgid "Username"
@@ @@ -1762,49 +1757,49 @@ msgid "Repository permission" @@
 msgstr "版本库权限"
 #: rhodecode/templates/admin/permissions/permissions.html:49
 msgid ""
 "All default permissions on each repository will be reset to choosen "
 "permission, note that all custom default permission on repositories will be "
 "lost"
 msgstr ""
 "所有版本库的默认权限将被重置到选择的权限，所有版本库的自定义权限将被丢弃"
 #: rhodecode/templates/admin/permissions/permissions.html:50
 msgid "overwrite existing settings"
 msgstr "覆盖已有设置"
 #: rhodecode/templates/admin/permissions/permissions.html:55
 msgid "Registration"
 msgstr "注册"
 #: rhodecode/templates/admin/permissions/permissions.html:63
 msgid "Repository creation"
 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
 msgid "set"
 msgstr "设置"
 #: rhodecode/templates/admin/repos/repo_add.html:5
 #: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
 msgid "Add repository"
 msgstr "添加版本库"
 #: rhodecode/templates/admin/repos/repo_add.html:11
 #: rhodecode/templates/admin/repos/repo_edit.html:11
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
 msgid "Repositories"
 msgstr "版本库"
 #: rhodecode/templates/admin/repos/repo_add.html:13
 msgid "add new"
 msgstr "新建"
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
 #: rhodecode/templates/summary/summary.html:95
 #: rhodecode/templates/summary/summary.html:96
@@ @@ -1923,49 +1918,49 @@ msgstr "启用概况页的下载菜单" @@
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
 msgid "Enable locking"
 msgstr "启用锁定"
 #: rhodecode/templates/admin/repos/repo_edit.html:116
 msgid "Enable lock-by-pulling on repository."
 msgstr "启用版本库的拉取锁定"
 #: rhodecode/templates/admin/repos/repo_edit.html:126
 msgid "Change owner of this repository."
 msgstr "修改这个版本库的所有者"
 #: 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/users/user_edit_my_account_form.html:80
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:136
 #: rhodecode/templates/files/files_add.html:82
 #: rhodecode/templates/files/files_edit.html:68
-#: rhodecode/templates/pullrequests/pullrequest.html:124
+#: rhodecode/templates/pullrequests/pullrequest.html:122
 #: rhodecode/templates/settings/repo_settings.html:94
 msgid "Reset"
 msgstr "重置"
 #: rhodecode/templates/admin/repos/repo_edit.html:152
 msgid "Administration"
 msgstr "管理"
 #: rhodecode/templates/admin/repos/repo_edit.html:155
 msgid "Statistics"
 msgstr "统计"
 #: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Reset current statistics"
 msgstr "重置统计"
 #: rhodecode/templates/admin/repos/repo_edit.html:159
 msgid "Confirm to remove current statistics"
 msgstr "确认移除当前统计"
 #: rhodecode/templates/admin/repos/repo_edit.html:162
 msgid "Fetched to rev"
 msgstr "获取到修订"
@@ @@ -2038,53 +2033,53 @@ msgstr "解锁版本库" @@
 #: rhodecode/templates/admin/repos/repo_edit.html:234
 msgid "Confirm to unlock repository"
 msgstr "确认解锁版本库"
 #: rhodecode/templates/admin/repos/repo_edit.html:237
 msgid "lock repo"
 msgstr "锁定版本库"
 #: rhodecode/templates/admin/repos/repo_edit.html:237
 msgid "Confirm to lock repository"
 msgstr "确认锁定版本库"
 #: rhodecode/templates/admin/repos/repo_edit.html:238
 msgid "Repository is not locked"
 msgstr "版本库未锁定"
 #: rhodecode/templates/admin/repos/repo_edit.html:243
 msgid ""
 "Force locking on repository. Works only when anonymous access is disabled"
 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
 msgid "Delete"
 msgstr "删除"
 #: rhodecode/templates/admin/repos/repo_edit.html:269
 msgid "Remove this repository"
 msgstr "删除版本库"
 #: rhodecode/templates/admin/repos/repo_edit.html:269
 #: rhodecode/templates/journal/journal.html:84
 msgid "Confirm to delete this repository"
 msgstr "确认删除版本库"
 #: rhodecode/templates/admin/repos/repo_edit.html:273
 msgid ""
 "This repository will be renamed in a special way in order to be unaccesible "
 "for RhodeCode and VCS systems.\n"
 "                         If you need fully delete it from filesystem please "
 "do it manually"
 msgstr ""
 "这个版本库将以特殊的方式重命名这样 RhodeCode 和版本控制系统将不能访问它。\n"
 "                         如果需要从文件系统完全删除，你需要手动操作"
@@ @@ -2198,49 +2193,49 @@ msgid "with" @@
 msgstr "有"
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
 msgid "Add repos group"
 msgstr "添加版本库组"
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10
 msgid "Repos groups"
 msgstr "版本库组"
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12
 msgid "add new repos group"
 msgstr "添加新版本库组"
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
 msgid "Group parent"
 msgstr "上级组"
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
 #: 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 "保存"
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
 msgid "Edit repos group"
 msgstr "编辑版本库组"
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12
 msgid "edit repos group"
 msgstr "编辑版本库组"
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other "
 "groups and repositories inside"
 msgstr "启用组的拉取锁定。这个选项将应用到组内的其他组和版本库"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
 msgid "Repositories groups administration"
 msgstr "版本库管理员"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
 msgid "ADD NEW GROUP"
 msgstr "添加组"
@@ @@ -2553,59 +2548,59 @@ msgstr "新密码" @@
 msgid "New password confirmation"
 msgstr "确认新密码"
 #: rhodecode/templates/admin/users/user_edit.html:147
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 msgid "Inherit default permissions"
 msgstr "继承默认权限"
 #: rhodecode/templates/admin/users/user_edit.html:152
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
 "Select to inherit permissions from %s settings. With this selected below "
 "options does not have any action"
 msgstr "勾选以从 %s 继承权限设置。 勾选后下面的选项将不起作用"
 #: rhodecode/templates/admin/users/user_edit.html:158
 #: 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_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
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
 msgid "Nothing here yet"
 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 "权限"
 #: rhodecode/templates/admin/users/user_edit.html:194
 msgid "Edit Permission"
 msgstr "编辑权限"
 #: rhodecode/templates/admin/users/user_edit.html:243
 msgid "Email addresses"
 msgstr "邮件地址"
 #: rhodecode/templates/admin/users/user_edit.html:256
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr "确认删除邮件地址: %s"
 #: rhodecode/templates/admin/users/user_edit.html:270
 msgid "New email address"
 msgstr "增加邮件地址"
 #: rhodecode/templates/admin/users/user_edit.html:277
 msgid "Add"
 msgstr "增加"
@@ @@ -2862,97 +2857,95 @@ msgid "Changelog" @@
 msgstr "修订记录"
 #: rhodecode/templates/base/base.html:175
 #: rhodecode/templates/base/base.html:177
 #: rhodecode/templates/base/base.html:179
 msgid "Switch to"
 msgstr "切换到"
 #: rhodecode/templates/base/base.html:186
 #: rhodecode/templates/base/base.html:188
 #: rhodecode/templates/base/base.html:190
 #: rhodecode/templates/data_table/_dt_elements.html:31
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
 msgid "Files"
 msgstr "浏览"
 #: rhodecode/templates/base/base.html:195
 #: rhodecode/templates/base/base.html:199
 msgid "Options"
 msgstr "选项"
 #: rhodecode/templates/base/base.html:204
 #: rhodecode/templates/base/base.html:206
 #| msgid "Repository creation"
 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 "分支"
+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 "新建拉取请求"
 #: rhodecode/templates/base/base.html:214
 msgid "search"
 msgstr "搜索"
 #: rhodecode/templates/base/base.html:220
 #| msgid "unlock"
 msgid "lock"
 msgstr "锁定"
 #: rhodecode/templates/base/base.html:231
 msgid "repositories groups"
 msgstr "版本库组"
 #: rhodecode/templates/base/base.html:233
 msgid "users groups"
 msgstr "用户组"
 #: rhodecode/templates/base/base.html:234
 msgid "permissions"
 msgstr "权限"
 #: rhodecode/templates/base/base.html:236
 msgid "settings"
 msgstr "设置"
 #: rhodecode/templates/base/base.html:247
 #: rhodecode/templates/base/base.html:249
 msgid "Followers"
 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
 #: rhodecode/templates/base/base.html:340
 #: rhodecode/templates/search/search.html:52
 msgid "Search"
 msgstr "搜索"
 #: rhodecode/templates/base/root.html:42
 msgid "add another comment"
 msgstr "添加新的评论"
 #: rhodecode/templates/base/root.html:43
 #: rhodecode/templates/journal/journal.html:120
 #: rhodecode/templates/summary/summary.html:57
 msgid "Stop following this repository"
 msgstr "停止关注该版本库"
 #: rhodecode/templates/base/root.html:44
 #: rhodecode/templates/summary/summary.html:61
 msgid "Start following this repository"
 msgstr "开始关注该版本库"
 #: rhodecode/templates/base/root.html:45
@@ @@ -3007,80 +3000,81 @@ msgstr "日期" @@
 #: 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
 msgid "compare"
 msgstr "比较显示"
 #: rhodecode/templates/changelog/changelog.html:6
 #, python-format
 msgid "%s Changelog"
 msgstr "%s 修订记录"
 #: rhodecode/templates/changelog/changelog.html:15
 #, python-format
 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 "显示"
 #: rhodecode/templates/changelog/changelog.html:72
 #: rhodecode/templates/summary/summary.html:364
 msgid "show more"
 msgstr "显示更多"
 #: rhodecode/templates/changelog/changelog.html:76
 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/changeset/changeset_file_comment.html:20
 #: rhodecode/templates/changeset/changeset_range.html:46
 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 "点击建立相关的拉取请求"
 #: rhodecode/templates/changelog/changelog.html:102
 #: rhodecode/templates/changeset/changeset.html:78
 msgid "Parent"
 msgstr "父版本"
 #: rhodecode/templates/changelog/changelog.html:108
 #: rhodecode/templates/changeset/changeset.html:84
 msgid "No parents"
 msgstr "无父版本"
 #: rhodecode/templates/changelog/changelog.html:113
 #: rhodecode/templates/changeset/changeset.html:88
 msgid "merge"
 msgstr "合并"
 #: rhodecode/templates/changelog/changelog.html:116
 #: rhodecode/templates/changeset/changeset.html:91
 #: rhodecode/templates/files/files.html:29
 #: rhodecode/templates/files/files_add.html:33
 #: rhodecode/templates/files/files_edit.html:33
 #: rhodecode/templates/shortlog/shortlog_data.html:9
@@ @@ -3212,136 +3206,141 @@ msgstr "发表评论" @@
 #: rhodecode/templates/changeset/changeset_file_comment.html:124
 msgid "Check this to change current status of code-review for this changeset"
 msgstr "勾选以改变这个修订集的代码审查状态"
 #: rhodecode/templates/changeset/changeset_file_comment.html:124
 msgid "change status"
 msgstr "改变状态"
 #: rhodecode/templates/changeset/changeset_file_comment.html:140
 msgid "Comment and close"
 msgstr "评论并关闭"
 #: rhodecode/templates/changeset/changeset_range.html:5
 #, python-format
 msgid "%s Changesets"
 msgstr "%s 修订集"
 #: rhodecode/templates/changeset/changeset_range.html:29
 #: rhodecode/templates/compare/compare_diff.html:29
 msgid "Compare View"
 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 "影响文件"
 #: rhodecode/templates/changeset/diff_block.html:19
 msgid "diff"
 msgstr "差别"
 #: rhodecode/templates/changeset/diff_block.html:27
 msgid "show inline comments"
 msgstr "显示内嵌评论"
 #: rhodecode/templates/compare/compare_cs.html:5
 msgid "No changesets"
 msgstr "无修订"
 #: rhodecode/templates/compare/compare_diff.html:37
 msgid "Outgoing changesets"
 msgstr "传出修订集"
 #: rhodecode/templates/data_table/_dt_elements.html:39
 #: rhodecode/templates/data_table/_dt_elements.html:41
 #: rhodecode/templates/data_table/_dt_elements.html:43
 msgid "Fork"
-msgstr "分支"
+msgstr "复刻"
 #: rhodecode/templates/data_table/_dt_elements.html:60
 #: rhodecode/templates/journal/journal.html:126
 #: rhodecode/templates/summary/summary.html:68
 msgid "Mercurial repository"
 msgstr "Mercurial 版本库"
 #: rhodecode/templates/data_table/_dt_elements.html:62
 #: rhodecode/templates/journal/journal.html:128
 #: rhodecode/templates/summary/summary.html:71
 msgid "Git repository"
 msgstr "Git 版本库"
 #: rhodecode/templates/data_table/_dt_elements.html:69
 #: rhodecode/templates/journal/journal.html:134
 #: rhodecode/templates/summary/summary.html:78
 msgid "public repository"
 msgstr "公共版本库"
 #: rhodecode/templates/data_table/_dt_elements.html:80
 #: 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"
 msgstr "无修订"
 #: rhodecode/templates/data_table/_dt_elements.html:104
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr "确认删除用户: %s"
 #: rhodecode/templates/email_templates/main.html:8
 msgid "This is an notification from RhodeCode."
 msgstr "这是 RhodeCode 发送的一个通知。"
 #: rhodecode/templates/errors/error_document.html:46
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr "%1s 秒后你将重定向到 %2s"
 #: rhodecode/templates/files/file_diff.html:4
 #, python-format
 msgid "%s File diff"
 msgstr "%s 文件差异"
 #: rhodecode/templates/files/file_diff.html:12
 msgid "File diff"
 msgstr "文件差异"
 #: rhodecode/templates/files/files.html:4
 #: rhodecode/templates/files/files.html:72
 #, python-format
 msgid "%s files"
 msgstr "%s 文件"
 #: rhodecode/templates/files/files.html:12
 #: rhodecode/templates/summary/summary.html:340
 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
 msgid "%s Edit file"
 msgstr "%s 编辑文件"
 #: rhodecode/templates/files/files_add.html:19
 msgid "add file"
 msgstr "新建文件"
 #: rhodecode/templates/files/files_add.html:40
 msgid "Add new file"
 msgstr "新建文件"
 #: rhodecode/templates/files/files_add.html:45
 msgid "File Name"
 msgstr "文件名"
 #: rhodecode/templates/files/files_add.html:49
 #: rhodecode/templates/files/files_add.html:58
 msgid "or"
 msgstr "或者"
 #: rhodecode/templates/files/files_add.html:49
@@ @@ -3374,49 +3373,49 @@ msgstr "提交信息" @@
 msgid "Commit changes"
 msgstr "提交修改"
 #: rhodecode/templates/files/files_browser.html:13
 msgid "view"
 msgstr "显示"
 #: rhodecode/templates/files/files_browser.html:14
 msgid "previous revision"
 msgstr "上一个修订"
 #: rhodecode/templates/files/files_browser.html:16
 msgid "next revision"
 msgstr "下一个修订"
 #: rhodecode/templates/files/files_browser.html:23
 msgid "follow current branch"
 msgstr "沿着当前分支"
 #: rhodecode/templates/files/files_browser.html:27
 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 "新建文件"
 #: rhodecode/templates/files/files_browser.html:35
 msgid "Loading file list..."
 msgstr "加载文件列表..."
 #: rhodecode/templates/files/files_browser.html:48
 msgid "Size"
 msgstr "大小"
 #: rhodecode/templates/files/files_browser.html:49
 msgid "Mimetype"
 msgstr "MIME 类型"
 #: rhodecode/templates/files/files_browser.html:50
 msgid "Last Revision"
 msgstr "最后修订号"
 #: rhodecode/templates/files/files_browser.html:51
 msgid "Last modified"
 msgstr "最后修改于"
 #: rhodecode/templates/files/files_browser.html:52
@@ @@ -3461,137 +3460,133 @@ msgstr "比较差异" @@
 #: rhodecode/templates/files/files_source.html:10
 msgid "show at revision"
 msgstr "显示修订"
 #: rhodecode/templates/files/files_source.html:14
 #, python-format
 msgid "%s author"
 msgid_plural "%s authors"
 msgstr[0] "%s 个作者"
 #: rhodecode/templates/files/files_source.html:36
 msgid "show source"
 msgstr "显示代码"
 #: rhodecode/templates/files/files_source.html:59
 #, python-format
 msgid "Binary file (%s)"
 msgstr "二进制文件（%s）"
 #: rhodecode/templates/files/files_source.html:68
 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 "显示注释"
 #: rhodecode/templates/files/files_ypjax.html:15
 msgid "Go back"
 msgstr "返回"
 #: rhodecode/templates/files/files_ypjax.html:16
 msgid "No files at given path"
 msgstr "指定的路径中没有文件"
 #: rhodecode/templates/followers/followers.html:5
 #, python-format
 msgid "%s Followers"
 msgstr "%s 个关注者"
 #: rhodecode/templates/followers/followers.html:13
 msgid "followers"
 msgstr "关注者"
 #: rhodecode/templates/followers/followers_data.html:12
 msgid "Started following -"
 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"
 msgstr "私有"
 #: rhodecode/templates/forks/fork.html:77
 msgid "Copy permissions"
 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"
 msgstr "克隆后更新"
 #: rhodecode/templates/forks/fork.html:90
 msgid "Checkout source after making a clone"
 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"
 msgstr "订阅日志 ATOM"
 #: rhodecode/templates/journal/journal.html:14
 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 "刷新"
 #: rhodecode/templates/journal/journal.html:27
 #: rhodecode/templates/journal/public_journal.html:24
 msgid "RSS feed"
 msgstr "订阅 RSS"
 #: rhodecode/templates/journal/journal.html:30
 #: rhodecode/templates/journal/public_journal.html:27
 msgid "ATOM feed"
 msgstr "订阅 ATOM"
 #: rhodecode/templates/journal/journal.html:41
 msgid "Watched"
 msgstr "关注的"
 #: rhodecode/templates/journal/journal.html:46
 msgid "ADD"
 msgstr "新建版本库"
 #: rhodecode/templates/journal/journal.html:114
 msgid "following user"
 msgstr "关注用户"
@@ @@ -3604,126 +3599,131 @@ msgstr "用户" @@
 msgid "You are not following any users or repositories"
 msgstr "未关注任何用户或版本库"
 #: rhodecode/templates/journal/journal_data.html:47
 msgid "No entries yet"
 msgstr "没有条目"
 #: rhodecode/templates/journal/public_journal.html:13
 msgid "ATOM public journal feed"
 msgstr "订阅公共日志 ATOM"
 #: rhodecode/templates/journal/public_journal.html:14
 msgid "RSS public journal feed"
 msgstr "订阅公共日志 RSS"
 #: rhodecode/templates/journal/public_journal.html:21
 msgid "Public Journal"
 msgstr "公共日志"
 #: rhodecode/templates/pullrequests/pullrequest.html:4
 #: rhodecode/templates/pullrequests/pullrequest.html:12
 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 "发送拉取请求"
 #: rhodecode/templates/pullrequests/pullrequest_show.html:23
 #, python-format
 msgid "Closed %s"
 msgstr "关闭于 %s"
 #: rhodecode/templates/pullrequests/pullrequest_show.html:23
 #, python-format
 msgid "with status %s"
 msgstr "状态%s"
 #: rhodecode/templates/pullrequests/pullrequest_show.html:31
 msgid "Status"
 msgstr "状态"
 #: rhodecode/templates/pullrequests/pullrequest_show.html:36
 msgid "Pull request status"
 msgstr "拉取请求状态"
 #: rhodecode/templates/pullrequests/pullrequest_show.html:44
 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 "传入修订集"
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
 msgid "all pull requests"
 msgstr "所有拉取请求"
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
 msgid "All pull requests"
 msgstr "所有拉取请求"
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:27
 msgid "Closed"
 msgstr "已关闭"
 #: rhodecode/templates/search/search.html:6
 #, python-format
 msgid "Search \"%s\" in repository: %s"
 msgstr "搜索 \"%s\" 于版本库 %s 中"
 #: rhodecode/templates/search/search.html:8
 #, python-format
 msgid "Search \"%s\" in all repositories"
 msgstr "在所有的版本库中搜索  \"%s\""
@@ @@ -3762,61 +3762,61 @@ msgstr "文件名" @@
 #: rhodecode/templates/search/search_commit.html:35
 #: rhodecode/templates/search/search_content.html:21
 #: rhodecode/templates/search/search_path.html:15
 msgid "Permission denied"
 msgstr "权限不足"
 #: rhodecode/templates/settings/repo_settings.html:5
 #, python-format
 msgid "%s Settings"
 msgstr "%s 设置"
 #: rhodecode/templates/shortlog/shortlog.html:5
 #, python-format
 msgid "%s Shortlog"
 msgstr "%s 简短日志"
 #: rhodecode/templates/shortlog/shortlog.html:14
 msgid "shortlog"
 msgstr "简短日志"
 #: rhodecode/templates/shortlog/shortlog_data.html:7
 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 "现有版本库？"
 #: rhodecode/templates/summary/summary.html:4
 #, python-format
 msgid "%s Summary"
 msgstr "%s 概要"
 #: rhodecode/templates/summary/summary.html:12
 msgid "summary"
 msgstr "概要"
 #: rhodecode/templates/summary/summary.html:20
 #, python-format
 msgid "repo %s ATOM feed"
 msgstr "订阅 ATOM %s"
 #: rhodecode/templates/summary/summary.html:21
 #, python-format
 msgid "repo %s RSS feed"
 msgstr "订阅 RSS %s"
 #: rhodecode/templates/summary/summary.html:49
 #: rhodecode/templates/summary/summary.html:52
@@ @@ -3931,27 +3931,24 @@ msgstr "文件已更改" @@
 #: rhodecode/templates/summary/summary.html:653
 msgid "files removed"
 msgstr "文件已删除"
 #: rhodecode/templates/summary/summary.html:656
 msgid "commit"
 msgstr "提交"
 #: rhodecode/templates/summary/summary.html:657
 msgid "file added"
 msgstr "文件已添加"
 #: rhodecode/templates/summary/summary.html:658
 msgid "file changed"
 msgstr "文件已更改"
 #: rhodecode/templates/summary/summary.html:659
 msgid "file removed"
 msgstr "文件已删除"
 #: rhodecode/templates/tags/tags.html:5
 #, python-format
 msgid "%s Tags"
 msgstr "%s 标签"
 #~ msgid "Groups"
 #~ msgstr "组"

0 comments (0 inline, 0 general)