Git 的中文本地化更新（新增29条翻译）

[Jiang Xin]

Hi all，

Git 的中文本地化更新将发到此论坛求审核。版本库地址：

 * https://github.com/gotgit/git-po-zh_CN/commits/master

待审核提交补丁文件（无关信息已裁剪）如下：

commit 006080154bc5608141b82624b3d86b0bc9c15f52

Author: Jiang Xin <worldhe...@gmail.com>

Date:   Wed Jul 4 17:20:34 2012 +0800

    l10n: zh_CN.po: translate 29 new messages

    

    Translate 29 new messages came from git.pot update in 11b9017

    (l10n: Update git.pot (29 new messages))

    

    Signed-off-by: Jiang Xin <worldhe...@gmail.com>

diff --git a/po/zh_CN.po b/po/zh_CN.po

index b46b53e..b3e1a54 100644

--- a/po/zh_CN.po

+++ b/po/zh_CN.po

@@ -2,8 +2,8 @@ msgid ""

 msgstr ""

 "Project-Id-Version: Git\n"

 "Report-Msgid-Bugs-To: Git Mailing List <g...@vger.kernel.org>\n"

-"POT-Creation-Date: 2012-06-08 10:20+0800\n"

-"PO-Revision-Date: 2012-06-08 12:24+0800\n"

+"POT-Creation-Date: 2012-07-03 10:23+0800\n"

+"PO-Revision-Date: 2012-07-04 22:38+0800\n"

 "Last-Translator: Jiang Xin <worldhe...@gmail.com>\n"

 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"

 "Language: zh_CN\n"

@@ -45,6 +45,9 @@ msgid_plural "The bundle contains %d refs"

 msgstr[0] "这个包中含有 %d 个引用"

 msgstr[1] "这个包中含有 %d 个引用"

 

+msgid "The bundle records a complete history."

+msgstr "这个包记录一个完整历史。"

+

 msgid "The bundle requires this ref"

 msgid_plural "The bundle requires these %d refs"

 msgstr[0] "这个包需要这个引用"

@@ -457,9 +460,15 @@ msgstr "  （使用 \"git reset %s <file>...\" 撤出暂存区）"

 msgid "  (use \"git rm --cached <file>...\" to unstage)"

 msgstr "  （使用 \"git rm --cached <file>...\" 撤出暂存区）"

 

+msgid "  (use \"git add <file>...\" to mark resolution)"

+msgstr "  （使用 \"git add <file>...\" 标记解决方案）"

+

 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"

 msgstr "  （酌情使用 \"git add/rm <file>...\" 标记解决方案）"

 

+msgid "  (use \"git rm <file>...\" to mark resolution)"

+msgstr "  （使用 \"git rm <file>...\" 标记解决方案）"

+

 msgid "Changes to be committed:"

 msgstr "要提交的变更："

 

@@ -545,6 +554,77 @@ msgstr "未合并：    %s"

 msgid "bug: unhandled diff status %c"

 msgstr "bug：未处理的差异状态 %c"

 

+msgid "You have unmerged paths."

+msgstr "您有路径尚未合并。"

+

+msgid "  (fix conflicts and run \"git commit\")"

+msgstr "  （解决冲突并运行 \"git commit\"）"

+

+msgid "All conflicts fixed but you are still merging."

+msgstr "所有冲突已解决但您仍处于合并中。"

+

+msgid "  (use \"git commit\" to conclude merge)"

+msgstr "  （使用 \"git commit\" 结束合并）"

+

+msgid "You are in the middle of an am session."

+msgstr "您正处于一个 am 过程中。"

+

+msgid "The current patch is empty."

+msgstr "当前的补丁为空。"

+

+msgid "  (fix conflicts and then run \"git am --resolved\")"

+msgstr "  （解决冲突，然后运行 \"git am --resolved\"）"

+

+msgid "  (use \"git am --skip\" to skip this patch)"

+msgstr "  （使用 \"git am --skip\" 跳过此补丁）"

+

+msgid "  (use \"git am --abort\" to restore the original branch)"

+msgstr "  （使用 \"git am --abort\" 恢复原有分支）"

+

+msgid "You are currently rebasing."

+msgstr "您正在变基。"

+

+msgid "  (fix conflicts and then run \"git rebase --continue\")"

+msgstr "  （解决冲突，然后运行 \"git rebase --continue\"）"

+

+msgid "  (use \"git rebase --skip\" to skip this patch)"

+msgstr "  （使用 \"git rebase --skip\" 跳过此补丁）"

+

+msgid "  (use \"git rebase --abort\" to check out the original branch)"

+msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"

+

+msgid "  (all conflicts fixed: run \"git rebase --continue\")"

+msgstr "  （所有冲突已解决：运行 \"git rebase --continue\"）"

+

+msgid "You are currently splitting a commit during a rebase."

+msgstr "您正在变基过程中拆分一个提交。"

+

+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"

+msgstr "  （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"

+

+msgid "You are currently editing a commit during a rebase."

+msgstr "您正在变基过程中编辑一个提交。"

+

+msgid "  (use \"git commit --amend\" to amend the current commit)"

+msgstr "  （使用 \"git commit --amend\" 修补当前提交）"

+

+msgid ""

+"  (use \"git rebase --continue\" once you are satisfied with your changes)"

+msgstr ""

+"  （执行 \"git rebase --continue\" 一旦您满意您的修改）"

+

+msgid "You are currently cherry-picking."

+msgstr "您正在做拣选操作。"

+

+msgid "  (all conflicts fixed: run \"git commit\")"

+msgstr "  （解决所有冲突后，执行 \"git commit\"）"

+

+msgid "You are currently bisecting."

+msgstr "您正在做二分查找。"

+

+msgid "  (use \"git bisect reset\" to get back to the original branch)"

+msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"

+

 msgid "On branch "

 msgstr "位于分支 "

 

@@ -2012,12 +2092,15 @@ msgstr[1] "包文件过早结束，缺少 %lu 字节"

 msgid "serious inflate inconsistency"

 msgstr "解压缩严重的不一致"

 

-msgid "cannot read existing object %s"

-msgstr "不能读取现存对象 %s"

-

 msgid "SHA1 COLLISION FOUND WITH %s !"

 msgstr "发现 %s 出现 SHA1 冲突！"

 

+msgid "unable to read %s"

+msgstr "不能读 %s"

+

+msgid "cannot read existing object %s"

+msgstr "不能读取现存对象 %s"

+

 msgid "invalid blob object %s"

 msgstr "无效的 blob 对象 %s"

 

@@ -2048,6 +2131,9 @@ msgstr "不能枚举包文件状态"

 msgid "pack has junk at the end"

 msgstr "包的结尾有垃圾数据"

 

+msgid "confusion beyond insanity in parse_pack_objects()"

+msgstr "parse_pack_objects() 中遇到不可理喻的问题"

+

 msgid "Resolving deltas"

 msgstr "处理 delta 中"

 

@@ -2582,6 +2668,9 @@ msgstr "对象 %s 没有注解\n"

 msgid "Unknown subcommand: %s"

 msgstr "未知子命令：%s"

 

+msgid "deflate error (%d)"

+msgstr "压缩错误 (%d)"

+

 msgid "unsupported index version %s"

 msgstr "不支持的索引版本 %s"

 

@@ -3274,8 +3363,7 @@ msgstr "您需要先设置你的提交者信息"

 msgid ""

 "You seem to have moved HEAD since the last 'am' failure.\n"

 "Not rewinding to ORIG_HEAD"

-msgstr ""

-"您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"

+msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"

 

 msgid ""

 "When you have resolved this problem run \"$cmdline --resolved\".\n"

@@ -3362,8 +3450,7 @@ msgstr ""

 msgid ""

 "You still have unmerged paths in your index\n"

 "did you forget to use 'git add'?"

-msgstr ""

-"您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"

+msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'？"

 

 msgid "No changes -- Patch already applied."

 msgstr "没有变更 -- 补丁已经应用过。"

--

Jiang Xin