l10n: zh.CN.po: update by msgmerge git.pot

Update of zh_CN.po: 134 fuzzy translations, 189 untranslated messages.

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

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 155c75e57e07c54835560759a1e85985788d1e48..053fbed9e06d75aa61f90237ca1b70b7a8c1e547 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"
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

-"POT-Creation-Date: 2012-05-15 06:31+0800\n"
+"POT-Creation-Date: 2012-05-21 08:57+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"
 "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"


@@ -42,6 +42,80 @@ msgstr ""
 "'git add/rm <file>' 标记解决方案，\n"
 "或使用 'git commit -a'。"
 
 "'git add/rm <file>' 标记解决方案，\n"
 "或使用 'git commit -a'。"
 

+#: bundle.c:36
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr ""
+
+#: bundle.c:63
+#, fuzzy, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "未识别的参数：%s"
+
+#: bundle.c:89 builtin/commit.c:697
+#, c-format
+msgid "could not open '%s'"
+msgstr "不能打开 '%s'"
+
+#: bundle.c:140
+msgid "Repository lacks these prerequisite commits:"
+msgstr ""
+
+#: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289
+#: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347
+#: builtin/shortlog.c:181
+msgid "revision walk setup failed"
+msgstr "版本遍历设置失败"
+
+#: bundle.c:186
+#, c-format
+msgid "The bundle contains %d ref"
+msgid_plural "The bundle contains %d refs"
+msgstr[0] ""
+
+#: bundle.c:192
+#, c-format
+msgid "The bundle requires this ref"
+msgid_plural "The bundle requires these %d refs"
+msgstr[0] ""
+
+#: bundle.c:290
+msgid "rev-list died"
+msgstr ""
+
+#: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "未识别的参数：%s"
+
+#: bundle.c:331
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr ""
+
+#: bundle.c:376
+#, fuzzy
+msgid "Refusing to create empty bundle."
+msgstr "不能创建临时索引"
+
+#: bundle.c:394
+#, fuzzy
+msgid "Could not spawn pack-objects"
+msgstr "不能读取对象 %s"
+
+#: bundle.c:412
+msgid "pack-objects died"
+msgstr ""
+
+#: bundle.c:415
+#, fuzzy, c-format
+msgid "cannot create '%s'"
+msgstr "不能读取 '%s'"
+
+#: bundle.c:437
+msgid "index-pack died"
+msgstr ""
+

 #: commit.c:48
 #, c-format
 msgid "could not parse %s"
 #: commit.c:48
 #, c-format
 msgid "could not parse %s"


@@ -70,6 +144,64 @@ msgstr "无法写入 rev-list：%s"
 msgid "failed to close rev-list's stdin: %s"
 msgstr "无法关闭 rev-list 的标准输入：%s"
 
 msgid "failed to close rev-list's stdin: %s"
 msgstr "无法关闭 rev-list 的标准输入：%s"
 

+#: date.c:95
+msgid "in the future"
+msgstr ""
+
+#: date.c:101
+#, c-format
+msgid "%lu second ago"
+msgid_plural "%lu seconds ago"
+msgstr[0] ""
+
+#: date.c:108
+#, c-format
+msgid "%lu minute ago"
+msgid_plural "%lu minutes ago"
+msgstr[0] ""
+
+#: date.c:115
+#, c-format
+msgid "%lu hour ago"
+msgid_plural "%lu hours ago"
+msgstr[0] ""
+
+#: date.c:122
+#, c-format
+msgid "%lu day ago"
+msgid_plural "%lu days ago"
+msgstr[0] ""
+
+#: date.c:128
+#, c-format
+msgid "%lu week ago"
+msgid_plural "%lu weeks ago"
+msgstr[0] ""
+
+#: date.c:135
+#, c-format
+msgid "%lu month ago"
+msgid_plural "%lu months ago"
+msgstr[0] ""
+
+#: date.c:146
+#, c-format
+msgid "%lu year"
+msgid_plural "%lu years"
+msgstr[0] ""
+
+#: date.c:149
+#, c-format
+msgid "%s, %lu month ago"
+msgid_plural "%s, %lu months ago"
+msgstr[0] ""
+
+#: date.c:154 date.c:159
+#, c-format
+msgid "%lu year ago"
+msgid_plural "%lu years ago"
+msgstr[0] ""
+

 #  译者：注意保持前导空格
 #: diff.c:105
 #, c-format
 #  译者：注意保持前导空格
 #: diff.c:105
 #, c-format


@@ -113,7 +245,7 @@ msgid ", %d deletion(-)"
 msgid_plural ", %d deletions(-)"
 msgstr[0] "，删除 %d 行(-)"
 
 msgid_plural ", %d deletions(-)"
 msgstr[0] "，删除 %d 行(-)"
 

-#: diff.c:3439
+#: diff.c:3478

 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"


@@ -149,7 +281,16 @@ msgstr "'%s'：%s"
 msgid "'%s': short read %s"
 msgstr "'%s'：读取不完整 %s"
 
 msgid "'%s': short read %s"
 msgstr "'%s'：读取不完整 %s"
 

-#: help.c:287
+#: help.c:207
+#, fuzzy, c-format
+msgid "available git commands in '%s'"
+msgstr "无法创建链接 '%s'"
+
+#: help.c:214
+msgid "git commands available from elsewhere on your $PATH"
+msgstr ""
+
+#: help.c:270

 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"


@@ -158,6 +299,58 @@ msgstr ""
 "'%s' 像是一个 git 命令，但却无法运行。\n"
 "可能是 git-%s 受损？"
 
 "'%s' 像是一个 git 命令，但却无法运行。\n"
 "可能是 git-%s 受损？"
 

+#: help.c:327
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr ""
+
+#: help.c:349
+#, c-format
+msgid ""
+"WARNING: You called a Git command named '%s', which does not exist.\n"
+"Continuing under the assumption that you meant '%s'"
+msgstr ""
+
+#: help.c:354
+#, c-format
+msgid "in %0.1f seconds automatically..."
+msgstr ""
+
+#: help.c:361
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr ""
+
+#: help.c:365
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+
+#: parse-options.c:493
+msgid "..."
+msgstr ""
+
+#: parse-options.c:511
+#, fuzzy, c-format
+msgid "usage: %s"
+msgstr "'%s'：%s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation
+#: parse-options.c:515
+#, fuzzy, c-format
+msgid "   or: %s"
+msgstr "HEAD（非分支）"
+
+#  译者：为保证在输出中对齐，注意调整句中空格！
+#: parse-options.c:518
+#, fuzzy, c-format
+msgid "    %s"
+msgstr "删除：      %s"
+

 #: remote.c:1607
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 #: remote.c:1607
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"


@@ -183,19 +376,19 @@ msgstr[0] ""
 "您的分支和 '%s' 出现了偏离，\n"
 "并且各自分别有 %d 和 %d 处不同的提交。\n"
 
 "您的分支和 '%s' 出现了偏离，\n"
 "并且各自分别有 %d 和 %d 处不同的提交。\n"
 

-#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978
+#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978

 #: builtin/merge.c:1088 builtin/merge.c:1098
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "不能为写入打开 '%s'"
 
 #: builtin/merge.c:1088 builtin/merge.c:1098
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "不能为写入打开 '%s'"
 

-#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868
+#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868

 #: builtin/merge.c:1090 builtin/merge.c:1103
 #, c-format
 msgid "Could not write to '%s'"
 msgstr "不能写入 '%s'"
 
 #: builtin/merge.c:1090 builtin/merge.c:1103
 #, c-format
 msgid "Could not write to '%s'"
 msgstr "不能写入 '%s'"
 

-#: sequencer.c:143
+#: sequencer.c:144

 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"


@@ -203,7 +396,7 @@ msgstr ""
 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
 "命令标记修正后的文件"
 
 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
 "命令标记修正后的文件"
 

-#: sequencer.c:146
+#: sequencer.c:147

 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"


@@ -212,202 +405,216 @@ msgstr ""
 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
 "对修正后的文件做标记，然后用 'git commit' 提交"
 
 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"
 "对修正后的文件做标记，然后用 'git commit' 提交"
 

-#: sequencer.c:159 sequencer.c:685 sequencer.c:768
+#: sequencer.c:160 sequencer.c:741 sequencer.c:824

 #, c-format
 msgid "Could not write to %s"
 msgstr "不能写入 %s"
 
 #, c-format
 msgid "Could not write to %s"
 msgstr "不能写入 %s"
 

-#: sequencer.c:162
+#: sequencer.c:163

 #, c-format
 msgid "Error wrapping up %s"
 msgstr "错误收尾 %s"
 
 #, c-format
 msgid "Error wrapping up %s"
 msgstr "错误收尾 %s"
 

-#: sequencer.c:177
+#: sequencer.c:178

 msgid "Your local changes would be overwritten by cherry-pick."
 msgstr "您的本地修改将被拣选操作覆盖。"
 
 msgid "Your local changes would be overwritten by cherry-pick."
 msgstr "您的本地修改将被拣选操作覆盖。"
 

-#: sequencer.c:179
+#: sequencer.c:180

 msgid "Your local changes would be overwritten by revert."
 msgstr "您的本地修改将被还原操作覆盖。"
 
 msgid "Your local changes would be overwritten by revert."
 msgstr "您的本地修改将被还原操作覆盖。"
 

-#: sequencer.c:182
+#: sequencer.c:183

 msgid "Commit your changes or stash them to proceed."
 msgstr "提交您的修改或保存进度后再继续。"
 
 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
 msgid "Commit your changes or stash them to proceed."
 msgstr "提交您的修改或保存进度后再继续。"
 
 #. TRANSLATORS: %s will be "revert" or "cherry-pick"

-#: sequencer.c:232
+#: sequencer.c:233

 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s：无法写入新索引文件"
 
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s：无法写入新索引文件"
 

-#: sequencer.c:298
+#: sequencer.c:261
+#, fuzzy
+msgid "Could not resolve HEAD commit\n"
+msgstr "不能解析 HEAD 提交"
+
+#: sequencer.c:282
+#, fuzzy
+msgid "Unable to update cache tree\n"
+msgstr "不能更新本地引用"
+
+#: sequencer.c:323
+#, fuzzy, c-format
+msgid "Could not parse commit %s\n"
+msgstr "不能解析 HEAD 提交"
+
+#: sequencer.c:328
+#, fuzzy, c-format
+msgid "Could not parse parent commit %s\n"
+msgstr "%s：不能解析父提交 %s"
+
+#: sequencer.c:358

 msgid "Your index file is unmerged."
 msgstr "您的索引文件未完成合并。"
 
 msgid "Your index file is unmerged."
 msgstr "您的索引文件未完成合并。"
 

-#: sequencer.c:301
+#: sequencer.c:361

 msgid "You do not have a valid HEAD"
 msgstr "您没有一个有效的 HEAD"
 
 msgid "You do not have a valid HEAD"
 msgstr "您没有一个有效的 HEAD"
 

-#: sequencer.c:316
+#: sequencer.c:376

 #, c-format
 msgid "Commit %s is a merge but no -m option was given."
 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
 
 #, c-format
 msgid "Commit %s is a merge but no -m option was given."
 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
 

-#: sequencer.c:324
+#: sequencer.c:384

 #, c-format
 msgid "Commit %s does not have parent %d"
 msgstr "提交 %s 没有父提交 %d"
 
 #, c-format
 msgid "Commit %s does not have parent %d"
 msgstr "提交 %s 没有父提交 %d"
 

-#: sequencer.c:328
+#: sequencer.c:388

 #, c-format
 msgid "Mainline was specified but commit %s is not a merge."
 msgstr "指定了主线但提交 %s 不是一个合并。"
 
 #. TRANSLATORS: The first %s will be "revert" or
 #. "cherry-pick", the second %s a SHA1
 #, c-format
 msgid "Mainline was specified but commit %s is not a merge."
 msgstr "指定了主线但提交 %s 不是一个合并。"
 
 #. TRANSLATORS: The first %s will be "revert" or
 #. "cherry-pick", the second %s a SHA1

-#: sequencer.c:339
+#: sequencer.c:399

 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：不能解析父提交 %s"
 
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：不能解析父提交 %s"
 

-#: sequencer.c:343
+#: sequencer.c:403

 #, c-format
 msgid "Cannot get commit message for %s"
 msgstr "不能得到 %s 的提交说明"
 
 #, c-format
 msgid "Cannot get commit message for %s"
 msgstr "不能得到 %s 的提交说明"
 

-#: sequencer.c:427
+#: sequencer.c:491

 #, c-format
 msgid "could not revert %s... %s"
 msgstr "不能还原 %s... %s"
 
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "不能还原 %s... %s"
 

-#: sequencer.c:428
+#: sequencer.c:492

 #, c-format
 msgid "could not apply %s... %s"
 msgstr "不能应用 %s... %s"
 
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "不能应用 %s... %s"
 

-#: sequencer.c:450 sequencer.c:909 builtin/log.c:289 builtin/log.c:719
-#: builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347
-#: builtin/shortlog.c:181
-msgid "revision walk setup failed"
-msgstr "版本遍历设置失败"
-
-#: sequencer.c:453
+#: sequencer.c:536

 msgid "empty commit set passed"
 msgstr "提供了空的提交集"
 
 msgid "empty commit set passed"
 msgstr "提供了空的提交集"
 

-#: sequencer.c:461
+#: sequencer.c:544

 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：无法读取索引"
 
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：无法读取索引"
 

-#: sequencer.c:466
+#: sequencer.c:549

 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：无法刷新索引"
 
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：无法刷新索引"
 

-#: sequencer.c:551
+#: sequencer.c:607

 #, c-format
 msgid "Cannot %s during a %s"
 msgstr "无法 %s 在一个 %s 过程中"
 
 #, c-format
 msgid "Cannot %s during a %s"
 msgstr "无法 %s 在一个 %s 过程中"
 

-#: sequencer.c:573
+#: sequencer.c:629

 #, c-format
 msgid "Could not parse line %d."
 msgstr "不能解析第 %d 行。"
 
 #, c-format
 msgid "Could not parse line %d."
 msgstr "不能解析第 %d 行。"
 

-#: sequencer.c:578
+#: sequencer.c:634

 msgid "No commits parsed."
 msgstr "没有提交被解析。"
 
 msgid "No commits parsed."
 msgstr "没有提交被解析。"
 

-#: sequencer.c:591
+#: sequencer.c:647

 #, c-format
 msgid "Could not open %s"
 msgstr "不能打开 %s"
 
 #, c-format
 msgid "Could not open %s"
 msgstr "不能打开 %s"
 

-#: sequencer.c:595
+#: sequencer.c:651

 #, c-format
 msgid "Could not read %s."
 msgstr "不能读取 %s。"
 
 #, c-format
 msgid "Could not read %s."
 msgstr "不能读取 %s。"
 

-#: sequencer.c:602
+#: sequencer.c:658

 #, c-format
 msgid "Unusable instruction sheet: %s"
 msgstr "无用的指令表单：%s"
 
 #, c-format
 msgid "Unusable instruction sheet: %s"
 msgstr "无用的指令表单：%s"
 

-#: sequencer.c:630
+#: sequencer.c:686

 #, c-format
 msgid "Invalid key: %s"
 msgstr "无效键名：%s"
 
 #, c-format
 msgid "Invalid key: %s"
 msgstr "无效键名：%s"
 

-#: sequencer.c:633
+#: sequencer.c:689

 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "无效的 %s 值：%s"
 
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "无效的 %s 值：%s"
 

-#: sequencer.c:645
+#: sequencer.c:701

 #, c-format
 msgid "Malformed options sheet: %s"
 msgstr "非法的选项表单：%s"
 
 #, c-format
 msgid "Malformed options sheet: %s"
 msgstr "非法的选项表单：%s"
 

-#: sequencer.c:666
+#: sequencer.c:722

 msgid "a cherry-pick or revert is already in progress"
 msgstr "一个拣选或还原操作已在进行"
 
 msgid "a cherry-pick or revert is already in progress"
 msgstr "一个拣选或还原操作已在进行"
 

-#: sequencer.c:667
+#: sequencer.c:723

 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
 
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
 

-#: sequencer.c:671
+#: sequencer.c:727

 #, c-format
 msgid "Could not create sequencer directory %s"
 msgstr "不能创建序列目录 %s"
 
 #, c-format
 msgid "Could not create sequencer directory %s"
 msgstr "不能创建序列目录 %s"
 

-#: sequencer.c:687 sequencer.c:772
+#: sequencer.c:743 sequencer.c:828

 #, c-format
 msgid "Error wrapping up %s."
 msgstr "错误收尾 %s。"
 
 #, c-format
 msgid "Error wrapping up %s."
 msgstr "错误收尾 %s。"
 

-#: sequencer.c:706 sequencer.c:840
+#: sequencer.c:762 sequencer.c:896

 msgid "no cherry-pick or revert in progress"
 msgstr "没有拣选或还原操作在进行"
 
 msgid "no cherry-pick or revert in progress"
 msgstr "没有拣选或还原操作在进行"
 

-#: sequencer.c:708
+#: sequencer.c:764

 msgid "cannot resolve HEAD"
 msgstr "不能解析 HEAD"
 
 msgid "cannot resolve HEAD"
 msgstr "不能解析 HEAD"
 

-#: sequencer.c:710
+#: sequencer.c:766

 msgid "cannot abort from a branch yet to be born"
 msgstr "不能从尚未建立的分支终止"
 
 msgid "cannot abort from a branch yet to be born"
 msgstr "不能从尚未建立的分支终止"
 

-#: sequencer.c:732
+#: sequencer.c:788 builtin/apply.c:3689

 #, c-format
 msgid "cannot open %s: %s"
 msgstr "不能打开 %s：%s"
 
 #, c-format
 msgid "cannot open %s: %s"
 msgstr "不能打开 %s：%s"
 

-#: sequencer.c:735
+#: sequencer.c:791

 #, c-format
 msgid "cannot read %s: %s"
 msgstr "不能读取 %s：%s"
 
 #, c-format
 msgid "cannot read %s: %s"
 msgstr "不能读取 %s：%s"
 

-#: sequencer.c:736
+#: sequencer.c:792

 msgid "unexpected end of file"
 msgstr "未预期的文件结束"
 
 msgid "unexpected end of file"
 msgstr "未预期的文件结束"
 

-#: sequencer.c:742
+#: sequencer.c:798

 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
 
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
 

-#: sequencer.c:765
+#: sequencer.c:821

 #, c-format
 msgid "Could not format %s."
 msgstr "不能格式化 %s。"
 
 #, c-format
 msgid "Could not format %s."
 msgstr "不能格式化 %s。"
 

-#: sequencer.c:927
+#: sequencer.c:983

 msgid "Can't revert as initial commit"
 msgstr "不能作为初始提交还原"
 
 msgid "Can't revert as initial commit"
 msgstr "不能作为初始提交还原"
 

-#: sequencer.c:928
+#: sequencer.c:984

 msgid "Can't cherry-pick into empty head"
 msgstr "不能拣选到空分支"
 
 msgid "Can't cherry-pick into empty head"
 msgstr "不能拣选到空分支"
 


@@ -430,261 +637,261 @@ msgstr "尚未给分支 '%s' 设置上游"
 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
 
 msgid "Upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
 

-#: wt-status.c:134
+#: wt-status.c:135

 msgid "Unmerged paths:"
 msgstr "未合并的路径："
 
 #  译者：注意保持前导空格
 msgid "Unmerged paths:"
 msgstr "未合并的路径："
 
 #  译者：注意保持前导空格

-#: wt-status.c:140 wt-status.c:157
+#: wt-status.c:141 wt-status.c:158

 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  （使用 \"git reset %s <file>...\" 撤出暂存区）"
 
 #  译者：注意保持前导空格
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  （使用 \"git reset %s <file>...\" 撤出暂存区）"
 
 #  译者：注意保持前导空格

-#: wt-status.c:142 wt-status.c:159
+#: wt-status.c:143 wt-status.c:160

 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  （使用 \"git rm --cached <file>...\" 撤出暂存区）"
 
 #  译者：注意保持前导空格
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  （使用 \"git rm --cached <file>...\" 撤出暂存区）"
 
 #  译者：注意保持前导空格

-#: wt-status.c:143
+#: wt-status.c:144

 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  （酌情使用 \"git add/rm <file>...\" 标记解决方案）"
 
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  （酌情使用 \"git add/rm <file>...\" 标记解决方案）"
 

-#: wt-status.c:151
+#: wt-status.c:152

 msgid "Changes to be committed:"
 msgstr "要提交的变更："
 
 msgid "Changes to be committed:"
 msgstr "要提交的变更："
 

-#: wt-status.c:169
+#: wt-status.c:170

 msgid "Changes not staged for commit:"
 msgstr "尚未暂存以备提交的变更："
 
 #  译者：注意保持前导空格
 msgid "Changes not staged for commit:"
 msgstr "尚未暂存以备提交的变更："
 
 #  译者：注意保持前导空格

-#: wt-status.c:173
+#: wt-status.c:174

 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add <file>...\" 更新要提交的内容）"
 
 #  译者：注意保持前导空格
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add <file>...\" 更新要提交的内容）"
 
 #  译者：注意保持前导空格

-#: wt-status.c:175
+#: wt-status.c:176

 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add/rm <file>...\" 更新要提交的内容）"
 
 #  译者：注意保持前导空格
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add/rm <file>...\" 更新要提交的内容）"
 
 #  译者：注意保持前导空格

-#: wt-status.c:176
+#: wt-status.c:177

 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr "  （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"
 
 #  译者：注意保持前导空格
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr "  （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"
 
 #  译者：注意保持前导空格

-#: wt-status.c:178
+#: wt-status.c:179

 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  （提交或丢弃子模组中未跟踪或修改的内容）"
 
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  （提交或丢弃子模组中未跟踪或修改的内容）"
 

-#: wt-status.c:187
+#: wt-status.c:188

 #, c-format
 msgid "%s files:"
 msgstr "%s文件："
 
 #  译者：注意保持前导空格
 #, c-format
 msgid "%s files:"
 msgstr "%s文件："
 
 #  译者：注意保持前导空格

-#: wt-status.c:190
+#: wt-status.c:191

 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  （使用 \"git %s <file>...\" 以包含要提交的内容）"
 
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  （使用 \"git %s <file>...\" 以包含要提交的内容）"
 

-#: wt-status.c:207
+#: wt-status.c:208

 msgid "bug"
 msgstr "bug"
 
 msgid "bug"
 msgstr "bug"
 

-#: wt-status.c:212
+#: wt-status.c:213

 msgid "both deleted:"
 msgstr "双方删除："
 
 msgid "both deleted:"
 msgstr "双方删除："
 

-#: wt-status.c:213
+#: wt-status.c:214

 msgid "added by us:"
 msgstr "由我们添加："
 
 msgid "added by us:"
 msgstr "由我们添加："
 

-#: wt-status.c:214
+#: wt-status.c:215

 msgid "deleted by them:"
 msgstr "由他们删除："
 
 msgid "deleted by them:"
 msgstr "由他们删除："
 

-#: wt-status.c:215
+#: wt-status.c:216

 msgid "added by them:"
 msgstr "由他们添加："
 
 msgid "added by them:"
 msgstr "由他们添加："
 

-#: wt-status.c:216
+#: wt-status.c:217

 msgid "deleted by us:"
 msgstr "由我们删除："
 
 msgid "deleted by us:"
 msgstr "由我们删除："
 

-#: wt-status.c:217
+#: wt-status.c:218

 msgid "both added:"
 msgstr "双方添加："
 
 msgid "both added:"
 msgstr "双方添加："
 

-#: wt-status.c:218
+#: wt-status.c:219

 msgid "both modified:"
 msgstr "双方修改："
 
 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 msgid "both modified:"
 msgstr "双方修改："
 
 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

-#: wt-status.c:248
+#: wt-status.c:249

 msgid "new commits, "
 msgstr "新提交, "
 
 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 msgid "new commits, "
 msgstr "新提交, "
 
 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

-#: wt-status.c:250
+#: wt-status.c:251

 msgid "modified content, "
 msgstr "修改的内容, "
 
 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 msgid "modified content, "
 msgstr "修改的内容, "
 
 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

-#: wt-status.c:252
+#: wt-status.c:253

 msgid "untracked content, "
 msgstr "未跟踪的内容, "
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
 msgid "untracked content, "
 msgstr "未跟踪的内容, "
 
 #  译者：为保证在输出中对齐，注意调整句中空格！

-#: wt-status.c:266
+#: wt-status.c:267

 #, c-format
 msgid "new file:   %s"
 msgstr "新文件：    %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
 #, c-format
 msgid "new file:   %s"
 msgstr "新文件：    %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！

-#: wt-status.c:269
+#: wt-status.c:270

 #, c-format
 msgid "copied:     %s -> %s"
 msgstr "拷贝：      %s -> %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
 #, c-format
 msgid "copied:     %s -> %s"
 msgstr "拷贝：      %s -> %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！

-#: wt-status.c:272
+#: wt-status.c:273

 #, c-format
 msgid "deleted:    %s"
 msgstr "删除：      %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
 #, c-format
 msgid "deleted:    %s"
 msgstr "删除：      %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！

-#: wt-status.c:275
+#: wt-status.c:276

 #, c-format
 msgid "modified:   %s"
 msgstr "修改：      %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
 #, c-format
 msgid "modified:   %s"
 msgstr "修改：      %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！

-#: wt-status.c:278
+#: wt-status.c:279

 #, c-format
 msgid "renamed:    %s -> %s"
 msgstr "重命名：    %s -> %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
 #, c-format
 msgid "renamed:    %s -> %s"
 msgstr "重命名：    %s -> %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！

-#: wt-status.c:281
+#: wt-status.c:282

 #, c-format
 msgid "typechange: %s"
 msgstr "类型变更：  %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
 #, c-format
 msgid "typechange: %s"
 msgstr "类型变更：  %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！

-#: wt-status.c:284
+#: wt-status.c:285

 #, c-format
 msgid "unknown:    %s"
 msgstr "未知：      %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
 #, c-format
 msgid "unknown:    %s"
 msgstr "未知：      %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！

-#: wt-status.c:287
+#: wt-status.c:288

 #, c-format
 msgid "unmerged:   %s"
 msgstr "未合并：    %s"
 
 #, c-format
 msgid "unmerged:   %s"
 msgstr "未合并：    %s"
 

-#: wt-status.c:290
+#: wt-status.c:291

 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr "bug：未处理的差异状态 %c"
 
 #, c-format
 msgid "bug: unhandled diff status %c"
 msgstr "bug：未处理的差异状态 %c"
 

-#: wt-status.c:713
+#: wt-status.c:737

 msgid "On branch "
 msgstr "位于分支 "
 
 msgid "On branch "
 msgstr "位于分支 "
 

-#: wt-status.c:720
+#: wt-status.c:744

 msgid "Not currently on any branch."
 msgstr "当前不在任何分支上。"
 
 msgid "Not currently on any branch."
 msgstr "当前不在任何分支上。"
 

-#: wt-status.c:731
+#: wt-status.c:755

 msgid "Initial commit"
 msgstr "初始提交"
 
 msgid "Initial commit"
 msgstr "初始提交"
 

-#: wt-status.c:745
+#: wt-status.c:769

 msgid "Untracked"
 msgstr "未跟踪的"
 
 msgid "Untracked"
 msgstr "未跟踪的"
 

-#: wt-status.c:747
+#: wt-status.c:771

 msgid "Ignored"
 msgstr "忽略的"
 
 msgid "Ignored"
 msgstr "忽略的"
 

-#: wt-status.c:749
+#: wt-status.c:773

 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"
 
 #  译者：中文字符串拼接，可删除前导空格
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"
 
 #  译者：中文字符串拼接，可删除前导空格

-#: wt-status.c:751
+#: wt-status.c:775

 msgid " (use -u option to show untracked files)"
 msgstr "（使用 -u 参数显示未跟踪的文件）"
 
 msgid " (use -u option to show untracked files)"
 msgstr "（使用 -u 参数显示未跟踪的文件）"
 

-#: wt-status.c:757
+#: wt-status.c:781

 msgid "No changes"
 msgstr "没有修改"
 
 msgid "No changes"
 msgstr "没有修改"
 

-#: wt-status.c:761
+#: wt-status.c:785

 #, c-format
 msgid "no changes added to commit%s\n"
 msgstr "修改尚未加入提交%s\n"
 
 #  译者：中文字符串拼接，可删除前导空格
 #, c-format
 msgid "no changes added to commit%s\n"
 msgstr "修改尚未加入提交%s\n"
 
 #  译者：中文字符串拼接，可删除前导空格

-#: wt-status.c:763
+#: wt-status.c:787

 msgid " (use \"git add\" and/or \"git commit -a\")"
 msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）"
 
 msgid " (use \"git add\" and/or \"git commit -a\")"
 msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）"
 

-#: wt-status.c:765
+#: wt-status.c:789

 #, c-format
 msgid "nothing added to commit but untracked files present%s\n"
 msgstr "空提交但存在未跟踪文件%s\n"
 
 #  译者：中文字符串拼接，可删除前导空格
 #, c-format
 msgid "nothing added to commit but untracked files present%s\n"
 msgstr "空提交但存在未跟踪文件%s\n"
 
 #  译者：中文字符串拼接，可删除前导空格

-#: wt-status.c:767
+#: wt-status.c:791

 msgid " (use \"git add\" to track)"
 msgstr "（使用 \"git add\" 建立跟踪）"
 
 msgid " (use \"git add\" to track)"
 msgstr "（使用 \"git add\" 建立跟踪）"
 

-#: wt-status.c:769 wt-status.c:772 wt-status.c:775
+#: wt-status.c:793 wt-status.c:796 wt-status.c:799

 #, c-format
 msgid "nothing to commit%s\n"
 msgstr "无须提交%s\n"
 
 #  译者：中文字符串拼接，可删除前导空格
 #, c-format
 msgid "nothing to commit%s\n"
 msgstr "无须提交%s\n"
 
 #  译者：中文字符串拼接，可删除前导空格

-#: wt-status.c:770
+#: wt-status.c:794

 msgid " (create/copy files and use \"git add\" to track)"
 msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）"
 
 #  译者：中文字符串拼接，可删除前导空格
 msgid " (create/copy files and use \"git add\" to track)"
 msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）"
 
 #  译者：中文字符串拼接，可删除前导空格

-#: wt-status.c:773
+#: wt-status.c:797

 msgid " (use -u to show untracked files)"
 msgstr "（使用 -u 显示未跟踪文件）"
 
 #  译者：中文字符串拼接，可删除前导空格
 msgid " (use -u to show untracked files)"
 msgstr "（使用 -u 显示未跟踪文件）"
 
 #  译者：中文字符串拼接，可删除前导空格

-#: wt-status.c:776
+#: wt-status.c:800

 msgid " (working directory clean)"
 msgstr "（干净的工作区）"
 
 msgid " (working directory clean)"
 msgstr "（干净的工作区）"
 

-#: wt-status.c:884
+#: wt-status.c:908

 msgid "HEAD (no branch)"
 msgstr "HEAD（非分支）"
 
 #  译者：注意保持句尾空格
 msgid "HEAD (no branch)"
 msgstr "HEAD（非分支）"
 
 #  译者：注意保持句尾空格

-#: wt-status.c:890
+#: wt-status.c:914

 msgid "Initial commit on "
 msgstr "初始提交于 "
 
 #  译者：注意保持句尾空格
 msgid "Initial commit on "
 msgstr "初始提交于 "
 
 #  译者：注意保持句尾空格

-#: wt-status.c:905
+#: wt-status.c:929

 msgid "behind "
 msgstr "落后 "
 
 #  译者：注意保持句尾空格
 msgid "behind "
 msgstr "落后 "
 
 #  译者：注意保持句尾空格

-#: wt-status.c:908 wt-status.c:911
+#: wt-status.c:932 wt-status.c:935

 msgid "ahead "
 msgstr "领先 "
 
 #  译者：注意保持句尾空格
 msgid "ahead "
 msgstr "领先 "
 
 #  译者：注意保持句尾空格

-#: wt-status.c:913
+#: wt-status.c:937

 msgid ", behind "
 msgstr "，落后 "
 
 msgid ", behind "
 msgstr "，落后 "
 


@@ -693,7 +900,7 @@ msgstr "，落后 "
 msgid "unexpected diff status %c"
 msgstr "意外的差异状态 %c"
 
 msgid "unexpected diff status %c"
 msgstr "意外的差异状态 %c"
 

-#: builtin/add.c:67 builtin/commit.c:298
+#: builtin/add.c:67 builtin/commit.c:226

 msgid "updating files failed"
 msgstr "更新文件失败"
 
 msgid "updating files failed"
 msgstr "更新文件失败"
 


@@ -743,54 +950,514 @@ msgstr "不能查看文件状态 '%s'"
 msgid "Empty patch. Aborted."
 msgstr "空补丁。异常终止。"
 
 msgid "Empty patch. Aborted."
 msgstr "空补丁。异常终止。"
 

-#: builtin/add.c:303
-#, c-format
-msgid "Could not apply '%s'"
-msgstr "不能应用 '%s'"
+#: builtin/add.c:303
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "不能应用 '%s'"
+
+#: builtin/add.c:312
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n"
+
+#: builtin/add.c:352
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr "使用 -f 参数如果您确实要添加它们。\n"
+
+#: builtin/add.c:353
+msgid "no files added"
+msgstr "没有文件被添加"
+
+#: builtin/add.c:359
+msgid "adding files failed"
+msgstr "添加文件失败"
+
+#: builtin/add.c:391
+msgid "-A and -u are mutually incompatible"
+msgstr "-A 和 -u 选项互斥"
+
+#: builtin/add.c:393
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
+
+#: builtin/add.c:413
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "没有指定文件，也没有文件被添加。\n"
+
+#: builtin/add.c:414
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "也许您想要执行 'git add .'？\n"
+
+#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82
+#: builtin/rm.c:162
+msgid "index file corrupt"
+msgstr "索引文件损坏"
+
+#: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260
+msgid "Unable to write new index file"
+msgstr "无法写入新索引文件"
+
+#: builtin/apply.c:53
+msgid "git apply [options] [<patch>...]"
+msgstr ""
+
+#: builtin/apply.c:106
+#, fuzzy, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "未识别的选项：'$arg'"
+
+#: builtin/apply.c:121
+#, fuzzy, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "未识别的选项：'$arg'"
+
+#: builtin/apply.c:815
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr ""
+
+#: builtin/apply.c:824
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr ""
+
+#: builtin/apply.c:905
+#, fuzzy, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "不能处理 %d 类型的文件"
+
+#: builtin/apply.c:937
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+
+#: builtin/apply.c:941
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+
+#: builtin/apply.c:942
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+
+#: builtin/apply.c:949
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr ""
+
+#: builtin/apply.c:1394
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr ""
+
+#: builtin/apply.c:1451
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr ""
+
+#: builtin/apply.c:1468
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+
+#: builtin/apply.c:1628
+msgid "new file depends on old contents"
+msgstr ""
+
+#: builtin/apply.c:1630
+msgid "deleted file still has contents"
+msgstr ""
+
+#: builtin/apply.c:1656
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr ""
+
+#: builtin/apply.c:1692
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr ""
+
+#: builtin/apply.c:1694
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr ""
+
+#: builtin/apply.c:1697
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr ""
+
+#: builtin/apply.c:1843
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr ""
+
+#. there has to be one hunk (forward hunk)
+#: builtin/apply.c:1872
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr ""
+
+#: builtin/apply.c:1958
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr ""
+
+#: builtin/apply.c:2048
+#, fuzzy, c-format
+msgid "unable to read symlink %s"
+msgstr "无法读取树（%s）"
+
+#: builtin/apply.c:2052
+#, fuzzy, c-format
+msgid "unable to open or read %s"
+msgstr "不能打开或读取 '%s'"
+
+#: builtin/apply.c:2123
+msgid "oops"
+msgstr ""
+
+#: builtin/apply.c:2645
+#, fuzzy, c-format
+msgid "invalid start of line: '%c'"
+msgstr "无效引用：%s"
+
+#: builtin/apply.c:2763
+#, c-format
+msgid "Hunk #%d succeeded at %d (offset %d line)."
+msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
+msgstr[0] ""
+
+#: builtin/apply.c:2775
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr ""
+
+#: builtin/apply.c:2781
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+
+#: builtin/apply.c:2800
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr ""
+
+#: builtin/apply.c:2903
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr ""
+
+#: builtin/apply.c:2909
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+
+#: builtin/apply.c:2930
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr ""
+
+#: builtin/apply.c:3045
+#, c-format
+msgid "patch %s has been renamed/deleted"
+msgstr ""
+
+#: builtin/apply.c:3052 builtin/apply.c:3069
+#, fuzzy, c-format
+msgid "read of %s failed"
+msgstr "重命名 '%s' 失败"
+
+#: builtin/apply.c:3084
+msgid "removal patch leaves file contents"
+msgstr ""
+
+#: builtin/apply.c:3105
+#, fuzzy, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s 存在且不是一个目录"
+
+#: builtin/apply.c:3143
+#, c-format
+msgid "%s: has been deleted/renamed"
+msgstr ""
+
+#: builtin/apply.c:3148 builtin/apply.c:3179
+#, fuzzy, c-format
+msgid "%s: %s"
+msgstr "'%s'：%s"
+
+#: builtin/apply.c:3159
+#, c-format
+msgid "%s: does not exist in index"
+msgstr ""
+
+#: builtin/apply.c:3173
+#, fuzzy, c-format
+msgid "%s: does not match index"
+msgstr "不能读取索引"
+
+#: builtin/apply.c:3190
+#, c-format
+msgid "%s: wrong type"
+msgstr ""
+
+#: builtin/apply.c:3192
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr ""
+
+#: builtin/apply.c:3247
+#, fuzzy, c-format
+msgid "%s: already exists in index"
+msgstr "%s 已经存在"
+
+#: builtin/apply.c:3266
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)%s%s"
+msgstr ""
+
+#: builtin/apply.c:3272
+#, c-format
+msgid "%s: patch does not apply"
+msgstr ""
+
+#: builtin/apply.c:3285
+#, c-format
+msgid "Checking patch %s..."
+msgstr ""
+
+#: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
+
+#: builtin/apply.c:3483
+#, fuzzy, c-format
+msgid "unable to remove %s from index"
+msgstr "不能移动 %s 至 %s"
+
+#: builtin/apply.c:3510
+#, c-format
+msgid "corrupt patch for subproject %s"
+msgstr ""
+
+#: builtin/apply.c:3514
+#, fuzzy, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "不能创建文件 '%s'"
+
+#: builtin/apply.c:3519
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr ""
+
+#: builtin/apply.c:3522
+#, fuzzy, c-format
+msgid "unable to add cache entry for %s"
+msgstr "无法为 '%s' 添加合并结果"
+
+#: builtin/apply.c:3555
+#, fuzzy, c-format
+msgid "closing file '%s'"
+msgstr "正克隆到 '%s'...\n"
+
+#: builtin/apply.c:3604
+#, fuzzy, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "不能写 %s"
+
+#: builtin/apply.c:3660
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr ""
+
+#: builtin/apply.c:3668
+#, fuzzy
+msgid "internal error"
+msgstr "在版本遍历时遇到内部错误"
+
+#. Say this even without --verbose
+#: builtin/apply.c:3671
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] ""
+
+#: builtin/apply.c:3681
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr ""
+
+#: builtin/apply.c:3702
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr ""
+
+#: builtin/apply.c:3705
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr ""
+
+#: builtin/apply.c:3836
+#, fuzzy
+msgid "unrecognized input"
+msgstr "未识别的参数：%s"
+
+#: builtin/apply.c:3847
+#, fuzzy
+msgid "unable to read index file"
+msgstr "无法写新的索引文件"
+
+#: builtin/apply.c:3962 builtin/apply.c:3965
+msgid "path"
+msgstr ""
+
+#: builtin/apply.c:3963
+msgid "don't apply changes matching the given path"
+msgstr ""
+
+#: builtin/apply.c:3966
+msgid "apply changes matching the given path"
+msgstr ""
+
+#: builtin/apply.c:3968
+msgid "num"
+msgstr ""
+
+#: builtin/apply.c:3969
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr ""
+
+#: builtin/apply.c:3972
+msgid "ignore additions made by the patch"
+msgstr ""
+
+#: builtin/apply.c:3974
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr ""
+
+#: builtin/apply.c:3978
+msgid "shows number of added and deleted lines in decimal notation"
+msgstr ""
+
+#: builtin/apply.c:3980
+msgid "instead of applying the patch, output a summary for the input"
+msgstr ""
+
+#: builtin/apply.c:3982
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr ""
+
+#: builtin/apply.c:3984
+msgid "make sure the patch is applicable to the current index"
+msgstr ""
+
+#: builtin/apply.c:3986
+msgid "apply a patch without touching the working tree"
+msgstr ""
+
+#: builtin/apply.c:3988
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr ""
+
+#: builtin/apply.c:3990
+msgid "build a temporary index based on embedded index information"
+msgstr ""
+
+#: builtin/apply.c:3992
+msgid "paths are separated with NUL character"
+msgstr ""
+
+#: builtin/apply.c:3995
+msgid "ensure at least <n> lines of context match"
+msgstr ""
+
+#: builtin/apply.c:3996
+msgid "action"
+msgstr ""
+
+#: builtin/apply.c:3997
+msgid "detect new or modified lines that have whitespace errors"
+msgstr ""
+
+#: builtin/apply.c:4000 builtin/apply.c:4003
+msgid "ignore changes in whitespace when finding context"
+msgstr ""
+
+#: builtin/apply.c:4006
+msgid "apply the patch in reverse"
+msgstr ""
+
+#: builtin/apply.c:4008
+msgid "don't expect at least one line of context"
+msgstr ""
+
+#: builtin/apply.c:4010
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr ""
+
+#: builtin/apply.c:4012
+msgid "allow overlapping hunks"
+msgstr ""
+
+#: builtin/apply.c:4013
+msgid "be verbose"
+msgstr ""

 
 

-#: builtin/add.c:312
-msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "下列路径被您的一个 .gitignore 文件所忽略：\n"
+#: builtin/apply.c:4015
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr ""

 
 

-#: builtin/add.c:352
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "使用 -f 参数如果您确实要添加它们。\n"
+#: builtin/apply.c:4018
+msgid "do not trust the line counts in the hunk headers"
+msgstr ""

 
 

-#: builtin/add.c:353
-msgid "no files added"
-msgstr "没有文件被添加"
+#: builtin/apply.c:4020
+msgid "root"
+msgstr ""

 
 

-#: builtin/add.c:359
-msgid "adding files failed"
-msgstr "添加文件失败"
+#: builtin/apply.c:4021
+msgid "prepend <root> to all filenames"
+msgstr ""

 
 

-#: builtin/add.c:391
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 和 -u 选项互斥"
+#: builtin/apply.c:4042
+#, fuzzy
+msgid "--index outside a repository"
+msgstr "不是一个 git 版本库"

 
 

-#: builtin/add.c:393
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "选项 --ignore-missing 只能和 --dry-run 共用"
+#: builtin/apply.c:4045
+#, fuzzy
+msgid "--cached outside a repository"
+msgstr "不是一个 git 版本库"

 
 

-#: builtin/add.c:413
-#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "没有指定文件，也没有文件被添加。\n"
+#: builtin/apply.c:4061
+#, fuzzy, c-format
+msgid "can't open patch '%s'"
+msgstr "不能打开 '%s'"

 
 

-#: builtin/add.c:414
+#: builtin/apply.c:4075

 #, c-format
 #, c-format

-msgid "Maybe you wanted to say 'git add .'?\n"
-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 "索引文件损坏"
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] ""

 
 

-#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260
-msgid "Unable to write new index file"
-msgstr "无法写入新索引文件"
+#: builtin/apply.c:4081 builtin/apply.c:4091
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] ""

 
 #: builtin/archive.c:17
 #, c-format
 
 #: builtin/archive.c:17
 #, c-format


@@ -828,7 +1495,7 @@ msgid "git archive: expected a flush"
 msgstr "git archive：预期一个刷新"
 
 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
 msgstr "git archive：预期一个刷新"
 
 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长

-#: builtin/branch.c:137
+#: builtin/branch.c:144

 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"


@@ -838,7 +1505,7 @@ msgstr ""
 "         '%s'，但未合并到 HEAD。"
 
 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
 "         '%s'，但未合并到 HEAD。"
 
 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长

-#: builtin/branch.c:141
+#: builtin/branch.c:148

 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"


@@ -847,36 +1514,35 @@ msgstr ""
 "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
 "         然而却尚未被合并到分支 '%s' 。"
 
 "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
 "         然而却尚未被合并到分支 '%s' 。"
 

-#  译者：汉字之间无空格，故删除尾部空格
-#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
-#: builtin/branch.c:164
-msgid "remote "
-msgstr "远程"
-
-#: builtin/branch.c:172
+#: builtin/branch.c:180

 msgid "cannot use -a with -d"
 msgstr "不能将 -a 和 -d 共用"
 
 msgid "cannot use -a with -d"
 msgstr "不能将 -a 和 -d 共用"
 

-#: builtin/branch.c:178
+#: builtin/branch.c:186

 msgid "Couldn't look up commit object for HEAD"
 msgstr "无法查询 HEAD 指向的提交对象"
 
 msgid "Couldn't look up commit object for HEAD"
 msgstr "无法查询 HEAD 指向的提交对象"
 

-#: builtin/branch.c:183
+#: builtin/branch.c:191

 #, c-format
 msgid "Cannot delete the branch '%s' which you are currently on."
 msgstr "无法删除您当前所在的分支 '%s'。"
 
 #, c-format
 msgid "Cannot delete the branch '%s' which you are currently on."
 msgstr "无法删除您当前所在的分支 '%s'。"
 

-#: builtin/branch.c:193
-#, c-format
-msgid "%sbranch '%s' not found."
+#: builtin/branch.c:202
+#, fuzzy, c-format
+msgid "remote branch '%s' not found."

 msgstr "%s分支 '%s' 未发现。"
 
 msgstr "%s分支 '%s' 未发现。"
 

-#: builtin/branch.c:201
+#: builtin/branch.c:203
+#, fuzzy, c-format
+msgid "branch '%s' not found."
+msgstr "%s分支 '%s' 未发现。"
+
+#: builtin/branch.c:210

 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "无法查询 '%s' 指向的提交对象"
 
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "无法查询 '%s' 指向的提交对象"
 

-#: builtin/branch.c:207
+#: builtin/branch.c:216

 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"


@@ -885,97 +1551,130 @@ msgstr ""
 "分支 '%s' 没有完全合并。\n"
 "如果您确认要删除它，执行 'git branch -D %s'。"
 
 "分支 '%s' 没有完全合并。\n"
 "如果您确认要删除它，执行 'git branch -D %s'。"
 

-#: builtin/branch.c:215
-#, c-format
-msgid "Error deleting %sbranch '%s'"
+#: builtin/branch.c:225
+#, fuzzy, c-format
+msgid "Error deleting remote branch '%s'"

 msgstr "删除 %s分支 '%s' 时出错"
 
 msgstr "删除 %s分支 '%s' 时出错"
 

-#: builtin/branch.c:221
-#, c-format
-msgid "Deleted %sbranch %s (was %s).\n"
+#: builtin/branch.c:226
+#, fuzzy, c-format
+msgid "Error deleting branch '%s'"
+msgstr "删除 %s分支 '%s' 时出错"
+
+#: builtin/branch.c:233
+#, fuzzy, c-format
+msgid "Deleted remote branch %s (was %s).\n"

 msgstr "已删除 %s分支 %s（曾为 %s）。\n"
 
 msgstr "已删除 %s分支 %s（曾为 %s）。\n"
 

-#: builtin/branch.c:226
+#: builtin/branch.c:234
+#, fuzzy, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "已删除 %s分支 %s（曾为 %s）。\n"
+
+#: builtin/branch.c:239

 msgid "Update of config-file failed"
 msgstr "无法更新 config 文件"
 
 msgid "Update of config-file failed"
 msgstr "无法更新 config 文件"
 

-#: builtin/branch.c:324
+#: builtin/branch.c:337

 #, c-format
 msgid "branch '%s' does not point at a commit"
 msgstr "分支 '%s' 未指向一个提交"
 
 #  译者：注意保持句尾空格
 #, c-format
 msgid "branch '%s' does not point at a commit"
 msgstr "分支 '%s' 未指向一个提交"
 
 #  译者：注意保持句尾空格

-#: builtin/branch.c:396
-#, c-format
-msgid "behind %d] "
+#: builtin/branch.c:409
+#, fuzzy, c-format
+msgid "[%s: behind %d]"

 msgstr "落后 %d] "
 
 #  译者：注意保持句尾空格
 msgstr "落后 %d] "
 
 #  译者：注意保持句尾空格

-#: builtin/branch.c:398
-#, c-format
-msgid "ahead %d] "
+#: builtin/branch.c:411
+#, fuzzy, c-format
+msgid "[behind %d]"
+msgstr "落后 %d] "
+
+#  译者：注意保持句尾空格
+#: builtin/branch.c:415
+#, fuzzy, c-format
+msgid "[%s: ahead %d]"

 msgstr "领先 %d] "
 
 #  译者：注意保持句尾空格
 msgstr "领先 %d] "
 
 #  译者：注意保持句尾空格

-#: builtin/branch.c:400
-#, c-format
-msgid "ahead %d, behind %d] "
+#: builtin/branch.c:417
+#, fuzzy, c-format
+msgid "[ahead %d]"
+msgstr "领先 %d] "
+
+#  译者：注意保持句尾空格
+#: builtin/branch.c:420
+#, fuzzy, c-format
+msgid "[%s: ahead %d, behind %d]"
+msgstr "领先 %d，落后 %d] "
+
+#  译者：注意保持句尾空格
+#: builtin/branch.c:423
+#, fuzzy, c-format
+msgid "[ahead %d, behind %d]"

 msgstr "领先 %d，落后 %d] "
 
 msgstr "领先 %d，落后 %d] "
 

-#: builtin/branch.c:503
+#: builtin/branch.c:535

 msgid "(no branch)"
 msgstr "（非分支）"
 
 msgid "(no branch)"
 msgstr "（非分支）"
 

-#: builtin/branch.c:568
+#: builtin/branch.c:600

 msgid "some refs could not be read"
 msgstr "一些引用不能读取"
 
 msgid "some refs could not be read"
 msgstr "一些引用不能读取"
 

-#: builtin/branch.c:581
+#: builtin/branch.c:613

 msgid "cannot rename the current branch while not on any."
 msgstr "无法重命名当前分支因为不处于任何分支上。"
 
 msgid "cannot rename the current branch while not on any."
 msgstr "无法重命名当前分支因为不处于任何分支上。"
 

-#: builtin/branch.c:591
+#: builtin/branch.c:623

 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "无效的分支名：'%s'"
 
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "无效的分支名：'%s'"
 

-#: builtin/branch.c:606
+#: builtin/branch.c:638

 msgid "Branch rename failed"
 msgstr "分支重命名失败"
 
 msgid "Branch rename failed"
 msgstr "分支重命名失败"
 

-#: builtin/branch.c:610
+#: builtin/branch.c:642

 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "重命名掉一个错误命名的旧分支 '%s'"
 
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "重命名掉一个错误命名的旧分支 '%s'"
 

-#: builtin/branch.c:614
+#: builtin/branch.c:646

 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支重命名为 %s，但 HEAD 没有更新！"
 
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支重命名为 %s，但 HEAD 没有更新！"
 

-#: builtin/branch.c:621
+#: builtin/branch.c:653

 msgid "Branch is renamed, but update of config-file failed"
 msgstr "分支被重命名，但更新 config 文件失败"
 
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "分支被重命名，但更新 config 文件失败"
 

-#: builtin/branch.c:636
+#: builtin/branch.c:668

 #, c-format
 msgid "malformed object name %s"
 msgstr "非法的对象名 %s"
 
 #, c-format
 msgid "malformed object name %s"
 msgstr "非法的对象名 %s"
 

-#: builtin/branch.c:660
-#, c-format
-msgid "could not write branch description template: %s\n"
+#: builtin/branch.c:692
+#, fuzzy, c-format
+msgid "could not write branch description template: %s"

 msgstr "不能写分支描述模版：%s\n"
 
 msgstr "不能写分支描述模版：%s\n"
 

-#: builtin/branch.c:750
+#: builtin/branch.c:783

 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "无法将 HEAD 解析为有效引用。"
 
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "无法将 HEAD 解析为有效引用。"
 

-#: builtin/branch.c:755 builtin/clone.c:558
+#: builtin/branch.c:788 builtin/clone.c:558

 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有位于 /refs/heads 之下！"
 
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有位于 /refs/heads 之下！"
 

-#: builtin/branch.c:813
+#: builtin/branch.c:808
+#, fuzzy
+msgid "--column and --verbose are incompatible"
+msgstr "--all 和 --mirror 不兼容"
+
+#: builtin/branch.c:857

 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
 
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
 


@@ -1022,11 +1721,6 @@ msgstr "path '%s'：无法合并"
 msgid "Unable to add merge result for '%s'"
 msgstr "无法为 '%s' 添加合并结果"
 
 msgid "Unable to add merge result for '%s'"
 msgstr "无法为 '%s' 添加合并结果"
 

-#: builtin/checkout.c:212 builtin/reset.c:158
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-

 #: builtin/checkout.c:234 builtin/checkout.c:392
 msgid "corrupt index file"
 msgstr "损坏的索引文件"
 #: builtin/checkout.c:234 builtin/checkout.c:392
 msgid "corrupt index file"
 msgstr "损坏的索引文件"


@@ -1122,71 +1816,71 @@ msgstr ""
 " git branch new_branch_name %s\n"
 "\n"
 
 " git branch new_branch_name %s\n"
 "\n"
 

-#: builtin/checkout.c:693
+#: builtin/checkout.c:694

 msgid "internal error in revision walk"
 msgstr "在版本遍历时遇到内部错误"
 
 msgid "internal error in revision walk"
 msgstr "在版本遍历时遇到内部错误"
 

-#: builtin/checkout.c:697
+#: builtin/checkout.c:698

 msgid "Previous HEAD position was"
 msgstr "之前的 HEAD 位置是"
 
 msgid "Previous HEAD position was"
 msgstr "之前的 HEAD 位置是"
 

-#: builtin/checkout.c:723
+#: builtin/checkout.c:724

 msgid "You are on a branch yet to be born"
 msgstr "您位于一个尚未初始化的分支"
 
 #. case (1)
 msgid "You are on a branch yet to be born"
 msgstr "您位于一个尚未初始化的分支"
 
 #. case (1)

-#: builtin/checkout.c:854
+#: builtin/checkout.c:855

 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"
 
 #. case (1): want a tree
 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"
 
 #. case (1): want a tree

-#: builtin/checkout.c:893
+#: builtin/checkout.c:894

 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用不是一个树：%s"
 
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用不是一个树：%s"
 

-#: builtin/checkout.c:973
+#: builtin/checkout.c:974

 msgid "-B cannot be used with -b"
 msgstr "-B 不能和 -b 共用"
 
 msgid "-B cannot be used with -b"
 msgstr "-B 不能和 -b 共用"
 

-#: builtin/checkout.c:982
+#: builtin/checkout.c:983

 msgid "--patch is incompatible with all other options"
 msgstr "--patch 选项和其他选项不兼容"
 
 msgid "--patch is incompatible with all other options"
 msgstr "--patch 选项和其他选项不兼容"
 

-#: builtin/checkout.c:985
+#: builtin/checkout.c:986

 msgid "--detach cannot be used with -b/-B/--orphan"
 msgstr "--detach 不能和 -b/-B/--orphan 共用"
 
 msgid "--detach cannot be used with -b/-B/--orphan"
 msgstr "--detach 不能和 -b/-B/--orphan 共用"
 

-#: builtin/checkout.c:987
+#: builtin/checkout.c:988

 msgid "--detach cannot be used with -t"
 msgstr "--detach 不能和 -t 共用"
 
 msgid "--detach cannot be used with -t"
 msgstr "--detach 不能和 -t 共用"
 

-#: builtin/checkout.c:993
+#: builtin/checkout.c:994

 msgid "--track needs a branch name"
 msgstr "--track 需要一个分支名"
 
 msgid "--track needs a branch name"
 msgstr "--track 需要一个分支名"
 

-#: builtin/checkout.c:1000
+#: builtin/checkout.c:1001

 msgid "Missing branch name; try -b"
 msgstr "缺少分支名；尝试 -b"
 
 msgid "Missing branch name; try -b"
 msgstr "缺少分支名；尝试 -b"
 

-#: builtin/checkout.c:1006
+#: builtin/checkout.c:1007

 msgid "--orphan and -b|-B are mutually exclusive"
 msgstr "--orphan 和 -b|-B 互斥"
 
 msgid "--orphan and -b|-B are mutually exclusive"
 msgstr "--orphan 和 -b|-B 互斥"
 

-#: builtin/checkout.c:1008
+#: builtin/checkout.c:1009

 msgid "--orphan cannot be used with -t"
 msgstr "--orphan 不能和 -t 共用"
 
 msgid "--orphan cannot be used with -t"
 msgstr "--orphan 不能和 -t 共用"
 

-#: builtin/checkout.c:1018
+#: builtin/checkout.c:1019

 msgid "git checkout: -f and -m are incompatible"
 msgstr "git checkout：-f 和 -m 不兼容"
 
 msgid "git checkout: -f and -m are incompatible"
 msgstr "git checkout：-f 和 -m 不兼容"
 

-#: builtin/checkout.c:1052
+#: builtin/checkout.c:1053

 msgid "invalid path specification"
 msgstr "无效的路径规格"
 
 msgid "invalid path specification"
 msgstr "无效的路径规格"
 

-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1061

 #, c-format
 msgid ""
 "git checkout: updating paths is incompatible with switching branches.\n"
 #, c-format
 msgid ""
 "git checkout: updating paths is incompatible with switching branches.\n"


@@ -1195,26 +1889,26 @@ msgstr ""
 "git checkout：更新路径和切换分支不兼容。\n"
 "您是想要检出 '%s' 但未能将其解析为提交么？"
 
 "git checkout：更新路径和切换分支不兼容。\n"
 "您是想要检出 '%s' 但未能将其解析为提交么？"
 

-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1063

 msgid "git checkout: updating paths is incompatible with switching branches."
 msgstr "git checkout：更新路径和切换分支不兼容。"
 
 msgid "git checkout: updating paths is incompatible with switching branches."
 msgstr "git checkout：更新路径和切换分支不兼容。"
 

-#: builtin/checkout.c:1067
+#: builtin/checkout.c:1068

 msgid "git checkout: --detach does not take a path argument"
 msgstr "git checkout：--detach 不跟路径参数"
 
 msgid "git checkout: --detach does not take a path argument"
 msgstr "git checkout：--detach 不跟路径参数"
 

-#: builtin/checkout.c:1070
+#: builtin/checkout.c:1071

 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
 
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
 

-#: builtin/checkout.c:1089
+#: builtin/checkout.c:1090

 msgid "Cannot switch branch to a non-commit."
 msgstr "无法切换分支到一个非提交。"
 
 msgid "Cannot switch branch to a non-commit."
 msgstr "无法切换分支到一个非提交。"
 

-#: builtin/checkout.c:1092
+#: builtin/checkout.c:1093

 msgid "--ours/--theirs is incompatible with switching branches."
 msgstr "--ours/--theirs 和切换分支不兼容。"
 
 msgid "--ours/--theirs is incompatible with switching branches."
 msgstr "--ours/--theirs 和切换分支不兼容。"
 


@@ -1385,7 +2079,11 @@ msgstr "远程分支 %s 在上游 %s 未发现"
 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎克隆了一个空版本库。"
 
 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎克隆了一个空版本库。"
 

-#: builtin/commit.c:42
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr ""
+
+#: builtin/commit.c:43

 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"


@@ -1408,7 +2106,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
 "\n"
 "    git commit --amend --reset-author\n"
 

-#: builtin/commit.c:54
+#: builtin/commit.c:55

 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"


@@ -1417,7 +2115,7 @@ msgstr ""
 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
 
 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
 

-#: builtin/commit.c:59
+#: builtin/commit.c:60

 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"


@@ -1433,109 +2131,102 @@ msgstr ""
 "\n"
 "否则，请使用命令 'git reset'\n"
 
 "\n"
 "否则，请使用命令 'git reset'\n"
 

-#: builtin/commit.c:205 builtin/reset.c:33
-msgid "merge"
-msgstr "合并"
-
-#: builtin/commit.c:208
-msgid "cherry-pick"
-msgstr "拣选"
-
-#: builtin/commit.c:325
+#: builtin/commit.c:253

 msgid "failed to unpack HEAD tree object"
 msgstr "无法解包 HEAD 树对象"
 
 msgid "failed to unpack HEAD tree object"
 msgstr "无法解包 HEAD 树对象"
 

-#: builtin/commit.c:367
+#: builtin/commit.c:295

 msgid "unable to create temporary index"
 msgstr "不能创建临时索引"
 
 msgid "unable to create temporary index"
 msgstr "不能创建临时索引"
 

-#: builtin/commit.c:373
+#: builtin/commit.c:301

 msgid "interactive add failed"
 msgstr "交互式添加失败"
 
 msgid "interactive add failed"
 msgstr "交互式添加失败"
 

-#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473
+#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405

 msgid "unable to write new_index file"
 msgstr "无法写 new_index 文件"
 
 #  译者：%s若翻为中文，前后不需要空格
 msgid "unable to write new_index file"
 msgstr "无法写 new_index 文件"
 
 #  译者：%s若翻为中文，前后不需要空格

-#: builtin/commit.c:457
-#, c-format
-msgid "cannot do a partial commit during a %s."
+#: builtin/commit.c:386
+#, fuzzy
+msgid "cannot do a partial commit during a merge."

 msgstr "在%s过程中不能做部分提交。"
 
 msgstr "在%s过程中不能做部分提交。"
 

-#: builtin/commit.c:466
+#  译者：%s若翻为中文，前后不需要空格
+#: builtin/commit.c:388
+#, fuzzy
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "在%s过程中不能做部分提交。"
+
+#: builtin/commit.c:398

 msgid "cannot read the index"
 msgstr "无法读取索引"
 
 msgid "cannot read the index"
 msgstr "无法读取索引"
 

-#: builtin/commit.c:486
+#: builtin/commit.c:418

 msgid "unable to write temporary index file"
 msgstr "无法写临时索引文件"
 
 msgid "unable to write temporary index file"
 msgstr "无法写临时索引文件"
 

-#: builtin/commit.c:561 builtin/commit.c:567
+#: builtin/commit.c:493 builtin/commit.c:499

 #, c-format
 msgid "invalid commit: %s"
 msgstr "无效的提交：%s"
 
 #, c-format
 msgid "invalid commit: %s"
 msgstr "无效的提交：%s"
 

-#: builtin/commit.c:590
+#: builtin/commit.c:522

 msgid "malformed --author parameter"
 msgstr "非法的 --author 参数"
 
 msgid "malformed --author parameter"
 msgstr "非法的 --author 参数"
 

-#: builtin/commit.c:651
+#: builtin/commit.c:583

 #, c-format
 msgid "Malformed ident string: '%s'"
 msgstr "非法的身份字符串：'%s'"
 
 #, c-format
 msgid "Malformed ident string: '%s'"
 msgstr "非法的身份字符串：'%s'"
 

-#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033
+#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968

 #, c-format
 msgid "could not lookup commit %s"
 msgstr "不能查询提交 %s"
 
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "不能查询提交 %s"
 

-#: builtin/commit.c:701 builtin/shortlog.c:296
+#: builtin/commit.c:633 builtin/shortlog.c:296

 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正从标准输入中读取日志信息）\n"
 
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正从标准输入中读取日志信息）\n"
 

-#: builtin/commit.c:703
+#: builtin/commit.c:635

 msgid "could not read log from standard input"
 msgstr "不能从标准输入中读取日志信息"
 
 msgid "could not read log from standard input"
 msgstr "不能从标准输入中读取日志信息"
 

-#: builtin/commit.c:707
+#: builtin/commit.c:639

 #, c-format
 msgid "could not read log file '%s'"
 msgstr "不能读取日志文件 '%s'"
 
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "不能读取日志文件 '%s'"
 

-#: builtin/commit.c:713
+#: builtin/commit.c:645

 msgid "commit has empty message"
 msgstr "提交说明为空"
 
 msgid "commit has empty message"
 msgstr "提交说明为空"
 

-#: builtin/commit.c:729
+#: builtin/commit.c:661

 msgid "could not read MERGE_MSG"
 msgstr "不能读取 MERGE_MSG"
 
 msgid "could not read MERGE_MSG"
 msgstr "不能读取 MERGE_MSG"
 

-#: builtin/commit.c:733
+#: builtin/commit.c:665

 msgid "could not read SQUASH_MSG"
 msgstr "不能读取 SQUASH_MSG"
 
 msgid "could not read SQUASH_MSG"
 msgstr "不能读取 SQUASH_MSG"
 

-#: builtin/commit.c:737
+#: builtin/commit.c:669

 #, c-format
 msgid "could not read '%s'"
 msgstr "不能读取 '%s'"
 
 #, c-format
 msgid "could not read '%s'"
 msgstr "不能读取 '%s'"
 

-#: builtin/commit.c:765
-#, c-format
-msgid "could not open '%s'"
-msgstr "不能打开 '%s'"
-
-#: builtin/commit.c:789
+#: builtin/commit.c:721

 msgid "could not write commit template"
 msgstr "不能写提交模版"
 
 #  译者：%s若翻为中文，前后不需要空格
 msgid "could not write commit template"
 msgstr "不能写提交模版"
 
 #  译者：%s若翻为中文，前后不需要空格

-#: builtin/commit.c:799
-#, c-format
+#: builtin/commit.c:732
+#, fuzzy, c-format

 msgid ""
 "\n"
 msgid ""
 "\n"

-"It looks like you may be committing a %s.\n"
+"It looks like you may be committing a merge.\n"

 "If this is not correct, please remove the file\n"
 "\t%s\n"
 "and try again.\n"
 "If this is not correct, please remove the file\n"
 "\t%s\n"
 "and try again.\n"


@@ -1546,23 +2237,37 @@ msgstr ""
 "\t%s\n"
 "然后重试。\n"
 
 "\t%s\n"
 "然后重试。\n"
 

-#: builtin/commit.c:812
-msgid "Please enter the commit message for your changes."
-msgstr "请为您的修改输入提交说明。"
+#  译者：%s若翻为中文，前后不需要空格
+#: builtin/commit.c:737
+#, fuzzy, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"看起来您正在提交一个%s。\n"
+"如果不是这样，请删除文件\n"
+"\t%s\n"
+"然后重试。\n"

 
 #  译者：中文字符串拼接，可删除前导空格
 
 #  译者：中文字符串拼接，可删除前导空格

-#: builtin/commit.c:815
+#: builtin/commit.c:749
+#, fuzzy

 msgid ""
 msgid ""

-" Lines starting\n"
+"Please enter the commit message for your changes. Lines starting\n"

 "with '#' will be ignored, and an empty message aborts the commit.\n"
 msgstr ""
 "以 '#' 开头\n"
 "的行将被忽略，并且空的提交说明将会中止提交。\n"
 
 #  译者：中文字符串拼接，可删除前导空格
 "with '#' will be ignored, and an empty message aborts the commit.\n"
 msgstr ""
 "以 '#' 开头\n"
 "的行将被忽略，并且空的提交说明将会中止提交。\n"
 
 #  译者：中文字符串拼接，可删除前导空格

-#: builtin/commit.c:820
+#: builtin/commit.c:754
+#, fuzzy

 msgid ""
 msgid ""

-" Lines starting\n"
+"Please enter the commit message for your changes. Lines starting\n"

 "with '#' will be kept; you may remove them yourself if you want to.\n"
 "An empty message aborts the commit.\n"
 msgstr ""
 "with '#' will be kept; you may remove them yourself if you want to.\n"
 "An empty message aborts the commit.\n"
 msgstr ""


@@ -1571,158 +2276,164 @@ msgstr ""
 "中止提交。\n"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
 "中止提交。\n"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！

-#: builtin/commit.c:832
+#: builtin/commit.c:767

 #, c-format
 msgid "%sAuthor:    %s"
 msgstr "%s作者：     %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
 #, c-format
 msgid "%sAuthor:    %s"
 msgstr "%s作者：     %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！

-#: builtin/commit.c:839
+#: builtin/commit.c:774

 #, c-format
 msgid "%sCommitter: %s"
 msgstr "%s提交者：   %s"
 
 #, c-format
 msgid "%sCommitter: %s"
 msgstr "%s提交者：   %s"
 

-#: builtin/commit.c:859
+#: builtin/commit.c:794

 msgid "Cannot read index"
 msgstr "无法读取索引"
 
 msgid "Cannot read index"
 msgstr "无法读取索引"
 

-#: builtin/commit.c:896
+#: builtin/commit.c:831

 msgid "Error building trees"
 msgstr "无法创建树对象"
 
 msgid "Error building trees"
 msgstr "无法创建树对象"
 

-#: builtin/commit.c:911 builtin/tag.c:357
+#: builtin/commit.c:846 builtin/tag.c:361

 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
 
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
 

-#: builtin/commit.c:1008
+#: builtin/commit.c:943

 #, c-format
 msgid "No existing author found with '%s'"
 msgstr "没有找到匹配 '%s' 的作者"
 
 #, c-format
 msgid "No existing author found with '%s'"
 msgstr "没有找到匹配 '%s' 的作者"
 

-#: builtin/commit.c:1023 builtin/commit.c:1217
+#: builtin/commit.c:958 builtin/commit.c:1158

 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "无效的未追踪文件参数 '%s'"
 
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "无效的未追踪文件参数 '%s'"
 

-#: builtin/commit.c:1063
+#: builtin/commit.c:998

 msgid "Using both --reset-author and --author does not make sense"
 msgstr "同时使用 --reset-author 和 --author 没有意义"
 
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "同时使用 --reset-author 和 --author 没有意义"
 

-#: builtin/commit.c:1074
+#: builtin/commit.c:1009

 msgid "You have nothing to amend."
 msgstr "您没有可修补的提交。"
 
 #  译者：%s若翻为中文，前后不需要空格
 msgid "You have nothing to amend."
 msgstr "您没有可修补的提交。"
 
 #  译者：%s若翻为中文，前后不需要空格

-#: builtin/commit.c:1076
-#, c-format
-msgid "You are in the middle of a %s -- cannot amend."
+#: builtin/commit.c:1012
+#, fuzzy
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
+
+#  译者：%s若翻为中文，前后不需要空格
+#: builtin/commit.c:1014
+#, fuzzy
+msgid "You are in the middle of a cherry-pick -- cannot amend."

 msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
 
 msgstr "您正处于一个%s的过程中 -- 无法修补提交。"
 

-#: builtin/commit.c:1078
+#: builtin/commit.c:1017

 msgid "Options --squash and --fixup cannot be used together"
 msgstr "选项 --squash 和 --fixup 不能共用"
 
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "选项 --squash 和 --fixup 不能共用"
 

-#: builtin/commit.c:1088
+#: builtin/commit.c:1027

 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
 
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
 

-#: builtin/commit.c:1090
+#: builtin/commit.c:1029

 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
 
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。"
 

-#: builtin/commit.c:1098
+#: builtin/commit.c:1037

 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
 
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。"
 

-#: builtin/commit.c:1115
+#: builtin/commit.c:1054

 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
 
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
 

-#: builtin/commit.c:1117
+#: builtin/commit.c:1056

 msgid "No paths with --include/--only does not make sense."
 msgstr "参数 --include/--only 不跟路径没有意义。"
 
 msgid "No paths with --include/--only does not make sense."
 msgstr "参数 --include/--only 不跟路径没有意义。"
 

-#: builtin/commit.c:1119
+#: builtin/commit.c:1058

 msgid "Clever... amending the last one with dirty index."
 msgstr "聪明... 在索引不干净下修补最后的提交。"
 
 msgid "Clever... amending the last one with dirty index."
 msgstr "聪明... 在索引不干净下修补最后的提交。"
 

-#: builtin/commit.c:1121
+#: builtin/commit.c:1060

 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."
 
 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."
 

-#: builtin/commit.c:1131 builtin/tag.c:556
+#: builtin/commit.c:1070 builtin/tag.c:577

 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "无效的清理模式 %s"
 
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "无效的清理模式 %s"
 

-#: builtin/commit.c:1136
+#: builtin/commit.c:1075

 msgid "Paths with -a does not make sense."
 msgstr "路径和 -a 选项共用没有意义。"
 
 msgid "Paths with -a does not make sense."
 msgstr "路径和 -a 选项共用没有意义。"
 

-#: builtin/commit.c:1315
+#: builtin/commit.c:1258

 msgid "couldn't look up newly created commit"
 msgstr "无法找到新创建的提交"
 
 msgid "couldn't look up newly created commit"
 msgstr "无法找到新创建的提交"
 

-#: builtin/commit.c:1317
+#: builtin/commit.c:1260

 msgid "could not parse newly created commit"
 msgstr "不能解析新创建的提交"
 
 msgid "could not parse newly created commit"
 msgstr "不能解析新创建的提交"
 

-#: builtin/commit.c:1358
+#: builtin/commit.c:1301

 msgid "detached HEAD"
 msgstr "分离头指针"
 
 #  译者：中文字符串拼接，可删除前导空格
 msgid "detached HEAD"
 msgstr "分离头指针"
 
 #  译者：中文字符串拼接，可删除前导空格

-#: builtin/commit.c:1360
+#: builtin/commit.c:1303

 msgid " (root-commit)"
 msgstr "（根提交）"
 
 msgid " (root-commit)"
 msgstr "（根提交）"
 

-#: builtin/commit.c:1450
+#: builtin/commit.c:1447

 msgid "could not parse HEAD commit"
 msgstr "不能解析 HEAD 提交"
 
 msgid "could not parse HEAD commit"
 msgstr "不能解析 HEAD 提交"
 

-#: builtin/commit.c:1487 builtin/merge.c:509
+#: builtin/commit.c:1485 builtin/merge.c:509

 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "不能为读入打开 '%s'"
 
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "不能为读入打开 '%s'"
 

-#: builtin/commit.c:1494
+#: builtin/commit.c:1492

 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "损坏的 MERGE_HEAD 文件（%s）"
 
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "损坏的 MERGE_HEAD 文件（%s）"
 

-#: builtin/commit.c:1501
+#: builtin/commit.c:1499

 msgid "could not read MERGE_MODE"
 msgstr "不能读取 MERGE_MODE"
 
 msgid "could not read MERGE_MODE"
 msgstr "不能读取 MERGE_MODE"
 

-#: builtin/commit.c:1520
+#: builtin/commit.c:1518

 #, c-format
 msgid "could not read commit message: %s"
 msgstr "不能读取提交说明：%s"
 
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "不能读取提交说明：%s"
 

-#: builtin/commit.c:1534
+#: builtin/commit.c:1532

 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "终止提交；您未更改来自模版的提交说明。\n"
 
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "终止提交；您未更改来自模版的提交说明。\n"
 

-#: builtin/commit.c:1539
+#: builtin/commit.c:1537

 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止提交因为提交说明为空。\n"
 
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止提交因为提交说明为空。\n"
 

-#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
+#: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961

 msgid "failed to write commit object"
 msgstr "无法写提交对象"
 
 msgid "failed to write commit object"
 msgstr "无法写提交对象"
 

-#: builtin/commit.c:1575
+#: builtin/commit.c:1573

 msgid "cannot lock HEAD ref"
 msgstr "无法锁定 HEAD 引用"
 
 msgid "cannot lock HEAD ref"
 msgstr "无法锁定 HEAD 引用"
 

-#: builtin/commit.c:1579
+#: builtin/commit.c:1577

 msgid "cannot update HEAD ref"
 msgstr "无法更新 HEAD 引用"
 
 msgid "cannot update HEAD ref"
 msgstr "无法更新 HEAD 引用"
 

-#: builtin/commit.c:1590
+#: builtin/commit.c:1588

 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full or quota is\n"
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full or quota is\n"


@@ -1930,21 +2641,21 @@ msgstr ""
 
 #  译者：注意保持前导空格
 #: builtin/fetch.c:549
 
 #  译者：注意保持前导空格
 #: builtin/fetch.c:549

-#, c-format
-msgid "   (%s will become dangling)\n"
+#, fuzzy, c-format
+msgid "   (%s will become dangling)"

 msgstr "   （%s 将成为悬空状态）\n"
 
 #  译者：注意保持前导空格
 #: builtin/fetch.c:550
 msgstr "   （%s 将成为悬空状态）\n"
 
 #  译者：注意保持前导空格
 #: builtin/fetch.c:550

-#, c-format
-msgid "   (%s has become dangling)\n"
+#, fuzzy, c-format
+msgid "   (%s has become dangling)"

 msgstr "   （%s 已成为悬空状态）\n"
 
 #: builtin/fetch.c:557
 msgid "[deleted]"
 msgstr "[已删除]"
 
 msgstr "   （%s 已成为悬空状态）\n"
 
 #: builtin/fetch.c:557
 msgid "[deleted]"
 msgstr "[已删除]"
 

-#: builtin/fetch.c:558
+#: builtin/fetch.c:558 builtin/remote.c:1055

 msgid "(none)"
 msgstr "（无）"
 
 msgid "(none)"
 msgstr "（无）"
 


@@ -1973,7 +2684,7 @@ msgstr "选项 \"%s\" 对于 %s 被忽略\n"
 msgid "Fetching %s\n"
 msgstr "正在获取 %s\n"
 
 msgid "Fetching %s\n"
 msgstr "正在获取 %s\n"
 

-#: builtin/fetch.c:890
+#: builtin/fetch.c:890 builtin/remote.c:100

 #, c-format
 msgid "Could not fetch %s"
 msgstr "不能获取 %s"
 #, c-format
 msgid "Could not fetch %s"
 msgstr "不能获取 %s"


@@ -2093,6 +2804,313 @@ msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
 msgid "both --cached and trees are given."
 msgstr "同时给出了 --cached 和树对象。"
 
 msgid "both --cached and trees are given."
 msgstr "同时给出了 --cached 和树对象。"
 

+#: builtin/help.c:59
+#, fuzzy, c-format
+msgid "unrecognized help format '%s'"
+msgstr "未识别的参数：%s"
+
+#: builtin/help.c:87
+#, fuzzy
+msgid "Failed to start emacsclient."
+msgstr "无法枚举 %s 状态\n"
+
+#: builtin/help.c:100
+#, fuzzy
+msgid "Failed to parse emacsclient version."
+msgstr "无法读取对象 '%s'。"
+
+#: builtin/help.c:108
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr ""
+
+#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#, fuzzy, c-format
+msgid "failed to exec '%s': %s"
+msgstr "无法打开 '%s'"
+
+#: builtin/help.c:211
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+
+#: builtin/help.c:223
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+
+#: builtin/help.c:287
+msgid "The most commonly used git commands are:"
+msgstr ""
+
+#: builtin/help.c:355
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr ""
+
+#: builtin/help.c:372
+#, fuzzy
+msgid "no man viewer handled the request"
+msgstr "没有合并策略处理此合并。\n"
+
+#: builtin/help.c:380
+msgid "no info viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:391
+#, fuzzy, c-format
+msgid "'%s': not a documentation directory."
+msgstr "不能访问当前工作目录"
+
+#: builtin/help.c:432 builtin/help.c:439
+#, c-format
+msgid "usage: %s%s"
+msgstr ""
+
+#: builtin/help.c:453
+#, c-format
+msgid "`git %s' is aliased to `%s'"
+msgstr ""
+
+#: builtin/index-pack.c:169
+#, c-format
+msgid "object type mismatch at %s"
+msgstr ""
+
+#: builtin/index-pack.c:189
+msgid "object of unexpected type"
+msgstr ""
+
+#: builtin/index-pack.c:226
+#, fuzzy, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "无法获知当前路径"
+
+#: builtin/index-pack.c:236
+msgid "early EOF"
+msgstr ""
+
+#: builtin/index-pack.c:237
+msgid "read error on input"
+msgstr ""
+
+#: builtin/index-pack.c:249
+msgid "used more bytes than were available"
+msgstr ""
+
+#: builtin/index-pack.c:256
+msgid "pack too large for current definition of off_t"
+msgstr ""
+
+#: builtin/index-pack.c:272
+#, fuzzy, c-format
+msgid "unable to create '%s'"
+msgstr "不能写 %s"
+
+#: builtin/index-pack.c:277
+#, fuzzy, c-format
+msgid "cannot open packfile '%s'"
+msgstr "无法打开补丁文件 %s"
+
+#: builtin/index-pack.c:291
+msgid "pack signature mismatch"
+msgstr ""
+
+#: builtin/index-pack.c:311
+#, c-format
+msgid "pack has bad object at offset %lu: %s"
+msgstr ""
+
+#: builtin/index-pack.c:405
+#, c-format
+msgid "inflate returned %d"
+msgstr ""
+
+#: builtin/index-pack.c:450
+msgid "offset value overflow for delta base object"
+msgstr ""
+
+#: builtin/index-pack.c:458
+msgid "delta base offset is out of bound"
+msgstr ""
+
+#: builtin/index-pack.c:466
+#, fuzzy, c-format
+msgid "unknown object type %d"
+msgstr "未知类型：%d"
+
+#: builtin/index-pack.c:495
+#, fuzzy
+msgid "cannot pread pack file"
+msgstr "无法打开补丁文件 %s"
+
+#: builtin/index-pack.c:497
+#, c-format
+msgid "premature end of pack file, %lu byte missing"
+msgid_plural "premature end of pack file, %lu bytes missing"
+msgstr[0] ""
+
+#: builtin/index-pack.c:510
+msgid "serious inflate inconsistency"
+msgstr ""
+
+#: builtin/index-pack.c:583
+#, fuzzy, c-format
+msgid "cannot read existing object %s"
+msgstr "不能读取对象 %s"
+
+#: builtin/index-pack.c:586
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr ""
+
+#: builtin/index-pack.c:598
+#, fuzzy, c-format
+msgid "invalid blob object %s"
+msgstr "不是一个有效对象：%s"
+
+#: builtin/index-pack.c:610
+#, fuzzy, c-format
+msgid "invalid %s"
+msgstr "无效键名：%s"
+
+#: builtin/index-pack.c:612
+msgid "Error in object"
+msgstr ""
+
+#: builtin/index-pack.c:614
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr ""
+
+#: builtin/index-pack.c:687 builtin/index-pack.c:713
+#, fuzzy
+msgid "failed to apply delta"
+msgstr "无法拷贝文件至 '%s'"
+
+#: builtin/index-pack.c:850
+#, fuzzy
+msgid "Receiving objects"
+msgstr "删除对象 %s 的注解\n"
+
+#: builtin/index-pack.c:850
+#, fuzzy
+msgid "Indexing objects"
+msgstr "坏对象 %s"
+
+#: builtin/index-pack.c:872
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr ""
+
+#: builtin/index-pack.c:877
+#, fuzzy
+msgid "cannot fstat packfile"
+msgstr "不能枚举模版 '%s' 状态"
+
+#: builtin/index-pack.c:880
+msgid "pack has junk at the end"
+msgstr ""
+
+#: builtin/index-pack.c:903
+#, fuzzy
+msgid "Resolving deltas"
+msgstr "正删除 %s\n"
+
+#: builtin/index-pack.c:954
+msgid "confusion beyond insanity"
+msgstr ""
+
+#: builtin/index-pack.c:973
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+
+#: builtin/index-pack.c:998
+#, fuzzy, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "不能写注解对象"
+
+#: builtin/index-pack.c:1077
+#, c-format
+msgid "local object %s is corrupt"
+msgstr ""
+
+#: builtin/index-pack.c:1101
+msgid "error while closing pack file"
+msgstr ""
+
+#: builtin/index-pack.c:1114
+#, fuzzy, c-format
+msgid "cannot write keep file '%s'"
+msgstr "不能枚举模版 '%s' 状态"
+
+#: builtin/index-pack.c:1122
+#, fuzzy, c-format
+msgid "cannot close written keep file '%s'"
+msgstr "不能枚举模版 '%s' 状态"
+
+#: builtin/index-pack.c:1135
+#, fuzzy
+msgid "cannot store pack file"
+msgstr "无法打开补丁文件 %s"
+
+#: builtin/index-pack.c:1146
+#, fuzzy
+msgid "cannot store index file"
+msgstr "无法读取索引"
+
+#: builtin/index-pack.c:1247
+#, fuzzy, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "无法打开补丁文件 %s"
+
+#: builtin/index-pack.c:1249
+#, fuzzy, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "无法打开补丁文件 %s"
+
+#: builtin/index-pack.c:1296
+#, fuzzy, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "不是一个有效对象：%s"
+
+#: builtin/index-pack.c:1303
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+
+#: builtin/index-pack.c:1330
+msgid "Cannot come back to cwd"
+msgstr ""
+
+#: builtin/index-pack.c:1374 builtin/index-pack.c:1377
+#: builtin/index-pack.c:1389 builtin/index-pack.c:1393
+#, fuzzy, c-format
+msgid "bad %s"
+msgstr "坏对象 %s"
+
+#: builtin/index-pack.c:1407
+#, fuzzy
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--orphan 不能和 -t 共用"
+
+#: builtin/index-pack.c:1411 builtin/index-pack.c:1421
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr ""
+
+#: builtin/index-pack.c:1430
+msgid "--verify with no packfile name given"
+msgstr ""
+

 #: builtin/init-db.c:35
 #, c-format
 msgid "Could not make %s writable by group"
 #: builtin/init-db.c:35
 #, c-format
 msgid "Could not make %s writable by group"


@@ -2304,11 +3322,6 @@ msgstr "-n 和 -k 互斥。"
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr "--subject-prefix 和 -k 互斥。"
 
 msgid "--subject-prefix and -k are mutually exclusive."
 msgstr "--subject-prefix 和 -k 互斥。"
 

-#: builtin/log.c:1231 builtin/shortlog.c:284
-#, c-format
-msgid "unrecognized argument: %s"
-msgstr "未识别的参数：%s"
-

 #: builtin/log.c:1234
 msgid "--name-only does not make sense"
 msgstr "--name-only 无意义"
 #: builtin/log.c:1234
 msgid "--name-only does not make sense"
 msgstr "--name-only 无意义"


@@ -2662,7 +3675,7 @@ msgstr "%s，源=%s，目标=%s"
 msgid "Renaming %s to %s\n"
 msgstr "重命名 %s 至 %s\n"
 
 msgid "Renaming %s to %s\n"
 msgstr "重命名 %s 至 %s\n"
 

-#: builtin/mv.c:215
+#: builtin/mv.c:215 builtin/remote.c:731

 #, c-format
 msgid "renaming '%s' failed"
 msgstr "重命名 '%s' 失败"
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "重命名 '%s' 失败"


@@ -2686,7 +3699,7 @@ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
 msgid "failed to finish 'show' for object '%s'"
 msgstr "无法为对象 '%s' 完成 'show'"
 
 msgid "failed to finish 'show' for object '%s'"
 msgstr "无法为对象 '%s' 完成 'show'"
 

-#: builtin/notes.c:175 builtin/tag.c:343
+#: builtin/notes.c:175 builtin/tag.c:347

 #, c-format
 msgid "could not create file '%s'"
 msgstr "不能创建文件 '%s'"
 #, c-format
 msgid "could not create file '%s'"
 msgstr "不能创建文件 '%s'"


@@ -2709,12 +3722,12 @@ msgstr "不能写注解对象"
 msgid "The note contents has been left in %s"
 msgstr "注解内容被留在文件 %s 中"
 
 msgid "The note contents has been left in %s"
 msgstr "注解内容被留在文件 %s 中"
 

-#: builtin/notes.c:251 builtin/tag.c:521
+#: builtin/notes.c:251 builtin/tag.c:542

 #, c-format
 msgid "cannot read '%s'"
 msgstr "不能读取 '%s'"
 
 #, c-format
 msgid "cannot read '%s'"
 msgstr "不能读取 '%s'"
 

-#: builtin/notes.c:253 builtin/tag.c:524
+#: builtin/notes.c:253 builtin/tag.c:545

 #, c-format
 msgid "could not open or read '%s'"
 msgstr "不能打开或读取 '%s'"
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "不能打开或读取 '%s'"


@@ -2722,7 +3735,7 @@ msgstr "不能打开或读取 '%s'"
 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
 #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766

-#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
+#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558

 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "无法解析 '%s' 为一个有效引用。"
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "无法解析 '%s' 为一个有效引用。"


@@ -2816,7 +3829,7 @@ msgstr ""
 msgid "Object %s has no note\n"
 msgstr "对象 %s 没有注解\n"
 
 msgid "Object %s has no note\n"
 msgstr "对象 %s 没有注解\n"
 

-#: builtin/notes.c:1103
+#: builtin/notes.c:1103 builtin/remote.c:1598

 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "未知子命令：%s"
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "未知子命令：%s"


@@ -2849,7 +3862,28 @@ msgstr "tag 简写没有跟 <tag> 参数"
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete 只接受简单的目标引用名"
 
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete 只接受简单的目标引用名"
 

-#: builtin/push.c:84
+#: builtin/push.c:99
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+
+#: builtin/push.c:102
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch.  To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+"    git push %s %s\n"
+"%s"
+msgstr ""
+
+#: builtin/push.c:121

 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"


@@ -2863,7 +3897,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<name-of-remote-branch>\n"
 
 "\n"
 "    git push %s HEAD:<name-of-remote-branch>\n"
 

-#: builtin/push.c:91
+#: builtin/push.c:128

 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"


@@ -2876,12 +3910,12 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
 "\n"
 "    git push --set-upstream %s %s\n"
 

-#: builtin/push.c:99
+#: builtin/push.c:136

 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
 
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
 

-#: builtin/push.c:102
+#: builtin/push.c:139

 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"


@@ -2891,12 +3925,12 @@ msgstr ""
 "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
 "而没有告诉我要推送什么、更新哪个远程分支。"
 
 "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
 "而没有告诉我要推送什么、更新哪个远程分支。"
 

-#: builtin/push.c:131
+#: builtin/push.c:174

 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。"
 
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。"
 

-#: builtin/push.c:138
+#: builtin/push.c:181

 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"


@@ -2907,7 +3941,7 @@ msgstr ""
 "再次推送前，先与远程变更合并（如 'git pull'）。详见\n"
 "'git push --help' 中的 'Note about fast-forwards' 小节。"
 
 "再次推送前，先与远程变更合并（如 'git pull'）。详见\n"
 "'git push --help' 中的 'Note about fast-forwards' 小节。"
 

-#: builtin/push.c:144
+#: builtin/push.c:187

 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. If you did not intend to push that branch, you may want to\n"
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. If you did not intend to push that branch, you may want to\n"


@@ -2916,10 +3950,9 @@ msgid ""
 msgstr ""
 "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
 "如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n"
 msgstr ""
 "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
 "如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n"

-"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送"
-"当前分支。"
+"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"

 
 

-#: builtin/push.c:150
+#: builtin/push.c:193

 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and merge the remote changes\n"
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and merge the remote changes\n"


@@ -2930,22 +3963,22 @@ msgstr ""
 "检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n"
 "'git push --help' 中的 'Note about fast-forwards' 小节。"
 
 "检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n"
 "'git push --help' 中的 'Note about fast-forwards' 小节。"
 

-#: builtin/push.c:190
+#: builtin/push.c:233

 #, c-format
 msgid "Pushing to %s\n"
 msgstr "推送到 %s\n"
 
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "推送到 %s\n"
 

-#: builtin/push.c:194
+#: builtin/push.c:237

 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "无法推送一些引用到 '%s'"
 
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "无法推送一些引用到 '%s'"
 

-#: builtin/push.c:226
+#: builtin/push.c:269

 #, c-format
 msgid "bad repository '%s'"
 msgstr "坏的版本库 '%s'"
 
 #, c-format
 msgid "bad repository '%s'"
 msgstr "坏的版本库 '%s'"
 

-#: builtin/push.c:227
+#: builtin/push.c:270

 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "


@@ -2966,34 +3999,384 @@ msgstr ""
 "\n"
 "    git push <name>\n"
 
 "\n"
 "    git push <name>\n"
 

-#: builtin/push.c:242
+#: builtin/push.c:285

 msgid "--all and --tags are incompatible"
 msgstr "--all 和 --tags 不兼容"
 
 msgid "--all and --tags are incompatible"
 msgstr "--all 和 --tags 不兼容"
 

-#: builtin/push.c:243
+#: builtin/push.c:286

 msgid "--all can't be combined with refspecs"
 msgstr "--all 不能和引用表达式共用"
 
 msgid "--all can't be combined with refspecs"
 msgstr "--all 不能和引用表达式共用"
 

-#: builtin/push.c:248
+#: builtin/push.c:291

 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror 和 --tags 不兼容"
 
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror 和 --tags 不兼容"
 

-#: builtin/push.c:249
+#: builtin/push.c:292

 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror 不能和引用表达式共用"
 
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror 不能和引用表达式共用"
 

-#: builtin/push.c:254
+#: builtin/push.c:297

 msgid "--all and --mirror are incompatible"
 msgstr "--all 和 --mirror 不兼容"
 
 msgid "--all and --mirror are incompatible"
 msgstr "--all 和 --mirror 不兼容"
 

-#: builtin/push.c:334
+#: builtin/push.c:385

 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
 
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
 

-#: builtin/push.c:336
+#: builtin/push.c:387

 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete 未接任何引用没有意义"
 
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete 未接任何引用没有意义"
 

+#: builtin/remote.c:98
+#, fuzzy, c-format
+msgid "Updating %s"
+msgstr "更新 %s..%s\n"
+
+#: builtin/remote.c:130
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+
+#: builtin/remote.c:147
+#, fuzzy, c-format
+msgid "unknown mirror argument: %s"
+msgstr "未识别的参数：%s"
+
+#: builtin/remote.c:185
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr ""
+
+#: builtin/remote.c:187
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+
+#: builtin/remote.c:195 builtin/remote.c:646
+#, fuzzy, c-format
+msgid "remote %s already exists."
+msgstr "%s 已经存在"
+
+#: builtin/remote.c:199 builtin/remote.c:650
+#, fuzzy, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' 不是一个有效的tag名称。"
+
+#: builtin/remote.c:243
+#, fuzzy, c-format
+msgid "Could not setup master '%s'"
+msgstr "不能查看文件状态 '%s'"
+
+#: builtin/remote.c:299
+#, fuzzy, c-format
+msgid "more than one %s"
+msgstr "提供了超过两个 blob 对象：'%s'"
+
+#: builtin/remote.c:339
+#, fuzzy, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr "不能获取 %s"
+
+#: builtin/remote.c:440 builtin/remote.c:448
+msgid "(matching)"
+msgstr ""
+
+#: builtin/remote.c:452
+#, fuzzy
+msgid "(delete)"
+msgstr "[已删除]"
+
+#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
+#, fuzzy, c-format
+msgid "Could not append '%s' to '%s'"
+msgstr "不能应用 '%s'"
+
+#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
+#, fuzzy, c-format
+msgid "No such remote: %s"
+msgstr "没有这样的远程或远程组：%s"
+
+#: builtin/remote.c:656
+#, fuzzy, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr "不能创建目录 '%s'"
+
+#: builtin/remote.c:662 builtin/remote.c:799
+#, fuzzy, c-format
+msgid "Could not remove config section '%s'"
+msgstr "不能创建目录 '%s'"
+
+#: builtin/remote.c:677
+#, c-format
+msgid ""
+"Not updating non-default fetch respec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+
+#: builtin/remote.c:683
+#, fuzzy, c-format
+msgid "Could not append '%s'"
+msgstr "不能应用 '%s'"
+
+#: builtin/remote.c:694
+#, fuzzy, c-format
+msgid "Could not set '%s'"
+msgstr "不能查看文件状态 '%s'"
+
+#: builtin/remote.c:716
+#, fuzzy, c-format
+msgid "deleting '%s' failed"
+msgstr "重命名 '%s' 失败"
+
+#: builtin/remote.c:750
+#, fuzzy, c-format
+msgid "creating '%s' failed"
+msgstr "重命名 '%s' 失败"
+
+#: builtin/remote.c:764
+#, fuzzy, c-format
+msgid "Could not remove branch %s"
+msgstr "不会删除 %s\n"
+
+#: builtin/remote.c:834
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] ""
+
+#: builtin/remote.c:943
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr ""
+
+#: builtin/remote.c:946
+#, fuzzy
+msgid " tracked"
+msgstr "未跟踪的"
+
+#: builtin/remote.c:948
+msgid " stale (use 'git remote prune' to remove)"
+msgstr ""
+
+#: builtin/remote.c:950
+msgid " ???"
+msgstr ""
+
+#: builtin/remote.c:991
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr ""
+
+#: builtin/remote.c:998
+#, fuzzy, c-format
+msgid "rebases onto remote %s"
+msgstr "无法删除 %s"
+
+#: builtin/remote.c:1001
+#, fuzzy, c-format
+msgid " merges with remote %s"
+msgstr "使用策略 %s 合并失败。\n"
+
+#: builtin/remote.c:1002
+msgid "    and with remote"
+msgstr ""
+
+#: builtin/remote.c:1004
+#, fuzzy, c-format
+msgid "merges with remote %s"
+msgstr "使用策略 %s 合并失败。\n"
+
+#: builtin/remote.c:1005
+msgid "   and with remote"
+msgstr ""
+
+#: builtin/remote.c:1051
+msgid "create"
+msgstr ""
+
+#: builtin/remote.c:1054
+#, fuzzy
+msgid "delete"
+msgstr "[已删除]"
+
+#: builtin/remote.c:1058
+#, fuzzy
+msgid "up to date"
+msgstr "[最新]"
+
+#: builtin/remote.c:1061
+#, fuzzy
+msgid "fast-forwardable"
+msgstr "（非快进式）"
+
+#: builtin/remote.c:1064
+msgid "local out of date"
+msgstr ""
+
+#: builtin/remote.c:1071
+#, c-format
+msgid "    %-*s forces to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1074
+#, c-format
+msgid "    %-*s pushes to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1078
+#, c-format
+msgid "    %-*s forces to %s"
+msgstr ""
+
+#: builtin/remote.c:1081
+#, c-format
+msgid "    %-*s pushes to %s"
+msgstr ""
+
+#  译者：汉字之间无空格，故删除尾部空格
+#: builtin/remote.c:1118
+#, fuzzy, c-format
+msgid "* remote %s"
+msgstr "远程"
+
+#: builtin/remote.c:1119
+#, c-format
+msgid "  Fetch URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1120 builtin/remote.c:1285
+msgid "(no URL)"
+msgstr ""
+
+#: builtin/remote.c:1129 builtin/remote.c:1131
+#, c-format
+msgid "  Push  URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
+#, fuzzy, c-format
+msgid "  HEAD branch: %s"
+msgstr "HEAD（非分支）"
+
+#: builtin/remote.c:1139
+#, c-format
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+
+#: builtin/remote.c:1151
+#, fuzzy, c-format
+msgid "  Remote branch:%s"
+msgid_plural "  Remote branches:%s"
+msgstr[0] "重置分支 '%s'\n"
+
+#: builtin/remote.c:1154 builtin/remote.c:1181
+msgid " (status not queried)"
+msgstr ""
+
+#: builtin/remote.c:1163
+msgid "  Local branch configured for 'git pull':"
+msgid_plural "  Local branches configured for 'git pull':"
+msgstr[0] ""
+
+#: builtin/remote.c:1171
+msgid "  Local refs will be mirrored by 'git push'"
+msgstr ""
+
+#: builtin/remote.c:1178
+#, fuzzy, c-format
+msgid "  Local ref configured for 'git push'%s:"
+msgid_plural "  Local refs configured for 'git push'%s:"
+msgstr[0] "尚未给分支 '%s' 设置上游"
+
+#: builtin/remote.c:1216
+#, fuzzy
+msgid "Cannot determine remote HEAD"
+msgstr "不能解析 HEAD"
+
+#: builtin/remote.c:1218
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr ""
+
+#: builtin/remote.c:1228
+#, fuzzy, c-format
+msgid "Could not delete %s"
+msgstr "不能获取 %s"
+
+#: builtin/remote.c:1236
+#, fuzzy, c-format
+msgid "Not a valid ref: %s"
+msgstr "不是一个有效对象：%s"
+
+#: builtin/remote.c:1238
+#, fuzzy, c-format
+msgid "Could not setup %s"
+msgstr "不能获取 %s"
+
+#  译者：注意保持前导空格
+#: builtin/remote.c:1274
+#, fuzzy, c-format
+msgid " %s will become dangling!"
+msgstr "   （%s 将成为悬空状态）\n"
+
+#  译者：注意保持前导空格
+#: builtin/remote.c:1275
+#, fuzzy, c-format
+msgid " %s has become dangling!"
+msgstr "   （%s 已成为悬空状态）\n"
+
+#: builtin/remote.c:1281
+#, fuzzy, c-format
+msgid "Pruning %s"
+msgstr "推送到 %s\n"
+
+#: builtin/remote.c:1282
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1295
+#, c-format
+msgid " * [would prune] %s"
+msgstr ""
+
+#: builtin/remote.c:1298
+#, c-format
+msgid " * [pruned] %s"
+msgstr ""
+
+#: builtin/remote.c:1387 builtin/remote.c:1461
+#, fuzzy, c-format
+msgid "No such remote '%s'"
+msgstr "没有此分支：'%s'"
+
+#: builtin/remote.c:1414
+#, fuzzy
+msgid "no remote specified"
+msgstr "未指定分支名"
+
+#: builtin/remote.c:1447
+#, fuzzy
+msgid "--add --delete doesn't make sense"
+msgstr "--name-only 无意义"
+
+#: builtin/remote.c:1487
+#, fuzzy, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "无效选项：%s"
+
+#: builtin/remote.c:1495
+#, fuzzy, c-format
+msgid "No such URL found: %s"
+msgstr "没有此分支：'%s'"
+
+#: builtin/remote.c:1497
+msgid "Will not delete all non-push URLs"
+msgstr ""
+

 #: builtin/reset.c:33
 msgid "mixed"
 msgstr "混杂"
 #: builtin/reset.c:33
 msgid "mixed"
 msgstr "混杂"


@@ -3006,6 +4389,10 @@ msgstr "软性"
 msgid "hard"
 msgstr "硬性"
 
 msgid "hard"
 msgstr "硬性"
 

+#: builtin/reset.c:33
+msgid "merge"
+msgstr "合并"
+

 #: builtin/reset.c:33
 msgid "keep"
 msgstr "保持"
 #: builtin/reset.c:33
 msgid "keep"
 msgstr "保持"


@@ -3081,15 +4468,15 @@ msgstr "不能重置索引文件至版本 '%s'。"
 msgid "%s: %s cannot be used with %s"
 msgstr "%s：%s 不能和 %s 共用"
 
 msgid "%s: %s cannot be used with %s"
 msgstr "%s：%s 不能和 %s 共用"
 

-#: builtin/revert.c:127
+#: builtin/revert.c:131

 msgid "program error"
 msgstr "程序错误"
 
 msgid "program error"
 msgstr "程序错误"
 

-#: builtin/revert.c:213
+#: builtin/revert.c:221

 msgid "revert failed"
 msgstr "还原失败"
 
 msgid "revert failed"
 msgstr "还原失败"
 

-#: builtin/revert.c:228
+#: builtin/revert.c:236

 msgid "cherry-pick failed"
 msgstr "拣选失败"
 
 msgid "cherry-pick failed"
 msgstr "拣选失败"
 


@@ -3135,32 +4522,32 @@ msgstr "git rm：不能删除 %s"
 msgid "Missing author: %s"
 msgstr "缺少作者：%s"
 
 msgid "Missing author: %s"
 msgstr "缺少作者：%s"
 

-#: builtin/tag.c:58
+#: builtin/tag.c:60

 #, c-format
 msgid "malformed object at '%s'"
 msgstr "非法的对象于 '%s'"
 
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "非法的对象于 '%s'"
 

-#: builtin/tag.c:205
+#: builtin/tag.c:207

 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr "tag 名字太长：%.*s..."
 
 #, c-format
 msgid "tag name too long: %.*s..."
 msgstr "tag 名字太长：%.*s..."
 

-#: builtin/tag.c:210
+#: builtin/tag.c:212

 #, c-format
 msgid "tag '%s' not found."
 msgstr "tag '%s' 未发现。"
 
 #, c-format
 msgid "tag '%s' not found."
 msgstr "tag '%s' 未发现。"
 

-#: builtin/tag.c:225
+#: builtin/tag.c:227

 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "已删除 tag '%s'（曾为 %s）\n"
 
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "已删除 tag '%s'（曾为 %s）\n"
 

-#: builtin/tag.c:237
+#: builtin/tag.c:239

 #, c-format
 msgid "could not verify the tag '%s'"
 msgstr "不能校验 tag '%s'"
 
 #, c-format
 msgid "could not verify the tag '%s'"
 msgstr "不能校验 tag '%s'"
 

-#: builtin/tag.c:247
+#: builtin/tag.c:249

 msgid ""
 "\n"
 "#\n"
 msgid ""
 "\n"
 "#\n"


@@ -3174,7 +4561,7 @@ msgstr ""
 "# 以 '#' 开头的行将被忽略。\n"
 "#\n"
 
 "# 以 '#' 开头的行将被忽略。\n"
 "#\n"
 

-#: builtin/tag.c:254
+#: builtin/tag.c:256

 msgid ""
 "\n"
 "#\n"
 msgid ""
 "\n"
 "#\n"


@@ -3189,85 +4576,216 @@ msgstr ""
 "# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n"
 "#\n"
 
 "# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n"
 "#\n"
 

-#: builtin/tag.c:294
+#: builtin/tag.c:298

 msgid "unable to sign the tag"
 msgstr "无法签署 tag"
 
 msgid "unable to sign the tag"
 msgstr "无法签署 tag"
 

-#: builtin/tag.c:296
+#: builtin/tag.c:300

 msgid "unable to write tag file"
 msgstr "无法写 tag 文件"
 
 msgid "unable to write tag file"
 msgstr "无法写 tag 文件"
 

-#: builtin/tag.c:321
+#: builtin/tag.c:325

 msgid "bad object type."
 msgstr "坏的对象类型。"
 
 msgid "bad object type."
 msgstr "坏的对象类型。"
 

-#: builtin/tag.c:334
+#: builtin/tag.c:338

 msgid "tag header too big."
 msgstr "tag 头信息太大。"
 
 msgid "tag header too big."
 msgstr "tag 头信息太大。"
 

-#: builtin/tag.c:366
+#: builtin/tag.c:370

 msgid "no tag message?"
 msgstr "无 tag 说明？"
 
 msgid "no tag message?"
 msgstr "无 tag 说明？"
 

-#: builtin/tag.c:372
+#: builtin/tag.c:376

 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "tag 说明被保留在 %s\n"
 
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "tag 说明被保留在 %s\n"
 

-#: builtin/tag.c:421
+#: builtin/tag.c:425

 msgid "switch 'points-at' requires an object"
 msgstr "开关 'points-at' 需要一个对象"
 
 msgid "switch 'points-at' requires an object"
 msgstr "开关 'points-at' 需要一个对象"
 

-#: builtin/tag.c:423
+#: builtin/tag.c:427

 #, c-format
 msgid "malformed object name '%s'"
 msgstr "非法的对象名 '%s'"
 
 #, c-format
 msgid "malformed object name '%s'"
 msgstr "非法的对象名 '%s'"
 

-#: builtin/tag.c:502
+#: builtin/tag.c:506
+#, fuzzy
+msgid "--column and -n are incompatible"
+msgstr "--all 和 --tags 不兼容"
+
+#: builtin/tag.c:523

 msgid "-n option is only allowed with -l."
 msgstr "-n 选项只允许和 -l 共用。"
 
 msgid "-n option is only allowed with -l."
 msgstr "-n 选项只允许和 -l 共用。"
 

-#: builtin/tag.c:504
+#: builtin/tag.c:525

 msgid "--contains option is only allowed with -l."
 msgstr "--contains 选项只允许和 -l 共用。"
 
 msgid "--contains option is only allowed with -l."
 msgstr "--contains 选项只允许和 -l 共用。"
 

-#: builtin/tag.c:506
+#: builtin/tag.c:527

 msgid "--points-at option is only allowed with -l."
 msgstr "--points-at 选项只允许和 -l 共用。"
 
 msgid "--points-at option is only allowed with -l."
 msgstr "--points-at 选项只允许和 -l 共用。"
 

-#: builtin/tag.c:514
+#: builtin/tag.c:535

 msgid "only one -F or -m option is allowed."
 msgstr "只允许一个 -F 或 -m 选项。"
 
 msgid "only one -F or -m option is allowed."
 msgstr "只允许一个 -F 或 -m 选项。"
 

-#: builtin/tag.c:534
+#: builtin/tag.c:555

 msgid "too many params"
 msgstr "太多参数"
 
 msgid "too many params"
 msgstr "太多参数"
 

-#: builtin/tag.c:540
+#: builtin/tag.c:561

 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' 不是一个有效的tag名称。"
 
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' 不是一个有效的tag名称。"
 

-#: builtin/tag.c:545
+#: builtin/tag.c:566

 #, c-format
 msgid "tag '%s' already exists"
 msgstr "tag '%s' 已存在"
 
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "tag '%s' 已存在"
 

-#: builtin/tag.c:563
+#: builtin/tag.c:584

 #, c-format
 msgid "%s: cannot lock the ref"
 msgstr "%s：不能锁定引用"
 
 #, c-format
 msgid "%s: cannot lock the ref"
 msgstr "%s：不能锁定引用"
 

-#: builtin/tag.c:565
+#: builtin/tag.c:586

 #, c-format
 msgid "%s: cannot update the ref"
 msgstr "%s：不能更新引用"
 
 #, c-format
 msgid "%s: cannot update the ref"
 msgstr "%s：不能更新引用"
 

-#: builtin/tag.c:567
+#: builtin/tag.c:588

 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新tag '%s'（曾为 %s）\n"
 
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新tag '%s'（曾为 %s）\n"
 

+#: git.c:16
+msgid "See 'git help <command>' for more information on a specific command."
+msgstr ""
+
+#: parse-options.h:133 parse-options.h:235
+msgid "n"
+msgstr ""
+
+#: parse-options.h:141
+msgid "time"
+msgstr ""
+
+#: parse-options.h:149
+#, fuzzy
+msgid "file"
+msgstr "%s文件："
+
+#: parse-options.h:151
+msgid "when"
+msgstr ""
+
+#: parse-options.h:156
+msgid "no-op (backward compatibility)"
+msgstr ""
+
+#: parse-options.h:228
+msgid "be more verbose"
+msgstr ""
+
+#: parse-options.h:230
+msgid "be more quiet"
+msgstr ""
+
+#: parse-options.h:236
+msgid "use <n> digits to display SHA-1s"
+msgstr ""
+
+#: common-cmds.h:8
+msgid "Add file contents to the index"
+msgstr ""
+
+#: common-cmds.h:9
+msgid "Find by binary search the change that introduced a bug"
+msgstr ""
+
+#: common-cmds.h:10
+#, fuzzy
+msgid "List, create, or delete branches"
+msgstr "无法变基到多个分支"
+
+#: common-cmds.h:11
+msgid "Checkout a branch or paths to the working tree"
+msgstr ""
+
+#: common-cmds.h:12
+#, fuzzy
+msgid "Clone a repository into a new directory"
+msgstr "引用版本库 '%s' 不是一个本地目录。"
+
+#: common-cmds.h:13
+#, fuzzy
+msgid "Record changes to the repository"
+msgstr "不是一个 git 版本库"
+
+#: common-cmds.h:14
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr ""
+
+#: common-cmds.h:15
+msgid "Download objects and refs from another repository"
+msgstr ""
+
+#: common-cmds.h:16
+msgid "Print lines matching a pattern"
+msgstr ""
+
+#: common-cmds.h:17
+msgid "Create an empty git repository or reinitialize an existing one"
+msgstr ""
+
+#: common-cmds.h:18
+#, fuzzy
+msgid "Show commit logs"
+msgstr "未知提交 %s"
+
+#: common-cmds.h:19
+msgid "Join two or more development histories together"
+msgstr ""
+
+#: common-cmds.h:20
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr ""
+
+#: common-cmds.h:21
+msgid "Fetch from and merge with another repository or a local branch"
+msgstr ""
+
+#: common-cmds.h:22
+msgid "Update remote refs along with associated objects"
+msgstr ""
+
+#: common-cmds.h:23
+msgid "Forward-port local commits to the updated upstream head"
+msgstr ""
+
+#: common-cmds.h:24
+msgid "Reset current HEAD to the specified state"
+msgstr ""
+
+#: common-cmds.h:25
+msgid "Remove files from the working tree and from the index"
+msgstr ""
+
+#: common-cmds.h:26
+msgid "Show various types of objects"
+msgstr ""
+
+#: common-cmds.h:27
+#, fuzzy
+msgid "Show the working tree status"
+msgstr "不能记录工作区状态"
+
+#: common-cmds.h:28
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr ""
+

 #: git-am.sh:50
 msgid "You need to set your committer info first"
 msgstr "您需要先设置你的提交者信息"
 #: git-am.sh:50
 msgid "You need to set your committer info first"
 msgstr "您需要先设置你的提交者信息"


@@ -3598,67 +5116,67 @@ msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
 
 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
 

-#: git-submodule.sh:248
+#: git-submodule.sh:249

 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
 
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
 

-#: git-submodule.sh:265
+#: git-submodule.sh:266

 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' 已经存在于索引中"
 
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' 已经存在于索引中"
 

-#: git-submodule.sh:282
+#: git-submodule.sh:283

 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
 
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
 

-#: git-submodule.sh:296
+#: git-submodule.sh:297

 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "不能检出子模组 '$sm_path'"
 
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "不能检出子模组 '$sm_path'"
 

-#: git-submodule.sh:301
+#: git-submodule.sh:302

 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "无法添加子模组 '$sm_path'"
 
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "无法添加子模组 '$sm_path'"
 

-#: git-submodule.sh:306
+#: git-submodule.sh:307

 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "无法注册子模组 '$sm_path'"
 
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "无法注册子模组 '$sm_path'"
 

-#: git-submodule.sh:348
+#: git-submodule.sh:349

 #, sh-format
 msgid "Entering '$prefix$sm_path'"
 msgstr "正在进入 '$prefix$sm_path'"
 
 #, sh-format
 msgid "Entering '$prefix$sm_path'"
 msgstr "正在进入 '$prefix$sm_path'"
 

-#: git-submodule.sh:360
+#: git-submodule.sh:363

 #, sh-format
 msgid "Stopping at '$sm_path'; script returned non-zero status."
 msgstr "停止于 '$sm_path'，脚本返回非零值。"
 
 #, sh-format
 msgid "Stopping at '$sm_path'; script returned non-zero status."
 msgstr "停止于 '$sm_path'，脚本返回非零值。"
 

-#: git-submodule.sh:402
+#: git-submodule.sh:405

 #, sh-format
 msgid "No url found for submodule path '$sm_path' in .gitmodules"
 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
 
 #, sh-format
 msgid "No url found for submodule path '$sm_path' in .gitmodules"
 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
 

-#: git-submodule.sh:411
+#: git-submodule.sh:414

 #, sh-format
 msgid "Failed to register url for submodule path '$sm_path'"
 msgstr "无法为子模组路径 '$sm_path' 注册 url"
 
 #, sh-format
 msgid "Failed to register url for submodule path '$sm_path'"
 msgstr "无法为子模组路径 '$sm_path' 注册 url"
 

-#: git-submodule.sh:419
+#: git-submodule.sh:422

 #, sh-format
 msgid "Failed to register update mode for submodule path '$sm_path'"
 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
 
 #, sh-format
 msgid "Failed to register update mode for submodule path '$sm_path'"
 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
 

-#: git-submodule.sh:421
+#: git-submodule.sh:424

 #, sh-format
 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
 
 #, sh-format
 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
 

-#: git-submodule.sh:520
+#: git-submodule.sh:523

 #, sh-format
 msgid ""
 "Submodule path '$sm_path' not initialized\n"
 #, sh-format
 msgid ""
 "Submodule path '$sm_path' not initialized\n"


@@ -3667,85 +5185,91 @@ msgstr ""
 "子模组路径 '$sm_path' 没有初始化\n"
 "也许您想用 'update --init'？"
 
 "子模组路径 '$sm_path' 没有初始化\n"
 "也许您想用 'update --init'？"
 

-#: git-submodule.sh:533
+#: git-submodule.sh:536

 #, sh-format
 msgid "Unable to find current revision in submodule path '$sm_path'"
 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
 
 #, sh-format
 msgid "Unable to find current revision in submodule path '$sm_path'"
 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
 

-#: git-submodule.sh:552
+#: git-submodule.sh:555

 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "无法在子模组路径 '$sm_path' 中获取"
 
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "无法在子模组路径 '$sm_path' 中获取"
 

-#: git-submodule.sh:566
+#: git-submodule.sh:569

 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
 
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
 

-#: git-submodule.sh:567
+#: git-submodule.sh:570

 #, sh-format
 msgid "Submodule path '$sm_path': rebased into '$sha1'"
 msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"
 
 #, sh-format
 msgid "Submodule path '$sm_path': rebased into '$sha1'"
 msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"
 

-#: git-submodule.sh:572
+#: git-submodule.sh:575

 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
 
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
 

-#: git-submodule.sh:573
+#: git-submodule.sh:576

 #, sh-format
 msgid "Submodule path '$sm_path': merged in '$sha1'"
 msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"
 
 #, sh-format
 msgid "Submodule path '$sm_path': merged in '$sha1'"
 msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"
 

-#: git-submodule.sh:578
+#: git-submodule.sh:581

 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
 
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
 

-#: git-submodule.sh:579
+#: git-submodule.sh:582

 #, sh-format
 msgid "Submodule path '$sm_path': checked out '$sha1'"
 msgstr "子模组路径 '$sm_path'：检出 '$sha1'"
 
 #, sh-format
 msgid "Submodule path '$sm_path': checked out '$sha1'"
 msgstr "子模组路径 '$sm_path'：检出 '$sha1'"
 

-#: git-submodule.sh:601 git-submodule.sh:924
+#: git-submodule.sh:604 git-submodule.sh:927

 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "无法递归进子模组路径 '$sm_path'"
 
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "无法递归进子模组路径 '$sm_path'"
 

-#: git-submodule.sh:709
+#: git-submodule.sh:712

 msgid "--"
 msgstr "--"
 
 #  译者：注意保持前导空格
 msgid "--"
 msgstr "--"
 
 #  译者：注意保持前导空格

-#: git-submodule.sh:767
+#: git-submodule.sh:770

 #, sh-format
 msgid "  Warn: $name doesn't contain commit $sha1_src"
 msgstr "  警告：$name 未包含提交 $sha1_src"
 
 #  译者：注意保持前导空格
 #, sh-format
 msgid "  Warn: $name doesn't contain commit $sha1_src"
 msgstr "  警告：$name 未包含提交 $sha1_src"
 
 #  译者：注意保持前导空格

-#: git-submodule.sh:770
+#: git-submodule.sh:773

 #, sh-format
 msgid "  Warn: $name doesn't contain commit $sha1_dst"
 msgstr "  警告：$name 未包含提交 $sha1_dst"
 
 #  译者：注意保持前导空格
 #, sh-format
 msgid "  Warn: $name doesn't contain commit $sha1_dst"
 msgstr "  警告：$name 未包含提交 $sha1_dst"
 
 #  译者：注意保持前导空格

-#: git-submodule.sh:773
+#: git-submodule.sh:776

 #, sh-format
 msgid "  Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
 
 #, sh-format
 msgid "  Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
 

-#: git-submodule.sh:798
+#: git-submodule.sh:801

 msgid "blob"
 msgstr "blob"
 
 msgid "blob"
 msgstr "blob"
 

-#: git-submodule.sh:799
+#: git-submodule.sh:802

 msgid "submodule"
 msgstr "子模组"
 
 msgid "submodule"
 msgstr "子模组"
 

-#: git-submodule.sh:970
+#: git-submodule.sh:973

 #, sh-format
 msgid "Synchronizing submodule url for '$name'"
 msgstr "为 '$name' 同步子模组 url"
 
 #, sh-format
 msgid "Synchronizing submodule url for '$name'"
 msgstr "为 '$name' 同步子模组 url"
 

+#~ msgid "cherry-pick"
+#~ msgstr "拣选"
+
+#~ msgid "Please enter the commit message for your changes."
+#~ msgstr "请为您的修改输入提交说明。"
+

 #~ msgid "Too many options specified"
 #~ msgstr "指定了太多的选项"
 #~ msgid "Too many options specified"
 #~ msgstr "指定了太多的选项"