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

@@ @@ -6,18 +6,19 @@ @@
 # 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"
@@ @@ -37,12 +38,12 @@ 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"
@@ @@ -53,7 +54,7 @@ msgid "" @@
 "allowed"
 msgstr "不允许修改已关闭拉取请求的修订集状态"
-#: rhodecode/controllers/compare.py:72
+#: rhodecode/controllers/compare.py:73
 #: rhodecode/controllers/pullrequests.py:114
 msgid "There are no changesets yet"
 msgstr "还没有修订集"
@@ @@ -188,8 +189,8 @@ 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
@@ @@ -197,8 +198,8 @@ 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
@@ @@ -221,7 +222,7 @@ 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"
 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 "在搜索操作中发生异常"
@@ @@ -287,8 +288,8 @@ 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
@@ @@ -574,61 +575,61 @@ msgstr "删除组用户时发生错误" @@
 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"
@@ @@ -746,19 +747,19 @@ msgstr "必须是注册用户才能进行此操作" @@
 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"
@@ @@ -795,9 +796,11 @@ msgstr "%s 个" @@
 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
@@ @@ -891,53 +894,65 @@ msgstr "还有 %s 个" @@
 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 "刚才"
@@ @@ -1083,7 +1098,7 @@ 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"
@@ @@ -1104,8 +1119,7 @@ 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"
@@ @@ -1846,7 +1860,7 @@ msgstr "默认修订" @@
 #: 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
@@ @@ -2261,7 +2275,7 @@ 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"
@@ @@ -2404,8 +2418,8 @@ 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"
@@ @@ -2594,11 +2608,11 @@ 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"
@@ @@ -2672,7 +2686,7 @@ msgstr "私有" @@
 #: 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
@@ @@ -2788,7 +2802,7 @@ 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"
@@ @@ -3019,7 +3033,7 @@ msgstr "%s 修订记录" @@
 #, 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
@@ @@ -3069,11 +3083,13 @@ 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
@@ @@ -3082,19 +3098,21 @@ 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 "没有任何变更"
@@ @@ -3159,7 +3177,7 @@ 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..."
@@ @@ -3189,7 +3207,7 @@ 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."
@@ @@ -3284,7 +3302,7 @@ 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."
@@ @@ -3293,7 +3311,7 @@ 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
@@ @@ -3664,7 +3682,7 @@ 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
@@ @@ -3690,13 +3708,12 @@ 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"
 #: 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
@@ @@ -3850,7 +3867,7 @@ msgstr "以名字显示" @@
 #: rhodecode/templates/summary/summary.html:134
 msgid "Show by ID"
-msgstr "以 ID 显示"
+msgstr "按ID显示"
 #: rhodecode/templates/summary/summary.html:142
 msgid "Trending files"
@@ @@ -3876,7 +3893,7 @@ 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"
@@ @@ -3892,7 +3909,7 @@ msgstr "按日期或作者的提交活动" @@
 #: rhodecode/templates/summary/summary.html:197
 msgid "Stats gathered: "
-msgstr "已收集的统计: "
+msgstr "已收集的统计："
 #: rhodecode/templates/summary/summary.html:218
 msgid "Shortlog"
@@ @@ -3909,12 +3926,12 @@ 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"

0 comments (0 inline, 0 general)