l10n: zh_CN: review for git v2.11.0 l10n

Signed-off-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c38326c6f106f65b6abd9ab7ff47f12c6dd0b432..4f5c3ab9aebbc2377eb6d7361ffd3d27e6e3fd48 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -136,7 +136,7 @@ msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 "POT-Creation-Date: 2016-11-25 22:50+0800\n"
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 "POT-Creation-Date: 2016-11-25 22:50+0800\n"

-"PO-Revision-Date: 2016-11-25 22:54+0800\n"
+"PO-Revision-Date: 2017-01-02 20:11+0800\n"

 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 "Language: zh_CN\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 "Language: zh_CN\n"


@@ -404,7 +404,7 @@ msgstr "缺失 '%s' 的二进制补丁数据"
 #: apply.c:3098
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 #: apply.c:3098
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

-msgstr "不能反向应用一个没有至 '%s' 的反向数据块的二进制补丁"
+msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"

 
 #: apply.c:3144
 #, c-format
 
 #: apply.c:3144
 #, c-format


@@ -415,12 +415,12 @@ msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."

-msgstr "è¡¥ä¸\81å¼\95ç\94¨å\88° '%s' (%s)，但是和当前内容不匹配。"
+msgstr "è¡¥ä¸\81åº\94ç\94¨å\88° '%s'ï¼\88%sï¼\89，但是和当前内容不匹配。"

 
 #: apply.c:3162
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 
 #: apply.c:3162
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"

-msgstr "补丁应用到空文件 '%s'，但是它并不空"
+msgstr "补丁应用到空文件 '%s'，但其并非空文件"

 
 #: apply.c:3180
 #, c-format
 
 #: apply.c:3180
 #, c-format


@@ -563,7 +563,7 @@ msgstr "子模组 %s 的 sha1 信息缺失或无效"
 #: apply.c:4082
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 #: apply.c:4082
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"

-msgstr "%s 的属性改变，但它不再当前 HEAD 中"
+msgstr "%s 的模式被改变，但它不在当前 HEAD 中"

 
 #: apply.c:4085
 #, c-format
 
 #: apply.c:4085
 #, c-format


@@ -1309,9 +1309,9 @@ msgid ""
 "You may want to amend it after fixing the message, or set the config\n"
 "variable i18n.commitencoding to the encoding your project uses.\n"
 msgstr ""
 "You may want to amend it after fixing the message, or set the config\n"
 "variable i18n.commitencoding to the encoding your project uses.\n"
 msgstr ""

-"警告：提交说明不符合 UTF-8 字符集。\n"
+"警告：提交说明不符合 UTF-8 字符编码。\n"

 "您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"
 "您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"

-"设置为您项目所用的字符集。\n"
+"设置为您项目所用的字符编码。\n"

 
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"


@@ -1440,7 +1440,7 @@ msgstr "不能取消设置 '%s'"
 
 #: connect.c:49
 msgid "The remote end hung up upon initial contact"
 
 #: connect.c:49
 msgid "The remote end hung up upon initial contact"

-msgstr "远端在初始连接时即挂断"
+msgstr "远端在连接发起时即挂断"

 
 #: connect.c:51
 msgid ""
 
 #: connect.c:51
 msgid ""


@@ -1644,7 +1644,7 @@ msgstr "因为文件太多，只在修改的路径中查找拷贝。"
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."

-msgstr "您可能想要将您的 %s 变量至少设置为 %d 并重复此命令。"
+msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"

 
 #: dir.c:1866
 msgid "failed to get kernel name and information"
 
 #: dir.c:1866
 msgid "failed to get kernel name and information"


@@ -1732,7 +1732,7 @@ msgstr "标记 %s 为完成"
 #: fetch-pack.c:697
 #, c-format
 msgid "already have %s (%s)"
 #: fetch-pack.c:697
 #, c-format
 msgid "already have %s (%s)"

-msgstr "已经有 %s (%s)"
+msgstr "已经有 %s（%s）"

 
 #: fetch-pack.c:735
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 
 #: fetch-pack.c:735
 msgid "fetch-pack: unable to fork off sideband demultiplexer"


@@ -2215,9 +2215,9 @@ msgid ""
 "Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
 "commit/abort the previous merge before you start a new notes merge."
 msgstr ""
 "Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
 "commit/abort the previous merge before you start a new notes merge."
 msgstr ""

-"您尚未结束您前一次注释合并（存在 %s）。\n"
-"请您在开始一个新的注释合并之前，使用 'git notes merge --commit' 或者 'git "
-"notes merge --abort' 来提交/终止前一次合并。"
+"您的前一次注释合并尚未结束（存在 %s）。\n"
+"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 "
+"'git notes merge --abort' 来提交/终止前一次合并。"

 
 #: notes-merge.c:280
 #, c-format
 
 #: notes-merge.c:280
 #, c-format


@@ -2340,7 +2340,7 @@ msgid ""
 "empty strings as pathspecs will be made invalid in upcoming releases. please "
 "use . instead if you meant to match all paths"
 msgstr ""
 "empty strings as pathspecs will be made invalid in upcoming releases. please "
 "use . instead if you meant to match all paths"
 msgstr ""

-"在即将到来的版本，不能再使用空字符串作为路径表达式。如果要匹配所有路径，\n"
+"在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n"

 "请代之以 ."
 
 #: pathspec.c:440
 "请代之以 ."
 
 #: pathspec.c:440


@@ -2771,7 +2771,7 @@ msgstr "不能解析 HEAD 提交\n"
 
 #: sequencer.c:438
 msgid "unable to update cache tree\n"
 
 #: sequencer.c:438
 msgid "unable to update cache tree\n"

-msgstr "不能更新缓存\n"
+msgstr "不能更新缓存树\n"

 
 #: sequencer.c:483
 #, c-format
 
 #: sequencer.c:483
 #, c-format


@@ -2789,11 +2789,11 @@ msgid ""
 "\n"
 "  git rebase --continue\n"
 msgstr ""
 "\n"
 "  git rebase --continue\n"
 msgstr ""

-"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交，执行：\n"
+"您的工作区中存在已暂存的修改\n如果这些修改需要被并入前一个提交，执行：\n"

 "\n"
 "  git commit --amend %s\n"
 "\n"
 "\n"
 "  git commit --amend %s\n"
 "\n"

-"如果这些变更要形成一个新提交，执行：\n"
+"如果这些修改要形成一个新提交，执行：\n"

 "\n"
 "  git commit %s\n"
 "\n"
 "\n"
 "  git commit %s\n"
 "\n"


@@ -2883,7 +2883,7 @@ msgstr "不能读取 '%s'。"
 #: sequencer.c:972
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 #: sequencer.c:972
 #, c-format
 msgid "unusable instruction sheet: '%s'"

-msgstr "无用的指令清单：'%s'"
+msgstr "不可用的指令清单：'%s'"

 
 #: sequencer.c:983
 msgid "cannot cherry-pick during a revert."
 
 #: sequencer.c:983
 msgid "cannot cherry-pick during a revert."


@@ -3088,7 +3088,7 @@ msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
 #: sha1_name.c:407
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 #: sha1_name.c:407
 #, c-format
 msgid "short SHA1 %s is ambiguous"

-msgstr "歧义的短 SHA1 %s"
+msgstr "短 SHA1 %s 存在歧义"

 
 #: sha1_name.c:418
 msgid "The candidates are:"
 
 #: sha1_name.c:418
 msgid "The candidates are:"


@@ -3260,7 +3260,7 @@ msgstr "太短的树对象"
 
 #: tree-walk.c:37
 msgid "malformed mode in tree entry"
 
 #: tree-walk.c:37
 msgid "malformed mode in tree entry"

-msgstr "树对象中的条目属性错误"
+msgstr "树对象中的条目模式错误"

 
 #: tree-walk.c:41
 msgid "empty filename in tree entry"
 
 #: tree-walk.c:41
 msgid "empty filename in tree entry"


@@ -4043,7 +4043,7 @@ msgstr "不能%s：您有未暂存的变更。"
 
 #: wt-status.c:2276
 msgid "additionally, your index contains uncommitted changes."
 
 #: wt-status.c:2276
 msgid "additionally, your index contains uncommitted changes."

-msgstr "而且您的索引中包含未提交的变更。"
+msgstr "另外，您的索引中包含未提交的变更。"

 
 #: wt-status.c:2278
 #, c-format
 
 #: wt-status.c:2278
 #, c-format


@@ -4778,7 +4778,7 @@ msgstr "在 %2$s 中无此路径 %1$s"
 #: builtin/blame.c:2854
 #, c-format
 msgid "cannot read blob %s for path %s"
 #: builtin/blame.c:2854
 #, c-format
 msgid "cannot read blob %s for path %s"

-msgstr "不能为路径 %2$s 读取对象 %1$s"
+msgstr "不能为路径 %2$s 读取数据对象 %1$s"

 
 #: builtin/blame.c:2873
 #, c-format
 
 #: builtin/blame.c:2873
 #, c-format


@@ -7749,7 +7749,7 @@ msgstr "手工维护参见 \"git help gc\"。\n"
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""

-"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"
+"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"

 
 #: builtin/gc.c:441
 msgid ""
 
 #: builtin/gc.c:441
 msgid ""


@@ -9240,7 +9240,7 @@ msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
 
 #: builtin/merge.c:652
 msgid "Not handling anything other than two heads merge."
 
 #: builtin/merge.c:652
 msgid "Not handling anything other than two heads merge."

-msgstr "不能处理两个头合并之外的任何操作。"
+msgstr "未处理两个头合并之外的任何操作。"

 
 #: builtin/merge.c:666
 #, c-format
 
 #: builtin/merge.c:666
 #, c-format


@@ -10904,10 +10904,10 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 "默认禁止删除当前分支，因为下一次 'git clone' 将不会检出任何文件，\n"
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 "默认禁止删除当前分支，因为下一次 'git clone' 将不会检出任何文件，\n"

-"导致混淆。\n"
+"导致困惑。\n"

 "\n"
 "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
 "\n"
 "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"

-"'warn' 或 'ignore' 以允许删除当前分支，显示或者不显示警告。\n"
+"'warn'（显示警告信息）或 'ignore'（忽略警告信息）以允许删除当前分支。\n"

 "\n"
 "若要屏蔽此信息，您可以设置它为 'refuse'。"
 
 "\n"
 "若要屏蔽此信息，您可以设置它为 'refuse'。"
 


@@ -12124,7 +12124,7 @@ msgstr "'%s' 不是一个有效的引用。"
 #: builtin/show-branch.c:836
 #, c-format
 msgid "cannot find commit %s (%s)"
 #: builtin/show-branch.c:836
 #, c-format
 msgid "cannot find commit %s (%s)"

-msgstr "不能找到提交 %s (%s)"
+msgstr "不能找到提交 %s（%s）"

 
 #: builtin/show-ref.c:10
 msgid ""
 
 #: builtin/show-ref.c:10
 msgid ""


@@ -12286,7 +12286,7 @@ msgstr "浅克隆的深度"
 
 #: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
 msgid "force cloning progress"
 
 #: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
 msgid "force cloning progress"

-msgstr "显示克隆进度"
+msgstr "强制显示克隆进度"

 
 #: builtin/submodule--helper.c:613
 msgid ""
 
 #: builtin/submodule--helper.c:613
 msgid ""


@@ -12964,7 +12964,7 @@ msgstr "不能创建目录 '%s'"
 #: builtin/worktree.c:272
 #, c-format
 msgid "Preparing %s (identifier %s)"
 #: builtin/worktree.c:272
 #, c-format
 msgid "Preparing %s (identifier %s)"

-msgstr "准备 %s （标识符 %s）"
+msgstr "准备 %s（标识符 %s）"

 
 #: builtin/worktree.c:323
 msgid "checkout <branch> even if already checked out in other worktree"
 
 #: builtin/worktree.c:323
 msgid "checkout <branch> even if already checked out in other worktree"


@@ -13058,7 +13058,7 @@ msgid ""
 "\n"
 "\tchmod 0700 %s"
 msgstr ""
 "\n"
 "\tchmod 0700 %s"
 msgstr ""

-"您 socket 目录权限过于放松，其他用户可能会读取您缓存的认证信息。考虑执行：\n"
+"您的 socket 目录权限过于宽松，其他用户可能会读取您缓存的认证信息。考虑执行：\n"

 "\n"
 "\tchmod 0700 %s"
 
 "\n"
 "\tchmod 0700 %s"
 


@@ -14280,8 +14280,7 @@ msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'."
 msgstr ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'."
 msgstr ""

-"您可以用命令 'git rebase --edit-todo' 修正然后执行命令 'git rebase --"
-"continue'。"
+"您可以用 'git rebase --edit-todo' 修正问题然后执行 'git rebase --continue'。"

 
 #: git-rebase--interactive.sh:1045
 msgid "Or you can abort the rebase with 'git rebase --abort'."
 
 #: git-rebase--interactive.sh:1045
 msgid "Or you can abort the rebase with 'git rebase --abort'."