Merge branch 'rt/cherry-revert-conflict-summary'

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 713542fdcd22bd459cc6043a2dbe358724ab1ea0..64747394807b169e6dc9f64e101a03ee659c8075 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2012-03-08 10:19+0800\n"
+"POT-Creation-Date: 2012-03-16 20:18+0800\n"
 "PO-Revision-Date: 2012-01-30 00:00+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
@@ -70,13 +70,13 @@ msgstr "无法写入 rev-list：%s"
 msgid "failed to close rev-list's stdin: %s"
 msgstr "无法关闭 rev-list 的标准输入：%s"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: diff.c:105
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%.*s'\n"
 msgstr "  无法解析 dirstat 阈值 '%.*s'\n"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: diff.c:110
 #, c-format
 msgid "  Unknown dirstat parameter '%.*s'\n"
@@ -88,12 +88,12 @@ msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr ""
-"配置变量 'diff.dirstat' 出错：\n"
+"发现配置变量 'diff.dirstat' 中的错误：\n"
 "%s"
 
 #: diff.c:1336
 msgid " 0 files changed\n"
-msgstr "0 个文件被修改\n"
+msgstr " 0 个文件被修改\n"
 
 #: diff.c:1340
 #, c-format
@@ -169,7 +169,7 @@ msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "您的分支落后 '%s' 共 %d 个提交，且可以快进。\n"
+msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
 
 #: remote.c:1621
 #, c-format
@@ -187,13 +187,13 @@ msgstr[0] ""
 #: builtin/merge.c:1095 builtin/merge.c:1105
 #, c-format
 msgid "Could not open '%s' for writing"
-msgstr "无法打开 '%s' 以写入"
+msgstr "不能为写入打开 '%s'"
 
 #: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867
 #: builtin/merge.c:1097 builtin/merge.c:1110
 #, c-format
 msgid "Could not write to '%s'"
-msgstr "无法写入 '%s'"
+msgstr "不能写入 '%s'"
 
 #: sequencer.c:143
 msgid ""
@@ -238,11 +238,11 @@ msgstr "提交您的修改或保存进度后再继续。"
 #: sequencer.c:232
 #, c-format
 msgid "%s: Unable to write new index file"
-msgstr "%s：无法写入新暂存区文件"
+msgstr "%s：无法写入新索引文件"
 
 #: sequencer.c:298
 msgid "Your index file is unmerged."
-msgstr "您的暂存区文件未完成合并。"
+msgstr "您的索引文件未完成合并。"
 
 #: sequencer.c:301
 msgid "You do not have a valid HEAD"
@@ -261,7 +261,7 @@ msgstr "提交 %s 没有父提交 %d"
 #: sequencer.c:328
 #, c-format
 msgid "Mainline was specified but commit %s is not a merge."
-msgstr "æ\8f\90ä¾\9b了主线但提交 %s 不是一个合并。"
+msgstr "æ\8c\87å®\9a了主线但提交 %s 不是一个合并。"
 
 #. TRANSLATORS: The first %s will be "revert" or
 #. "cherry-pick", the second %s a SHA1
@@ -298,26 +298,26 @@ msgstr "提供了空的提交集"
 #: sequencer.c:461
 #, c-format
 msgid "git %s: failed to read the index"
-msgstr "git %s: 无法读取暂存区"
+msgstr "git %s：无法读取索引"
 
 #: sequencer.c:466
 #, c-format
 msgid "git %s: failed to refresh the index"
-msgstr "git %s: 无法刷新暂存区"
+msgstr "git %s：无法刷新索引"
 
 #: sequencer.c:551
 #, c-format
 msgid "Cannot %s during a %s"
-msgstr "无法 %s 在 %s 过程中"
+msgstr "无法 %s 在一个 %s 过程中"
 
 #: sequencer.c:573
 #, c-format
 msgid "Could not parse line %d."
-msgstr "无法解析第 %d 行。"
+msgstr "不能解析第 %d 行。"
 
 #: sequencer.c:578
 msgid "No commits parsed."
-msgstr "æ\9cª有提交被解析。"
+msgstr "没有提交被解析。"
 
 #: sequencer.c:591
 #, c-format
@@ -360,7 +360,7 @@ msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
 #: sequencer.c:671
 #, c-format
 msgid "Could not create sequencer directory %s"
-msgstr "无法创建序列目录 %s"
+msgstr "不能创建序列目录 %s"
 
 #: sequencer.c:687 sequencer.c:772
 #, c-format
@@ -377,7 +377,7 @@ msgstr "不能解析 HEAD"
 
 #: sequencer.c:710
 msgid "cannot abort from a branch yet to be born"
-msgstr "不能从未初始分支终止"
+msgstr "不能从尚未建立的分支终止"
 
 #: sequencer.c:732
 #, c-format
@@ -396,7 +396,7 @@ msgstr "未预期的文件结束"
 #: sequencer.c:742
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "保存预拣选提交的 HEAD 文件 '%s' 损坏"
+msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
 
 #: sequencer.c:765
 #, c-format
@@ -415,18 +415,18 @@ msgstr "不能拣选到空分支"
 msgid "Unmerged paths:"
 msgstr "未合并的路径："
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: wt-status.c:140 wt-status.c:157
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  （使用 \"git reset %s <file>...\" 撤出暂存区）"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: wt-status.c:142 wt-status.c:159
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  （使用 \"git rm --cached <file>...\" 撤出暂存区）"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: wt-status.c:143
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  （酌情使用 \"git add/rm <file>...\" 标记解决方案）"
@@ -437,25 +437,25 @@ msgstr "要提交的变更："
 
 #: wt-status.c:169
 msgid "Changes not staged for commit:"
-msgstr "未暂存至提交的变更："
+msgstr "尚未暂存以备提交的变更："
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: wt-status.c:173
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add <file>...\" 更新要提交的内容）"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: wt-status.c:175
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add/rm <file>...\" 更新要提交的内容）"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: wt-status.c:176
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr "  （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: wt-status.c:178
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  （提交或丢弃子模组中未跟踪或修改的内容）"
@@ -465,11 +465,11 @@ msgstr "  （提交或丢弃子模组中未跟踪或修改的内容）"
 msgid "%s files:"
 msgstr "%s文件："
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: wt-status.c:190
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  （使用 \"git %s <file>...\" 包含到提交列表）"
+msgstr "  （使用 \"git %s <file>...\" 以包含要提交的内容）"
 
 #: wt-status.c:207
 msgid "bug"
@@ -503,61 +503,64 @@ msgstr "双方添加："
 msgid "both modified:"
 msgstr "双方修改："
 
+#  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 #: wt-status.c:248
 msgid "new commits, "
 msgstr "新提交, "
 
+#  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 #: wt-status.c:250
 msgid "modified content, "
 msgstr "修改的内容, "
 
+#  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 #: wt-status.c:252
 msgid "untracked content, "
 msgstr "未跟踪的内容, "
 
-#  为保证在输出中对齐，注意调整句中空格！
+#  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:266
 #, c-format
 msgid "new file:   %s"
 msgstr "新文件：    %s"
 
-#  为保证在输出中对齐，注意调整句中空格！
+#  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:269
 #, c-format
 msgid "copied:     %s -> %s"
 msgstr "拷贝：      %s -> %s"
 
-#  为保证在输出中对齐，注意调整句中空格！
+#  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:272
 #, c-format
 msgid "deleted:    %s"
 msgstr "删除：      %s"
 
-#  为保证在输出中对齐，注意调整句中空格！
+#  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:275
 #, c-format
 msgid "modified:   %s"
 msgstr "修改：      %s"
 
-#  为保证在输出中对齐，注意调整句中空格！
+#  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:278
 #, c-format
 msgid "renamed:    %s -> %s"
 msgstr "重命名：    %s -> %s"
 
-#  为保证在输出中对齐，注意调整句中空格！
+#  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:281
 #, c-format
 msgid "typechange: %s"
 msgstr "类型变更：  %s"
 
-#  为保证在输出中对齐，注意调整句中空格！
+#  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:284
 #, c-format
 msgid "unknown:    %s"
 msgstr "未知：      %s"
 
-#  为保证在输出中对齐，注意调整句中空格！
+#  译者：为保证在输出中对齐，注意调整句中空格！
 #: wt-status.c:287
 #, c-format
 msgid "unmerged:   %s"
@@ -566,7 +569,7 @@ msgstr "未合并：    %s"
 #: wt-status.c:290
 #, c-format
 msgid "bug: unhandled diff status %c"
-msgstr "bug: 未处理的差异状态 %c"
+msgstr "bug：未处理的差异状态 %c"
 
 #: wt-status.c:713
 msgid "On branch "
@@ -593,10 +596,10 @@ msgstr "忽略的"
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"
 
-#  注意保持前导空格
+#  译者：中文字符串拼接，可删除前导空格
 #: wt-status.c:751
 msgid " (use -u option to show untracked files)"
-msgstr " （使用 -u 参数显示未跟踪的文件）"
+msgstr "（使用 -u 参数显示未跟踪的文件）"
 
 #: wt-status.c:757
 msgid "No changes"
@@ -607,61 +610,61 @@ msgstr "没有修改"
 msgid "no changes added to commit%s\n"
 msgstr "修改尚未加入提交%s\n"
 
-#  注意保持前导空格
+#  译者：中文字符串拼接，可删除前导空格
 #: wt-status.c:763
 msgid " (use \"git add\" and/or \"git commit -a\")"
-msgstr " （使用 \"git add\" 和/或 \"git commit -a\"）"
+msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）"
 
 #: wt-status.c:765
 #, c-format
 msgid "nothing added to commit but untracked files present%s\n"
 msgstr "空提交但存在未跟踪文件%s\n"
 
-#  注意保持前导空格
+#  译者：中文字符串拼接，可删除前导空格
 #: wt-status.c:767
 msgid " (use \"git add\" to track)"
-msgstr " （使用 \"git add\" 建立跟踪）"
+msgstr "（使用 \"git add\" 建立跟踪）"
 
 #: wt-status.c:769 wt-status.c:772 wt-status.c:775
 #, c-format
 msgid "nothing to commit%s\n"
 msgstr "无须提交%s\n"
 
-#  注意保持前导空格
+#  译者：中文字符串拼接，可删除前导空格
 #: wt-status.c:770
 msgid " (create/copy files and use \"git add\" to track)"
-msgstr " （新建/拷贝的文件使用 \"git add\" 建立跟踪）"
+msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）"
 
-#  注意保持前导空格
+#  译者：中文字符串拼接，可删除前导空格
 #: wt-status.c:773
 msgid " (use -u to show untracked files)"
-msgstr " （使用 -u 显示未跟踪文件）"
+msgstr "（使用 -u 显示未跟踪文件）"
 
-#  注意保持前导空格
+#  译者：中文字符串拼接，可删除前导空格
 #: wt-status.c:776
 msgid " (working directory clean)"
-msgstr " （干净的工作区）"
+msgstr "（干净的工作区）"
 
 #: wt-status.c:884
 msgid "HEAD (no branch)"
 msgstr "HEAD（非分支）"
 
-#  注意保持句尾空格
+#  译者：注意保持句尾空格
 #: wt-status.c:890
 msgid "Initial commit on "
 msgstr "初始提交于 "
 
-#  注意保持句尾空格
+#  译者：注意保持句尾空格
 #: wt-status.c:905
 msgid "behind "
 msgstr "落后 "
 
-#  注意保持句尾空格
+#  译者：注意保持句尾空格
 #: wt-status.c:908 wt-status.c:911
 msgid "ahead "
 msgstr "领先 "
 
-#  注意保持句尾空格
+#  译者：注意保持句尾空格
 #: wt-status.c:913
 msgid ", behind "
 msgstr "，落后 "
@@ -687,7 +690,7 @@ msgstr "路径 '%s' 属于模组 '%.*s'"
 
 #: builtin/add.c:192
 msgid "Unstaged changes after refreshing the index:"
-msgstr "刷新暂存区后未暂存的变更："
+msgstr "刷新索引之后尚未被暂存的变更："
 
 #: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
 #, c-format
@@ -701,21 +704,21 @@ msgstr "'%s' 位于符号链接中"
 
 #: builtin/add.c:276
 msgid "Could not read the index"
-msgstr "无法读取暂存区"
+msgstr "不能读取索引"
 
 #: builtin/add.c:286
 #, c-format
 msgid "Could not open '%s' for writing."
-msgstr "无法打开 '%s' 以写入。"
+msgstr "不能为写入打开 '%s'。"
 
 #: builtin/add.c:290
 msgid "Could not write patch"
-msgstr "无法写补丁"
+msgstr "不能写补丁"
 
 #: builtin/add.c:295
 #, c-format
 msgid "Could not stat '%s'"
-msgstr "无法查看文件状态 '%s'"
+msgstr "不能查看文件状态 '%s'"
 
 #: builtin/add.c:297
 msgid "Empty patch. Aborted."
@@ -724,7 +727,7 @@ msgstr "空补丁。异常终止。"
 #: builtin/add.c:303
 #, c-format
 msgid "Could not apply '%s'"
-msgstr "无法应用 '%s'"
+msgstr "不能应用 '%s'"
 
 #: builtin/add.c:312
 msgid "The following paths are ignored by one of your .gitignore files:\n"
@@ -733,7 +736,7 @@ msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n"
 #: builtin/add.c:352
 #, c-format
 msgid "Use -f if you really want to add them.\n"
-msgstr "使用 -f 参数如果你确实要添加它们。\n"
+msgstr "使用 -f 参数如果您确实要添加它们。\n"
 
 #: builtin/add.c:353
 msgid "no files added"
@@ -754,7 +757,7 @@ msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
 #: builtin/add.c:413
 #, c-format
 msgid "Nothing specified, nothing added.\n"
-msgstr "æ\9cªæ\8f\90ä¾\9bå\8f\82æ\95°ï¼\8c没有文件被添加。\n"
+msgstr "没æ\9c\89æ\8c\87å®\9aæ\96\87件ï¼\8cä¹\9f没有文件被添加。\n"
 
 #: builtin/add.c:414
 #, c-format
@@ -764,33 +767,33 @@ msgstr "也许您想要执行 'git add .'？\n"
 #: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82
 #: builtin/rm.c:162
 msgid "index file corrupt"
-msgstr "暂存区文件损坏"
+msgstr "索引文件损坏"
 
 #: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260
 msgid "Unable to write new index file"
-msgstr "无法写入新暂存区文件"
+msgstr "无法写入新索引文件"
 
 #: builtin/archive.c:17
 #, c-format
 msgid "could not create archive file '%s'"
-msgstr "无法创建归档文件 '%s'"
+msgstr "不能创建归档文件 '%s'"
 
 #: builtin/archive.c:20
 msgid "could not redirect output"
-msgstr "无法重定向输出"
+msgstr "不能输出重定向"
 
 #: builtin/archive.c:37
 msgid "git archive: Remote with no URL"
-msgstr "git archive: 未提供远程URL"
+msgstr "git archive：未提供远程URL"
 
 #: builtin/archive.c:58
 msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive: 期待ACK/NACK，却得到EOF"
+msgstr "git archive：期待ACK/NACK，却得到EOF"
 
 #: builtin/archive.c:63
 #, c-format
 msgid "git archive: NACK %s"
-msgstr "git archive: NACK %s"
+msgstr "git archive：NACK %s"
 
 #: builtin/archive.c:65
 #, c-format
@@ -799,13 +802,13 @@ msgstr "远程错误：%s"
 
 #: builtin/archive.c:66
 msgid "git archive: protocol error"
-msgstr "git archive: 协议错误"
+msgstr "git archive：协议错误"
 
 #: builtin/archive.c:71
 msgid "git archive: expected a flush"
-msgstr "git archive: 预期一个刷新"
+msgstr "git archive：预期一个刷新"
 
-#  保持原换行格式，在输出时 %s 的替代内容会让字串变长
+#  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
 #: builtin/branch.c:137
 #, c-format
 msgid ""
@@ -815,7 +818,7 @@ msgstr ""
 "将要删除的分支 '%s' 已经被合并到\n"
 "         '%s'，但未合并到 HEAD。"
 
-#  保持原换行格式，在输出时 %s 的替代内容会让字串变长
+#  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
 #: builtin/branch.c:141
 #, c-format
 msgid ""
@@ -825,7 +828,7 @@ msgstr ""
 "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
 "         然而却尚未被合并到分支 '%s' 。"
 
-#  汉字之间无空格，故删除尾部空格
+#  译者：汉字之间无空格，故删除尾部空格
 #. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
 #: builtin/branch.c:163
 msgid "remote "
@@ -866,7 +869,7 @@ msgstr ""
 #: builtin/branch.c:214
 #, c-format
 msgid "Error deleting %sbranch '%s'"
-msgstr "删除 %s分支 '%s' 时错误"
+msgstr "删除 %s分支 '%s' 时出错"
 
 #: builtin/branch.c:219
 #, c-format
@@ -882,19 +885,19 @@ msgstr "无法更新 config 文件"
 msgid "branch '%s' does not point at a commit"
 msgstr "分支 '%s' 未指向一个提交"
 
-#  注意保持句尾空格
+#  译者：注意保持句尾空格
 #: builtin/branch.c:394
 #, c-format
 msgid "behind %d] "
 msgstr "落后 %d] "
 
-#  注意保持句尾空格
+#  译者：注意保持句尾空格
 #: builtin/branch.c:396
 #, c-format
 msgid "ahead %d] "
 msgstr "领先 %d] "
 
-#  注意保持句尾空格
+#  译者：注意保持句尾空格
 #: builtin/branch.c:398
 #, c-format
 msgid "ahead %d, behind %d] "
@@ -906,11 +909,11 @@ msgstr "（非分支）"
 
 #: builtin/branch.c:566
 msgid "some refs could not be read"
-msgstr "一些引用无法读取"
+msgstr "一些引用不能读取"
 
 #: builtin/branch.c:579
 msgid "cannot rename the current branch while not on any."
-msgstr "无法重命名不存在的当前分支。"
+msgstr "无法重命名当前分支因为不处于任何分支上。"
 
 #: builtin/branch.c:589
 #, c-format
@@ -951,7 +954,7 @@ msgstr "无法将 HEAD 解析为有效引用。"
 
 #: builtin/branch.c:751 builtin/clone.c:558
 msgid "HEAD not found below refs/heads!"
-msgstr "未在 /refs/heads 下发现 HEAD！"
+msgstr "HEAD 没有位于 /refs/heads 之下！"
 
 #: builtin/branch.c:809
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
@@ -964,11 +967,11 @@ msgstr "%s 可以\n"
 
 #: builtin/bundle.c:56
 msgid "Need a repository to create a bundle."
-msgstr "需要一个版本库来创建包"
+msgstr "需要一个版本库来创建包。"
 
 #: builtin/bundle.c:60
 msgid "Need a repository to unbundle."
-msgstr "需要一个版本库来解包"
+msgstr "需要一个版本库来解包。"
 
 #: builtin/checkout.c:113 builtin/checkout.c:146
 #, c-format
@@ -993,7 +996,7 @@ msgstr "路径 '%s' 没有必须的版本"
 #: builtin/checkout.c:192
 #, c-format
 msgid "path '%s': cannot merge"
-msgstr "path '%s': 无法合并"
+msgstr "path '%s'：无法合并"
 
 #: builtin/checkout.c:209
 #, c-format
@@ -1007,7 +1010,7 @@ msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
 
 #: builtin/checkout.c:234 builtin/checkout.c:392
 msgid "corrupt index file"
-msgstr "冲突的暂存区文件"
+msgstr "损坏的索引文件"
 
 #: builtin/checkout.c:264 builtin/checkout.c:271
 #, c-format
@@ -1017,7 +1020,7 @@ msgstr "路径 '%s' 未合并"
 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
 #: builtin/merge.c:811
 msgid "unable to write new index file"
-msgstr "无法写新的暂存区文件"
+msgstr "无法写新的索引文件"
 
 #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
 msgid "diff_setup_done failed"
@@ -1025,12 +1028,12 @@ msgstr "diff_setup_done 失败"
 
 #: builtin/checkout.c:414
 msgid "you need to resolve your current index first"
-msgstr "您需要先解决当前暂存区的冲突"
+msgstr "您需要先解决当前索引的冲突"
 
 #: builtin/checkout.c:533
 #, c-format
 msgid "Can not do reflog for '%s'\n"
-msgstr "不能对 '%s' 保存引用日志\n"
+msgstr "不能对 '%s' 执行 reflog 操作\n"
 
 #: builtin/checkout.c:565
 msgid "HEAD is now at"
@@ -1061,11 +1064,11 @@ msgstr "切换到一个新分支 '%s'\n"
 msgid "Switched to branch '%s'\n"
 msgstr "切换到分支 '%s'\n"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: builtin/checkout.c:639
 #, c-format
 msgid " ... and %d more.\n"
-msgstr " ... 及 %d 更多。\n"
+msgstr " ... 及其它 %d 个。\n"
 
 #. The singular version
 #: builtin/checkout.c:645
@@ -1110,7 +1113,7 @@ msgstr "之前的 HEAD 位置是"
 
 #: builtin/checkout.c:722
 msgid "You are on a branch yet to be born"
-msgstr "您位于一个未初始化的分支"
+msgstr "您位于一个尚未初始化的分支"
 
 #. case (1)
 #: builtin/checkout.c:853
@@ -1158,11 +1161,11 @@ msgstr "--orphan 不能和 -t 共用"
 
 #: builtin/checkout.c:1017
 msgid "git checkout: -f and -m are incompatible"
-msgstr "git checkout: -f 和 -m 不兼容"
+msgstr "git checkout：-f 和 -m 不兼容"
 
 #: builtin/checkout.c:1051
 msgid "invalid path specification"
-msgstr "无效的路径"
+msgstr "无效的路径规格"
 
 #: builtin/checkout.c:1059
 #, c-format
@@ -1170,24 +1173,23 @@ msgid ""
 "git checkout: updating paths is incompatible with switching branches.\n"
 "Did you intend to checkout '%s' which can not be resolved as commit?"
 msgstr ""
-"git checkout: 更新路径和切换分支不兼容。\n"
+"git checkout：更新路径和切换分支不兼容。\n"
 "您是想要检出 '%s' 但未能将其解析为提交么？"
 
 #: builtin/checkout.c:1061
 msgid "git checkout: updating paths is incompatible with switching branches."
-msgstr "git checkout: 更新路径和切换分支不兼容。"
+msgstr "git checkout：更新路径和切换分支不兼容。"
 
 #: builtin/checkout.c:1066
 msgid "git checkout: --detach does not take a path argument"
-msgstr "git checkout: --detach 不跟路径参数"
+msgstr "git checkout：--detach 不跟路径参数"
 
 #: builtin/checkout.c:1069
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
-"git checkout: --ours/--theirs, --force 和 --merge 不兼容当\n"
-"检出暂存区时。"
+"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
 
 #: builtin/checkout.c:1088
 msgid "Cannot switch branch to a non-commit."
@@ -1205,14 +1207,14 @@ msgstr "-x 和 -X 不能共用"
 msgid ""
 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"
 msgstr ""
-"clean.requireForce 设置为 true，若未提供 -n 或 -f 选项，拒绝执行清理动作"
+"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"
 
 #: builtin/clean.c:85
 msgid ""
 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "
 "clean"
 msgstr ""
-"clean.requireForce 默认为 true，若未提供 -n 或 -f 选项，拒绝执行清理动作"
+"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"
 
 #: builtin/clean.c:155 builtin/clean.c:176
 #, c-format
@@ -1247,17 +1249,17 @@ msgstr "引用版本库 '%s' 不是一个本地目录。"
 #: builtin/clone.c:302
 #, c-format
 msgid "failed to open '%s'"
-msgstr "æ\89\93å¼\80 '%s' 失败"
+msgstr "æ\97 æ³\95æ\89\93å¼\80 '%s'"
 
 #: builtin/clone.c:306
 #, c-format
 msgid "failed to create directory '%s'"
-msgstr "创建目录 '%s' 失败"
+msgstr "无法创建目录 '%s'"
 
 #: builtin/clone.c:308 builtin/diff.c:75
 #, c-format
 msgid "failed to stat '%s'"
-msgstr "æ\9e\9a举 '%s' ç\8a¶æ\80\81失败"
+msgstr "æ\97 æ³\95æ\9e\9a举 '%s' ç\8a¶æ\80\81"
 
 #: builtin/clone.c:310
 #, c-format
@@ -1267,22 +1269,22 @@ msgstr "%s 存在且不是一个目录"
 #: builtin/clone.c:324
 #, c-format
 msgid "failed to stat %s\n"
-msgstr "æ\9e\9a举 %s ç\8a¶æ\80\81失败\n"
+msgstr "æ\97 æ³\95æ\9e\9a举 %s ç\8a¶æ\80\81\n"
 
 #: builtin/clone.c:341
 #, c-format
 msgid "failed to unlink '%s'"
-msgstr "删除 '%s' 失败"
+msgstr "无法删除 '%s'"
 
 #: builtin/clone.c:346
 #, c-format
 msgid "failed to create link '%s'"
-msgstr "创建链接 '%s' 失败"
+msgstr "无法创建链接 '%s'"
 
 #: builtin/clone.c:350
 #, c-format
 msgid "failed to copy file to '%s'"
-msgstr "æ\8b·è´\9dæ\96\87件è\87³ '%s' 失败"
+msgstr "æ\97 æ³\95æ\8b·è´\9dæ\96\87件è\87³ '%s'"
 
 #: builtin/clone.c:373
 #, c-format
@@ -1292,7 +1294,7 @@ msgstr "完成。\n"
 #: builtin/clone.c:440
 #, c-format
 msgid "Could not find remote branch %s to clone."
-msgstr "无法发现要克隆的远程分支 %s。"
+msgstr "不能发现要克隆的远程分支 %s。"
 
 #: builtin/clone.c:549
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
@@ -1304,7 +1306,7 @@ msgstr "太多参数。"
 
 #: builtin/clone.c:643
 msgid "You must specify a repository to clone."
-msgstr "你必须指定一个版本库来克隆"
+msgstr "您必须指定一个版本库来克隆。"
 
 #: builtin/clone.c:654
 #, c-format
@@ -1323,7 +1325,7 @@ msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
 #: builtin/clone.c:683
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
-msgstr "目标路径 '%s' 已经存在且不是一个空目录。"
+msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
 
 #: builtin/clone.c:693
 #, c-format
@@ -1333,12 +1335,12 @@ msgstr "工作区 '%s' 已经存在。"
 #: builtin/clone.c:706 builtin/clone.c:720
 #, c-format
 msgid "could not create leading directories of '%s'"
-msgstr "无法为 '%s' 创建目录"
+msgstr "不能为 '%s' 创建先导目录"
 
 #: builtin/clone.c:709
 #, c-format
 msgid "could not create work tree dir '%s'."
-msgstr "无法为 '%s' 创建工作区目录。"
+msgstr "不能为 '%s' 创建工作区目录。"
 
 #: builtin/clone.c:728
 #, c-format
@@ -1377,13 +1379,13 @@ msgid ""
 "\n"
 "    git commit --amend --reset-author\n"
 msgstr ""
-"您的姓名和邮件地址会基于您的用户名和主机地址自动配置。请检查它们\n"
-"正确与否。您可通过下面命令对其显式声明以避免重复出现类似提示：\n"
+"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
+"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息：\n"
 "\n"
 "    git config --global user.name \"Your Name\"\n"
 "    git config --global user.email you@example.com\n"
 "\n"
-"设置完毕后，您可用下面命令来更改此次提交所使用的用户ID：\n"
+"设置完毕后，您可以用下面的命令来修正本次提交所使用的用户身份：\n"
 "\n"
 "    git commit --amend --reset-author\n"
 
@@ -1422,11 +1424,11 @@ msgstr "拣选"
 
 #: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
-msgstr "解包 HEAD 树对象失败"
+msgstr "无法解包 HEAD 树对象"
 
 #: builtin/commit.c:367
 msgid "unable to create temporary index"
-msgstr "不能创建临时暂存区"
+msgstr "不能创建临时索引"
 
 #: builtin/commit.c:373
 msgid "interactive add failed"
@@ -1434,9 +1436,9 @@ msgstr "交互式添加失败"
 
 #: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473
 msgid "unable to write new_index file"
-msgstr "无法写入新暂存区文件"
+msgstr "无法写 new_index 文件"
 
-#  %s若翻为中文，前后不需要空格
+#  译者：%s若翻为中文，前后不需要空格
 #: builtin/commit.c:457
 #, c-format
 msgid "cannot do a partial commit during a %s."
@@ -1444,11 +1446,11 @@ msgstr "在%s过程中不能做部分提交。"
 
 #: builtin/commit.c:466
 msgid "cannot read the index"
-msgstr "无法读取暂存区"
+msgstr "无法读取索引"
 
 #: builtin/commit.c:486
 msgid "unable to write temporary index file"
-msgstr "无法写临时暂存区文件"
+msgstr "无法写临时索引文件"
 
 #: builtin/commit.c:550 builtin/commit.c:556
 #, c-format
@@ -1462,7 +1464,7 @@ msgstr "非法的 --author 参数"
 #: builtin/commit.c:635
 #, c-format
 msgid "Malformed ident string: '%s'"
-msgstr "é\9d\9eæ³\95ç\9a\84è¯\86å\88«å­\97串：'%s'"
+msgstr "é\9d\9eæ³\95ç\9a\84身份å­\97符串：'%s'"
 
 #: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000
 #, c-format
@@ -1472,16 +1474,16 @@ msgstr "不能查询提交 %s"
 #: builtin/commit.c:682 builtin/shortlog.c:296
 #, c-format
 msgid "(reading log message from standard input)\n"
-msgstr "（正从标准输入中读取说明信息）\n"
+msgstr "（正从标准输入中读取日志信息）\n"
 
 #: builtin/commit.c:684
 msgid "could not read log from standard input"
-msgstr "无法从标准输入中读取说明信息"
+msgstr "不能从标准输入中读取日志信息"
 
 #: builtin/commit.c:688
 #, c-format
 msgid "could not read log file '%s'"
-msgstr "无法读取说明文件 '%s'"
+msgstr "不能读取日志文件 '%s'"
 
 #: builtin/commit.c:694
 msgid "commit has empty message"
@@ -1489,27 +1491,27 @@ msgstr "提交说明为空"
 
 #: builtin/commit.c:710
 msgid "could not read MERGE_MSG"
-msgstr "无法读取 MERGE_MSG"
+msgstr "不能读取 MERGE_MSG"
 
 #: builtin/commit.c:714
 msgid "could not read SQUASH_MSG"
-msgstr "无法读取 SQUASH_MSG"
+msgstr "不能读取 SQUASH_MSG"
 
 #: builtin/commit.c:718
 #, c-format
 msgid "could not read '%s'"
-msgstr "无法读取 '%s'"
+msgstr "不能读取 '%s'"
 
 #: builtin/commit.c:746
 #, c-format
 msgid "could not open '%s'"
-msgstr "无法打开 '%s'"
+msgstr "不能打开 '%s'"
 
 #: builtin/commit.c:770
 msgid "could not write commit template"
-msgstr "无法写提交模版"
+msgstr "不能写提交模版"
 
-#  %s若翻为中文，前后不需要空格
+#  译者：%s若翻为中文，前后不需要空格
 #: builtin/commit.c:783
 #, c-format
 msgid ""
@@ -1529,7 +1531,7 @@ msgstr ""
 msgid "Please enter the commit message for your changes."
 msgstr "请为您的修改输入提交说明。"
 
-#  前导空格用于拼接英文字串，中文字串拼接无需空格
+#  译者：中文字符串拼接，可删除前导空格
 #: builtin/commit.c:799
 msgid ""
 " Lines starting\n"
@@ -1538,7 +1540,7 @@ msgstr ""
 "以 '#' 开头\n"
 "的行将被忽略，并且空的提交说明将会中止提交。\n"
 
-#  前导空格用于拼接英文字串，中文字串拼接无需空格
+#  译者：中文字符串拼接，可删除前导空格
 #: builtin/commit.c:804
 msgid ""
 " Lines starting\n"
@@ -1549,13 +1551,13 @@ msgstr ""
 "的行将被保留，您可以删除它们如果您想这样做的话。空的提交说明将会\n"
 "中止提交。\n"
 
-#  为保证在输出中对齐，注意调整句中空格！
+#  译者：为保证在输出中对齐，注意调整句中空格！
 #: builtin/commit.c:816
 #, c-format
 msgid "%sAuthor:    %s"
 msgstr "%s作者：     %s"
 
-#  为保证在输出中对齐，注意调整句中空格！
+#  译者：为保证在输出中对齐，注意调整句中空格！
 #: builtin/commit.c:823
 #, c-format
 msgid "%sCommitter: %s"
@@ -1563,7 +1565,7 @@ msgstr "%s提交者：   %s"
 
 #: builtin/commit.c:843
 msgid "Cannot read index"
-msgstr "无法读取暂存区"
+msgstr "无法读取索引"
 
 #: builtin/commit.c:880
 msgid "Error building trees"
@@ -1572,7 +1574,7 @@ msgstr "无法创建树对象"
 #: builtin/commit.c:895 builtin/tag.c:357
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
-msgstr "请使用 -m 或者 -F 选项提供说明。\n"
+msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
 
 #: builtin/commit.c:975
 #, c-format
@@ -1582,7 +1584,7 @@ msgstr "没有找到匹配 '%s' 的作者"
 #: builtin/commit.c:990 builtin/commit.c:1182
 #, c-format
 msgid "Invalid untracked files mode '%s'"
-msgstr "无效的非追踪文件参数 '%s'"
+msgstr "无效的未追踪文件参数 '%s'"
 
 #: builtin/commit.c:1030
 msgid "Using both --reset-author and --author does not make sense"
@@ -1590,13 +1592,13 @@ msgstr "同时使用 --reset-author 和 --author 没有意义"
 
 #: builtin/commit.c:1041
 msgid "You have nothing to amend."
-msgstr "您没有要修补。"
+msgstr "您没有可修补的提交。"
 
-#  %s若翻为中文，前后不需要空格
+#  译者：%s若翻为中文，前后不需要空格
 #: builtin/commit.c:1043
 #, c-format
 msgid "You are in the middle of a %s -- cannot amend."
-msgstr "您正处于一个%s过程中 -- 无法修补提交。"
+msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
 
 #: builtin/commit.c:1045
 msgid "Options --squash and --fixup cannot be used together"
@@ -1612,7 +1614,7 @@ msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
 
 #: builtin/commit.c:1063
 msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author 只能和 -C, -c 或 --amend 共用。"
+msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
 
 #: builtin/commit.c:1080
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
@@ -1624,11 +1626,11 @@ msgstr "参数 --include/--only 不跟路径没有意义。"
 
 #: builtin/commit.c:1084
 msgid "Clever... amending the last one with dirty index."
-msgstr "聪明... 在暂存区不干净下修补最后的提交。"
+msgstr "聪明... 在索引不干净下修补最后的提交。"
 
 #: builtin/commit.c:1086
 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
-msgstr "没æ\9c\89ç\94¨ -i æ\88\96 -o é\80\89项è\80\8cæ\98¾å¼\8få\9c°æ\8f\90ä¾\9bè·¯å¾\84ï¼\8c认为是 --only paths..."
+msgstr "æ\8c\87å®\9aäº\86æ\98\8eç¡®ç\9a\84è·¯å¾\84è\80\8c没æ\9c\89使ç\94¨ -i æ\88\96 -o é\80\89项ï¼\9b认为是 --only paths..."
 
 #: builtin/commit.c:1096 builtin/tag.c:556
 #, c-format
@@ -1645,39 +1647,39 @@ msgstr "无法找到新创建的提交"
 
 #: builtin/commit.c:1282
 msgid "could not parse newly created commit"
-msgstr "无法解析新创建的提交"
+msgstr "不能解析新创建的提交"
 
 #: builtin/commit.c:1323
 msgid "detached HEAD"
 msgstr "分离头指针"
 
-#  注意保持前导空格
+#  译者：中文字符串拼接，可删除前导空格
 #: builtin/commit.c:1325
 msgid " (root-commit)"
-msgstr " （根提交）"
+msgstr "（根提交）"
 
 #: builtin/commit.c:1415
 msgid "could not parse HEAD commit"
-msgstr "无法解析 HEAD 提交"
+msgstr "不能解析 HEAD 提交"
 
 #: builtin/commit.c:1452 builtin/merge.c:509
 #, c-format
 msgid "could not open '%s' for reading"
-msgstr "无法打开 '%s' 读取"
+msgstr "不能为读入打开 '%s'"
 
 #: builtin/commit.c:1459
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
-msgstr "损坏的 MERGE_HEAD 文件 (%s)"
+msgstr "损坏的 MERGE_HEAD 文件（%s）"
 
 #: builtin/commit.c:1466
 msgid "could not read MERGE_MODE"
-msgstr "无法读取 MERGE_MODE"
+msgstr "不能读取 MERGE_MODE"
 
 #: builtin/commit.c:1485
 #, c-format
 msgid "could not read commit message: %s"
-msgstr "无法读取提交说明：%s"
+msgstr "不能读取提交说明：%s"
 
 #: builtin/commit.c:1499
 #, c-format
@@ -1686,7 +1688,7 @@ msgstr "终止提交因为提交说明为空。\n"
 
 #: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968
 msgid "failed to write commit object"
-msgstr "写提交对象失败"
+msgstr "无法写提交对象"
 
 #: builtin/commit.c:1535
 msgid "cannot lock HEAD ref"
@@ -1702,8 +1704,8 @@ msgid ""
 "new_index file. Check that disk is not full or quota is\n"
 "not exceeded, and then \"git reset HEAD\" to recover."
 msgstr ""
-"版本库已被更新，但无法写入新暂存区文件。检查是否磁盘\n"
-"已满或磁盘配额耗尽，然后执行 \"git reset HEAD\" 恢复。"
+"版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
+"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
 
 #: builtin/describe.c:234
 #, c-format
@@ -1718,7 +1720,7 @@ msgstr "注释 tag %s 没有嵌入名称"
 #: builtin/describe.c:240
 #, c-format
 msgid "tag '%s' is really '%s' here"
-msgstr "tag '%s' 确是在 '%s'"
+msgstr "tag '%s' ç\9a\84ç¡®æ\98¯å\9c¨ '%s'"
 
 #: builtin/describe.c:267
 #, c-format
@@ -1761,7 +1763,7 @@ msgid ""
 "Try --always, or create some tags."
 msgstr ""
 "没有注释 tag 能描述 '%s'。\n"
-"尝试 --always，或创建一些 tag。"
+"尝试 --always，或者创建一些 tag。"
 
 #: builtin/describe.c:378
 #, c-format
@@ -1774,8 +1776,8 @@ msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
-"å\8f\91ç\8e°å¤\9aäº\8e %i 个 tagï¼\9b列出最近的 %i 个\n"
-"放弃搜索 %s\n"
+"å\8f\91ç\8e°å¤\9aäº\8e %i 个 tagï¼\8c列出最近的 %i 个\n"
+"在 %s 放弃搜索\n"
 
 #: builtin/describe.c:436
 msgid "--long is incompatible with --abbrev=0"
@@ -1783,7 +1785,7 @@ msgstr "--long 与 --abbrev=0 不兼容"
 
 #: builtin/describe.c:462
 msgid "No names found, cannot describe anything."
-msgstr "没有发现名称，无法描述任何东西"
+msgstr "没有发现名称，无法描述任何东西。"
 
 #: builtin/describe.c:482
 msgid "--dirty is incompatible with committishes"
@@ -1849,7 +1851,7 @@ msgstr "[已拒绝]"
 msgid "[tag update]"
 msgstr "[tag更新]"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331
 msgid "  (unable to update local ref)"
 msgstr "  （不能更新本地引用）"
@@ -1872,7 +1874,7 @@ msgstr "强制更新"
 
 #: builtin/fetch.c:353
 msgid "(non-fast-forward)"
-msgstr "（非快进式推送）"
+msgstr "（非快进式）"
 
 #: builtin/fetch.c:384 builtin/fetch.c:676
 #, c-format
@@ -1898,13 +1900,13 @@ msgstr ""
 "一些本地引用不能被更新；尝试运行\n"
 " 'git remote prune %s' 来删除旧的、有冲突的分支"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: builtin/fetch.c:540
 #, c-format
 msgid "   (%s will become dangling)\n"
 msgstr "   （%s 将成为悬空状态）\n"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: builtin/fetch.c:541
 #, c-format
 msgid "   (%s has become dangling)\n"
@@ -1952,11 +1954,11 @@ msgstr "不能获取 %s"
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
-msgstr "æ\9cªæ\8f\90ä¾\9bè¿\9cç¨\8bç\89\88æ\9c¬åº\93ã\80\82请æ\8f\90ä¾\9bä¸\80个URLæ\88\96è¿\9cç¨\8bç\89\88æ\9c¬åº\93å\90\8dï¼\8cç\94¨äº\8eè\8e·å\8f\96æ\96°ç\89\88æ\9c¬。"
+msgstr "æ\9cªæ\8c\87å®\9aè¿\9cç¨\8bç\89\88æ\9c¬åº\93ã\80\82请é\80\9aè¿\87ä¸\80个URLæ\88\96è¿\9cç¨\8bç\89\88æ\9c¬åº\93å\90\8dæ\8c\87å®\9aï¼\8cç\94¨ä»¥è\8e·å\8f\96æ\96°æ\8f\90交。"
 
 #: builtin/fetch.c:918
 msgid "You need to specify a tag name."
-msgstr "你需要提供一个 tag 名称"
+msgstr "您需要指定一个 tag 名称。"
 
 #: builtin/fetch.c:970
 msgid "fetch --all does not take a repository argument"
@@ -1973,7 +1975,7 @@ msgstr "没有这样的远程或远程组：%s"
 
 #: builtin/fetch.c:991
 msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "è\8e·å\8f\96ç»\84并æ\8f\90ä¾\9b引用表达式没有意义"
+msgstr "è\8e·å\8f\96ç»\84并æ\8c\87å®\9a引用表达式没有意义"
 
 #: builtin/gc.c:63
 #, c-format
@@ -1982,7 +1984,7 @@ msgstr "无效的 %s：'%s'"
 
 #: builtin/gc.c:78
 msgid "Too many options specified"
-msgstr "æ\8f\90ä¾\9b了太多的选项"
+msgstr "æ\8c\87å®\9a了太多的选项"
 
 #: builtin/gc.c:103
 #, c-format
@@ -2000,18 +2002,18 @@ msgid ""
 "Auto packing the repository for optimum performance. You may also\n"
 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
 msgstr ""
-"自动打包版本库以求最佳性能。你还可以\n"
-"手动运行 \"git gc\"。 参见 \"git help gc\" 获取更多信息。\n"
+"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
+"参见 \"git help gc\" 以获取更多信息。\n"
 
 #: builtin/gc.c:256
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr "有太多无指向的松散对象，运行 'git prune' 删除它们。"
+msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
 
 #: builtin/grep.c:216
 #, c-format
 msgid "grep: failed to create thread: %s"
-msgstr "grep: 无法创建线程：%s"
+msgstr "grep：无法创建线程：%s"
 
 #: builtin/grep.c:402
 #, c-format
@@ -2021,7 +2023,7 @@ msgstr "无法切换目录：%s"
 #: builtin/grep.c:478 builtin/grep.c:512
 #, c-format
 msgid "unable to read tree (%s)"
-msgstr "无法读取代码树（%s）"
+msgstr "无法读取树（%s）"
 
 #: builtin/grep.c:526
 #, c-format
@@ -2053,7 +2055,7 @@ msgstr "--open-files-in-pager 仅用于工作区"
 
 #: builtin/grep.c:966
 msgid "--cached or --untracked cannot be used with --no-index."
-msgstr "--cached 或 --untracked 不能与 --no-index 共用"
+msgstr "--cached 或 --untracked 不能与 --no-index 共用。"
 
 #: builtin/grep.c:971
 msgid "--no-index or --untracked cannot be used with revs."
@@ -2061,7 +2063,7 @@ msgstr "--no-index 或 --untracked 不能和版本共用。"
 
 #: builtin/grep.c:974
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
-msgstr "--[no-]exclude-standard 不能用于跟踪内容。"
+msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
 
 #: builtin/grep.c:982
 msgid "both --cached and trees are given."
@@ -2105,7 +2107,7 @@ msgstr "太长的符号链接 %s"
 #: builtin/init-db.c:102
 #, c-format
 msgid "cannot symlink '%s' '%s'"
-msgstr "不能创建符号链接 '%s' 到 '%s'"
+msgstr "不能自 '%s' 到 '%s' 创建符号链接"
 
 #: builtin/init-db.c:106
 #, c-format
@@ -2175,10 +2177,10 @@ msgstr "重新初始化现存的"
 msgid "Initialized empty"
 msgstr "初始化空的"
 
-#  汉字字串合并，之间无空格，故删除前导空格
+#  译者：中文字符串拼接，可删除前导空格
 #: builtin/init-db.c:421
 msgid " shared"
-msgstr "共享的"
+msgstr "共享"
 
 #: builtin/init-db.c:440
 msgid "cannot tell cwd"
@@ -2200,7 +2202,7 @@ msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr ""
-"不允许 %s（或 --work-tree=<directory>）而没有 %s（或 --git-dir=<directory>）"
+"不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-dir=<directory>）"
 
 #: builtin/init-db.c:578
 msgid "Cannot access current working directory"
@@ -2219,7 +2221,7 @@ msgstr "最终输出：%d %s\n"
 #: builtin/log.c:395 builtin/log.c:483
 #, c-format
 msgid "Could not read object %s"
-msgstr "无法读取对象 %s"
+msgstr "不能读取对象 %s"
 
 #: builtin/log.c:507
 #, c-format
@@ -2249,7 +2251,7 @@ msgstr "不是一个范围。"
 
 #: builtin/log.c:739
 msgid "Could not extract email from committer identity."
-msgstr "无法从提交者身份中提取邮件地址。"
+msgstr "不能从提交者身份中提取邮件地址。"
 
 #: builtin/log.c:785
 msgid "Cover letter needs email format"
@@ -2301,7 +2303,7 @@ msgstr "标准输出或目录，哪一个？"
 #: builtin/log.c:1257
 #, c-format
 msgid "Could not create directory '%s'"
-msgstr "无法创建目录 '%s'"
+msgstr "不能创建目录 '%s'"
 
 #: builtin/log.c:1410
 msgid "Failed to create output files"
@@ -2311,7 +2313,7 @@ msgstr "无法创建输出文件"
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr "无法找到跟踪的远程分支，请手工提供 <upstream>。\n"
+msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
 
 #: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544
 #, c-format
@@ -2325,7 +2327,7 @@ msgstr "开关 `m' 需要一个值"
 #: builtin/merge.c:128
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
-msgstr "无法找到合并策略 '%s'。\n"
+msgstr "不能找到合并策略 '%s'。\n"
 
 #: builtin/merge.c:129
 #, c-format
@@ -2354,7 +2356,7 @@ msgstr "不是一个有效对象：%s"
 msgid "read-tree failed"
 msgstr "读取树失败"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: builtin/merge.c:317
 msgid " (nothing to squash)"
 msgstr " （无可压缩）"
@@ -2385,7 +2387,7 @@ msgstr "'%s' 没有指向一个提交"
 #: builtin/merge.c:536
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "错的 branch.%s.mergeoptions 字串：%s"
+msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
 
 #: builtin/merge.c:629
 msgid "git write-tree failed to write a tree"
@@ -2397,7 +2399,7 @@ msgstr "无法读取缓存"
 
 #: builtin/merge.c:696
 msgid "Unable to write index."
-msgstr "不能写暂存区。"
+msgstr "不能写索引。"
 
 #: builtin/merge.c:709
 msgid "Not handling anything other than two heads merge."
@@ -2457,15 +2459,15 @@ msgstr "'%s' 不是一个提交"
 
 #: builtin/merge.c:1057
 msgid "No current branch."
-msgstr "当前不在分支上。"
+msgstr "没有当前分支。"
 
 #: builtin/merge.c:1059
 msgid "No remote for the current branch."
-msgstr "当前分支没有远程版本库。"
+msgstr "当前分支没有对应的远程版本库。"
 
 #: builtin/merge.c:1061
 msgid "No default upstream defined for the current branch."
-msgstr "å½\93å\89\8då\88\86æ\94¯æ\9cªå®\9aä¹\89é»\98认上游分支。"
+msgstr "å½\93å\89\8då\88\86æ\94¯æ²¡æ\9c\89å®\9aä¹\89é»\98认ç\9a\84上游分支。"
 
 #: builtin/merge.c:1066
 #, c-format
@@ -2474,7 +2476,7 @@ msgstr "%s 没有来自 %s 的远程跟踪分支"
 
 #: builtin/merge.c:1188
 msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "没有要终止的合并（MERGE_HEAD 丢失）"
+msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
 
 #: builtin/merge.c:1204 git-pull.sh:31
 msgid ""
@@ -2482,7 +2484,7 @@ msgid ""
 "Please, commit your changes before you can merge."
 msgstr ""
 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"
-"请å\85\88æ\8f\90交æ\82¨ç\9a\84ä¿®æ\94¹ï¼\8cæ\82¨æ\89\8dè\83½å\90\88并。"
+"请å\9c¨å\90\88并å\89\8då\85\88æ\8f\90交æ\82¨ç\9a\84ä¿®æ\94¹。"
 
 #: builtin/merge.c:1207 git-pull.sh:34
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
@@ -2494,7 +2496,7 @@ msgid ""
 "Please, commit your changes before you can merge."
 msgstr ""
 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
-"请å\85\88æ\8f\90交æ\82¨ç\9a\84ä¿®æ\94¹ï¼\8cæ\82¨æ\89\8dè\83½å\90\88并。"
+"请å\9c¨å\90\88并å\89\8då\85\88æ\8f\90交æ\82¨ç\9a\84ä¿®æ\94¹。"
 
 #: builtin/merge.c:1214
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
@@ -2510,11 +2512,11 @@ msgstr "您不能将 --no-ff 与 --ff-only 共用。"
 
 #: builtin/merge.c:1235
 msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "æ\9cªæ\8c\87å\87º提交并且 merge.defaultToUpstream 未设置。"
+msgstr "æ\9cªæ\8c\87å®\9a提交并且 merge.defaultToUpstream 未设置。"
 
 #: builtin/merge.c:1266
 msgid "Can merge only exactly one commit into empty head"
-msgstr "只可将一个提交合并到空分支上"
+msgstr "只能将一个提交合并到空分支上"
 
 #: builtin/merge.c:1269
 msgid "Squash commit into empty head not supported yet"
@@ -2537,7 +2539,7 @@ msgstr "更新 %s..%s\n"
 #: builtin/merge.c:1423
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
-msgstr "尝试非常小的暂存区内合并...\n"
+msgstr "尝试非常小的索引内合并...\n"
 
 #: builtin/merge.c:1430
 #, c-format
@@ -2598,7 +2600,7 @@ msgstr "不能将目录移动到文件"
 #: builtin/mv.c:128
 #, c-format
 msgid "Huh? %.*s is in index?"
-msgstr "嗯？%.*s 在暂存区中？"
+msgstr "嗯？%.*s 在索引中？"
 
 #: builtin/mv.c:140
 msgid "source directory is empty"
@@ -2698,7 +2700,7 @@ msgstr "不能打开或读取 '%s'"
 #: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
-msgstr "无法解析 '%s' 为一个有效引用"
+msgstr "无法解析 '%s' 为一个有效引用。"
 
 #: builtin/notes.c:275
 #, c-format
@@ -2712,7 +2714,7 @@ msgstr "不能提交未初始化/未引用的注解树"
 #: builtin/notes.c:340
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "错误的 notes.rewriteMode 值：'%s'"
+msgstr "坏的 notes.rewriteMode 值：'%s'"
 
 #: builtin/notes.c:350
 #, c-format
@@ -2724,7 +2726,7 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
 #: builtin/notes.c:377
 #, c-format
 msgid "Bad %s value: '%s'"
-msgstr "错误的 %s 值：'%s'"
+msgstr "坏的 %s 值：'%s'"
 
 #: builtin/notes.c:441
 #, c-format
@@ -2734,7 +2736,7 @@ msgstr "非法的输入行：'%s'。"
 #: builtin/notes.c:456
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "无法从 '%s' 拷贝注解到 '%s'"
+msgstr "无法从 '%s' 到 '%s' 拷贝注解"
 
 #: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
 #: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
@@ -2781,7 +2783,7 @@ msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr ""
-"选项 -m/-F/-c/-C 已为 'edit' 子命令废弃。\n"
+"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
 
 #: builtin/notes.c:971
@@ -2797,17 +2799,17 @@ msgstr "未知子命令：%s"
 #: builtin/pack-objects.c:2310
 #, c-format
 msgid "unsupported index version %s"
-msgstr "不支持的暂存区版本 %s"
+msgstr "不支持的索引版本 %s"
 
 #: builtin/pack-objects.c:2314
 #, c-format
 msgid "bad index version '%s'"
-msgstr "错误的暂存区版本 '%s'"
+msgstr "坏的索引版本 '%s'"
 
 #: builtin/pack-objects.c:2322
 #, c-format
 msgid "option %s does not accept negative form"
-msgstr "选项 '%s' 不接受否定格式"
+msgstr "选项 %s 不接受否定格式"
 
 #: builtin/pack-objects.c:2326
 #, c-format
@@ -2820,7 +2822,7 @@ msgstr "tag 简写没有跟 <tag> 参数"
 
 #: builtin/push.c:63
 msgid "--delete only accepts plain target ref names"
-msgstr "--delete 只接受简单的引用名称"
+msgstr "--delete 只接受简单的目标引用名"
 
 #: builtin/push.c:73
 #, c-format
@@ -2832,7 +2834,7 @@ msgid ""
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr ""
 "您当前不在一个分支上。\n"
-"现在为推送当前历史（分离头指针），使用\n"
+"现在为推送当前（分离头指针）的历史，使用\n"
 "\n"
 "    git push %s HEAD:<name-of-remote-branch>\n"
 
@@ -2857,7 +2859,7 @@ msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
 #: builtin/push.c:111
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "æ\82¨æ²¡æ\9c\89为æ\8e¨é\80\81æ\8f\90ä¾\9b任何引用表达式，并且 push.default 为 \"nothing\"。"
+msgstr "æ\82¨æ²¡æ\9c\89为æ\8e¨é\80\81æ\8c\87å®\9a任何引用表达式，并且 push.default 为 \"nothing\"。"
 
 #: builtin/push.c:131
 #, c-format
@@ -2876,14 +2878,14 @@ msgid ""
 "Merge the remote changes (e.g. 'git pull') before pushing again.  See the\n"
 "'Note about fast-forwards' section of 'git push --help' for details.\n"
 msgstr ""
-"为防止您丢失提交历史，禁止非快进式推送。\n"
+"为了防止您丢失提交历史，非快进式更新被拒绝。\n"
 "再次推送前先与远程变更合并（如 'git pull'）。详见\n"
 "'git push --help' 中的 'Note about fast-forwards' 小节。\n"
 
 #: builtin/push.c:160
 #, c-format
 msgid "bad repository '%s'"
-msgstr "错误的版本库 '%s'"
+msgstr "坏的版本库 '%s'"
 
 #: builtin/push.c:161
 msgid ""
@@ -2897,8 +2899,8 @@ msgid ""
 "\n"
 "    git push <name>\n"
 msgstr ""
-"æ\9cª配置推送目标。\n"
-"æ\88\96è\80\85é\80\9aè¿\87å\91½ä»¤è¡\8cæ\8f\90ä¾\9bURL，或者用下面命令配置一个远程版本库\n"
+"没æ\9c\89配置推送目标。\n"
+"æ\88\96è\80\85é\80\9aè¿\87å\91½ä»¤è¡\8cæ\8c\87å®\9aURL，或者用下面命令配置一个远程版本库\n"
 "\n"
 "    git remote add <name> <url>\n"
 "\n"
@@ -2965,7 +2967,7 @@ msgstr "无法找到 %s 指向的树。"
 
 #: builtin/reset.c:96
 msgid "Could not write new index file."
-msgstr "无法写入新的暂存区文件。"
+msgstr "不能写入新的索引文件。"
 
 #: builtin/reset.c:106
 #, c-format
@@ -2974,13 +2976,13 @@ msgstr "HEAD 现在位于 %s"
 
 #: builtin/reset.c:130
 msgid "Could not read index"
-msgstr "不能读取暂存区"
+msgstr "不能读取索引"
 
 #: builtin/reset.c:133
 msgid "Unstaged changes after reset:"
-msgstr "重置后变更撤出暂存区："
+msgstr "重置后撤出暂存区的变更："
 
-#  汉字之间无空格，故删除%s前后空格
+#  译者：汉字之间无空格，故删除%s前后空格
 #: builtin/reset.c:223
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
@@ -2999,13 +3001,13 @@ msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 带路径已弃用，代之以 'git reset -- <paths>'。"
 
-#  汉字之间无空格，故删除%s前后空格
+#  译者：汉字之间无空格，故删除%s前后空格
 #: builtin/reset.c:313
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "不能带路径进行%s重置。"
 
-#  汉字之间无空格，故删除%s前后空格
+#  译者：汉字之间无空格，故删除%s前后空格
 #: builtin/reset.c:325
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
@@ -3014,12 +3016,12 @@ msgstr "不能对裸版本库进行%s重置"
 #: builtin/reset.c:341
 #, c-format
 msgid "Could not reset index file to revision '%s'."
-msgstr "不能重置暂存区至版本 '%s'。"
+msgstr "不能重置索引文件至版本 '%s'。"
 
 #: builtin/revert.c:70 builtin/revert.c:91
 #, c-format
 msgid "%s: %s cannot be used with %s"
-msgstr "%s: %s 不能和 %s 共用"
+msgstr "%s：%s 不能和 %s 共用"
 
 #: builtin/revert.c:126
 msgid "program error"
@@ -3039,7 +3041,7 @@ msgid ""
 "'%s' has staged content different from both the file and the HEAD\n"
 "(use -f to force removal)"
 msgstr ""
-"'%s' 暂存的内容和工作区文件及 HEAD 中的都不一样\n"
+"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
 "（使用 -f 强制删除）"
 
 #: builtin/rm.c:115
@@ -3048,7 +3050,7 @@ msgid ""
 "'%s' has changes staged in the index\n"
 "(use --cached to keep the file, or -f to force removal)"
 msgstr ""
-"'%s' 有变更已加入暂存区中\n"
+"'%s' 有变更已暂存至索引中\n"
 "（使用 --cached 保存文件，或用 -f 强制删除）"
 
 #: builtin/rm.c:119
@@ -3139,11 +3141,11 @@ msgstr "无法写 tag 文件"
 
 #: builtin/tag.c:321
 msgid "bad object type."
-msgstr "无效的对象类型"
+msgstr "坏的对象类型。"
 
 #: builtin/tag.c:334
 msgid "tag header too big."
-msgstr "tag 头信息太大"
+msgstr "tag 头信息太大。"
 
 #: builtin/tag.c:366
 msgid "no tag message?"
@@ -3186,7 +3188,7 @@ msgstr "太多参数"
 #: builtin/tag.c:540
 #, c-format
 msgid "'%s' is not a valid tag name."
-msgstr "'%s' 不是一个有效的tag名称"
+msgstr "'%s' 不是一个有效的tag名称。"
 
 #: builtin/tag.c:545
 #, c-format
@@ -3222,11 +3224,11 @@ msgid ""
 "It does not apply to blobs recorded in its index."
 msgstr ""
 "您是否曾手动编辑过您的补丁？\n"
-"无法应用补丁到暂存区的数据中。"
+"无法应用补丁到索引中的数据上。"
 
 #: git-am.sh:156
 msgid "Falling back to patching base and 3-way merge..."
-msgstr "转而使用补丁应用的基础版本和三路合并..."
+msgstr "回退到补丁基础版本并使用三路合并..."
 
 #: git-am.sh:268
 msgid "Only one StGIT patch series can be applied at once"
@@ -3241,54 +3243,54 @@ msgstr "不支持 $patch_format 补丁格式。"
 msgid "Patch format detection failed."
 msgstr "补丁格式检测失败。"
 
-#: git-am.sh:409
+#: git-am.sh:411
 msgid "-d option is no longer supported.  Do not use."
 msgstr "不再支持 -d 选项。不要使用。"
 
-#: git-am.sh:472
+#: git-am.sh:474
 #, sh-format
 msgid "previous rebase directory $dotest still exists but mbox given."
 msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
 
-#: git-am.sh:477
+#: git-am.sh:479
 msgid "Please make up your mind. --skip or --abort?"
 msgstr "请下决心。--skip 或是 --abort ？"
 
-#: git-am.sh:504
+#: git-am.sh:506
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解决操作未进行，我们不会继续。"
 
-#: git-am.sh:570
+#: git-am.sh:572
 #, sh-format
 msgid "Dirty index: cannot apply patches (dirty: $files)"
-msgstr "脏的暂存区：不能应用补丁（脏文件：$files）"
+msgstr "脏的索引：不能应用补丁（脏文件：$files）"
 
-#: git-am.sh:746
+#: git-am.sh:748
 msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "没æ\9c\89å\92\8cç»\88端å\85³è\81\94ç\9a\84æ \87å\87\86è¾\93å\85¥不能进行交互式操作。"
+msgstr "æ \87å\87\86è¾\93å\85¥æ²¡æ\9c\89å\92\8cç»\88端å\85³è\81\94ï¼\8c不能进行交互式操作。"
 
-#  注意保持句尾空格
+#  译者：注意保持句尾空格
 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
 #. in your translation. The program will only accept English
 #. input at this point.
-#: git-am.sh:757
+#: git-am.sh:759
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
 msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
 
-#: git-am.sh:793
+#: git-am.sh:795
 #, sh-format
 msgid "Applying: $FIRSTLINE"
 msgstr "正应用：$FIRSTLINE"
 
-#: git-am.sh:838
+#: git-am.sh:840
 msgid "No changes -- Patch already applied."
 msgstr "没有变更 -- 补丁已经应用过。"
 
-#: git-am.sh:864
+#: git-am.sh:866
 msgid "applying to an empty history"
 msgstr "正应用到一个空历史上"
 
-#  注意保持句尾空格
+#  译者：注意保持句尾空格
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
@@ -3322,17 +3324,17 @@ msgstr "不会在已查找过的树上二分查找"
 
 #: git-bisect.sh:144
 msgid "Bad HEAD - strange symbolic ref"
-msgstr "错误的 HEAD - 奇怪的符号引用"
+msgstr "坏的 HEAD - 奇怪的符号引用"
 
 #: git-bisect.sh:189
 #, sh-format
 msgid "Bad bisect_write argument: $state"
-msgstr "错误的bisect_write参数：$state"
+msgstr "坏的 bisect_write 参数：$state"
 
 #: git-bisect.sh:218
 #, sh-format
 msgid "Bad rev input: $arg"
-msgstr "输入错误版本：$arg"
+msgstr "输入坏的版本：$arg"
 
 #: git-bisect.sh:232
 msgid "Please call 'bisect_state' with at least one argument."
@@ -3347,7 +3349,7 @@ msgstr "输入坏的版本：$rev"
 msgid "'git bisect bad' can take only one argument."
 msgstr "'git bisect bad' 只能带一个参数。"
 
-#  注意保持句尾空格
+#  译者：注意保持句尾空格
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
@@ -3384,7 +3386,7 @@ msgstr "?? 您在说什么?"
 
 #: git-bisect.sh:474
 msgid "We are not bisecting."
-msgstr "我们没有进行二分查找。"
+msgstr "我们没有在二分查找。"
 
 #: git-pull.sh:21
 msgid ""
@@ -3392,17 +3394,17 @@ msgid ""
 "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution, or use 'git commit -a'."
 msgstr ""
-"Pull 不可用，因为你尚有未合并的文件。请先在工作区改正文件，\n"
+"Pull 不可用，因为您尚有未合并的文件。请先在工作区改正文件，\n"
 "然后酌情使用 'git add/rm <file>' 标记解决方案，\n"
-"或使用 'git commit -a'。"
+"或者使用 'git commit -a'。"
 
 #: git-pull.sh:25
 msgid "Pull is not possible because you have unmerged files."
-msgstr "Pull 不可用，因为你尚有未合并的文件。"
+msgstr "Pull 不可用，因为您尚有未合并的文件。"
 
 #: git-pull.sh:197
 msgid "updating an unborn branch with changes added to the index"
-msgstr "更新尚未诞生的分支，变更添加至暂存区"
+msgstr "更新尚未诞生的分支，变更添加至索引"
 
 #: git-pull.sh:253
 msgid "Cannot merge multiple branches into empty head"
@@ -3422,7 +3424,7 @@ msgstr "您尚未建立初始提交"
 
 #: git-stash.sh:89
 msgid "Cannot save the current index state"
-msgstr "无法保存当前暂存区状态"
+msgstr "无法保存当前索引状态"
 
 #: git-stash.sh:123 git-stash.sh:136
 msgid "Cannot save the current worktree state"
@@ -3430,11 +3432,11 @@ msgstr "无法保存当前工作区状态"
 
 #: git-stash.sh:140
 msgid "No changes selected"
-msgstr "没有修改被选择"
+msgstr "没有选择变更"
 
 #: git-stash.sh:143
 msgid "Cannot remove temporary index (can't happen)"
-msgstr "无法删除临时暂存区（不应发生）"
+msgstr "无法删除临时索引（不应发生）"
 
 #: git-stash.sh:156
 msgid "Cannot record working tree state"
@@ -3446,7 +3448,7 @@ msgstr "没有要保存的本地修改"
 
 #: git-stash.sh:227
 msgid "Cannot initialize stash"
-msgstr "无法初始化stash"
+msgstr "无法初始化 stash"
 
 #: git-stash.sh:235
 msgid "Cannot save the current status"
@@ -3458,12 +3460,12 @@ msgstr "无法删除工作区变更"
 
 #: git-stash.sh:352
 msgid "No stash found."
-msgstr "未发现stash。"
+msgstr "未发现 stash。"
 
 #: git-stash.sh:359
 #, sh-format
 msgid "Too many revisions specified: $REV"
-msgstr "æ\8f\90ä¾\9b太多的版本：$REV"
+msgstr "æ\8c\87å®\9aäº\86太多的版本：$REV"
 
 #: git-stash.sh:365
 #, sh-format
@@ -3473,16 +3475,16 @@ msgstr "$reference 不是有效的引用"
 #: git-stash.sh:393
 #, sh-format
 msgid "'$args' is not a stash-like commit"
-msgstr "'$args' 不是stash样提交"
+msgstr "'$args' 不是 stash 样提交"
 
 #: git-stash.sh:404
 #, sh-format
 msgid "'$args' is not a stash reference"
-msgstr "'$args' 不是一个stash引用"
+msgstr "'$args' 不是一个 stash 引用"
 
 #: git-stash.sh:412
 msgid "unable to refresh index"
-msgstr "无法刷新暂存区"
+msgstr "无法刷新索引"
 
 #: git-stash.sh:416
 msgid "Cannot apply a stash in the middle of a merge"
@@ -3490,11 +3492,11 @@ msgstr "无法在合并过程中恢复进度"
 
 #: git-stash.sh:424
 msgid "Conflicts in index. Try without --index."
-msgstr "暂存区冲突。尝试不用 --index。"
+msgstr "索引中有冲突。尝试不使用 --index。"
 
 #: git-stash.sh:426
 msgid "Could not save index tree"
-msgstr "无法保存暂存区"
+msgstr "不能保存索引树"
 
 #: git-stash.sh:460
 msgid "Cannot unstage modified files"
@@ -3508,7 +3510,7 @@ msgstr "丢弃了 ${REV} ($s)"
 #: git-stash.sh:492
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: 无法丢弃进度条目"
+msgstr "${REV}：不能丢弃进度条目"
 
 #: git-stash.sh:499
 msgid "No branch name specified"
@@ -3528,10 +3530,15 @@ msgstr "无法从 url '$remoteurl' 剥离一个组件"
 msgid "No submodule mapping found in .gitmodules for path '$path'"
 msgstr "未在 .gitmodules 中发现路径 '$path' 的子模组映射"
 
-#: git-submodule.sh:173
+#: git-submodule.sh:149
 #, sh-format
 msgid "Clone of '$url' into submodule path '$path' failed"
-msgstr "克隆 '$url' 到子模组路径 '$path' 失败"
+msgstr "无法克隆 '$url' 到子模组路径 '$path'"
+
+#: git-submodule.sh:159
+#, sh-format
+msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
+msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
 
 #: git-submodule.sh:247
 #, sh-format
@@ -3541,7 +3548,7 @@ msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
 #: git-submodule.sh:264
 #, sh-format
 msgid "'$path' already exists in the index"
-msgstr "'$path' 已经存在于暂存区中"
+msgstr "'$path' 已经存在于索引中"
 
 #: git-submodule.sh:281
 #, sh-format
@@ -3576,7 +3583,7 @@ msgstr "停止于 '$path'，脚本返回非零值。"
 #: git-submodule.sh:401
 #, sh-format
 msgid "No url found for submodule path '$path' in .gitmodules"
-msgstr "在 .gitmodules 中未找到子模组路径 '$path' 的url"
+msgstr "在 .gitmodules 中未找到子模组路径 '$path' 的 url"
 
 #: git-submodule.sh:410
 #, sh-format
@@ -3600,7 +3607,7 @@ msgid ""
 "Maybe you want to use 'update --init'?"
 msgstr ""
 "子模组路径 '$path' 没有初始化\n"
-"也许你想用 'update --init'？"
+"也许您想用 'update --init'？"
 
 #: git-submodule.sh:532
 #, sh-format
@@ -3651,19 +3658,19 @@ msgstr "无法递归进子模组路径 '$path'"
 msgid "--"
 msgstr "--"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: git-submodule.sh:766
 #, sh-format
 msgid "  Warn: $name doesn't contain commit $sha1_src"
 msgstr "  警告：$name 未包含提交 $sha1_src"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: git-submodule.sh:769
 #, sh-format
 msgid "  Warn: $name doesn't contain commit $sha1_dst"
 msgstr "  警告：$name 未包含提交 $sha1_dst"
 
-#  注意保持前导空格
+#  译者：注意保持前导空格
 #: git-submodule.sh:772
 #, sh-format
 msgid "  Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
@@ -3680,4 +3687,4 @@ msgstr "子模组"
 #: git-submodule.sh:969
 #, sh-format
 msgid "Synchronizing submodule url for '$name'"
-msgstr "为 '$name' 同步子模组url"
+msgstr "为 '$name' 同步子模组 url"