kallithea Changeset - 0497d9d9e0c8

Changeset - 0497d9d9e0c8

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

xpol - 13 years ago 2012-10-16 05:39:47

Grafted from: 696cddb408bf

[zhCN] Update, bug fixes and enhance to the zhCN translation.

2 files changed with 107 insertions and 90 deletions:

rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo

bin+mod

rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po

107

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"
+"Project-Id-Version: RhodeCode 1.4.4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2012-10-02 13:34+0800\n"
 "PO-Revision-Date: 2012-10-02 13:44+0800\n"
 "POT-Creation-Date: 2012-10-16 10:48+0800\n"
 "PO-Revision-Date: 2012-10-16 11:36+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-Generator: Poedit 1.5.4\n"
 "X-Poedit-Basepath: ../../../..\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
+#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:74
 msgid "binary file"
 msgstr "二进制文件"
 #: rhodecode/controllers/changeset.py:381
-#: rhodecode/controllers/pullrequests.py:376
+#: rhodecode/controllers/pullrequests.py:383
 #, python-format
 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/compare.py:73
 #: 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 "由于错误的语法，服务器无法对请求进行响应。"
@@ @@ -179,125 +180,125 @@ msgstr "分支" @@
 #: 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 "
 "以重新扫描版本库"
 "版本库%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 以重新扫描版本库"
 " 版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以"
 "重新扫描版本库"
 #: rhodecode/controllers/forks.py:168
 #, python-format
 msgid "forked %s repository as %s"
 msgstr "版本库 %s 被复刻到 %s"
 #: rhodecode/controllers/forks.py:182
 #, python-format
 msgid "An error occurred during repository forking %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"
+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:75 rhodecode/model/scm.py:549
 msgid "Bookmarks"
 msgstr "书签"
-#: rhodecode/controllers/pullrequests.py:182
+#: rhodecode/controllers/pullrequests.py:183
 msgid "Pull request requires a title with min. 3 chars"
 msgstr "拉取请求的标题至少 3 个字符"
-#: rhodecode/controllers/pullrequests.py:184
+#: rhodecode/controllers/pullrequests.py:185
 msgid "error during creation of pull request"
 msgstr "提交拉取请求时发生错误"
-#: rhodecode/controllers/pullrequests.py:205
+#: rhodecode/controllers/pullrequests.py:206
 msgid "Successfully opened new pull request"
 msgstr "成功提交拉取请求"
-#: rhodecode/controllers/pullrequests.py:208
+#: rhodecode/controllers/pullrequests.py:209
 msgid "Error occurred during sending pull request"
 msgstr "提交拉取请求时发生错误"
-#: rhodecode/controllers/pullrequests.py:241
+#: rhodecode/controllers/pullrequests.py:242
 msgid "Successfully deleted pull request"
 msgstr "成功删除拉取请求"
-#: rhodecode/controllers/search.py:132
+#: rhodecode/controllers/search.py:134
 msgid "Invalid search query. Try quoting it."
 msgstr "错误的搜索。请尝试用引号包含它。"
-#: rhodecode/controllers/search.py:137
+#: rhodecode/controllers/search.py:139
 msgid "There is no index to search in. Please run whoosh indexer"
 msgstr "没有索引用于搜索。请运行 whoosh 索引器"
-#: rhodecode/controllers/search.py:141
+#: rhodecode/controllers/search.py:143
 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
 msgid "error occurred during update of repository %s"
 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 "
 "以重新扫描版本库"
 "版本库%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"
@@ @@ -565,79 +566,79 @@ msgstr "不能删除包含子组的组" @@
 #, python-format
 msgid "error occurred during deletion of repos group %s"
 msgstr "删除版本库组时发生错误 %s"
 #: rhodecode/controllers/admin/repos_groups.py:240
 msgid "An error occurred during deletion of group user"
 msgstr "删除组用户时发生错误"
 #: rhodecode/controllers/admin/repos_groups.py:261
 msgid "An error occurred during deletion of group users groups"
 msgstr "删除版本库组的用户组时发生错误"
-#: rhodecode/controllers/admin/settings.py:122
+#: rhodecode/controllers/admin/settings.py:123
 #, python-format
 msgid "Repositories successfully rescanned added: %s,removed: %s"
 msgstr "重新扫描版本库成功，增加 %s， 移除 %s"
-#: rhodecode/controllers/admin/settings.py:130
+#: rhodecode/controllers/admin/settings.py:131
 msgid "Whoosh reindex task scheduled"
 msgstr "Whoosh 重新索引任务调度"
-#: rhodecode/controllers/admin/settings.py:161
+#: rhodecode/controllers/admin/settings.py:162
 msgid "Updated application settings"
 msgstr "更新应用设置"
 #: rhodecode/controllers/admin/settings.py:165
 #: rhodecode/controllers/admin/settings.py:293
 #: rhodecode/controllers/admin/settings.py:166
 #: rhodecode/controllers/admin/settings.py:294
 msgid "error occurred during updating application settings"
 msgstr "更新设置时发生错误"
-#: rhodecode/controllers/admin/settings.py:201
+#: rhodecode/controllers/admin/settings.py:202
 msgid "Updated visualisation settings"
 msgstr "成功更新可视化设置"
-#: rhodecode/controllers/admin/settings.py:206
+#: rhodecode/controllers/admin/settings.py:207
 msgid "error occurred during updating visualisation settings"
 msgstr "更新可视化设置时发生错误"
-#: rhodecode/controllers/admin/settings.py:289
+#: rhodecode/controllers/admin/settings.py:290
 msgid "Updated VCS settings"
 msgstr "成功更新版本控制系统设置"
-#: rhodecode/controllers/admin/settings.py:303
+#: rhodecode/controllers/admin/settings.py:304
 msgid "Added new hook"
 msgstr "新建钩子"
-#: rhodecode/controllers/admin/settings.py:315
+#: rhodecode/controllers/admin/settings.py:316
 msgid "Updated hooks"
 msgstr "更新钩子"
-#: rhodecode/controllers/admin/settings.py:319
+#: rhodecode/controllers/admin/settings.py:320
 msgid "error occurred during hook creation"
 msgstr "创建钩子时发生错误"
-#: rhodecode/controllers/admin/settings.py:338
+#: rhodecode/controllers/admin/settings.py:339
 msgid "Email task created"
 msgstr "已创建电子邮件任务"
-#: rhodecode/controllers/admin/settings.py:393
+#: rhodecode/controllers/admin/settings.py:394
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法编辑该用户"
-#: rhodecode/controllers/admin/settings.py:424
+#: rhodecode/controllers/admin/settings.py:425
 msgid "Your account was updated successfully"
 msgstr "你的帐号已经更新完成"
-#: rhodecode/controllers/admin/settings.py:439
+#: rhodecode/controllers/admin/settings.py:440
 #: rhodecode/controllers/admin/users.py:191
 #, python-format
 msgid "error occurred during update of user %s"
 msgstr "更新用户 %s 时发生错误"
 #: rhodecode/controllers/admin/users.py:130
 #, python-format
 msgid "created user %s"
 msgstr "创建用户 %s"
 #: rhodecode/controllers/admin/users.py:142
 #, python-format
@@ @@ -737,37 +738,37 @@ msgstr "已授予用户组‘复刻版本库’的权限" @@
 #: rhodecode/controllers/admin/users_groups.py:249
 msgid "Revoked 'repository fork' permission to users group"
 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
+#: 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:97
+#: rhodecode/lib/diffs.py:100
 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"
+msgstr "%Y/%m/%d %H:%M:%S"
 #: rhodecode/lib/helpers.py:485
 msgid "True"
 msgstr "是"
 #: rhodecode/lib/helpers.py:489
 msgid "False"
 msgstr "否"
 #: rhodecode/lib/helpers.py:533
 msgid "Changeset not found"
 msgstr "未找到修订集"
@@ @@ -786,27 +787,29 @@ 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:49
 msgid "revisions"
 msgstr "修订"
 #: rhodecode/lib/helpers.py:607
 msgid "fork name "
 msgstr "复刻名称"
 #: rhodecode/lib/helpers.py:608
 #, python-format
 #| msgid "fork name "
 msgid "fork name %s"
 msgstr "复刻名称%s"
 #: 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 "[删除]版本库"
@@ @@ -882,71 +885,83 @@ msgstr "[开始关注]版本库" @@
 msgid "[stopped following] repository"
 msgstr "[停止关注]版本库"
 #: rhodecode/lib/helpers.py:845
 #, python-format
 msgid " and %s more"
 msgstr "还有 %s 个"
 #: rhodecode/lib/helpers.py:849
 msgid "No Files"
 msgstr "没有文件"
-#: rhodecode/lib/utils2.py:352
+#: rhodecode/lib/utils2.py:357
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d 年"
-#: rhodecode/lib/utils2.py:353
+#: rhodecode/lib/utils2.py:358
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d 月"
-#: rhodecode/lib/utils2.py:354
+#: rhodecode/lib/utils2.py:359
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
-#: rhodecode/lib/utils2.py:355
+#: rhodecode/lib/utils2.py:360
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小时"
 #: rhodecode/lib/utils2.py:356
 msgstr[0] "%d时"
 #: rhodecode/lib/utils2.py:361
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分钟"
 #: rhodecode/lib/utils2.py:357
 msgstr[0] "%d分"
 #: rhodecode/lib/utils2.py:362
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 #: rhodecode/lib/utils2.py:372
 #: rhodecode/lib/utils2.py:378
 #, python-format
 #| msgid "on line %s"
 msgid "in %s"
 msgstr "%s前"
 #: rhodecode/lib/utils2.py:380
 #, python-format
 msgid "%s ago"
 msgstr "%s 之前"
 #: rhodecode/lib/utils2.py:374
 msgstr "%s前"
 #: rhodecode/lib/utils2.py:382
 #, python-format
 #| msgid "%s and %s ago"
 msgid "in %s and %s"
 msgstr "%s%s前"
 #: rhodecode/lib/utils2.py:385
 #, python-format
 msgid "%s and %s ago"
 msgstr "%s 零 %s 之前"
 #: rhodecode/lib/utils2.py:377
 msgstr "%s%s前"
 #: rhodecode/lib/utils2.py:388
 msgid "just now"
 msgstr "刚才"
 #: rhodecode/lib/celerylib/tasks.py:269
 msgid "password reset link"
 msgstr "密码重置链接"
 #: rhodecode/model/comment.py:110
 #, python-format
 msgid "on line %s"
 msgstr "在 %s 行"
@@ @@ -1074,47 +1089,46 @@ msgstr "创建新的拉取请求" @@
 #: rhodecode/model/notification.py:225
 msgid "commented on pull request"
 msgstr "评论了拉取请求"
 #: rhodecode/model/pull_request.py:89
 #, python-format
 msgid "%(user)s wants you to review pull request #%(pr_id)s"
 msgstr "%(user)s 想要你检视拉取请求 #%(pr_id)s"
 #: rhodecode/model/scm.py:535
 msgid "latest tip"
-msgstr "最后 tip 版本"
+msgstr "最新tip版本"
 #: rhodecode/model/user.py:230
 msgid "new user registration"
 msgstr "[RhodeCode] 新用户注册"
 #: rhodecode/model/user.py:255 rhodecode/model/user.py:277
 #: rhodecode/model/user.py:299
 msgid "You can't Edit this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法编辑该用户"
 #: rhodecode/model/user.py:323
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr "由于是系统帐号，无法删除该用户"
 #: rhodecode/model/user.py:329
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch owners "
 "or remove those repositories. %s"
 msgstr ""
 "由于用户 \"%s\" 拥有版本库 %s 因而无法删除，请修改版本库所有者或删除版本"
 "库。%s"
 "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s"
 #: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37
 msgid "Value cannot be an empty list"
 msgstr "值不能为空"
 #: rhodecode/model/validators.py:83
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr "用户名称 %(username)s 已经存在"
 #: rhodecode/model/validators.py:85
 #, python-format
@@ @@ -1837,25 +1851,25 @@ msgstr "要创建的版本库类型" @@
 #: rhodecode/templates/admin/repos/repo_add_base.html:47
 #: rhodecode/templates/admin/repos/repo_edit.html:66
 #: rhodecode/templates/forks/fork.html:41
 #: rhodecode/templates/settings/repo_settings.html:57
 msgid "Landing revision"
 msgstr "默认修订"
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
 #: rhodecode/templates/admin/repos/repo_edit.html:70
 #: rhodecode/templates/forks/fork.html:45
 #: rhodecode/templates/settings/repo_settings.html:61
 msgid "Default revision for files page, downloads, whoosh and readme"
-msgstr "文件浏览、下载、whoosh和readme的默认修订版本"
+msgstr "文件浏览、下载、whoosh和README的默认修订版本"
 #: rhodecode/templates/admin/repos/repo_add_base.html:60
 #: rhodecode/templates/admin/repos/repo_edit.html:79
 #: rhodecode/templates/forks/fork.html:63
 #: rhodecode/templates/settings/repo_settings.html:70
 msgid ""
 "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr "保持简短。用 README 文件来写更长的描述。"
 #: rhodecode/templates/admin/repos/repo_add_base.html:69
 #: rhodecode/templates/admin/repos/repo_edit.html:89
 #: rhodecode/templates/forks/fork.html:72
@@ @@ -2252,25 +2266,25 @@ msgstr "操作" @@
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
 #: rhodecode/templates/admin/users/user_edit.html:255
 #: rhodecode/templates/admin/users_groups/users_groups.html:44
 #: rhodecode/templates/data_table/_dt_elements.html:7
 #: rhodecode/templates/data_table/_dt_elements.html:103
 msgid "delete"
 msgstr "删除"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54
 #, python-format
 msgid "Confirm to delete this group: %s"
-msgstr "确认删除该版本库组: %s"
+msgstr "确认删除该版本库组：%s"
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:62
 msgid "There are no repositories groups yet"
 msgstr "没有版本库组"
 #: rhodecode/templates/admin/settings/hooks.html:5
 #: rhodecode/templates/admin/settings/settings.html:5
 msgid "Settings administration"
 msgstr "系统设置"
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
@@ @@ -2395,26 +2409,26 @@ msgstr "版本控制系统设置" @@
 msgid "Web"
 msgstr "网络"
 #: rhodecode/templates/admin/settings/settings.html:190
 msgid "require ssl for vcs operations"
 msgstr "要求使用 SSL进行版本控制系统操作"
 #: rhodecode/templates/admin/settings/settings.html:192
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it will "
 "return HTTP Error 406: Not Acceptable"
 msgstr ""
 "勾选后 RhodeCode 将要求使用 SSL 进行推送和拉取。如果没有使用 SSL 将返回 HTTP "
 "406错误：Not Acceptable"
 "勾选后RhodeCode将要求使用SSL进行推送和拉取。如果没有使用SSL将返回HTTP 406错"
 "误：Not Acceptable"
 #: rhodecode/templates/admin/settings/settings.html:198
 msgid "Hooks"
 msgstr "钩子"
 #: rhodecode/templates/admin/settings/settings.html:203
 msgid "Update repository after push (hg update)"
 msgstr "推送后更新版本库（hg update）"
 #: rhodecode/templates/admin/settings/settings.html:207
 msgid "Show repository size after push"
 msgstr "推送后显示版本库大小"
@@ @@ -2585,29 +2599,29 @@ 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"
+msgstr "确认删除邮箱：%s"
 #: rhodecode/templates/admin/users/user_edit.html:270
 msgid "New email address"
-msgstr "增加邮件地址"
+msgstr "增加邮箱"
 #: rhodecode/templates/admin/users/user_edit.html:277
 msgid "Add"
 msgstr "增加"
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
 #: rhodecode/templates/base/base.html:124
 msgid "My account"
 msgstr "我的账户"
 #: rhodecode/templates/admin/users/user_edit_my_account.html:9
 msgid "My Account"
@@ @@ -2663,25 +2677,25 @@ msgstr "拉取请求 #%s 由 %s 创建于 %s" @@
 msgid "Revision"
 msgstr "修订"
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
 #: rhodecode/templates/journal/journal.html:81
 msgid "private"
 msgstr "私有"
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
 #: rhodecode/templates/data_table/_dt_elements.html:7
 #, python-format
 msgid "Confirm to delete this repository: %s"
-msgstr "确认删除版本库: %s"
+msgstr "确认删除版本库：%s"
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
 #: rhodecode/templates/journal/journal.html:94
 msgid "No repositories yet"
 msgstr "没有任何版本库"
 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
 #: rhodecode/templates/journal/journal.html:96
 msgid "create one now"
 msgstr "创建一个"
 #: rhodecode/templates/admin/users/users.html:5
@@ @@ -2779,25 +2793,25 @@ msgstr "添加新用户组" @@
 #: rhodecode/templates/admin/users_groups/users_groups.html:32
 msgid "group name"
 msgstr "组名"
 #: rhodecode/templates/admin/users_groups/users_groups.html:33
 #: rhodecode/templates/base/root.html:46
 msgid "members"
 msgstr "成员"
 #: rhodecode/templates/admin/users_groups/users_groups.html:45
 #, python-format
 msgid "Confirm to delete this users group: %s"
-msgstr "确认删除该组: %s"
+msgstr "确认删除该组：%s"
 #: rhodecode/templates/base/base.html:41
 msgid "Submit a bug"
 msgstr "提交 bug"
 #: rhodecode/templates/base/base.html:77
 msgid "Login to your account"
 msgstr "登录"
 #: rhodecode/templates/base/base.html:100
 msgid "Forgot password ?"
 msgstr "忘记密码？"
@@ @@ -3010,25 +3024,25 @@ msgstr "修订" @@
 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 个版本"
+msgstr[0] "显示%d/%d个版本"
 #: 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:38
 #: rhodecode/templates/forks/forks_data.html:21
 msgid "Compare fork"
 msgstr "比较复刻"
@@ @@ -3060,50 +3074,54 @@ 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
 #: rhodecode/templates/changeset/changeset_range.html:79
 msgid "merge"
 msgstr "合并"
 #: rhodecode/templates/changelog/changelog.html:116
 #: rhodecode/templates/changeset/changeset.html:91
 #: 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
 #: rhodecode/templates/shortlog/shortlog_data.html:9
 msgid "branch"
 msgstr "分支"
 #: rhodecode/templates/changelog/changelog.html:122
 #: rhodecode/templates/changeset/changeset_range.html:88
 msgid "bookmark"
 msgstr "书签"
 #: rhodecode/templates/changelog/changelog.html:128
 #: rhodecode/templates/changeset/changeset.html:96
 #: rhodecode/templates/changeset/changeset_range.html:94
 msgid "tag"
 msgstr "标签"
 #: rhodecode/templates/changelog/changelog.html:164
 msgid "Show selected changes __S -> __E"
 msgstr "显示选定的修订集 __S -> __E"
 #: rhodecode/templates/changelog/changelog.html:255
 msgstr "显示选定的修订集：__S -> __E"
 #: rhodecode/templates/changelog/changelog.html:256
 msgid "There are no changes yet"
 msgstr "没有任何变更"
 #: rhodecode/templates/changelog/changelog_details.html:4
 #: rhodecode/templates/changeset/changeset.html:66
 msgid "removed"
 msgstr "移除"
 #: rhodecode/templates/changelog/changelog_details.html:5
 #: rhodecode/templates/changeset/changeset.html:67
 msgid "changed"
 msgstr "修改"
@@ @@ -3150,25 +3168,25 @@ msgid_plural "%d comments" @@
 msgstr[0] "%d 条评论"
 #: rhodecode/templates/changeset/changeset.html:48
 #: rhodecode/templates/changeset/changeset_file_comment.html:82
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] "(%d 内嵌)"
 #: rhodecode/templates/changeset/changeset.html:103
 #, python-format
 msgid "%s files affected with %s insertions and %s deletions:"
-msgstr "%s 个文件受影响包括 %s 行插入和 %s 行删除："
+msgstr "%s个文件受影响%s行插入和%s行删除："
 #: rhodecode/templates/changeset/changeset_file_comment.html:42
 msgid "Submitting..."
 msgstr "提交中……"
 #: rhodecode/templates/changeset/changeset_file_comment.html:45
 msgid "Commenting on line {1}."
 msgstr "在 {1} 行上评论"
 #: rhodecode/templates/changeset/changeset_file_comment.html:46
 #: rhodecode/templates/changeset/changeset_file_comment.html:121
 #, python-format
@@ @@ -3180,25 +3198,25 @@ msgstr "评论使用 %s 语法并支持 %s" @@
 msgid ""
 "Use @username inside this text to send notification to this RhodeCode user"
 msgstr "在文本中使用 @用户名 以发送通知到该 RhodeCode 用户"
 #: rhodecode/templates/changeset/changeset_file_comment.html:59
 #: rhodecode/templates/changeset/changeset_file_comment.html:138
 msgid "Comment"
 msgstr "评论"
 #: rhodecode/templates/changeset/changeset_file_comment.html:60
 #: rhodecode/templates/changeset/changeset_file_comment.html:71
 msgid "Hide"
-msgstr "影藏"
+msgstr "隐藏"
 #: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "You need to be logged in to comment."
 msgstr "必须登录才能评论"
 #: rhodecode/templates/changeset/changeset_file_comment.html:67
 msgid "Login now"
 msgstr "现在登陆"
 #: rhodecode/templates/changeset/changeset_file_comment.html:118
 msgid "Leave a comment"
 msgstr "发表评论"
@@ @@ -3275,34 +3293,34 @@ msgstr "公共版本库" @@
 #: rhodecode/templates/summary/summary.html:87
 #: rhodecode/templates/summary/summary.html:88
 msgid "Fork of"
 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"
+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"
+msgstr "重定向到%s，于%s秒后"
 #: 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
@@ @@ -3655,25 +3673,25 @@ msgstr "标题" @@
 #: rhodecode/templates/pullrequests/pullrequest.html:113
 msgid "description"
 msgstr "描述"
 #: 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"
+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"
@@ @@ -3681,31 +3699,30 @@ msgstr "拉取请求状态" @@
 #: rhodecode/templates/pullrequests/pullrequest_show.html:44
 msgid "Still not reviewed by"
 msgstr "还未检视的检视人员"
 #: 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: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"
 msgstr "创建于"
 #: rhodecode/templates/pullrequests/pullrequest_show.html:65
 msgid "Compare view"
 msgstr "比较显示"
 #: rhodecode/templates/pullrequests/pullrequest_show.html:69
 msgid "Incoming changesets"
 msgstr "传入修订集"
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
 msgid "all pull requests"
 msgstr "所有拉取请求"
@@ @@ -3784,29 +3801,29 @@ msgid "age" @@
 msgstr "时间"
 #: rhodecode/templates/shortlog/shortlog_data.html:33
 msgid "No commit message"
 msgstr "没有提交信息"
 #: rhodecode/templates/shortlog/shortlog_data.html:77
 msgid "Add or upload files directly via RhodeCode"
 msgstr "通过 RhodeCode 直接添加或者上传文件"
 #: rhodecode/templates/shortlog/shortlog_data.html:86
 msgid "Push new repo"
-msgstr "Push 新版本库"
+msgstr "推送新版本库"
 #: rhodecode/templates/shortlog/shortlog_data.html:94
 msgid "Existing repository?"
-msgstr "现有版本库？"
+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
@@ @@ -3841,25 +3858,25 @@ msgid "Contact" @@
 msgstr "联系方式"
 #: rhodecode/templates/summary/summary.html:130
 msgid "Clone url"
 msgstr "克隆地址"
 #: rhodecode/templates/summary/summary.html:133
 msgid "Show by Name"
 msgstr "以名字显示"
 #: rhodecode/templates/summary/summary.html:134
 msgid "Show by ID"
-msgstr "以 ID 显示"
+msgstr "按ID显示"
 #: rhodecode/templates/summary/summary.html:142
 msgid "Trending files"
 msgstr "文件趋势图"
 #: rhodecode/templates/summary/summary.html:150
 #: rhodecode/templates/summary/summary.html:166
 #: rhodecode/templates/summary/summary.html:194
 msgid "enable"
 msgstr "启用"
 #: rhodecode/templates/summary/summary.html:158
@@ @@ -3867,63 +3884,63 @@ msgid "Download" @@
 msgstr "下载"
 #: rhodecode/templates/summary/summary.html:162
 msgid "There are no downloads yet"
 msgstr "无下载"
 #: rhodecode/templates/summary/summary.html:164
 msgid "Downloads are disabled for this repository"
 msgstr "这个版本库的下载已经禁用"
 #: rhodecode/templates/summary/summary.html:170
 msgid "Download as zip"
-msgstr "下载 zip 包"
+msgstr "zip打包下载"
 #: rhodecode/templates/summary/summary.html:173
 msgid "Check this to download archive with subrepos"
 msgstr "勾选以下载包含子版本库的压缩包"
 #: rhodecode/templates/summary/summary.html:173
 msgid "with subrepos"
 msgstr "包括子版本库"
 #: rhodecode/templates/summary/summary.html:186
 msgid "Commit activity by day / author"
 msgstr "按日期或作者的提交活动"
 #: rhodecode/templates/summary/summary.html:197
 msgid "Stats gathered: "
-msgstr "已收集的统计: "
+msgstr "已收集的统计："
 #: rhodecode/templates/summary/summary.html:218
 msgid "Shortlog"
 msgstr "简短日志"
 #: rhodecode/templates/summary/summary.html:220
 msgid "Quick start"
 msgstr "快速入门"
 #: rhodecode/templates/summary/summary.html:233
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr "修订 '%s' 中的README"
 #: rhodecode/templates/summary/summary.html:236
 msgid "Permalink to this readme"
-msgstr "这个 README 的固定链接"
+msgstr "这个README的永久链接"
 #: rhodecode/templates/summary/summary.html:293
 #, python-format
 msgid "Download %s as %s"
-msgstr "下载 %s 作为 %s"
+msgstr "下载%s为%s包"
 #: rhodecode/templates/summary/summary.html:650
 msgid "commits"
 msgstr "提交"
 #: rhodecode/templates/summary/summary.html:651
 msgid "files added"
 msgstr "文件已添加"
 #: rhodecode/templates/summary/summary.html:652
 msgid "files changed"
 msgstr "文件已更改"

0 comments (0 inline, 0 general)