Commits

Anonymous committed 90e6ef5

l10n: Review zh_CN translation for Git 1.7.10-rc1

Overall review of the zh_CN translation:

- Distinguish the translations of index and stage, though they are the
same thing.

- Many other fixes, e.g., add the lost periods at the end of translated
sentences.

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

  • Participants
  • Parent commits 0e641b1

Comments (0)

Files changed (1)

 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"
 "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
 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
 #: 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 ""
 #: 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"
 #: sequencer.c:328
 #, c-format
 msgid "Mainline was specified but commit %s is not a merge."
-msgstr "提供了主线但提交 %s 不是一个合并。"
+msgstr "指定了主线但提交 %s 不是一个合并。"
 
 #. TRANSLATORS: The first %s will be "revert" or
 #. "cherry-pick", the second %s a SHA1
 #: 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."
 #: sequencer.c:671
 #, c-format
 msgid "Could not create sequencer directory %s"
-msgstr "无法创建序列目录 %s"
+msgstr "不能创建序列目录 %s"
 
 #: sequencer.c:687 sequencer.c:772
 #, c-format
 
 #: sequencer.c:710
 msgid "cannot abort from a branch yet to be born"
-msgstr "不能从未初始分支终止"
+msgstr "不能从尚未建立的分支终止"
 
 #: sequencer.c:732
 #, c-format
 #: 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
 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>...\" 标记解决方案)"
 msgid "Changes not staged for commit:"
 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 "  (提交或丢弃子模组中未跟踪或修改的内容)"
 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"
 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"
 #: 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 "
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"
 
-#  注意保持前导空格
+#  译者:注意保持前导空格
 #: wt-status.c:751
 msgid " (use -u option to show untracked files)"
 msgstr " (使用 -u 参数显示未跟踪的文件)"
 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\")"
 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\" 建立跟踪)"
 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\" 建立跟踪)"
 
-#  注意保持前导空格
+#  译者:注意保持前导空格
 #: wt-status.c:773
 msgid " (use -u to show untracked files)"
 msgstr " (使用 -u 显示未跟踪文件)"
 
-#  注意保持前导空格
+#  译者:注意保持前导空格
 #: wt-status.c:776
 msgid " (working directory clean)"
 msgstr " (干净的工作区)"
 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 ",落后 "
 
 #: 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
 
 #: 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."
 #: 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"
 #: 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"
 #: builtin/add.c:413
 #, c-format
 msgid "Nothing specified, nothing added.\n"
-msgstr "未提供参数,没有文件被添加。\n"
+msgstr "没有指定文件,也没有文件被添加。\n"
 
 #: builtin/add.c:414
 #, c-format
 #: 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 archiveNACK %s"
 
 #: builtin/archive.c:65
 #, c-format
 
 #: 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 ""
 "将要删除的分支 '%s' 已经被合并到\n"
 "         '%s',但未合并到 HEAD。"
 
-#  保持原换行格式,在输出时 %s 的替代内容会让字串变长
+#  译者:保持原换行格式,在输出时 %s 的替代内容会让字串变长
 #: builtin/branch.c:141
 #, c-format
 msgid ""
 "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
 "         然而却尚未被合并到分支 '%s' 。"
 
-#  汉字之间无空格,故删除尾部空格
+#  译者:汉字之间无空格,故删除尾部空格
 #. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
 #: builtin/branch.c:163
 msgid "remote "
 #: builtin/branch.c:214
 #, c-format
 msgid "Error deleting %sbranch '%s'"
-msgstr "删除 %s分支 '%s' 时错"
+msgstr "删除 %s分支 '%s' 时错"
 
 #: builtin/branch.c:219
 #, c-format
 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] "
 
 #: 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
 
 #: 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"
 
 #: 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
 #: builtin/checkout.c:192
 #, c-format
 msgid "path '%s': cannot merge"
-msgstr "path '%s': 无法合并"
+msgstr "path '%s'无法合并"
 
 #: builtin/checkout.c:209
 #, c-format
 
 #: builtin/checkout.c:234 builtin/checkout.c:392
 msgid "corrupt index file"
-msgstr "冲突的暂存区文件"
+msgstr "损坏的索引文件"
 
 #: builtin/checkout.c:264 builtin/checkout.c:271
 #, c-format
 #: 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"
 
 #: 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"
 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
 
 #: builtin/checkout.c:722
 msgid "You are on a branch yet to be born"
-msgstr "您位于一个未初始化的分支"
+msgstr "您位于一个未初始化的分支"
 
 #. case (1)
 #: builtin/checkout.c:853
 
 #: 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
 "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."
 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
 #: builtin/clone.c:302
 #, c-format
 msgid "failed to open '%s'"
-msgstr "打开 '%s' 失败"
+msgstr "无法打开 '%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 "枚举 '%s' 状态失败"
+msgstr "无法枚举 '%s' 状态"
 
 #: builtin/clone.c:310
 #, c-format
 #: builtin/clone.c:324
 #, c-format
 msgid "failed to stat %s\n"
-msgstr "枚举 %s 状态失败\n"
+msgstr "无法枚举 %s 状态\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 "拷贝文件至 '%s' 失败"
+msgstr "无法拷贝文件至 '%s'"
 
 #: builtin/clone.c:373
 #, c-format
 #: 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"
 
 #: builtin/clone.c:643
 msgid "You must specify a repository to clone."
-msgstr "必须指定一个版本库来克隆"
+msgstr "必须指定一个版本库来克隆"
 
 #: builtin/clone.c:654
 #, c-format
 #: 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
 #: 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
 "\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"
 
 
 #: 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"
 
 #: 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."
 
 #: 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
 #: builtin/commit.c:635
 #, c-format
 msgid "Malformed ident string: '%s'"
-msgstr "非法的识别字串:'%s'"
+msgstr "非法的身份字符串:'%s'"
 
 #: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000
 #, c-format
 #: 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"
 
 #: 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 ""
 msgid "Please enter the commit message for your changes."
 msgstr "请为您的修改输入提交说明。"
 
-#  前导空格用于拼接英文字串,中文字串拼接无需空格
+#  译者:前导空格用于拼接英文字串,中文字串拼接无需空格
 #: builtin/commit.c:799
 msgid ""
 " Lines starting\n"
 "以 '#' 开头\n"
 "的行将被忽略,并且空的提交说明将会中止提交。\n"
 
-#  前导空格用于拼接英文字串,中文字串拼接无需空格
+#  译者:前导空格用于拼接英文字串,中文字串拼接无需空格
 #: builtin/commit.c:804
 msgid ""
 " Lines starting\n"
 "的行将被保留,您可以删除它们如果您想这样做的话。空的提交说明将会\n"
 "中止提交。\n"
 
-#  为保证在输出中对齐,注意调整句中空格!
+#  译者:为保证在输出中对齐,注意调整句中空格!
 #: builtin/commit.c:816
 #, c-format
 msgid "%sAuthor:    %s"
 msgstr "%s作者:     %s"
 
-#  为保证在输出中对齐,注意调整句中空格!
+#  译者:为保证在输出中对齐,注意调整句中空格!
 #: builtin/commit.c:823
 #, c-format
 msgid "%sCommitter: %s"
 
 #: builtin/commit.c:843
 msgid "Cannot read index"
-msgstr "无法读取暂存区"
+msgstr "无法读取索引"
 
 #: builtin/commit.c:880
 msgid "Error building trees"
 #: 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
 #: 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"
 
 #: 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"
 
 #: 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."
 
 #: 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 "没有用 -i 或 -o 选项而显式地提供路径,认为是 --only paths..."
+msgstr "指定了明确的路径而没有使用 -i 或 -o 选项认为是 --only paths..."
 
 #: builtin/commit.c:1096 builtin/tag.c:556
 #, c-format
 
 #: 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 " (根提交)"
 
 #: 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
 
 #: 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"
 "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
 #: builtin/describe.c:240
 #, c-format
 msgid "tag '%s' is really '%s' here"
-msgstr "tag '%s' 确是在 '%s'"
+msgstr "tag '%s' 确是在 '%s'"
 
 #: builtin/describe.c:267
 #, c-format
 "Try --always, or create some tags."
 msgstr ""
 "没有注释 tag 能描述 '%s'。\n"
-"尝试 --always,或创建一些 tag。"
+"尝试 --always,或创建一些 tag。"
 
 #: builtin/describe.c:378
 #, c-format
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
-"发现多于 %i 个 tag;列出最近的 %i 个\n"
-"放弃搜索 %s\n"
+"发现多于 %i 个 tag,列出最近的 %i 个\n"
+"在 %s 放弃搜索\n"
 
 #: builtin/describe.c:436
 msgid "--long is incompatible with --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"
 msgid "[tag update]"
 msgstr "[tag更新]"
 
-#  注意保持前导空格
+#  译者:注意保持前导空格
 #: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331
 msgid "  (unable to update local ref)"
 msgstr "  (不能更新本地引用)"
 
 #: builtin/fetch.c:353
 msgid "(non-fast-forward)"
-msgstr "(非快进式推送)"
+msgstr "(非快进式)"
 
 #: builtin/fetch.c:384 builtin/fetch.c:676
 #, c-format
 "一些本地引用不能被更新;尝试运行\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"
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
-msgstr "未提供远程版本库。请提供一个URL或远程版本库名,用获取新版本。"
+msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用获取新提交。"
 
 #: 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"
 
 #: builtin/fetch.c:991
 msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "获取组并提供引用表达式没有意义"
+msgstr "获取组并指定引用表达式没有意义"
 
 #: builtin/gc.c:63
 #, c-format
 
 #: builtin/gc.c:78
 msgid "Too many options specified"
-msgstr "提供了太多的选项"
+msgstr "指定了太多的选项"
 
 #: builtin/gc.c:103
 #, c-format
 "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
 #: 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
 
 #: 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."
 
 #: 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."
 #: 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
 msgid "Initialized empty"
 msgstr "初始化空的"
 
-#  汉字字串合并,之间无空格,故删除前导空格
+#  译者:汉字字串合并,之间无空格,故删除前导空格
 #: builtin/init-db.c:421
 msgid " shared"
-msgstr "共享"
+msgstr "共享"
 
 #: builtin/init-db.c:440
 msgid "cannot tell cwd"
 "%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"
 #: 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
 
 #: builtin/log.c:739
 msgid "Could not extract email from committer identity."
-msgstr "无法从提交者身份中提取邮件地址。"
+msgstr "不能从提交者身份中提取邮件地址。"
 
 #: builtin/log.c:785
 msgid "Cover letter needs email format"
 #: 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"
 #, 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
 #: 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
 msgid "read-tree failed"
 msgstr "读取树失败"
 
-#  注意保持前导空格
+#  译者:注意保持前导空格
 #: builtin/merge.c:317
 msgid " (nothing to squash)"
 msgstr " (无可压缩)"
 #: 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"
 
 #: builtin/merge.c:696
 msgid "Unable to write index."
-msgstr "不能写暂存区。"
+msgstr "不能写索引。"
 
 #: builtin/merge.c:709
 msgid "Not handling anything other than two heads merge."
 
 #: 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 "当前分支定义默认上游分支。"
+msgstr "当前分支没有定义默认上游分支。"
 
 #: builtin/merge.c:1066
 #, c-format
 
 #: 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 ""
 "Please, commit your changes before you can merge."
 msgstr ""
 "您尚未结束您的合并(存在 MERGE_HEAD)。\n"
-"请先提交您的修改,您才能合并。"
+"请在合并前先提交您的修改。"
 
 #: builtin/merge.c:1207 git-pull.sh:34
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 "Please, commit your changes before you can merge."
 msgstr ""
 "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
-"请先提交您的修改,您才能合并。"
+"请在合并前先提交您的修改。"
 
 #: builtin/merge.c:1214
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 
 #: builtin/merge.c:1235
 msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "未指提交并且 merge.defaultToUpstream 未设置。"
+msgstr "未指提交并且 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"
 #: builtin/merge.c:1423
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
-msgstr "尝试非常小的暂存区内合并...\n"
+msgstr "尝试非常小的索引内合并...\n"
 
 #: builtin/merge.c:1430
 #, c-format
 #: 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"
 #: 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
 #: 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
 #: builtin/notes.c:377
 #, c-format
 msgid "Bad %s value: '%s'"
-msgstr "错误的 %s 值:'%s'"
+msgstr "的 %s 值:'%s'"
 
 #: builtin/notes.c:441
 #, c-format
 #: 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
 "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
 #: 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
 
 #: builtin/push.c:63
 msgid "--delete only accepts plain target ref names"
-msgstr "--delete 只接受简单的引用名"
+msgstr "--delete 只接受简单的目标引用名"
 
 #: builtin/push.c:73
 #, c-format
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr ""
 "您当前不在一个分支上。\n"
-"现在为推送当前历史(分离头指针),使用\n"
+"现在为推送当前(分离头指针)的历史,使用\n"
 "\n"
 "    git push %s HEAD:<name-of-remote-branch>\n"
 
 #: builtin/push.c:111
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "您没有为推送提供任何引用表达式,并且 push.default 为 \"nothing\"。"
+msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
 
 #: builtin/push.c:131
 #, c-format
 "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 ""
 "\n"
 "    git push <name>\n"
 msgstr ""
-"未配置推送目标。\n"
-"或者通过命令行提供URL,或者用下面命令配置一个远程版本库\n"
+"没有配置推送目标。\n"
+"或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n"
 "\n"
 "    git remote add <name> <url>\n"
 "\n"
 
 #: builtin/reset.c:96
 msgid "Could not write new index file."
-msgstr "无法写入新的暂存区文件。"
+msgstr "不能写入新的索引文件。"
 
 #: builtin/reset.c:106
 #, c-format
 
 #: 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."
 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"
 #: 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"
 "'%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
 "'%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
 
 #: 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?"
 #: 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
 "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"
 #: git-am.sh:572
 #, sh-format
 msgid "Dirty index: cannot apply patches (dirty: $files)"
-msgstr "脏的暂存区:不能应用补丁(脏文件:$files)"
+msgstr "脏的索引:不能应用补丁(脏文件:$files)"
 
 #: git-am.sh:748
 msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "没有和终端关联的标准输入不能进行交互式操作。"
+msgstr "标准输入没有和终端关联不能进行交互式操作。"
 
-#  注意保持句尾空格
+#  译者:注意保持句尾空格
 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
 #. in your translation. The program will only accept English
 #. input at this point.
 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.
 
 #: 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."
 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.
 
 #: git-bisect.sh:474
 msgid "We are not bisecting."
-msgstr "我们没有进行二分查找。"
+msgstr "我们没有二分查找。"
 
 #: git-pull.sh:21
 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"
 
 #: 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"
 
 #: 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"
 
 #: git-stash.sh:227
 msgid "Cannot initialize stash"
-msgstr "无法初始化stash"
+msgstr "无法初始化 stash"
 
 #: git-stash.sh:235
 msgid "Cannot save the current status"
 
 #: 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 "提供太多的版本:$REV"
+msgstr "指定了太多的版本:$REV"
 
 #: git-stash.sh:365
 #, sh-format
 #: 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"
 
 #: 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"
 #: 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"
 #: 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
 #: git-submodule.sh:264
 #, sh-format
 msgid "'$path' already exists in the index"
-msgstr "'$path' 已经存在于暂存区中"
+msgstr "'$path' 已经存在于索引中"
 
 #: git-submodule.sh:281
 #, sh-format
 #: 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
 "Maybe you want to use 'update --init'?"
 msgstr ""
 "子模组路径 '$path' 没有初始化\n"
-"也许想用 'update --init'?"
+"也许想用 'update --init'?"
 
 #: git-submodule.sh:532
 #, sh-format
 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"
 #: git-submodule.sh:969
 #, sh-format
 msgid "Synchronizing submodule url for '$name'"
-msgstr "为 '$name' 同步子模组url"
+msgstr "为 '$name' 同步子模组 url"