diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4838c19b0be283..b0e5c18fb0166b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -154,8 +154,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2024-04-28 19:59+0800\n"
-"PO-Revision-Date: 2024-04-28 20:31+0800\n"
+"POT-Creation-Date: 2024-07-27 22:28+0800\n"
+"PO-Revision-Date: 2024-07-27 22:13+0800\n"
 "Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
 "Language: zh_CN\n"
@@ -165,233 +165,240 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 42.0\n"
 
-#: add-interactive.c
+#: add-interactive.c:391
 #, c-format
 msgid "Huh (%s)?"
 msgstr "嗯（%s）？"
 
-#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c
+#: add-interactive.c:545 add-interactive.c:855 builtin/merge.c:381
+#: builtin/rebase.c:1307 builtin/rebase.c:1719 reset.c:146 sequencer.c:3810
+#: sequencer.c:4287 sequencer.c:4680
 msgid "could not read index"
 msgstr "不能读取索引"
 
-#: add-interactive.c
+#: add-interactive.c:599
 msgid "binary"
 msgstr "二进制"
 
-#: add-interactive.c
+#: add-interactive.c:657
 msgid "nothing"
 msgstr "无"
 
-#: add-interactive.c
+#: add-interactive.c:658
 msgid "unchanged"
 msgstr "没有修改"
 
-#: add-interactive.c
+#: add-interactive.c:695
 msgid "Update"
 msgstr "更新"
 
-#: add-interactive.c
+#: add-interactive.c:716 add-interactive.c:720 add-interactive.c:911
 #, c-format
 msgid "could not stage '%s'"
 msgstr "不能暂存 '%s'"
 
-#: add-interactive.c builtin/stash.c reset.c sequencer.c
+#: add-interactive.c:726 add-interactive.c:918 builtin/stash.c:523
+#: builtin/stash.c:540 builtin/stash.c:610 builtin/stash.c:1377
+#: builtin/stash.c:1568 reset.c:175 sequencer.c:4051
 msgid "could not write index"
 msgstr "不能写入索引"
 
-#: add-interactive.c
+#: add-interactive.c:729
 #, c-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "更新了 %d 个路径\n"
 msgstr[1] "更新了 %d 个路径\n"
 
-#: add-interactive.c
+#: add-interactive.c:747
 #, c-format
 msgid "note: %s is untracked now.\n"
 msgstr "说明：%s 现已成为未跟踪的。\n"
 
-#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c
+#: add-interactive.c:752 apply.c:4206 builtin/checkout.c:323
+#: builtin/reset.c:183
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
 
-#: add-interactive.c
+#: add-interactive.c:784
 msgid "Revert"
 msgstr "还原"
 
-#: add-interactive.c
+#: add-interactive.c:800
 msgid "Could not parse HEAD^{tree}"
 msgstr "不能解析 HEAD^{tree}"
 
-#: add-interactive.c
+#: add-interactive.c:838
 #, c-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "还原了 %d 个路径\n"
 msgstr[1] "还原了 %d 个路径\n"
 
-#: add-interactive.c
+#: add-interactive.c:890
 #, c-format
 msgid "No untracked files.\n"
 msgstr "没有未跟踪的文件。\n"
 
-#: add-interactive.c
+#: add-interactive.c:894
 msgid "Add untracked"
 msgstr "添加未跟踪的"
 
-#: add-interactive.c
+#: add-interactive.c:921
 #, c-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "增加了 %d 个路径\n"
 msgstr[1] "增加了 %d 个路径\n"
 
-#: add-interactive.c
+#: add-interactive.c:951
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "忽略未合入的：%s"
 
-#: add-interactive.c add-patch.c
+#: add-interactive.c:963
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "只有二进制文件被修改。\n"
 
-#: add-interactive.c add-patch.c
+#: add-interactive.c:965
 #, c-format
 msgid "No changes.\n"
 msgstr "没有修改。\n"
 
-#: add-interactive.c
+#: add-interactive.c:969
 msgid "Patch update"
 msgstr "补丁更新"
 
-#: add-interactive.c
+#: add-interactive.c:1010
 msgid "Review diff"
 msgstr "检视 diff"
 
-#: add-interactive.c
+#: add-interactive.c:1037
 msgid "show paths with changes"
 msgstr "显示含变更的路径"
 
-#: add-interactive.c
+#: add-interactive.c:1039
 msgid "add working tree state to the staged set of changes"
 msgstr "将工作区状态添加到暂存区修改集中"
 
-#: add-interactive.c
+#: add-interactive.c:1041
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "将暂存的修改集恢复为 HEAD 版本"
 
-#: add-interactive.c
+#: add-interactive.c:1043
 msgid "pick hunks and update selectively"
 msgstr "挑选数据块并有选择地更新"
 
-#: add-interactive.c
+#: add-interactive.c:1045
 msgid "view diff between HEAD and index"
 msgstr "显示 HEAD 和索引的差异"
 
-#: add-interactive.c
+#: add-interactive.c:1047
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "将未跟踪文件的内容添加到暂存区修改集中"
 
-#: add-interactive.c
+#: add-interactive.c:1055 add-interactive.c:1104
 msgid "Prompt help:"
 msgstr "帮助："
 
-#: add-interactive.c
+#: add-interactive.c:1057
 msgid "select a single item"
 msgstr "选择一个条目"
 
-#: add-interactive.c
+#: add-interactive.c:1059
 msgid "select a range of items"
 msgstr "选择一系列条目"
 
-#: add-interactive.c
+#: add-interactive.c:1061
 msgid "select multiple ranges"
 msgstr "选择多个范围"
 
-#: add-interactive.c
+#: add-interactive.c:1063 add-interactive.c:1108
 msgid "select item based on unique prefix"
 msgstr "基于唯一前缀选择条目"
 
-#: add-interactive.c
+#: add-interactive.c:1065
 msgid "unselect specified items"
 msgstr "反选指定的条目"
 
-#: add-interactive.c
+#: add-interactive.c:1067
 msgid "choose all items"
 msgstr "选择所有条目"
 
-#: add-interactive.c
+#: add-interactive.c:1069
 msgid "(empty) finish selecting"
 msgstr "（空）结束选择"
 
-#: add-interactive.c
+#: add-interactive.c:1106
 msgid "select a numbered item"
 msgstr "选择一个编号条目"
 
-#: add-interactive.c
+#: add-interactive.c:1110
 msgid "(empty) select nothing"
 msgstr "（空）不选择任何内容"
 
-#: add-interactive.c builtin/clean.c
+#: add-interactive.c:1118 builtin/clean.c:846
 msgid "*** Commands ***"
 msgstr "*** 命令 ***"
 
-#: add-interactive.c builtin/clean.c
+#: add-interactive.c:1119 builtin/clean.c:847
 msgid "What now"
 msgstr "请选择"
 
-#: add-interactive.c
+#: add-interactive.c:1171
 msgid "staged"
 msgstr "缓存"
 
-#: add-interactive.c
+#: add-interactive.c:1171
 msgid "unstaged"
 msgstr "未缓存"
 
-#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c
-#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c
-#: builtin/pull.c builtin/submodule--helper.c
+#: add-interactive.c:1171 apply.c:5119 apply.c:5122 builtin/am.c:2357
+#: builtin/am.c:2360 builtin/bugreport.c:120 builtin/clone.c:143
+#: builtin/diagnose.c:25 builtin/fetch.c:2179 builtin/hook.c:30
+#: builtin/merge.c:272 builtin/pull.c:196 builtin/submodule--helper.c:1838
+#: builtin/submodule--helper.c:1841
 msgid "path"
 msgstr "路径"
 
-#: add-interactive.c
+#: add-interactive.c:1178
 msgid "could not refresh index"
 msgstr "不能刷新索引"
 
-#: add-interactive.c builtin/clean.c
+#: add-interactive.c:1192 builtin/clean.c:811
 #, c-format
 msgid "Bye.\n"
 msgstr "再见。\n"
 
-#: add-patch.c
+#: add-patch.c:42
 #, c-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:43
 #, c-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:44
 #, c-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:45
 #, c-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "暂存该块 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:47
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "staging."
 msgstr "如果补丁能正确地应用，编辑块将立即标记为暂存。"
 
-#: add-patch.c
+#: add-patch.c:50
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -405,33 +412,33 @@ msgstr ""
 "a - 暂存该块和本文件中后面的全部块\n"
 "d - 不暂存该块和本文件中后面的全部块\n"
 
-#: add-patch.c
+#: add-patch.c:64
 #, c-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:65
 #, c-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:66
 #, c-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:67
 #, c-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:69
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "stashing."
 msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。"
 
-#: add-patch.c
+#: add-patch.c:72
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -445,33 +452,33 @@ msgstr ""
 "a - 贮藏该块和本文件中后面的全部块\n"
 "d - 不贮藏该块和本文件中后面的全部块\n"
 
-#: add-patch.c
+#: add-patch.c:88
 #, c-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:89
 #, c-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:90
 #, c-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:91
 #, c-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:93
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "unstaging."
 msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。"
 
-#: add-patch.c
+#: add-patch.c:96
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -485,33 +492,33 @@ msgstr ""
 "a - 取消暂存该块和本文件中后面的全部块\n"
 "d - 不要取消暂存该块和本文件中后面的全部块\n"
 
-#: add-patch.c
+#: add-patch.c:111
 #, c-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:112
 #, c-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:113
 #, c-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:114
 #, c-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:116 add-patch.c:184 add-patch.c:229
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "applying."
 msgstr "如果补丁能正确地应用，编辑块将立即标记为应用。"
 
-#: add-patch.c
+#: add-patch.c:119
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -525,33 +532,33 @@ msgstr ""
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块\n"
 
-#: add-patch.c
+#: add-patch.c:134 add-patch.c:202
 #, c-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:135 add-patch.c:203
 #, c-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:136 add-patch.c:204
 #, c-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:137 add-patch.c:205
 #, c-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:139 add-patch.c:162 add-patch.c:207
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "discarding."
 msgstr "如果补丁能正确地应用，编辑块将立即标记为丢弃。"
 
-#: add-patch.c
+#: add-patch.c:142 add-patch.c:210
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -565,27 +572,27 @@ msgstr ""
 "a - 丢弃该块和本文件中后面的全部块\n"
 "d - 不要丢弃该块和本文件中后面的全部块\n"
 
-#: add-patch.c
+#: add-patch.c:157
 #, c-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:158
 #, c-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:159
 #, c-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:160
 #, c-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:165
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -599,27 +606,27 @@ msgstr ""
 "a - 丢弃该块和本文件中后面的全部块\n"
 "d - 不要丢弃该块和本文件中后面的全部块\n"
 
-#: add-patch.c
+#: add-patch.c:179
 #, c-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:180
 #, c-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:181
 #, c-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:182
 #, c-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:187
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -633,27 +640,27 @@ msgstr ""
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块\n"
 
-#: add-patch.c
+#: add-patch.c:224
 #, c-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:225
 #, c-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:226
 #, c-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:227
 #, c-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c
+#: add-patch.c:232
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -667,35 +674,35 @@ msgstr ""
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块\n"
 
-#: add-patch.c
+#: add-patch.c:352
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "无法解析数据块头信息 '%.*s'"
 
-#: add-patch.c
+#: add-patch.c:440
 msgid "could not parse diff"
 msgstr "不能解析差异信息"
 
-#: add-patch.c
+#: add-patch.c:459
 msgid "could not parse colored diff"
 msgstr "不能解析彩色差异信息"
 
-#: add-patch.c
+#: add-patch.c:473
 #, c-format
 msgid "failed to run '%s'"
 msgstr "无法运行 '%s'"
 
-#: add-patch.c
+#: add-patch.c:631
 msgid "mismatched output from interactive.diffFilter"
 msgstr "interactive.diffFilter 的输出不匹配"
 
-#: add-patch.c
+#: add-patch.c:632
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
 msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
 
-#: add-patch.c
+#: add-patch.c:819
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -704,7 +711,7 @@ msgstr ""
 "预期上下文行 #%d 于\n"
 "%.*s"
 
-#: add-patch.c
+#: add-patch.c:834
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -717,11 +724,11 @@ msgstr ""
 "\t不是结尾于：\n"
 "%.*s"
 
-#: add-patch.c
+#: add-patch.c:1111
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
 
-#: add-patch.c
+#: add-patch.c:1115
 #, c-format
 msgid ""
 "---\n"
@@ -734,7 +741,7 @@ msgstr ""
 "要删除 '%c' 开始的行，删除它们。\n"
 "以 %s 开始的行将被删除。\n"
 
-#: add-patch.c
+#: add-patch.c:1130
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -743,11 +750,11 @@ msgstr ""
 "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
 "此次编辑被终止，该块不会被修改。\n"
 
-#: add-patch.c
+#: add-patch.c:1163
 msgid "could not parse hunk header"
 msgstr "无法解析数据块头信息"
 
-#: add-patch.c
+#: add-patch.c:1208
 msgid "'git apply --cached' failed"
 msgstr "'git apply --cached' 失败"
 
@@ -757,24 +764,24 @@ msgstr "'git apply --cached' 失败"
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
 #.
-#: add-patch.c
+#: add-patch.c:1278
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
 
-#: add-patch.c
+#: add-patch.c:1321
 msgid "The selected hunks do not apply to the index!"
 msgstr "选中的块不能应用到索引！"
 
-#: add-patch.c
+#: add-patch.c:1322
 msgid "Apply them to the worktree anyway? "
 msgstr "无论如何都要应用到工作区么？"
 
-#: add-patch.c
+#: add-patch.c:1329
 msgid "Nothing was applied.\n"
 msgstr "未应用。\n"
 
-#: add-patch.c
+#: add-patch.c:1386
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -798,73 +805,91 @@ msgstr ""
 "p - 显示当前块\n"
 "? - 显示帮助\n"
 
-#: add-patch.c
+#: add-patch.c:1520
+#, c-format
+msgid "Only one letter is expected, got '%s'"
+msgstr "预计只有一个字母，得到 '%s'"
+
+#: add-patch.c:1559 add-patch.c:1569
 msgid "No previous hunk"
 msgstr "没有前一个块"
 
-#: add-patch.c
+#: add-patch.c:1564 add-patch.c:1574
 msgid "No next hunk"
 msgstr "没有下一个块"
 
-#: add-patch.c
+#: add-patch.c:1580
 msgid "No other hunks to goto"
 msgstr "没有其它可供跳转的块"
 
-#: add-patch.c
+#: add-patch.c:1591
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "跳转到哪个块（<回车> 查看更多）？ "
 
-#: add-patch.c
+#: add-patch.c:1592
 msgid "go to which hunk? "
 msgstr "跳转到哪个块？"
 
-#: add-patch.c
+#: add-patch.c:1603
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "无效数字：'%s'"
 
-#: add-patch.c
+#: add-patch.c:1608
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "对不起，只有 %d 个可用块。"
 msgstr[1] "对不起，只有 %d 个可用块。"
 
-#: add-patch.c
+#: add-patch.c:1617
 msgid "No other hunks to search"
 msgstr "没有其它可供查找的块"
 
-#: add-patch.c
+#: add-patch.c:1623
 msgid "search for regex? "
 msgstr "使用正则表达式搜索？"
 
-#: add-patch.c
+#: add-patch.c:1638
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "错误的正则表达式 %s：%s"
 
-#: add-patch.c
+#: add-patch.c:1655
 msgid "No hunk matches the given pattern"
 msgstr "没有和给定模式相匹配的块"
 
-#: add-patch.c
+#: add-patch.c:1663
 msgid "Sorry, cannot split this hunk"
 msgstr "对不起，不能拆分这个块"
 
-#: add-patch.c
+#: add-patch.c:1667
 #, c-format
 msgid "Split into %d hunks."
 msgstr "拆分为 %d 块。"
 
-#: add-patch.c
+#: add-patch.c:1673
 msgid "Sorry, cannot edit this hunk"
 msgstr "对不起，不能编辑这个块"
 
-#: add-patch.c
+#: add-patch.c:1705
+#, c-format
+msgid "Unknown command '%s' (use '?' for help)"
+msgstr "未知命令 '%s'（使用 '?' 寻求帮助）"
+
+#: add-patch.c:1730
 msgid "'git apply' failed"
 msgstr "'git apply' 失败"
 
-#: advice.c
+#: add-patch.c:1793
+msgid "No changes."
+msgstr "没有修改。"
+
+#: add-patch.c:1795
+msgid "Only binary files changed."
+msgstr "只有二进制文件被修改。"
+
+#: advice.c:95
 #, c-format
 msgid ""
 "\n"
@@ -873,36 +898,36 @@ msgstr ""
 "\n"
 "使用 \"git config advice.%s false\" 来关闭此消息"
 
-#: advice.c
+#: advice.c:111
 #, c-format
 msgid "%shint:%s%.*s%s\n"
 msgstr "%s提示：%s%.*s%s\n"
 
-#: advice.c
+#: advice.c:205
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "无法拣选，因为您有未合并的文件。"
 
-#: advice.c
+#: advice.c:207
 msgid "Committing is not possible because you have unmerged files."
 msgstr "无法提交，因为您有未合并的文件。"
 
-#: advice.c
+#: advice.c:209
 msgid "Merging is not possible because you have unmerged files."
 msgstr "无法合并，因为您有未合并的文件。"
 
-#: advice.c
+#: advice.c:211
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "无法拉取，因为您有未合并的文件。"
 
-#: advice.c
+#: advice.c:213
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "无法回退，因为您有未合并的文件。"
 
-#: advice.c
+#: advice.c:215
 msgid "Rebasing is not possible because you have unmerged files."
 msgstr "无法变基，因为您有未合并的文件。"
 
-#: advice.c
+#: advice.c:224
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -910,23 +935,23 @@ msgstr ""
 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
 "解决方案并提交。"
 
-#: advice.c
+#: advice.c:232
 msgid "Exiting because of an unresolved conflict."
 msgstr "因为存在未解决的冲突而退出。"
 
-#: advice.c builtin/merge.c
+#: advice.c:237 builtin/merge.c:1398
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
 
-#: advice.c
+#: advice.c:239
 msgid "Please, commit your changes before merging."
 msgstr "请在合并前先提交您的修改。"
 
-#: advice.c
+#: advice.c:240
 msgid "Exiting because of unfinished merge."
 msgstr "因为存在未完成的合并而退出。"
 
-#: advice.c
+#: advice.c:246
 msgid ""
 "Diverging branches can't be fast-forwarded, you need to either:\n"
 "\n"
@@ -944,11 +969,11 @@ msgstr ""
 "\n"
 "\tgit rebase\n"
 
-#: advice.c
+#: advice.c:253
 msgid "Not possible to fast-forward, aborting."
 msgstr "无法快进，终止。"
 
-#: advice.c
+#: advice.c:263
 #, c-format
 msgid ""
 "The following paths and/or pathspecs matched paths that exist\n"
@@ -958,7 +983,7 @@ msgstr ""
 "下面的路径和/或者路径规格匹配了您定义的稀疏检出以外的路径，\n"
 "所以不会在索引中更新：\n"
 
-#: advice.c
+#: advice.c:270
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
@@ -968,7 +993,7 @@ msgstr ""
 "* 使用 --sparse 选项。\n"
 "* 禁用或者修改稀疏规则。"
 
-#: advice.c
+#: advice.c:278
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -1007,7 +1032,7 @@ msgstr ""
 "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
 "\n"
 
-#: advice.c
+#: advice.c:305
 #, c-format
 msgid ""
 "The following paths have been moved outside the\n"
@@ -1017,7 +1042,7 @@ msgstr ""
 "下列的路径已经被移动至稀疏检出的定义之外，\n"
 "但是由于本地的修改而并非稀疏。\n"
 
-#: advice.c
+#: advice.c:312
 msgid ""
 "To correct the sparsity of these paths, do the following:\n"
 "* Use \"git add --sparse <paths>\" to update the index\n"
@@ -1027,102 +1052,122 @@ msgstr ""
 "* 使用 \"git add --sparse <路径>\" 来更新索引\n"
 "* 使用 \"git sparse-checkout reapply\" 来应用稀疏规则"
 
-#: alias.c
+#: alias.c:73
 msgid "cmdline ends with \\"
 msgstr "命令行以 \\ 结尾"
 
-#: alias.c
+#: alias.c:74
 msgid "unclosed quote"
 msgstr "未关闭的引号"
 
-#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
-#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c
+#: alias.c:75 builtin/cat-file.c:1077 builtin/notes.c:450 builtin/notes.c:512
+#: builtin/notes.c:594 builtin/notes.c:606 builtin/notes.c:689
+#: builtin/notes.c:765 builtin/notes.c:918 builtin/notes.c:1072
+#: builtin/notes.c:1094 builtin/prune-packed.c:26 builtin/receive-pack.c:2506
+#: builtin/refs.c:33 builtin/tag.c:644 t/helper/test-pkt-line.c:89
 msgid "too many arguments"
 msgstr "太多参数"
 
-#: apply.c
+#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "未能识别的空白字符选项 '%s'"
 
-#: apply.c
+#: apply.c:102
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "未能识别的空白字符忽略选项 '%s'"
 
-#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c
-#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c
-#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
-#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
-#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
-#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c
-#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.c
-#: builtin/rev-parse.c builtin/show-branch.c builtin/stash.c
-#: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c
-#: range-diff.c revision.c
+#: apply.c:155 archive.c:685 builtin/add.c:381 builtin/add.c:383
+#: builtin/add.c:389 builtin/add.c:401 builtin/branch.c:837
+#: builtin/checkout-index.c:275 builtin/checkout.c:485 builtin/checkout.c:488
+#: builtin/checkout.c:1791 builtin/checkout.c:1901 builtin/checkout.c:1904
+#: builtin/clean.c:963 builtin/clone.c:1015 builtin/clone.c:1020
+#: builtin/commit.c:360 builtin/commit.c:363 builtin/commit.c:1230
+#: builtin/commit.c:1286 builtin/commit.c:1303 builtin/describe.c:617
+#: builtin/diff-tree.c:163 builtin/difftool.c:743 builtin/fast-export.c:1262
+#: builtin/fetch.c:2290 builtin/fetch.c:2317 builtin/fetch.c:2331
+#: builtin/fetch.c:2336 builtin/help.c:618 builtin/index-pack.c:1867
+#: builtin/init-db.c:110 builtin/log.c:2234 builtin/log.c:2236
+#: builtin/ls-files.c:744 builtin/merge-base.c:174 builtin/merge-base.c:180
+#: builtin/merge-tree.c:594 builtin/merge.c:1419 builtin/merge.c:1421
+#: builtin/pack-objects.c:4508 builtin/rebase.c:1262 builtin/rebase.c:1264
+#: builtin/rebase.c:1273 builtin/repack.c:1263 builtin/replay.c:315
+#: builtin/reset.c:382 builtin/reset.c:419 builtin/rev-list.c:575
+#: builtin/rev-parse.c:934 builtin/rev-parse.c:941 builtin/rev-parse.c:952
+#: builtin/show-branch.c:725 builtin/show-branch.c:730 builtin/stash.c:1783
+#: builtin/stash.c:1786 builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:3038 builtin/tag.c:578 builtin/tag.c:625
+#: builtin/worktree.c:730 builtin/worktree.c:733 builtin/worktree.c:806
+#: builtin/worktree.c:809 builtin/worktree.c:812 builtin/worktree.c:1058
+#: parse-options.c:280 parse-options.c:1326 range-diff.c:574 revision.c:2476
+#: revision.c:2481 revision.c:2485 revision.c:2494 revision.c:2499
+#: revision.c:2731 revision.c:2802 revision.c:2814 revision.c:2820
+#: revision.c:2840 revision.c:2850 revision.c:2860 revision.c:3147
+#: revision.c:3159
 #, c-format
 msgid "options '%s' and '%s' cannot be used together"
 msgstr "选项 '%s' 和 '%s' 不能同时使用"
 
-#: apply.c
+#: apply.c:158 apply.c:169 apply.c:172
 #, c-format
 msgid "'%s' outside a repository"
 msgstr "'%s' 在仓库之外"
 
-#: apply.c
+#: apply.c:419
 msgid "failed to read patch"
 msgstr "无法读取补丁"
 
-#: apply.c
+#: apply.c:421
 msgid "patch too large"
 msgstr "补丁过大"
 
-#: apply.c
+#: apply.c:835
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "无法准备时间戳正则表达式 %s"
 
-#: apply.c
+#: apply.c:844
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec 返回 %d，输入为：%s"
 
-#: apply.c
+#: apply.c:918
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "不能在补丁的第 %d 行找到文件名"
 
-#: apply.c
+#: apply.c:956
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
 
-#: apply.c
+#: apply.c:962
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
 
-#: apply.c
+#: apply.c:963
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
 
-#: apply.c
+#: apply.c:968
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
 
-#: apply.c
+#: apply.c:997
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "第 %d 行包含无效文件模式：%s"
 
-#: apply.c
+#: apply.c:1323
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "不一致的文件头，%d 行和 %d 行"
 
-#: apply.c
+#: apply.c:1413
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -1133,92 +1178,92 @@ msgid_plural ""
 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
 
-#: apply.c
+#: apply.c:1426
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
 
-#: apply.c
+#: apply.c:1522
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount：意外的行：%.*s"
 
-#: apply.c
+#: apply.c:1591
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "第 %d 行的补丁片段没有头信息：%.*s"
 
-#: apply.c
+#: apply.c:1794
 msgid "new file depends on old contents"
 msgstr "新文件依赖旧内容"
 
-#: apply.c
+#: apply.c:1796
 msgid "deleted file still has contents"
 msgstr "删除的文件仍有内容"
 
-#: apply.c
+#: apply.c:1830
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "补丁在第 %d 行损坏"
 
-#: apply.c
+#: apply.c:1867
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "新文件 %s 依赖旧内容"
 
-#: apply.c
+#: apply.c:1869
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "删除的文件 %s 仍有内容"
 
-#: apply.c
+#: apply.c:1872
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** 警告：文件 %s 成为空文件但并未删除"
 
-#: apply.c
+#: apply.c:2020
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "二进制补丁在第 %d 行损坏：%.*s"
 
-#: apply.c
+#: apply.c:2057
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "未能识别的二进制补丁位于第 %d 行"
 
-#: apply.c
+#: apply.c:2219
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "补丁文件的第 %d 行只有垃圾数据"
 
-#: apply.c
+#: apply.c:2306
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "无法读取符号链接 %s"
 
-#: apply.c
+#: apply.c:2310
 #, c-format
 msgid "unable to open or read %s"
 msgstr "不能打开或读取 %s"
 
-#: apply.c
+#: apply.c:3002
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "无效的行首字符：'%c'"
 
-#: apply.c
+#: apply.c:3123
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
 
-#: apply.c
+#: apply.c:3135
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
 
-#: apply.c
+#: apply.c:3141
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1227,674 +1272,687 @@ msgstr ""
 "当查询：\n"
 "%.*s"
 
-#: apply.c
+#: apply.c:3163
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "缺失 '%s' 的二进制补丁数据"
 
-#: apply.c
+#: apply.c:3171
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
 
-#: apply.c
+#: apply.c:3218
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
 
-#: apply.c
+#: apply.c:3229
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
 
-#: apply.c
+#: apply.c:3237
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "补丁应用到空文件 '%s'，但其并非空文件"
 
-#: apply.c
+#: apply.c:3256
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
 
-#: apply.c
+#: apply.c:3269
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "二进制补丁未应用到 '%s'"
 
-#: apply.c
+#: apply.c:3276
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
 
-#: apply.c
+#: apply.c:3297
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "打补丁失败：%s:%ld"
 
-#: apply.c builtin/mv.c
+#: apply.c:3421 builtin/mv.c:529
 #, c-format
 msgid "cannot checkout %s"
 msgstr "不能检出 %s"
 
-#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c
+#: apply.c:3473 apply.c:3484 apply.c:3530 midx.c:114 pack-mtimes.c:42
+#: pack-revindex.c:225 setup.c:328
 #, c-format
 msgid "failed to read %s"
 msgstr "无法读取 %s"
 
-#: apply.c
+#: apply.c:3481
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "读取位于符号链接中的 '%s'"
 
-#: apply.c
+#: apply.c:3510 apply.c:3785
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "路径 %s 已经被重命名/删除"
 
-#: apply.c
+#: apply.c:3621 apply.c:3800
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s：不存在于索引中"
 
-#: apply.c
+#: apply.c:3630 apply.c:3808 apply.c:4033
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s：和索引不匹配"
 
-#: apply.c
+#: apply.c:3667
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "仓库缺乏执行三方合并所必需的数据对象。"
 
-#: apply.c
+#: apply.c:3670
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "执行三方合并...\n"
 
-#: apply.c
+#: apply.c:3686 apply.c:3690
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "无法读取 '%s' 的当前内容"
 
-#: apply.c
+#: apply.c:3702
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "无法执行三方合并...\n"
 
-#: apply.c
+#: apply.c:3716
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "应用补丁到 '%s' 存在冲突。\n"
 
-#: apply.c
+#: apply.c:3721
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "成功应用补丁到 '%s'。\n"
 
-#: apply.c
+#: apply.c:3738
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "回落到直接应用...\n"
 
-#: apply.c
+#: apply.c:3752
 msgid "removal patch leaves file contents"
 msgstr "移除补丁仍留下了文件内容"
 
-#: apply.c
+#: apply.c:3834
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s：错误类型"
 
-#: apply.c
+#: apply.c:3836
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s 的类型是 %o，应为 %o"
 
-#: apply.c read-cache.c
+#: apply.c:3973 apply.c:3975 read-cache.c:842 read-cache.c:871
+#: read-cache.c:1304
 #, c-format
 msgid "invalid path '%s'"
 msgstr "无效路径 '%s'"
 
-#: apply.c
+#: apply.c:4031
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s：已经存在于索引中"
 
-#: apply.c
+#: apply.c:4035
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s：已经存在于工作区中"
 
-#: apply.c
+#: apply.c:4055
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
 
-#: apply.c
+#: apply.c:4060
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
 
-#: apply.c
+#: apply.c:4080 apply.c:4510
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "受影响的文件 '%s' 位于符号链接中"
 
-#: apply.c
+#: apply.c:4084
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：补丁未应用"
 
-#: apply.c
+#: apply.c:4099
 #, c-format
 msgid "Checking patch %s..."
 msgstr "正在检查补丁 %s..."
 
-#: apply.c
+#: apply.c:4191
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "子模组 %s 的 sha1 信息缺失或无效"
 
-#: apply.c
+#: apply.c:4198
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s 的模式变更，但它不在当前 HEAD 中"
 
-#: apply.c
+#: apply.c:4201
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 信息缺失或无效（%s）。"
 
-#: apply.c
+#: apply.c:4210
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "不能在临时索引中添加 %s"
 
-#: apply.c
+#: apply.c:4220
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "不能把临时索引写入到 %s"
 
-#: apply.c
+#: apply.c:4358
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "不能从索引中移除 %s"
 
-#: apply.c
+#: apply.c:4392
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "子模组 %s 损坏的补丁"
 
-#: apply.c
+#: apply.c:4398
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "不能对新建文件 '%s' 调用 stat"
 
-#: apply.c
+#: apply.c:4406
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "不能为新建文件 %s 创建后端存储"
 
-#: apply.c
+#: apply.c:4412 apply.c:4587
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "无法为 %s 添加缓存条目"
 
-#: apply.c builtin/bisect.c builtin/gc.c
+#: apply.c:4455 builtin/bisect.c:611 builtin/gc.c:2412 builtin/gc.c:2474
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "无法写入 '%s'"
 
-#: apply.c
+#: apply.c:4459
 #, c-format
 msgid "closing file '%s'"
 msgstr "关闭文件 '%s'"
 
-#: apply.c
+#: apply.c:4557
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "不能写文件 '%s' 权限 %o"
 
-#: apply.c
+#: apply.c:4657
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "成功应用补丁 %s。"
 
-#: apply.c
+#: apply.c:4665
 msgid "internal error"
 msgstr "内部错误"
 
-#: apply.c
+#: apply.c:4668
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
 
-#: apply.c
+#: apply.c:4681 apply.c:4690 apply.c:4696
 #, c-format
 msgid "cannot open %s"
 msgstr "不能打开 %s"
 
-#: apply.c rerere.c
+#: apply.c:4685 rerere.c:1081
 #, c-format
 msgid "cannot unlink '%s'"
 msgstr "不能删除 '%s'"
 
-#: apply.c
+#: apply.c:4713
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "第 #%d 个片段成功应用。"
 
-#: apply.c
+#: apply.c:4717
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "拒绝第 #%d 个片段。"
 
-#: apply.c
+#: apply.c:4848
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "略过补丁 '%s'。"
 
-#: apply.c
+#: apply.c:4857
 msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）"
 
-#: apply.c t/helper/test-cache-tree.c
+#: apply.c:4878 t/helper/test-cache-tree.c:40
 msgid "unable to read index file"
 msgstr "无法读取索引文件"
 
-#: apply.c
+#: apply.c:5035
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "不能打开补丁 '%s'：%s"
 
-#: apply.c
+#: apply.c:5062
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下仍有 %d 个空白字符误用"
 msgstr[1] "抑制下仍有 %d 个空白字符误用"
 
-#: apply.c
+#: apply.c:5068 apply.c:5083
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d 行新增了空白字符误用。"
 msgstr[1] "%d 行新增了空白字符误用。"
 
-#: apply.c
+#: apply.c:5076
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "修复空白错误后，应用了 %d 行。"
 msgstr[1] "修复空白错误后，应用了 %d 行。"
 
-#: apply.c builtin/mv.c builtin/rm.c
+#: apply.c:5092 builtin/mv.c:570 builtin/rm.c:440
 msgid "Unable to write new index file"
 msgstr "无法写入新索引文件"
 
-#: apply.c
+#: apply.c:5120
 msgid "don't apply changes matching the given path"
 msgstr "不要应用与给出路径向匹配的变更"
 
-#: apply.c
+#: apply.c:5123
 msgid "apply changes matching the given path"
 msgstr "应用与给出路径向匹配的变更"
 
-#: apply.c builtin/am.c
+#: apply.c:5125 builtin/am.c:2366
 msgid "num"
 msgstr "数字"
 
-#: apply.c
+#: apply.c:5126
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
 
-#: apply.c
+#: apply.c:5129
 msgid "ignore additions made by the patch"
 msgstr "忽略补丁中的添加的文件"
 
-#: apply.c
+#: apply.c:5131
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
 
-#: apply.c
+#: apply.c:5135
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "以十进制数显示添加和删除的行数"
 
-#: apply.c
+#: apply.c:5137
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "不应用补丁，而是显示输入的概要"
 
-#: apply.c
+#: apply.c:5139
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "不应用补丁，而是查看补丁是否可应用"
 
-#: apply.c
+#: apply.c:5141
 msgid "make sure the patch is applicable to the current index"
 msgstr "确认补丁可以应用到当前索引"
 
-#: apply.c
+#: apply.c:5143
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
 
-#: apply.c
+#: apply.c:5145
 msgid "apply a patch without touching the working tree"
 msgstr "应用补丁而不修改工作区"
 
-#: apply.c
+#: apply.c:5147
 msgid "accept a patch that touches outside the working area"
 msgstr "接受修改工作区之外文件的补丁"
 
-#: apply.c
+#: apply.c:5150
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
 
-#: apply.c
+#: apply.c:5152
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr "尝试三路合并，如果失败则回落至正常补丁模式"
 
-#: apply.c
+#: apply.c:5154
 msgid "build a temporary index based on embedded index information"
 msgstr "创建一个临时索引基于嵌入的索引信息"
 
-#: apply.c builtin/checkout-index.c
+#: apply.c:5157 builtin/checkout-index.c:235
 msgid "paths are separated with NUL character"
 msgstr "路径以 NUL 字符分隔"
 
-#: apply.c
+#: apply.c:5159
 msgid "ensure at least <n> lines of context match"
 msgstr "确保至少匹配 <n> 行上下文"
 
-#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c
-#: builtin/rebase.c
+#: apply.c:5160 builtin/am.c:2342 builtin/am.c:2345
+#: builtin/interpret-trailers.c:202 builtin/interpret-trailers.c:204
+#: builtin/pack-objects.c:4390 builtin/rebase.c:1117
 msgid "action"
 msgstr "动作"
 
-#: apply.c
+#: apply.c:5161
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "检查新增和修改的行中间的空白字符滥用"
 
-#: apply.c
+#: apply.c:5164 apply.c:5167
 msgid "ignore changes in whitespace when finding context"
 msgstr "查找上下文时忽略空白字符的变更"
 
-#: apply.c
+#: apply.c:5170
 msgid "apply the patch in reverse"
 msgstr "反向应用补丁"
 
-#: apply.c
+#: apply.c:5172
 msgid "don't expect at least one line of context"
 msgstr "无需至少一行上下文"
 
-#: apply.c
+#: apply.c:5174
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
 
-#: apply.c
+#: apply.c:5176
 msgid "allow overlapping hunks"
 msgstr "允许重叠的补丁片段"
 
-#: apply.c
+#: apply.c:5179
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "允许不正确的文件末尾换行符"
 
-#: apply.c
+#: apply.c:5182
 msgid "do not trust the line counts in the hunk headers"
 msgstr "不信任补丁片段的头信息中的行号"
 
-#: apply.c builtin/am.c
+#: apply.c:5184 builtin/am.c:2354
 msgid "root"
 msgstr "根目录"
 
-#: apply.c
+#: apply.c:5185
 msgid "prepend <root> to all filenames"
 msgstr "为所有文件名前添加 <根目录>"
 
-#: apply.c
+#: apply.c:5188
 msgid "don't return error for empty patches"
 msgstr "对空的补丁不返回错误"
 
-#: archive-tar.c archive-zip.c
+#: archive-tar.c:140 archive-zip.c:354
 #, c-format
 msgid "cannot stream blob %s"
 msgstr "不能打开数据对象 %s"
 
-#: archive-tar.c archive-zip.c
+#: archive-tar.c:280 archive-zip.c:367
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "不支持的文件模式：0%o (SHA1: %s)"
 
-#: archive-tar.c archive-zip.c builtin/pack-objects.c
+#: archive-tar.c:460 archive-zip.c:478 builtin/pack-objects.c:376
+#: builtin/pack-objects.c:379
 #, c-format
 msgid "deflate error (%d)"
 msgstr "压缩错误 (%d)"
 
-#: archive-tar.c
+#: archive-tar.c:513
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "无法启动 '%s' 过滤器"
 
-#: archive-tar.c
+#: archive-tar.c:516
 msgid "unable to redirect descriptor"
 msgstr "无法重定向描述符"
 
-#: archive-tar.c
+#: archive-tar.c:523
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "'%s' 过滤器报告了错误"
 
-#: archive-zip.c
+#: archive-zip.c:327
 #, c-format
 msgid "path is not valid UTF-8: %s"
 msgstr "路径不是有效的 UTF-8：%s"
 
-#: archive-zip.c
+#: archive-zip.c:331
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "路径太长（%d 字符，SHA1：%s）：%s"
 
-#: archive-zip.c
+#: archive-zip.c:612
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
 msgstr "对于本系统时间戳太大：%<PRIuMAX>"
 
-#: archive.c
+#: archive.c:26
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<选项>] <树对象> [<路径>...]"
 
-#: archive.c
+#: archive.c:28
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
 
-#: archive.c
+#: archive.c:29
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 
-#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c
+#: archive.c:222 archive.c:378 builtin/gc.c:566 builtin/notes.c:298
+#: builtin/tag.c:631
 #, c-format
 msgid "cannot read '%s'"
 msgstr "不能读取 '%s'"
 
-#: archive.c
+#: archive.c:473
 #, c-format
 msgid "pathspec '%s' matches files outside the current directory"
 msgstr "路径规格 '%s' 匹配了当前目录外的文件'"
 
-#: archive.c builtin/add.c builtin/rm.c
+#: archive.c:496 builtin/add.c:133 builtin/add.c:530 builtin/rm.c:344
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "路径规格 '%s' 未匹配任何文件"
 
-#: archive.c
+#: archive.c:519
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "无此引用：%.*s"
 
-#: archive.c
+#: archive.c:526
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "不是一个有效的对象名：%s"
 
-#: archive.c t/helper/test-cache-tree.c
+#: archive.c:541 t/helper/test-cache-tree.c:45
 #, c-format
 msgid "not a tree object: %s"
 msgstr "不是一个树对象：%s"
 
-#: archive.c
+#: archive.c:582
 #, c-format
 msgid "File not found: %s"
 msgstr "文件未找到：%s"
 
-#: archive.c
+#: archive.c:584
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "不是一个常规文件：%s"
 
-#: archive.c
+#: archive.c:593
 #, c-format
 msgid "unclosed quote: '%s'"
 msgstr "未关闭的引号：'%s'"
 
-#: archive.c
+#: archive.c:596
 #, c-format
 msgid "missing colon: '%s'"
 msgstr "缺失冒号：'%s'"
 
-#: archive.c
+#: archive.c:599
 #, c-format
 msgid "empty file name: '%s'"
 msgstr "空的文件名：'%s'"
 
-#: archive.c
+#: archive.c:646
 msgid "fmt"
 msgstr "格式"
 
-#: archive.c
+#: archive.c:646
 msgid "archive format"
 msgstr "归档格式"
 
-#: archive.c builtin/log.c parse-options.h
+#: archive.c:647 builtin/log.c:2061 parse-options.h:532
 msgid "prefix"
 msgstr "前缀"
 
-#: archive.c
+#: archive.c:648
 msgid "prepend prefix to each pathname in the archive"
 msgstr "为归档中每个路径名加上前缀"
 
-#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c
-#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c
-#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h
+#: archive.c:649 archive.c:655 builtin/blame.c:901 builtin/blame.c:905
+#: builtin/blame.c:906 builtin/commit-tree.c:107 builtin/config.c:71
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1200
+#: builtin/fast-export.c:1204 builtin/gc.c:1526 builtin/gc.c:1591
+#: builtin/grep.c:992 builtin/hash-object.c:112 builtin/ls-files.c:610
+#: builtin/ls-files.c:613 builtin/notes.c:487 builtin/notes.c:663
+#: builtin/read-tree.c:121 parse-options.h:330
 msgid "file"
 msgstr "文件"
 
-#: archive.c
+#: archive.c:650 archive.c:653
 msgid "add untracked file to archive"
 msgstr "将未跟踪文件添加到归档"
 
-#: archive.c
+#: archive.c:653
 msgid "path:content"
 msgstr "路径:内容"
 
-#: archive.c builtin/archive.c
+#: archive.c:656 builtin/archive.c:86
 msgid "write the archive to this file"
 msgstr "归档写入此文件"
 
-#: archive.c
+#: archive.c:658
 msgid "read .gitattributes in working directory"
 msgstr "读取工作区中的 .gitattributes"
 
-#: archive.c
+#: archive.c:659
 msgid "report archived files on stderr"
 msgstr "在标准错误上报告归档文件"
 
-#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c
-#: builtin/pull.c
+#: archive.c:660 builtin/clone.c:147 builtin/fetch.c:2210
+#: builtin/pack-objects.c:4359 builtin/pack-objects.c:4363 builtin/pull.c:217
 msgid "time"
 msgstr "时间"
 
-#: archive.c
+#: archive.c:661
 msgid "set modification time of archive entries"
 msgstr "设置归档条目的修改时间"
 
-#: archive.c
+#: archive.c:664
 msgid "set compression level"
 msgstr "设置压缩级别"
 
-#: archive.c
+#: archive.c:667
 msgid "list supported archive formats"
 msgstr "列出支持的归档格式"
 
-#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c
+#: archive.c:669 builtin/archive.c:87 builtin/clone.c:133 builtin/clone.c:136
+#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2761
 msgid "repo"
 msgstr "仓库"
 
-#: archive.c builtin/archive.c
+#: archive.c:670 builtin/archive.c:88
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "从远程仓库（<仓库>）提取归档文件"
 
-#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c
+#: archive.c:671 builtin/archive.c:89 builtin/difftool.c:718
+#: builtin/notes.c:583
 msgid "command"
 msgstr "命令"
 
-#: archive.c builtin/archive.c
+#: archive.c:672 builtin/archive.c:90
 msgid "path to the remote git-upload-archive command"
 msgstr "远程 git-upload-archive 命令的路径"
 
-#: archive.c
+#: archive.c:679
 msgid "Unexpected option --remote"
 msgstr "未知参数 --remote"
 
-#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c
-#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c
-#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c
-#: revision.c
+#: archive.c:681 builtin/add.c:404 builtin/add.c:436 builtin/checkout.c:1910
+#: builtin/clone.c:1249 builtin/clone.c:1252 builtin/commit.c:372
+#: builtin/fast-export.c:1247 builtin/index-pack.c:1863 builtin/log.c:2408
+#: builtin/reset.c:391 builtin/reset.c:452 builtin/rm.c:288
+#: builtin/stash.c:1795 builtin/worktree.c:818 builtin/worktree.c:1060
+#: fetch-pack.c:345 http-fetch.c:156 http-fetch.c:165 revision.c:3161
 #, c-format
 msgid "the option '%s' requires '%s'"
 msgstr "选项 '%s' 需要 '%s'"
 
-#: archive.c
+#: archive.c:683
 msgid "Unexpected option --output"
 msgstr "未知参数 --output"
 
-#: archive.c
+#: archive.c:692
 #, c-format
 msgid "extra command line parameter '%s'"
 msgstr "额外的命令行参数：'%s'"
 
-#: archive.c
+#: archive.c:709
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "未知归档格式 '%s'"
 
-#: archive.c
+#: archive.c:718
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "参数不支持此格式 '%s'：-%d"
 
-#: attr.c
+#: attr.c:221
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s 不是一个有效的属性名"
 
-#: attr.c
+#: attr.c:249
 msgid "unable to add additional attribute"
 msgstr "不能添加额外属性"
 
-#: attr.c
+#: attr.c:371
 #, c-format
 msgid "ignoring overly long attributes line %d"
 msgstr "忽略过长的属性行 %d"
 
-#: attr.c
+#: attr.c:386
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "不允许 %s：%s:%d"
 
-#: attr.c
+#: attr.c:425
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1902,52 +1960,58 @@ msgstr ""
 "负值模版在 git attributes 中被忽略\n"
 "当字符串确实要以感叹号开始时，使用 '\\!'。"
 
-#: attr.c
+#: attr.c:748
 #, c-format
 msgid "cannot fstat gitattributes file '%s'"
 msgstr "无法 fstat gitattributes 文件 '%s'"
 
-#: attr.c
+#: attr.c:753
 #, c-format
 msgid "ignoring overly large gitattributes file '%s'"
 msgstr "忽略过大的 gitattributes 文件 '%s'"
 
-#: attr.c
+#: attr.c:780
 #, c-format
 msgid "ignoring overly large gitattributes blob '%s'"
 msgstr "忽略过大的 gitattributes 数据对象 '%s'"
 
-#: attr.c
+#: attr.c:1234
+msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo"
+msgstr "无法在没有存储库的情况下使用 --attr-source 或 GIT_ATTR_SOURCE"
+
+#: attr.c:1242
 msgid "bad --attr-source or GIT_ATTR_SOURCE"
 msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE"
 
-#: attr.c read-cache.c
+#: attr.c:1294 read-cache.c:801
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "无法对 %s 执行 stat"
 
-#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c
-#: builtin/pack-objects.c combine-diff.c rerere.c
+#: bisect.c:164 builtin/cat-file.c:230 builtin/cat-file.c:494
+#: builtin/index-pack.c:766 builtin/notes.c:720 builtin/pack-objects.c:302
+#: builtin/pack-objects.c:363 builtin/pack-objects.c:471 combine-diff.c:343
+#: rerere.c:987
 #, c-format
 msgid "unable to read %s"
 msgstr "不能读 %s"
 
-#: bisect.c
+#: bisect.c:495
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "文件 '%s' 包含错误的引用格式：%s"
 
-#: bisect.c
+#: bisect.c:707
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "我们无法进行更多的二分查找！\n"
 
-#: bisect.c
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "不是一个有效的提交名 %s"
 
-#: bisect.c
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1956,7 +2020,7 @@ msgstr ""
 "合并基线 %s 是坏的。\n"
 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
 
-#: bisect.c
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1965,7 +2029,7 @@ msgstr ""
 "合并基线 %s 是新的。\n"
 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
 
-#: bisect.c
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1974,7 +2038,7 @@ msgstr ""
 "合并基线 %s 是 %s。\n"
 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
 
-#: bisect.c
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1985,7 +2049,7 @@ msgstr ""
 "这种情况下 git 二分查找无法正常工作。\n"
 "您可能弄错了 %s 和 %s 版本？\n"
 
-#: bisect.c
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1996,41 +2060,41 @@ msgstr ""
 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
 "我们仍旧继续。"
 
-#: bisect.c
+#: bisect.c:861
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "二分查找中：合并基线必须是经过测试的\n"
 
-#: bisect.c
+#: bisect.c:914
 #, c-format
 msgid "a %s revision is needed"
 msgstr "需要一个 %s 版本"
 
-#: bisect.c
+#: bisect.c:944
 #, c-format
 msgid "could not create file '%s'"
 msgstr "不能创建文件 '%s'"
 
-#: bisect.c builtin/notes.c
+#: bisect.c:979 builtin/notes.c:177
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "不能为对象 '%s' 开始 'show'"
 
-#: bisect.c builtin/merge.c
+#: bisect.c:1000 builtin/merge.c:157
 #, c-format
 msgid "could not read file '%s'"
 msgstr "不能读取文件 '%s'"
 
-#: bisect.c
+#: bisect.c:1042
 msgid "reading bisect refs failed"
 msgstr "读取二分查找引用失败"
 
-#: bisect.c
+#: bisect.c:1072
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s 同时为 %s 和 %s\n"
 
-#: bisect.c
+#: bisect.c:1082
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -2039,7 +2103,7 @@ msgstr ""
 "没有发现可测试的提交。\n"
 "可能您在运行时使用了错误的路径参数？\n"
 
-#: bisect.c
+#: bisect.c:1113
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -2049,73 +2113,77 @@ msgstr[1] "（大概 %d 步）"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c
+#: bisect.c:1119
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
 
-#: blame.c
+#: blame.c:2774
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents 和 --reverse 不能混用。"
 
-#: blame.c
+#: blame.c:2826
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
 
-#: blame.c builtin/commit.c builtin/log.c builtin/merge.c
-#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c
-#: remote.c sequencer.c submodule.c
+#: blame.c:2835 builtin/commit.c:1124 builtin/log.c:519 builtin/log.c:1273
+#: builtin/log.c:1903 builtin/log.c:2362 builtin/log.c:2675 builtin/merge.c:417
+#: builtin/pack-objects.c:3520 builtin/pack-objects.c:3678
+#: builtin/pack-objects.c:4168 builtin/pack-objects.c:4183
+#: builtin/shortlog.c:272 midx-write.c:782 pack-bitmap.c:1152
+#: pack-bitmap.c:2548 remote.c:2221 sequencer.c:2540 sequencer.c:5528
+#: submodule.c:924
 msgid "revision walk setup failed"
 msgstr "版本遍历初始化失败"
 
-#: blame.c
+#: blame.c:2853
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
 
-#: blame.c
+#: blame.c:2864
 #, c-format
 msgid "no such path %s in %s"
 msgstr "在 %2$s 中无此路径 %1$s"
 
-#: blame.c
+#: blame.c:2877
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "不能为路径 %2$s 读取数据对象 %1$s"
 
-#: branch.c
+#: branch.c:102
 msgid ""
 "cannot inherit upstream tracking configuration of multiple refs when "
 "rebasing is requested"
 msgstr "在请求变基时无法继承上游多个引用的跟踪设置"
 
-#: branch.c
+#: branch.c:113
 #, c-format
 msgid "not setting branch '%s' as its own upstream"
 msgstr "没有将分支 '%s' 设置为它自己的上游"
 
-#: branch.c
+#: branch.c:169
 #, c-format
 msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr "分支 '%s' 设置为使用变基来跟踪 '%s'。"
 
-#: branch.c
+#: branch.c:170
 #, c-format
 msgid "branch '%s' set up to track '%s'."
 msgstr "分支 '%s' 设置为跟踪 '%s'。"
 
-#: branch.c
+#: branch.c:173
 #, c-format
 msgid "branch '%s' set up to track:"
 msgstr "分支 '%s' 设置为跟踪："
 
-#: branch.c
+#: branch.c:185
 msgid "unable to write upstream branch configuration"
 msgstr "无法写入上游分支配置"
 
-#: branch.c
+#: branch.c:187
 msgid ""
 "\n"
 "After fixing the error cause you may try to fix up\n"
@@ -2124,17 +2192,17 @@ msgstr ""
 "\n"
 "在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支："
 
-#: branch.c
+#: branch.c:228
 #, c-format
 msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr "要求从 '%s' 继承跟踪信息，但是没有设置远程"
 
-#: branch.c
+#: branch.c:234
 #, c-format
 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置"
 
-#: branch.c
+#: branch.c:294
 #, c-format
 msgid "not tracking: ambiguous information for ref '%s'"
 msgstr "不在跟踪中：引用 '%s' 有歧义的信息"
@@ -2151,7 +2219,7 @@ msgstr "不在跟踪中：引用 '%s' 有歧义的信息"
 #. you'll probably want to swap the "%s" and leading " " space
 #. around.
 #.
-#: branch.c object-name.c
+#: branch.c:306 object-name.c:487
 #, c-format
 msgid "  %s\n"
 msgstr "  %s\n"
@@ -2159,7 +2227,7 @@ msgstr "  %s\n"
 #. TRANSLATORS: The second argument is a \n-delimited list of
 #. duplicate refspecs, composed above.
 #.
-#: branch.c
+#: branch.c:312
 #, c-format
 msgid ""
 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -2178,36 +2246,36 @@ msgstr ""
 "如果要支持设置追踪分支，请保证不同远程的获取引用规格映射至不同的追踪命名空"
 "间。"
 
-#: branch.c
+#: branch.c:376
 #, c-format
 msgid "'%s' is not a valid branch name"
 msgstr "'%s' 不是一个有效的分支名称"
 
-#: branch.c builtin/branch.c
+#: branch.c:378 builtin/branch.c:592
 msgid "See `man git check-ref-format`"
 msgstr "查阅 `man git check-ref-format`"
 
-#: branch.c
+#: branch.c:475
 #, c-format
 msgid "a branch named '%s' already exists"
 msgstr "一个名为 '%s' 的分支已经存在"
 
-#: branch.c
+#: branch.c:479
 #, c-format
 msgid "cannot force update the branch '%s' used by worktree at '%s'"
 msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'"
 
-#: branch.c
+#: branch.c:504
 #, c-format
 msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支"
 
-#: branch.c
+#: branch.c:506
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "请求的上游分支 '%s' 不存在"
 
-#: branch.c
+#: branch.c:508
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2225,27 +2293,28 @@ msgstr ""
 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
 
-#: branch.c builtin/replace.c
+#: branch.c:556 builtin/replace.c:336 builtin/replace.c:392
+#: builtin/replace.c:438 builtin/replace.c:468
 #, c-format
 msgid "not a valid object name: '%s'"
 msgstr "不是一个有效的对象名：'%s'"
 
-#: branch.c
+#: branch.c:577
 #, c-format
 msgid "ambiguous object name: '%s'"
 msgstr "歧义的对象名：'%s'"
 
-#: branch.c
+#: branch.c:582
 #, c-format
 msgid "not a valid branch point: '%s'"
 msgstr "无效的分支点：'%s'"
 
-#: branch.c
+#: branch.c:774
 #, c-format
 msgid "submodule '%s': unable to find submodule"
 msgstr "子模组 '%s'：无法找到子模组"
 
-#: branch.c
+#: branch.c:777
 #, c-format
 msgid ""
 "You may try updating the submodules using 'git checkout --no-recurse-"
@@ -2254,136 +2323,128 @@ msgstr ""
 "你可以用 'git checkout --no-recurse-submodules %s && git submodule update --"
 "init' 来尝试更新子模组"
 
-#: branch.c
+#: branch.c:788 branch.c:814
 #, c-format
 msgid "submodule '%s': cannot create branch '%s'"
 msgstr "子模组 '%s'：不能创建分支 '%s'"
 
-#: branch.c
+#: branch.c:849
 #, c-format
 msgid "'%s' is already used by worktree at '%s'"
 msgstr "'%s' 已经被工作区 '%s' 使用"
 
-#: builtin/add.c
+#: builtin/add.c:29
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<选项>] [--] <路径规格>..."
 
-#: builtin/add.c
+#: builtin/add.c:61
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "不能 chmod %cx '%s'"
 
-#: builtin/add.c
+#: builtin/add.c:123
 msgid "Unstaged changes after refreshing the index:"
 msgstr "刷新索引之后尚未被暂存的变更："
 
-#: builtin/add.c
-msgid ""
-"the add.interactive.useBuiltin setting has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"设置 add.interactive.useBuiltin 已经被移除！\n"
-"查看 'git help config' 中的相关条目以获取更多信息。"
-
-#: builtin/add.c
+#: builtin/add.c:181
 msgid "could not read the index"
 msgstr "不能读取索引"
 
-#: builtin/add.c
+#: builtin/add.c:196
 msgid "editing patch failed"
 msgstr "编辑补丁失败"
 
-#: builtin/add.c read-cache.c
+#: builtin/add.c:199 read-cache.c:3206
 #, c-format
 msgid "could not stat '%s'"
 msgstr "不能对 '%s' 调用 stat"
 
-#: builtin/add.c
+#: builtin/add.c:201
 msgid "empty patch. aborted"
 msgstr "空补丁。异常终止"
 
-#: builtin/add.c
+#: builtin/add.c:207
 #, c-format
 msgid "could not apply '%s'"
 msgstr "不能应用 '%s'"
 
-#: builtin/add.c
+#: builtin/add.c:216
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
 
-#: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c
-#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c
-#: builtin/rm.c builtin/send-pack.c
+#: builtin/add.c:238 builtin/clean.c:934 builtin/fetch.c:2200 builtin/mv.c:187
+#: builtin/prune-packed.c:15 builtin/pull.c:210 builtin/push.c:570
+#: builtin/remote.c:1474 builtin/rm.c:251 builtin/send-pack.c:189
 msgid "dry run"
 msgstr "演习"
 
-#: builtin/add.c builtin/check-ignore.c builtin/commit.c
-#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c
-#: builtin/read-tree.c
+#: builtin/add.c:239 builtin/check-ignore.c:23 builtin/commit.c:1511
+#: builtin/count-objects.c:102 builtin/fsck.c:908 builtin/log.c:2626
+#: builtin/mv.c:186 builtin/read-tree.c:126
 msgid "be verbose"
 msgstr "冗长输出"
 
-#: builtin/add.c
+#: builtin/add.c:241
 msgid "interactive picking"
 msgstr "交互式拣选"
 
-#: builtin/add.c builtin/checkout.c builtin/reset.c
+#: builtin/add.c:242 builtin/checkout.c:1726 builtin/reset.c:366
 msgid "select hunks interactively"
 msgstr "交互式挑选数据块"
 
-#: builtin/add.c
+#: builtin/add.c:243
 msgid "edit current diff and apply"
 msgstr "编辑当前差异并应用"
 
-#: builtin/add.c
+#: builtin/add.c:244
 msgid "allow adding otherwise ignored files"
 msgstr "允许添加忽略的文件"
 
-#: builtin/add.c
+#: builtin/add.c:245
 msgid "update tracked files"
 msgstr "更新已跟踪的文件"
 
-#: builtin/add.c
+#: builtin/add.c:246
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
 
-#: builtin/add.c
+#: builtin/add.c:247
 msgid "record only the fact that the path will be added later"
 msgstr "只记录，该路径稍后再添加"
 
-#: builtin/add.c
+#: builtin/add.c:248
 msgid "add changes from all tracked and untracked files"
 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
 
-#: builtin/add.c
+#: builtin/add.c:251
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
 
-#: builtin/add.c
+#: builtin/add.c:253
 msgid "don't add, only refresh the index"
 msgstr "不添加，只刷新索引"
 
-#: builtin/add.c
+#: builtin/add.c:254
 msgid "just skip files which cannot be added because of errors"
 msgstr "跳过因出错不能添加的文件"
 
-#: builtin/add.c
+#: builtin/add.c:255
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
 
-#: builtin/add.c builtin/mv.c builtin/rm.c
+#: builtin/add.c:256 builtin/mv.c:191 builtin/rm.c:258
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr "允许更新稀疏检出锥以外的条目"
 
-#: builtin/add.c builtin/update-index.c
+#: builtin/add.c:258 builtin/update-index.c:970
 msgid "override the executable bit of the listed files"
 msgstr "覆盖列表里文件的可执行位"
 
-#: builtin/add.c
+#: builtin/add.c:260
 msgid "warn when adding an embedded repository"
 msgstr "创建一个嵌入式仓库时给予警告"
 
-#: builtin/add.c
+#: builtin/add.c:282
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -2411,189 +2472,201 @@ msgstr ""
 "\n"
 "参见 \"git help submodule\" 获取更多信息。"
 
-#: builtin/add.c
+#: builtin/add.c:311
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "正在添加嵌入式 git 仓库：%s"
 
-#: builtin/add.c
+#: builtin/add.c:331
 msgid "Use -f if you really want to add them."
 msgstr "如果您确实想添加它们，请使用 -f 选项。"
 
-#: builtin/add.c
+#: builtin/add.c:344
 msgid "adding files failed"
 msgstr "添加文件失败"
 
-#: builtin/add.c
+#: builtin/add.c:408
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
 
-#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
-#: builtin/rm.c builtin/stash.c
+#: builtin/add.c:429 builtin/checkout.c:1898 builtin/commit.c:366
+#: builtin/reset.c:385 builtin/rm.c:282 builtin/stash.c:1789
 #, c-format
 msgid "'%s' and pathspec arguments cannot be used together"
 msgstr "'%s' 和路径规格参数不能同时使用"
 
-#: builtin/add.c
+#: builtin/add.c:440
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "没有指定文件，也没有文件被添加。\n"
 
-#: builtin/add.c
+#: builtin/add.c:442
 msgid "Maybe you wanted to say 'git add .'?"
 msgstr "也许您想要执行 'git add .'？"
 
-#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c
-#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c
-#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c
-#: rerere.c submodule.c
+#: builtin/add.c:458 builtin/check-ignore.c:184 builtin/checkout.c:568
+#: builtin/checkout.c:784 builtin/clean.c:1013 builtin/commit.c:380
+#: builtin/diff-tree.c:130 builtin/grep.c:556 builtin/mv.c:219
+#: builtin/reset.c:458 builtin/rm.c:302 builtin/submodule--helper.c:207
+#: builtin/submodule--helper.c:3317 read-cache.c:2031 read-cache.c:2350
+#: rerere.c:561 rerere.c:595 rerere.c:1115 submodule.c:1866
 msgid "index file corrupt"
 msgstr "索引文件损坏"
 
-#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c
-#: builtin/commit.c builtin/stash.c merge.c rerere.c
+#: builtin/add.c:570 builtin/am.c:2018 builtin/am.c:2052 builtin/checkout.c:637
+#: builtin/checkout.c:926 builtin/clone.c:789 builtin/commit.c:448
+#: builtin/commit.c:473 builtin/commit.c:521 builtin/stash.c:303 merge.c:111
+#: rerere.c:717
 msgid "unable to write new index file"
 msgstr "无法写新的索引文件"
 
-#: builtin/am.c builtin/mailinfo.c mailinfo.c
+#: builtin/am.c:198 builtin/mailinfo.c:47 mailinfo.c:1263
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr "'%2$s' 的错误动作 '%1$s'"
 
-#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
-#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c
-#: ls-refs.c parallel-checkout.c sequencer.c setup.c
+#: builtin/am.c:216 builtin/am.c:2273 builtin/am.c:2295 builtin/blame.c:741
+#: builtin/blame.c:761 builtin/fetch.c:169 builtin/pack-objects.c:3865
+#: builtin/pull.c:46 builtin/pull.c:48 builtin/pull.c:323 builtin/revert.c:66
+#: config.c:1410 diff-merges.c:94 gpg-interface.c:746 gpg-interface.c:761
+#: ls-refs.c:38 parallel-checkout.c:47 sequencer.c:3101 setup.c:646 setup.c:658
+#: setup.c:676
 #, c-format
 msgid "invalid value for '%s': '%s'"
 msgstr "'%s' 的值无效：'%s'"
 
-#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
+#: builtin/am.c:303 builtin/commit.c:850 builtin/merge.c:1159 sequencer.c:599
+#: sequencer.c:2082 sequencer.c:3402 sequencer.c:3852
 #, c-format
 msgid "could not read '%s'"
 msgstr "不能读取 '%s'"
 
-#: builtin/am.c
+#: builtin/am.c:406
 msgid "could not parse author script"
 msgstr "不能解析作者脚本"
 
-#: builtin/am.c builtin/replace.c commit.c sequencer.c
+#: builtin/am.c:413 builtin/am.c:458 builtin/am.c:463 builtin/am.c:1464
+#: builtin/am.c:2153 builtin/replace.c:471 commit.c:62 sequencer.c:3395
 #, c-format
 msgid "could not parse %s"
 msgstr "不能解析 %s"
 
-#: builtin/am.c
+#: builtin/am.c:498
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' 被 applypatch-msg 钩子删除"
 
-#: builtin/am.c
+#: builtin/am.c:528
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "非法的输入行：'%s'。"
 
-#: builtin/am.c
+#: builtin/am.c:566
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
 
-#: builtin/am.c
+#: builtin/am.c:592
 msgid "fseek failed"
 msgstr "fseek 失败"
 
-#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c
+#: builtin/am.c:760 builtin/am.c:852 builtin/rebase.c:678 sequencer.c:985
+#: wrapper.c:198 wrapper.c:368
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "无法打开 '%s' 进行读取"
 
-#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c
+#: builtin/am.c:769 builtin/rebase.c:629 editor.c:147 sequencer.c:4415
+#: wrapper.c:196 wrapper.c:366
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "无法打开 '%s' 进行写入"
 
-#: builtin/am.c
+#: builtin/am.c:780
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "无法解析补丁 '%s'"
 
-#: builtin/am.c
+#: builtin/am.c:845
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "一次只能有一个 StGIT 补丁队列被应用"
 
-#: builtin/am.c
+#: builtin/am.c:893
 msgid "invalid timestamp"
 msgstr "无效的时间戳"
 
-#: builtin/am.c
+#: builtin/am.c:898 builtin/am.c:910
 msgid "invalid Date line"
 msgstr "无效的日期行"
 
-#: builtin/am.c
+#: builtin/am.c:905
 msgid "invalid timezone offset"
 msgstr "无效的时区偏移值"
 
-#: builtin/am.c
+#: builtin/am.c:998
 msgid "Patch format detection failed."
 msgstr "补丁格式探测失败。"
 
-#: builtin/am.c builtin/clone.c
+#: builtin/am.c:1003 builtin/clone.c:318
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "无法创建目录 '%s'"
 
-#: builtin/am.c
+#: builtin/am.c:1009
 msgid "Failed to split patches."
 msgstr "无法拆分补丁。"
 
-#: builtin/am.c
+#: builtin/am.c:1163
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\".\n"
 msgstr "当您解决这一问题之后，执行 \"%s --continue\"。\n"
 
-#: builtin/am.c
+#: builtin/am.c:1164
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n"
 msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。\n"
 
-#: builtin/am.c
+#: builtin/am.c:1169
 #, c-format
 msgid ""
 "To record the empty patch as an empty commit, run \"%s --allow-empty\".\n"
 msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。\n"
 
-#: builtin/am.c
+#: builtin/am.c:1171
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
 
-#: builtin/am.c
+#: builtin/am.c:1269
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。"
 
-#: builtin/am.c
+#: builtin/am.c:1358
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "在提交 %s 中缺失作者行"
 
-#: builtin/am.c
+#: builtin/am.c:1361
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "无效的身份标识：%.*s"
 
-#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c
+#: builtin/am.c:1383 builtin/checkout.c:830 builtin/clone.c:779
+#: commit-graph.c:1243
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "不能解析提交 %s"
 
-#: builtin/am.c
+#: builtin/am.c:1592
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
 
-#: builtin/am.c
+#: builtin/am.c:1594
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引来重建一个（三方合并的）基础目录树..."
 
-#: builtin/am.c
+#: builtin/am.c:1614
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -2601,32 +2674,33 @@ msgstr ""
 "您是否曾手动编辑过您的补丁？\n"
 "无法应用补丁到索引中的数据对象上。"
 
-#: builtin/am.c
+#: builtin/am.c:1620
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回落到基础版本上打补丁及进行三方合并..."
 
-#: builtin/am.c
+#: builtin/am.c:1646
 msgid "Failed to merge in the changes."
 msgstr "无法合并变更。"
 
-#: builtin/am.c builtin/merge.c sequencer.c
+#: builtin/am.c:1670 builtin/merge.c:699 sequencer.c:1590
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree 无法写入树对象"
 
-#: builtin/am.c
+#: builtin/am.c:1678
 msgid "applying to an empty history"
 msgstr "正应用到一个空历史上"
 
-#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c
+#: builtin/am.c:1697 builtin/commit.c:1849 builtin/merge.c:921
+#: builtin/merge.c:948 builtin/replay.c:75 sequencer.c:1700
 msgid "failed to write commit object"
 msgstr "无法写提交对象"
 
-#: builtin/am.c
+#: builtin/am.c:1732 builtin/am.c:1736
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "无法继续：%s 不存在。"
 
-#: builtin/am.c
+#: builtin/am.c:1754
 msgid "Commit Body is:"
 msgstr "提交内容为："
 
@@ -2634,57 +2708,57 @@ msgstr "提交内容为："
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c
+#: builtin/am.c:1764
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
 
-#: builtin/am.c builtin/commit.c
+#: builtin/am.c:1811 builtin/commit.c:413
 msgid "unable to write index file"
 msgstr "无法写入索引文件"
 
-#: builtin/am.c
+#: builtin/am.c:1815
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "脏索引：不能应用补丁（脏文件：%s）"
 
-#: builtin/am.c
+#: builtin/am.c:1857
 #, c-format
 msgid "Skipping: %.*s"
 msgstr "跳过：%.*s"
 
-#: builtin/am.c
+#: builtin/am.c:1862
 #, c-format
 msgid "Creating an empty commit: %.*s"
 msgstr "创建空提交：%.*s"
 
-#: builtin/am.c
+#: builtin/am.c:1866
 msgid "Patch is empty."
 msgstr "补丁为空。"
 
-#: builtin/am.c
+#: builtin/am.c:1877 builtin/am.c:1946
 #, c-format
 msgid "Applying: %.*s"
 msgstr "应用：%.*s"
 
-#: builtin/am.c
+#: builtin/am.c:1894
 msgid "No changes -- Patch already applied."
 msgstr "没有变更 —— 补丁已经应用过。"
 
-#: builtin/am.c
+#: builtin/am.c:1900
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打补丁失败于 %s %.*s"
 
-#: builtin/am.c
+#: builtin/am.c:1904
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
 
-#: builtin/am.c
+#: builtin/am.c:1950
 msgid "No changes - recorded it as an empty commit."
 msgstr "没有变更 —— 记录为空提交。"
 
-#: builtin/am.c
+#: builtin/am.c:1952
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -2694,7 +2768,7 @@ msgstr ""
 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
 "您也许想要跳过这个补丁。"
 
-#: builtin/am.c
+#: builtin/am.c:1960
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -2705,166 +2779,180 @@ msgstr ""
 "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
 "您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
 
-#: builtin/am.c builtin/reset.c
+#: builtin/am.c:2068 builtin/am.c:2072 builtin/am.c:2084 builtin/reset.c:405
+#: builtin/reset.c:413
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "不能解析对象 '%s'。"
 
-#: builtin/am.c
+#: builtin/am.c:2120 builtin/am.c:2197
 msgid "failed to clean index"
 msgstr "无法清空索引"
 
-#: builtin/am.c
+#: builtin/am.c:2164
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
 
-#: builtin/am.c builtin/bisect.c worktree.c
+#: builtin/am.c:2240 builtin/bisect.c:181 builtin/tag.c:359 worktree.c:259
 #, c-format
 msgid "failed to read '%s'"
 msgstr "无法读取 '%s'"
 
-#: builtin/am.c
+#: builtin/am.c:2311
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c
+#: builtin/am.c:2312
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<选项>] (--continue | --skip | --abort)"
 
-#: builtin/am.c
+#: builtin/am.c:2318
 msgid "run interactively"
 msgstr "以交互式方式运行"
 
-#: builtin/am.c
+#: builtin/am.c:2320
 msgid "bypass pre-applypatch and applypatch-msg hooks"
 msgstr "绕过 pre-applypatch 和 applypatch-msg 钩子"
 
-#: builtin/am.c
+#: builtin/am.c:2322
 msgid "historical option -- no-op"
 msgstr "老的参数 —— 无作用"
 
-#: builtin/am.c
+#: builtin/am.c:2324
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必要，允许使用三方合并。"
 
-#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c
-#: builtin/stash.c
+#: builtin/am.c:2325 builtin/init-db.c:95 builtin/prune-packed.c:17
+#: builtin/repack.c:1162 builtin/stash.c:1025
 msgid "be quiet"
 msgstr "静默模式"
 
-#: builtin/am.c
+#: builtin/am.c:2327
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "在提交说明中添加 Signed-off-by 尾注"
 
-#: builtin/am.c
+#: builtin/am.c:2330
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字符集（默认）"
 
-#: builtin/am.c
+#: builtin/am.c:2332
 msgid "pass -k flag to git-mailinfo"
 msgstr "向 git-mailinfo 传递 -k 参数"
 
-#: builtin/am.c
+#: builtin/am.c:2334
 msgid "pass -b flag to git-mailinfo"
 msgstr "向 git-mailinfo 传递 -b 参数"
 
-#: builtin/am.c
+#: builtin/am.c:2336
 msgid "pass -m flag to git-mailinfo"
 msgstr "向 git-mailinfo 传递 -m 参数"
 
-#: builtin/am.c
+#: builtin/am.c:2338
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
 
-#: builtin/am.c
+#: builtin/am.c:2341
 msgid "strip everything before a scissors line"
 msgstr "丢弃裁切线前的所有内容"
 
-#: builtin/am.c
+#: builtin/am.c:2343
 msgid "pass it through git-mailinfo"
 msgstr "传递给 git-mailinfo"
 
-#: builtin/am.c
+#: builtin/am.c:2346 builtin/am.c:2349 builtin/am.c:2352 builtin/am.c:2355
+#: builtin/am.c:2358 builtin/am.c:2361 builtin/am.c:2364 builtin/am.c:2367
+#: builtin/am.c:2373
 msgid "pass it through git-apply"
 msgstr "传递给 git-apply"
 
-#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c
-#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c
-#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h
+#: builtin/am.c:2363 builtin/commit.c:1542 builtin/fmt-merge-msg.c:19
+#: builtin/fmt-merge-msg.c:22 builtin/grep.c:976 builtin/merge.c:248
+#: builtin/pull.c:144 builtin/pull.c:206 builtin/pull.c:223
+#: builtin/rebase.c:1112 builtin/repack.c:1173 builtin/repack.c:1177
+#: builtin/repack.c:1179 builtin/show-branch.c:664 builtin/show-ref.c:309
+#: builtin/tag.c:486 parse-options.h:215 parse-options.h:276
+#: parse-options.h:526
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
-#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c
-#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
-#: builtin/verify-tag.c
+#: builtin/am.c:2369 builtin/branch.c:771 builtin/bugreport.c:122
+#: builtin/cat-file.c:964 builtin/cat-file.c:968 builtin/cat-file.c:975
+#: builtin/clone.c:159 builtin/diagnose.c:27 builtin/for-each-ref.c:43
+#: builtin/init-db.c:102 builtin/ls-files.c:634 builtin/ls-tree.c:363
+#: builtin/refs.c:20 builtin/replace.c:570 builtin/tag.c:524
+#: builtin/verify-tag.c:30
 msgid "format"
 msgstr "格式"
 
-#: builtin/am.c
+#: builtin/am.c:2370
 msgid "format the patch(es) are in"
 msgstr "补丁的格式"
 
-#: builtin/am.c
+#: builtin/am.c:2376
 msgid "override error message when patch failure occurs"
 msgstr "打补丁失败时显示的错误信息"
 
-#: builtin/am.c
+#: builtin/am.c:2378
 msgid "continue applying patches after resolving a conflict"
 msgstr "冲突解决后继续应用补丁"
 
-#: builtin/am.c
+#: builtin/am.c:2381
 msgid "synonyms for --continue"
 msgstr "和 --continue 同义"
 
-#: builtin/am.c
+#: builtin/am.c:2384
 msgid "skip the current patch"
 msgstr "跳过当前补丁"
 
-#: builtin/am.c
+#: builtin/am.c:2387
 msgid "restore the original branch and abort the patching operation"
 msgstr "恢复原始分支并终止打补丁操作"
 
-#: builtin/am.c
+#: builtin/am.c:2390
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "终止补丁操作但保持 HEAD 不变"
 
-#: builtin/am.c
+#: builtin/am.c:2394
 msgid "show the patch being applied"
 msgstr "显示正在应用的补丁"
 
-#: builtin/am.c
+#: builtin/am.c:2398
+msgid "try to apply current patch again"
+msgstr "尝试再次应用当前补丁"
+
+#: builtin/am.c:2401
 msgid "record the empty patch as an empty commit"
 msgstr "把空补丁记录为空提交"
 
-#: builtin/am.c
+#: builtin/am.c:2405
 msgid "lie about committer date"
 msgstr "将作者日期作为提交日期"
 
-#: builtin/am.c
+#: builtin/am.c:2407
 msgid "use current timestamp for author date"
 msgstr "用当前时间作为作者日期"
 
-#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c
-#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c
+#: builtin/am.c:2409 builtin/commit-tree.c:110 builtin/commit.c:1668
+#: builtin/merge.c:287 builtin/pull.c:181 builtin/rebase.c:1168
+#: builtin/revert.c:131 builtin/tag.c:503
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c builtin/rebase.c
+#: builtin/am.c:2410 builtin/rebase.c:1169
 msgid "GPG-sign commits"
 msgstr "使用 GPG 签名提交"
 
-#: builtin/am.c
+#: builtin/am.c:2413
 msgid "how to handle empty patches"
 msgstr "如何处理空补丁"
 
-#: builtin/am.c
+#: builtin/am.c:2416
 msgid "(internal use for git-rebase)"
 msgstr "（内部使用，用于 git-rebase）"
 
-#: builtin/am.c
+#: builtin/am.c:2434
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -2872,16 +2960,16 @@ msgstr ""
 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
 "请不要再使用它了。"
 
-#: builtin/am.c
+#: builtin/am.c:2441
 msgid "failed to read the index"
 msgstr "无法读取索引"
 
-#: builtin/am.c
+#: builtin/am.c:2456
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
 
-#: builtin/am.c
+#: builtin/am.c:2480
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -2890,44 +2978,40 @@ msgstr ""
 "发现了错误的 %s 目录。\n"
 "使用 \"git am --abort\" 删除它。"
 
-#: builtin/am.c
+#: builtin/am.c:2486
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解决操作未进行，我们不会继续。"
 
-#: builtin/am.c
+#: builtin/am.c:2496
 msgid "interactive mode requires patches on the command line"
 msgstr "交互式模式需要命令行上提供补丁"
 
-#: builtin/apply.c
+#: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<选项>] [<补丁>...]"
 
-#: builtin/archive.c diagnose.c
+#: builtin/archive.c:18 diagnose.c:211
 msgid "could not redirect output"
 msgstr "不能重定向输出"
 
-#: builtin/archive.c
-msgid "git archive: Remote with no URL"
-msgstr "git archive：未提供远程 URL"
-
-#: builtin/archive.c
+#: builtin/archive.c:57
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive：期望是 ACK/NAK，却得到 flush 包"
 
-#: builtin/archive.c
+#: builtin/archive.c:60
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive：NACK %s"
 
-#: builtin/archive.c
+#: builtin/archive.c:61
 msgid "git archive: protocol error"
 msgstr "git archive：协议错误"
 
-#: builtin/archive.c
+#: builtin/archive.c:65
 msgid "git archive: expected a flush"
 msgstr "git archive：应有一个 flush 包"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:27
 msgid ""
 "git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-"
 "checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]"
@@ -2935,97 +3019,97 @@ msgstr ""
 "git bisect start [--term-{new|bad}=<术语> --term-{old|good}=<术语>]    [--no-"
 "checkout] [--first-parent] [<坏> [<好>...]] [--]    [<路径规格>...]"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:31
 msgid "git bisect (good|bad) [<rev>...]"
 msgstr "git bisect (good|bad) [<版本>...]"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:35
 msgid "git bisect skip [(<rev>|<range>)...]"
 msgstr "git bisect skip [(<版本>|<范围>)...]"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:39
 msgid "git bisect reset [<commit>]"
 msgstr "git bisect reset [<提交>]"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:43
 msgid "git bisect replay <logfile>"
 msgstr "git bisect replay <日志文件>"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:47
 msgid "git bisect run <cmd> [<arg>...]"
 msgstr "git bisect run <命令> [<参数>...]"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:134
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:141
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "不能写入文件 '%s'"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:179
 #, c-format
 msgid "cannot open file '%s' for reading"
 msgstr "不能打开文件 '%s' 来读取"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:195
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' 不是一个有效的术语"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:199
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "不能使用内置命令 '%s' 作为术语"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:209
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "不能修改术语 '%s' 的含义"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:219
 msgid "please use two different terms"
 msgstr "请使用两个不同的术语"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:235
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "我们没有在二分查找。\n"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:242
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' 不是一个有效的提交"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:253
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:297
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "坏的 bisect_write 参数：%s"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:302
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "无法获取版本 '%s' 的对象 ID"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:314
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "无法打开文件 '%s'"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:340
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:368
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -3034,7 +3118,7 @@ msgstr ""
 "您需要给我至少一个 %s 和一个 %s 版本。\n"
 "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:372
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -3045,7 +3129,7 @@ msgstr ""
 "然后需要提供我至少一个 %s 和一个 %s 版本。\n"
 "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:392
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "在只有一个 %s 提交的情况下二分查找"
@@ -3054,37 +3138,37 @@ msgstr "在只有一个 %s 提交的情况下二分查找"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect.c
+#: builtin/bisect.c:400
 msgid "Are you sure [Y/n]? "
 msgstr "您确认么[Y/n]？ "
 
-#: builtin/bisect.c
+#: builtin/bisect.c:458
 msgid "status: waiting for both good and bad commits\n"
 msgstr "状态：正在等待好的和坏的提交\n"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:460
 #, c-format
 msgid "status: waiting for bad commit, %d good commit known\n"
 msgid_plural "status: waiting for bad commit, %d good commits known\n"
 msgstr[0] "状态：正在等待坏的提交，已知 %d 个好的提交\n"
 msgstr[1] "状态：正在等待坏的提交，已知 %d 个好的提交\n"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:464
 msgid "status: waiting for good commit(s), bad commit known\n"
 msgstr "状态：正在等待好的提交，已知坏的提交\n"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:503
 msgid "no terms defined"
 msgstr "未定义术语"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:506
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
 "and %s for the new state.\n"
 msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:516
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -3093,48 +3177,48 @@ msgstr ""
 "命令 'git bisect terms' 的参数 %s 无效。\n"
 "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:585 builtin/bisect.c:1110
 msgid "revision walk setup failed\n"
 msgstr "版本遍历设置失败\n"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:607
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "无法打开 '%s' 进行追加"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:731 builtin/bisect.c:744
 msgid "'' is not a valid term"
 msgstr "'' 不是一个有效的术语"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:754
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "未识别的选项：'%s'"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:758
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' 看起来不是一个有效的版本"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:790
 msgid "bad HEAD - I need a HEAD"
 msgstr "坏的 HEAD - 我需要一个 HEAD"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:806
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:823
 msgid "bad HEAD - strange symbolic ref"
 msgstr "坏的 HEAD - 奇怪的符号引用"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:843
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "无效的引用：'%s'"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:901
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "您需要执行 \"git bisect start\" 来开始\n"
 
@@ -3142,267 +3226,270 @@ msgstr "您需要执行 \"git bisect start\" 来开始\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect.c
+#: builtin/bisect.c:912
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "您想让我为您这样做么[Y/n]？ "
 
-#: builtin/bisect.c
+#: builtin/bisect.c:929
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "请使用至少一个参数调用 `--bisect-state`"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:942
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "'git bisect %s' 只能带一个参数。"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:955 builtin/bisect.c:968
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "坏的版本输入：%s"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:975
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "坏的版本输入（不是提交）：%s"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1007
 msgid "We are not bisecting."
 msgstr "我们没有在二分查找。"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1057
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "'%s'?? 您在说什么?"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1069
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "不能读取文件 '%s' 来重放"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1176
 #, c-format
 msgid "running %s\n"
 msgstr "正在执行 %s\n"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1225
 msgid "bisect run failed: no command provided."
 msgstr "二分查找运行失败：没有提供命令。"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1245
 #, c-format
 msgid "unable to verify %s on good revision"
 msgstr "无法在好版本中验证 %s"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1251
 #, c-format
 msgid "bogus exit code %d for good revision"
 msgstr "好版本返回错误的退出码 %d"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1259
 #, c-format
 msgid "bisect run failed: exit code %d from %s is < 0 or >= 128"
 msgstr "二分查找运行失败：命令 %2$s 的退出码 %1$d < 0 或 >= 128"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1274
 #, c-format
 msgid "cannot open file '%s' for writing"
 msgstr "无法打开文件 '%s' 进行写入"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1292
 msgid "bisect run cannot continue any more"
 msgstr "二分查找不能继续运行"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1294
 msgid "bisect run success"
 msgstr "二分查找运行成功"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1297
 msgid "bisect found first bad commit"
 msgstr "二分查找找到了第一个坏的提交"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1300
 #, c-format
 msgid "bisect run failed: 'git bisect %s' exited with error code %d"
 msgstr "二分查找运行失败：'git bisect %s' 退出码为 %d"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1315
 #, c-format
 msgid "'%s' requires either no argument or a commit"
 msgstr "'%s' 无需参数或者需要一个提交"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1326
 #, c-format
 msgid "'%s' requires 0 or 1 argument"
 msgstr "'%s' 无需参数或者需要一个参数"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1350
 #, c-format
 msgid "'%s' requires 0 arguments"
 msgstr "'%s' 无需参数"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1369
 msgid "no logfile given"
 msgstr "未提供日志文件"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1405
 #, c-format
 msgid "'%s' failed: no command provided."
 msgstr "'%s' 运行失败：没有提供命令。"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1436
 msgid "need a command"
 msgstr "需要一个命令"
 
-#: builtin/bisect.c builtin/cat-file.c
+#: builtin/bisect.c:1441 builtin/cat-file.c:747
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "未知命令：'%s'"
 
-#: builtin/blame.c
+#: builtin/blame.c:38
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
 
-#: builtin/blame.c
+#: builtin/blame.c:39
 msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git annotate [<选项>] [<版本选项>] [<版本>] [--] <文件>"
 
-#: builtin/blame.c
+#: builtin/blame.c:44 builtin/blame.c:51
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
 
-#: builtin/blame.c
+#: builtin/blame.c:420
 #, c-format
 msgid "expecting a color: %s"
 msgstr "期望一个颜色：%s"
 
-#: builtin/blame.c
+#: builtin/blame.c:427
 msgid "must end with a color"
 msgstr "必须以一个颜色结尾"
 
-#: builtin/blame.c
+#: builtin/blame.c:862
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "不能找到要忽略的版本 %s"
 
-#: builtin/blame.c
+#: builtin/blame.c:884
 msgid "show blame entries as we find them, incrementally"
 msgstr "增量式地显示发现的 blame 条目"
 
-#: builtin/blame.c
+#: builtin/blame.c:885
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "不显示边界提交的对象名（默认：关闭）"
 
-#: builtin/blame.c
+#: builtin/blame.c:886
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "不把根提交作为边界（默认：关闭）"
 
-#: builtin/blame.c
+#: builtin/blame.c:887
 msgid "show work cost statistics"
 msgstr "显示工作消耗统计"
 
-#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c
-#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c
-#: builtin/push.c builtin/remote.c builtin/send-pack.c
+#: builtin/blame.c:888 builtin/checkout.c:1680 builtin/clone.c:109
+#: builtin/commit-graph.c:83 builtin/commit-graph.c:253 builtin/fetch.c:2207
+#: builtin/merge.c:286 builtin/multi-pack-index.c:131
+#: builtin/multi-pack-index.c:188 builtin/multi-pack-index.c:215
+#: builtin/multi-pack-index.c:244 builtin/pull.c:122 builtin/push.c:586
+#: builtin/remote.c:697 builtin/send-pack.c:197
 msgid "force progress reporting"
 msgstr "强制显示进度报告"
 
-#: builtin/blame.c
+#: builtin/blame.c:889
 msgid "show output score for blame entries"
 msgstr "显示 blame 条目的输出得分"
 
-#: builtin/blame.c
+#: builtin/blame.c:890
 msgid "show original filename (Default: auto)"
 msgstr "显示原始文件名（默认：自动）"
 
-#: builtin/blame.c
+#: builtin/blame.c:891
 msgid "show original linenumber (Default: off)"
 msgstr "显示原始的行号（默认：关闭）"
 
-#: builtin/blame.c
+#: builtin/blame.c:892
 msgid "show in a format designed for machine consumption"
 msgstr "显示为一个适合机器读取的格式"
 
-#: builtin/blame.c
+#: builtin/blame.c:893
 msgid "show porcelain format with per-line commit information"
 msgstr "为每一行显示机器适用的提交信息"
 
-#: builtin/blame.c
+#: builtin/blame.c:894
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
 
-#: builtin/blame.c
+#: builtin/blame.c:895
 msgid "show raw timestamp (Default: off)"
 msgstr "显示原始时间戳（默认：关闭）"
 
-#: builtin/blame.c
+#: builtin/blame.c:896
 msgid "show long commit SHA1 (Default: off)"
 msgstr "显示长的 SHA1 提交号（默认：关闭）"
 
-#: builtin/blame.c
+#: builtin/blame.c:897
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "隐藏作者名字和时间戳（默认：关闭）"
 
-#: builtin/blame.c
+#: builtin/blame.c:898
 msgid "show author email instead of name (Default: off)"
 msgstr "显示作者的邮箱而不是名字（默认：关闭）"
 
-#: builtin/blame.c
+#: builtin/blame.c:899
 msgid "ignore whitespace differences"
 msgstr "忽略空白差异"
 
-#: builtin/blame.c builtin/log.c
+#: builtin/blame.c:900 builtin/log.c:2109
 msgid "rev"
 msgstr "版本"
 
-#: builtin/blame.c
+#: builtin/blame.c:900
 msgid "ignore <rev> when blaming"
 msgstr "在执行 blame 操作时忽略 <版本>"
 
-#: builtin/blame.c
+#: builtin/blame.c:901
 msgid "ignore revisions from <file>"
 msgstr "忽略来自 <文件> 中的版本"
 
-#: builtin/blame.c
+#: builtin/blame.c:902
 msgid "color redundant metadata from previous line differently"
 msgstr "使用颜色间隔输出与前一行不同的重复元信息"
 
-#: builtin/blame.c
+#: builtin/blame.c:903
 msgid "color lines by age"
 msgstr "依据时间着色"
 
-#: builtin/blame.c
+#: builtin/blame.c:904
 msgid "spend extra cycles to find better match"
 msgstr "花费额外的循环来找到更好的匹配"
 
-#: builtin/blame.c
+#: builtin/blame.c:905
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
 
-#: builtin/blame.c
+#: builtin/blame.c:906
 msgid "use <file>'s contents as the final image"
 msgstr "使用 <文件> 的内容作为最终的镜像"
 
-#: builtin/blame.c
+#: builtin/blame.c:907 builtin/blame.c:908
 msgid "score"
 msgstr "得分"
 
-#: builtin/blame.c
+#: builtin/blame.c:907
 msgid "find line copies within and across files"
 msgstr "找到文件内及跨文件的行拷贝"
 
-#: builtin/blame.c
+#: builtin/blame.c:908
 msgid "find line movements within and across files"
 msgstr "找到文件内及跨文件的行移动"
 
-#: builtin/blame.c
+#: builtin/blame.c:909
 msgid "range"
 msgstr "范围"
 
-#: builtin/blame.c
+#: builtin/blame.c:910
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数名>"
 
-#: builtin/blame.c
+#: builtin/blame.c:972
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress 不能和 --incremental 或机器内部格式一起使用"
 
@@ -3414,57 +3501,57 @@ msgstr "--progress 不能和 --incremental 或机器内部格式一起使用"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c
+#: builtin/blame.c:1023
 msgid "4 years, 11 months ago"
 msgstr "4 年 11 个月前"
 
-#: builtin/blame.c
+#: builtin/blame.c:1139
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "文件 %s 只有 %lu 行"
 msgstr[1] "文件 %s 只有 %lu 行"
 
-#: builtin/blame.c
+#: builtin/blame.c:1187
 msgid "Blaming lines"
 msgstr "追踪代码行"
 
-#: builtin/branch.c
+#: builtin/branch.c:31
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]"
 
-#: builtin/branch.c
+#: builtin/branch.c:32
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
 msgstr "git branch [<选项>] [-f] [--recurse-submodules] <分支名> [<起始点>]"
 
-#: builtin/branch.c
+#: builtin/branch.c:33
 msgid "git branch [<options>] [-l] [<pattern>...]"
 msgstr "git branch [<选项>] [-l] [<模式>...]"
 
-#: builtin/branch.c
+#: builtin/branch.c:34
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
 
-#: builtin/branch.c
+#: builtin/branch.c:35
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
 
-#: builtin/branch.c
+#: builtin/branch.c:36
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
 
-#: builtin/branch.c
+#: builtin/branch.c:37
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c
+#: builtin/branch.c:38
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<选项>] [-r | -a] [--format]"
 
 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c
+#: builtin/branch.c:178
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -3474,7 +3561,7 @@ msgstr ""
 "         '%s'，但未合并到 HEAD"
 
 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c
+#: builtin/branch.c:182
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -3483,40 +3570,40 @@ msgstr ""
 "并未删除分支 '%s'，虽然它已经合并到 HEAD，\n"
 "         然而却尚未被合并到分支 '%s'"
 
-#: builtin/branch.c
+#: builtin/branch.c:196
 #, c-format
 msgid "couldn't look up commit object for '%s'"
 msgstr "无法查询 '%s' 指向的提交对象"
 
-#: builtin/branch.c
+#: builtin/branch.c:200
 #, c-format
 msgid "the branch '%s' is not fully merged"
 msgstr "分支 '%s' 没有完全合并"
 
-#: builtin/branch.c
+#: builtin/branch.c:202
 #, c-format
 msgid "If you are sure you want to delete it, run 'git branch -D %s'"
 msgstr "如果您确认要删除它，执行 'git branch -D %s'"
 
-#: builtin/branch.c
+#: builtin/branch.c:214
 msgid "update of config-file failed"
 msgstr "更新配置文件失败"
 
-#: builtin/branch.c
+#: builtin/branch.c:249
 msgid "cannot use -a with -d"
 msgstr "不能将 -a 和 -d 同时使用"
 
-#: builtin/branch.c
+#: builtin/branch.c:267
 #, c-format
 msgid "cannot delete branch '%s' used by worktree at '%s'"
 msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'"
 
-#: builtin/branch.c
+#: builtin/branch.c:283
 #, c-format
 msgid "remote-tracking branch '%s' not found"
 msgstr "未能找到远程跟踪分支 '%s'"
 
-#: builtin/branch.c
+#: builtin/branch.c:296
 #, c-format
 msgid ""
 "branch '%s' not found.\n"
@@ -3525,96 +3612,96 @@ msgstr ""
 "分支 '%s' 未找到。\n"
 "是否忘记指定 --remote 选项？"
 
-#: builtin/branch.c
+#: builtin/branch.c:300
 #, c-format
 msgid "branch '%s' not found"
 msgstr "分支 '%s' 未发现"
 
-#: builtin/branch.c
+#: builtin/branch.c:333
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c
+#: builtin/branch.c:334
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "已删除分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c builtin/tag.c
+#: builtin/branch.c:472 builtin/tag.c:69
 msgid "unable to parse format string"
 msgstr "不能解析格式化字符串"
 
-#: builtin/branch.c
+#: builtin/branch.c:509
 msgid "could not resolve HEAD"
 msgstr "不能解析 HEAD 提交"
 
-#: builtin/branch.c
+#: builtin/branch.c:515
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) 指向 refs/heads/ 之外"
 
-#: builtin/branch.c
+#: builtin/branch.c:530
 #, c-format
 msgid "branch %s is being rebased at %s"
 msgstr "分支 %s 正被变基到 %s"
 
-#: builtin/branch.c
+#: builtin/branch.c:534
 #, c-format
 msgid "branch %s is being bisected at %s"
 msgstr "分支 %s 正被二分查找于 %s"
 
-#: builtin/branch.c
+#: builtin/branch.c:563
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "工作区 %s 的 HEAD 指向没有被更新"
 
-#: builtin/branch.c
+#: builtin/branch.c:590
 #, c-format
 msgid "invalid branch name: '%s'"
 msgstr "无效的分支名：'%s'"
 
-#: builtin/branch.c
+#: builtin/branch.c:610 builtin/branch.c:901 builtin/branch.c:946
 #, c-format
 msgid "no commit on branch '%s' yet"
 msgstr "分支 '%s' 尚无提交"
 
-#: builtin/branch.c
+#: builtin/branch.c:612 builtin/branch.c:902
 #, c-format
 msgid "no branch named '%s'"
 msgstr "没有分支 '%s'"
 
-#: builtin/branch.c
+#: builtin/branch.c:640
 msgid "branch rename failed"
 msgstr "分支重命名失败"
 
-#: builtin/branch.c
+#: builtin/branch.c:642
 msgid "branch copy failed"
 msgstr "分支拷贝失败"
 
-#: builtin/branch.c
+#: builtin/branch.c:646
 #, c-format
 msgid "created a copy of a misnamed branch '%s'"
 msgstr "已为错误命名的分支 '%s' 创建了一个副本"
 
-#: builtin/branch.c
+#: builtin/branch.c:649
 #, c-format
 msgid "renamed a misnamed branch '%s' away"
 msgstr "已将错误命名的分支 '%s' 重命名"
 
-#: builtin/branch.c
+#: builtin/branch.c:656
 #, c-format
 msgid "branch renamed to %s, but HEAD is not updated"
 msgstr "分支重命名为 %s，但 HEAD 没有更新"
 
-#: builtin/branch.c
+#: builtin/branch.c:663
 msgid "branch is renamed, but update of config-file failed"
 msgstr "分支被重命名，但更新配置文件失败"
 
-#: builtin/branch.c
+#: builtin/branch.c:665
 msgid "branch is copied, but update of config-file failed"
 msgstr "分支已拷贝，但更新配置文件失败"
 
-#: builtin/branch.c
+#: builtin/branch.c:685
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -3625,224 +3712,227 @@ msgstr ""
 "  %s\n"
 "以 '%s' 开头的行将被过滤。\n"
 
-#: builtin/branch.c
+#: builtin/branch.c:723
 msgid "Generic options"
 msgstr "通用选项"
 
-#: builtin/branch.c
+#: builtin/branch.c:725
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:726
 msgid "suppress informational messages"
 msgstr "不显示信息"
 
-#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c
+#: builtin/branch.c:728 builtin/checkout.c:1698
+#: builtin/submodule--helper.c:3066
 msgid "set branch tracking configuration"
 msgstr "设置分支跟踪配置"
 
-#: builtin/branch.c
+#: builtin/branch.c:731
 msgid "do not use"
 msgstr "不要使用"
 
-#: builtin/branch.c
+#: builtin/branch.c:733
 msgid "upstream"
 msgstr "上游"
 
-#: builtin/branch.c
+#: builtin/branch.c:733
 msgid "change the upstream info"
 msgstr "改变上游信息"
 
-#: builtin/branch.c
+#: builtin/branch.c:734
 msgid "unset the upstream info"
 msgstr "取消上游信息的设置"
 
-#: builtin/branch.c
+#: builtin/branch.c:735
 msgid "use colored output"
 msgstr "使用彩色输出"
 
-#: builtin/branch.c
+#: builtin/branch.c:736
 msgid "act on remote-tracking branches"
 msgstr "作用于远程跟踪分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:739 builtin/branch.c:741
 msgid "print only branches that contain the commit"
 msgstr "只打印包含该提交的分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:740 builtin/branch.c:742
 msgid "print only branches that don't contain the commit"
 msgstr "只打印不包含该提交的分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:745
 msgid "Specific git-branch actions:"
 msgstr "具体的 git-branch 动作："
 
-#: builtin/branch.c
+#: builtin/branch.c:746
 msgid "list both remote-tracking and local branches"
 msgstr "列出远程跟踪及本地分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:749
 msgid "delete fully merged branch"
 msgstr "删除完全合并的分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:750
 msgid "delete branch (even if not merged)"
 msgstr "删除分支（即使没有合并）"
 
-#: builtin/branch.c
+#: builtin/branch.c:751
 msgid "move/rename a branch and its reflog"
 msgstr "移动/重命名一个分支，以及它的引用日志"
 
-#: builtin/branch.c
+#: builtin/branch.c:752
 msgid "move/rename a branch, even if target exists"
 msgstr "移动/重命名一个分支，即使目标已存在"
 
-#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
+#: builtin/branch.c:754 builtin/for-each-ref.c:39 builtin/tag.c:517
 msgid "do not output a newline after empty formatted refs"
 msgstr "在格式化引用结果为空之后，不输出换行符"
 
-#: builtin/branch.c
+#: builtin/branch.c:755
 msgid "copy a branch and its reflog"
 msgstr "拷贝一个分支和它的引用日志"
 
-#: builtin/branch.c
+#: builtin/branch.c:756
 msgid "copy a branch, even if target exists"
 msgstr "拷贝一个分支，即使目标已存在"
 
-#: builtin/branch.c
+#: builtin/branch.c:757
 msgid "list branch names"
 msgstr "列出分支名"
 
-#: builtin/branch.c
+#: builtin/branch.c:758
 msgid "show current branch name"
 msgstr "显示当前分支名"
 
-#: builtin/branch.c builtin/submodule--helper.c
+#: builtin/branch.c:759 builtin/submodule--helper.c:3064
 msgid "create the branch's reflog"
 msgstr "创建分支的引用日志"
 
-#: builtin/branch.c
+#: builtin/branch.c:761
 msgid "edit the description for the branch"
 msgstr "标记分支的描述"
 
-#: builtin/branch.c
+#: builtin/branch.c:762
 msgid "force creation, move/rename, deletion"
 msgstr "强制创建、移动/重命名、删除"
 
-#: builtin/branch.c
+#: builtin/branch.c:763
 msgid "print only branches that are merged"
 msgstr "只打印已经合并的分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:764
 msgid "print only branches that are not merged"
 msgstr "只打印尚未合并的分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:765
 msgid "list branches in columns"
 msgstr "以列的方式显示分支"
 
-#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c
+#: builtin/branch.c:767 builtin/for-each-ref.c:48 builtin/notes.c:490
+#: builtin/notes.c:493 builtin/notes.c:666 builtin/notes.c:669
+#: builtin/tag.c:520
 msgid "object"
 msgstr "对象"
 
-#: builtin/branch.c
+#: builtin/branch.c:768
 msgid "print only branches of the object"
 msgstr "只打印指向该对象的分支"
 
-#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
+#: builtin/branch.c:769 builtin/for-each-ref.c:54 builtin/tag.c:527
 msgid "sorting and filtering are case insensitive"
 msgstr "排序和过滤属于大小写不敏感"
 
-#: builtin/branch.c builtin/ls-files.c
+#: builtin/branch.c:770 builtin/ls-files.c:623
 msgid "recurse through submodules"
 msgstr "在子模组中递归"
 
-#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c
-#: builtin/tag.c builtin/verify-tag.c
+#: builtin/branch.c:771 builtin/for-each-ref.c:43 builtin/ls-files.c:635
+#: builtin/ls-tree.c:364 builtin/tag.c:525 builtin/verify-tag.c:30
 msgid "format to use for the output"
 msgstr "输出格式"
 
-#: builtin/branch.c
+#: builtin/branch.c:796
 msgid "failed to resolve HEAD as a valid ref"
 msgstr "无法将 HEAD 解析为有效引用"
 
-#: builtin/branch.c builtin/clone.c
+#: builtin/branch.c:800 builtin/clone.c:758
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有位于 /refs/heads 之下！"
 
-#: builtin/branch.c
+#: builtin/branch.c:821
 msgid ""
 "branch with --recurse-submodules can only be used if submodule."
 "propagateBranches is enabled"
 msgstr ""
 "带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用"
 
-#: builtin/branch.c
+#: builtin/branch.c:823
 msgid "--recurse-submodules can only be used to create branches"
 msgstr "--recurse-submodules 只能用于创建分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:854 builtin/branch.c:913
 msgid "branch name required"
 msgstr "必须提供分支名"
 
-#: builtin/branch.c
+#: builtin/branch.c:889
 msgid "cannot give description to detached HEAD"
 msgstr "不能向分离头指针提供描述"
 
-#: builtin/branch.c
+#: builtin/branch.c:895
 msgid "cannot edit description of more than one branch"
 msgstr "不能为一个以上的分支编辑描述"
 
-#: builtin/branch.c
+#: builtin/branch.c:915
 msgid "cannot copy the current branch while not on any"
 msgstr "不处于任何分支上，无法拷贝当前分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:916
 msgid "cannot rename the current branch while not on any"
 msgstr "不处于任何分支上，无法重命名当前分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:922
 msgid "too many branches for a copy operation"
 msgstr "为拷贝操作提供了太多的分支名"
 
-#: builtin/branch.c
+#: builtin/branch.c:923
 msgid "too many arguments for a rename operation"
 msgstr "为重命名操作提供了太多的参数"
 
-#: builtin/branch.c
+#: builtin/branch.c:934
 msgid "too many arguments to set new upstream"
 msgstr "为设置新上游提供了太多的参数"
 
-#: builtin/branch.c
+#: builtin/branch.c:938
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch"
 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:941 builtin/branch.c:970
 #, c-format
 msgid "no such branch '%s'"
 msgstr "没有此分支 '%s'"
 
-#: builtin/branch.c
+#: builtin/branch.c:947
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' 不存在"
 
-#: builtin/branch.c
+#: builtin/branch.c:964
 msgid "too many arguments to unset upstream"
 msgstr "为取消上游设置操作提供了太多的参数"
 
-#: builtin/branch.c
+#: builtin/branch.c:968
 msgid "could not unset upstream of HEAD when it does not point to any branch"
 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:974
 #, c-format
 msgid "branch '%s' has no upstream information"
 msgstr "分支 '%s' 没有上游信息"
 
-#: builtin/branch.c
+#: builtin/branch.c:988
 msgid ""
 "the -a, and -r, options to 'git branch' do not take a branch name.\n"
 "Did you mean to use: -a|-r --list <pattern>?"
@@ -3850,34 +3940,34 @@ msgstr ""
 "'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
 "您是否想要使用：-a|-r --list <模式>？"
 
-#: builtin/branch.c
+#: builtin/branch.c:992
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead"
 msgstr "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:21
 msgid "git version:\n"
 msgstr "git 版本：\n"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:27
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() 失败，错误为 '%s'（%d）\n"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:37
 msgid "compiler info: "
 msgstr "编译器信息："
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:40
 msgid "libc info: "
 msgstr "libc 信息："
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:54
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:67
 msgid ""
 "git bugreport [(-o | --output-directory) <path>]\n"
 "              [(-s | --suffix) <format> | --no-suffix]\n"
@@ -3887,7 +3977,7 @@ msgstr ""
 "              [(-s | --suffix) <格式> | --no-suffix]\n"
 "              [--diagnose[=<模式>]"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:76
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -3921,58 +4011,59 @@ msgstr ""
 "请检查下面错误报告中余下的内容。\n"
 "您可以删除任何您不想共享的内容。\n"
 
-#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c
-#: parse-options.h
+#: builtin/bugreport.c:117 builtin/commit.c:1529 builtin/commit.c:1533
+#: builtin/commit.c:1694 builtin/fast-export.c:1189 builtin/fast-export.c:1192
+#: builtin/fast-export.c:1195 builtin/rebase.c:1179 parse-options.h:581
 msgid "mode"
 msgstr "模式"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:118
 msgid ""
 "create an additional zip archive of detailed diagnostics (default 'stats')"
 msgstr "额外创建详细诊断信息的压缩包（默认 'stats'）"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:121
 msgid "specify a destination for the bugreport file(s)"
 msgstr "指定错误报告文件的目标位置"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:123
 msgid "specify a strftime format suffix for the filename(s)"
 msgstr "指定文件的 strftime 格式后缀"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:131
 #, c-format
 msgid "unknown argument `%s'"
 msgstr "未知参数 `%s'"
 
-#: builtin/bugreport.c builtin/diagnose.c
+#: builtin/bugreport.c:154 builtin/diagnose.c:53
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "不能为 '%s' 创建先导目录"
 
-#: builtin/bugreport.c builtin/diagnose.c
+#: builtin/bugreport.c:167 builtin/diagnose.c:59
 #, c-format
 msgid "unable to create diagnostics archive %s"
 msgstr "不能创建诊断归档包 %s"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:175
 msgid "System Info"
 msgstr "系统信息"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:178
 msgid "Enabled Hooks"
 msgstr "启用的钩子"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:185
 #, c-format
 msgid "unable to write to %s"
 msgstr "无法写入 %s"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:195
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "在 '%s' 创建了新报告。\n"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:19
 msgid ""
 "git bundle create [-q | --quiet | --progress]\n"
 "                  [--version=<version>] <file> <git-rev-list-args>"
@@ -3980,108 +4071,112 @@ msgstr ""
 "git bundle create [-q | --quiet | --progress]\n"
 "                  [--version=<版本>] <文件> <git-rev-list-参数>"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:22
 msgid "git bundle verify [-q | --quiet] <file>"
 msgstr "git bundle verify [-q | --quiet] <文件>"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:24
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads <文件> [<引用名>...]"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:26
 msgid "git bundle unbundle [--progress] <file> [<refname>...]"
 msgstr "git bundle unbundle [--progress] <文件> [<引用名>...]"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:65
 msgid "need a <file> argument"
 msgstr "需要一个 <文件> 参数"
 
-#: builtin/bundle.c builtin/pack-objects.c
+#: builtin/bundle.c:76 builtin/pack-objects.c:4301
 msgid "do not show progress meter"
 msgstr "不显示进度表"
 
-#: builtin/bundle.c builtin/pack-objects.c
+#: builtin/bundle.c:79 builtin/bundle.c:200 builtin/pack-objects.c:4304
 msgid "show progress meter"
 msgstr "显示进度表"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:82
 msgid "historical; same as --progress"
 msgstr "老的参数；等同于 --progress"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:85
 msgid "historical; does nothing"
 msgstr "老的参数；无作用"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:88
 msgid "specify bundle format version"
 msgstr "指定归档包的格式版本"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:102
 msgid "Need a repository to create a bundle."
 msgstr "需要一个仓库来创建归档包。"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:133
 msgid "do not show bundle details"
 msgstr "不显示归档包的细节"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:144 bundle.c:231
+msgid "need a repository to verify a bundle"
+msgstr "需要一个仓库来校验一个归档包"
+
+#: builtin/bundle.c:159
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s 可以\n"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:215
 msgid "Need a repository to unbundle."
 msgstr "需要一个仓库来解开归档包。"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:218
 msgid "Unbundling objects"
 msgstr "解包对象中"
 
-#: builtin/cat-file.c merge-recursive.c
+#: builtin/cat-file.c:73 merge-recursive.c:967
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "不能读取对象 %s '%s'"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:679
 msgid "flush is only for --buffer mode"
 msgstr "flush 只在 --buffer 模式中使用"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:723
 msgid "empty command in input"
 msgstr "输入为空的命令"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:725
 #, c-format
 msgid "whitespace before command: '%s'"
 msgstr "命令前存在空白：'%s'"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:734
 #, c-format
 msgid "%s requires arguments"
 msgstr "%s 需要参数"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:739
 #, c-format
 msgid "%s takes no arguments"
 msgstr "%s 不需要参数"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:907
 msgid "only one batch option may be specified"
 msgstr "只能指定一个批处理选项"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:938
 msgid "git cat-file <type> <object>"
 msgstr "git cat-file <类型> <对象>"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:939
 msgid "git cat-file (-e | -p) <object>"
 msgstr "git cat-file (-e | -p) <对象>"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:940
 msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
 msgstr "git cat-file (-t | -s) [--allow-unknown-type] <对象>"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:941
 msgid ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
@@ -4089,7 +4184,7 @@ msgstr ""
 "git cat-file (--textconv | --filters)\n"
 "             [<版本>:<路径|树对象> | --path=<路径|树对象> <版本>]"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:943
 msgid ""
 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
 "objects]\n"
@@ -4101,402 +4196,410 @@ msgstr ""
 "             [--buffer] [--follow-symlinks] [--unordered]\n"
 "             [--textconv | --filters] [-Z]"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:950
 msgid "Check object existence or emit object contents"
 msgstr "检查对象存在或输出对象内容"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:952
 msgid "check if <object> exists"
 msgstr "检查 <对象> 是否存在"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:953
 msgid "pretty-print <object> content"
 msgstr "美观地打印 <对象> 的内容"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:955
 msgid "Emit [broken] object attributes"
 msgstr "输出 [坏的] 对象属性"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:956
 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
 msgstr "显示对象的类型（'blob'、'tree'、'commit'、'tag'……其中之一）"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:957
 msgid "show object size"
 msgstr "显示对象大小"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:959
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "允许 -s 和 -t 对损坏的对象生效"
 
-#: builtin/cat-file.c builtin/log.c
+#: builtin/cat-file.c:960 builtin/log.c:267
 msgid "use mail map file"
 msgstr "使用邮件映射文件"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:963
 msgid "Batch objects requested on stdin (or --batch-all-objects)"
 msgstr "批量处理标准输入中请求的对象（或者 --batch-all-objects）"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:965
 msgid "show full <object> or <rev> contents"
 msgstr "显示完整的 <对象> 或 <版本> 内容"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:969
 msgid "like --batch, but don't emit <contents>"
 msgstr "类似于 --batch，但不输出 <内容>"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:972
 msgid "stdin is NUL-terminated"
 msgstr "标准输入以 NUL 字符分隔"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:974
 msgid "stdin and stdout is NUL-terminated"
 msgstr "标准输入和标准输出以 NUL 字符分隔"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:976
 msgid "read commands from stdin"
 msgstr "从标准输入读取命令"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:980
 msgid "with --batch[-check]: ignores stdin, batches all known objects"
 msgstr "带有 --batch[-check]：忽略标准输入，批量处理所有已知的对象"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:982
 msgid "Change or optimize batch output"
 msgstr "更改或优化批处理输出"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:983
 msgid "buffer --batch output"
 msgstr "缓冲 --batch 的输出"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:985
 msgid "follow in-tree symlinks"
 msgstr "跟随树内符号链接"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:987
 msgid "do not order objects before emitting them"
 msgstr "在输出对象前不要排序"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:989
 msgid ""
 "Emit object (blob or tree) with conversion or filter (stand-alone, or with "
 "batch)"
 msgstr "转换或过滤后输出对象（数据对象或树）（单独或批处理）"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:991
 msgid "run textconv on object's content"
 msgstr "对对象内容做文本转换"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:993
 msgid "run filters on object's content"
 msgstr "对对象内容做过滤"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:994
 msgid "blob|tree"
 msgstr "数据对象|树"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:995
 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
 msgstr "(--textconv | --filters) 使用 <路径>；而不是 'batch'"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1016
 #, c-format
 msgid "'%s=<%s>' needs '%s' or '%s'"
 msgstr "'%s=<%s>' 需要 '%s' 或 '%s'"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1018
 msgid "path|tree-ish"
 msgstr "路径|树对象"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1025 builtin/cat-file.c:1028 builtin/cat-file.c:1031
+#: builtin/cat-file.c:1034 builtin/cat-file.c:1037
 #, c-format
 msgid "'%s' requires a batch mode"
 msgstr "'%s' 需要批处理模式"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1055
 #, c-format
 msgid "'-%c' is incompatible with batch mode"
 msgstr "'-%c' 与批处理模式不兼容"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1058
 msgid "batch modes take no arguments"
 msgstr "批处理模式不带其他参数"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1066 builtin/cat-file.c:1069
 #, c-format
 msgid "<rev> required with '%s'"
 msgstr "'%s' 需要 <版本>"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1072
 #, c-format
 msgid "<object> required with '-%c'"
 msgstr "'-%c' 需要 <对象>"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1081
 #, c-format
 msgid "only two arguments allowed in <type> <object> mode, not %d"
 msgstr "<类型> <对象> 模式只允许两个参数，而不是 %d 个"
 
-#: builtin/check-attr.c
+#: builtin/check-attr.c:18
 msgid ""
 "git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
 "<pathname>..."
 msgstr ""
 "git check-attr [--source <树对象>] [-a | --all | <属性>...] [--] <路径名>..."
 
-#: builtin/check-attr.c
+#: builtin/check-attr.c:19
 msgid ""
 "git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"
 msgstr ""
 "git check-attr --stdin [-z] [--source <树对象>] [-a | --all | <属性>...]"
 
-#: builtin/check-attr.c
+#: builtin/check-attr.c:26
 msgid "report all attributes set on file"
 msgstr "报告设置在文件上的所有属性"
 
-#: builtin/check-attr.c
+#: builtin/check-attr.c:27
 msgid "use .gitattributes only from the index"
 msgstr "只使用索引中的 .gitattributes"
 
-#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c
+#: builtin/check-attr.c:28 builtin/check-ignore.c:26 builtin/hash-object.c:109
 msgid "read file names from stdin"
 msgstr "从标准输入读出文件名"
 
-#: builtin/check-attr.c builtin/check-ignore.c
+#: builtin/check-attr.c:30 builtin/check-ignore.c:28
 msgid "terminate input and output records by a NUL character"
 msgstr "输入和输出的记录使用 NUL 字符终结"
 
-#: builtin/check-attr.c
+#: builtin/check-attr.c:31
 msgid "<tree-ish>"
 msgstr "<树对象>"
 
-#: builtin/check-attr.c
+#: builtin/check-attr.c:31
 msgid "which tree-ish to check attributes at"
 msgstr "要用哪一个树对象来检查属性"
 
-#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c
+#: builtin/check-ignore.c:22 builtin/checkout.c:1676 builtin/gc.c:626
+#: builtin/worktree.c:790
 msgid "suppress progress reporting"
 msgstr "不显示进度报告"
 
-#: builtin/check-ignore.c
+#: builtin/check-ignore.c:30
 msgid "show non-matching input paths"
 msgstr "显示未匹配的输入路径"
 
-#: builtin/check-ignore.c
+#: builtin/check-ignore.c:32
 msgid "ignore index when checking"
 msgstr "检查时忽略索引"
 
-#: builtin/check-ignore.c
+#: builtin/check-ignore.c:166
 msgid "cannot specify pathnames with --stdin"
 msgstr "不能同时指定路径及 --stdin 参数"
 
-#: builtin/check-ignore.c
+#: builtin/check-ignore.c:169
 msgid "-z only makes sense with --stdin"
 msgstr "-z 需要和 --stdin 参数共用才有意义"
 
-#: builtin/check-ignore.c
+#: builtin/check-ignore.c:171
 msgid "no path specified"
 msgstr "未指定路径"
 
-#: builtin/check-ignore.c
+#: builtin/check-ignore.c:175
 msgid "--quiet is only valid with a single pathname"
 msgstr "参数 --quiet 只在提供一个路径名时有效"
 
-#: builtin/check-ignore.c
+#: builtin/check-ignore.c:177
 msgid "cannot have both --quiet and --verbose"
 msgstr "不能同时提供 --quiet 和 --verbose 参数"
 
-#: builtin/check-ignore.c
+#: builtin/check-ignore.c:180
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching 选项只在使用 --verbose 时有效"
 
-#: builtin/check-mailmap.c
+#: builtin/check-mailmap.c:13
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<选项>] <联系地址>..."
 
-#: builtin/check-mailmap.c
+#: builtin/check-mailmap.c:18
 msgid "also read contacts from stdin"
 msgstr "还从标准输入读取联系地址"
 
-#: builtin/check-mailmap.c
+#: builtin/check-mailmap.c:29
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "不能解析联系地址：%s"
 
-#: builtin/check-mailmap.c
+#: builtin/check-mailmap.c:52
 msgid "no contacts specified"
 msgstr "未指定联系地址"
 
-#: builtin/checkout--worker.c
+#: builtin/checkout--worker.c:112
 msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<选项>]"
 
-#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c
-#: builtin/submodule--helper.c builtin/worktree.c
+#: builtin/checkout--worker.c:120 builtin/checkout-index.c:240
+#: builtin/column.c:32 builtin/column.c:33 builtin/submodule--helper.c:1844
+#: builtin/submodule--helper.c:1847 builtin/submodule--helper.c:1855
+#: builtin/worktree.c:788 builtin/worktree.c:1087
 msgid "string"
 msgstr "字符串"
 
-#: builtin/checkout--worker.c builtin/checkout-index.c
+#: builtin/checkout--worker.c:121 builtin/checkout-index.c:241
 msgid "when creating files, prepend <string>"
 msgstr "在创建文件时，在前面加上 <字符串>"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:188
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:206
 msgid "stage should be between 1 and 3 or all"
 msgstr "索引值应该取值 1 到 3 或者 all"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:224
 msgid "check out all files in the index"
 msgstr "检出索引区的所有文件"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:226
 msgid "do not skip files with skip-worktree set"
 msgstr "在 skip-worktree 设置时不要跳过文件"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:227
 msgid "force overwrite of existing files"
 msgstr "强制覆盖现有的文件"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:229
 msgid "no warning for existing files and files not in index"
 msgstr "存在或不在索引中的文件都没有警告"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:231
 msgid "don't checkout new files"
 msgstr "不检出新文件"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:233
 msgid "update stat information in the index file"
 msgstr "更新索引中文件的状态信息"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:237
 msgid "read list of paths from the standard input"
 msgstr "从标准输入读取路径列表"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:239
 msgid "write the content to temporary files"
 msgstr "将内容写入临时文件"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:243
 msgid "copy out the files from named stage"
 msgstr "从指定暂存区中拷出文件"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:42
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<选项>] <分支>"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:43
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
 
-#: builtin/checkout.c
+#: builtin/checkout.c:48
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<选项>] [<分支>]"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:53
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
 
-#: builtin/checkout.c
+#: builtin/checkout.c:210 builtin/checkout.c:249
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "路径 '%s' 没有我们的版本"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:212 builtin/checkout.c:251
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "路径 '%s' 没有他们的版本"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:228
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "路径 '%s' 没有全部必需的版本"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:283
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "路径 '%s' 没有必需的版本"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:303
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "path '%s'：无法合并"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:319
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "无法为 '%s' 添加合并结果"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:437
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "重新创建了 %d 个合并冲突"
 msgstr[1] "重新创建了 %d 个合并冲突"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:442
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "从 %2$s 更新了 %1$d 个路径"
 msgstr[1] "从 %2$s 更新了 %1$d 个路径"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:449
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "从索引区更新了 %d 个路径"
 msgstr[1] "从索引区更新了 %d 个路径"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:478
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' 不能在更新路径时使用"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:492
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "不能同时更新路径并切换到分支'%s'。"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:496
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "'%s' 或 '%s' 都没有指定"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:500
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "未指定 '%2$s' 时，必须使用 '%1$s'"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:518 builtin/checkout.c:522
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:532
 #, c-format
 msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree"
 msgstr "'%s'、'%s' 或 '%s' 不能在检出一个树时使用"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:605 builtin/checkout.c:612
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路径 '%s' 未合并"
 
-#: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c
-#: merge-ort.c reset.c sequencer.c tree-walk.c
+#: builtin/checkout.c:797 builtin/checkout.c:1267 builtin/checkout.c:1273
+#: builtin/grep.c:525 builtin/grep.c:668 builtin/grep.c:708
+#: builtin/merge-tree.c:449 builtin/merge-tree.c:454 builtin/merge-tree.c:459
+#: builtin/reset.c:120 merge-ort.c:5142 reset.c:168 sequencer.c:775
+#: sequencer.c:4047 tree-walk.c:95
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "无法读取树（%s）"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:813
 msgid "you need to resolve your current index first"
 msgstr "您需要先解决当前索引的冲突"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:868
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -4505,51 +4608,51 @@ msgstr ""
 "不能继续，下列文件有暂存的修改：\n"
 "%s"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:964
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1011
 msgid "HEAD is now at"
 msgstr "HEAD 目前位于"
 
-#: builtin/checkout.c builtin/clone.c
+#: builtin/checkout.c:1015 builtin/clone.c:676 builtin/clone.c:705
 msgid "unable to update HEAD"
 msgstr "不能更新 HEAD"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1019
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "重置分支 '%s'\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1022
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已经位于 '%s'\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1026
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切换并重置分支 '%s'\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1028 builtin/checkout.c:1481
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切换到一个新分支 '%s'\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1030
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切换到分支 '%s'\n"
 
 #  译者：注意保持前导空格
-#: builtin/checkout.c
+#: builtin/checkout.c:1083
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... 及其它 %d 个。\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1089
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -4570,7 +4673,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1108
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -4597,19 +4700,19 @@ msgstr[1] ""
 " git branch <新分支名> %s\n"
 "\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1144
 msgid "internal error in revision walk"
 msgstr "在版本遍历时遇到内部错误"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1148
 msgid "Previous HEAD position was"
 msgstr "之前的 HEAD 位置是"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1193 builtin/checkout.c:1475
 msgid "You are on a branch yet to be born"
 msgstr "您位于一个尚未初始化的分支"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1286
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -4618,7 +4721,7 @@ msgstr ""
 "'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
 "请使用 --（和可选的 --no-guess）来消除歧义"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1293
 msgid ""
 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
 "you can do so by fully qualifying the name with the --track option:\n"
@@ -4637,56 +4740,56 @@ msgstr ""
 "如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n"
 "名称，可以在配置中设置 checkout.defaultRemote=origin。"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1303
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' 匹配多个（%d 个）远程跟踪分支"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1370
 msgid "only one reference expected"
 msgstr "只期望一个引用"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1387
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "应只有一个引用，却给出了 %d 个"
 
-#: builtin/checkout.c builtin/worktree.c
+#: builtin/checkout.c:1433 builtin/worktree.c:443 builtin/worktree.c:897
 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1446 builtin/checkout.c:1872
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用不是一个树：%s"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1497
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "期望一个分支，得到标签 '%s'"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1499
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "期望一个分支，得到远程分支 '%s'"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1501 builtin/checkout.c:1510
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "期望一个分支，得到 '%s'"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1504
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "期望一个分支，得到提交 '%s'"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1513
 msgid ""
 "If you want to detach HEAD at the commit, try again with the --detach option."
 msgstr "如果你在本提交分离头指针，使用 --detach 选项重试。"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1526
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -4694,7 +4797,7 @@ msgstr ""
 "不能在合并时切换分支\n"
 "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1530
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -4702,7 +4805,7 @@ msgstr ""
 "不能在一个 am 会话期间切换分支\n"
 "考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1534
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -4710,7 +4813,7 @@ msgstr ""
 "不能在变基时切换分支\n"
 "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1538
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -4718,7 +4821,7 @@ msgstr ""
 "不能在拣选时切换分支\n"
 "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1542
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -4726,242 +4829,246 @@ msgstr ""
 "不能在还原时切换分支\n"
 "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1546
 msgid "you are switching branch while bisecting"
 msgstr "您在执行二分查找时切换分支"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1576
 msgid "paths cannot be used with switching branches"
 msgstr "路径不能和切换分支同时使用"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1579 builtin/checkout.c:1583 builtin/checkout.c:1587
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' 不能和切换分支同时使用"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1591 builtin/checkout.c:1594 builtin/checkout.c:1597
+#: builtin/checkout.c:1602 builtin/checkout.c:1607
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' 不能和 '%s' 同时使用"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1604
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' 不带 <起始点>"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1612
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "不能切换分支到一个非提交 '%s'"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1619
 msgid "missing branch or commit argument"
 msgstr "缺少分支或提交参数"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1664
 #, c-format
 msgid "unknown conflict style '%s'"
 msgstr "未知的冲突风格 '%s'"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1681
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支执行三方合并"
 
-#: builtin/checkout.c builtin/log.c parse-options.h
+#: builtin/checkout.c:1682 builtin/log.c:2096 parse-options.h:542
 msgid "style"
 msgstr "风格"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1683
 msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr "冲突输出风格（merge、diff3 或 zdiff3）"
 
-#: builtin/checkout.c builtin/worktree.c
+#: builtin/checkout.c:1696 builtin/worktree.c:785
 msgid "detach HEAD at named commit"
 msgstr "HEAD 从指定的提交分离"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1701
 msgid "force checkout (throw away local modifications)"
 msgstr "强制检出（丢弃本地修改）"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1703
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1703
 msgid "new unborn branch"
 msgstr "新的未诞生的分支"
 
-#: builtin/checkout.c builtin/merge.c
+#: builtin/checkout.c:1705 builtin/merge.c:290
 msgid "update ignored files (default)"
 msgstr "更新忽略的文件（默认）"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1708
 msgid "do not check if another worktree is holding the given ref"
 msgstr "不检查指定的引用是否被其他工作区所占用"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1721
 msgid "checkout our version for unmerged files"
 msgstr "对尚未合并的文件检出我们的版本"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1724
 msgid "checkout their version for unmerged files"
 msgstr "对尚未合并的文件检出他们的版本"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1728
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "对路径不做稀疏检出的限制"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1787
 #, c-format
 msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr "选项 '-%c'、'-%c' 和 ‘%s' 不能同时使用"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1828
 msgid "--track needs a branch name"
 msgstr "--track 需要一个分支名"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1833
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "缺少分支名，尝试 -%c"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1865
 #, c-format
 msgid "could not resolve %s"
 msgstr "无法解析 %s"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1881
 msgid "invalid path specification"
 msgstr "无效的路径规格"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1888
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1892
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach 不能接收路径参数 '%s'"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1917
 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
+#: builtin/checkout.c:1922
 msgid "you must specify path(s) to restore"
 msgstr "您必须指定要恢复的路径"
 
-#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c
-#: builtin/submodule--helper.c builtin/worktree.c
+#: builtin/checkout.c:1954 builtin/checkout.c:1956 builtin/checkout.c:2001
+#: builtin/checkout.c:2003 builtin/clone.c:141 builtin/remote.c:174
+#: builtin/remote.c:176 builtin/replay.c:296 builtin/submodule--helper.c:3021
+#: builtin/submodule--helper.c:3367 builtin/worktree.c:780
+#: builtin/worktree.c:782
 msgid "branch"
 msgstr "分支"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1955
 msgid "create and checkout a new branch"
 msgstr "创建并检出一个新的分支"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1957
 msgid "create/reset and checkout a branch"
 msgstr "创建/重置并检出一个分支"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1958
 msgid "create reflog for new branch"
 msgstr "为新的分支创建引用日志"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1960
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "二次猜测 'git checkout <无此分支>'（默认）"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1961
 msgid "use overlay mode (default)"
 msgstr "使用叠加模式（默认）"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:2002
 msgid "create and switch to a new branch"
 msgstr "创建并切换一个新分支"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:2004
 msgid "create/reset and switch to a branch"
 msgstr "创建/重置并切换一个分支"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:2006
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "二次猜测 'git switch <无此分支>'"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:2008
 msgid "throw away local modifications"
 msgstr "丢弃本地修改"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:2038
 msgid "which tree-ish to checkout from"
 msgstr "要检出哪一个树"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:2040
 msgid "restore the index"
 msgstr "恢复索引"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:2042
 msgid "restore the working tree (default)"
 msgstr "恢复工作区（默认）"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:2044
 msgid "ignore unmerged entries"
 msgstr "忽略未合并条目"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:2045
 msgid "use overlay mode"
 msgstr "使用叠加模式"
 
-#: builtin/clean.c
+#: builtin/clean.c:33
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
 "[<pathspec>...]"
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径规格>..."
 
-#: builtin/clean.c
+#: builtin/clean.c:37
 #, c-format
 msgid "Removing %s\n"
 msgstr "正删除 %s\n"
 
-#: builtin/clean.c
+#: builtin/clean.c:38
 #, c-format
 msgid "Would remove %s\n"
 msgstr "将删除 %s\n"
 
-#: builtin/clean.c
+#: builtin/clean.c:39
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "忽略仓库 %s\n"
 
-#: builtin/clean.c
+#: builtin/clean.c:40
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "将忽略仓库 %s\n"
 
-#: builtin/clean.c midx.c
+#: builtin/clean.c:41 midx.c:513
 #, c-format
 msgid "failed to remove %s"
 msgstr "无法删除 %s"
 
-#: builtin/clean.c
+#: builtin/clean.c:42
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "不能对 %s 调用 lstat\n"
 
-#: builtin/clean.c
+#: builtin/clean.c:43
 msgid "Refusing to remove current working directory\n"
 msgstr "拒绝删除当前工作目录\n"
 
-#: builtin/clean.c
+#: builtin/clean.c:44
 msgid "Would refuse to remove current working directory\n"
 msgstr "将拒绝删除当前工作目录\n"
 
-#: builtin/clean.c
+#: builtin/clean.c:333
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -4974,7 +5081,7 @@ msgstr ""
 "foo        - 通过唯一前缀选择一个选项\n"
 "           - （空）什么也不选择\n"
 
-#: builtin/clean.c
+#: builtin/clean.c:337
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -4995,32 +5102,32 @@ msgstr ""
 "*          - 选择所有选项\n"
 "           - （空）结束选择\n"
 
-#: builtin/clean.c
+#: builtin/clean.c:552
 #, c-format
 msgid "Huh (%s)?\n"
 msgstr "嗯（%s）？\n"
 
-#: builtin/clean.c
+#: builtin/clean.c:692
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "输入模版以排除条目>> "
 
-#: builtin/clean.c
+#: builtin/clean.c:726
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "警告：无法找到和 %s 匹配的条目"
 
-#: builtin/clean.c
+#: builtin/clean.c:747
 msgid "Select items to delete"
 msgstr "选择要删除的条目"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c
+#: builtin/clean.c:788
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "删除 %s [y/N]？"
 
-#: builtin/clean.c
+#: builtin/clean.c:819
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -5038,271 +5145,291 @@ msgstr ""
 "help                - 显示本帮助\n"
 "?                   - 显示如何在提示符下选择的帮助"
 
-#: builtin/clean.c
+#: builtin/clean.c:855
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "将删除如下条目："
 msgstr[1] "将删除如下条目："
 
-#: builtin/clean.c
+#: builtin/clean.c:871
 msgid "No more files to clean, exiting."
 msgstr "没有要清理的文件，退出。"
 
-#: builtin/clean.c
+#: builtin/clean.c:933
 msgid "do not print names of files removed"
 msgstr "不打印删除文件的名称"
 
-#: builtin/clean.c
+#: builtin/clean.c:935
 msgid "force"
 msgstr "强制"
 
-#: builtin/clean.c
+#: builtin/clean.c:936
 msgid "interactive cleaning"
 msgstr "交互式清除"
 
-#: builtin/clean.c
+#: builtin/clean.c:938
 msgid "remove whole directories"
 msgstr "删除整个目录"
 
-#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c
-#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c
-#: ref-filter.h
+#: builtin/clean.c:939 builtin/config.c:876 builtin/config.c:929
+#: builtin/config.c:985 builtin/describe.c:589 builtin/describe.c:591
+#: builtin/grep.c:994 builtin/log.c:274 builtin/log.c:276
+#: builtin/ls-files.c:607 builtin/name-rev.c:570 builtin/name-rev.c:572
+#: builtin/pack-refs.c:32 builtin/pack-refs.c:34 builtin/show-ref.c:316
+#: ref-filter.h:133
 msgid "pattern"
 msgstr "模式"
 
-#: builtin/clean.c
+#: builtin/clean.c:940
 msgid "add <pattern> to ignore rules"
 msgstr "添加 <模式> 到忽略规则"
 
-#: builtin/clean.c
+#: builtin/clean.c:941
 msgid "remove ignored files, too"
 msgstr "也删除忽略的文件"
 
-#: builtin/clean.c
+#: builtin/clean.c:943
 msgid "remove only ignored files"
 msgstr "只删除忽略的文件"
 
-#: builtin/clean.c
+#: builtin/clean.c:953
 msgid "clean.requireForce is true and -f not given: refusing to clean"
 msgstr "clean.requireForce 设置为 true 且未提供 -f 选项：拒绝执行清理动作"
 
-#: builtin/clone.c
+#: builtin/clone.c:56
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
 
-#: builtin/clone.c
+#: builtin/clone.c:111
 msgid "don't clone shallow repository"
 msgstr "不克隆浅仓库"
 
-#: builtin/clone.c
+#: builtin/clone.c:113
 msgid "don't create a checkout"
 msgstr "不创建一个检出"
 
-#: builtin/clone.c builtin/init-db.c
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/init-db.c:90
 msgid "create a bare repository"
 msgstr "创建一个纯仓库"
 
-#: builtin/clone.c
+#: builtin/clone.c:118
 msgid "create a mirror repository (implies --bare)"
 msgstr "创建一个镜像仓库（隐含 --bare）"
 
-#: builtin/clone.c
+#: builtin/clone.c:120
 msgid "to clone from a local repository"
 msgstr "从本地仓库克隆"
 
-#: builtin/clone.c
+#: builtin/clone.c:122
 msgid "don't use local hardlinks, always copy"
 msgstr "不使用本地硬链接，始终复制"
 
-#: builtin/clone.c
+#: builtin/clone.c:124
 msgid "setup as shared repository"
 msgstr "设置为共享仓库"
 
-#: builtin/clone.c
+#: builtin/clone.c:126
 msgid "pathspec"
 msgstr "路径规格"
 
-#: builtin/clone.c
+#: builtin/clone.c:126
 msgid "initialize submodules in the clone"
 msgstr "在克隆时初始化子模组"
 
-#: builtin/clone.c
+#: builtin/clone.c:130
 msgid "number of submodules cloned in parallel"
 msgstr "并发克隆的子模组的数量"
 
-#: builtin/clone.c builtin/init-db.c
+#: builtin/clone.c:131 builtin/init-db.c:87
 msgid "template-directory"
 msgstr "模板目录"
 
-#: builtin/clone.c builtin/init-db.c
+#: builtin/clone.c:132 builtin/init-db.c:88
 msgid "directory from which templates will be used"
 msgstr "模板目录将被使用"
 
-#: builtin/clone.c builtin/submodule--helper.c
+#: builtin/clone.c:134 builtin/clone.c:136 builtin/submodule--helper.c:1851
+#: builtin/submodule--helper.c:2762 builtin/submodule--helper.c:3374
 msgid "reference repository"
 msgstr "参考仓库"
 
-#: builtin/clone.c builtin/submodule--helper.c
+#: builtin/clone.c:138 builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2764
 msgid "use --reference only while cloning"
 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
 
-#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c
-#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c
-#: builtin/submodule--helper.c t/helper/test-simple-ipc.c
+#: builtin/clone.c:139 builtin/column.c:28 builtin/fmt-merge-msg.c:28
+#: builtin/init-db.c:98 builtin/merge-file.c:82 builtin/merge.c:275
+#: builtin/pack-objects.c:4374 builtin/repack.c:1186
+#: builtin/submodule--helper.c:3376 t/helper/test-simple-ipc.c:596
+#: t/helper/test-simple-ipc.c:598
 msgid "name"
 msgstr "名称"
 
-#: builtin/clone.c
+#: builtin/clone.c:140
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
 
-#: builtin/clone.c
+#: builtin/clone.c:142
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "检出 <分支> 而不是远程 HEAD"
 
-#: builtin/clone.c
+#: builtin/clone.c:144
 msgid "path to git-upload-pack on the remote"
 msgstr "远程 git-upload-pack 路径"
 
-#: builtin/clone.c builtin/fetch.c builtin/pull.c
+#: builtin/clone.c:145 builtin/fetch.c:2208 builtin/pull.c:214
 msgid "depth"
 msgstr "深度"
 
-#: builtin/clone.c
+#: builtin/clone.c:146
 msgid "create a shallow clone of that depth"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/clone.c
+#: builtin/clone.c:148
 msgid "create a shallow clone since a specific time"
 msgstr "从一个特定时间创建一个浅克隆"
 
-#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c
-#: builtin/replay.c
+#: builtin/clone.c:149 builtin/fetch.c:2212 builtin/fetch.c:2235
+#: builtin/pull.c:220 builtin/pull.c:245 builtin/rebase.c:1088
+#: builtin/replay.c:299
 msgid "revision"
 msgstr "版本"
 
-#: builtin/clone.c builtin/fetch.c builtin/pull.c
+#: builtin/clone.c:150 builtin/fetch.c:2213 builtin/pull.c:221
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "深化浅克隆的历史，除了特定版本"
 
-#: builtin/clone.c builtin/submodule--helper.c
+#: builtin/clone.c:152 builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:2778
 msgid "clone only one branch, HEAD or --branch"
 msgstr "只克隆一个分支、HEAD 或 --branch"
 
-#: builtin/clone.c
+#: builtin/clone.c:154
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
 
-#: builtin/clone.c
+#: builtin/clone.c:156
 msgid "any cloned submodules will be shallow"
 msgstr "子模组将以浅下载模式克隆"
 
-#: builtin/clone.c builtin/init-db.c
+#: builtin/clone.c:157 builtin/init-db.c:96
 msgid "gitdir"
 msgstr "git目录"
 
-#: builtin/clone.c builtin/init-db.c
+#: builtin/clone.c:158 builtin/init-db.c:97
 msgid "separate git dir from working tree"
 msgstr "git目录和工作区分离"
 
-#: builtin/clone.c builtin/init-db.c
+#: builtin/clone.c:160 builtin/init-db.c:103
 msgid "specify the reference format to use"
 msgstr "指定要使用的引用格式"
 
-#: builtin/clone.c
+#: builtin/clone.c:161
 msgid "key=value"
 msgstr "key=value"
 
-#: builtin/clone.c
+#: builtin/clone.c:162
 msgid "set config inside the new repository"
 msgstr "在新仓库中设置配置信息"
 
-#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c
-#: builtin/push.c builtin/send-pack.c
+#: builtin/clone.c:164 builtin/fetch.c:2233 builtin/ls-remote.c:84
+#: builtin/pull.c:236 builtin/push.c:595 builtin/send-pack.c:195
 msgid "server-specific"
 msgstr "server-specific"
 
-#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c
-#: builtin/push.c builtin/send-pack.c
+#: builtin/clone.c:164 builtin/fetch.c:2233 builtin/ls-remote.c:84
+#: builtin/pull.c:237 builtin/push.c:595 builtin/send-pack.c:196
 msgid "option to transmit"
 msgstr "传输选项"
 
-#: builtin/clone.c
+#: builtin/clone.c:168
 msgid "apply partial clone filters to submodules"
 msgstr "对子模组使用部分克隆过滤器"
 
-#: builtin/clone.c
+#: builtin/clone.c:170
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
 
-#: builtin/clone.c
+#: builtin/clone.c:172
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr "初始化稀疏检出文件，只包含根目录文件"
 
-#: builtin/clone.c
+#: builtin/clone.c:174
 msgid "uri"
 msgstr "uri"
 
-#: builtin/clone.c
+#: builtin/clone.c:174
 msgid "a URI for downloading bundles before fetching from origin remote"
 msgstr "用于在从 origin 远程获取之前下载归档包的 URI"
 
-#: builtin/clone.c
+#: builtin/clone.c:249
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
 
-#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c
+#: builtin/clone.c:320 builtin/diff.c:93 builtin/rm.c:143 grep.c:1940
+#: setup.c:196
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "无法对 '%s' 调用 stat"
 
-#: builtin/clone.c
+#: builtin/clone.c:322
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s 存在且不是一个目录"
 
-#: builtin/clone.c
+#: builtin/clone.c:356
 #, c-format
 msgid "'%s' is a symlink, refusing to clone with --local"
 msgstr "'%s' 为符号链接，拒绝用 --local 克隆"
 
-#: builtin/clone.c
+#: builtin/clone.c:360
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "无法在 '%s' 上启动迭代器"
 
-#: builtin/clone.c
+#: builtin/clone.c:375
 #, c-format
 msgid "symlink '%s' exists, refusing to clone with --local"
 msgstr "符号链接 '%s' 存在，拒绝用 --local 克隆"
 
-#: builtin/clone.c compat/precompose_utf8.c
+#: builtin/clone.c:390 compat/precompose_utf8.c:62
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "无法删除 '%s'"
 
-#: builtin/clone.c
+#: builtin/clone.c:402
+#, c-format
+msgid "hardlink cannot be checked at '%s'"
+msgstr "无法检查 '%s' 处的硬链接"
+
+#: builtin/clone.c:409
+#, c-format
+msgid "hardlink different from source at '%s'"
+msgstr "硬链接与 '%s' 处的源不同"
+
+#: builtin/clone.c:414
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "无法创建链接 '%s'"
 
-#: builtin/clone.c
+#: builtin/clone.c:418
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "无法拷贝文件至 '%s'"
 
-#: builtin/clone.c
+#: builtin/clone.c:423
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "无法在 '%s' 上迭代"
 
-#: builtin/clone.c
+#: builtin/clone.c:448
 #, c-format
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: builtin/clone.c
+#: builtin/clone.c:462
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -5312,215 +5439,216 @@ msgstr ""
 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
 "'git restore --source=HEAD :/' 重试\n"
 
-#: builtin/clone.c
+#: builtin/clone.c:543
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "不能发现要克隆的远程分支 %s。"
 
-#: builtin/clone.c fetch-pack.c
+#: builtin/clone.c:648 fetch-pack.c:2099
 msgid "remote did not send all necessary objects"
 msgstr "远程没有发送所有必需的对象"
 
-#: builtin/clone.c
+#: builtin/clone.c:664
 #, c-format
 msgid "unable to update %s"
 msgstr "不能更新 %s"
 
-#: builtin/clone.c
+#: builtin/clone.c:725
 msgid "failed to initialize sparse-checkout"
 msgstr "无法初始化稀疏检出"
 
-#: builtin/clone.c
+#: builtin/clone.c:748
 msgid "remote HEAD refers to nonexistent ref, unable to checkout"
 msgstr "远程 HEAD 指向一个不存在的引用，无法检出"
 
-#: builtin/clone.c
+#: builtin/clone.c:784
 msgid "unable to checkout working tree"
 msgstr "不能检出工作区"
 
-#: builtin/clone.c
+#: builtin/clone.c:874
 msgid "unable to write parameters to config file"
 msgstr "无法将参数写入配置文件"
 
-#: builtin/clone.c
+#: builtin/clone.c:941
 msgid "cannot repack to clean up"
 msgstr "无法执行 repack 来清理"
 
-#: builtin/clone.c
+#: builtin/clone.c:943
 msgid "cannot unlink temporary alternates file"
 msgstr "无法删除临时的 alternates 文件"
 
-#: builtin/clone.c
+#: builtin/clone.c:992
 msgid "Too many arguments."
 msgstr "太多参数。"
 
-#: builtin/clone.c scalar.c
+#: builtin/clone.c:996 scalar.c:456
 msgid "You must specify a repository to clone."
 msgstr "您必须指定一个仓库来克隆。"
 
-#: builtin/clone.c builtin/init-db.c setup.c
+#: builtin/clone.c:1007 builtin/init-db.c:170 builtin/refs.c:39 setup.c:2321
 #, c-format
 msgid "unknown ref storage format '%s'"
 msgstr "未知的引用存储格式 '%s'"
 
-#: builtin/clone.c
+#: builtin/clone.c:1034
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "仓库 '%s' 不存在"
 
-#: builtin/clone.c builtin/fetch.c
+#: builtin/clone.c:1038 builtin/fetch.c:2345
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s 不是一个正数"
 
-#: builtin/clone.c
+#: builtin/clone.c:1048
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
 
-#: builtin/clone.c
+#: builtin/clone.c:1054
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "仓库路径 '%s' 已经存在，并且不是一个空目录。"
 
-#: builtin/clone.c
+#: builtin/clone.c:1068
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作区 '%s' 已经存在。"
 
-#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c
+#: builtin/clone.c:1083 builtin/clone.c:1104 builtin/difftool.c:267
+#: builtin/log.c:2301 builtin/worktree.c:455 builtin/worktree.c:487
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "不能为 '%s' 创建先导目录"
 
-#: builtin/clone.c
+#: builtin/clone.c:1088
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "不能创建工作区目录 '%s'"
 
-#: builtin/clone.c
+#: builtin/clone.c:1108
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "克隆到纯仓库 '%s'...\n"
 
-#: builtin/clone.c
+#: builtin/clone.c:1110
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正克隆到 '%s'...\n"
 
-#: builtin/clone.c
+#: builtin/clone.c:1139
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
 
-#: builtin/clone.c builtin/remote.c
+#: builtin/clone.c:1268 builtin/remote.c:204 builtin/remote.c:735
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' 不是一个有效的远程名称"
 
-#: builtin/clone.c
+#: builtin/clone.c:1302
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c
+#: builtin/clone.c:1304
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c
+#: builtin/clone.c:1306
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c
+#: builtin/clone.c:1308
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c fetch-pack.c
+#: builtin/clone.c:1311 fetch-pack.c:1217 fetch-pack.c:1570
 msgid "source repository is shallow, reject to clone."
 msgstr "源仓库是浅克隆，拒绝克隆。"
 
-#: builtin/clone.c
+#: builtin/clone.c:1313
 msgid "source repository is shallow, ignoring --local"
 msgstr "源仓库是浅克隆，忽略 --local"
 
-#: builtin/clone.c
+#: builtin/clone.c:1318
 msgid "--local is ignored"
 msgstr "--local 被忽略"
 
-#: builtin/clone.c
+#: builtin/clone.c:1334
 msgid "cannot clone from filtered bundle"
 msgstr "无法从经过过滤的归档包克隆"
 
-#: builtin/clone.c
+#: builtin/clone.c:1401 builtin/clone.c:1418
 msgid "failed to initialize the repo, skipping bundle URI"
 msgstr "无法初始化仓库，跳过归档包 URI"
 
-#: builtin/clone.c
+#: builtin/clone.c:1403
 #, c-format
 msgid "failed to fetch objects from bundle URI '%s'"
 msgstr "无法从归档包 URI '%s' 获取对象"
 
-#: builtin/clone.c
+#: builtin/clone.c:1421
 msgid "failed to fetch advertised bundles"
 msgstr "无法获取公布的归档包"
 
-#: builtin/clone.c
+#: builtin/clone.c:1450 builtin/clone.c:1510
 msgid "remote transport reported error"
 msgstr "远程传输报告错误"
 
-#: builtin/clone.c
+#: builtin/clone.c:1460
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "远程分支 %s 在上游 %s 未发现"
 
-#: builtin/clone.c
+#: builtin/clone.c:1471
 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎克隆了一个空仓库。"
 
-#: builtin/column.c
+#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<选项>]"
 
-#: builtin/column.c
+#: builtin/column.c:28
 msgid "lookup config vars"
 msgstr "查找配置变量"
 
-#: builtin/column.c
+#: builtin/column.c:29 builtin/column.c:30
 msgid "layout to use"
 msgstr "要使用的布局"
 
-#: builtin/column.c
+#: builtin/column.c:31
 msgid "maximum width"
 msgstr "最大宽度"
 
-#: builtin/column.c
+#: builtin/column.c:32
 msgid "padding space on left border"
 msgstr "左边框的填充空间"
 
-#: builtin/column.c
+#: builtin/column.c:33
 msgid "padding space on right border"
 msgstr "右边框的填充空间"
 
-#: builtin/column.c
+#: builtin/column.c:34
 msgid "padding space between columns"
 msgstr "两列之间的填充空间"
 
-#: builtin/column.c
+#: builtin/column.c:49
 #, c-format
 msgid "%s must be non-negative"
 msgstr "%s 必须为非负整数"
 
-#: builtin/column.c
+#: builtin/column.c:54
 msgid "--command must be the first argument"
 msgstr "--command 必须是第一个参数"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:18
 msgid ""
 "git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]"
 msgstr ""
 "git commit-graph verify [--object-dir <目录>] [--shallow] [--[no-]progress]"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:21
 msgid ""
 "git commit-graph write [--object-dir <dir>] [--append]\n"
 "                       [--split[=<strategy>]] [--reachable | --stdin-packs | "
@@ -5536,101 +5664,102 @@ msgstr ""
 "[no-]progress]\n"
 "                       <切分选项>"
 
-#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c
+#: builtin/commit-graph.c:56 builtin/fetch.c:2222 builtin/log.c:2065
+#: builtin/repack.c:1192 builtin/repack.c:1194
 msgid "dir"
 msgstr "目录"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:57
 msgid "the object directory to store the graph"
 msgstr "保存图形的对象目录"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:81
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "如果提交图被拆分，只验证头一个文件"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:110
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "无法打开提交图 '%s'"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:114
 #, c-format
 msgid "could not open commit-graph chain '%s'"
 msgstr "无法打开提交图链 '%s'"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:161
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "未能识别的 --split 参数，%s"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:174
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "意外的非十六进制对象 ID：%s"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:179
 #, c-format
 msgid "invalid object: %s"
 msgstr "无效对象：%s"
 
-#: builtin/commit-graph.c parse-options-cb.c
+#: builtin/commit-graph.c:199 parse-options-cb.c:27 parse-options-cb.c:31
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr "选项 `%s' 期望一个数字值"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:230
 msgid "start walk at all refs"
 msgstr "开始遍历所有引用"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:232
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "从标准输入中的包索引文件列表中扫描提交"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:234
 msgid "start walk at commits listed by stdin"
 msgstr "从标准输入中的提交开始扫描"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:236
 msgid "include all commits already in the commit-graph file"
 msgstr "包含 commit-graph 文件中已有所有提交"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:238
 msgid "enable computation for changed paths"
 msgstr "启用变更路径的计算"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:240
 msgid "allow writing an incremental commit-graph file"
 msgstr "允许写一个增量提交图文件"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:244
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "在非基本拆分提交图中的最大提交数"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:246
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "一个拆分提交图的两个级别之间的最大比率"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:248
 msgid "only expire files older than a given date-time"
 msgstr "只让早于给定时间的文件过期"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:250
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "要计算的变更路径布隆过滤器的最大数"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:276
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:307
 msgid "Collecting commits from input"
 msgstr "正从标准输入收集提交"
 
-#: builtin/commit-tree.c
+#: builtin/commit-tree.c:17
 msgid "git commit-tree <tree> [(-p <parent>)...]"
 msgstr "git commit-tree <树> [(-p <父提交>)...]"
 
-#: builtin/commit-tree.c
+#: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
 "                [(-F <file>)...] <tree>"
@@ -5638,61 +5767,62 @@ msgstr ""
 "git commit-tree [(-p <父提交>)...] [-S[<私钥 ID>]] [(-m <消息>)...]\n"
 "                [(-F <文件>)...] <树>"
 
-#: builtin/commit-tree.c
+#: builtin/commit-tree.c:31
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr "忽略重复的父提交 %s"
 
-#: builtin/commit-tree.c builtin/log.c
+#: builtin/commit-tree.c:48 builtin/commit-tree.c:127 builtin/log.c:697
 #, c-format
 msgid "not a valid object name %s"
 msgstr "不是一个有效的对象名 %s"
 
-#: builtin/commit-tree.c
+#: builtin/commit-tree.c:86
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree：无法读取 '%s'"
 
-#: builtin/commit-tree.c
+#: builtin/commit-tree.c:88
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree：无法关闭 '%s'"
 
-#: builtin/commit-tree.c
+#: builtin/commit-tree.c:101
 msgid "parent"
 msgstr "父提交"
 
-#: builtin/commit-tree.c
+#: builtin/commit-tree.c:102
 msgid "id of a parent commit object"
 msgstr "父提交对象 ID"
 
-#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c
-#: builtin/stash.c builtin/tag.c
+#: builtin/commit-tree.c:104 builtin/commit.c:1652 builtin/merge.c:269
+#: builtin/notes.c:484 builtin/notes.c:660 builtin/stash.c:1752
+#: builtin/tag.c:495
 msgid "message"
 msgstr "说明"
 
-#: builtin/commit-tree.c builtin/commit.c
+#: builtin/commit-tree.c:105 builtin/commit.c:1652
 msgid "commit message"
 msgstr "提交说明"
 
-#: builtin/commit-tree.c
+#: builtin/commit-tree.c:108
 msgid "read commit log message from file"
 msgstr "从文件中读取提交说明"
 
-#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c
-#: builtin/revert.c
+#: builtin/commit-tree.c:111 builtin/commit.c:1669 builtin/merge.c:288
+#: builtin/pull.c:182 builtin/revert.c:132
 msgid "GPG sign commit"
 msgstr "GPG 提交签名"
 
-#: builtin/commit-tree.c
+#: builtin/commit-tree.c:124
 msgid "must give exactly one tree"
 msgstr "必须精确地提供一个树"
 
-#: builtin/commit-tree.c
+#: builtin/commit-tree.c:131
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree：无法读取"
 
-#: builtin/commit.c
+#: builtin/commit.c:43
 msgid ""
 "git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
 "           [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|"
@@ -5714,11 +5844,11 @@ msgstr ""
 "           [(--trailer <键>[(=|:)<值>])...] [-S[<私钥 ID>]]\n"
 "           [--] [<路径规格>...]"
 
-#: builtin/commit.c
+#: builtin/commit.c:55
 msgid "git status [<options>] [--] [<pathspec>...]"
 msgstr "git status [<选项>] [--] [<路径规格>...]"
 
-#: builtin/commit.c
+#: builtin/commit.c:60
 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"
@@ -5727,7 +5857,7 @@ msgstr ""
 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:65
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -5741,15 +5871,15 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:72
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "否则，请使用 'git rebase --skip'\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:75
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "否则，请使用 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:78
 msgid ""
 "and then use:\n"
 "\n"
@@ -5770,128 +5900,129 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c read-cache.c
+#: builtin/commit.c:299 read-cache.c:3916
 msgid "updating files failed"
 msgstr "更新文件失败"
 
-#: builtin/commit.c
+#: builtin/commit.c:326
 msgid "failed to unpack HEAD tree object"
 msgstr "无法解包 HEAD 树对象"
 
-#: builtin/commit.c
+#: builtin/commit.c:377
 msgid "No paths with --include/--only does not make sense."
 msgstr "参数 --include/--only 不跟路径没有意义。"
 
-#: builtin/commit.c
+#: builtin/commit.c:390
 msgid "unable to create temporary index"
 msgstr "不能创建临时索引"
 
-#: builtin/commit.c
+#: builtin/commit.c:399
 msgid "interactive add failed"
 msgstr "交互式添加失败"
 
-#: builtin/commit.c
+#: builtin/commit.c:415
 msgid "unable to update temporary index"
 msgstr "无法更新临时索引"
 
-#: builtin/commit.c
+#: builtin/commit.c:417
 msgid "Failed to update main cache tree"
 msgstr "不能更新树的主缓存"
 
-#: builtin/commit.c
+#: builtin/commit.c:502
 msgid "cannot do a partial commit during a merge."
 msgstr "在合并过程中不能做部分提交。"
 
-#: builtin/commit.c
+#: builtin/commit.c:504
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在拣选过程中不能做部分提交。"
 
-#: builtin/commit.c
+#: builtin/commit.c:506
 msgid "cannot do a partial commit during a rebase."
 msgstr "在变基过程中不能做部分提交。"
 
-#: builtin/commit.c
+#: builtin/commit.c:514
 msgid "cannot read the index"
 msgstr "无法读取索引"
 
-#: builtin/commit.c
+#: builtin/commit.c:533
 msgid "unable to write temporary index file"
 msgstr "无法写临时索引文件"
 
-#: builtin/commit.c
+#: builtin/commit.c:631
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "提交 '%s' 缺少作者信息"
 
-#: builtin/commit.c
+#: builtin/commit.c:633
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "提交 '%s' 有格式错误的作者信息"
 
-#: builtin/commit.c
+#: builtin/commit.c:652
 msgid "malformed --author parameter"
 msgstr "格式错误的 --author 参数"
 
-#: builtin/commit.c ident.c
+#: builtin/commit.c:660 ident.c:531
 #, c-format
 msgid "invalid date format: %s"
 msgstr "无效的日期格式：%s"
 
-#: builtin/commit.c
+#: builtin/commit.c:706
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "无法选择一个未被当前提交说明使用的注释字符"
 
-#: builtin/commit.c
+#: builtin/commit.c:761 builtin/commit.c:796 builtin/commit.c:1200
 #, c-format
 msgid "could not lookup commit '%s'"
 msgstr "不能查询提交 '%s'"
 
-#: builtin/commit.c builtin/shortlog.c
+#: builtin/commit.c:774 builtin/shortlog.c:457
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正从标准输入中读取日志信息）\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:776
 msgid "could not read log from standard input"
 msgstr "不能从标准输入中读取日志信息"
 
-#: builtin/commit.c
+#: builtin/commit.c:780
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "不能读取日志文件 '%s'"
 
-#: builtin/commit.c
+#: builtin/commit.c:818
 #, c-format
 msgid "options '%s' and '%s:%s' cannot be used together"
 msgstr "选项 '%s' 和 '%s:%s' 不能同时使用"
 
-#: builtin/commit.c
+#: builtin/commit.c:830 builtin/commit.c:846
 msgid "could not read SQUASH_MSG"
 msgstr "不能读取 SQUASH_MSG"
 
-#: builtin/commit.c
+#: builtin/commit.c:837
 msgid "could not read MERGE_MSG"
 msgstr "不能读取 MERGE_MSG"
 
-#: builtin/commit.c bundle.c rerere.c sequencer.c
+#: builtin/commit.c:878 bundle.c:152 rerere.c:476 rerere.c:687 sequencer.c:2905
+#: sequencer.c:3691
 #, c-format
 msgid "could not open '%s'"
 msgstr "不能打开 '%s'"
 
-#: builtin/commit.c
+#: builtin/commit.c:897
 msgid "could not write commit template"
 msgstr "不能写提交模版"
 
-#: builtin/commit.c
+#: builtin/commit.c:910
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 "with '%s' will be ignored.\n"
 msgstr "请为您的变更输入提交说明。以 '%s' 开始的行将被忽略。\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:912
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5900,7 +6031,7 @@ msgstr ""
 "请为您的变更输入提交说明。以 '%s' 开始的行将被忽略，而一个空的提交\n"
 "说明将会终止提交。\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:916
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5909,7 +6040,7 @@ msgstr ""
 "请为您的变更输入提交说明。以 '%s' 开始的行将被保留，如果您愿意\n"
 "也可以删除它们。\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:920
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5919,7 +6050,7 @@ msgstr ""
 "请为您的变更输入提交说明。以 '%s' 开始的行将被保留，如果您愿意\n"
 "也可以删除它们。一个空的提交说明将会终止提交。\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:931
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -5932,7 +6063,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "然后重试。\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:936
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -5946,344 +6077,346 @@ msgstr ""
 "然后重试。\n"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c
+#: builtin/commit.c:963
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s作者：  %.*s <%.*s>"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c
+#: builtin/commit.c:971
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s日期：  %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c
+#: builtin/commit.c:978
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s提交者：%.*s <%.*s>"
 
-#: builtin/commit.c
+#: builtin/commit.c:996
 msgid "Cannot read index"
 msgstr "无法读取索引"
 
-#: builtin/commit.c
+#: builtin/commit.c:1035 builtin/tag.c:348
 msgid "unable to pass trailers to --trailers"
 msgstr "无法将尾注传递给 --trailers"
 
-#: builtin/commit.c
+#: builtin/commit.c:1075
 msgid "Error building trees"
 msgstr "无法创建树对象"
 
-#: builtin/commit.c builtin/tag.c
+#: builtin/commit.c:1089 builtin/tag.c:353
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:1135
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配"
 
-#: builtin/commit.c
+#: builtin/commit.c:1149
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "无效的忽略模式 '%s'"
 
-#: builtin/commit.c
+#: builtin/commit.c:1188 builtin/commit.c:1477
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "无效的未跟踪文件参数 '%s'"
 
-#: builtin/commit.c
+#: builtin/commit.c:1261
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "您正处于一个合并过程中 -- 无法改写说明。"
 
-#: builtin/commit.c
+#: builtin/commit.c:1263
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr "您正处于一个拣选过程中 -- 无法改写说明。"
 
-#: builtin/commit.c
+#: builtin/commit.c:1266
 #, c-format
 msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr "改写说明选项 '%s' 和路径 '%s' 不能同时使用"
 
-#: builtin/commit.c
+#: builtin/commit.c:1268
 #, c-format
 msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr "改写说明选项 '%s' 和 '%s' 不能同时使用"
 
-#: builtin/commit.c
+#: builtin/commit.c:1293
 msgid "You have nothing to amend."
 msgstr "您没有可修补的提交。"
 
-#: builtin/commit.c
+#: builtin/commit.c:1296
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
 
-#: builtin/commit.c
+#: builtin/commit.c:1298
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
 
-#: builtin/commit.c
+#: builtin/commit.c:1300
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "您正处于一个变基过程中 -- 无法修补提交。"
 
-#: builtin/commit.c
+#: builtin/commit.c:1320
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
 
-#: builtin/commit.c
+#: builtin/commit.c:1367
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "未知选项：--fixup=%s:%s"
 
-#: builtin/commit.c
+#: builtin/commit.c:1384
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "路径  '%s ...' 和 -a 选项同时使用没有意义"
 
-#: builtin/commit.c
+#: builtin/commit.c:1513 builtin/commit.c:1680
 msgid "show status concisely"
 msgstr "以简洁的格式显示状态"
 
-#: builtin/commit.c
+#: builtin/commit.c:1515 builtin/commit.c:1682
 msgid "show branch information"
 msgstr "显示分支信息"
 
-#: builtin/commit.c
+#: builtin/commit.c:1517
 msgid "show stash information"
 msgstr "显示贮藏区信息"
 
-#: builtin/commit.c
+#: builtin/commit.c:1519 builtin/commit.c:1684
 msgid "compute full ahead/behind values"
 msgstr "计算完整的领先/落后值"
 
-#: builtin/commit.c
+#: builtin/commit.c:1521
 msgid "version"
 msgstr "版本"
 
-#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c
+#: builtin/commit.c:1521 builtin/commit.c:1686 builtin/fetch.c:2201
+#: builtin/push.c:571 builtin/worktree.c:1044
 msgid "machine-readable output"
 msgstr "机器可读的输出"
 
-#: builtin/commit.c
+#: builtin/commit.c:1524 builtin/commit.c:1688
 msgid "show status in long format (default)"
 msgstr "以长格式显示状态（默认）"
 
-#: builtin/commit.c
+#: builtin/commit.c:1527 builtin/commit.c:1691
 msgid "terminate entries with NUL"
 msgstr "条目以 NUL 字符结尾"
 
-#: builtin/commit.c
+#: builtin/commit.c:1530 builtin/commit.c:1694
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
 
-#: builtin/commit.c
+#: builtin/commit.c:1534
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）"
 
-#: builtin/commit.c parse-options.h
+#: builtin/commit.c:1536 parse-options.h:338
 msgid "when"
 msgstr "何时"
 
-#: builtin/commit.c
+#: builtin/commit.c:1537
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
 
-#: builtin/commit.c
+#: builtin/commit.c:1539
 msgid "list untracked files in columns"
 msgstr "以列的方式显示未跟踪的文件"
 
-#: builtin/commit.c
+#: builtin/commit.c:1540
 msgid "do not detect renames"
 msgstr "不检测重命名"
 
-#: builtin/commit.c
+#: builtin/commit.c:1542
 msgid "detect renames, optionally set similarity index"
 msgstr "检测重命名，可以设置索引相似度"
 
-#: builtin/commit.c
+#: builtin/commit.c:1565
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "不支持已忽略和未跟踪文件参数的组合"
 
-#: builtin/commit.c
+#: builtin/commit.c:1645
 msgid "suppress summary after successful commit"
 msgstr "提交成功后不显示概述信息"
 
-#: builtin/commit.c
+#: builtin/commit.c:1646
 msgid "show diff in commit message template"
 msgstr "在提交说明模板里显示差异"
 
-#: builtin/commit.c
+#: builtin/commit.c:1648
 msgid "Commit message options"
 msgstr "提交说明选项"
 
-#: builtin/commit.c builtin/merge.c builtin/tag.c
+#: builtin/commit.c:1649 builtin/merge.c:273 builtin/tag.c:497
 msgid "read message from file"
 msgstr "从文件中读取提交说明"
 
-#: builtin/commit.c
+#: builtin/commit.c:1650
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c
+#: builtin/commit.c:1650
 msgid "override author for commit"
 msgstr "提交时覆盖作者"
 
-#: builtin/commit.c builtin/gc.c
+#: builtin/commit.c:1651 builtin/gc.c:627
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c
+#: builtin/commit.c:1651
 msgid "override date for commit"
 msgstr "提交时覆盖日期"
 
-#: builtin/commit.c parse-options.h ref-filter.h
+#: builtin/commit.c:1653 builtin/commit.c:1654 builtin/commit.c:1660
+#: parse-options.h:571 ref-filter.h:121
 msgid "commit"
 msgstr "提交"
 
-#: builtin/commit.c
+#: builtin/commit.c:1653
 msgid "reuse and edit message from specified commit"
 msgstr "重用并编辑指定提交的提交说明"
 
-#: builtin/commit.c
+#: builtin/commit.c:1654
 msgid "reuse message from specified commit"
 msgstr "重用指定提交的提交说明"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c
+#: builtin/commit.c:1659
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]提交"
 
-#: builtin/commit.c
+#: builtin/commit.c:1659
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明"
 
-#: builtin/commit.c
+#: builtin/commit.c:1660
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交"
 
-#: builtin/commit.c
+#: builtin/commit.c:1661
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
 
-#: builtin/commit.c builtin/interpret-trailers.c
+#: builtin/commit.c:1662 builtin/interpret-trailers.c:213 builtin/tag.c:498
 msgid "trailer"
 msgstr "尾注"
 
-#: builtin/commit.c
+#: builtin/commit.c:1662 builtin/tag.c:499
 msgid "add custom trailer(s)"
 msgstr "添加自定义尾注"
 
-#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c
-#: builtin/revert.c
+#: builtin/commit.c:1663 builtin/log.c:2038 builtin/merge.c:291
+#: builtin/pull.c:148 builtin/revert.c:124
 msgid "add a Signed-off-by trailer"
 msgstr "添加 Signed-off-by 尾注"
 
-#: builtin/commit.c
+#: builtin/commit.c:1664
 msgid "use specified template file"
 msgstr "使用指定的模板文件"
 
-#: builtin/commit.c
+#: builtin/commit.c:1665
 msgid "force edit of commit"
 msgstr "强制编辑提交"
 
-#: builtin/commit.c
+#: builtin/commit.c:1667
 msgid "include status in commit message template"
 msgstr "在提交说明模板里包含状态信息"
 
-#: builtin/commit.c
+#: builtin/commit.c:1672
 msgid "Commit contents options"
 msgstr "提交内容选项"
 
-#: builtin/commit.c
+#: builtin/commit.c:1673
 msgid "commit all changed files"
 msgstr "提交所有改动的文件"
 
-#: builtin/commit.c
+#: builtin/commit.c:1674
 msgid "add specified files to index for commit"
 msgstr "添加指定的文件到索引区等待提交"
 
-#: builtin/commit.c
+#: builtin/commit.c:1675
 msgid "interactively add files"
 msgstr "交互式添加文件"
 
-#: builtin/commit.c
+#: builtin/commit.c:1676
 msgid "interactively add changes"
 msgstr "交互式添加变更"
 
-#: builtin/commit.c
+#: builtin/commit.c:1677
 msgid "commit only specified files"
 msgstr "只提交指定的文件"
 
-#: builtin/commit.c
+#: builtin/commit.c:1678
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "绕过 pre-commit 和 commit-msg 钩子"
 
-#: builtin/commit.c
+#: builtin/commit.c:1679
 msgid "show what would be committed"
 msgstr "显示将要提交的内容"
 
-#: builtin/commit.c
+#: builtin/commit.c:1692
 msgid "amend previous commit"
 msgstr "修改先前的提交"
 
-#: builtin/commit.c
+#: builtin/commit.c:1693
 msgid "bypass post-rewrite hook"
 msgstr "绕过 post-rewrite 钩子"
 
-#: builtin/commit.c
+#: builtin/commit.c:1700
 msgid "ok to record an empty change"
 msgstr "允许一个空提交"
 
-#: builtin/commit.c
+#: builtin/commit.c:1702
 msgid "ok to record a change with an empty message"
 msgstr "允许空的提交说明"
 
-#: builtin/commit.c sequencer.c
+#: builtin/commit.c:1734 sequencer.c:1521 sequencer.c:1601
 msgid "could not parse HEAD commit"
 msgstr "不能解析 HEAD 提交"
 
-#: builtin/commit.c
+#: builtin/commit.c:1780
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "损坏的 MERGE_HEAD 文件（%s）"
 
-#: builtin/commit.c
+#: builtin/commit.c:1787
 msgid "could not read MERGE_MODE"
 msgstr "不能读取 MERGE_MODE"
 
-#: builtin/commit.c
+#: builtin/commit.c:1808
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "不能读取提交说明：%s"
 
-#: builtin/commit.c
+#: builtin/commit.c:1815
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止提交因为提交说明为空。\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:1820
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "终止提交；您未更改来自模版的提交说明。\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:1831
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "因提交说明的正文为空而终止提交。\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:1865
 msgid ""
 "repository has been updated, but unable to write\n"
 "new index file. Check that disk is not full and quota is\n"
@@ -6292,234 +6425,207 @@ msgstr ""
 "仓库已更新，但无法写入索引文件。检查是否磁盘已满或\n"
 "磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。"
 
-#: builtin/config.c
-msgid "git config [<options>]"
-msgstr "git config [<选项>]"
+#: builtin/config.c:19 builtin/config.c:31
+msgid "git config list [<file-option>] [<display-option>] [--includes]"
+msgstr "git config list [<文件选项>] [<显示选项>] [--includes]"
 
-#: builtin/config.c
-#, c-format
-msgid "unrecognized --type argument, %s"
-msgstr "未能识别的 --type 参数，%s"
+#: builtin/config.c:20 builtin/config.c:36
+msgid ""
+"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
+"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
+"<name>"
+msgstr ""
+"git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp=<正则"
+"表达式>] [--value=<值>] [--fixed-value] [--default=<默认值>] <名称>"
 
-#: builtin/config.c
-msgid "only one type at a time"
-msgstr "一次只能一个类型"
+#: builtin/config.c:21
+msgid ""
+"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
+"fixed-value] <name> <value>"
+msgstr ""
+"git config set [<文件选项>] [--type=<类型>] [--all] [--value=<值>] [--fixed-"
+"value] <名称> <值>"
+
+#: builtin/config.c:22 builtin/config.c:46
+msgid ""
+"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
+"<name> <value>"
+msgstr ""
+"git config unset [<文件选项>] [--all] [--value=<值>] [--fixed-value] <名称> <"
+"值>"
+
+#: builtin/config.c:23 builtin/config.c:51
+msgid "git config rename-section [<file-option>] <old-name> <new-name>"
+msgstr "git config rename-section [<文件选项>] <旧名称> <新名称>"
+
+#: builtin/config.c:24 builtin/config.c:56
+msgid "git config remove-section [<file-option>] <name>"
+msgstr "git config remove-section [<文件选项>] <名称>"
+
+#: builtin/config.c:25 builtin/config.c:61
+msgid "git config edit [<file-option>]"
+msgstr "git config edit [<文件选项>]"
+
+#: builtin/config.c:26
+msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"
+msgstr "git config [<文件选项>] --get-colorbool <名称> [<标准输出为 tty>]"
 
-#: builtin/config.c
+#: builtin/config.c:41
+msgid ""
+"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
+"[--value=<value>] [--fixed-value] <name> <value>"
+msgstr ""
+"git config set [<文件选项>] [--type=<类型>] [--comment=<消息>] [--all] [--"
+"value=<值>] [--fixed-value] <名称> <值>"
+
+#: builtin/config.c:66
 msgid "Config file location"
 msgstr "配置文件位置"
 
-#: builtin/config.c
+#: builtin/config.c:67
 msgid "use global config file"
 msgstr "使用全局配置文件"
 
-#: builtin/config.c
+#: builtin/config.c:68
 msgid "use system config file"
 msgstr "使用系统级配置文件"
 
-#: builtin/config.c
+#: builtin/config.c:69
 msgid "use repository config file"
 msgstr "使用仓库级配置文件"
 
-#: builtin/config.c
+#: builtin/config.c:70
 msgid "use per-worktree config file"
 msgstr "使用工作区级别的配置文件"
 
-#: builtin/config.c builtin/gc.c
+#: builtin/config.c:71 builtin/gc.c:1526 builtin/gc.c:1591
 msgid "use given config file"
 msgstr "使用指定的配置文件"
 
-#: builtin/config.c
+#: builtin/config.c:72
 msgid "blob-id"
 msgstr "数据对象 ID"
 
-#: builtin/config.c
+#: builtin/config.c:72
 msgid "read config from given blob object"
 msgstr "从给定的数据对象读取配置"
 
-#: builtin/config.c
-msgid "Action"
-msgstr "操作"
-
-#: builtin/config.c
-msgid "get value: name [value-pattern]"
-msgstr "获取值：名称 [值模式]"
-
-#: builtin/config.c
-msgid "get all values: key [value-pattern]"
-msgstr "获得所有的值：键 [值模式]"
-
-#: builtin/config.c
-msgid "get values for regexp: name-regex [value-pattern]"
-msgstr "根据正则表达式获得值：名称正则 [值模式]"
-
-#: builtin/config.c
-msgid "get value specific for the URL: section[.var] URL"
-msgstr "获得 URL 取值：section[.var] URL"
-
-#: builtin/config.c
-msgid "replace all matching variables: name value [value-pattern]"
-msgstr "替换所有匹配的变量：名称 值 [值模式]"
-
-#: builtin/config.c
-msgid "add a new variable: name value"
-msgstr "添加一个新的变量：名称 值"
-
-#: builtin/config.c
-msgid "remove a variable: name [value-pattern]"
-msgstr "删除一个变量：名称 [值模式]"
-
-#: builtin/config.c
-msgid "remove all matches: name [value-pattern]"
-msgstr "删除所有匹配项：名称 [值模式]"
-
-#: builtin/config.c
-msgid "rename section: old-name new-name"
-msgstr "重命名小节：old-name new-name"
-
-#: builtin/config.c
-msgid "remove a section: name"
-msgstr "删除一个小节：name"
-
-#: builtin/config.c
-msgid "list all"
-msgstr "列出所有"
-
-#: builtin/config.c
-msgid "use string equality when comparing values to 'value-pattern'"
-msgstr "在比较值与 '值模式' 时，使用字符串字面比较"
-
-#: builtin/config.c
-msgid "open an editor"
-msgstr "打开一个编辑器"
-
-#: builtin/config.c
-msgid "find the color configured: slot [default]"
-msgstr "获得配置的颜色：配置 [默认]"
-
-#: builtin/config.c
-msgid "find the color setting: slot [stdout-is-tty]"
-msgstr "获得颜色设置：配置 [stdout-is-tty]"
-
-#: builtin/config.c
+#: builtin/config.c:89
 msgid "Type"
 msgstr "类型"
 
-#: builtin/config.c builtin/hash-object.c
+#: builtin/config.c:90 builtin/hash-object.c:105
 msgid "type"
 msgstr "类型"
 
-#: builtin/config.c
+#: builtin/config.c:90
 msgid "value is given this type"
 msgstr "取值为该类型"
 
-#: builtin/config.c
+#: builtin/config.c:91
 msgid "value is \"true\" or \"false\""
 msgstr "值是 \"true\" 或 \"false\""
 
-#: builtin/config.c
+#: builtin/config.c:92
 msgid "value is decimal number"
 msgstr "值是十进制数"
 
-#: builtin/config.c
+#: builtin/config.c:93
 msgid "value is --bool or --int"
 msgstr "值是 --bool 或 --int"
 
-#: builtin/config.c
+#: builtin/config.c:94
 msgid "value is --bool or string"
 msgstr "值是 --bool 或字符串"
 
-#: builtin/config.c
+#: builtin/config.c:95
 msgid "value is a path (file or directory name)"
 msgstr "值是一个路径（文件或目录名）"
 
-#: builtin/config.c
+#: builtin/config.c:96
 msgid "value is an expiry date"
 msgstr "值是一个到期日期"
 
-#: builtin/config.c
-msgid "Other"
-msgstr "其它"
+#: builtin/config.c:99
+msgid "Display options"
+msgstr "显示选项"
 
-#: builtin/config.c
+#: builtin/config.c:100
 msgid "terminate values with NUL byte"
 msgstr "终止值是 NUL 字节"
 
-#: builtin/config.c
+#: builtin/config.c:101
 msgid "show variable names only"
 msgstr "只显示变量名"
 
-#: builtin/config.c
-msgid "respect include directives on lookup"
-msgstr "查询时参照 include 指令递归查找"
-
-#: builtin/config.c
+#: builtin/config.c:102
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
 
-#: builtin/config.c
+#: builtin/config.c:103
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr "显示配置的作用域（工作区、本地、全局、系统、命令）"
 
-#: builtin/config.c
-msgid "value"
-msgstr "取值"
+#: builtin/config.c:104
+msgid "show config keys in addition to their values"
+msgstr "显示配置键及其值"
 
-#: builtin/config.c
-msgid "with --get, use default value when missing entry"
-msgstr "使用 --get 参数，当缺少设置时使用默认值"
+#: builtin/config.c:169
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "未能识别的 --type 参数，%s"
 
-#: builtin/config.c
-msgid "human-readable comment string (# will be prepended as needed)"
-msgstr "人类可读的注释字符串（# 将根据需要添加到前面）"
+#: builtin/config.c:181
+msgid "only one type at a time"
+msgstr "一次只能一个类型"
 
-#: builtin/config.c
+#: builtin/config.c:194
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "错误的参数个数，应该为 %d 个"
 
-#: builtin/config.c
+#: builtin/config.c:196
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "错误的参数个数，应该为从 %d 个到 %d 个"
 
-#: builtin/config.c
+#: builtin/config.c:396
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "无效键名模式：%s"
 
-#: builtin/config.c config.c
+#: builtin/config.c:420 config.c:3376
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "无效模式：%s"
 
-#: builtin/config.c
+#: builtin/config.c:441
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "无法格式化默认配置值：%s"
 
-#: builtin/config.c
+#: builtin/config.c:506
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "无法解析颜色 '%s'"
 
-#: builtin/config.c
+#: builtin/config.c:557
 msgid "unable to parse default color value"
 msgstr "无法解析默认颜色值"
 
-#: builtin/config.c
+#: builtin/config.c:622 builtin/config.c:1076
 msgid "not in a git directory"
 msgstr "不在 git 仓库中"
 
-#: builtin/config.c
+#: builtin/config.c:625
 msgid "writing to stdin is not supported"
 msgstr "不支持写到标准输入"
 
-#: builtin/config.c
+#: builtin/config.c:628
 msgid "writing config blobs is not supported"
 msgstr "不支持写到配置数据对象"
 
-#: builtin/config.c
+#: builtin/config.c:723
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -6534,27 +6640,27 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c
+#: builtin/config.c:743
 msgid "only one config file at a time"
 msgstr "一次只能有一个配置文件"
 
-#: builtin/config.c
+#: builtin/config.c:749
 msgid "--local can only be used inside a git repository"
 msgstr "--local 只能在 git 仓库内使用"
 
-#: builtin/config.c
+#: builtin/config.c:751
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob 只能在 git 仓库内使用"
 
-#: builtin/config.c
+#: builtin/config.c:753
 msgid "--worktree can only be used inside a git repository"
 msgstr "--worktree 只能在 git 仓库内使用"
 
-#: builtin/config.c builtin/gc.c
+#: builtin/config.c:772 builtin/gc.c:1566 builtin/gc.c:1634
 msgid "$HOME not set"
 msgstr "$HOME 未设置"
 
-#: builtin/config.c
+#: builtin/config.c:786
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -6563,59 +6669,99 @@ msgstr ""
 "不能和多个工作区一起使用 --worktree，除非启用 worktreeConfig 配置扩展。\n"
 "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
 
-#: builtin/config.c
-msgid "--get-color and variable type are incoherent"
-msgstr "--get-color 和变量类型不兼容"
+#: builtin/config.c:836 builtin/config.c:880 builtin/config.c:931
+#: builtin/config.c:1165
+msgid "Other"
+msgstr "其它"
 
-#: builtin/config.c
-msgid "only one action at a time"
-msgstr "一次只能有一个动作"
+#: builtin/config.c:838 builtin/config.c:882 builtin/config.c:1171
+msgid "respect include directives on lookup"
+msgstr "查询时参照 include 指令递归查找"
 
-#: builtin/config.c
-msgid "--name-only is only applicable to --list or --get-regexp"
-msgstr "--name-only 仅适用于 --list 或 --get-regexp"
+#: builtin/config.c:854 builtin/config.c:1272
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "无法读取配置文件 '%s'"
 
-#: builtin/config.c
-msgid ""
-"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
-"list"
-msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
+#: builtin/config.c:857 builtin/config.c:1275
+msgid "error processing config file(s)"
+msgstr "处理配置文件出错"
 
-#: builtin/config.c
-msgid "--default is only applicable to --get"
-msgstr "--default 仅适用于 --get"
+#: builtin/config.c:873
+msgid "Filter options"
+msgstr "过滤选项"
 
-#: builtin/config.c
-msgid "--comment is only applicable to add/set/replace operations"
-msgstr "--comment 仅适用于 add/set/replace 操作"
+#: builtin/config.c:874
+msgid "return all values for multi-valued config options"
+msgstr "返回多值配置选项的所有值"
+
+#: builtin/config.c:875
+msgid "interpret the name as a regular expression"
+msgstr "将名称解释为正则表达式"
+
+#: builtin/config.c:876 builtin/config.c:929 builtin/config.c:985
+msgid "show config with values matching the pattern"
+msgstr "显示具有与模式匹配的值的配置"
+
+#: builtin/config.c:877 builtin/config.c:930 builtin/config.c:986
+#: builtin/config.c:1169
+msgid "use string equality when comparing values to value pattern"
+msgstr "在将值与值模式进行比较时使用字符串相等性"
+
+#: builtin/config.c:878
+msgid "URL"
+msgstr "URL"
+
+#: builtin/config.c:878
+msgid "show config matching the given URL"
+msgstr "显示与给定 URL 匹配的配置"
 
-#: builtin/config.c
+#: builtin/config.c:884 builtin/config.c:932 builtin/config.c:1167
+#: builtin/config.c:1168
+msgid "value"
+msgstr "取值"
+
+#: builtin/config.c:884
+msgid "use default value when missing entry"
+msgstr "缺少条目时使用默认值"
+
+#: builtin/config.c:894 builtin/config.c:996 builtin/config.c:1252
 msgid "--fixed-value only applies with 'value-pattern'"
 msgstr "--fixed-value 仅适用于有 '值模式'"
 
-#: builtin/config.c
-#, c-format
-msgid "unable to read config file '%s'"
-msgstr "无法读取配置文件 '%s'"
+#: builtin/config.c:897
+msgid "--default= cannot be used with --all or --url="
+msgstr "--default= 不能与 --all 或 --url= 一起使用"
 
-#: builtin/config.c
-msgid "error processing config file(s)"
-msgstr "处理配置文件出错"
+#: builtin/config.c:901
+msgid "--url= cannot be used with --all, --regexp or --value"
+msgstr "--url= 不能与 --all、--regexp 或 --value 一起使用"
 
-#: builtin/config.c
-msgid "editing stdin is not supported"
-msgstr "不支持编辑标准输入"
+#: builtin/config.c:927 builtin/config.c:983
+msgid "Filter"
+msgstr "过滤器"
 
-#: builtin/config.c
-msgid "editing blobs is not supported"
-msgstr "不支持编辑数据对象"
+#: builtin/config.c:928 builtin/config.c:984
+msgid "replace multi-valued config option with new value"
+msgstr "将多值配置选项替换为新值"
 
-#: builtin/config.c
-#, c-format
-msgid "cannot create configuration file %s"
-msgstr "不能创建配置文件 %s"
+#: builtin/config.c:932 builtin/config.c:1168
+msgid "human-readable comment string (# will be prepended as needed)"
+msgstr "人类可读的注释字符串（# 将根据需要添加到前面）"
+
+#: builtin/config.c:933
+msgid "add a new line without altering any existing values"
+msgstr "添加新行而不更改任何现有值"
+
+#: builtin/config.c:945
+msgid "--fixed-value only applies with --value=<pattern>"
+msgstr "--fixed-value only applies with --value=<pattern>"
 
-#: builtin/config.c
+#: builtin/config.c:947
+msgid "--append cannot be used with --value=<pattern>"
+msgstr "--append 不能与 --value=<pattern> 一起使用"
+
+#: builtin/config.c:966 builtin/config.c:1287
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -6624,16 +6770,120 @@ msgstr ""
 "无法用一个值覆盖多个值\n"
 "       使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
 
-#: builtin/config.c
+#: builtin/config.c:1034 builtin/config.c:1063 builtin/config.c:1361
+#: builtin/config.c:1373
 #, c-format
 msgid "no such section: %s"
 msgstr "无此小节：%s"
 
-#: builtin/count-objects.c
+#: builtin/config.c:1078
+msgid "editing stdin is not supported"
+msgstr "不支持编辑标准输入"
+
+#: builtin/config.c:1080
+msgid "editing blobs is not supported"
+msgstr "不支持编辑数据对象"
+
+#: builtin/config.c:1094
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "不能创建配置文件 %s"
+
+#: builtin/config.c:1149
+msgid "Action"
+msgstr "操作"
+
+#: builtin/config.c:1150
+msgid "get value: name [<value-pattern>]"
+msgstr "获取值：name [<值模式>]"
+
+#: builtin/config.c:1151
+msgid "get all values: key [<value-pattern>]"
+msgstr "获取所有值：key [<值模式>]"
+
+#: builtin/config.c:1152
+msgid "get values for regexp: name-regex [<value-pattern>]"
+msgstr "获取正则表达式的值：name-regex [<值模式>]"
+
+#: builtin/config.c:1153
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "获得 URL 取值：section[.var] URL"
+
+#: builtin/config.c:1154
+msgid "replace all matching variables: name value [<value-pattern>]"
+msgstr "替换所有匹配的变量：name value [<值模式>]"
+
+#: builtin/config.c:1155
+msgid "add a new variable: name value"
+msgstr "添加一个新的变量：名称 值"
+
+#: builtin/config.c:1156
+msgid "remove a variable: name [<value-pattern>]"
+msgstr "删除一个变量：名称 [<值模式>]"
+
+#: builtin/config.c:1157
+msgid "remove all matches: name [<value-pattern>]"
+msgstr "删除所有匹配项：名称 [<值模式>]"
+
+#: builtin/config.c:1158
+msgid "rename section: old-name new-name"
+msgstr "重命名小节：old-name new-name"
+
+#: builtin/config.c:1159
+msgid "remove a section: name"
+msgstr "删除一个小节：name"
+
+#: builtin/config.c:1160
+msgid "list all"
+msgstr "列出所有"
+
+#: builtin/config.c:1161
+msgid "open an editor"
+msgstr "打开一个编辑器"
+
+#: builtin/config.c:1162
+msgid "find the color configured: slot [<default>]"
+msgstr "找到配置的颜色：slot [<默认>]"
+
+#: builtin/config.c:1163
+msgid "find the color setting: slot [<stdout-is-tty>]"
+msgstr "找到颜色设置：slot [<stdout-is-tty>]"
+
+#: builtin/config.c:1167
+msgid "with --get, use default value when missing entry"
+msgstr "使用 --get 参数，当缺少设置时使用默认值"
+
+#: builtin/config.c:1186
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color 和变量类型不兼容"
+
+#: builtin/config.c:1196
+msgid "no action specified"
+msgstr "未指定任何操作"
+
+#: builtin/config.c:1201
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr "--name-only 仅适用于 --list 或 --get-regexp"
+
+#: builtin/config.c:1207
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
+
+#: builtin/config.c:1213
+msgid "--default is only applicable to --get"
+msgstr "--default 仅适用于 --get"
+
+#: builtin/config.c:1219
+msgid "--comment is only applicable to add/set/replace operations"
+msgstr "--comment 仅适用于 add/set/replace 操作"
+
+#: builtin/count-objects.c:104
 msgid "print sizes in human readable format"
 msgstr "以用户可读的格式显示大小"
 
-#: builtin/credential-cache--daemon.c
+#: builtin/credential-cache--daemon.c:253
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -6646,77 +6896,78 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c
+#: builtin/credential-cache--daemon.c:302
 msgid "print debugging messages to stderr"
 msgstr "输出调试信息到标准错误"
 
-#: builtin/credential-cache--daemon.c
+#: builtin/credential-cache--daemon.c:312
+#: builtin/credential-cache--daemon.c:344
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr "credential-cache--daemon 不可用，不支持 unix 套接字"
 
-#: builtin/credential-cache.c
+#: builtin/credential-cache.c:161 builtin/credential-cache.c:195
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache 不可用，不支持 unix 套接字"
 
-#: builtin/credential-store.c
+#: builtin/credential-store.c:70
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr "无法在 %d ms 获得凭证存储锁"
 
-#: builtin/describe.c
+#: builtin/describe.c:30
 msgid ""
 "git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]"
 msgstr ""
 "git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<提交号>...]"
 
-#: builtin/describe.c
+#: builtin/describe.c:31
 msgid ""
 "git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]"
 msgstr ""
 "git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<标记>]"
 
-#: builtin/describe.c
+#: builtin/describe.c:32
 msgid "git describe <blob>"
 msgstr "git describe <数据对象>"
 
-#: builtin/describe.c
+#: builtin/describe.c:72
 msgid "head"
 msgstr "头"
 
-#: builtin/describe.c
+#: builtin/describe.c:72
 msgid "lightweight"
 msgstr "轻量级的"
 
-#: builtin/describe.c
+#: builtin/describe.c:72
 msgid "annotated"
 msgstr "附注的"
 
-#: builtin/describe.c
+#: builtin/describe.c:287
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "附注标签 %s 无效"
 
-#: builtin/describe.c
+#: builtin/describe.c:291
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "标签 '%s' 在外部被认为是 '%s'"
 
-#: builtin/describe.c
+#: builtin/describe.c:339
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "没有标签准确匹配 '%s'"
 
-#: builtin/describe.c
+#: builtin/describe.c:341
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n"
 
-#: builtin/describe.c
+#: builtin/describe.c:408
 #, c-format
 msgid "finished search at %s\n"
 msgstr "完成搜索 %s\n"
 
-#: builtin/describe.c
+#: builtin/describe.c:435
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -6725,7 +6976,7 @@ msgstr ""
 "没有附注标签能描述 '%s'。\n"
 "然而，存在未附注标签：尝试 --tags。"
 
-#: builtin/describe.c
+#: builtin/describe.c:439
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -6734,12 +6985,12 @@ msgstr ""
 "没有标签能描述 '%s'。\n"
 "尝试 --always，或者创建一些标签。"
 
-#: builtin/describe.c
+#: builtin/describe.c:469
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "已遍历 %lu 个提交\n"
 
-#: builtin/describe.c
+#: builtin/describe.c:472
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -6748,87 +6999,87 @@ msgstr ""
 "发现多于 %i 个标签，列出最近的 %i 个\n"
 "在 %s 放弃搜索\n"
 
-#: builtin/describe.c
+#: builtin/describe.c:541
 #, c-format
 msgid "describe %s\n"
 msgstr "描述 %s\n"
 
-#: builtin/describe.c
+#: builtin/describe.c:544
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "不是一个有效的对象名 %s"
 
-#: builtin/describe.c
+#: builtin/describe.c:552
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s 既不是提交也不是数据对象"
 
-#: builtin/describe.c
+#: builtin/describe.c:577
 msgid "find the tag that comes after the commit"
 msgstr "寻找该提交之后的标签"
 
-#: builtin/describe.c
+#: builtin/describe.c:578
 msgid "debug search strategy on stderr"
 msgstr "在标准错误上调试搜索策略"
 
-#: builtin/describe.c
+#: builtin/describe.c:579
 msgid "use any ref"
 msgstr "使用任意引用"
 
-#: builtin/describe.c
+#: builtin/describe.c:580
 msgid "use any tag, even unannotated"
 msgstr "使用任意标签，即使未附带注释"
 
-#: builtin/describe.c
+#: builtin/describe.c:581
 msgid "always use long format"
 msgstr "始终使用长提交号格式"
 
-#: builtin/describe.c
+#: builtin/describe.c:582
 msgid "only follow first parent"
 msgstr "只跟随第一个父提交"
 
-#: builtin/describe.c
+#: builtin/describe.c:585
 msgid "only output exact matches"
 msgstr "只输出精确匹配"
 
-#: builtin/describe.c
+#: builtin/describe.c:588
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "考虑最近 <n> 个标签（默认：10）"
 
-#: builtin/describe.c
+#: builtin/describe.c:590
 msgid "only consider tags matching <pattern>"
 msgstr "只考虑匹配 <模式> 的标签"
 
-#: builtin/describe.c
+#: builtin/describe.c:592
 msgid "do not consider tags matching <pattern>"
 msgstr "不考虑匹配 <模式> 的标签"
 
-#: builtin/describe.c builtin/name-rev.c
+#: builtin/describe.c:594 builtin/name-rev.c:584
 msgid "show abbreviated commit object as fallback"
 msgstr "显示简写的提交号作为后备"
 
-#: builtin/describe.c
+#: builtin/describe.c:595 builtin/describe.c:598
 msgid "mark"
 msgstr "标记"
 
-#: builtin/describe.c
+#: builtin/describe.c:596
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
 
-#: builtin/describe.c
+#: builtin/describe.c:599
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
 
-#: builtin/describe.c
+#: builtin/describe.c:647
 msgid "No names found, cannot describe anything."
 msgstr "没有发现名称，无法描述任何东西。"
 
-#: builtin/describe.c
+#: builtin/describe.c:710 builtin/describe.c:712
 #, c-format
 msgid "option '%s' and commit-ishes cannot be used together"
 msgstr "选项 '%s' 和提交号不能同时使用"
 
-#: builtin/diagnose.c
+#: builtin/diagnose.c:9
 msgid ""
 "git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"
 "             [--mode=<mode>]"
@@ -6836,85 +7087,85 @@ msgstr ""
 "git diagnose [(-o | --output-directory) <路径>] [(-s | --suffix) <格式>]\n"
 "             [--mode=<模式>]"
 
-#: builtin/diagnose.c
+#: builtin/diagnose.c:26
 msgid "specify a destination for the diagnostics archive"
 msgstr "指定诊断归档包的目标位置"
 
-#: builtin/diagnose.c
+#: builtin/diagnose.c:28
 msgid "specify a strftime format suffix for the filename"
 msgstr "指定文件的 strftime 格式后缀"
 
-#: builtin/diagnose.c
+#: builtin/diagnose.c:30
 msgid "specify the content of the diagnostic archive"
 msgstr "指定诊断信息归档包的内容"
 
-#: builtin/diff-tree.c
+#: builtin/diff-tree.c:165
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base 仅适用于两个提交"
 
-#: builtin/diff.c
+#: builtin/diff.c:95
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s'：不是一个普通文件或符号链接"
 
-#: builtin/diff.c
+#: builtin/diff.c:220
 msgid "no merge given, only parents."
 msgstr "没有给出合并，只有父提交。"
 
-#: builtin/diff.c
+#: builtin/diff.c:265
 #, c-format
 msgid "invalid option: %s"
 msgstr "无效选项：%s"
 
-#: builtin/diff.c
+#: builtin/diff.c:384
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr "%s...%s：无合并基线"
 
-#: builtin/diff.c
+#: builtin/diff.c:508
 msgid "Not a git repository"
 msgstr "不是 git 仓库"
 
-#: builtin/diff.c builtin/grep.c
+#: builtin/diff.c:554 builtin/grep.c:749
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "提供了无效对象 '%s'。"
 
-#: builtin/diff.c
+#: builtin/diff.c:570
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "提供了超过两个数据对象：'%s'"
 
-#: builtin/diff.c
+#: builtin/diff.c:575
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "无法处理的对象 '%s'。"
 
-#: builtin/diff.c
+#: builtin/diff.c:609
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s：多条合并基线，使用 %s"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:38
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:298
 #, c-format
 msgid "could not read symlink %s"
 msgstr "无法读取符号链接 %s"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:300
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "无法读取符号链接文件 %s"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:309
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:431
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -6922,294 +7173,296 @@ msgstr ""
 "不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
 "cc'）。"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:637
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "两个文件都被修改：'%s' 和 '%s'。"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:639
 msgid "working tree file has been left."
 msgstr "工作区文件被留了下来。"
 
-#: builtin/difftool.c sequencer.c
+#: builtin/difftool.c:644 sequencer.c:2410 sequencer.c:3786 sequencer.c:3790
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "不能拷贝 '%s' 至 '%s'"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:650
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "临时文件存在于 '%s'。"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:651
 msgid "you may want to cleanup or recover these."
 msgstr "您可能想要清理或者恢复它们。"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:656
 #, c-format
 msgid "failed: %d"
 msgstr "失败：%d"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:700
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:702
 msgid "perform a full-directory diff"
 msgstr "执行一个全目录差异比较"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:704
 msgid "do not prompt before launching a diff tool"
 msgstr "启动差异比较工具之前不提示"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:709
 msgid "use symlinks in dir-diff mode"
 msgstr "在 dir-diff 模式中使用符号链接"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:710
 msgid "tool"
 msgstr "工具"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:711
 msgid "use the specified diff tool"
 msgstr "使用指定的差异比较工具"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:713
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:716
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr "当执行的 diff 工具返回非零退出码时，使 'git-difftool' 退出"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:719
 msgid "specify a custom command for viewing diffs"
 msgstr "指定一个用于查看差异的自定义命令"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:720
 msgid "passed to `diff`"
 msgstr "传递给 `diff`"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:736
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool 要求工作区或者 --no-index"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:763
 msgid "no <tool> given for --tool=<tool>"
 msgstr "没有为 --tool=<工具> 参数提供 <工具>"
 
-#: builtin/difftool.c
+#: builtin/difftool.c:770
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:30
 msgid "git fast-export [<rev-list-opts>]"
 msgstr "git fast-export [<rev-list 选项>]"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:863
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1168
 msgid "--anonymize-map token cannot be empty"
 msgstr "--anonymize-map 取值不能为空"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1188
 msgid "show progress after <n> objects"
 msgstr "在 <n> 个对象之后显示进度"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1190
 msgid "select handling of signed tags"
 msgstr "选择如何处理签名标签"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1193
 msgid "select handling of tags that tag filtered objects"
 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1196
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "选择使用备用编码处理提交说明"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1199
 msgid "dump marks to this file"
 msgstr "把标记存储到这个文件"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1201
 msgid "import marks from this file"
 msgstr "从这个文件导入标记"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1205
 msgid "import marks from this file if it exists"
 msgstr "如果文件存在，从该文件导入标记"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1207
 msgid "fake a tagger when tags lack one"
 msgstr "当标签缺少标记人字段时，假装提供一个"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1209
 msgid "output full tree for each commit"
 msgstr "每次提交都输出整个树"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1211
 msgid "use the done feature to terminate the stream"
 msgstr "使用 done 功能来终止流"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1212
 msgid "skip output of blob data"
 msgstr "跳过数据对象的输出"
 
-#: builtin/fast-export.c builtin/log.c
+#: builtin/fast-export.c:1213 builtin/log.c:2112
 msgid "refspec"
 msgstr "引用规格"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1214
 msgid "apply refspec to exported refs"
 msgstr "对导出的引用应用引用规格"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1215
 msgid "anonymize output"
 msgstr "匿名输出"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1216
 msgid "from:to"
 msgstr "from:to"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1217
 msgid "convert <from> to <to> in anonymized output"
 msgstr "在匿名输出中将 <from> 转换为 <to>"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1220
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr "引用父对象 ID 不在 fast-export 流中"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1222
 msgid "show original object ids of blobs/commits"
 msgstr "显示数据对象/提交的原始对象 ID"
 
-#: builtin/fast-export.c
+#: builtin/fast-export.c:1224
 msgid "label tags with mark ids"
 msgstr "对带有标记 ID 的标签做标记"
 
-#: builtin/fast-import.c
+#: builtin/fast-import.c:3117
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "子模组 '%s' 缺少 from 标记"
 
-#: builtin/fast-import.c
+#: builtin/fast-import.c:3119
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "子模组 '%s' 缺少 to 标记"
 
-#: builtin/fast-import.c
+#: builtin/fast-import.c:3247
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "预期 'mark' 命令，得到 %s"
 
-#: builtin/fast-import.c
+#: builtin/fast-import.c:3252
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "预期 'to' 命令，得到 %s"
 
-#: builtin/fast-import.c
+#: builtin/fast-import.c:3346
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "子模组重写选项的预期格式为 name:filename"
 
-#: builtin/fast-import.c
+#: builtin/fast-import.c:3403
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
 
-#: builtin/fetch-pack.c
+#: builtin/fetch-pack.c:250
 #, c-format
 msgid "Lockfile created but not reported: %s"
 msgstr "Lockfile 已创建但未报告：%s"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:45
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:46
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<选项>] <组>"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:47
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:48
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<选项>]"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:155
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel 不能为负数"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:579
 msgid "couldn't find remote ref HEAD"
 msgstr "无法发现远程 HEAD 引用"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:870
 #, c-format
 msgid "From %.*s\n"
 msgstr "来自 %.*s\n"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:915
 #, c-format
 msgid "object %s not found"
 msgstr "对象 %s 未发现"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:919
 msgid "[up to date]"
 msgstr "[最新]"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:932 builtin/fetch.c:950 builtin/fetch.c:1029
 msgid "[rejected]"
 msgstr "[已拒绝]"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:933
 msgid "can't fetch into checked-out branch"
 msgstr "无法获取到已检出的分支"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:944
 msgid "[tag update]"
 msgstr "[标签更新]"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:945 builtin/fetch.c:984 builtin/fetch.c:1010
+#: builtin/fetch.c:1023
 msgid "unable to update local ref"
 msgstr "不能更新本地引用"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:951
 msgid "would clobber existing tag"
 msgstr "会破坏现有的标签"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:973
 msgid "[new tag]"
 msgstr "[新标签]"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:976
 msgid "[new branch]"
 msgstr "[新分支]"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:979
 msgid "[new ref]"
 msgstr "[新引用]"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1023
 msgid "forced update"
 msgstr "强制更新"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1029
 msgid "non-fast-forward"
 msgstr "非快进"
 
-#: builtin/fetch.c builtin/grep.c sequencer.c
+#: builtin/fetch.c:1061 builtin/fetch.c:1449 builtin/grep.c:829
+#: sequencer.c:3463
 #, c-format
 msgid "cannot open '%s'"
 msgstr "不能打开 '%s'"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1133
 msgid ""
 "fetch normally indicates which branches had a forced update,\n"
 "but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
@@ -7219,7 +7472,7 @@ msgstr ""
 "要重新启用，请使用 '--show-forced-updates' 选项或运行\n"
 "'git config fetch.showForcedUpdates true'"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1137
 #, c-format
 msgid ""
 "it took %.2f seconds to check forced updates; you can use\n"
@@ -7230,17 +7483,17 @@ msgstr ""
 "花了 %.2f 秒来检查强制更新；您可以使用 '--no-show-forced-updates'\n"
 "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查\n"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1164
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s 未发送所有必需的对象\n"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1183
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr "拒绝 %s 因为浅克隆的根不允许被更新"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1281
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -7250,74 +7503,74 @@ msgstr ""
 " 'git remote prune %s' 来删除旧的、有冲突的分支"
 
 #  译者：注意保持前导空格
-#: builtin/fetch.c
+#: builtin/fetch.c:1388
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   （%s 将成为悬空状态）"
 
 #  译者：注意保持前导空格
-#: builtin/fetch.c
+#: builtin/fetch.c:1389
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   （%s 已成为悬空状态）"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1416
 msgid "[deleted]"
 msgstr "[已删除]"
 
-#: builtin/fetch.c builtin/remote.c
+#: builtin/fetch.c:1417 builtin/remote.c:1179
 msgid "(none)"
 msgstr "（无）"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1438
 #, c-format
 msgid "refusing to fetch into branch '%s' checked out at '%s'"
 msgstr "拒绝获取于 '%2$s' 检出的分支 '%1$s'"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1458
 #, c-format
 msgid "option \"%s\" value \"%s\" is not valid for %s"
 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1461
 #, c-format
 msgid "option \"%s\" is ignored for %s\n"
 msgstr "选项 \"%s\" 为 %s 所忽略\n"
 
-#: builtin/fetch.c object-file.c
+#: builtin/fetch.c:1487 object-file.c:2697
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s 不是一个有效的对象"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1489
 #, c-format
 msgid "the object %s does not exist"
 msgstr "对象 '%s' 不存在"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1760
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "检测到多分支，和 --set-upstream 不兼容"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1772
 #, c-format
 msgid ""
 "could not set upstream of HEAD to '%s' from '%s' when it does not point to "
 "any branch."
 msgstr "无法在不指向任何分支时将 HEAD 的上游从 '%s' 设置为 '%s'。"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1785
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "没有为一个远程跟踪分支设置上游"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1787
 msgid "not setting upstream for a remote tag"
 msgstr "没有为一个远程标签设置上游"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1789
 msgid "unknown branch type"
 msgstr "未知的分支类型"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1791
 msgid ""
 "no source branch found;\n"
 "you need to specify exactly one branch with the --set-upstream option"
@@ -7325,370 +7578,375 @@ msgstr ""
 "未发现源分支；\n"
 "您需要使用 --set-upstream 选项指定一个分支"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1932 builtin/fetch.c:2010
 #, c-format
 msgid "Fetching %s\n"
 msgstr "正在获取 %s\n"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1943 builtin/fetch.c:2013
 #, c-format
 msgid "could not fetch %s"
 msgstr "不能获取 %s"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:1955
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "无法获取 '%s'（退出码：%d）\n"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2074
 msgid ""
 "no remote repository specified; please specify either a URL or a\n"
 "remote name from which new revisions should be fetched"
 msgstr "未指定远程仓库；请指定一个用于获取新版本的 URL 或远程仓库名"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2110
 msgid "you need to specify a tag name"
 msgstr "您需要指定一个标签名称"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2172 builtin/pull.c:191
 msgid "fetch from all remotes"
 msgstr "从所有远程抓取"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2174 builtin/pull.c:251
 msgid "set upstream for git pull/fetch"
 msgstr "为 git pull/fetch 设置上游"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2176 builtin/pull.c:194
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2178
 msgid "use atomic transaction to update references"
 msgstr "使用原子事务更新引用"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2180 builtin/pull.c:197
 msgid "path to upload pack on remote end"
 msgstr "上传包到远程的路径"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2181
 msgid "force overwrite of local reference"
 msgstr "强制覆盖本地引用"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2183
 msgid "fetch from multiple remotes"
 msgstr "从多个远程抓取"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2185 builtin/pull.c:201
 msgid "fetch all tags and associated objects"
 msgstr "抓取所有的标签和关联对象"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2187
 msgid "do not fetch all tags (--no-tags)"
 msgstr "不抓取任何标签（--no-tags）"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2189
 msgid "number of submodules fetched in parallel"
 msgstr "获取子模组的并发数"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2191
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr "修改引用规格以将所有引用放入 refs/prefetch/"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2193 builtin/pull.c:204
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "清除远程已经不存在的分支的跟踪分支"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2195
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr "清除远程不存在的本地标签，并且替换变更标签"
 
 #  译者：可选值，不能翻译
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2196 builtin/fetch.c:2225 builtin/pull.c:125
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2197
 msgid "control recursive fetching of submodules"
 msgstr "控制子模组的递归抓取"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2203
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "将获取到的引用写入 FETCH_HEAD 文件"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2204 builtin/pull.c:212
 msgid "keep downloaded pack"
 msgstr "保持已下载的包"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2206
 msgid "allow updating of HEAD ref"
 msgstr "允许更新 HEAD 引用"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2209 builtin/fetch.c:2215 builtin/pull.c:215
+#: builtin/pull.c:224
 msgid "deepen history of shallow clone"
 msgstr "深化浅克隆的历史"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2211 builtin/pull.c:218
 msgid "deepen history of shallow repository based on time"
 msgstr "基于时间来深化浅克隆的历史"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2217 builtin/pull.c:227
 msgid "convert to a complete repository"
 msgstr "转换为一个完整的仓库"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2220
 msgid "re-fetch without negotiating common commits"
 msgstr "重新获取而不协商共同提交"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2223
 msgid "prepend this to submodule path output"
 msgstr "在子模组路径输出的前面加上此目录"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2226
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2230 builtin/pull.c:230
 msgid "accept refs that update .git/shallow"
 msgstr "接受更新 .git/shallow 的引用"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2231 builtin/pull.c:232
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2232 builtin/pull.c:233
 msgid "specify fetch refmap"
 msgstr "指定获取操作的引用映射"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2236 builtin/pull.c:246
 msgid "report that we have only objects reachable from this object"
 msgstr "报告我们只拥有从该对象开始可达的对象"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2238
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr "不获取包文件；而是打印协商的祖先提交"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2241 builtin/fetch.c:2243
 msgid "run 'maintenance --auto' after fetching"
 msgstr "获取后执行 'maintenance --auto'"
 
-#: builtin/fetch.c builtin/pull.c
+#: builtin/fetch.c:2245 builtin/pull.c:249
 msgid "check for forced-updates on all updated branches"
 msgstr "在所有更新分支上检查强制更新"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2247
 msgid "write the commit-graph after fetching"
 msgstr "抓取后写提交图"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2249
 msgid "accept refspecs from stdin"
 msgstr "从标准输入获取引用规格"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2325
 msgid "--negotiate-only needs one or more --negotiation-tip=*"
 msgstr "--negotiate-only 需要一个或多个 --negotiation-tip=*"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2329
 msgid "negative depth in --deepen is not supported"
 msgstr "--deepen 不支持负数深度"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2338
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2358
 #, c-format
 msgid "failed to fetch bundles from '%s'"
 msgstr "无法从 '%s' 获取归档包"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2370
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all 不能带一个仓库参数"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2372
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 带引用规格没有任何意义"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2386
 #, c-format
 msgid "no such remote or remote group: %s"
 msgstr "没有这样的远程或远程组：%s"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2394
 msgid "fetching a group and specifying refspecs does not make sense"
 msgstr "获取组并指定引用规格没有意义"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2411
 msgid "must supply remote when using --negotiate-only"
 msgstr "在使用 --negotiate-only 时必须提供远程仓库"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2416
 msgid "protocol does not support --negotiate-only, exiting"
 msgstr "协议不支持 --negotiate-only，退出"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2437
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2441
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic 仅在从一个远程仓库获取的时候可用"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2445
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin 仅在从一个远程仓库获取的时候可用"
 
-#: builtin/fmt-merge-msg.c
+#: builtin/fmt-merge-msg.c:8
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
 
-#: builtin/fmt-merge-msg.c
+#: builtin/fmt-merge-msg.c:20
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
 
-#: builtin/fmt-merge-msg.c
+#: builtin/fmt-merge-msg.c:23
 msgid "alias for --log (deprecated)"
 msgstr "参数 --log 的别名（已弃用）"
 
-#: builtin/fmt-merge-msg.c
+#: builtin/fmt-merge-msg.c:26
 msgid "text"
 msgstr "文本"
 
-#: builtin/fmt-merge-msg.c
+#: builtin/fmt-merge-msg.c:27
 msgid "use <text> as start of message"
 msgstr "使用 <文本> 作为提交说明的开始"
 
-#: builtin/fmt-merge-msg.c
+#: builtin/fmt-merge-msg.c:29
 msgid "use <name> instead of the real target branch"
 msgstr "使用 <名称> 而不是真正的目标分支"
 
-#: builtin/fmt-merge-msg.c
+#: builtin/fmt-merge-msg.c:30
 msgid "file to read from"
 msgstr "从文件中读取"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<选项>] [<模式>]"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <对象>]"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:14
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:15
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "引用占位符适用于 shells"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "引用占位符适用于 perl"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "引用占位符适用于 python"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "引用占位符适用于 Tcl"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:42
 msgid "show only <n> matched refs"
 msgstr "只显示 <n> 个匹配的引用"
 
-#: builtin/for-each-ref.c builtin/tag.c
+#: builtin/for-each-ref.c:44 builtin/tag.c:526
 msgid "respect format colors"
 msgstr "遵照格式中的颜色输出"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:48
 msgid "print only refs which points at the given object"
 msgstr "只打印指向给定对象的引用"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:50
 msgid "print only refs that are merged"
 msgstr "只打印已经合并的引用"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:51
 msgid "print only refs that are not merged"
 msgstr "只打印没有合并的引用"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:52
 msgid "print only refs which contain the commit"
 msgstr "只打印包含该提交的引用"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:53
 msgid "print only refs which don't contain the commit"
 msgstr "只打印不包含该提交的引用"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:55
 msgid "read reference patterns from stdin"
 msgstr "从标准输入读取引用的模式"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:56
 msgid "also include HEAD ref and pseudorefs"
 msgstr "还包括 HEAD 引用和伪引用"
 
-#: builtin/for-each-ref.c
+#: builtin/for-each-ref.c:87
 msgid "unknown arguments supplied with --stdin"
 msgstr "为 --stdin 提供了未知的命令参数"
 
-#: builtin/for-each-repo.c
+#: builtin/for-each-repo.c:11
 msgid "git for-each-repo --config=<config> [--] <arguments>"
 msgstr "git for-each-repo --config=<配置> [--] <命令参数>"
 
-#: builtin/for-each-repo.c
+#: builtin/for-each-repo.c:41
 msgid "config"
 msgstr "配置"
 
-#: builtin/for-each-repo.c
+#: builtin/for-each-repo.c:42
 msgid "config key storing a list of repository paths"
 msgstr "存储着仓库路径列表的配置项键名"
 
-#: builtin/for-each-repo.c
+#: builtin/for-each-repo.c:44
+msgid "keep going even if command fails in a repository"
+msgstr "即使存储库中的命令失败，仍继续执行"
+
+#: builtin/for-each-repo.c:52
 msgid "missing --config=<config>"
 msgstr "缺少 --config=<配置>"
 
-#: builtin/for-each-repo.c
+#: builtin/for-each-repo.c:56
 #, c-format
 msgid "got bad config --config=%s"
 msgstr "发现错误的配置行 --config=%s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:77 builtin/fsck.c:136 builtin/fsck.c:137
 msgid "unknown"
 msgstr "未知"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c
+#: builtin/fsck.c:86 builtin/fsck.c:108
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "%s %s 错误：%s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c
+#: builtin/fsck.c:102
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "%s %s 警告：%s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:132 builtin/fsck.c:135
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "来自 %7s %s 的损坏的链接"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:144
 msgid "wrong object type in link"
 msgstr "链接中错误的对象类型"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:160
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -7697,186 +7955,187 @@ msgstr ""
 "损坏的链接来自于 %7s %s\n"
 "              到 %7s %s"
 
-#: builtin/fsck.c builtin/prune.c connected.c
+#: builtin/fsck.c:197 builtin/prune.c:64 connected.c:117
 msgid "Checking connectivity"
 msgstr "正在检查连通性"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:274
 #, c-format
 msgid "missing %s %s"
 msgstr "缺失 %s %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:301
 #, c-format
 msgid "unreachable %s %s"
 msgstr "不可达 %s %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:321
 #, c-format
 msgid "dangling %s %s"
 msgstr "悬空 %s %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:331
 msgid "could not create lost-found"
 msgstr "不能创建 lost-found"
 
-#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c
-#: sequencer.c
+#: builtin/fsck.c:338 builtin/gc.c:1943 builtin/rebase.c:224
+#: rebase-interactive.c:127 rerere.c:481 rerere.c:689 sequencer.c:4222
+#: sequencer.c:6509
 #, c-format
 msgid "could not write '%s'"
 msgstr "不能写入 '%s'"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:342
 #, c-format
 msgid "could not finish '%s'"
 msgstr "不能完成 '%s'"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:359
 #, c-format
 msgid "Checking %s"
 msgstr "正在检查 %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:397
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "正在检查连通性（%d 个对象）"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:416
 #, c-format
 msgid "Checking %s %s"
 msgstr "正在检查 %s %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:421
 msgid "broken links"
 msgstr "损坏的链接"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:430
 #, c-format
 msgid "root %s"
 msgstr "根 %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:438
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "标记 %s %s (%s) 于 %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:464
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s：对象损坏或丢失"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:489
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s：无效的引用日志条目 %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:504
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "正在检查引用日志 %s->%s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:539
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s：无效的 sha1 指针 %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:546
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s：不是一个提交"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:601
 msgid "notice: No default references"
 msgstr "注意：无默认引用"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:631
 #, c-format
 msgid "%s: hash-path mismatch, found at: %s"
 msgstr "%s：哈希路径不匹配，发现于 %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:634
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s：对象损坏或丢失：%s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:638
 #, c-format
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s：对象有未知的类型 '%s': %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:655
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s：不能解析对象：%s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:676
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "坏的 sha1 文件：%s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:697
 msgid "Checking object directory"
 msgstr "正在检查对象目录"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:700
 msgid "Checking object directories"
 msgstr "正在检查对象目录"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:716
 #, c-format
 msgid "Checking %s link"
 msgstr "正在检查 %s 链接"
 
-#: builtin/fsck.c builtin/index-pack.c
+#: builtin/fsck.c:723 builtin/index-pack.c:873
 #, c-format
 msgid "invalid %s"
 msgstr "无效的 %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:730
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s 指向奇怪的东西（%s）"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:736
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s：分离头指针的指向不存在"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:740
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "注意：%s 指向一个尚未诞生的分支（%s）"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:752
 #, c-format
 msgid "Checking cache tree of %s"
 msgstr "正在检查缓存树 %s"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:757
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree of %s"
 msgstr "%s：cache-tree %s 中存在无效的 sha1 指针"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:766
 msgid "non-tree in cache-tree"
 msgstr "cache-tree 中非树对象"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:797
 #, c-format
 msgid "%s: invalid sha1 pointer in resolve-undo of %s"
 msgstr "%s：resolve-undo %s 中存在无效的 sha1 指针"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:884
 #, c-format
 msgid "unable to load rev-index for pack '%s'"
 msgstr "无法为包文件 %s 加载反向索引"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:889
 #, c-format
 msgid "invalid rev-index for pack '%s'"
 msgstr "包文件 '%s' 的反向索引文件无效"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:900
 msgid ""
 "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
 "         [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
@@ -7888,205 +8147,205 @@ msgstr ""
 "         [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
 "         [--[no-]name-objects] [<对象>...]"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:909
 msgid "show unreachable objects"
 msgstr "显示不可达的对象"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:910
 msgid "show dangling objects"
 msgstr "显示悬空的对象"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:911
 msgid "report tags"
 msgstr "报告标签"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:912
 msgid "report root nodes"
 msgstr "报告根节点"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:913
 msgid "make index objects head nodes"
 msgstr "将索引亦作为检查的头节点"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:914
 msgid "make reflogs head nodes (default)"
 msgstr "将引用日志作为检查的头节点（默认）"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:915
 msgid "also consider packs and alternate objects"
 msgstr "也考虑包和备用对象"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:916
 msgid "check only connectivity"
 msgstr "仅检查连通性"
 
-#: builtin/fsck.c builtin/mktag.c
+#: builtin/fsck.c:917 builtin/mktag.c:79
 msgid "enable more strict checking"
 msgstr "启用更严格的检查"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:919
 msgid "write dangling objects in .git/lost-found"
 msgstr "将悬空对象写入 .git/lost-found 中"
 
-#: builtin/fsck.c builtin/prune.c
+#: builtin/fsck.c:920 builtin/prune.c:157
 msgid "show progress"
 msgstr "显示进度"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:921
 msgid "show verbose names for reachable objects"
 msgstr "显示可达对象的详细名称"
 
-#: builtin/fsck.c builtin/index-pack.c
+#: builtin/fsck.c:982 builtin/index-pack.c:269
 msgid "Checking objects"
 msgstr "正在检查对象"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:1010
 #, c-format
 msgid "%s: object missing"
 msgstr "%s：对象缺失"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:1021
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "无效的参数：期望 sha1，得到 '%s'"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:22
 msgid "git fsmonitor--daemon start [<options>]"
 msgstr "git fsmonitor--daemon start [<选项>]"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:23
 msgid "git fsmonitor--daemon run [<options>]"
 msgstr "git fsmonitor--daemon run [<选项>]"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:48 builtin/fsmonitor--daemon.c:57
 #, c-format
 msgid "value of '%s' out of range: %d"
 msgstr "'%s' 的值超出范围：%d"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:67
 #, c-format
 msgid "value of '%s' not bool or int: %d"
 msgstr "'%s' 的值不是 bool 或 int：%d"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:109
 #, c-format
 msgid "fsmonitor-daemon is watching '%s'\n"
 msgstr "fsmonitor-daemon 正在监视 '%s'\n"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:114
 #, c-format
 msgid "fsmonitor-daemon is not watching '%s'\n"
 msgstr "fsmonitor-daemon 不在监视 '%s'\n"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:181
 #, c-format
 msgid "could not create fsmonitor cookie '%s'"
 msgstr "无法创建 fsmonitor cookie '%s'"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:766
 #, c-format
 msgid "fsmonitor: cookie_result '%d' != SEEN"
 msgstr "fsmonitor: cookie_result '%d' != SEEN"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1215
 #, c-format
 msgid "could not start IPC thread pool on '%s'"
 msgstr "无法在 '%s' 启动 IPC 线程池"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1225
 msgid "could not start fsmonitor listener thread"
 msgstr "无法启动 fsmonitor 监听线程"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1236
 msgid "could not start fsmonitor health thread"
 msgstr "无法启动 fsmonitor 健康检查线程"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1371
 msgid "could not initialize listener thread"
 msgstr "无法初始化监听线程"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1376
 msgid "could not initialize health thread"
 msgstr "无法初始化健康检查线程"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1395
 #, c-format
 msgid "could not cd home '%s'"
 msgstr "不能切换至家目录 '%s'"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1428 builtin/fsmonitor--daemon.c:1484
 #, c-format
 msgid "fsmonitor--daemon is already running '%s'"
 msgstr "fsmonitor--daemon 已经在运行 '%s'"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1432
 #, c-format
 msgid "running fsmonitor-daemon in '%s'\n"
 msgstr "在 '%s' 中运行 fsmonitor-daemon\n"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1488
 #, c-format
 msgid "starting fsmonitor-daemon in '%s'\n"
 msgstr "在 '%s' 中启动 fsmonitor-daemon\n"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1514
 msgid "daemon failed to start"
 msgstr "守护进程无法启动"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1517
 msgid "daemon not online yet"
 msgstr "守护进程尚未在线"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1520
 msgid "daemon terminated"
 msgstr "守护进程被终结"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1531
 msgid "detach from console"
 msgstr "从控制台分离"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1534
 msgid "use <n> ipc worker threads"
 msgstr "使用 <n> 个 IPC 工作线程"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1537
 msgid "max seconds to wait for background daemon startup"
 msgstr "等待守护进程启动的最大秒数"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1551
 #, c-format
 msgid "invalid 'ipc-threads' value (%d)"
 msgstr "无效的 'ipc-threads' 值（%d）"
 
-#: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c
+#: builtin/fsmonitor--daemon.c:1583 t/helper/test-cache-tree.c:67
 #, c-format
 msgid "Unhandled subcommand '%s'"
 msgstr "未处理的子命令 '%s'"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:1596
 msgid "fsmonitor--daemon not supported on this platform"
 msgstr "fsmonitor--daemon 不支持本平台"
 
-#: builtin/gc.c
+#: builtin/gc.c:48
 msgid "git gc [<options>]"
 msgstr "git gc [<选项>]"
 
-#: builtin/gc.c
+#: builtin/gc.c:106
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "对 %s 调用 fstat 失败：%s"
 
-#: builtin/gc.c
+#: builtin/gc.c:142
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "无法解析 '%s' 值 '%s'"
 
-#: builtin/gc.c setup.c
+#: builtin/gc.c:557 setup.c:1955
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "不能对 '%s' 调用 stat"
 
-#: builtin/gc.c
+#: builtin/gc.c:573
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8100,303 +8359,304 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c
+#: builtin/gc.c:628
 msgid "prune unreferenced objects"
 msgstr "清除未引用的对象"
 
-#: builtin/gc.c
+#: builtin/gc.c:630
 msgid "pack unreferenced objects separately"
 msgstr "分开打包未引用的对象"
 
-#: builtin/gc.c builtin/repack.c
+#: builtin/gc.c:632 builtin/repack.c:1153
 msgid "with --cruft, limit the size of new cruft packs"
 msgstr "使用 --cruft，限制新 cruft 包的总大小"
 
-#: builtin/gc.c
+#: builtin/gc.c:633
 msgid "be more thorough (increased runtime)"
 msgstr "更彻底（增加运行时间）"
 
-#: builtin/gc.c
+#: builtin/gc.c:634
 msgid "enable auto-gc mode"
 msgstr "启用自动垃圾回收模式"
 
-#: builtin/gc.c
+#: builtin/gc.c:637
 msgid "force running gc even if there may be another gc running"
 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
 
-#: builtin/gc.c
+#: builtin/gc.c:640
 msgid "repack all other packs except the largest pack"
 msgstr "除了最大的包之外，对所有其它包文件重新打包"
 
-#: builtin/gc.c
+#: builtin/gc.c:656
 #, c-format
 msgid "failed to parse gc.logExpiry value %s"
 msgstr "无法解析 gc.logExpiry 的值 %s"
 
-#: builtin/gc.c
+#: builtin/gc.c:667
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "无法解析清除期限值 %s"
 
-#: builtin/gc.c
+#: builtin/gc.c:687
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
 
-#: builtin/gc.c
+#: builtin/gc.c:689
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "自动打包仓库以求最佳性能。\n"
 
-#: builtin/gc.c
+#: builtin/gc.c:690
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "手工维护参见 \"git help gc\"。\n"
 
-#: builtin/gc.c
+#: builtin/gc.c:731
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
 
-#: builtin/gc.c
+#: builtin/gc.c:800
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
 
-#: builtin/gc.c
+#: builtin/gc.c:810
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]"
 
-#: builtin/gc.c
+#: builtin/gc.c:820
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule 不被允许"
 
-#: builtin/gc.c
+#: builtin/gc.c:825
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "无法识别的 --schedule 参数 '%s'"
 
-#: builtin/gc.c
+#: builtin/gc.c:939
 msgid "failed to write commit-graph"
 msgstr "无法写入提交图"
 
-#: builtin/gc.c
+#: builtin/gc.c:969
 msgid "failed to prefetch remotes"
 msgstr "无法预先获取远程仓库"
 
-#: builtin/gc.c
+#: builtin/gc.c:1085
 msgid "failed to start 'git pack-objects' process"
 msgstr "无法启动 'git pack-objects' 进程"
 
-#: builtin/gc.c
+#: builtin/gc.c:1102
 msgid "failed to finish 'git pack-objects' process"
 msgstr "无法完成 'git pack-objects' 进程"
 
-#: builtin/gc.c
+#: builtin/gc.c:1153
 msgid "failed to write multi-pack-index"
 msgstr "无法写入多包索引"
 
-#: builtin/gc.c
+#: builtin/gc.c:1169
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' 失败"
 
-#: builtin/gc.c
+#: builtin/gc.c:1228
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' 失败"
 
-#: builtin/gc.c
+#: builtin/gc.c:1237
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用"
 
-#: builtin/gc.c
+#: builtin/gc.c:1341
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "锁文件 '%s' 已存在，跳过维护"
 
-#: builtin/gc.c
+#: builtin/gc.c:1371
 #, c-format
 msgid "task '%s' failed"
 msgstr "任务 '%s' 失败"
 
-#: builtin/gc.c
+#: builtin/gc.c:1453
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' 不是一个有效的任务"
 
-#: builtin/gc.c
+#: builtin/gc.c:1458
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "任务 '%s' 不能被多次选择"
 
-#: builtin/gc.c
+#: builtin/gc.c:1473
 msgid "run tasks based on the state of the repository"
 msgstr "基于仓库状态来运行任务"
 
-#: builtin/gc.c
+#: builtin/gc.c:1474
 msgid "frequency"
 msgstr "频率"
 
-#: builtin/gc.c
+#: builtin/gc.c:1475
 msgid "run tasks based on frequency"
 msgstr "基于频率运行任务"
 
-#: builtin/gc.c
+#: builtin/gc.c:1478
 msgid "do not report progress or other information over stderr"
 msgstr "不通过标准错误报告进度或其它信息"
 
-#: builtin/gc.c
+#: builtin/gc.c:1479
 msgid "task"
 msgstr "任务"
 
-#: builtin/gc.c
+#: builtin/gc.c:1480
 msgid "run a specific task"
 msgstr "运行一个特定的任务"
 
-#: builtin/gc.c
+#: builtin/gc.c:1497
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
 
-#: builtin/gc.c
+#: builtin/gc.c:1573
 #, c-format
 msgid "unable to add '%s' value of '%s'"
 msgstr "无法添加 '%2$s' 的 '%1$s' 值"
 
-#: builtin/gc.c
+#: builtin/gc.c:1593
 msgid "return success even if repository was not registered"
 msgstr "即便仓库非注册仍然返回成功"
 
-#: builtin/gc.c
+#: builtin/gc.c:1642
 #, c-format
 msgid "unable to unset '%s' value of '%s'"
 msgstr "无法取消设置 '%2$s' 的 '%1$s' 值"
 
-#: builtin/gc.c
+#: builtin/gc.c:1645
 #, c-format
 msgid "repository '%s' is not registered"
 msgstr "仓库 '%s' 未注册"
 
-#: builtin/gc.c
+#: builtin/gc.c:1778
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "无法扩展路径 '%s'"
 
-#: builtin/gc.c
+#: builtin/gc.c:1805 builtin/gc.c:1843
 msgid "failed to start launchctl"
 msgstr "无法启动 launchctl"
 
-#: builtin/gc.c
+#: builtin/gc.c:1921 builtin/gc.c:2374 builtin/gc.c:2447
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "无法为 '%s' 创建目录"
 
-#: builtin/gc.c
+#: builtin/gc.c:1948
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "无法引导服务 %s"
 
-#: builtin/gc.c
+#: builtin/gc.c:2038
 msgid "failed to create temp xml file"
 msgstr "无法创建临时 XML 文件"
 
-#: builtin/gc.c
+#: builtin/gc.c:2131
 msgid "failed to start schtasks"
 msgstr "无法启动计划任务"
 
-#: builtin/gc.c
+#: builtin/gc.c:2217
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'"
 
-#: builtin/gc.c
+#: builtin/gc.c:2224
 msgid "failed to create crontab temporary file"
 msgstr "无法创建 crontab 临时文件"
 
-#: builtin/gc.c
+#: builtin/gc.c:2229
 msgid "failed to open temporary file"
 msgstr "无法打开临时文件"
 
-#: builtin/gc.c
+#: builtin/gc.c:2279
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"
 
-#: builtin/gc.c
+#: builtin/gc.c:2284
 msgid "'crontab' died"
 msgstr "'crontab' 终止"
 
-#: builtin/gc.c builtin/worktree.c
+#: builtin/gc.c:2335 builtin/gc.c:2348 builtin/gc.c:2544 builtin/worktree.c:152
+#: builtin/worktree.c:1304
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "无法删除 '%s'"
 
-#: builtin/gc.c rerere.c
+#: builtin/gc.c:2417 builtin/gc.c:2479 rerere.c:494
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "无法刷新 '%s'"
 
-#: builtin/gc.c
+#: builtin/gc.c:2520
 msgid "failed to start systemctl"
 msgstr "无法启动 systemctl"
 
-#: builtin/gc.c
+#: builtin/gc.c:2530
 msgid "failed to run systemctl"
 msgstr "无法运行 systemctl"
 
-#: builtin/gc.c
+#: builtin/gc.c:2661
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "无法识别的 --scheduler 参数 '%s'"
 
-#: builtin/gc.c
+#: builtin/gc.c:2686
 msgid "neither systemd timers nor crontab are available"
 msgstr "systemd 和 crontab 的定时器都不可用"
 
-#: builtin/gc.c
+#: builtin/gc.c:2701
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "%s 调度器不可用"
 
-#: builtin/gc.c
+#: builtin/gc.c:2715
 msgid "another process is scheduling background maintenance"
 msgstr "另外一个进程正运行于后台维护"
 
-#: builtin/gc.c
+#: builtin/gc.c:2737
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<调度器>]"
 
-#: builtin/gc.c
+#: builtin/gc.c:2746
 msgid "scheduler"
 msgstr "调度器"
 
-#: builtin/gc.c
+#: builtin/gc.c:2747
 msgid "scheduler to trigger git maintenance run"
 msgstr "触发 git maintenance 执行的调度器"
 
-#: builtin/gc.c
+#: builtin/gc.c:2762
 msgid "failed to set up maintenance schedule"
 msgstr "无法设置维护计划"
 
-#: builtin/gc.c
+#: builtin/gc.c:2765
 msgid "failed to add repo to global config"
 msgstr "无法将仓库添加到全局配置"
 
-#: builtin/gc.c
+#: builtin/gc.c:2787
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <子命令> [<选项>]"
 
-#: builtin/grep.c
+#: builtin/grep.c:36
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
 
-#: builtin/grep.c
+#: builtin/grep.c:245
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep：无法创建线程：%s"
 
-#: builtin/grep.c
+#: builtin/grep.c:303
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
@@ -8406,257 +8666,258 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c
+#: builtin/grep.c:311 builtin/index-pack.c:1594 builtin/index-pack.c:1800
+#: builtin/pack-objects.c:3281
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "没有线程支持，忽略 %s"
 
-#: builtin/grep.c
+#: builtin/grep.c:575
 #, c-format
 msgid "unable to read tree %s"
 msgstr "无法读取树 %s"
 
-#: builtin/grep.c
+#: builtin/grep.c:723
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "无法抓取来自于 %s 类型的对象"
 
-#: builtin/grep.c
+#: builtin/grep.c:803
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "开关 `%c' 期望一个数字值"
 
-#: builtin/grep.c
+#: builtin/grep.c:909
 msgid "search in index instead of in the work tree"
 msgstr "在索引区搜索而不是在工作区"
 
-#: builtin/grep.c
+#: builtin/grep.c:911
 msgid "find in contents not managed by git"
 msgstr "在未被 git 管理的内容中查找"
 
-#: builtin/grep.c
+#: builtin/grep.c:913
 msgid "search in both tracked and untracked files"
 msgstr "在跟踪和未跟踪的文件中搜索"
 
-#: builtin/grep.c
+#: builtin/grep.c:915
 msgid "ignore files specified via '.gitignore'"
 msgstr "忽略 '.gitignore' 包含的文件"
 
-#: builtin/grep.c
+#: builtin/grep.c:917
 msgid "recursively search in each submodule"
 msgstr "在每一个子模组中递归搜索"
 
-#: builtin/grep.c
+#: builtin/grep.c:920
 msgid "show non-matching lines"
 msgstr "显示未匹配的行"
 
-#: builtin/grep.c
+#: builtin/grep.c:922
 msgid "case insensitive matching"
 msgstr "不区分大小写匹配"
 
-#: builtin/grep.c
+#: builtin/grep.c:924
 msgid "match patterns only at word boundaries"
 msgstr "只在单词边界匹配模式"
 
-#: builtin/grep.c
+#: builtin/grep.c:926
 msgid "process binary files as text"
 msgstr "把二进制文件当做文本处理"
 
-#: builtin/grep.c
+#: builtin/grep.c:928
 msgid "don't match patterns in binary files"
 msgstr "不在二进制文件中匹配模式"
 
-#: builtin/grep.c
+#: builtin/grep.c:931
 msgid "process binary files with textconv filters"
 msgstr "用 textconv 过滤器处理二进制文件"
 
-#: builtin/grep.c
+#: builtin/grep.c:933
 msgid "search in subdirectories (default)"
 msgstr "在子目录中寻找（默认）"
 
-#: builtin/grep.c
+#: builtin/grep.c:935
 msgid "descend at most <n> levels"
 msgstr "最多向下寻找 <n> 层"
 
-#: builtin/grep.c
+#: builtin/grep.c:938
 msgid "use extended POSIX regular expressions"
 msgstr "使用扩展的 POSIX 正则表达式"
 
-#: builtin/grep.c
+#: builtin/grep.c:941
 msgid "use basic POSIX regular expressions (default)"
 msgstr "使用基本的 POSIX 正则表达式（默认）"
 
-#: builtin/grep.c
+#: builtin/grep.c:944
 msgid "interpret patterns as fixed strings"
 msgstr "把模式解析为固定的字符串"
 
-#: builtin/grep.c
+#: builtin/grep.c:947
 msgid "use Perl-compatible regular expressions"
 msgstr "使用 Perl 兼容的正则表达式"
 
-#: builtin/grep.c
+#: builtin/grep.c:950
 msgid "show line numbers"
 msgstr "显示行号"
 
-#: builtin/grep.c
+#: builtin/grep.c:951
 msgid "show column number of first match"
 msgstr "显示第一个匹配的列号"
 
-#: builtin/grep.c
+#: builtin/grep.c:952
 msgid "don't show filenames"
 msgstr "不显示文件名"
 
-#: builtin/grep.c
+#: builtin/grep.c:953
 msgid "show filenames"
 msgstr "显示文件名"
 
-#: builtin/grep.c
+#: builtin/grep.c:955
 msgid "show filenames relative to top directory"
 msgstr "显示相对于顶级目录的文件名"
 
-#: builtin/grep.c
+#: builtin/grep.c:957
 msgid "show only filenames instead of matching lines"
 msgstr "只显示文件名而不显示匹配的行"
 
-#: builtin/grep.c
+#: builtin/grep.c:959
 msgid "synonym for --files-with-matches"
 msgstr "和 --files-with-matches 同义"
 
-#: builtin/grep.c
+#: builtin/grep.c:962
 msgid "show only the names of files without match"
 msgstr "只显示未匹配的文件名"
 
-#: builtin/grep.c
+#: builtin/grep.c:964
 msgid "print NUL after filenames"
 msgstr "在文件名后输出 NUL 字符"
 
-#: builtin/grep.c
+#: builtin/grep.c:967
 msgid "show only matching parts of a line"
 msgstr "只显示行中的匹配的部分"
 
-#: builtin/grep.c
+#: builtin/grep.c:969
 msgid "show the number of matches instead of matching lines"
 msgstr "显示总匹配行数，而不显示匹配的行"
 
-#: builtin/grep.c
+#: builtin/grep.c:970
 msgid "highlight matches"
 msgstr "高亮显示匹配项"
 
-#: builtin/grep.c
+#: builtin/grep.c:972
 msgid "print empty line between matches from different files"
 msgstr "在不同文件的匹配项之间打印空行"
 
-#: builtin/grep.c
+#: builtin/grep.c:974
 msgid "show filename only once above matches from same file"
 msgstr "只在同一文件的匹配项的上面显示一次文件名"
 
-#: builtin/grep.c
+#: builtin/grep.c:977
 msgid "show <n> context lines before and after matches"
 msgstr "显示匹配项前后的 <n> 行上下文"
 
-#: builtin/grep.c
+#: builtin/grep.c:980
 msgid "show <n> context lines before matches"
 msgstr "显示匹配项前 <n> 行上下文"
 
-#: builtin/grep.c
+#: builtin/grep.c:982
 msgid "show <n> context lines after matches"
 msgstr "显示匹配项后 <n> 行上下文"
 
-#: builtin/grep.c
+#: builtin/grep.c:984
 msgid "use <n> worker threads"
 msgstr "使用 <n> 个工作线程"
 
-#: builtin/grep.c
+#: builtin/grep.c:985
 msgid "shortcut for -C NUM"
 msgstr "快捷键 -C 数字"
 
-#: builtin/grep.c
+#: builtin/grep.c:988
 msgid "show a line with the function name before matches"
 msgstr "在匹配的前面显示一行函数名"
 
-#: builtin/grep.c
+#: builtin/grep.c:990
 msgid "show the surrounding function"
 msgstr "显示所在函数的前后内容"
 
-#: builtin/grep.c
+#: builtin/grep.c:993
 msgid "read patterns from file"
 msgstr "从文件读取模式"
 
-#: builtin/grep.c
+#: builtin/grep.c:995
 msgid "match <pattern>"
 msgstr "匹配 <模式>"
 
-#: builtin/grep.c
+#: builtin/grep.c:997
 msgid "combine patterns specified with -e"
 msgstr "组合用 -e 参数设定的模式"
 
-#: builtin/grep.c
+#: builtin/grep.c:1009
 msgid "indicate hit with exit status without output"
 msgstr "不输出，而用退出码标识命中状态"
 
-#: builtin/grep.c
+#: builtin/grep.c:1011
 msgid "show only matches from files that match all patterns"
 msgstr "只显示匹配所有模式的文件中的匹配"
 
-#: builtin/grep.c
+#: builtin/grep.c:1014
 msgid "pager"
 msgstr "分页"
 
-#: builtin/grep.c
+#: builtin/grep.c:1014
 msgid "show matching files in the pager"
 msgstr "分页显示匹配的文件"
 
-#: builtin/grep.c
+#: builtin/grep.c:1018
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "允许调用 grep(1)（本次构建忽略）"
 
-#: builtin/grep.c
+#: builtin/grep.c:1021
 msgid "maximum number of results per file"
 msgstr "每个文件的最大结果数量"
 
-#: builtin/grep.c
+#: builtin/grep.c:1091
 msgid "no pattern given"
 msgstr "未提供匹配模式"
 
-#: builtin/grep.c
+#: builtin/grep.c:1127
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index 或 --untracked 不能和版本同时使用"
 
-#: builtin/grep.c
+#: builtin/grep.c:1135
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "不能解析版本：%s"
 
-#: builtin/grep.c
+#: builtin/grep.c:1165
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked 不支持和 --recurse-submodules 共用"
 
-#: builtin/grep.c
+#: builtin/grep.c:1176
 msgid "invalid option combination, ignoring --threads"
 msgstr "无效的选项组合，忽略 --threads"
 
-#: builtin/grep.c builtin/pack-objects.c
+#: builtin/grep.c:1179 builtin/pack-objects.c:4494
 msgid "no threads support, ignoring --threads"
 msgstr "没有线程支持，忽略 --threads"
 
-#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c
+#: builtin/grep.c:1182 builtin/index-pack.c:1591 builtin/pack-objects.c:3278
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的线程数无效（%d）"
 
-#: builtin/grep.c
+#: builtin/grep.c:1216
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 仅用于工作区"
 
-#: builtin/grep.c
+#: builtin/grep.c:1249
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
 
-#: builtin/grep.c
+#: builtin/grep.c:1257
 msgid "both --cached and trees are given"
 msgstr "同时给出了 --cached 和树对象"
 
-#: builtin/hash-object.c
+#: builtin/hash-object.c:90
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n"
 "                [--stdin [--literally]] [--] <file>..."
@@ -8664,111 +8925,111 @@ msgstr ""
 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters]\n"
 "                [--stdin [--literally]] [--] <文件>..."
 
-#: builtin/hash-object.c
+#: builtin/hash-object.c:92
 msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]"
 msgstr "git hash-object [-t <类型>] [-w] --stdin-paths [--no-filters]"
 
-#: builtin/hash-object.c
+#: builtin/hash-object.c:105
 msgid "object type"
 msgstr "对象类型"
 
-#: builtin/hash-object.c
+#: builtin/hash-object.c:106
 msgid "write the object into the object database"
 msgstr "将对象写入对象数据库"
 
-#: builtin/hash-object.c
+#: builtin/hash-object.c:108
 msgid "read the object from stdin"
 msgstr "从标准输入读取对象"
 
-#: builtin/hash-object.c
+#: builtin/hash-object.c:110
 msgid "store file as is without filters"
 msgstr "原样存储文件不使用过滤器"
 
-#: builtin/hash-object.c
+#: builtin/hash-object.c:111
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
 
-#: builtin/hash-object.c
+#: builtin/hash-object.c:112
 msgid "process file as it were from this path"
 msgstr "处理文件并假设其来自于此路径"
 
-#: builtin/help.c
+#: builtin/help.c:62
 msgid "print all available commands"
 msgstr "打印所有可用的命令"
 
-#: builtin/help.c
+#: builtin/help.c:65
 msgid "show external commands in --all"
 msgstr "在 --all 中显示外部命令"
 
-#: builtin/help.c
+#: builtin/help.c:66
 msgid "show aliases in --all"
 msgstr "在 --all 中显示别名"
 
-#: builtin/help.c
+#: builtin/help.c:67
 msgid "exclude guides"
 msgstr "排除向导"
 
-#: builtin/help.c
+#: builtin/help.c:68
 msgid "show man page"
 msgstr "显示 man 手册"
 
-#: builtin/help.c
+#: builtin/help.c:69
 msgid "show manual in web browser"
 msgstr "在 web 浏览器中显示手册"
 
-#: builtin/help.c
+#: builtin/help.c:71
 msgid "show info page"
 msgstr "显示 info 手册"
 
-#: builtin/help.c
+#: builtin/help.c:73
 msgid "print command description"
 msgstr "打印命令描述"
 
-#: builtin/help.c
+#: builtin/help.c:75
 msgid "print list of useful guides"
 msgstr "显示有用的指南列表"
 
-#: builtin/help.c
+#: builtin/help.c:78
 msgid "print list of user-facing repository, command and file interfaces"
 msgstr "打印面向用户的仓库、命令和文件接口列表"
 
-#: builtin/help.c
+#: builtin/help.c:81
 msgid "print list of file formats, protocols and other developer interfaces"
 msgstr "打印文件格式、协议和其他开发者接口列表"
 
-#: builtin/help.c
+#: builtin/help.c:83
 msgid "print all configuration variable names"
 msgstr "打印所有配置变量名称"
 
-#: builtin/help.c
+#: builtin/help.c:95
 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]"
 msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>|<文档>]"
 
-#: builtin/help.c
+#: builtin/help.c:214
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "未能识别的帮助格式 '%s'"
 
-#: builtin/help.c
+#: builtin/help.c:240
 msgid "Failed to start emacsclient."
 msgstr "无法启动 emacsclient。"
 
-#: builtin/help.c
+#: builtin/help.c:253
 msgid "Failed to parse emacsclient version."
 msgstr "无法解析 emacsclient 版本。"
 
-#: builtin/help.c
+#: builtin/help.c:261
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient 版本 '%d' 太老（< 22）。"
 
-#: builtin/help.c
+#: builtin/help.c:279 builtin/help.c:301 builtin/help.c:311 builtin/help.c:319
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "无法执行 '%s'"
 
-#: builtin/help.c
+#: builtin/help.c:357
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -8777,7 +9038,7 @@ msgstr ""
 "'%s'：不支持的 man 手册查看器的路径。\n"
 "请使用 'man.<工具>.cmd'。"
 
-#: builtin/help.c
+#: builtin/help.c:369
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -8786,49 +9047,49 @@ msgstr ""
 "'%s': 支持的 man 手册查看器命令。\n"
 "请使用 'man.<工具>.path'。"
 
-#: builtin/help.c
+#: builtin/help.c:487
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s'：未知的 man 查看器。"
 
-#: builtin/help.c
+#: builtin/help.c:503
 msgid "no man viewer handled the request"
 msgstr "没有 man 查看器处理此请求"
 
-#: builtin/help.c
+#: builtin/help.c:510
 msgid "no info viewer handled the request"
 msgstr "没有 info 查看器处理此请求"
 
-#: builtin/help.c git.c
+#: builtin/help.c:571 builtin/help.c:582 git.c:370
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' 是 '%s' 的别名"
 
-#: builtin/help.c git.c
+#: builtin/help.c:585 git.c:400
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "坏的 alias.%s 字符串：%s"
 
-#: builtin/help.c
+#: builtin/help.c:627
 #, c-format
 msgid "the '%s' option doesn't take any non-option arguments"
 msgstr "'%s' 选项不带任何非选项参数"
 
-#: builtin/help.c
+#: builtin/help.c:647
 msgid ""
 "the '--no-[external-commands|aliases]' options can only be used with '--all'"
 msgstr "'--no-[external-commands|aliases]' 选项只能和 '--all' 一起使用"
 
-#: builtin/help.c
+#: builtin/help.c:659 builtin/help.c:695
 #, c-format
 msgid "usage: %s%s"
 msgstr "用法：%s%s"
 
-#: builtin/help.c
+#: builtin/help.c:690
 msgid "'git help config' for more information"
 msgstr "'git help config' 获取更多信息"
 
-#: builtin/hook.c
+#: builtin/hook.c:9
 msgid ""
 "git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-"
 "args>]"
@@ -8836,283 +9097,285 @@ msgstr ""
 "git hook run [--ignore-missing] [--to-stdin=<路径>] <钩子名称> [-- <钩子参数"
 ">]"
 
-#: builtin/hook.c
+#: builtin/hook.c:29
 msgid "silently ignore missing requested <hook-name>"
 msgstr "静默地忽略缺失的 <钩子名称>"
 
-#: builtin/hook.c
+#: builtin/hook.c:31
 msgid "file to read into hooks' stdin"
 msgstr "读取至钩子标准输入的文件"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:229
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "%s 的对象类型不匹配"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:249
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "未能获取预期的对象 %s"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:252
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "对象 %s：应为类型 %s，却是 %s"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:302
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "无法填充 %d 字节"
 msgstr[1] "无法填充 %d 字节"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:312
 msgid "early EOF"
 msgstr "过早的文件结束符（EOF）"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:313
 msgid "read error on input"
 msgstr "输入上的读错误"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:325
 msgid "used more bytes than were available"
 msgstr "用掉了超过可用的字节"
 
-#: builtin/index-pack.c builtin/pack-objects.c
+#: builtin/index-pack.c:332 builtin/pack-objects.c:769
 msgid "pack too large for current definition of off_t"
 msgstr "包太大超过了当前 off_t 的定义"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:337
 #, c-format
 msgid "pack exceeds maximum allowed size (%s)"
 msgstr "包超过了最大允许大小（%s）"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:370
 msgid "pack signature mismatch"
 msgstr "包签名不匹配"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:372
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "不支持包版本 %<PRIu32>"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:388
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:493
 #, c-format
 msgid "inflate returned %d"
 msgstr "解压缩返回 %d"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:543
 msgid "offset value overflow for delta base object"
 msgstr "偏移值覆盖了 delta 基准对象"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:551
 msgid "delta base offset is out of bound"
 msgstr "delta 基准偏移越界"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:559
 #, c-format
 msgid "unknown object type %d"
 msgstr "未知对象类型 %d"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:590
 msgid "cannot pread pack file"
 msgstr "无法读取包文件"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:592
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "包文件过早结束，缺少 %<PRIuMAX> 字节"
 msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:618
 msgid "serious inflate inconsistency"
 msgstr "解压缩严重的不一致"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:763 builtin/index-pack.c:769 builtin/index-pack.c:793
+#: builtin/index-pack.c:833 builtin/index-pack.c:843
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "发现 %s 出现 SHA1 冲突！"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:831
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "不能读取现存对象信息 %s"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:840
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "不能读取现存对象 %s"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:854
 #, c-format
 msgid "invalid blob object %s"
 msgstr "无效的数据对象 %s"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:857 builtin/index-pack.c:876
 msgid "fsck error in packed object"
 msgstr "对打包对象 fsck 检查出错"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:878
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s 的所有子对象并非都可达"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:939 builtin/index-pack.c:986
 msgid "failed to apply delta"
 msgstr "无法应用 delta"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1173
 msgid "Receiving objects"
 msgstr "接收对象中"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1173
 msgid "Indexing objects"
 msgstr "索引对象中"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1209
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "包冲突（SHA1 不匹配）"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1214
 msgid "cannot fstat packfile"
 msgstr "不能对包文件调用 fstat"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1217
 msgid "pack has junk at the end"
 msgstr "包的结尾有垃圾数据"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1229
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1252
 msgid "Resolving deltas"
 msgstr "处理 delta 中"
 
-#: builtin/index-pack.c builtin/pack-objects.c
+#: builtin/index-pack.c:1264 builtin/pack-objects.c:3022
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "不能创建线程：%s"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1298
 msgid "confusion beyond insanity"
 msgstr "不可理喻"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1304
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "完成 %d 个本地对象"
 msgstr[1] "完成 %d 个本地对象"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1316
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1320
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "包有 %d 个未解决的 delta"
 msgstr[1] "包有 %d 个未解决的 delta"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1344
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "不能压缩附加对象（%d）"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "本地对象 %s 已损坏"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1462
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "包文件名 '%s' 没有以 '.%s' 结尾"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1486
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "无法写入 %s 文件 '%s'"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1494
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "无法关闭已写入的 %s 文件 '%s'"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1511
 #, c-format
 msgid "unable to rename temporary '*.%s' file to '%s'"
 msgstr "不能重命名临时文件 '*.%s' 为 '%s'"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1534
 msgid "error while closing pack file"
 msgstr "关闭包文件时出错"
 
-#: builtin/index-pack.c builtin/pack-objects.c
+#: builtin/index-pack.c:1585 builtin/pack-objects.c:3289
 #, c-format
 msgid "bad pack.indexVersion=%<PRIu32>"
 msgstr "坏的 pack.indexVersion=%<PRIu32>"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1655
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "无法打开现存包文件 '%s'"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1657
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "无法为 %s 打开包索引文件"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1705
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "非 delta：%d 个对象"
 msgstr[1] "非 delta：%d 个对象"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1712
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "链长 = %d: %lu 对象"
 msgstr[1] "链长 = %d: %lu 对象"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1756
 msgid "Cannot come back to cwd"
 msgstr "无法返回当前工作目录"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1811 builtin/index-pack.c:1814
+#: builtin/index-pack.c:1834 builtin/index-pack.c:1838
 #, c-format
 msgid "bad %s"
 msgstr "错误选项 %s"
 
-#: builtin/index-pack.c builtin/init-db.c setup.c
+#: builtin/index-pack.c:1844 builtin/init-db.c:164 setup.c:2302
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "未知的哈希算法 '%s'"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1865
 msgid "--stdin requires a git repository"
 msgstr "--stdin 需要 git 仓库"
 
-#: builtin/index-pack.c
+#: builtin/index-pack.c:1882
 msgid "--verify with no packfile name given"
 msgstr "--verify 没有提供包文件名参数"
 
-#: builtin/index-pack.c builtin/unpack-objects.c
+#: builtin/index-pack.c:1948 builtin/unpack-objects.c:675
 msgid "fsck error in pack objects"
 msgstr "在打包对象中 fsck 检查出错"
 
-#: builtin/init-db.c
+#: builtin/init-db.c:59
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
 "         [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
@@ -9126,53 +9389,53 @@ msgstr ""
 "         [-b <分支名> | --initial-branch=<分支名>]\n"
 "         [--shared[=<权限>]] [<目录>]"
 
-#: builtin/init-db.c
+#: builtin/init-db.c:92
 msgid "permissions"
 msgstr "权限"
 
-#: builtin/init-db.c
+#: builtin/init-db.c:93
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "指定 git 仓库是多个用户之间共享的"
 
-#: builtin/init-db.c
+#: builtin/init-db.c:99
 msgid "override the name of the initial branch"
 msgstr "覆盖初始分支名称"
 
-#: builtin/init-db.c builtin/verify-pack.c
+#: builtin/init-db.c:100 builtin/verify-pack.c:75
 msgid "hash"
 msgstr "hash"
 
-#: builtin/init-db.c builtin/show-index.c builtin/verify-pack.c
+#: builtin/init-db.c:101 builtin/show-index.c:25 builtin/verify-pack.c:76
 msgid "specify the hash algorithm to use"
 msgstr "指定要使用的哈希算法"
 
-#: builtin/init-db.c
+#: builtin/init-db.c:141 builtin/init-db.c:146
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "不能创建目录 %s"
 
-#: builtin/init-db.c
+#: builtin/init-db.c:150 builtin/init-db.c:211
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "不能切换目录到 %s"
 
-#: builtin/init-db.c
+#: builtin/init-db.c:183
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
 
-#: builtin/init-db.c
+#: builtin/init-db.c:235
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "不能访问工作区 '%s'"
 
-#: builtin/init-db.c
+#: builtin/init-db.c:240
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir 不能用于纯仓库"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:17
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty]\n"
 "                       [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n"
@@ -9182,234 +9445,236 @@ msgstr ""
 "                       [(--trailer (<键|键别名>)[(=|:)<值>])...]\n"
 "                       [--parse] [<文件>...]"
 
-#: builtin/interpret-trailers.c wrapper.c
+#: builtin/interpret-trailers.c:105 wrapper.c:728
 #, c-format
 msgid "could not stat %s"
 msgstr "不能对 %s 调用 stat"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:107
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "文件 %s 不是一个普通文件"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:109
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "文件 %s 用户不可写"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:121
 msgid "could not open temporary file"
 msgstr "不能打开临时文件"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:130
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "不能读取输入文件 '%s'"
 
-#: builtin/interpret-trailers.c builtin/mktag.c imap-send.c
+#: builtin/interpret-trailers.c:133 builtin/mktag.c:92 imap-send.c:1552
 msgid "could not read from stdin"
 msgstr "不能自标准输入读取"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:186
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "不能重命名临时文件为 %s"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:197
 msgid "edit files in place"
 msgstr "在原位编辑文件"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:198
 msgid "trim empty trailers"
 msgstr "删除空的尾注"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:200
 msgid "placement"
 msgstr "安置"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:201
 msgid "where to place the new trailer"
 msgstr "在哪里放置新的尾注"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:203
 msgid "action if trailer already exists"
 msgstr "当尾注已经存在时所采取的动作"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:205
 msgid "action if trailer is missing"
 msgstr "当尾注缺失时所采取的动作"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:207
 msgid "output only the trailers"
 msgstr "只输出尾注"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:208
 msgid "do not apply trailer.* configuration variables"
 msgstr "不应用 trailer.* 配置变量"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:209
 msgid "reformat multiline trailer values as single-line values"
 msgstr "将多行尾注值重新格式化为单行值"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:210
 msgid "alias for --only-trailers --only-input --unfold"
 msgstr "--only-trailers --only-input --unfold 的别名"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:212
 msgid "do not treat \"---\" as the end of input"
 msgstr "不要将 \"---\" 视为输入的结束"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:214
 msgid "trailer(s) to add"
 msgstr "要添加的尾注"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:225
 msgid "--trailer with --only-input does not make sense"
 msgstr "--trailer 和 --only-input 同时使用没有意义"
 
-#: builtin/interpret-trailers.c
+#: builtin/interpret-trailers.c:235
 msgid "no input file given for in-place editing"
 msgstr "没有给出要原位编辑的文件"
 
-#: builtin/log.c
+#: builtin/log.c:56
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
 
-#: builtin/log.c
+#: builtin/log.c:57
 msgid "git show [<options>] <object>..."
 msgstr "git show [<选项>] <对象>..."
 
-#: builtin/log.c
+#: builtin/log.c:162
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "无效的 --decorate 选项：%s"
 
-#: builtin/log.c diff.c
+#: builtin/log.c:265 diff.c:5620
 msgid "suppress diff output"
 msgstr "不显示差异输出"
 
-#: builtin/log.c
+#: builtin/log.c:266
 msgid "show source"
 msgstr "显示源"
 
-#: builtin/log.c
+#: builtin/log.c:270
 msgid "clear all previously-defined decoration filters"
 msgstr "清除所有之前定义的修饰过滤器"
 
-#: builtin/log.c
+#: builtin/log.c:274
 msgid "only decorate refs that match <pattern>"
 msgstr "只修饰与 <模式> 匹配的引用"
 
-#: builtin/log.c
+#: builtin/log.c:276
 msgid "do not decorate refs that match <pattern>"
 msgstr "不修饰和 <模式> 匹配的引用"
 
-#: builtin/log.c
+#: builtin/log.c:277
 msgid "decorate options"
 msgstr "修饰选项"
 
-#: builtin/log.c
+#: builtin/log.c:280
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
 msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变"
 
-#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c
+#: builtin/log.c:300 builtin/log.c:2241 builtin/replay.c:336
+#: builtin/shortlog.c:439 bundle.c:531
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "未能识别的参数：%s"
 
-#: builtin/log.c
+#: builtin/log.c:303
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<范围>:<文件> 不能和路径表达式共用"
 
-#: builtin/log.c
+#: builtin/log.c:404
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最终输出：%d %s\n"
 
-#: builtin/log.c
+#: builtin/log.c:511
 msgid "unable to create temporary object directory"
 msgstr "无法创建临时对象目录"
 
-#: builtin/log.c
+#: builtin/log.c:706
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: 损坏的文件"
 
-#: builtin/log.c
+#: builtin/log.c:721 builtin/log.c:823
 #, c-format
 msgid "could not read object %s"
 msgstr "不能读取对象 %s"
 
-#: builtin/log.c
+#: builtin/log.c:861
 #, c-format
 msgid "unknown type: %d"
 msgstr "未知类型：%d"
 
-#: builtin/log.c
+#: builtin/log.c:1043
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s：从描述生成附函的模式无效"
 
-#: builtin/log.c
+#: builtin/log.c:1073
 msgid "format.headers without value"
 msgstr "format.headers 没有值"
 
-#: builtin/log.c
+#: builtin/log.c:1234
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "无法打开补丁文件 %s"
 
-#: builtin/log.c
+#: builtin/log.c:1251
 msgid "need exactly one range"
 msgstr "只需要一个范围"
 
-#: builtin/log.c
+#: builtin/log.c:1261
 msgid "not a range"
 msgstr "不是一个范围"
 
-#: builtin/log.c
+#: builtin/log.c:1356
 #, c-format
 msgid "unable to read branch description file '%s'"
 msgstr "无法读取分支描述文件 '%s'"
 
-#: builtin/log.c
+#: builtin/log.c:1439
 msgid "cover letter needs email format"
 msgstr "附函需要邮件地址格式"
 
-#: builtin/log.c
+#: builtin/log.c:1445
 msgid "failed to create cover-letter file"
 msgstr "无法创建附函文件"
 
-#: builtin/log.c
+#: builtin/log.c:1536
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "不正常的 in-reply-to：%s"
 
-#: builtin/log.c
+#: builtin/log.c:1563
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
 
-#: builtin/log.c
+#: builtin/log.c:1631
 msgid "two output directories?"
 msgstr "两个输出目录？"
 
-#: builtin/log.c
+#: builtin/log.c:1768 builtin/log.c:2657 builtin/log.c:2659 builtin/log.c:2671
 #, c-format
 msgid "unknown commit %s"
 msgstr "未知提交 %s"
 
-#: builtin/log.c builtin/replace.c
+#: builtin/log.c:1779 builtin/replace.c:67 builtin/replace.c:222
+#: builtin/replace.c:225
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "无法将 '%s' 解析为一个有效引用"
 
-#: builtin/log.c
+#: builtin/log.c:1791
 msgid "could not find exact merge base"
 msgstr "不能找到准确的合并基线"
 
-#: builtin/log.c
+#: builtin/log.c:1801
 msgid ""
 "failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9419,412 +9684,417 @@ msgstr ""
 "git branch --set-upstream-to 来跟踪一个远程分支。或者您可以通过\n"
 "参数 --base=<基线提交> 手动指定一个基线提交"
 
-#: builtin/log.c
+#: builtin/log.c:1826
 msgid "failed to find exact merge base"
 msgstr "无法找到准确的合并基线"
 
-#: builtin/log.c
+#: builtin/log.c:1846
 msgid "base commit should be the ancestor of revision list"
 msgstr "基线提交应该是版本列表的祖先"
 
-#: builtin/log.c
+#: builtin/log.c:1856
 msgid "base commit shouldn't be in revision list"
 msgstr "基线提交不应该出现在版本列表中"
 
-#: builtin/log.c
+#: builtin/log.c:1914
 msgid "cannot get patch id"
 msgstr "无法得到补丁 id"
 
-#: builtin/log.c
+#: builtin/log.c:1977
 msgid "failed to infer range-diff origin of current series"
 msgstr "无法推断当前系列的 range-diff 起始"
 
-#: builtin/log.c
+#: builtin/log.c:1979
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "使用 '%s' 作为当前系列的 range-diff 源"
 
-#: builtin/log.c
+#: builtin/log.c:2033
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，即使只有一个补丁"
 
-#: builtin/log.c
+#: builtin/log.c:2036
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，即使有多个补丁"
 
-#: builtin/log.c
+#: builtin/log.c:2040
 msgid "print patches to standard out"
 msgstr "打印补丁到标准输出"
 
-#: builtin/log.c
+#: builtin/log.c:2042
 msgid "generate a cover letter"
 msgstr "生成一封附函"
 
-#: builtin/log.c
+#: builtin/log.c:2044
 msgid "use simple number sequence for output file names"
 msgstr "使用简单的数字序列作为输出文件名"
 
-#: builtin/log.c
+#: builtin/log.c:2045
 msgid "sfx"
 msgstr "后缀"
 
-#: builtin/log.c
+#: builtin/log.c:2046
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <后缀> 代替 '.patch'"
 
-#: builtin/log.c
+#: builtin/log.c:2048
 msgid "start numbering patches at <n> instead of 1"
 msgstr "补丁以 <n> 开始编号，而不是1"
 
-#: builtin/log.c
+#: builtin/log.c:2049
 msgid "reroll-count"
 msgstr "重制-计数"
 
-#: builtin/log.c
+#: builtin/log.c:2050
 msgid "mark the series as Nth re-roll"
 msgstr "标记补丁系列是第几次重制"
 
-#: builtin/log.c
+#: builtin/log.c:2052
 msgid "max length of output filename"
 msgstr "输出文件名的最大长度"
 
-#: builtin/log.c
-msgid "use [RFC PATCH] instead of [PATCH]"
-msgstr "使用 [RFC PATCH] 代替 [PATCH]"
+#: builtin/log.c:2053
+msgid "rfc"
+msgstr "rfc 补丁"
+
+#: builtin/log.c:2054
+msgid "add <rfc> (default 'RFC') before 'PATCH'"
+msgstr "在 'PATCH' 之前添加 <rfc> （默认为 'RFC'）"
 
-#: builtin/log.c
+#: builtin/log.c:2057
 msgid "cover-from-description-mode"
 msgstr "从分支描述获取附函的模式"
 
-#: builtin/log.c
+#: builtin/log.c:2058
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "基于一个分支描述生成部分附函"
 
-#: builtin/log.c
+#: builtin/log.c:2060
 msgid "use branch description from file"
 msgstr "使用来自文件的分支描述"
 
-#: builtin/log.c
+#: builtin/log.c:2062
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<前缀>] 代替 [PATCH]"
 
-#: builtin/log.c
+#: builtin/log.c:2065
 msgid "store resulting files in <dir>"
 msgstr "把结果文件存储在 <目录>"
 
-#: builtin/log.c
+#: builtin/log.c:2068
 msgid "don't strip/add [PATCH]"
 msgstr "不删除/添加 [PATCH]"
 
-#: builtin/log.c
+#: builtin/log.c:2071
 msgid "don't output binary diffs"
 msgstr "不输出二进制差异"
 
-#: builtin/log.c
+#: builtin/log.c:2073
 msgid "output all-zero hash in From header"
 msgstr "在 From 头信息中输出全为零的哈希值"
 
-#: builtin/log.c
+#: builtin/log.c:2075
 msgid "don't include a patch matching a commit upstream"
 msgstr "不包含已在上游提交中的补丁"
 
-#: builtin/log.c
+#: builtin/log.c:2077
 msgid "show patch format instead of default (patch + stat)"
 msgstr "显示纯补丁格式而非默认的（补丁+状态）"
 
-#: builtin/log.c
+#: builtin/log.c:2079
 msgid "Messaging"
 msgstr "邮件发送"
 
-#: builtin/log.c
+#: builtin/log.c:2080
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c
+#: builtin/log.c:2081
 msgid "add email header"
 msgstr "添加邮件头"
 
-#: builtin/log.c
+#: builtin/log.c:2082 builtin/log.c:2083
 msgid "email"
 msgstr "邮件地址"
 
-#: builtin/log.c
+#: builtin/log.c:2082
 msgid "add To: header"
 msgstr "添加收件人"
 
-#: builtin/log.c
+#: builtin/log.c:2083
 msgid "add Cc: header"
 msgstr "添加抄送"
 
-#: builtin/log.c
+#: builtin/log.c:2084
 msgid "ident"
 msgstr "标识"
 
-#: builtin/log.c
+#: builtin/log.c:2085
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
 
-#: builtin/log.c
+#: builtin/log.c:2087
 msgid "message-id"
 msgstr "邮件标识"
 
-#: builtin/log.c
+#: builtin/log.c:2088
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
 
-#: builtin/log.c
+#: builtin/log.c:2089 builtin/log.c:2092
 msgid "boundary"
 msgstr "边界"
 
-#: builtin/log.c
+#: builtin/log.c:2090
 msgid "attach the patch"
 msgstr "附件方式添加补丁"
 
-#: builtin/log.c
+#: builtin/log.c:2093
 msgid "inline the patch"
 msgstr "内联显示补丁"
 
-#: builtin/log.c
+#: builtin/log.c:2097
 msgid "enable message threading, styles: shallow, deep"
 msgstr "启用邮件线索，风格：浅，深"
 
-#: builtin/log.c
+#: builtin/log.c:2099
 msgid "signature"
 msgstr "签名"
 
-#: builtin/log.c
+#: builtin/log.c:2100
 msgid "add a signature"
 msgstr "添加一个签名"
 
-#: builtin/log.c
+#: builtin/log.c:2101
 msgid "base-commit"
 msgstr "基线提交"
 
-#: builtin/log.c
+#: builtin/log.c:2102
 msgid "add prerequisite tree info to the patch series"
 msgstr "为补丁列表添加前置树信息"
 
-#: builtin/log.c
+#: builtin/log.c:2105
 msgid "add a signature from a file"
 msgstr "从文件添加一个签名"
 
-#: builtin/log.c
+#: builtin/log.c:2106
 msgid "don't print the patch filenames"
 msgstr "不要打印补丁文件名"
 
-#: builtin/log.c
+#: builtin/log.c:2108
 msgid "show progress while generating patches"
 msgstr "在生成补丁时显示进度"
 
-#: builtin/log.c
+#: builtin/log.c:2110
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "在附函或单个补丁中显示和 <版本> 的差异"
 
-#: builtin/log.c
+#: builtin/log.c:2113
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "在附函或单个补丁中显示和 <引用规格> 的差异"
 
-#: builtin/log.c builtin/range-diff.c
+#: builtin/log.c:2115 builtin/range-diff.c:29
 msgid "percentage by which creation is weighted"
 msgstr "创建权重的百分比"
 
-#: builtin/log.c
+#: builtin/log.c:2117
 msgid "show in-body From: even if identical to the e-mail header"
 msgstr "显示正文内的 From:，即使其与电子邮件头中一致"
 
-#: builtin/log.c
+#: builtin/log.c:2219
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "包含无效的身份标识：%s"
 
-#: builtin/log.c
+#: builtin/log.c:2244
 msgid "--name-only does not make sense"
 msgstr "--name-only 无意义"
 
-#: builtin/log.c
+#: builtin/log.c:2246
 msgid "--name-status does not make sense"
 msgstr "--name-status 无意义"
 
-#: builtin/log.c
+#: builtin/log.c:2248
 msgid "--check does not make sense"
 msgstr "--check 无意义"
 
-#: builtin/log.c
+#: builtin/log.c:2250
 msgid "--remerge-diff does not make sense"
 msgstr "--remerge-diff 无意义"
 
-#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c
+#: builtin/log.c:2306 builtin/submodule--helper.c:1722
+#: builtin/submodule--helper.c:1780 rerere.c:880 submodule.c:2379
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "不能创建目录 '%s'"
 
-#: builtin/log.c
+#: builtin/log.c:2397
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff 需要 --cover-letter 或单一补丁"
 
-#: builtin/log.c
+#: builtin/log.c:2401
 msgid "Interdiff:"
 msgstr "版本间差异："
 
-#: builtin/log.c
+#: builtin/log.c:2402
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "对 v%d 的版本差异："
 
-#: builtin/log.c
+#: builtin/log.c:2412
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff 需要 --cover-letter 或单一补丁"
 
-#: builtin/log.c
+#: builtin/log.c:2420
 msgid "Range-diff:"
 msgstr "范围差异："
 
-#: builtin/log.c
+#: builtin/log.c:2421
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "对 v%d 的范围差异："
 
-#: builtin/log.c
+#: builtin/log.c:2443
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "无法读取签名文件 '%s'"
 
-#: builtin/log.c
+#: builtin/log.c:2483
 msgid "Generating patches"
 msgstr "生成补丁"
 
-#: builtin/log.c
+#: builtin/log.c:2527
 msgid "failed to create output files"
 msgstr "无法创建输出文件"
 
-#: builtin/log.c
+#: builtin/log.c:2592
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
 
-#: builtin/log.c
+#: builtin/log.c:2646
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
 
-#: builtin/ls-files.c builtin/ls-tree.c
+#: builtin/ls-files.c:251 builtin/ls-tree.c:29
 #, c-format
 msgid "could not get object info about '%s'"
 msgstr "无法获得关于 '%s' 的对象信息"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:520
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<选项>] [<文件>...]"
 
-#: builtin/ls-files.c builtin/merge-tree.c
+#: builtin/ls-files.c:574 builtin/merge-tree.c:551
 msgid "separate paths with the NUL character"
 msgstr "用 NUL 字符分隔路径"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:576
 msgid "identify the file status with tags"
 msgstr "用标签标识文件的状态"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:578
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "使用小写字母表示 '假设未改变的' 文件"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:580
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "使用小写字母表示 'fsmonitor clean' 文件"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:582
 msgid "show cached files in the output (default)"
 msgstr "显示缓存的文件（默认）"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:584
 msgid "show deleted files in the output"
 msgstr "显示已删除的文件"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:586
 msgid "show modified files in the output"
 msgstr "显示已修改的文件"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:588
 msgid "show other files in the output"
 msgstr "显示其它文件"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:590
 msgid "show ignored files in the output"
 msgstr "显示忽略的文件"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:593
 msgid "show staged contents' object name in the output"
 msgstr "显示暂存区内容的对象名称"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:595
 msgid "show files on the filesystem that need to be removed"
 msgstr "显示文件系统需要删除的文件"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:597
 msgid "show 'other' directories' names only"
 msgstr "只显示“其他”目录的名称"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:599
 msgid "show line endings of files"
 msgstr "显示文件换行符格式"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:601
 msgid "don't show empty directories"
 msgstr "不显示空目录"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:604
 msgid "show unmerged files in the output"
 msgstr "显示未合并的文件"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:606
 msgid "show resolve-undo information"
 msgstr "显示 resolve-undo 信息"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:608
 msgid "skip files matching pattern"
 msgstr "跳过和模式匹配的文件"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:611
 msgid "read exclude patterns from <file>"
 msgstr "从 <文件> 读取排除模式"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:614
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "从 <文件> 读取额外的每个目录的排除模式"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:616
 msgid "add the standard git exclusions"
 msgstr "添加标准的 git 排除"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:620
 msgid "make the output relative to the project top directory"
 msgstr "显示相对于顶级目录的文件名"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:625
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "如果任何 <文件> 都不在索引区，视为错误"
 
-#: builtin/ls-files.c builtin/merge-tree.c
+#: builtin/ls-files.c:626 builtin/merge-tree.c:566
 msgid "tree-ish"
 msgstr "树对象"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:627
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:629
 msgid "show debugging data"
 msgstr "显示调试数据"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:631
 msgid "suppress duplicate entries"
 msgstr "抑制重复条目"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:633
 msgid "show sparse directories in the presence of a sparse index"
 msgstr "在稀疏索引存在时显示稀疏目录"
 
-#: builtin/ls-files.c
+#: builtin/ls-files.c:664
 msgid ""
 "--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, "
 "--eol"
@@ -9832,195 +10102,199 @@ msgstr ""
 "--format 不能和 -s、-o、-k、-t、--resolve-undo、--deduplicate 和 --eol 同时使"
 "用"
 
-#: builtin/ls-remote.c
+#: builtin/ls-remote.c:12
 msgid ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
 "              [--symref] [<repository> [<patterns>...]]"
 msgstr ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<可执行文件>]\n"
+"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<可执行文件>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url] [--sort=<键>]\n"
 "              [--symref] [<仓库> [<模式>...]]"
 
-#: builtin/ls-remote.c
+#: builtin/ls-remote.c:64
 msgid "do not print remote URL"
 msgstr "不打印远程 URL"
 
-#: builtin/ls-remote.c builtin/rebase.c
+#: builtin/ls-remote.c:65 builtin/ls-remote.c:67 builtin/rebase.c:1172
 msgid "exec"
 msgstr "exec"
 
-#: builtin/ls-remote.c
+#: builtin/ls-remote.c:66 builtin/ls-remote.c:68
 msgid "path of git-upload-pack on the remote host"
 msgstr "远程主机上的 git-upload-pack 路径"
 
-#: builtin/ls-remote.c
+#: builtin/ls-remote.c:70
 msgid "limit to tags"
 msgstr "仅限于标签"
 
-#: builtin/ls-remote.c
-msgid "limit to heads"
+#: builtin/ls-remote.c:71
+msgid "limit to branches"
 msgstr "仅限于分支"
 
-#: builtin/ls-remote.c
+#: builtin/ls-remote.c:73 builtin/show-ref.c:299
+msgid "deprecated synonym for --branches"
+msgstr "已弃用的 --branches 同义词"
+
+#: builtin/ls-remote.c:75
 msgid "do not show peeled tags"
 msgstr "不显示已解析的标签"
 
-#: builtin/ls-remote.c
+#: builtin/ls-remote.c:77
 msgid "take url.<base>.insteadOf into account"
 msgstr "参考 url.<base>.insteadOf 设置"
 
-#: builtin/ls-remote.c
+#: builtin/ls-remote.c:80
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "若未找到匹配的引用则以退出码2退出"
 
-#: builtin/ls-remote.c
+#: builtin/ls-remote.c:83
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "除了显示指向的对象外，显示指向的引用名"
 
-#: builtin/ls-tree.c
+#: builtin/ls-tree.c:19
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
 
-#: builtin/ls-tree.c
+#: builtin/ls-tree.c:343
 msgid "only show trees"
 msgstr "只显示树"
 
-#: builtin/ls-tree.c
+#: builtin/ls-tree.c:345
 msgid "recurse into subtrees"
 msgstr "递归到子树"
 
-#: builtin/ls-tree.c
+#: builtin/ls-tree.c:347
 msgid "show trees when recursing"
 msgstr "当递归时显示树"
 
-#: builtin/ls-tree.c
+#: builtin/ls-tree.c:350
 msgid "terminate entries with NUL byte"
 msgstr "条目以 NUL 字符终止"
 
-#: builtin/ls-tree.c
+#: builtin/ls-tree.c:351
 msgid "include object size"
 msgstr "包括对象大小"
 
-#: builtin/ls-tree.c
+#: builtin/ls-tree.c:353 builtin/ls-tree.c:355
 msgid "list only filenames"
 msgstr "只列出文件名"
 
-#: builtin/ls-tree.c
+#: builtin/ls-tree.c:357
 msgid "list only objects"
 msgstr "只列出对象"
 
-#: builtin/ls-tree.c
+#: builtin/ls-tree.c:359
 msgid "use full path names"
 msgstr "使用文件的全路径"
 
-#: builtin/ls-tree.c
+#: builtin/ls-tree.c:361
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"
 
-#: builtin/ls-tree.c
+#: builtin/ls-tree.c:398
 msgid "--format can't be combined with other format-altering options"
 msgstr "--format 不能和改变格式的选项同时使用"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
-#: builtin/mailinfo.c
+#: builtin/mailinfo.c:15
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [<选项>] <消息> <补丁> < mail >info"
 
-#: builtin/mailinfo.c
+#: builtin/mailinfo.c:59
 msgid "keep subject"
 msgstr "保持主题"
 
-#: builtin/mailinfo.c
+#: builtin/mailinfo.c:61
 msgid "keep non patch brackets in subject"
 msgstr "在主题中保持无补丁括号标注"
 
-#: builtin/mailinfo.c
+#: builtin/mailinfo.c:63
 msgid "copy Message-ID to the end of commit message"
 msgstr "拷贝 Message-ID 至提交说明结尾"
 
-#: builtin/mailinfo.c
+#: builtin/mailinfo.c:65
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr "将元数据重新编码为 i18n.commitEncoding"
 
-#: builtin/mailinfo.c
+#: builtin/mailinfo.c:68
 msgid "disable charset re-coding of metadata"
 msgstr "禁用元数据的字符集重新编码"
 
-#: builtin/mailinfo.c
+#: builtin/mailinfo.c:70
 msgid "encoding"
 msgstr "编码"
 
-#: builtin/mailinfo.c
+#: builtin/mailinfo.c:71
 msgid "re-code metadata to this encoding"
 msgstr "将元数据用此编码重新编码"
 
-#: builtin/mailinfo.c
+#: builtin/mailinfo.c:73
 msgid "use scissors"
 msgstr "使用剪刀标记"
 
-#: builtin/mailinfo.c
+#: builtin/mailinfo.c:74
 msgid "<action>"
 msgstr "<动作>"
 
-#: builtin/mailinfo.c
+#: builtin/mailinfo.c:75
 msgid "action when quoted CR is found"
 msgstr "找到引号中的 CR 时的操作"
 
-#: builtin/mailinfo.c
+#: builtin/mailinfo.c:78
 msgid "use headers in message's body"
 msgstr "在消息正文中使用标头"
 
-#: builtin/mailsplit.c
+#: builtin/mailsplit.c:227
 msgid "reading patches from stdin/tty..."
 msgstr "从标准输入或tty读取补丁……"
 
-#: builtin/mailsplit.c
+#: builtin/mailsplit.c:242
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "空的 mbox：'%s'"
 
-#: builtin/merge-base.c
+#: builtin/merge-base.c:35
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <提交> <提交>..."
 
-#: builtin/merge-base.c
+#: builtin/merge-base.c:36
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <提交>..."
 
-#: builtin/merge-base.c
+#: builtin/merge-base.c:37
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <提交> <提交>"
 
-#: builtin/merge-base.c
+#: builtin/merge-base.c:38
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <提交>..."
 
-#: builtin/merge-base.c
+#: builtin/merge-base.c:39
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <引用> [<提交>]"
 
-#: builtin/merge-base.c
+#: builtin/merge-base.c:155
 msgid "output all common ancestors"
 msgstr "输出所有共同的祖先"
 
-#: builtin/merge-base.c
+#: builtin/merge-base.c:157
 msgid "find ancestors for a single n-way merge"
 msgstr "查找一个多路合并的祖先提交"
 
-#: builtin/merge-base.c
+#: builtin/merge-base.c:159
 msgid "list revs not reachable from others"
 msgstr "显示不能被其他访问到的版本"
 
-#: builtin/merge-base.c
+#: builtin/merge-base.c:161
 msgid "is the first one ancestor of the other?"
 msgstr "第一个是其他的祖先提交么？"
 
-#: builtin/merge-base.c
+#: builtin/merge-base.c:163
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点"
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:15
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -10028,7 +10302,7 @@ msgstr ""
 "git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初"
 "始文件> <文件2>"
 
-#: builtin/merge-file.c diff.c
+#: builtin/merge-file.c:50 diff.c:5281
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -10036,345 +10310,345 @@ msgstr ""
 "选项 diff-algorithm 接受参数 \"myers\"、\"minimal\"、\"patience\" 和 "
 "\"histogram\""
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:65
 msgid "send results to standard output"
 msgstr "将结果发送到标准输出"
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:66
 msgid "use object IDs instead of filenames"
 msgstr "使用对象 ID 替换文件名"
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:67
 msgid "use a diff3 based merge"
 msgstr "使用基于 diff3 的合并"
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:68
 msgid "use a zealous diff3 based merge"
 msgstr "使用基于狂热 diff3（zealous diff3）的合并"
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:70
 msgid "for conflicts, use our version"
 msgstr "如果冲突，使用我们的版本"
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:72
 msgid "for conflicts, use their version"
 msgstr "如果冲突，使用他们的版本"
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:74
 msgid "for conflicts, use a union version"
 msgstr "如果冲突，使用联合版本"
 
-#: builtin/merge-file.c diff.c
+#: builtin/merge-file.c:76 diff.c:5799
 msgid "<algorithm>"
 msgstr "<算法>"
 
-#: builtin/merge-file.c diff.c
+#: builtin/merge-file.c:77 diff.c:5800
 msgid "choose a diff algorithm"
 msgstr "选择一个差异算法"
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:80
 msgid "for conflicts, use this marker size"
 msgstr "如果冲突，使用指定长度的标记"
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:81
 msgid "do not warn about conflicts"
 msgstr "不要警告冲突"
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:83
 msgid "set labels for file1/orig-file/file2"
 msgstr "为 文件1/初始文件/文件2 设置标签"
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:121
 #, c-format
 msgid "object '%s' does not exist"
 msgstr "对象 '%s' 不存在"
 
-#: builtin/merge-file.c
+#: builtin/merge-file.c:152
 msgid "Could not write object file"
 msgstr "不能写入对象文件"
 
-#: builtin/merge-recursive.c
+#: builtin/merge-recursive.c:48
 #, c-format
 msgid "unknown option %s"
 msgstr "未知选项 %s"
 
-#: builtin/merge-recursive.c
+#: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
 msgstr "不能解析对象 '%s'"
 
-#: builtin/merge-recursive.c
+#: builtin/merge-recursive.c:56
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
 msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
 msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
 
-#: builtin/merge-recursive.c
+#: builtin/merge-recursive.c:64
 msgid "not handling anything other than two heads merge."
 msgstr "不能处理两个头合并之外的任何操作。"
 
-#: builtin/merge-recursive.c
+#: builtin/merge-recursive.c:73 builtin/merge-recursive.c:75
 #, c-format
 msgid "could not resolve ref '%s'"
 msgstr "无法解析引用 '%s'"
 
-#: builtin/merge-recursive.c
+#: builtin/merge-recursive.c:81
 #, c-format
 msgid "Merging %s with %s\n"
 msgstr "合并 %s 和 %s\n"
 
-#: builtin/merge-tree.c
+#: builtin/merge-tree.c:446 builtin/merge-tree.c:451 builtin/merge-tree.c:456
 #, c-format
 msgid "could not parse as tree '%s'"
 msgstr "无法解析为树对象 '%s'"
 
-#: builtin/merge-tree.c builtin/merge.c
+#: builtin/merge-tree.c:467 builtin/merge-tree.c:472 builtin/merge.c:1222
 msgid "not something we can merge"
 msgstr "不是可以合并的东西"
 
-#: builtin/merge-tree.c builtin/merge.c
+#: builtin/merge-tree.c:482 builtin/merge.c:1562
 msgid "refusing to merge unrelated histories"
 msgstr "拒绝合并无关的历史"
 
-#: builtin/merge-tree.c
+#: builtin/merge-tree.c:489
 msgid "failure to merge"
 msgstr "合并失败"
 
-#: builtin/merge-tree.c
+#: builtin/merge-tree.c:538
 msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>"
 msgstr "git merge-tree [--write-tree] [<选项>] <分支1> <分支2>"
 
-#: builtin/merge-tree.c
+#: builtin/merge-tree.c:539
 msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>"
 msgstr "git merge-tree [--trivial-merge] <基准树> <分支1> <分支2>"
 
-#: builtin/merge-tree.c
+#: builtin/merge-tree.c:544
 msgid "do a real merge instead of a trivial merge"
 msgstr "进行真正的合并而不是简单的合并"
 
-#: builtin/merge-tree.c
+#: builtin/merge-tree.c:547
 msgid "do a trivial merge only"
 msgstr "只进行简单的合并"
 
-#: builtin/merge-tree.c
+#: builtin/merge-tree.c:549
 msgid "also show informational/conflict messages"
 msgstr "同时显示额外信息/冲突消息"
 
-#: builtin/merge-tree.c
+#: builtin/merge-tree.c:554
 msgid "list filenames without modes/oids/stages"
 msgstr "列出没有模式/对象 ID/暂存的文件名"
 
-#: builtin/merge-tree.c builtin/merge.c builtin/pull.c
+#: builtin/merge-tree.c:558 builtin/merge.c:285 builtin/pull.c:186
 msgid "allow merging unrelated histories"
 msgstr "允许合并不相关的历史"
 
-#: builtin/merge-tree.c
+#: builtin/merge-tree.c:562
 msgid "perform multiple merges, one per line of input"
 msgstr "实施多个合并，每输入行一个"
 
-#: builtin/merge-tree.c
+#: builtin/merge-tree.c:567
 msgid "specify a merge-base for the merge"
 msgstr "指定用于合并的合并基线"
 
-#: builtin/merge-tree.c builtin/merge.c builtin/pull.c
+#: builtin/merge-tree.c:568 builtin/merge.c:267 builtin/pull.c:178
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge-tree.c builtin/merge.c builtin/pull.c
+#: builtin/merge-tree.c:569 builtin/merge.c:268 builtin/pull.c:179
 msgid "option for selected merge strategy"
 msgstr "所选的合并策略的选项"
 
-#: builtin/merge-tree.c
+#: builtin/merge-tree.c:582 builtin/merge-tree.c:592 builtin/merge-tree.c:658
 msgid "--trivial-merge is incompatible with all other options"
 msgstr "--trivial-merge 与其他所有选项不兼容"
 
-#: builtin/merge-tree.c builtin/merge.c
+#: builtin/merge-tree.c:585 builtin/merge.c:736
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "未知的策略选项：-X%s"
 
-#: builtin/merge-tree.c builtin/notes.c
+#: builtin/merge-tree.c:604 builtin/merge-tree.c:620 builtin/notes.c:383
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "格式错误的输入行：'%s'。"
 
-#: builtin/merge-tree.c
+#: builtin/merge-tree.c:624
 #, c-format
 msgid "merging cannot continue; got unclean result of %d"
 msgstr "合并无法继续；得到不干净的结果 %d"
 
-#: builtin/merge.c
+#: builtin/merge.c:62
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<选项>] [<提交>...]"
 
-#: builtin/merge.c
+#: builtin/merge.c:127
 msgid "switch `m' requires a value"
 msgstr "开关 `m' 需要一个值"
 
-#: builtin/merge.c
+#: builtin/merge.c:150
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "选项 `%s' 需要一个值"
 
-#: builtin/merge.c
+#: builtin/merge.c:203
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "不能找到合并策略 '%s'。\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:204
 #, c-format
 msgid "Available strategies are:"
 msgstr "可用的策略有："
 
-#: builtin/merge.c
+#: builtin/merge.c:209
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "可用的自定义策略有："
 
-#: builtin/merge.c builtin/pull.c
+#: builtin/merge.c:244 builtin/pull.c:136
 msgid "do not show a diffstat at the end of the merge"
 msgstr "在合并的最后不显示差异统计"
 
-#: builtin/merge.c builtin/pull.c
+#: builtin/merge.c:246 builtin/pull.c:139
 msgid "show a diffstat at the end of the merge"
 msgstr "在合并的最后显示差异统计"
 
-#: builtin/merge.c builtin/pull.c
+#: builtin/merge.c:247 builtin/pull.c:142
 msgid "(synonym to --stat)"
 msgstr "（和 --stat 同义）"
 
-#: builtin/merge.c builtin/pull.c
+#: builtin/merge.c:249 builtin/pull.c:145
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
 
-#: builtin/merge.c builtin/pull.c
+#: builtin/merge.c:252 builtin/pull.c:151
 msgid "create a single commit instead of doing a merge"
 msgstr "创建一个单独的提交而不是做一次合并"
 
-#: builtin/merge.c builtin/pull.c
+#: builtin/merge.c:254 builtin/pull.c:154
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果合并成功，执行一次提交（默认）"
 
-#: builtin/merge.c builtin/pull.c
+#: builtin/merge.c:256 builtin/pull.c:157
 msgid "edit message before committing"
 msgstr "在提交前编辑提交说明"
 
-#: builtin/merge.c
+#: builtin/merge.c:258
 msgid "allow fast-forward (default)"
 msgstr "允许快进（默认）"
 
-#: builtin/merge.c builtin/pull.c
+#: builtin/merge.c:260 builtin/pull.c:164
 msgid "abort if fast-forward is not possible"
 msgstr "如果不能快进就放弃合并"
 
-#: builtin/merge.c builtin/pull.c
+#: builtin/merge.c:264 builtin/pull.c:170
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
 
-#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c
-#: builtin/revert.c
+#: builtin/merge.c:265 builtin/notes.c:890 builtin/pull.c:174
+#: builtin/rebase.c:1185 builtin/revert.c:128
 msgid "strategy"
 msgstr "策略"
 
-#: builtin/merge.c builtin/pull.c
+#: builtin/merge.c:266 builtin/pull.c:175
 msgid "merge strategy to use"
 msgstr "要使用的合并策略"
 
-#: builtin/merge.c
+#: builtin/merge.c:270
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "合并的提交说明（针对非快进式合并）"
 
-#: builtin/merge.c
+#: builtin/merge.c:276
 msgid "use <name> instead of the real target"
 msgstr "使用 <名称> 而不是真正的目标"
 
-#: builtin/merge.c
+#: builtin/merge.c:279
 msgid "abort the current in-progress merge"
 msgstr "放弃当前正在进行的合并"
 
 #
-#: builtin/merge.c
+#: builtin/merge.c:281
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort，但是保留索引和工作区"
 
-#: builtin/merge.c
+#: builtin/merge.c:283
 msgid "continue the current in-progress merge"
 msgstr "继续当前正在进行的合并"
 
-#: builtin/merge.c
+#: builtin/merge.c:292
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
 
-#: builtin/merge.c
+#: builtin/merge.c:316
 msgid "could not run stash."
 msgstr "不能运行贮藏。"
 
-#: builtin/merge.c
+#: builtin/merge.c:321
 msgid "stash failed"
 msgstr "贮藏失败"
 
-#: builtin/merge.c
+#: builtin/merge.c:326
 #, c-format
 msgid "not a valid object: %s"
 msgstr "不是一个有效对象：%s"
 
-#: builtin/merge.c
+#: builtin/merge.c:343 builtin/merge.c:355
 msgid "read-tree failed"
 msgstr "读取树失败"
 
-#: builtin/merge.c
+#: builtin/merge.c:389
 msgid "Already up to date. (nothing to squash)"
 msgstr "已经是最新的。（无可挤压）"
 
-#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c
+#: builtin/merge.c:391 merge-ort-wrappers.c:37 merge-recursive.c:3547
 msgid "Already up to date."
 msgstr "已经是最新的。"
 
-#: builtin/merge.c
+#: builtin/merge.c:403
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "挤压提交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:454
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "无合并信息 -- 未更新 HEAD\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:505
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' 没有指向一个提交"
 
-#: builtin/merge.c
+#: builtin/merge.c:593
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
 
-#: builtin/merge.c merge-recursive.c
+#: builtin/merge.c:711 builtin/merge.c:912 merge-recursive.c:3919
 msgid "Unable to write index."
 msgstr "不能写入索引。"
 
-#: builtin/merge.c
+#: builtin/merge.c:723
 msgid "Not handling anything other than two heads merge."
 msgstr "未处理两个头合并之外的任何操作。"
 
-#: builtin/merge.c
+#: builtin/merge.c:760
 #, c-format
 msgid "unable to write %s"
 msgstr "不能写 %s"
 
-#: builtin/merge.c
+#: builtin/merge.c:812
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "不能从 '%s' 读取"
 
-#: builtin/merge.c
+#: builtin/merge.c:821
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:827
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
 "especially if it merges an updated upstream into a topic branch.\n"
@@ -10384,84 +10658,84 @@ msgstr ""
 "合并到主题分支。\n"
 "\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:832
 msgid "An empty message aborts the commit.\n"
 msgstr "空的提交说明会终止提交。\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:835
 #, c-format
 msgid ""
 "Lines starting with '%s' will be ignored, and an empty message aborts\n"
 "the commit.\n"
 msgstr "以 '%s' 开始的行将被忽略，而空的提交说明将终止提交。\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:898
 msgid "Empty commit message."
 msgstr "空提交信息。"
 
-#: builtin/merge.c
+#: builtin/merge.c:915
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:980
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:1020
 msgid "No current branch."
 msgstr "没有当前分支。"
 
-#: builtin/merge.c
+#: builtin/merge.c:1022
 msgid "No remote for the current branch."
 msgstr "当前分支没有对应的远程仓库。"
 
-#: builtin/merge.c
+#: builtin/merge.c:1024
 msgid "No default upstream defined for the current branch."
 msgstr "当前分支没有定义默认的上游分支。"
 
-#: builtin/merge.c
+#: builtin/merge.c:1029
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
 
-#: builtin/merge.c
+#: builtin/merge.c:1086
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
 
-#: builtin/merge.c editor.c read-cache.c wrapper.c
+#: builtin/merge.c:1161 editor.c:152 read-cache.c:3090 wrapper.c:685
 #, c-format
 msgid "could not close '%s'"
 msgstr "不能关闭 '%s'"
 
-#: builtin/merge.c
+#: builtin/merge.c:1188
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "不能在 %s 中合并：%s"
 
-#: builtin/merge.c
+#: builtin/merge.c:1338
 msgid "--abort expects no arguments"
 msgstr "--abort 不带参数"
 
-#: builtin/merge.c
+#: builtin/merge.c:1342
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c
+#: builtin/merge.c:1362
 msgid "--quit expects no arguments"
 msgstr "--quit 不带参数"
 
-#: builtin/merge.c
+#: builtin/merge.c:1375
 msgid "--continue expects no arguments"
 msgstr "--continue 不带参数"
 
-#: builtin/merge.c
+#: builtin/merge.c:1379
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c
+#: builtin/merge.c:1395
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10469,7 +10743,7 @@ msgstr ""
 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"
 "请在合并前先提交您的修改。"
 
-#: builtin/merge.c
+#: builtin/merge.c:1402
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10477,37 +10751,37 @@ msgstr ""
 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
 "请在合并前先提交您的修改。"
 
-#: builtin/merge.c
+#: builtin/merge.c:1405
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c
+#: builtin/merge.c:1437
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
 
-#: builtin/merge.c
+#: builtin/merge.c:1454
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚不支持到空分支的压缩提交"
 
-#: builtin/merge.c
+#: builtin/merge.c:1456
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的非快进式提交没有意义"
 
-#: builtin/merge.c
+#: builtin/merge.c:1461
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - 不能被合并"
 
-#: builtin/merge.c
+#: builtin/merge.c:1463
 msgid "Can merge only exactly one commit into empty head"
 msgstr "只能将一个提交合并到空分支上"
 
-#: builtin/merge.c
+#: builtin/merge.c:1583
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "更新 %s..%s\n"
 
-#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c
+#: builtin/merge.c:1632 merge-ort-wrappers.c:17 merge-recursive.c:3797
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -10516,101 +10790,101 @@ msgstr ""
 "您对下列文件的本地修改将被合并操作覆盖：\n"
 "  %s"
 
-#: builtin/merge.c
+#: builtin/merge.c:1641
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "尝试非常小的索引内合并...\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:1648
 #, c-format
 msgid "Nope.\n"
 msgstr "无。\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:1711 builtin/merge.c:1779
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "将树回滚至原始状态...\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:1715
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "尝试合并策略 %s...\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:1769
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "没有合并策略处理此合并。\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:1771
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s 合并失败。\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:1781
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr "使用 %s 策略以准备手工解决。\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:1795
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自动合并进展顺利，按要求在提交前停止\n"
 
-#: builtin/merge.c
+#: builtin/merge.c:1800
 #, c-format
 msgid "When finished, apply stashed changes with `git stash pop`\n"
 msgstr "在完成后，使用 `git stash pop` 应用贮藏的变更\n"
 
-#: builtin/mktag.c
+#: builtin/mktag.c:30
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr "警告：标签输入未通过 fsck：%s"
 
-#: builtin/mktag.c
+#: builtin/mktag.c:41
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "错误：标签输入未通过 fsck：%s"
 
-#: builtin/mktag.c
+#: builtin/mktag.c:44
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调"
 
-#: builtin/mktag.c
+#: builtin/mktag.c:60
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr "不能读取被标记的对象 '%s'"
 
-#: builtin/mktag.c
+#: builtin/mktag.c:63
 #, c-format
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "对象 '%s' 被标记为 '%s'，然而是一个 '%s' 类型"
 
-#: builtin/mktag.c
+#: builtin/mktag.c:101
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "标准输入上的标签未通过我们严格的 fsck 检查"
 
-#: builtin/mktag.c
+#: builtin/mktag.c:104
 msgid "tag on stdin did not refer to a valid object"
 msgstr "标准输入上的标签未指向一个有效的对象"
 
-#: builtin/mktag.c builtin/tag.c
+#: builtin/mktag.c:107 builtin/tag.c:271
 msgid "unable to write tag file"
 msgstr "无法写标签文件"
 
-#: builtin/mktree.c
+#: builtin/mktree.c:164
 msgid "input is NUL terminated"
 msgstr "输入以 NUL 字符终止"
 
-#: builtin/mktree.c builtin/write-tree.c
+#: builtin/mktree.c:165 builtin/write-tree.c:29
 msgid "allow missing objects"
 msgstr "允许丢失的对象"
 
-#: builtin/mktree.c
+#: builtin/mktree.c:166
 msgid "allow creation of more than one tree"
 msgstr "允许创建一个以上的树"
 
-#: builtin/multi-pack-index.c
+#: builtin/multi-pack-index.c:14
 msgid ""
 "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
 "snapshot=<path>]"
@@ -10618,205 +10892,205 @@ msgstr ""
 "git multi-pack-index [<选项>] write [--preferred-pack=<包>][--refs-snapshot=<"
 "路径>]"
 
-#: builtin/multi-pack-index.c
+#: builtin/multi-pack-index.c:18
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<选项>] verify"
 
-#: builtin/multi-pack-index.c
+#: builtin/multi-pack-index.c:21
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<选项>] expire"
 
-#: builtin/multi-pack-index.c
+#: builtin/multi-pack-index.c:24
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<选项>] repack [--batch-size=<尺寸>]"
 
-#: builtin/multi-pack-index.c
+#: builtin/multi-pack-index.c:74
 msgid "directory"
 msgstr "目录"
 
-#: builtin/multi-pack-index.c
+#: builtin/multi-pack-index.c:75
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "包含成对包文件和包索引的对象目录"
 
-#: builtin/multi-pack-index.c
+#: builtin/multi-pack-index.c:126
 msgid "preferred-pack"
 msgstr "首选包"
 
-#: builtin/multi-pack-index.c
+#: builtin/multi-pack-index.c:127
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr "在计算多包位图时打包以供重用"
 
-#: builtin/multi-pack-index.c
+#: builtin/multi-pack-index.c:128
 msgid "write multi-pack bitmap"
 msgstr "写入多包位图"
 
-#: builtin/multi-pack-index.c
+#: builtin/multi-pack-index.c:133
 msgid "write multi-pack index containing only given indexes"
 msgstr "写入只包括给定索引的多包索引"
 
-#: builtin/multi-pack-index.c
+#: builtin/multi-pack-index.c:135
 msgid "refs snapshot for selecting bitmap commits"
 msgstr "用于选择位图提交的引用快照"
 
-#: builtin/multi-pack-index.c
+#: builtin/multi-pack-index.c:242
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
 msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中"
 
-#: builtin/mv.c
+#: builtin/mv.c:28
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<选项>] <源>... <目标>"
 
-#: builtin/mv.c
+#: builtin/mv.c:91
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "目录 %s 在索引中并且不是子模组？"
 
-#: builtin/mv.c
+#: builtin/mv.c:93
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
 
-#: builtin/mv.c
+#: builtin/mv.c:112
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s 在索引中"
 
-#: builtin/mv.c
+#: builtin/mv.c:188
 msgid "force move/rename even if target exists"
 msgstr "强制移动/重命令，即使目标存在"
 
-#: builtin/mv.c
+#: builtin/mv.c:190
 msgid "skip move/rename errors"
 msgstr "跳过移动/重命名错误"
 
-#: builtin/mv.c
+#: builtin/mv.c:246
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "目标 '%s' 不是一个目录"
 
-#: builtin/mv.c
+#: builtin/mv.c:270
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "检查 '%s' 到 '%s' 的重命名\n"
 
-#: builtin/mv.c
+#: builtin/mv.c:289 builtin/mv.c:294
 msgid "bad source"
 msgstr "坏的源"
 
-#: builtin/mv.c
+#: builtin/mv.c:307 builtin/mv.c:384
 msgid "destination exists"
 msgstr "目标已存在"
 
-#: builtin/mv.c
+#: builtin/mv.c:315
 msgid "can not move directory into itself"
 msgstr "不能将目录移动到自身"
 
-#: builtin/mv.c
+#: builtin/mv.c:320
 msgid "destination already exists"
 msgstr "目标已存在"
 
-#: builtin/mv.c
+#: builtin/mv.c:339
 msgid "source directory is empty"
 msgstr "源目录为空"
 
-#: builtin/mv.c
+#: builtin/mv.c:375
 msgid "not under version control"
 msgstr "不在版本控制之下"
 
-#: builtin/mv.c
+#: builtin/mv.c:379
 msgid "conflicted"
 msgstr "冲突"
 
-#: builtin/mv.c
+#: builtin/mv.c:392 builtin/mv.c:414
 #, c-format
 msgid "overwriting '%s'"
 msgstr "覆盖 '%s'"
 
-#: builtin/mv.c
+#: builtin/mv.c:395
 msgid "Cannot overwrite"
 msgstr "不能覆盖"
 
-#: builtin/mv.c
+#: builtin/mv.c:400
 msgid "multiple sources for the same target"
 msgstr "同一目标具有多个源"
 
-#: builtin/mv.c
+#: builtin/mv.c:404
 msgid "destination directory does not exist"
 msgstr "目标目录不存在"
 
-#: builtin/mv.c
+#: builtin/mv.c:411
 msgid "destination exists in the index"
 msgstr "目标在索引中已存在"
 
-#: builtin/mv.c
+#: builtin/mv.c:446
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s，源=%s，目标=%s"
 
-#: builtin/mv.c
+#: builtin/mv.c:479
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "重命名 %s 至 %s\n"
 
-#: builtin/mv.c builtin/remote.c
+#: builtin/mv.c:487 builtin/remote.c:829
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "重命名 '%s' 失败"
 
-#: builtin/name-rev.c
+#: builtin/name-rev.c:508
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<选项>] <提交>..."
 
-#: builtin/name-rev.c
+#: builtin/name-rev.c:509
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<选项>] --all"
 
-#: builtin/name-rev.c
+#: builtin/name-rev.c:510
 msgid "git name-rev [<options>] --annotate-stdin"
 msgstr "git name-rev [<选项>] --annotate-stdin"
 
-#: builtin/name-rev.c
+#: builtin/name-rev.c:568
 msgid "print only ref-based names (no object names)"
 msgstr "只打印基于引用的名称（非对象名）"
 
-#: builtin/name-rev.c
+#: builtin/name-rev.c:569
 msgid "only use tags to name the commits"
 msgstr "只使用标签来命名提交"
 
-#: builtin/name-rev.c
+#: builtin/name-rev.c:571
 msgid "only use refs matching <pattern>"
 msgstr "只使用和 <模式> 相匹配的引用"
 
-#: builtin/name-rev.c
+#: builtin/name-rev.c:573
 msgid "ignore refs matching <pattern>"
 msgstr "忽略和 <模式> 相匹配的引用"
 
-#: builtin/name-rev.c
+#: builtin/name-rev.c:575
 msgid "list all commits reachable from all refs"
 msgstr "列出可以从所有引用访问的提交"
 
-#: builtin/name-rev.c
+#: builtin/name-rev.c:579
 msgid "deprecated: use --annotate-stdin instead"
 msgstr "已弃用：取而代之使用 --annotate-stdin"
 
-#: builtin/name-rev.c
+#: builtin/name-rev.c:581
 msgid "annotate text from stdin"
 msgstr "标注标准输入的文字"
 
-#: builtin/name-rev.c
+#: builtin/name-rev.c:582
 msgid "allow to print `undefined` names (default)"
 msgstr "允许打印 `未定义` 的名称（默认）"
 
-#: builtin/name-rev.c
+#: builtin/name-rev.c:586
 msgid "dereference tags in the input (internal use)"
 msgstr "反向解析输入中的标签（内部使用）"
 
-#: builtin/notes.c
+#: builtin/notes.c:34
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
 
-#: builtin/notes.c
+#: builtin/notes.c:35
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"
 "separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
@@ -10826,11 +11100,11 @@ msgstr ""
 "separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <"
 "对象>] [<对象>]"
 
-#: builtin/notes.c
+#: builtin/notes.c:36
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
 
-#: builtin/notes.c
+#: builtin/notes.c:37
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"
 "separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
@@ -10840,126 +11114,128 @@ msgstr ""
 "separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <"
 "对象>] [<对象>]"
 
-#: builtin/notes.c
+#: builtin/notes.c:38
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
 
-#: builtin/notes.c
+#: builtin/notes.c:39
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <注解引用>] show [<对象>]"
 
-#: builtin/notes.c
+#: builtin/notes.c:40
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
 
-#: builtin/notes.c
+#: builtin/notes.c:43
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
 
-#: builtin/notes.c
+#: builtin/notes.c:44
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
 
-#: builtin/notes.c
+#: builtin/notes.c:45
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <注解引用>] get-ref"
 
-#: builtin/notes.c
+#: builtin/notes.c:50
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<对象>]]"
 
-#: builtin/notes.c
+#: builtin/notes.c:55
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<选项>] [<对象>]"
 
-#: builtin/notes.c
+#: builtin/notes.c:60
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
 
-#: builtin/notes.c
+#: builtin/notes.c:61
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
 
-#: builtin/notes.c
+#: builtin/notes.c:66
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<选项>] [<对象>]"
 
-#: builtin/notes.c
+#: builtin/notes.c:71
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<对象>]"
 
-#: builtin/notes.c
+#: builtin/notes.c:76
 msgid "git notes show [<object>]"
 msgstr "git notes show [<对象>]"
 
-#: builtin/notes.c
+#: builtin/notes.c:81
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<选项>] <注解引用>"
 
-#: builtin/notes.c
+#: builtin/notes.c:82
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<选项>]"
 
-#: builtin/notes.c
+#: builtin/notes.c:83
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<选项>]"
 
-#: builtin/notes.c
+#: builtin/notes.c:88
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<对象>]"
 
-#: builtin/notes.c
+#: builtin/notes.c:93
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<选项>]"
 
-#: builtin/notes.c
+#: builtin/notes.c:103
 msgid "Write/edit the notes for the following object:"
 msgstr "为下面的对象写/编辑说明："
 
-#: builtin/notes.c
+#: builtin/notes.c:181
 msgid "could not read 'show' output"
 msgstr "不能读取 'show' 的输出"
 
-#: builtin/notes.c
+#: builtin/notes.c:189
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "无法为对象 '%s' 完成 'show'"
 
-#: builtin/notes.c
+#: builtin/notes.c:223
 msgid "please supply the note contents using either -m or -F option"
 msgstr "请通过 -m 或 -F 选项为注解提供内容"
 
-#: builtin/notes.c
+#: builtin/notes.c:233
 msgid "unable to write note object"
 msgstr "不能写注解对象"
 
-#: builtin/notes.c
+#: builtin/notes.c:236
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "注解内容被留在 %s 中"
 
-#: builtin/notes.c builtin/tag.c
+#: builtin/notes.c:300 builtin/tag.c:634
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "不能打开或读取 '%s'"
 
-#: builtin/notes.c
+#: builtin/notes.c:321 builtin/notes.c:387 builtin/notes.c:389
+#: builtin/notes.c:457 builtin/notes.c:523 builtin/notes.c:611
+#: builtin/notes.c:616 builtin/notes.c:705 builtin/notes.c:772
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "无法解析 '%s' 为一个有效引用。"
 
-#: builtin/notes.c
+#: builtin/notes.c:323
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "无法读取对象 '%s'。"
 
-#: builtin/notes.c
+#: builtin/notes.c:328
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "不能从非数据对象 '%s' 中读取注解数据。"
 
-#: builtin/notes.c
+#: builtin/notes.c:398
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "无法把注解从 '%s' 拷贝到 '%s'"
@@ -10967,94 +11243,94 @@ msgstr "无法把注解从 '%s' 拷贝到 '%s'"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c
+#: builtin/notes.c:430
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"
 
-#: builtin/notes.c
+#: builtin/notes.c:463 builtin/notes.c:778
 #, c-format
 msgid "no note found for object %s."
 msgstr "未发现对象 %s 的注解。"
 
-#: builtin/notes.c
+#: builtin/notes.c:485 builtin/notes.c:661
 msgid "note contents as a string"
 msgstr "注解内容作为一个字符串"
 
-#: builtin/notes.c
+#: builtin/notes.c:488 builtin/notes.c:664
 msgid "note contents in a file"
 msgstr "注解内容到一个文件中"
 
-#: builtin/notes.c
+#: builtin/notes.c:491 builtin/notes.c:667
 msgid "reuse and edit specified note object"
 msgstr "重用和编辑指定的注解对象"
 
-#: builtin/notes.c
+#: builtin/notes.c:494 builtin/notes.c:670
 msgid "reuse specified note object"
 msgstr "重用指定的注解对象"
 
-#: builtin/notes.c
+#: builtin/notes.c:497 builtin/notes.c:673
 msgid "allow storing empty note"
 msgstr "允许保存空白注释"
 
-#: builtin/notes.c
+#: builtin/notes.c:498 builtin/notes.c:581
 msgid "replace existing notes"
 msgstr "替换已存在的注解"
 
-#: builtin/notes.c
+#: builtin/notes.c:500 builtin/notes.c:675
 msgid "<paragraph-break>"
 msgstr "<分段符>"
 
-#: builtin/notes.c
+#: builtin/notes.c:501 builtin/notes.c:676
 msgid "insert <paragraph-break> between paragraphs"
 msgstr "在段落之间插入<分段符>"
 
-#: builtin/notes.c
+#: builtin/notes.c:504 builtin/notes.c:679
 msgid "remove unnecessary whitespace"
 msgstr "删除不必要的空白字符"
 
-#: builtin/notes.c
+#: builtin/notes.c:533
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
 
-#: builtin/notes.c
+#: builtin/notes.c:548 builtin/notes.c:629
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "覆盖对象 %s 现存注解\n"
 
-#: builtin/notes.c
+#: builtin/notes.c:560 builtin/notes.c:737 builtin/notes.c:1011
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "删除对象 %s 的注解\n"
 
-#: builtin/notes.c
+#: builtin/notes.c:582
 msgid "read objects from stdin"
 msgstr "从标准输入读取对象"
 
-#: builtin/notes.c
+#: builtin/notes.c:584
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
 
-#: builtin/notes.c
+#: builtin/notes.c:602
 msgid "too few arguments"
 msgstr "参数太少"
 
-#: builtin/notes.c
+#: builtin/notes.c:623
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
 
-#: builtin/notes.c
+#: builtin/notes.c:635
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "源对象 %s 缺少注解。不能拷贝。"
 
-#: builtin/notes.c
+#: builtin/notes.c:698
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -11063,97 +11339,97 @@ msgstr ""
 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
 
-#: builtin/notes.c
+#: builtin/notes.c:798
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c
+#: builtin/notes.c:800
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "无法删除引用 NOTES_MERGE_REF"
 
-#: builtin/notes.c
+#: builtin/notes.c:802
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "无法删除 'git notes merge' 工作区"
 
-#: builtin/notes.c
+#: builtin/notes.c:822
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c
+#: builtin/notes.c:824
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
 
-#: builtin/notes.c
+#: builtin/notes.c:826
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
 
-#: builtin/notes.c
+#: builtin/notes.c:840
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "无法解析 NOTES_MERGE_REF"
 
-#: builtin/notes.c
+#: builtin/notes.c:843
 msgid "failed to finalize notes merge"
 msgstr "无法完成注解合并"
 
-#: builtin/notes.c
+#: builtin/notes.c:871
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "未知的注解合并策略 %s"
 
-#: builtin/notes.c
+#: builtin/notes.c:887
 msgid "General options"
 msgstr "通用选项"
 
-#: builtin/notes.c
+#: builtin/notes.c:889
 msgid "Merge options"
 msgstr "合并选项"
 
-#: builtin/notes.c
+#: builtin/notes.c:891
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c
+#: builtin/notes.c:893
 msgid "Committing unmerged notes"
 msgstr "提交未合并的注解"
 
-#: builtin/notes.c
+#: builtin/notes.c:895
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "通过提交未合并的注解来完成注解合并"
 
-#: builtin/notes.c
+#: builtin/notes.c:897
 msgid "Aborting notes merge resolution"
 msgstr "中止注解合并的方案"
 
-#: builtin/notes.c
+#: builtin/notes.c:899
 msgid "abort notes merge"
 msgstr "中止注解合并"
 
-#: builtin/notes.c
+#: builtin/notes.c:910
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "不能混用 --commit、--abort 或 -s/--strategy"
 
-#: builtin/notes.c
+#: builtin/notes.c:915
 msgid "must specify a notes ref to merge"
 msgstr "必须指定一个注解引用来合并"
 
-#: builtin/notes.c
+#: builtin/notes.c:939
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "未知的 -s/--strategy：%s"
 
-#: builtin/notes.c
+#: builtin/notes.c:981
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
 
-#: builtin/notes.c
+#: builtin/notes.c:985
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "无法存储链接到当前的注解引用（%s）"
 
-#: builtin/notes.c
+#: builtin/notes.c:987
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -11163,55 +11439,55 @@ msgstr ""
 "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
 "交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
 
-#: builtin/notes.c builtin/tag.c
+#: builtin/notes.c:1006 builtin/tag.c:647
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "无法解析 '%s' 为一个有效引用。"
 
-#: builtin/notes.c
+#: builtin/notes.c:1009
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "对象 %s 没有注解\n"
 
-#: builtin/notes.c
+#: builtin/notes.c:1021
 msgid "attempt to remove non-existent note is not an error"
 msgstr "尝试删除不存在的注解不是一个错误"
 
-#: builtin/notes.c
+#: builtin/notes.c:1024
 msgid "read object names from the standard input"
 msgstr "从标准输入读取对象名称"
 
-#: builtin/notes.c builtin/prune.c builtin/worktree.c
+#: builtin/notes.c:1063 builtin/prune.c:155 builtin/worktree.c:237
 msgid "do not remove, show only"
 msgstr "不删除，只显示"
 
-#: builtin/notes.c
+#: builtin/notes.c:1064
 msgid "report pruned notes"
 msgstr "报告清除的注解"
 
-#: builtin/notes.c
+#: builtin/notes.c:1107
 msgid "notes-ref"
 msgstr "注解引用"
 
-#: builtin/notes.c
+#: builtin/notes.c:1108
 msgid "use notes from <notes-ref>"
 msgstr "从 <注解引用> 使用注解"
 
-#: builtin/notes.c builtin/remote.c parse-options.c
+#: builtin/notes.c:1127 builtin/remote.c:1755 parse-options.c:867
 #, c-format
 msgid "unknown subcommand: `%s'"
 msgstr "未知子命令：`%s'"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:185
 msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects --stdout [<选项>] [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:186
 msgid ""
 "git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<选项>] <前缀名称> [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:585
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -11219,129 +11495,130 @@ msgid ""
 msgstr ""
 "write_reuse_object：无法定位 %1$s，预期在包 %3$s 中的偏移量 %2$<PRIuMAX> 上"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:593
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "%s 错的包对象 CRC"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:604
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "%s 损坏的包对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:735
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "发现对象 %s 递归 delta"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:957
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "排序了 %u 个对象，预期 %<PRIu32> 个"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:1055
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "预期对象在包文件 %2$s 的偏移量 %1$<PRIuMAX> 上"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:1238
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:1251
 msgid "Writing objects"
 msgstr "写入对象中"
 
-#: builtin/pack-objects.c builtin/update-index.c
+#: builtin/pack-objects.c:1329 builtin/update-index.c:109
 #, c-format
 msgid "failed to stat %s"
 msgstr "无法对 %s 调用 stat"
 
-#: builtin/pack-objects.c object-file.c
+#: builtin/pack-objects.c:1337 object-file.c:2186
 #, c-format
 msgid "failed utime() on %s"
 msgstr "在 %s 上调用 utime() 失败"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:1371
 msgid "failed to write bitmap index"
 msgstr "无法写入位图索引"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:1399
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
 
-#: builtin/pack-objects.c builtin/repack.c
+#: builtin/pack-objects.c:1649 builtin/repack.c:1239
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:2097
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "%s 压缩中 delta 基准偏移越界"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:2106
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "%s 的 delta 基准偏移越界"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:2387
 msgid "Counting objects"
 msgstr "对象计数中"
 
-#: builtin/pack-objects.c pack-bitmap.c
+#: builtin/pack-objects.c:2537 pack-bitmap.c:1725 pack-bitmap.c:1731
 #, c-format
 msgid "unable to get size of %s"
 msgstr "无法得到 %s 的大小"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:2552
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "无法解析对象 %s 头信息"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:2624 builtin/pack-objects.c:2642
+#: builtin/pack-objects.c:2652
 #, c-format
 msgid "object %s cannot be read"
 msgstr "对象 %s 无法读取"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:2627 builtin/pack-objects.c:2656
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:2666
 msgid "suboptimal pack - out of memory"
 msgstr "次优（suboptimal）打包 - 内存不足"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:2981
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "使用 %d 个线程进行压缩"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3120
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "无法为标签 %s 压缩对象"
 
-#: builtin/pack-objects.c commit-graph.c
+#: builtin/pack-objects.c:3188 commit-graph.c:1505
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "无法获得对象 %s 类型"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3207
 msgid "Compressing objects"
 msgstr "压缩对象中"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3213
 msgid "inconsistency with delta count"
 msgstr "不一致的差异计数"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3267
 #, c-format
 msgid "invalid pack.allowPackReuse value: '%s'"
 msgstr "无效的 pack.allowPackReuse 值：'%s'"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3317
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -11350,40 +11627,41 @@ msgstr ""
 "uploadpack.blobpackfileuri 的取值必须是 '<object-hash> <pack-hash> <uri>' 格"
 "式（得到 '%s'）"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3320
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置（得到 '%s'）"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3357
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr "无法获得包 %2$s 中对象 %1$s 的类型"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3487 builtin/pack-objects.c:3500
+#: builtin/pack-objects.c:3624
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "不能找到包 '%s'"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3489
 #, c-format
 msgid "packfile %s cannot be accessed"
 msgstr "无法访问包文件 %s"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3635 builtin/pack-objects.c:3661
 msgid "Enumerating cruft objects"
 msgstr "枚举废弃对象中"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3667
 msgid "unable to add cruft objects"
 msgstr "无法添加废弃对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3680
 msgid "Traversing cruft objects"
 msgstr "遍历废弃对象中"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3765
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -11392,7 +11670,7 @@ msgstr ""
 "预期边界对象（edge object）ID，却得到垃圾数据：\n"
 " %s"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3771
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -11401,267 +11679,267 @@ msgstr ""
 "预期对象 ID，却得到垃圾数据：\n"
 " %s"
 
-#: builtin/pack-objects.c reachable.c
+#: builtin/pack-objects.c:3885 reachable.c:294
 msgid "could not load cruft pack .mtimes"
 msgstr "不能载入废弃包 .mtimes"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3907 builtin/pack-objects.c:4006
 msgid "cannot open pack index"
 msgstr "无法打开包文件索引"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:3916
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "无法检查 %s 处的松散对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4014
 msgid "unable to force loose object"
 msgstr "无法强制松散对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4150
 #, c-format
 msgid "not a rev '%s'"
 msgstr "不是一个版本 '%s'"
 
-#: builtin/pack-objects.c builtin/rev-parse.c
+#: builtin/pack-objects.c:4153 builtin/rev-parse.c:1145
 #, c-format
 msgid "bad revision '%s'"
 msgstr "坏的版本 '%s'"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4181
 msgid "unable to add recent objects"
 msgstr "无法添加最近的对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4249
 #, c-format
 msgid "unsupported index version %s"
 msgstr "不支持的索引版本 %s"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4253
 #, c-format
 msgid "bad index version '%s'"
 msgstr "坏的索引版本 '%s'"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4306
 msgid "show progress meter during object writing phase"
 msgstr "在对象写入阶段显示进度表"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4309
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "当进度表显示时类似于 --all-progress"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4310
 msgid "<version>[,<offset>]"
 msgstr "<版本>[,<偏移>]"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4311
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格式版本来写包索引文件"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4314
 msgid "maximum size of each output pack file"
 msgstr "每个输出包的最大尺寸"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4316
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略从备用对象存储里借用对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4318
 msgid "ignore packed objects"
 msgstr "忽略包对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4320
 msgid "limit pack window by objects"
 msgstr "限制打包窗口的对象数"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4322
 msgid "limit pack window by memory in addition to object limit"
 msgstr "除对象数量限制外设置打包窗口的内存限制"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4324
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包允许的 delta 链的最大长度"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4326
 msgid "reuse existing deltas"
 msgstr "重用已存在的 deltas"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4328
 msgid "reuse existing objects"
 msgstr "重用已存在的对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4330
 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4332
 msgid "use threads when searching for best delta matches"
 msgstr "使用线程查询最佳 delta 匹配"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4334
 msgid "do not create an empty pack output"
 msgstr "不创建空的包输出"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4336
 msgid "read revision arguments from standard input"
 msgstr "从标准输入读取版本号参数"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4338
 msgid "limit the objects to those that are not yet packed"
 msgstr "限制那些尚未打包的对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4341
 msgid "include objects reachable from any reference"
 msgstr "包括可以从任何引用访问到的对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4344
 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日志引用到的对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4347
 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4350
 msgid "read packs from stdin"
 msgstr "从标准输入读取包"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4352
 msgid "output pack to stdout"
 msgstr "输出包到标准输出"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4354
 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包对象的标签对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4356
 msgid "keep unreachable objects"
 msgstr "维持不可达的对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4358
 msgid "pack loose unreachable objects"
 msgstr "打包松散的不可达对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4360
 msgid "unpack unreachable objects newer than <time>"
 msgstr "将比给定 <时间> 新的无法访问的对象解包"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4362
 msgid "create a cruft pack"
 msgstr "创建废弃包"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4364
 msgid "expire cruft objects older than <time>"
 msgstr "使早于给定 <时间> 的废弃对象过期"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4367
 msgid "use the sparse reachability algorithm"
 msgstr "使用稀疏可达性算法"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4369
 msgid "create thin packs"
 msgstr "创建精简包"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4371
 msgid "create packs suitable for shallow fetches"
 msgstr "创建适合浅克隆仓库获取的包"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4373
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略配有 .keep 文件的包"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4375
 msgid "ignore this pack"
 msgstr "忽略该 pack"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4377
 msgid "pack compression level"
 msgstr "打包压缩级别"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4379
 msgid "do not hide commits by grafts"
 msgstr "显示被移植隐藏的提交"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4381
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4383
 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的同时创建 bitmap 索引"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4387
 msgid "write a bitmap index if possible"
 msgstr "如果可能，写 bitmap 索引"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4391
 msgid "handling for missing objects"
 msgstr "处理丢失的对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4394
 msgid "do not pack objects in promisor packfiles"
 msgstr "不要打包 promisor 包文件中的对象"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4396
 msgid "respect islands during delta compression"
 msgstr "在增量压缩时参考数据岛"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4398
 msgid "protocol"
 msgstr "协议"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4399
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4437
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "增量链深度 %d 太深了，强制为 %d"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4442
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d"
 
-#: builtin/pack-objects.c config.c
+#: builtin/pack-objects.c:4488 config.c:1868
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "错误的打包压缩级别 %d"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4498
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4500
 msgid "minimum pack size limit is 1 MiB"
 msgstr "最小的包文件大小是 1 MiB"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4505
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin 不能用于创建一个可索引包"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4513
 msgid "cannot use --filter with --stdin-packs"
 msgstr "不能同时使用 --filter 和 --stdin-packs"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4516
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "不能同时使用内部版本列表和 --stdin-packs"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4520
 msgid "cannot use internal rev list with --cruft"
 msgstr "不能同时使用内部版本列表和 --cruft"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4522
 msgid "cannot use --stdin-packs with --cruft"
 msgstr "不能将 --stdin-packs 和 --cruft 同时使用"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4582
 msgid "Enumerating objects"
 msgstr "枚举对象中"
 
-#: builtin/pack-objects.c
+#: builtin/pack-objects.c:4626
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -11670,7 +11948,7 @@ msgstr ""
 "总共 %<PRIu32>（差异 %<PRIu32>），复用 %<PRIu32>（差异 %<PRIu32>），包复用 "
 "%<PRIu32>（来自  %<PRIuMAX> 个包）"
 
-#: builtin/pack-redundant.c
+#: builtin/pack-redundant.c:605
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -11683,11 +11961,11 @@ msgstr ""
 "并通过发送邮件到 <git@vger.kernel.org> 让我们知道您仍旧\n"
 "使用它。 谢谢。\n"
 
-#: builtin/pack-redundant.c
+#: builtin/pack-redundant.c:610
 msgid "refusing to run without --i-still-use-this"
 msgstr "拒绝在未指定 --i-still-use-this 选项时运行"
 
-#: builtin/pack-refs.c
+#: builtin/pack-refs.c:10
 msgid ""
 "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
 "<pattern>]"
@@ -11695,128 +11973,128 @@ msgstr ""
 "git pack-refs [--all] [--no-prune] [--auto] [--include <模式>] [--exclude <模"
 "式>]"
 
-#: builtin/pack-refs.c
+#: builtin/pack-refs.c:29
 msgid "pack everything"
 msgstr "打包一切"
 
-#: builtin/pack-refs.c
+#: builtin/pack-refs.c:30
 msgid "prune loose refs (default)"
 msgstr "清除松散的引用（默认）"
 
-#: builtin/pack-refs.c
+#: builtin/pack-refs.c:31
 msgid "auto-pack refs as needed"
 msgstr "按需对引用自动打包"
 
-#: builtin/pack-refs.c
+#: builtin/pack-refs.c:33
 msgid "references to include"
 msgstr "需包含的引用"
 
-#: builtin/pack-refs.c
+#: builtin/pack-refs.c:35
 msgid "references to exclude"
 msgstr "需排除的引用"
 
-#: builtin/patch-id.c
+#: builtin/patch-id.c:192
 msgid "git patch-id [--stable | --unstable | --verbatim]"
 msgstr "git patch-id [--stable | --unstable | --verbatim]"
 
-#: builtin/patch-id.c
+#: builtin/patch-id.c:224
 msgid "use the unstable patch-id algorithm"
 msgstr "使用不稳定的 patch-id 算法"
 
-#: builtin/patch-id.c
+#: builtin/patch-id.c:226
 msgid "use the stable patch-id algorithm"
 msgstr "使用稳定的 patch-id 算法"
 
-#: builtin/patch-id.c
+#: builtin/patch-id.c:228
 msgid "don't strip whitespace from the patch"
 msgstr "不要从补丁中删除空白字符"
 
-#: builtin/prune.c
+#: builtin/prune.c:21
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
 
-#: builtin/prune.c
+#: builtin/prune.c:156
 msgid "report pruned objects"
 msgstr "报告清除的对象"
 
-#: builtin/prune.c
+#: builtin/prune.c:159
 msgid "expire objects older than <time>"
 msgstr "使早于给定时间的对象过期"
 
-#: builtin/prune.c
+#: builtin/prune.c:161
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "限制遍历 promisor 包以外的对象"
 
-#: builtin/prune.c
+#: builtin/prune.c:174
 msgid "cannot prune in a precious-objects repo"
 msgstr "不能在珍品仓库中执行清理操作"
 
-#: builtin/pull.c
+#: builtin/pull.c:68
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/pull.c
+#: builtin/pull.c:126
 msgid "control for recursive fetching of submodules"
 msgstr "控制子模组的递归获取"
 
-#: builtin/pull.c
+#: builtin/pull.c:130
 msgid "Options related to merging"
 msgstr "和合并相关的选项"
 
-#: builtin/pull.c
+#: builtin/pull.c:133
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "使用变基操作取代合并操作以合入修改"
 
-#: builtin/pull.c builtin/revert.c
+#: builtin/pull.c:161 builtin/revert.c:140
 msgid "allow fast-forward"
 msgstr "允许快进式"
 
-#: builtin/pull.c
+#: builtin/pull.c:167
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用"
 
-#: builtin/pull.c parse-options.h
+#: builtin/pull.c:173 parse-options.h:584
 msgid "automatically stash/stash pop before and after"
 msgstr "在操作前后执行自动贮藏和弹出贮藏"
 
-#: builtin/pull.c
+#: builtin/pull.c:189
 msgid "Options related to fetching"
 msgstr "和获取相关的参数"
 
-#: builtin/pull.c
+#: builtin/pull.c:199
 msgid "force overwrite of local branch"
 msgstr "强制覆盖本地分支"
 
-#: builtin/pull.c
+#: builtin/pull.c:207
 msgid "number of submodules pulled in parallel"
 msgstr "并发拉取的子模组的数量"
 
-#: builtin/pull.c parse-options.h
+#: builtin/pull.c:240 parse-options.h:587
 msgid "use IPv4 addresses only"
 msgstr "只使用 IPv4 地址"
 
-#: builtin/pull.c parse-options.h
+#: builtin/pull.c:243 parse-options.h:589
 msgid "use IPv6 addresses only"
 msgstr "只使用 IPv6 地址"
 
-#: builtin/pull.c
+#: builtin/pull.c:446
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
 
-#: builtin/pull.c
+#: builtin/pull.c:448
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
 
-#: builtin/pull.c
+#: builtin/pull.c:449
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
 
-#: builtin/pull.c
+#: builtin/pull.c:452
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11826,40 +12104,41 @@ msgstr ""
 "您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
 "分支默认的远程仓库，您必须在命令行中指定一个分支名。"
 
-#: builtin/pull.c builtin/rebase.c
+#: builtin/pull.c:457 builtin/rebase.c:1035
 msgid "You are not currently on a branch."
 msgstr "您当前不在一个分支上。"
 
-#: builtin/pull.c
+#: builtin/pull.c:459 builtin/pull.c:474
 msgid "Please specify which branch you want to rebase against."
 msgstr "请指定您要变基到哪一个分支。"
 
-#: builtin/pull.c
+#: builtin/pull.c:461 builtin/pull.c:476
 msgid "Please specify which branch you want to merge with."
 msgstr "请指定您要合并哪一个分支。"
 
-#: builtin/pull.c
+#: builtin/pull.c:462 builtin/pull.c:477
 msgid "See git-pull(1) for details."
 msgstr "详见 git-pull(1)。"
 
-#: builtin/pull.c builtin/rebase.c
+#: builtin/pull.c:464 builtin/pull.c:470 builtin/pull.c:479
+#: builtin/rebase.c:1041
 msgid "<remote>"
 msgstr "<远程>"
 
-#: builtin/pull.c scalar.c
+#: builtin/pull.c:464 builtin/pull.c:479 builtin/pull.c:484 scalar.c:414
 msgid "<branch>"
 msgstr "<分支>"
 
-#: builtin/pull.c builtin/rebase.c
+#: builtin/pull.c:472 builtin/rebase.c:1033
 msgid "There is no tracking information for the current branch."
 msgstr "当前分支没有跟踪信息。"
 
-#: builtin/pull.c
+#: builtin/pull.c:481
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
 
-#: builtin/pull.c
+#: builtin/pull.c:486
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11868,16 +12147,16 @@ msgstr ""
 "您的配置中指定要合并远程的引用 '%s'，\n"
 "但是没有获取到这个引用。"
 
-#: builtin/pull.c
+#: builtin/pull.c:596
 #, c-format
 msgid "unable to access commit %s"
 msgstr "无法访问提交 %s"
 
-#: builtin/pull.c
+#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
 msgstr "为变基操作忽略 --verify-signatures"
 
-#: builtin/pull.c
+#: builtin/pull.c:966
 msgid ""
 "You have divergent branches and need to specify how to reconcile them.\n"
 "You can do so by running one of the following commands sometime before\n"
@@ -11904,19 +12183,19 @@ msgstr ""
 "缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n"
 "或者 --ff-only 参数覆盖缺省设置。\n"
 
-#: builtin/pull.c
+#: builtin/pull.c:1048
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未诞生的分支，变更添加至索引。"
 
-#: builtin/pull.c
+#: builtin/pull.c:1052
 msgid "pull with rebase"
 msgstr "变基式拉取"
 
-#: builtin/pull.c builtin/rebase.c
+#: builtin/pull.c:1053 builtin/rebase.c:1727
 msgid "Please commit or stash them."
 msgstr "请提交或贮藏修改。"
 
-#: builtin/pull.c
+#: builtin/pull.c:1078
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11926,7 +12205,7 @@ msgstr ""
 "fetch 更新了当前的分支。快进您的工作区\n"
 "至提交 %s。"
 
-#: builtin/pull.c
+#: builtin/pull.c:1084
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11943,39 +12222,39 @@ msgstr ""
 "$ git reset --hard\n"
 "恢复之前的状态。"
 
-#: builtin/pull.c
+#: builtin/pull.c:1099
 msgid "Cannot merge multiple branches into empty head."
 msgstr "无法将多个分支合并到空分支。"
 
-#: builtin/pull.c
+#: builtin/pull.c:1105
 msgid "Cannot rebase onto multiple branches."
 msgstr "无法变基到多个分支。"
 
-#: builtin/pull.c
+#: builtin/pull.c:1107
 msgid "Cannot fast-forward to multiple branches."
 msgstr "无法快进到多个分支。"
 
-#: builtin/pull.c
+#: builtin/pull.c:1122
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "需要指定如何调和偏离的分支。"
 
-#: builtin/pull.c
+#: builtin/pull.c:1134
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "本地子模组中有修改，无法变基"
 
-#: builtin/push.c
+#: builtin/push.c:24
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/push.c
+#: builtin/push.c:108
 msgid "tag shorthand without <tag>"
 msgstr "标签后面未提供 <标签> 参数"
 
-#: builtin/push.c
+#: builtin/push.c:116
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete 只接受简单的目标引用名"
 
-#: builtin/push.c
+#: builtin/push.c:158
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'.\n"
@@ -11983,7 +12262,7 @@ msgstr ""
 "\n"
 "为了永久地选择任一选项，参见 'git help config' 中的 push.default。\n"
 
-#: builtin/push.c
+#: builtin/push.c:162
 msgid ""
 "\n"
 "To avoid automatically configuring an upstream branch when its name\n"
@@ -11994,7 +12273,7 @@ msgstr ""
 "为了避免在与本地分支名字不匹配时自动设置上游分支，参见 'git help config'\n"
 "中 branch.autoSetupMerge 的 'simple' 选项。\n"
 
-#: builtin/push.c
+#: builtin/push.c:168
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -12018,7 +12297,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s%s"
 
-#: builtin/push.c
+#: builtin/push.c:184
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -12032,7 +12311,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<远程分支名字>\n"
 
-#: builtin/push.c
+#: builtin/push.c:200
 msgid ""
 "\n"
 "To have this happen automatically for branches without a tracking\n"
@@ -12042,7 +12321,7 @@ msgstr ""
 "为了让没有追踪上游的分支自动配置，参见 'git help config' 中的 push."
 "autoSetupRemote。\n"
 
-#: builtin/push.c
+#: builtin/push.c:206
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -12057,17 +12336,17 @@ msgstr ""
 "    git push --set-upstream %s %s\n"
 "%s"
 
-#: builtin/push.c
+#: builtin/push.c:217
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
 
-#: builtin/push.c
+#: builtin/push.c:235
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"
 
-#: builtin/push.c
+#: builtin/push.c:261
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -12077,7 +12356,7 @@ msgstr ""
 "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
 "而没有告诉我要推送什么、更新哪个远程分支。"
 
-#: builtin/push.c
+#: builtin/push.c:284
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. If you want to integrate the remote changes,\n"
@@ -12088,7 +12367,7 @@ msgstr ""
 "如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n"
 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c
+#: builtin/push.c:290
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. If you want to integrate the remote changes, use 'git pull'\n"
@@ -12099,7 +12378,7 @@ msgstr ""
 "如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n"
 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c
+#: builtin/push.c:296
 msgid ""
 "Updates were rejected because the remote contains work that you do not\n"
 "have locally. This is usually caused by another repository pushing to\n"
@@ -12112,11 +12391,11 @@ msgstr ""
 "前执行 'git pull'。\n"
 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c
+#: builtin/push.c:303
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "更新被拒绝，因为该标签在远程已经存在。"
 
-#: builtin/push.c
+#: builtin/push.c:306
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -12125,7 +12404,7 @@ msgstr ""
 "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
 "也不能更新远程引用让其指向一个非提交对象。\n"
 
-#: builtin/push.c
+#: builtin/push.c:311
 msgid ""
 "Updates were rejected because the tip of the remote-tracking branch has\n"
 "been updated since the last checkout. If you want to integrate the\n"
@@ -12136,110 +12415,111 @@ msgstr ""
 "如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n"
 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c
+#: builtin/push.c:381
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "推送到 %s\n"
 
-#: builtin/push.c
+#: builtin/push.c:388
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "无法推送一些引用到 '%s'"
 
-#: builtin/push.c
+#: builtin/push.c:454
 msgid ""
 "recursing into submodule with push.recurseSubmodules=only; using on-demand "
 "instead"
 msgstr ""
 "在 push.recurseSubmodules=only 时递归进入子模组；取而代之使用 on-demand"
 
-#: builtin/push.c builtin/send-pack.c submodule-config.c
+#: builtin/push.c:511 builtin/send-pack.c:144 submodule-config.c:654
 #, c-format
 msgid "invalid value for '%s'"
 msgstr "'%s' 的值无效"
 
-#: builtin/push.c builtin/submodule--helper.c
+#: builtin/push.c:563 builtin/submodule--helper.c:3373
 msgid "repository"
 msgstr "仓库"
 
-#: builtin/push.c
+#: builtin/push.c:564
 msgid "push all branches"
 msgstr "推送所有分支"
 
-#: builtin/push.c builtin/send-pack.c
+#: builtin/push.c:566 builtin/send-pack.c:190
 msgid "mirror all refs"
 msgstr "镜像所有引用"
 
-#: builtin/push.c
+#: builtin/push.c:568
 msgid "delete refs"
 msgstr "删除引用"
 
-#: builtin/push.c
+#: builtin/push.c:569
 msgid "push tags (can't be used with --all or --branches or --mirror)"
 msgstr "推送标签（不能使用 --all or --branches or --mirror）"
 
-#: builtin/push.c builtin/send-pack.c
+#: builtin/push.c:572 builtin/send-pack.c:191
 msgid "force updates"
 msgstr "强制更新"
 
-#: builtin/push.c builtin/send-pack.c
+#: builtin/push.c:573 builtin/send-pack.c:203
 msgid "<refname>:<expect>"
 msgstr "<引用名>:<期望值>"
 
-#: builtin/push.c builtin/send-pack.c
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "require old value of ref to be at this value"
 msgstr "要求引用旧的取值为设定值"
 
-#: builtin/push.c builtin/send-pack.c
+#: builtin/push.c:577 builtin/send-pack.c:207
 msgid "require remote updates to be integrated locally"
 msgstr "要求远程更新在本地被整合"
 
-#: builtin/push.c
+#: builtin/push.c:580
 msgid "control recursive pushing of submodules"
 msgstr "控制子模组的递归推送"
 
-#: builtin/push.c builtin/send-pack.c
+#: builtin/push.c:581 builtin/send-pack.c:198
 msgid "use thin pack"
 msgstr "使用精简打包"
 
-#: builtin/push.c builtin/send-pack.c
+#: builtin/push.c:582 builtin/push.c:583 builtin/send-pack.c:185
+#: builtin/send-pack.c:186
 msgid "receive pack program"
 msgstr "接收包程序"
 
-#: builtin/push.c
+#: builtin/push.c:584
 msgid "set upstream for git pull/status"
 msgstr "设置 git pull/status 的上游"
 
-#: builtin/push.c
+#: builtin/push.c:587
 msgid "prune locally removed refs"
 msgstr "清除本地删除的引用"
 
-#: builtin/push.c
+#: builtin/push.c:589
 msgid "bypass pre-push hook"
 msgstr "绕过 pre-push 钩子"
 
-#: builtin/push.c
+#: builtin/push.c:590
 msgid "push missing but relevant tags"
 msgstr "推送缺失但有关的标签"
 
-#: builtin/push.c builtin/send-pack.c
+#: builtin/push.c:592 builtin/send-pack.c:192
 msgid "GPG sign the push"
 msgstr "用 GPG 为推送签名"
 
-#: builtin/push.c builtin/send-pack.c
+#: builtin/push.c:594 builtin/send-pack.c:199
 msgid "request atomic transaction on remote side"
 msgstr "需要远端支持原子事务"
 
-#: builtin/push.c
+#: builtin/push.c:613
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete 未接任何引用没有意义"
 
-#: builtin/push.c t/helper/test-bundle-uri.c
+#: builtin/push.c:631 t/helper/test-bundle-uri.c:88
 #, c-format
 msgid "bad repository '%s'"
 msgstr "坏的仓库 '%s'"
 
-#: builtin/push.c
+#: builtin/push.c:632
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -12260,70 +12540,70 @@ msgstr ""
 "\n"
 "    git push <名称>\n"
 
-#: builtin/push.c
+#: builtin/push.c:650
 msgid "--all can't be combined with refspecs"
 msgstr "--all 不能和引用规格同时使用"
 
-#: builtin/push.c
+#: builtin/push.c:654
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror 不能和引用规格同时使用"
 
-#: builtin/push.c
+#: builtin/push.c:662
 msgid "push options must not have new line characters"
 msgstr "推送选项不能有换行符"
 
-#: builtin/range-diff.c
+#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
 
-#: builtin/range-diff.c
+#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
 
-#: builtin/range-diff.c
+#: builtin/range-diff.c:12
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
 
-#: builtin/range-diff.c
+#: builtin/range-diff.c:31
 msgid "use simple diff colors"
 msgstr "使用简单差异颜色"
 
-#: builtin/range-diff.c
+#: builtin/range-diff.c:33
 msgid "notes"
 msgstr "注解"
 
-#: builtin/range-diff.c
+#: builtin/range-diff.c:33
 msgid "passed to 'git log'"
 msgstr "传递给 'git log'"
 
-#: builtin/range-diff.c
+#: builtin/range-diff.c:36
 msgid "only emit output related to the first range"
 msgstr "仅显示与第一个范围有关的输出"
 
-#: builtin/range-diff.c
+#: builtin/range-diff.c:38
 msgid "only emit output related to the second range"
 msgstr "仅显示与第二个范围有关的输出"
 
-#: builtin/range-diff.c
+#: builtin/range-diff.c:75 builtin/range-diff.c:79 builtin/range-diff.c:83
 #, c-format
 msgid "not a revision: '%s'"
 msgstr "不是版本：'%s'"
 
-#: builtin/range-diff.c
+#: builtin/range-diff.c:99 builtin/range-diff.c:103
 #, c-format
 msgid "not a commit range: '%s'"
 msgstr "不是提交范围：'%s'"
 
-#: builtin/range-diff.c
+#: builtin/range-diff.c:121
 #, c-format
 msgid "not a symmetric range: '%s'"
 msgstr "不是对称的范围：'%s'"
 
-#: builtin/range-diff.c
+#: builtin/range-diff.c:144
 msgid "need two commit ranges"
 msgstr "需要两个提交范围"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:43
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
 "prefix=<prefix>)\n"
@@ -12334,79 +12614,79 @@ msgstr ""
 "              [-u | -i]] [--index-output=<文件>] [--no-sparse-checkout]\n"
 "              (--empty | <树对象一> [<树对象二> [<树对象三>]])"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:122
 msgid "write resulting index to <file>"
 msgstr "将索引结果写入 <文件>"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:125
 msgid "only empty the index"
 msgstr "只是清空索引"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:127
 msgid "Merging"
 msgstr "合并"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:129
 msgid "perform a merge in addition to a read"
 msgstr "读取之余再执行一个合并"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:131
 msgid "3-way merge if no file level merging required"
 msgstr "如果没有文件级合并需要，执行三方合并"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:133
 msgid "3-way merge in presence of adds and removes"
 msgstr "存在添加和删除时，也执行三方合并"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:135
 msgid "same as -m, but discard unmerged entries"
 msgstr "类似于 -m，但丢弃未合并的条目"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:136
 msgid "<subdirectory>/"
 msgstr "<子目录>/"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:137
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "读取树对象到索引的 <子目录>/ 下"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:140
 msgid "update working tree with merge result"
 msgstr "用合并的结果更新工作区"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:142
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:143
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "允许忽略文件中设定的文件可以被覆盖"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:146
 msgid "don't check the working tree after merging"
 msgstr "合并后不检查工作区"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:147
 msgid "don't update the index or the work tree"
 msgstr "不更新索引区和工作区"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:149
 msgid "skip applying sparse checkout filter"
 msgstr "跳过应用稀疏检出过滤器"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:151
 msgid "debug unpack-trees"
 msgstr "调试 unpack-trees"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:155
 msgid "suppress feedback messages"
 msgstr "抑制反馈信息"
 
-#: builtin/read-tree.c
+#: builtin/read-tree.c:196
 msgid "You need to resolve your current index first"
 msgstr "您需要先解决当前索引的冲突"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:37
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -12414,60 +12694,61 @@ msgstr ""
 "git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<"
 "上游> [<分支>]]"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:39
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
 
-#: builtin/rebase.c sequencer.c
+#: builtin/rebase.c:217 sequencer.c:2909
 #, c-format
 msgid "could not read '%s'."
 msgstr "不能读取 '%s'。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:266
 #, c-format
 msgid "could not create temporary %s"
 msgstr "无法创建临时的 %s"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:272
 msgid "could not mark as interactive"
 msgstr "无法标记为交互式"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:309
 msgid "could not generate todo list"
 msgstr "无法生成待办列表"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:350
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:400
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s 需要合并后端"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:443
 #, c-format
 msgid "invalid onto: '%s'"
 msgstr "无效新基线：'%s'"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:460
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "无效的原始 head：'%s'"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:485
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "忽略无效的 allow_rerere_autoupdate：'%s'"
 
-#: builtin/rebase.c builtin/rm.c sequencer.c
+#: builtin/rebase.c:553 builtin/rebase.c:1375 builtin/rm.c:419 sequencer.c:455
+#: sequencer.c:5363
 #, c-format
 msgid "could not remove '%s'"
 msgstr "无法删除 '%s'"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:666
 #, c-format
 msgid ""
 "\n"
@@ -12485,32 +12766,33 @@ msgstr ""
 "\n"
 "因此 git 无法对其变基。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:757
 #, c-format
 msgid "Unknown rebase-merges mode: %s"
 msgstr "未知的变基合并模式：%s"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:839
 #, c-format
 msgid "could not switch to %s"
 msgstr "无法切换到 %s"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:921 builtin/rebase.c:937 builtin/rebase.c:954
+#: builtin/rebase.c:1514
 msgid "apply options and merge options cannot be used together"
 msgstr "应用选项和合并选项不能同时使用"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:971
 msgid "--empty=ask is deprecated; use '--empty=stop' instead."
 msgstr "--empty=ask 已弃用；请使用 '--empty=stop'。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:975
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
 "\"stop\"."
 msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"stop\"。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1010
 msgid ""
 "--rebase-merges with an empty string argument is deprecated and will stop "
 "working in a future version of Git. Use --rebase-merges without an argument "
@@ -12520,7 +12802,7 @@ msgstr ""
 "的版本中将不再支持。 支持使用无参数 --rebase-merges 的方式进行替\n"
 "代，它们具有相同的作用。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1027
 #, c-format
 msgid ""
 "%s\n"
@@ -12537,7 +12819,7 @@ msgstr ""
 "    git rebase '<branch>'\n"
 "\n"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1043
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -12550,167 +12832,167 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1056
 msgid "exec commands cannot contain newlines"
 msgstr "exec 命令不能包含换行符"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1060
 msgid "empty exec command"
 msgstr "空的 exec 命令"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1089
 msgid "rebase onto given branch instead of upstream"
 msgstr "变基到给定的分支而非上游"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1091
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "使用上游和分支的合并基线做为当前基线"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1093
 msgid "allow pre-rebase hook to run"
 msgstr "允许执行 pre-rebase 钩子"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1095
 msgid "be quiet. implies --no-stat"
 msgstr "安静。暗示 --no-stat"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1098
 msgid "display a diffstat of what changed upstream"
 msgstr "显示上游变化的差异统计"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1101
 msgid "do not show diffstat of what changed upstream"
 msgstr "不显示上游变化的差异统计"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1104
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "为每一个提交添加 Signed-off-by 尾注"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1107
 msgid "make committer date match author date"
 msgstr "使提交者日期和作者日期一致"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1109
 msgid "ignore author date and use current date"
 msgstr "忽略作者日期，使用当前日期"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1111
 msgid "synonym of --reset-author-date"
 msgstr "--reset-author-date 的同义词"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1113 builtin/rebase.c:1117
 msgid "passed to 'git apply'"
 msgstr "传递给 'git apply'"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1115
 msgid "ignore changes in whitespace"
 msgstr "忽略空白字符的变更"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1119 builtin/rebase.c:1122
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "拣选所有提交，即使未修改"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1124
 msgid "continue"
 msgstr "继续"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1127
 msgid "skip current patch and continue"
 msgstr "跳过当前补丁并继续"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1129
 msgid "abort and check out the original branch"
 msgstr "终止并检出原有分支"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1132
 msgid "abort but keep HEAD where it is"
 msgstr "终止但保持 HEAD 不变"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1133
 msgid "edit the todo list during an interactive rebase"
 msgstr "在交互式变基中编辑待办列表"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1136
 msgid "show the patch file being applied or merged"
 msgstr "显示正在应用或合并的补丁文件"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1139
 msgid "use apply strategies to rebase"
 msgstr "使用应用策略进行变基"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1143
 msgid "use merging strategies to rebase"
 msgstr "使用合并策略进行变基"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1147
 msgid "let the user edit the list of commits to rebase"
 msgstr "让用户编辑要变基的提交列表"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1151
 msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
 msgstr "（已删除）曾是：尝试重建合并提交而非忽略它们"
 
-#: builtin/rebase.c builtin/revert.c
+#: builtin/rebase.c:1156 builtin/revert.c:145
 msgid "how to handle commits that become empty"
 msgstr "如何处理成为空提交的提交"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1159
 msgid "keep commits which start empty"
 msgstr "保留初始为空的提交"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1163
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1166
 msgid "update branches that point to commits that are being rebased"
 msgstr "更新指向正在被变基的提交的分支"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1173
 msgid "add exec lines after each commit of the editable list"
 msgstr "可编辑列表的每一个提交下面增加一行 exec"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1177
 msgid "allow rebasing commits with empty messages"
 msgstr "允许针对空提交说明的提交变基"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1180
 msgid "try to rebase merges instead of skipping them"
 msgstr "尝试对合并提交变基而不是忽略它们"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1183
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "使用 'merge-base --fork-point' 来优化上游"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1185
 msgid "use the given merge strategy"
 msgstr "使用给定的合并策略"
 
-#: builtin/rebase.c builtin/revert.c
+#: builtin/rebase.c:1187 builtin/revert.c:129
 msgid "option"
 msgstr "选项"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1188
 msgid "pass the argument through to the merge strategy"
 msgstr "将参数传递给合并策略"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1191
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "将所有可达的提交变基到根提交"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1194
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "自动重新安排任何失败的 `exec`"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1196
 msgid "apply all changes, even those already present upstream"
 msgstr "应用所有更改，甚至那些已在上游存在的"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1216
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "看起来 'git am' 正在执行中。无法变基。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1225
 msgid ""
 "`rebase --preserve-merges` (-p) is no longer supported.\n"
 "Use `git rebase --abort` to terminate current rebase.\n"
@@ -12720,7 +13002,7 @@ msgstr ""
 "使用 `git rebase --abort` 来终止当前的变基。\n"
 "或者降级至 v2.33 或更早的版本来完成此次变基。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1247
 msgid ""
 "--preserve-merges was replaced by --rebase-merges\n"
 "Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
@@ -12730,19 +13012,19 @@ msgstr ""
 "提示：你的 `pull.rebase` 配置可能是不再被支持的 'preserve' 选项；\n"
 "取而代之请使用 'merges'"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1276
 msgid "no rebase in progress"
 msgstr "没有正在进行的变基"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1279
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1303
 msgid "Cannot read HEAD"
 msgstr "不能读取 HEAD"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1315
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -12750,16 +13032,16 @@ msgstr ""
 "您必须编辑所有的合并冲突，然后通过 git add\n"
 "命令将它们标记为已解决"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1330
 msgid "could not discard worktree changes"
 msgstr "无法丢弃工作区变更"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1355
 #, c-format
 msgid "could not move back to %s"
 msgstr "无法移回 %s"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1401
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -12778,120 +13060,121 @@ msgstr ""
 "\t%s\n"
 "然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1429
 msgid "switch `C' expects a numerical value"
 msgstr "开关 `C' 期望一个数字值"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1517
 msgid ""
 "apply options are incompatible with rebase.rebaseMerges.  Consider adding --"
 "no-rebase-merges"
 msgstr "应用的选项与 rebase.rebaseMerges 不兼容。考虑加上 --no-rebase-merges"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1519
 msgid ""
 "apply options are incompatible with rebase.updateRefs.  Consider adding --no-"
 "update-refs"
 msgstr "应用的选项与 rebase.updateRefs 不兼容。考虑加上 --no-update-refs"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1549
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "未知的变基后端：%s"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1578
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1609
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "无效的上游 '%s'"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1615
 msgid "Could not create new root commit"
 msgstr "不能创建新的根提交"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1659
 #, c-format
 msgid "no such branch/commit '%s'"
 msgstr "无此分支/提交 '%s'"
 
-#: builtin/rebase.c builtin/submodule--helper.c
+#: builtin/rebase.c:1666 builtin/submodule--helper.c:51
+#: builtin/submodule--helper.c:2460
 #, c-format
 msgid "No such ref: %s"
 msgstr "没有这样的引用：%s"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1678
 msgid "Could not resolve HEAD to a commit"
 msgstr "不能解析 HEAD 至一个提交"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1694
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s'：只需要与分支的一个合并基线"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1697
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s'：只需要一个合并基线"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1706
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "没有指向一个有效的提交 '%s'"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1759
 msgid "HEAD is up to date."
 msgstr "HEAD 是最新的。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1761
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "当前分支 %s 是最新的。\n"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1769
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD 是最新的，强制变基。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1771
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "当前分支 %s 是最新的，强制变基。\n"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1779
 msgid "The pre-rebase hook refused to rebase."
 msgstr "pre-rebase 钩子拒绝了变基操作。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1786
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "到 %s 的变更：\n"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1789
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "从 %s 到 %s 的变更：\n"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1813
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr "首先，回退头指针以便在其上重放您的工作...\n"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1825
 msgid "Could not detach HEAD"
 msgstr "无法分离头指针"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1833
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "快进 %s 到 %s。\n"
 
-#: builtin/receive-pack.c
+#: builtin/receive-pack.c:44
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <仓库目录>"
 
-#: builtin/receive-pack.c
+#: builtin/receive-pack.c:1253
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -12917,7 +13200,7 @@ msgstr ""
 "若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
 "配置变量为 'refuse'。"
 
-#: builtin/receive-pack.c
+#: builtin/receive-pack.c:1273
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -12936,23 +13219,23 @@ msgstr ""
 "\n"
 "若要屏蔽此信息，您可以设置它为 'refuse'。"
 
-#: builtin/receive-pack.c
+#: builtin/receive-pack.c:2493
 msgid "quiet"
 msgstr "静默模式"
 
-#: builtin/receive-pack.c
+#: builtin/receive-pack.c:2508
 msgid "you must specify a directory"
 msgstr "您必须指定一个目录"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:14
 msgid "git reflog [show] [<log-options>] [<ref>]"
 msgstr "git reflog [show] [<log 选项>] [<引用>]"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:17
 msgid "git reflog list"
 msgstr "git reflog list"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:20
 msgid ""
 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
 "                  [--rewrite] [--updateref] [--stale-fix]\n"
@@ -12964,7 +13247,7 @@ msgstr ""
 "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | <"
 "引用>...]"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:25
 msgid ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
@@ -12972,83 +13255,104 @@ msgstr ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <引用>@{<指定符>}..."
 
-#: builtin/reflog.c
+#: builtin/reflog.c:29
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <引用>"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:214 builtin/reflog.c:230
 #, c-format
 msgid "invalid timestamp '%s' given to '--%s'"
 msgstr "给 '--%2$s' 的时间戳 '%1$s' 无效"
 
-#: builtin/reflog.c sequencer.c
+#: builtin/reflog.c:265 sequencer.c:2722
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s 不接受参数：'%s'"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:282 builtin/reflog.c:404
 msgid "do not actually prune any entries"
 msgstr "不要实际清除任何条目"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:285 builtin/reflog.c:407
 msgid ""
 "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
 msgstr "用现在前继条目的 SHA1 来重写旧的 SHA1"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:288 builtin/reflog.c:410
 msgid "update the reference to the value of the top reflog entry"
 msgstr "更新引用至引用日志顶部的条目"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:290 builtin/reflog.c:412
 msgid "print extra information on screen"
 msgstr "在屏幕上打印额外信息"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:291 builtin/reflog.c:295
 msgid "timestamp"
 msgstr "时间戳"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:292
 msgid "prune entries older than the specified time"
 msgstr "清除早于指定时间之前的条目"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:296
 msgid ""
 "prune entries older than <time> that are not reachable from the current tip "
 "of the branch"
 msgstr "清除早于 <时间> 且自当前分支顶部不可达的条目"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:300
 msgid "prune any reflog entries that point to broken commits"
 msgstr "清除指向损坏提交的引用条目"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:301
 msgid "process the reflogs of all references"
 msgstr "处理所有引用的引用日志"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:303
 msgid "limits processing to reflogs from the current worktree only"
 msgstr "仅处理当前工作树的引用日志"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:336
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "正在标记可达对象..."
 
-#: builtin/reflog.c
+#: builtin/reflog.c:382
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s 指向不存在！"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:419
 msgid "no reflog specified to delete"
 msgstr "未指定要删除的引用日志"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:441
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "无效的引用格式：%s"
 
-#: builtin/remote.c
+#: builtin/refs.c:8
+msgid "git refs migrate --ref-format=<format> [--dry-run]"
+msgstr "git refs migrate --ref-format=<格式> [--dry-run]"
+
+#: builtin/refs.c:21
+msgid "specify the reference format to convert to"
+msgstr "指定要转换的参考格式"
+
+#: builtin/refs.c:24
+msgid "perform a non-destructive dry-run"
+msgstr "进行非破坏性的试运行（dry-run）"
+
+#: builtin/refs.c:35
+msgid "missing --ref-format=<format>"
+msgstr "缺少 --ref-format=<格式>"
+
+#: builtin/refs.c:44
+#, c-format
+msgid "repository already uses '%s' format"
+msgstr "repository already uses '%s' format"
+
+#: builtin/remote.c:21
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -13056,86 +13360,86 @@ msgstr ""
 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <名称> <地址>"
 
-#: builtin/remote.c
+#: builtin/remote.c:22 builtin/remote.c:42
 msgid "git remote rename [--[no-]progress] <old> <new>"
 msgstr "git remote rename [--[no-]progress] <旧> <新>"
 
-#: builtin/remote.c
+#: builtin/remote.c:23 builtin/remote.c:47
 msgid "git remote remove <name>"
 msgstr "git remote remove <名称>"
 
-#: builtin/remote.c
+#: builtin/remote.c:24 builtin/remote.c:52
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
 
-#: builtin/remote.c
+#: builtin/remote.c:25
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <名称>"
 
-#: builtin/remote.c
+#: builtin/remote.c:26
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <名称>"
 
-#: builtin/remote.c
+#: builtin/remote.c:27
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
 
-#: builtin/remote.c
+#: builtin/remote.c:28
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <名称> <分支>..."
 
-#: builtin/remote.c
+#: builtin/remote.c:29 builtin/remote.c:78
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <名称>"
 
-#: builtin/remote.c
+#: builtin/remote.c:30 builtin/remote.c:83
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
 
-#: builtin/remote.c
+#: builtin/remote.c:31 builtin/remote.c:84
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <名称> <新的地址>"
 
-#: builtin/remote.c
+#: builtin/remote.c:32 builtin/remote.c:85
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <名称> <地址>"
 
-#: builtin/remote.c
+#: builtin/remote.c:37
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<选项>] <名称> <地址>"
 
-#: builtin/remote.c
+#: builtin/remote.c:57
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <名称> <分支>..."
 
-#: builtin/remote.c
+#: builtin/remote.c:58
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <名称> <分支>..."
 
-#: builtin/remote.c
+#: builtin/remote.c:63
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<选项>] <名称>"
 
-#: builtin/remote.c
+#: builtin/remote.c:68
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<选项>] <名称>"
 
-#: builtin/remote.c
+#: builtin/remote.c:73
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<选项>] [<组> | <远程>]..."
 
-#: builtin/remote.c
+#: builtin/remote.c:104
 #, c-format
 msgid "Updating %s"
 msgstr "更新 %s 中"
 
-#: builtin/remote.c
+#: builtin/remote.c:106
 #, c-format
 msgid "Could not fetch %s"
 msgstr "不能获取 %s"
 
-#: builtin/remote.c
+#: builtin/remote.c:136
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -13143,85 +13447,86 @@ msgstr ""
 "--mirror 选项危险且过时，请使用 --mirror=fetch\n"
 "\t 或 --mirror=push"
 
-#: builtin/remote.c
+#: builtin/remote.c:153
 #, c-format
 msgid "unknown --mirror argument: %s"
 msgstr "未知的 --mirror 参数：%s"
 
-#: builtin/remote.c
+#: builtin/remote.c:169
 msgid "fetch the remote branches"
 msgstr "抓取远程的分支"
 
-#: builtin/remote.c
+#: builtin/remote.c:171
 msgid ""
 "import all tags and associated objects when fetching\n"
 "or do not fetch any tag at all (--no-tags)"
 msgstr "抓取时导入所有的标签和关联对象，或不抓取任何标签（--no-tags）"
 
-#: builtin/remote.c
+#: builtin/remote.c:175
 msgid "branch(es) to track"
 msgstr "跟踪的分支"
 
-#: builtin/remote.c
+#: builtin/remote.c:176
 msgid "master branch"
 msgstr "主线分支"
 
-#: builtin/remote.c
+#: builtin/remote.c:178
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "把远程设置为用以推送或抓取的镜像"
 
-#: builtin/remote.c
+#: builtin/remote.c:190
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
 
-#: builtin/remote.c
+#: builtin/remote.c:192
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
 
-#: builtin/remote.c
+#: builtin/remote.c:199 builtin/remote.c:730
 #, c-format
 msgid "remote %s already exists."
 msgstr "远程 %s 已经存在。"
 
-#: builtin/remote.c
+#: builtin/remote.c:244
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "无法设置 master '%s'"
 
-#: builtin/remote.c trailer.c
+#: builtin/remote.c:305 builtin/remote.c:333 trailer.c:544 trailer.c:551
+#: trailer.c:558
 #, c-format
 msgid "more than one %s"
 msgstr "多于一个 %s"
 
-#: builtin/remote.c
+#: builtin/remote.c:328
 #, c-format
 msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
 msgstr "未处理的 branch.%s.rebase=%s; 假定为 'true'"
 
-#: builtin/remote.c
+#: builtin/remote.c:373
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "无法得到引用规格 %s 的获取列表"
 
-#: builtin/remote.c
+#: builtin/remote.c:470 builtin/remote.c:478
 msgid "(matching)"
 msgstr "（匹配）"
 
-#: builtin/remote.c
+#: builtin/remote.c:482
 msgid "(delete)"
 msgstr "（删除）"
 
-#: builtin/remote.c
+#: builtin/remote.c:678
 #, c-format
 msgid "could not set '%s'"
 msgstr "不能设置 '%s'"
 
-#: builtin/remote.c config.c
+#: builtin/remote.c:680 builtin/remote.c:904 builtin/remote.c:912 config.c:3556
 #, c-format
 msgid "could not unset '%s'"
 msgstr "不能取消设置 '%s'"
 
-#: builtin/remote.c
+#: builtin/remote.c:683
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -13232,17 +13537,17 @@ msgstr ""
 "\t%s:%d\n"
 "现在在为不存在的远程名 '%s' 命名"
 
-#: builtin/remote.c
+#: builtin/remote.c:721 builtin/remote.c:885 builtin/remote.c:997
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "没有此远程仓库：'%s'"
 
-#: builtin/remote.c
+#: builtin/remote.c:740
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "不能重命名配置小节 '%s' 到 '%s'"
 
-#: builtin/remote.c
+#: builtin/remote.c:761
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -13253,21 +13558,21 @@ msgstr ""
 "\t%s\n"
 "\t如果必要请手动更新配置。"
 
-#: builtin/remote.c
+#: builtin/remote.c:800
 msgid "Renaming remote references"
 msgstr "正在重命名远程引用"
 
-#: builtin/remote.c
+#: builtin/remote.c:811
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "删除 '%s' 失败"
 
-#: builtin/remote.c
+#: builtin/remote.c:849
 #, c-format
 msgid "creating '%s' failed"
 msgstr "创建 '%s' 失败"
 
-#: builtin/remote.c
+#: builtin/remote.c:934
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -13277,154 +13582,154 @@ msgid_plural ""
 msgstr[0] "注意：refs/remotes/ 层级之外的一个分支未被移除。要删除它，使用："
 msgstr[1] "注意：refs/remotes/ 层级之外的一些分支未被移除。要删除它们，使用："
 
-#: builtin/remote.c
+#: builtin/remote.c:948
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "不能移除配置小节 '%s'"
 
-#: builtin/remote.c
+#: builtin/remote.c:1058
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " 新的（下一次获取将存储于 remotes/%s）"
 
-#: builtin/remote.c
+#: builtin/remote.c:1061
 msgid " tracked"
 msgstr " 已跟踪"
 
-#: builtin/remote.c
+#: builtin/remote.c:1063
 msgid " skipped"
 msgstr " 已跳过"
 
-#: builtin/remote.c
+#: builtin/remote.c:1065
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " 已过期（使用 'git remote prune' 来移除）"
 
-#: builtin/remote.c
+#: builtin/remote.c:1067
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c
+#: builtin/remote.c:1108
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
 
-#: builtin/remote.c
+#: builtin/remote.c:1117
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "交互式变基到远程 %s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1119
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "交互式变基（含合并提交）到远程 %s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1122
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "变基到远程 %s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1126
 #, c-format
 msgid " merges with remote %s"
 msgstr " 与远程 %s 合并"
 
-#: builtin/remote.c
+#: builtin/remote.c:1129
 #, c-format
 msgid "merges with remote %s"
 msgstr "与远程 %s 合并"
 
-#: builtin/remote.c
+#: builtin/remote.c:1132
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    以及和远程 %s\n"
 
-#: builtin/remote.c
+#: builtin/remote.c:1175
 msgid "create"
 msgstr "创建"
 
-#: builtin/remote.c
+#: builtin/remote.c:1178
 msgid "delete"
 msgstr "删除"
 
-#: builtin/remote.c
+#: builtin/remote.c:1182
 msgid "up to date"
 msgstr "最新"
 
-#: builtin/remote.c
+#: builtin/remote.c:1185
 msgid "fast-forwardable"
 msgstr "可快进"
 
-#: builtin/remote.c
+#: builtin/remote.c:1188
 msgid "local out of date"
 msgstr "本地已过时"
 
-#: builtin/remote.c
+#: builtin/remote.c:1195
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s 强制推送至 %-*s (%s)"
 
-#: builtin/remote.c
+#: builtin/remote.c:1198
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s 推送至 %-*s (%s)"
 
-#: builtin/remote.c
+#: builtin/remote.c:1202
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s 强制推送至 %s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1205
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s 推送至 %s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1274
 msgid "do not query remotes"
 msgstr "不查询远程"
 
-#: builtin/remote.c
+#: builtin/remote.c:1295
 #, c-format
 msgid "* remote %s"
 msgstr "* 远程 %s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1296
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  获取地址：%s"
 
-#: builtin/remote.c
-msgid "(no URL)"
-msgstr "(无 URL)"
-
 #. TRANSLATORS: the colon ':' should align
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c
+#: builtin/remote.c:1304 builtin/remote.c:1306
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  推送地址：%s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1306
+msgid "(no URL)"
+msgstr "(无 URL)"
+
+#: builtin/remote.c:1308 builtin/remote.c:1310 builtin/remote.c:1312
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD 分支：%s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1308
 msgid "(not queried)"
 msgstr "（未查询）"
 
-#: builtin/remote.c
+#: builtin/remote.c:1310
 msgid "(unknown)"
 msgstr "（未知）"
 
-#: builtin/remote.c
+#: builtin/remote.c:1314
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
 
-#: builtin/remote.c
+#: builtin/remote.c:1327
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -13432,159 +13737,154 @@ msgstr[0] "  远程分支：%s"
 msgstr[1] "  远程分支：%s"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c
+#: builtin/remote.c:1330 builtin/remote.c:1356
 msgid " (status not queried)"
 msgstr "（状态未查询）"
 
-#: builtin/remote.c
+#: builtin/remote.c:1339
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  为 'git pull' 配置的本地分支："
 msgstr[1] "  为 'git pull' 配置的本地分支："
 
-#: builtin/remote.c
+#: builtin/remote.c:1347
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  本地引用将在 'git push' 时被镜像"
 
-#: builtin/remote.c
+#: builtin/remote.c:1353
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  为 'git push' 配置的本地引用%s："
 msgstr[1] "  为 'git push' 配置的本地引用%s："
 
-#: builtin/remote.c
+#: builtin/remote.c:1374
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
 
-#: builtin/remote.c
+#: builtin/remote.c:1376
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "删除 refs/remotes/<名称>/HEAD"
 
-#: builtin/remote.c
+#: builtin/remote.c:1390
 msgid "Cannot determine remote HEAD"
 msgstr "无法确定远程 HEAD"
 
-#: builtin/remote.c
+#: builtin/remote.c:1392
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
 
-#: builtin/remote.c
+#: builtin/remote.c:1402
 #, c-format
 msgid "Could not delete %s"
 msgstr "无法删除 %s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1410
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "不是一个有效引用：%s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1412
 #, c-format
 msgid "Could not setup %s"
 msgstr "不能设置 %s"
 
 #  译者：注意保持前导空格
-#: builtin/remote.c
+#: builtin/remote.c:1430
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s 将成为悬空状态！"
 
 #  译者：注意保持前导空格
-#: builtin/remote.c
+#: builtin/remote.c:1431
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s 已成为悬空状态！"
 
-#: builtin/remote.c
+#: builtin/remote.c:1440
 #, c-format
 msgid "Pruning %s"
 msgstr "修剪 %s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1441
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1455
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [将删除] %s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1458
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [已删除] %s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1506
 msgid "prune remotes after fetching"
 msgstr "抓取后清除远程"
 
-#: builtin/remote.c
+#: builtin/remote.c:1569 builtin/remote.c:1625 builtin/remote.c:1681
 #, c-format
 msgid "No such remote '%s'"
 msgstr "没有此远程 '%s'"
 
-#: builtin/remote.c
+#: builtin/remote.c:1587
 msgid "add branch"
 msgstr "添加分支"
 
-#: builtin/remote.c
+#: builtin/remote.c:1594
 msgid "no remote specified"
 msgstr "未指定远程"
 
-#: builtin/remote.c
+#: builtin/remote.c:1610
 msgid "query push URLs rather than fetch URLs"
 msgstr "查询推送 URL 地址，而非获取 URL 地址"
 
-#: builtin/remote.c
+#: builtin/remote.c:1612
 msgid "return all URLs"
 msgstr "返回所有 URL 地址"
 
-#: builtin/remote.c
-#, c-format
-msgid "no URLs configured for remote '%s'"
-msgstr "没有给远程仓库 '%s' 设定 URL"
-
-#: builtin/remote.c
+#: builtin/remote.c:1654
 msgid "manipulate push URLs"
 msgstr "操作推送 URLS"
 
-#: builtin/remote.c
+#: builtin/remote.c:1656
 msgid "add URL"
 msgstr "添加 URL"
 
-#: builtin/remote.c
+#: builtin/remote.c:1658
 msgid "delete URLs"
 msgstr "删除 URLS"
 
-#: builtin/remote.c
+#: builtin/remote.c:1666
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete 无意义"
 
-#: builtin/remote.c
+#: builtin/remote.c:1705
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "无效的旧 URL 匹配模版：%s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1713
 #, c-format
 msgid "No such URL found: %s"
 msgstr "未找到此 URL：%s"
 
-#: builtin/remote.c
+#: builtin/remote.c:1715
 msgid "Will not delete all non-push URLs"
 msgstr "将不会删除所有非推送 URL 地址"
 
-#: builtin/remote.c
+#: builtin/remote.c:1733
 msgid "be verbose; must be placed before a subcommand"
 msgstr "冗长输出；必须置于子命令之前"
 
-#: builtin/repack.c
+#: builtin/repack.c:41
 msgid "git repack [<options>]"
 msgstr "git repack [<选项>]"
 
-#: builtin/repack.c
+#: builtin/repack.c:46
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
@@ -13592,209 +13892,209 @@ msgstr ""
 "增量 repack 和 bitmap 索引不兼容。  使用 --no-write-bitmap-index\n"
 "或禁用 pack.writeBitmaps 配置。"
 
-#: builtin/repack.c
+#: builtin/repack.c:314
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
 
-#: builtin/repack.c
+#: builtin/repack.c:319
 msgid "failed to feed promisor objects to pack-objects"
 msgstr "无法将承诺者对象提供给 pack-objects"
 
-#: builtin/repack.c
+#: builtin/repack.c:406 builtin/repack.c:911
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
 
-#: builtin/repack.c
+#: builtin/repack.c:430
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
 
-#: builtin/repack.c
+#: builtin/repack.c:444
 #, c-format
 msgid "cannot open index for %s"
 msgstr "不能打开 %s 的索引"
 
-#: builtin/repack.c
+#: builtin/repack.c:534
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "包 %s 太大，不在几何级数中考虑"
 
-#: builtin/repack.c
+#: builtin/repack.c:568 builtin/repack.c:576 builtin/repack.c:582
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "包 %s 太大导致数字溢出"
 
-#: builtin/repack.c
+#: builtin/repack.c:701
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "无法打开临时文件 %s 进行写入"
 
-#: builtin/repack.c
+#: builtin/repack.c:722
 msgid "could not close refs snapshot tempfile"
 msgstr "不能关闭引用快照临时文件"
 
-#: builtin/repack.c
+#: builtin/repack.c:891
 #, c-format
 msgid "could not remove stale bitmap: %s"
 msgstr "无法删除过期的位图： %s"
 
-#: builtin/repack.c
+#: builtin/repack.c:1111
 #, c-format
 msgid "pack prefix %s does not begin with objdir %s"
 msgstr "包前缀 %s 没有以对象目录 %s 开始"
 
-#: builtin/repack.c
+#: builtin/repack.c:1143
 msgid "pack everything in a single pack"
 msgstr "所有内容打包到一个包文件中"
 
-#: builtin/repack.c
+#: builtin/repack.c:1145
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "和 -a 相同，并将不可达的对象设为松散对象"
 
-#: builtin/repack.c
+#: builtin/repack.c:1148
 msgid "same as -a, pack unreachable cruft objects separately"
 msgstr "和 -a 相同，将不可达的废弃对象分开打包"
 
-#: builtin/repack.c
+#: builtin/repack.c:1150 builtin/repack.c:1169
 msgid "approxidate"
 msgstr "近似日期"
 
-#: builtin/repack.c
+#: builtin/repack.c:1151
 msgid "with --cruft, expire objects older than this"
 msgstr "使用 --cruft，使早于给定时间的对象过期"
 
-#: builtin/repack.c
+#: builtin/repack.c:1155
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "删除多余的包，运行 git-prune-packed"
 
-#: builtin/repack.c
+#: builtin/repack.c:1157
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
 
-#: builtin/repack.c
+#: builtin/repack.c:1159
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
 
-#: builtin/repack.c
+#: builtin/repack.c:1161
 msgid "do not run git-update-server-info"
 msgstr "不运行 git-update-server-info"
 
-#: builtin/repack.c
+#: builtin/repack.c:1164
 msgid "pass --local to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --local"
 
-#: builtin/repack.c
+#: builtin/repack.c:1166
 msgid "write bitmap index"
 msgstr "写 bitmap 索引"
 
-#: builtin/repack.c
+#: builtin/repack.c:1168
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --delta-islands"
 
-#: builtin/repack.c
+#: builtin/repack.c:1170
 msgid "with -A, do not loosen objects older than this"
 msgstr "使用 -A，不要将早于给定时间的对象过期"
 
-#: builtin/repack.c
+#: builtin/repack.c:1172
 msgid "with -a, repack unreachable objects"
 msgstr "使用 -a ，重新对不可达对象打包"
 
-#: builtin/repack.c
+#: builtin/repack.c:1174
 msgid "size of the window used for delta compression"
 msgstr "用于增量压缩的窗口值"
 
-#: builtin/repack.c
+#: builtin/repack.c:1175
 msgid "bytes"
 msgstr "字节"
 
-#: builtin/repack.c
+#: builtin/repack.c:1176
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "和上面的相似，但限制内存大小而非条目数"
 
-#: builtin/repack.c
+#: builtin/repack.c:1178
 msgid "limits the maximum delta depth"
 msgstr "限制最大增量深度"
 
-#: builtin/repack.c
+#: builtin/repack.c:1180
 msgid "limits the maximum number of threads"
 msgstr "限制最大线程数"
 
-#: builtin/repack.c
+#: builtin/repack.c:1182
 msgid "maximum size of each packfile"
 msgstr "每个包文件的最大尺寸"
 
-#: builtin/repack.c
+#: builtin/repack.c:1185
 msgid "repack objects in packs marked with .keep"
 msgstr "对标记为 .keep 的包中的对象重新打包"
 
-#: builtin/repack.c
+#: builtin/repack.c:1187
 msgid "do not repack this pack"
 msgstr "不要对该包文件重新打包"
 
-#: builtin/repack.c
+#: builtin/repack.c:1189
 msgid "find a geometric progression with factor <N>"
 msgstr "使用因子 <n> 查找几何级数"
 
-#: builtin/repack.c
+#: builtin/repack.c:1191
 msgid "write a multi-pack index of the resulting packs"
 msgstr "写入结果包的多包索引"
 
-#: builtin/repack.c
+#: builtin/repack.c:1193
 msgid "pack prefix to store a pack containing pruned objects"
 msgstr "储存被清除的对象的包的前缀"
 
-#: builtin/repack.c
+#: builtin/repack.c:1195
 msgid "pack prefix to store a pack containing filtered out objects"
 msgstr "储存被过滤的对象的包的前缀"
 
-#: builtin/repack.c
+#: builtin/repack.c:1207
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "不能删除珍品仓库中的打包文件"
 
-#: builtin/repack.c
+#: builtin/repack.c:1339
 #, c-format
 msgid "option '%s' can only be used along with '%s'"
 msgstr "选项 '%s' 只能和 '%s' 搭配使用"
 
-#: builtin/repack.c
+#: builtin/repack.c:1369
 msgid "Nothing new to pack."
 msgstr "没有新的要打包。"
 
-#: builtin/repack.c
+#: builtin/repack.c:1466
 #, c-format
 msgid "renaming pack to '%s' failed"
 msgstr "重命名包至 '%s' 失败"
 
-#: builtin/repack.c
+#: builtin/repack.c:1468
 #, c-format
 msgid "pack-objects did not write a '%s' file for pack %s-%s"
 msgstr "pack-objects 未为包 %2$s-%3$s 写入 '%1$s' 文件"
 
-#: builtin/repack.c sequencer.c
+#: builtin/repack.c:1471 sequencer.c:4396
 #, c-format
 msgid "could not unlink: %s"
 msgstr "不能删除：%s"
 
-#: builtin/replace.c
+#: builtin/replace.c:30
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <对象> <替换物>"
 
-#: builtin/replace.c
+#: builtin/replace.c:31
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <对象>"
 
-#: builtin/replace.c
+#: builtin/replace.c:32
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
 
-#: builtin/replace.c
+#: builtin/replace.c:34
 msgid "git replace -d <object>..."
 msgstr "git replace -d <对象>..."
 
-#: builtin/replace.c
+#: builtin/replace.c:35
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
 
-#: builtin/replace.c
+#: builtin/replace.c:100
 #, c-format
 msgid ""
 "invalid replace format '%s'\n"
@@ -13803,27 +14103,27 @@ msgstr ""
 "无效的替换格式 '%s'\n"
 "有效的格式有 'short'、'medium' 和 'long'"
 
-#: builtin/replace.c
+#: builtin/replace.c:137
 #, c-format
 msgid "replace ref '%s' not found"
 msgstr "未发现替换引用 '%s'"
 
-#: builtin/replace.c
+#: builtin/replace.c:153
 #, c-format
 msgid "Deleted replace ref '%s'"
 msgstr "已删除替换引用 '%s'"
 
-#: builtin/replace.c
+#: builtin/replace.c:167
 #, c-format
 msgid "'%s' is not a valid ref name"
 msgstr "'%s' 不是一个有效的引用名"
 
-#: builtin/replace.c
+#: builtin/replace.c:172
 #, c-format
 msgid "replace ref '%s' already exists"
 msgstr "替换引用 '%s' 已经存在"
 
-#: builtin/replace.c
+#: builtin/replace.c:192
 #, c-format
 msgid ""
 "Objects must be of the same type.\n"
@@ -13834,106 +14134,106 @@ msgstr ""
 "'%s' 指向 '%s' 类型的替换对象\n"
 "而 '%s' 指向 '%s' 类型的替换对象。"
 
-#: builtin/replace.c
+#: builtin/replace.c:244
 #, c-format
 msgid "unable to open %s for writing"
 msgstr "无法为写入打开 %s"
 
-#: builtin/replace.c
+#: builtin/replace.c:257
 msgid "cat-file reported failure"
 msgstr "cat-file 报告失败"
 
-#: builtin/replace.c
+#: builtin/replace.c:273
 #, c-format
 msgid "unable to open %s for reading"
 msgstr "无法为读取打开 %s"
 
-#: builtin/replace.c
+#: builtin/replace.c:286
 msgid "unable to spawn mktree"
 msgstr "无法启动 mktree"
 
-#: builtin/replace.c
+#: builtin/replace.c:290
 msgid "unable to read from mktree"
 msgstr "无法从 mktree 读取"
 
-#: builtin/replace.c
+#: builtin/replace.c:299
 msgid "mktree reported failure"
 msgstr "mktree 报告失败"
 
-#: builtin/replace.c
+#: builtin/replace.c:303
 msgid "mktree did not return an object name"
 msgstr "mktree 没有返回一个对象名"
 
-#: builtin/replace.c
+#: builtin/replace.c:312
 #, c-format
 msgid "unable to fstat %s"
 msgstr "无法对 %s 执行 fstat"
 
-#: builtin/replace.c
+#: builtin/replace.c:317
 msgid "unable to write object to database"
 msgstr "无法向数据库写入对象"
 
-#: builtin/replace.c
+#: builtin/replace.c:340
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "无法得到 %s 的对象类型"
 
-#: builtin/replace.c
+#: builtin/replace.c:356
 msgid "editing object file failed"
 msgstr "编辑对象文件失败"
 
-#: builtin/replace.c
+#: builtin/replace.c:365
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "新对象和旧对象相同：'%s'"
 
-#: builtin/replace.c
+#: builtin/replace.c:398
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "无法将 %s 解析为一个提交"
 
-#: builtin/replace.c
+#: builtin/replace.c:430
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "提交 '%s' 中含有损坏的合并标签"
 
-#: builtin/replace.c
+#: builtin/replace.c:432
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "提交 '%s' 中含有格式错误的合并标签"
 
-#: builtin/replace.c
+#: builtin/replace.c:444
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
 
-#: builtin/replace.c
+#: builtin/replace.c:483
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "原始提交 '%s' 中有一个 gpg 签名"
 
-#: builtin/replace.c
+#: builtin/replace.c:484
 msgid "the signature will be removed in the replacement commit!"
 msgstr "在替换的提交中签名将被移除！"
 
-#: builtin/replace.c
+#: builtin/replace.c:494
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "不能为 '%s' 写替换提交"
 
-#: builtin/replace.c
+#: builtin/replace.c:502
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "对 '%s' 移植没有必要"
 
-#: builtin/replace.c
+#: builtin/replace.c:506
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "新提交和旧的一样：'%s'"
 
-#: builtin/replace.c
+#: builtin/replace.c:541
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -13942,112 +14242,112 @@ msgstr ""
 "不能转换下列移植：\n"
 "%s"
 
-#: builtin/replace.c
+#: builtin/replace.c:562
 msgid "list replace refs"
 msgstr "列出替换的引用"
 
-#: builtin/replace.c
+#: builtin/replace.c:563
 msgid "delete replace refs"
 msgstr "删除替换的引用"
 
-#: builtin/replace.c
+#: builtin/replace.c:564
 msgid "edit existing object"
 msgstr "编辑现存的对象"
 
-#: builtin/replace.c
+#: builtin/replace.c:565
 msgid "change a commit's parents"
 msgstr "修改一个提交的父提交"
 
-#: builtin/replace.c
+#: builtin/replace.c:566
 msgid "convert existing graft file"
 msgstr "转换现存的移植文件"
 
-#: builtin/replace.c
+#: builtin/replace.c:567
 msgid "replace the ref if it exists"
 msgstr "如果存在则替换引用"
 
-#: builtin/replace.c
+#: builtin/replace.c:569
 msgid "do not pretty-print contents for --edit"
 msgstr "不要为 --edit 操作美观显示内容"
 
-#: builtin/replace.c
+#: builtin/replace.c:570
 msgid "use this format"
 msgstr "使用此格式"
 
-#: builtin/replace.c
+#: builtin/replace.c:583
 msgid "--format cannot be used when not listing"
 msgstr "不列出时不能使用 --format"
 
-#: builtin/replace.c
+#: builtin/replace.c:591
 msgid "-f only makes sense when writing a replacement"
 msgstr "只有写一个替换时 -f 才有意义"
 
-#: builtin/replace.c
+#: builtin/replace.c:595
 msgid "--raw only makes sense with --edit"
 msgstr "--raw 只有和 --edit 共用才有意义"
 
-#: builtin/replace.c
+#: builtin/replace.c:601
 msgid "-d needs at least one argument"
 msgstr "-d 需要至少一个参数"
 
-#: builtin/replace.c
+#: builtin/replace.c:607
 msgid "bad number of arguments"
 msgstr "错误的参数个数"
 
-#: builtin/replace.c
+#: builtin/replace.c:613
 msgid "-e needs exactly one argument"
 msgstr "-e 需要且仅需要一个参数"
 
-#: builtin/replace.c
+#: builtin/replace.c:619
 msgid "-g needs at least one argument"
 msgstr "-g 需要至少一个参数"
 
-#: builtin/replace.c
+#: builtin/replace.c:625
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file 不带参数"
 
-#: builtin/replace.c
+#: builtin/replace.c:631
 msgid "only one pattern can be given with -l"
 msgstr "只能为 -l 提供一个模式"
 
-#: builtin/replay.c
+#: builtin/replay.c:162
 msgid "need some commits to replay"
 msgstr "需要一些提交来重放"
 
-#: builtin/replay.c
+#: builtin/replay.c:164
 msgid "--onto and --advance are incompatible"
 msgstr "--onto 和 --advance 不兼容"
 
-#: builtin/replay.c
+#: builtin/replay.c:169 builtin/replay.c:202
 msgid "all positive revisions given must be references"
 msgstr "提供的所有正向版本必须为引用"
 
-#: builtin/replay.c
+#: builtin/replay.c:179
 msgid "argument to --advance must be a reference"
 msgstr "--advance 的参数必须是引用"
 
-#: builtin/replay.c
+#: builtin/replay.c:182
 msgid ""
 "cannot advance target with multiple sources because ordering would be ill-"
 "defined"
 msgstr "不能使用多个源推进目标，因为无法明确如何排序"
 
-#: builtin/replay.c
+#: builtin/replay.c:196 builtin/replay.c:204
 msgid ""
 "cannot implicitly determine whether this is an --advance or --onto operation"
 msgstr "不能隐式地确定这是 --advance 还是 --onto 的操作"
 
-#: builtin/replay.c
+#: builtin/replay.c:206
 msgid ""
 "cannot advance target with multiple source branches because ordering would "
 "be ill-defined"
 msgstr "不能使用多个源分支推进目标，因为无法明确如何排序"
 
-#: builtin/replay.c
+#: builtin/replay.c:215
 msgid "cannot implicitly determine correct base for --onto"
 msgstr "不能隐式地确定 --onto 正确的基线"
 
-#: builtin/replay.c
+#: builtin/replay.c:289
 msgid ""
 "(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance "
 "<branch>) <revision-range>..."
@@ -14055,23 +14355,24 @@ msgstr ""
 "（试验中！）git replay ([--contained] --onto <新基线> | --advance <分支>) <版"
 "本范围>..."
 
-#: builtin/replay.c
+#: builtin/replay.c:297
 msgid "make replay advance given branch"
 msgstr "重放时演进给定的分支"
 
-#: builtin/replay.c
+#: builtin/replay.c:300
 msgid "replay onto given commit"
 msgstr "重放到给定提交"
 
-#: builtin/replay.c
+#: builtin/replay.c:302
 msgid "advance all branches contained in revision-range"
 msgstr "演进版本范围中包含的所有分支"
 
-#: builtin/replay.c
+#: builtin/replay.c:310
 msgid "option --onto or --advance is mandatory"
 msgstr "选项 --onto 或 --advance 必须指定其一"
 
-#: builtin/replay.c
+#: builtin/replay.c:345 builtin/replay.c:351 builtin/replay.c:357
+#: builtin/replay.c:363
 #, c-format
 msgid ""
 "some rev walking options will be overridden as '%s' bit in 'struct rev_info' "
@@ -14079,225 +14380,226 @@ msgid ""
 msgstr ""
 "一些版本遍历选项将被覆盖，如 'struct rev_info' 中的 '%s' 位将被强制设定"
 
-#: builtin/replay.c
+#: builtin/replay.c:376
 msgid "error preparing revisions"
 msgstr "准备版本时错误"
 
-#: builtin/replay.c
+#: builtin/replay.c:391
 msgid "replaying down to root commit is not supported yet!"
 msgstr "目前还不支持重放到根提交！"
 
-#: builtin/replay.c
+#: builtin/replay.c:393
 msgid "replaying merge commits is not supported yet!"
 msgstr "目前还不支持重放到合并提交！"
 
-#: builtin/rerere.c
+#: builtin/rerere.c:13
 msgid ""
 "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"
 msgstr ""
 "git rerere [clear | forget <路径规格>... | diff | status | remaining | gc]"
 
-#: builtin/rerere.c
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "在索引中注册干净的解决方案"
 
-#: builtin/rerere.c
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "没有路径的 'git rerere forget' 已经过时"
 
-#: builtin/rerere.c
+#: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "无法为 '%s' 生成差异"
 
-#: builtin/reset.c
+#: builtin/reset.c:42
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
 
-#: builtin/reset.c
+#: builtin/reset.c:43
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
 
-#: builtin/reset.c
+#: builtin/reset.c:44
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
 
-#: builtin/reset.c
+#: builtin/reset.c:45
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"
 
-#: builtin/reset.c
+#: builtin/reset.c:51
 msgid "mixed"
 msgstr "混杂"
 
-#: builtin/reset.c
+#: builtin/reset.c:51
 msgid "soft"
 msgstr "软性"
 
-#: builtin/reset.c
+#: builtin/reset.c:51
 msgid "hard"
 msgstr "硬性"
 
-#: builtin/reset.c
+#: builtin/reset.c:51
 msgid "merge"
 msgstr "合并"
 
-#: builtin/reset.c
+#: builtin/reset.c:51
 msgid "keep"
 msgstr "保持"
 
-#: builtin/reset.c
+#: builtin/reset.c:101
 msgid "You do not have a valid HEAD."
 msgstr "您没有一个有效的 HEAD。"
 
-#: builtin/reset.c
+#: builtin/reset.c:103
 msgid "Failed to find tree of HEAD."
 msgstr "无法找到 HEAD 指向的树。"
 
-#: builtin/reset.c
+#: builtin/reset.c:109
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "无法找到 %s 指向的树。"
 
-#: builtin/reset.c
+#: builtin/reset.c:138
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD 现在位于 %s"
 
 #  译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c
+#: builtin/reset.c:239
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "在合并过程中不能做%s重置操作。"
 
-#: builtin/reset.c builtin/stash.c
+#: builtin/reset.c:344 builtin/stash.c:660 builtin/stash.c:733
+#: builtin/stash.c:756
 msgid "be quiet, only report errors"
 msgstr "安静模式，只报告错误"
 
-#: builtin/reset.c
+#: builtin/reset.c:346
 msgid "skip refreshing the index after reset"
 msgstr "重置后跳过刷新索引"
 
-#: builtin/reset.c
+#: builtin/reset.c:348
 msgid "reset HEAD and index"
 msgstr "重置 HEAD 和索引"
 
-#: builtin/reset.c
+#: builtin/reset.c:351
 msgid "reset only HEAD"
 msgstr "只重置 HEAD"
 
-#: builtin/reset.c
+#: builtin/reset.c:354 builtin/reset.c:357
 msgid "reset HEAD, index and working tree"
 msgstr "重置 HEAD、索引和工作区"
 
-#: builtin/reset.c
+#: builtin/reset.c:360
 msgid "reset HEAD but keep local changes"
 msgstr "重置 HEAD 但保存本地变更"
 
-#: builtin/reset.c
+#: builtin/reset.c:368
 msgid "record only the fact that removed paths will be added later"
 msgstr "将删除的路径标记为稍后添加"
 
-#: builtin/reset.c
+#: builtin/reset.c:402
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "无法将 '%s' 解析为一个有效的版本。"
 
-#: builtin/reset.c
+#: builtin/reset.c:410
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "无法将 '%s' 解析为一个有效的树对象。"
 
-#: builtin/reset.c
+#: builtin/reset.c:431
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
 
 #  译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c
+#: builtin/reset.c:433
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "不能带路径进行%s重置。"
 
 #  译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c
+#: builtin/reset.c:448
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "不能对纯仓库进行%s重置"
 
-#: builtin/reset.c
+#: builtin/reset.c:482
 msgid "Unstaged changes after reset:"
 msgstr "重置后取消暂存的变更："
 
-#: builtin/reset.c
+#: builtin/reset.c:485
 #, c-format
 msgid ""
 "It took %.2f seconds to refresh the index after reset.  You can use\n"
 "'--no-refresh' to avoid this."
 msgstr "在重置后花了 %.2f 秒来刷新索引。使用 '--no-refresh' 以避免之。"
 
-#: builtin/reset.c
+#: builtin/reset.c:503
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "不能重置索引文件至版本 '%s'。"
 
-#: builtin/reset.c
+#: builtin/reset.c:508
 msgid "Could not write new index file."
 msgstr "不能写入新的索引文件。"
 
-#: builtin/rev-list.c
+#: builtin/rev-list.c:97
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "无法得到 %s 的磁盘使用量"
 
-#: builtin/rev-list.c
+#: builtin/rev-list.c:671
 #, c-format
 msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
 msgstr "'%s' 的值无效：'%s'，唯一允许的格式是 '%s'"
 
-#: builtin/rev-list.c
+#: builtin/rev-list.c:711
 msgid "rev-list does not support display of notes"
 msgstr "rev-list 不支持显示注解"
 
-#: builtin/rev-list.c
+#: builtin/rev-list.c:716
 #, c-format
 msgid "marked counting and '%s' cannot be used together"
 msgstr "标记计数和 '%s' 不能同时使用"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:428
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:433
 msgid "keep the `--` passed as an arg"
 msgstr "保持 `--` 作为一个参数传递"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:435
 msgid "stop parsing after the first non-option argument"
 msgstr "遇到第一个非选项参数后停止解析"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:438
 msgid "output in stuck long form"
 msgstr "以固定长格式输出"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:457
 msgid "premature end of input"
 msgstr "输入过早结束"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:460
 msgid "no usage string given before the `--' separator"
 msgstr "在 `--' 分隔符之前没有给出使用方法字符串"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:501
 msgid "missing opt-spec before option flags"
 msgstr "选项参数之前缺少选项规格"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:578
 msgid "Needed a single revision"
 msgstr "需要一个单独的版本"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:582
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -14311,79 +14613,79 @@ msgstr ""
 "\n"
 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:746
 msgid "--resolve-git-dir requires an argument"
 msgstr "--resolve-git-dir 需要一个参数"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:749
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "不是一个git目录 '%s'"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:777
 msgid "--git-path requires an argument"
 msgstr "--git-path 需要一个参数"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:787
 msgid "-n requires an argument"
 msgstr "-n 需要一个参数"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:801
 msgid "--path-format requires an argument"
 msgstr "--path-format 需要一个参数"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:807
 #, c-format
 msgid "unknown argument to --path-format: %s"
 msgstr "未知的 --path-format 参数：%s"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:814
 msgid "--default requires an argument"
 msgstr "--default 需要一个参数"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:820
 msgid "--prefix requires an argument"
 msgstr "--prefix 需要一个参数"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:853
 msgid "no object format specified"
 msgstr "未指定对象格式"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:865
 #, c-format
 msgid "unsupported object format: %s"
 msgstr "不支持的对象格式：'%s'"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:905
 #, c-format
 msgid "unknown mode for --abbrev-ref: %s"
 msgstr "未知的 --abbrev-ref 模式：%s"
 
-#: builtin/rev-parse.c setup.c
+#: builtin/rev-parse.c:970 setup.c:495
 msgid "this operation must be run in a work tree"
 msgstr "该操作必须在一个工作区中运行"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:1068
 msgid "Could not read the index"
 msgstr "不能读取索引"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:1098
 #, c-format
 msgid "unknown mode for --show-object-format: %s"
 msgstr "未知的 --show-object-format 模式：%s"
 
-#: builtin/revert.c
+#: builtin/revert.c:24
 msgid ""
 "git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] "
 "<commit>..."
 msgstr ""
 "git revert [--[no-]edit] [-n] [-m <父编号>] [-s] [-S[<私钥 ID>]] <提交>..."
 
-#: builtin/revert.c
+#: builtin/revert.c:25
 msgid "git revert (--continue | --skip | --abort | --quit)"
 msgstr "git revert (--continue | --skip | --abort | --quit)"
 
-#: builtin/revert.c
+#: builtin/revert.c:30
 msgid ""
 "git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n"
 "                [-S[<keyid>]] <commit>..."
@@ -14391,89 +14693,89 @@ msgstr ""
 "git cherry-pick [--edit] [-n] [-m <父编号>] [-s] [-x] [--ff]\n"
 "                [-S[<私钥 ID>]] <提交>..."
 
-#: builtin/revert.c
+#: builtin/revert.c:32
 msgid "git cherry-pick (--continue | --skip | --abort | --quit)"
 msgstr "git cherry-pick (--continue | --skip | --abort | --quit)"
 
-#: builtin/revert.c
+#: builtin/revert.c:84
 #, c-format
 msgid "option `%s' expects a number greater than zero"
 msgstr "选项 `%s' 期望一个大于零的数字"
 
-#: builtin/revert.c
+#: builtin/revert.c:104
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s：%s 不能和 %s 同时使用"
 
-#: builtin/revert.c
+#: builtin/revert.c:116
 msgid "end revert or cherry-pick sequence"
 msgstr "终止反转或拣选操作"
 
-#: builtin/revert.c
+#: builtin/revert.c:117
 msgid "resume revert or cherry-pick sequence"
 msgstr "继续反转或拣选操作"
 
-#: builtin/revert.c
+#: builtin/revert.c:118
 msgid "cancel revert or cherry-pick sequence"
 msgstr "取消反转或拣选操作"
 
-#: builtin/revert.c
+#: builtin/revert.c:119
 msgid "skip current commit and continue"
 msgstr "跳过当前提交并继续"
 
-#: builtin/revert.c
+#: builtin/revert.c:121
 msgid "don't automatically commit"
 msgstr "不要自动提交"
 
-#: builtin/revert.c
+#: builtin/revert.c:122
 msgid "edit the commit message"
 msgstr "编辑提交说明"
 
-#: builtin/revert.c
+#: builtin/revert.c:125
 msgid "parent-number"
 msgstr "父编号"
 
-#: builtin/revert.c
+#: builtin/revert.c:126
 msgid "select mainline parent"
 msgstr "选择主干父提交编号"
 
-#: builtin/revert.c
+#: builtin/revert.c:128
 msgid "merge strategy"
 msgstr "合并策略"
 
-#: builtin/revert.c
+#: builtin/revert.c:130
 msgid "option for merge strategy"
 msgstr "合并策略的选项"
 
-#: builtin/revert.c
+#: builtin/revert.c:139
 msgid "append commit name"
 msgstr "追加提交名称"
 
-#: builtin/revert.c
+#: builtin/revert.c:141
 msgid "preserve initially empty commits"
 msgstr "保留初始化的空提交"
 
-#: builtin/revert.c
+#: builtin/revert.c:142
 msgid "allow commits with empty messages"
 msgstr "允许提交说明为空"
 
-#: builtin/revert.c
+#: builtin/revert.c:143
 msgid "deprecated: use --empty=keep instead"
 msgstr "已弃用：取而代之使用 --empty=keep"
 
-#: builtin/revert.c
+#: builtin/revert.c:153
 msgid "use the 'reference' format to refer to commits"
 msgstr "使用 'reference' 格式来指向提交"
 
-#: builtin/revert.c
+#: builtin/revert.c:273
 msgid "revert failed"
 msgstr "还原失败"
 
-#: builtin/revert.c
+#: builtin/revert.c:287
 msgid "cherry-pick failed"
 msgstr "拣选失败"
 
-#: builtin/rm.c
+#: builtin/rm.c:26
 msgid ""
 "git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
 "       [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
@@ -14483,7 +14785,7 @@ msgstr ""
 "       [--quiet] [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
 "       [--] [<路径规格>...]"
 
-#: builtin/rm.c
+#: builtin/rm.c:215
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -14493,7 +14795,7 @@ msgid_plural ""
 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
 
-#: builtin/rm.c
+#: builtin/rm.c:220
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -14501,13 +14803,13 @@ msgstr ""
 "\n"
 "（使用 -f 强制删除）"
 
-#: builtin/rm.c
+#: builtin/rm.c:224
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "下列文件索引中有变更"
 msgstr[1] "下列文件索引中有变更"
 
-#: builtin/rm.c
+#: builtin/rm.c:228 builtin/rm.c:237
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -14515,51 +14817,51 @@ msgstr ""
 "\n"
 "（使用 --cached 保留本地文件，或用 -f 强制删除）"
 
-#: builtin/rm.c
+#: builtin/rm.c:234
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "如下文件有本地修改："
 msgstr[1] "如下文件有本地修改："
 
-#: builtin/rm.c
+#: builtin/rm.c:252
 msgid "do not list removed files"
 msgstr "不列出删除的文件"
 
-#: builtin/rm.c
+#: builtin/rm.c:253
 msgid "only remove from the index"
 msgstr "只从索引区删除"
 
-#: builtin/rm.c
+#: builtin/rm.c:254
 msgid "override the up-to-date check"
 msgstr "忽略文件更新状态检查"
 
-#: builtin/rm.c
+#: builtin/rm.c:255
 msgid "allow recursive removal"
 msgstr "允许递归删除"
 
-#: builtin/rm.c
+#: builtin/rm.c:257
 msgid "exit with a zero status even if nothing matched"
 msgstr "即使没有匹配，也以零状态退出"
 
-#: builtin/rm.c
+#: builtin/rm.c:292
 msgid "No pathspec was given. Which files should I remove?"
 msgstr "没有提供路径规格。我应该删除哪些文件？"
 
-#: builtin/rm.c
+#: builtin/rm.c:325
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
 
-#: builtin/rm.c
+#: builtin/rm.c:347
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "未提供 -r 选项不会递归删除 '%s'"
 
-#: builtin/rm.c
+#: builtin/rm.c:395
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm：不能删除 %s"
 
-#: builtin/send-pack.c
+#: builtin/send-pack.c:18
 msgid ""
 "git send-pack [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
@@ -14573,85 +14875,85 @@ msgstr ""
 "              [--[no-]signed | --signed=(true|false|if-asked)]\n"
 "              [<主机>:]<目录> (--all | <引用>...)"
 
-#: builtin/send-pack.c
+#: builtin/send-pack.c:187
 msgid "remote name"
 msgstr "远程名称"
 
-#: builtin/send-pack.c
+#: builtin/send-pack.c:188
 msgid "push all refs"
 msgstr "推送所有引用"
 
-#: builtin/send-pack.c
+#: builtin/send-pack.c:200
 msgid "use stateless RPC protocol"
 msgstr "使用无状态的 RPC 协议"
 
-#: builtin/send-pack.c
+#: builtin/send-pack.c:201
 msgid "read refs from stdin"
 msgstr "从标准输入读取引用"
 
-#: builtin/send-pack.c
+#: builtin/send-pack.c:202
 msgid "print status from remote helper"
 msgstr "打印来自远程 helper 的状态"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:19
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:20
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<选项>]"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:128
 msgid "using multiple --group options with stdin is not supported"
 msgstr "不支持和标准输入一起使用多个 --group 选项"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:138 builtin/shortlog.c:140
 #, c-format
 msgid "using %s with stdin is not supported"
 msgstr "不支持对 %s 使用标准输入"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:347
 #, c-format
 msgid "unknown group type: %s"
 msgstr "未知分组类型：%s"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:389
 msgid "group by committer rather than author"
 msgstr "按照提交者而不是作者分组"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:392
 msgid "sort output according to the number of commits per author"
 msgstr "根据每个作者的提交数量排序"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:394
 msgid "suppress commit descriptions, only provides commit count"
 msgstr "抑制提交描述，只提供提交数量"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:396
 msgid "show the email address of each author"
 msgstr "显示每个作者的电子邮件地址"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:397
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:398
 msgid "linewrap output"
 msgstr "折行输出"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:400
 msgid "field"
 msgstr "字段"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:401
 msgid "group by field"
 msgstr "按字段分组"
 
-#: builtin/shortlog.c
+#: builtin/shortlog.c:434
 msgid "too many arguments given outside repository"
 msgstr "仓库外执行提供了太多的参数"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:20
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -14665,142 +14967,142 @@ msgstr ""
 "                [--no-name | --sha1-name] [--topics]\n"
 "                [(<版本> | <通配符>)...]"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:25
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:403
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "忽略 %s，无法处理 %d 个以上的引用"
 msgstr[1] "忽略 %s，无法处理 %d 个以上的引用"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:558
 #, c-format
 msgid "no matching refs with %s"
 msgstr "没有和 %s 匹配的引用"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:659
 msgid "show remote-tracking and local branches"
 msgstr "显示远程跟踪的和本地的分支"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:661
 msgid "show remote-tracking branches"
 msgstr "显示远程跟踪的分支"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:663
 msgid "color '*!+-' corresponding to the branch"
 msgstr "着色 '*!+-' 到相应的分支"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:665
 msgid "show <n> more commits after the common ancestor"
 msgstr "显示共同祖先后的 <n> 个提交"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:667
 msgid "synonym to more=-1"
 msgstr "和 more=-1 同义"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:668
 msgid "suppress naming strings"
 msgstr "不显示字符串命名"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:670
 msgid "include the current branch"
 msgstr "包括当前分支"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:672
 msgid "name commits with their object names"
 msgstr "以对象名字命名提交"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:674
 msgid "show possible merge bases"
 msgstr "显示可能合并的基线"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:676
 msgid "show refs unreachable from any other ref"
 msgstr "显示没有任何引用的的引用"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:678
 msgid "show commits in topological order"
 msgstr "以拓扑顺序显示提交"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:681
 msgid "show only commits not on the first branch"
 msgstr "只显示不在第一个分支上的提交"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:683
 msgid "show merges reachable from only one tip"
 msgstr "显示仅一个分支可访问的合并提交"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:685
 msgid "topologically sort, maintaining date order where possible"
 msgstr "拓扑方式排序，并尽可能地保持日期顺序"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:688
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:689
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:755
 msgid "no branches given, and HEAD is not valid"
 msgstr "未提供分支，且 HEAD 无效"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:758
 msgid "--reflog option needs one branch name"
 msgstr "选项 --reflog 需要一个分支名"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:761
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "一次只能显示 %d 个条目。"
 msgstr[1] "一次只能显示 %d 个条目。"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:766
 #, c-format
 msgid "no such ref %s"
 msgstr "无此引用 %s"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:853
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "不能处理 %d 个以上的版本。"
 msgstr[1] "不能处理 %d 个以上的版本。"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:857
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' 不是一个有效的引用。"
 
-#: builtin/show-branch.c
+#: builtin/show-branch.c:860
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "不能找到提交 %s（%s）"
 
-#: builtin/show-index.c
+#: builtin/show-index.c:24
 msgid "hash-algorithm"
 msgstr "哈希算法"
 
-#: builtin/show-index.c
+#: builtin/show-index.c:34
 msgid "Unknown hash algorithm"
 msgstr "未知的哈希算法"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:13
 msgid ""
 "git show-ref [--head] [-d | --dereference]\n"
-"             [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"
-"             [--heads] [--] [<pattern>...]"
+"             [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n"
+"             [--] [<pattern>...]"
 msgstr ""
 "git show-ref [--head] [-d | --dereference]\n"
 "             [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"
-"             [--heads] [--] [<模式>...]"
+"             [--branches] [--] [<模式>...]"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:16
 msgid ""
 "git show-ref --verify [-q | --quiet] [-d | --dereference]\n"
 "             [-s | --hash[=<n>]] [--abbrev[=<n>]]\n"
@@ -14810,59 +15112,59 @@ msgstr ""
 "             [-s | --hash[=<n>]] [--abbrev[=<n>]]\n"
 "             [--] [<引用>...]"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:19
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<模式>]"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:20
 msgid "git show-ref --exists <ref>"
 msgstr "git show-ref --exists <引用>"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:249
 msgid "reference does not exist"
 msgstr "引用不存在"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:253
 msgid "failed to look up reference"
 msgstr "无法找到引用"
 
-#: builtin/show-ref.c
-msgid "only show tags (can be combined with heads)"
-msgstr "只显示标签（可以和头共用）"
+#: builtin/show-ref.c:296
+msgid "only show tags (can be combined with branches)"
+msgstr "仅显示标签（可与分支组合使用）"
 
-#: builtin/show-ref.c
-msgid "only show heads (can be combined with tags)"
-msgstr "只显示头（可以和标签共用）"
+#: builtin/show-ref.c:297
+msgid "only show branches (can be combined with tags)"
+msgstr "仅显示分支（可以和标签组合使用）"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:300
 msgid "check for reference existence without resolving"
 msgstr "检查引用是否存在但不解析"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:301
 msgid "stricter reference checking, requires exact ref path"
 msgstr "更严格的引用检测，需要精确的引用路径"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:304 builtin/show-ref.c:306
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "显示 HEAD 引用，即使被过滤掉"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:308
 msgid "dereference tags into object IDs"
 msgstr "转换标签到对象 ID"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:310
 msgid "only show SHA1 hash using <n> digits"
 msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:314
 msgid "do not print results to stdout (useful with --verify)"
 msgstr "不打印结果到标准输出（例如与 --verify 参数共用）"
 
-#: builtin/show-ref.c
+#: builtin/show-ref.c:316
 msgid "show refs from stdin that aren't in local repository"
 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:23
 msgid ""
 "git sparse-checkout (init | list | set | add | reapply | disable | check-"
 "rules) [<options>]"
@@ -14870,103 +15172,107 @@ msgstr ""
 "git sparse-checkout (init | list | set | add | reapply | disable | check\n"
 "-rules) [<选项>]"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:62
 msgid "this worktree is not sparse"
 msgstr "这个工作区不是稀疏的"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:77
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr "本工作区不是稀疏模式（稀疏检出文件可能不存在）"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:179
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
 "cone"
 msgstr "目录 '%s' 包括了未跟踪文件，但不在稀疏检出锥中"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:187
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "无法删除目录 '%s'"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:337
 msgid "failed to create directory for sparse-checkout file"
 msgstr "无法为稀疏检出文件创建目录"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:376
 msgid "failed to initialize worktree config"
 msgstr "无法初始化工作树配置"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:424
 msgid "failed to modify sparse-index config"
 msgstr "无法修改 sparse-index 配置"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:456 builtin/sparse-checkout.c:819
+#: builtin/sparse-checkout.c:874
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "初始化稀疏检出为锥形模式"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:458 builtin/sparse-checkout.c:821
+#: builtin/sparse-checkout.c:876
 msgid "toggle the use of a sparse index"
 msgstr "切换稀疏索引的使用"
 
-#: builtin/sparse-checkout.c commit-graph.c midx-write.c sequencer.c
+#: builtin/sparse-checkout.c:492 commit-graph.c:2058 midx-write.c:950
+#: sequencer.c:4401
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "不能为 %s 创建先导目录"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:496
 #, c-format
 msgid "failed to open '%s'"
 msgstr "无法打开 '%s'"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:555
 #, c-format
 msgid "could not normalize path %s"
 msgstr "无法规范化路径 %s"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:584 builtin/sparse-checkout.c:973
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:640 builtin/sparse-checkout.c:668
+#: builtin/sparse-checkout.c:1023
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "无法加载现存的稀疏检出模式"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:644
 msgid "existing sparse-checkout patterns do not use cone mode"
 msgstr "已有的稀疏检出模式不使用锥形模式"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:733
 msgid "please run from the toplevel directory in non-cone mode"
 msgstr "请在非锥形模式的顶级目录中运行"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:738
 msgid "specify directories rather than patterns (no leading slash)"
 msgstr "指定目录而不是模式（无前导斜线）"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:740
 msgid ""
 "specify directories rather than patterns.  If your directory starts with a "
 "'!', pass --skip-checks"
 msgstr "指定目录而不是模式。若你的目录以 '!' 开头，传入 --skip-checks"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:742
 msgid ""
 "specify directories rather than patterns.  If your directory really has any "
 "of '*?[]\\' in it, pass --skip-checks"
 msgstr ""
 "指定目录而不是模式。若你的目录真的包含 '*?[]\\' 中的字符，传入 --skip-checks"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:758
 #, c-format
 msgid ""
 "'%s' is not a directory; to treat it as a directory anyway, rerun with --"
 "skip-checks"
 msgstr "'%s' 不是目录；若无论如何都要将它当作目录，使用 --skip-checks 重新运行"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:760
 #, c-format
 msgid ""
 "pass a leading slash before paths such as '%s' if you want a single file "
@@ -14975,24 +15281,24 @@ msgstr ""
 "如果您想要单独一个文件，在类似于 '%s' 的路径前传入前置斜线 （参见 git-sparse-"
 "checkout 手册中的 NON-CONE PROBLEMS）。"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:765
 msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
 msgstr "git sparse-checkout add [--skip-checks] (--stdin | <模式>)"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:778 builtin/sparse-checkout.c:823
 msgid ""
 "skip some sanity checks on the given paths that might give false positives"
 msgstr "跳过可能对一些目录产生假阳性错误的合理性检查"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:781 builtin/sparse-checkout.c:826
 msgid "read patterns from standard in"
 msgstr "从标准输入读取模式"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:787
 msgid "no sparse-checkout to add to"
 msgstr "没有可以添加到的稀疏检出"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:801
 msgid ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
@@ -15000,15 +15306,15 @@ msgstr ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <模式>)"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:882
 msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr "必须在稀疏检出中重应用稀疏模式"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:942
 msgid "error while refreshing working directory"
 msgstr "刷新工作目录时出错"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:949
 msgid ""
 "git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"
 "file <file>]"
@@ -15016,23 +15322,23 @@ msgstr ""
 "git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"
 "file <文件>]"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:992
 msgid "terminate input and output files by a NUL character"
 msgstr "输入和输出的文件使用 NUL 字符终结"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:994
 msgid "when used with --rules-file interpret patterns as cone mode patterns"
 msgstr "通过 --rules-file 选项传递的模型将被作为锥形（稀疏检出模型）进行解析"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:996
 msgid "use patterns in <file> instead of the current ones."
 msgstr "从 <文件> 参数中读取模式，而不是从标准输入"
 
-#: builtin/stash.c
+#: builtin/stash.c:34
 msgid "git stash list [<log-options>]"
 msgstr "git stash list [<日志选项>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:36
 msgid ""
 "git stash show [-u | --include-untracked | --only-untracked] [<diff-"
 "options>] [<stash>]"
@@ -15040,27 +15346,27 @@ msgstr ""
 "git stash show [-u | --include-untracked | --only-untracked] [<差异选项>] [<"
 "贮存>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:38
 msgid "git stash drop [-q | --quiet] [<stash>]"
 msgstr "git stash drop [-q | --quiet] [<贮存>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:40
 msgid "git stash pop [--index] [-q | --quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q | --quiet] [<贮存>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:42
 msgid "git stash apply [--index] [-q | --quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q | --quiet] [<贮存>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:44
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <分支名> [<stash>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:46
 msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"
 msgstr "git stash store [(-m | --message) <消息>] [-q | --quiet] <提交>"
 
-#: builtin/stash.c
+#: builtin/stash.c:48
 msgid ""
 "git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "
 "| --quiet]\n"
@@ -15075,7 +15381,7 @@ msgstr ""
 "          [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
 "          [--] [<路径规格>...]]"
 
-#: builtin/stash.c
+#: builtin/stash.c:53
 msgid ""
 "git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "
 "--quiet]\n"
@@ -15085,34 +15391,34 @@ msgstr ""
 "--quiet]\n"
 "          [-u | --include-untracked] [-a | --all] [<消息>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:56
 msgid "git stash create [<message>]"
 msgstr "git stash create [<消息>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:167
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' 不像是一个贮藏提交"
 
-#: builtin/stash.c
+#: builtin/stash.c:187
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "指定了太多的版本：%s"
 
-#: builtin/stash.c
+#: builtin/stash.c:199
 msgid "No stash entries found."
 msgstr "未发现贮藏条目。"
 
-#: builtin/stash.c
+#: builtin/stash.c:213
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s 不是一个有效的引用名"
 
-#: builtin/stash.c
+#: builtin/stash.c:261
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear 不支持参数"
 
-#: builtin/stash.c
+#: builtin/stash.c:481
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -15123,217 +15429,218 @@ msgstr ""
 "            %s -> %s\n"
 "         以腾出空间。\n"
 
-#: builtin/stash.c
+#: builtin/stash.c:544
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "无法在合并过程中应用贮藏"
 
-#: builtin/stash.c
+#: builtin/stash.c:555
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "无法生成差异 %s^!."
 
-#: builtin/stash.c
+#: builtin/stash.c:562
 msgid "conflicts in index. Try without --index."
 msgstr "索引中有冲突。尝试不用 --index。"
 
-#: builtin/stash.c
+#: builtin/stash.c:569
 msgid "could not save index tree"
 msgstr "不能保存索引树"
 
-#: builtin/stash.c
+#: builtin/stash.c:590
 #, c-format
 msgid "Merging %s with %s"
 msgstr "正在合并 %s 和 %s"
 
-#: builtin/stash.c
+#: builtin/stash.c:616
 msgid "Index was not unstashed."
 msgstr "索引未从贮藏中恢复。"
 
-#: builtin/stash.c
+#: builtin/stash.c:630
 msgid "could not restore untracked files from stash"
 msgstr "无法从贮藏条目中恢复未跟踪文件"
 
-#: builtin/stash.c
+#: builtin/stash.c:662 builtin/stash.c:758
 msgid "attempt to recreate the index"
 msgstr "尝试重建索引"
 
-#: builtin/stash.c
+#: builtin/stash.c:700
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "丢弃了 %s（%s）"
 
-#: builtin/stash.c
+#: builtin/stash.c:703
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s：无法丢弃贮藏条目"
 
-#: builtin/stash.c
+#: builtin/stash.c:722
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' 不是一个贮藏引用"
 
-#: builtin/stash.c
+#: builtin/stash.c:769
 msgid "The stash entry is kept in case you need it again."
 msgstr "贮藏条目被保留以备您再次需要。"
 
-#: builtin/stash.c
+#: builtin/stash.c:793
 msgid "No branch name specified"
 msgstr "未指定分支名"
 
-#: builtin/stash.c
+#: builtin/stash.c:873
 msgid "failed to parse tree"
 msgstr "无法解析树"
 
-#: builtin/stash.c
+#: builtin/stash.c:885
 msgid "failed to unpack trees"
 msgstr "无法解包目录树"
 
-#: builtin/stash.c
+#: builtin/stash.c:905
 msgid "include untracked files in the stash"
 msgstr "在贮藏中包含未跟踪文件"
 
-#: builtin/stash.c
+#: builtin/stash.c:908
 msgid "only show untracked files in the stash"
 msgstr "仅显示贮藏中的未跟踪文件"
 
-#: builtin/stash.c
+#: builtin/stash.c:1009 builtin/stash.c:1047
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "无法用 %2$s 更新 %1$s"
 
-#: builtin/stash.c
+#: builtin/stash.c:1027 builtin/stash.c:1753 builtin/stash.c:1833
 msgid "stash message"
 msgstr "贮藏说明"
 
-#: builtin/stash.c
+#: builtin/stash.c:1038
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" 需要一个 <提交> 参数"
 
-#: builtin/stash.c
+#: builtin/stash.c:1226
 msgid "No staged changes"
 msgstr "没有暂存的修改"
 
-#: builtin/stash.c
+#: builtin/stash.c:1287
 msgid "No changes selected"
 msgstr "没有选择变更"
 
-#: builtin/stash.c
+#: builtin/stash.c:1383
 msgid "You do not have the initial commit yet"
 msgstr "您尚未建立初始提交"
 
-#: builtin/stash.c
+#: builtin/stash.c:1413
 msgid "Cannot save the current index state"
 msgstr "无法保存当前索引状态"
 
-#: builtin/stash.c
+#: builtin/stash.c:1425
 msgid "Cannot save the untracked files"
 msgstr "无法保存未跟踪文件"
 
-#: builtin/stash.c
+#: builtin/stash.c:1436 builtin/stash.c:1455
 msgid "Cannot save the current worktree state"
 msgstr "无法保存当前工作区状态"
 
-#: builtin/stash.c
+#: builtin/stash.c:1446
 msgid "Cannot save the current staged state"
 msgstr "无法保存当前暂存状态"
 
-#: builtin/stash.c
+#: builtin/stash.c:1478
 msgid "Cannot record working tree state"
 msgstr "不能记录工作区状态"
 
-#: builtin/stash.c
+#: builtin/stash.c:1529
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
 
-#: builtin/stash.c
+#: builtin/stash.c:1540
 msgid "Can't use --staged and --include-untracked or --all at the same time"
 msgstr "不能同时使用参数 --staged 和 --include-untracked 或 --all"
 
-#: builtin/stash.c
+#: builtin/stash.c:1558
 msgid "Did you forget to 'git add'?"
 msgstr "您是否忘了执行 'git add'？"
 
-#: builtin/stash.c
+#: builtin/stash.c:1574
 msgid "No local changes to save"
 msgstr "没有要保存的本地修改"
 
-#: builtin/stash.c
+#: builtin/stash.c:1581
 msgid "Cannot initialize stash"
 msgstr "无法初始化贮藏"
 
-#: builtin/stash.c
+#: builtin/stash.c:1596
 msgid "Cannot save the current status"
 msgstr "无法保存当前状态"
 
-#: builtin/stash.c
+#: builtin/stash.c:1601
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "保存工作目录和索引状态 %s"
 
-#: builtin/stash.c
+#: builtin/stash.c:1698
 msgid "Cannot remove worktree changes"
 msgstr "无法删除工作区变更"
 
-#: builtin/stash.c
+#: builtin/stash.c:1742 builtin/stash.c:1822
 msgid "keep index"
 msgstr "保持索引"
 
-#: builtin/stash.c
+#: builtin/stash.c:1744 builtin/stash.c:1824
 msgid "stash staged changes only"
 msgstr "只贮藏暂存的变更"
 
-#: builtin/stash.c
+#: builtin/stash.c:1746 builtin/stash.c:1826
 msgid "stash in patch mode"
 msgstr "以补丁模式贮藏"
 
-#: builtin/stash.c
+#: builtin/stash.c:1747 builtin/stash.c:1827
 msgid "quiet mode"
 msgstr "静默模式"
 
-#: builtin/stash.c
+#: builtin/stash.c:1749 builtin/stash.c:1829
 msgid "include untracked files in stash"
 msgstr "贮藏中包含未跟踪文件"
 
-#: builtin/stash.c
+#: builtin/stash.c:1751 builtin/stash.c:1831
 msgid "include ignore files"
 msgstr "包含忽略的文件"
 
-#: builtin/stripspace.c
+#: builtin/stripspace.c:40
 msgid "skip and remove all lines starting with comment character"
 msgstr "跳过和移除所有的注释行"
 
-#: builtin/stripspace.c
+#: builtin/stripspace.c:43
 msgid "prepend comment character and space to each line"
 msgstr "为每一行的行首添加注释符和空格"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:60 builtin/submodule--helper.c:2469
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一个完整的引用名称，却得到 %s"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:80 builtin/submodule--helper.c:2486
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "无法获得子模组 '%s' 的仓库句柄"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:108
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:312 builtin/submodule--helper.c:467
+#: builtin/submodule--helper.c:490
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "在 .gitmodules 中未找到子模组路径 '%s' 的 url"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:364
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "进入 '%s'\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:367
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -15342,7 +15649,7 @@ msgstr ""
 "对 %s 执行 run_command 返回非零值。\n"
 "."
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:388
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -15352,148 +15659,150 @@ msgstr ""
 "在递归 %s 的子模组执行 run_command 时返回非零值。\n"
 "."
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:404
 msgid "suppress output of entering each submodule command"
 msgstr "抑制进入每一个子模组命令的输出"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:406 builtin/submodule--helper.c:741
+#: builtin/submodule--helper.c:1343
 msgid "recurse into nested submodules"
 msgstr "递归进入嵌套子模组中"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:410
 msgid "git submodule foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule foreach [--quiet] [--recursive] [--] <命令>"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:505
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "无法为子模组路径 '%s' 注册 url"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:509
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:519
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "无法为子模组路径 '%s' 注册更新模式"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:549
 msgid "suppress output for initializing a submodule"
 msgstr "抑制子模组初始化的输出"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:553
 msgid "git submodule init [<options>] [<path>]"
 msgstr "git submodule init [<选项>] [<路径>]"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:640 builtin/submodule--helper.c:2991
+#: builtin/submodule--helper.c:3046
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:687
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "无法解析子模组 '%s' 的 HEAD 引用"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:713 builtin/submodule--helper.c:1311
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "无法递归进入子模组 '%s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:739 builtin/submodule--helper.c:1487
 msgid "suppress submodule status output"
 msgstr "抑制子模组状态输出"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:740
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:745
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:847
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s（数据对象）->%s（子模组）"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:850
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s（子模组）->%s（数据对象）"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:863
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:915
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "不能从 '%s' 创建哈希对象"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:919
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "意外的模式 %o\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1168
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1170
 msgid "compare the commit in the index with that in the submodule HEAD"
 msgstr "比较存储在索引和子模组 HEAD 中的提交"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1172
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "跳过设置了 'ignore_config' 为 'all' 的子模组"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1174
 msgid "limit the summary size"
 msgstr "限制总结的大小"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1178
 msgid "git submodule summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule summary [<选项>] [<提交>] [--] [<路径>]"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1202
 msgid "could not fetch a revision for HEAD"
 msgstr "不能为 HEAD 获取一个版本"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1269
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "为 '%s' 同步子模组 url\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1275
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "无法为子模组路径 '%s' 注册 url"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1293
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "无法为子模组 '%s' 更新远程关联"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1341
 msgid "suppress output of synchronizing submodule url"
 msgstr "抑制子模组 URL 同步的输出"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1347
 msgid "git submodule sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule sync [--quiet] [--recursive] [<路径>]"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1405
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory. This will be replaced "
@@ -15502,52 +15811,52 @@ msgstr ""
 "子模组工作区 '%s' 包含一个 .git 目录。这将会用 absorbgitdirs 子命令替换成一"
 "个 .git 文件。"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1422
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1430
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "已清除目录 '%s'\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1432
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "无法移除子模组工作区 '%s'\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1443
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "不能创建空的子模组目录 %s"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1460
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1488
 msgid "remove submodule working trees even if they contain local changes"
 msgstr "删除子模组工作区，即使包含本地修改"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1489
 msgid "unregister all submodules"
 msgstr "将所有子模组取消注册"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1493
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1508
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1559
 msgid ""
 "An alternate computed from a superproject's alternate is invalid.\n"
 "To allow Git to clone without an alternate in such a case, set\n"
@@ -15559,75 +15868,78 @@ msgstr ""
 "Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n"
 "'--reference' 来克隆。"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1583
 #, c-format
 msgid "could not get a repository handle for gitdir '%s'"
 msgstr "无法获得 git 目录 '%s' 的仓库句柄"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1608 builtin/submodule--helper.c:1611
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "子模组 '%s' 不能添加仓库备选：%s"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1647
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1654
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "不能识别 submodule.alternateLocation 的取值 '%s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1713 builtin/submodule--helper.c:1799
+#: submodule.c:2183 submodule.c:2194
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'"
 
-#: builtin/submodule--helper.c
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1719 builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1778
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "目录非空：'%s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1763
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "无法克隆 '%s' 到子模组路径 '%s'"
+
+#: builtin/submodule--helper.c:1807
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "无法得到 '%s' 的子模组目录"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1839
 msgid "alternative anchor for relative paths"
 msgstr "相对路径的替代锚记（anchor）"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1842
 msgid "where the new submodule will be cloned to"
 msgstr "新的子模组将要克隆的路径"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1845
 msgid "name of the new submodule"
 msgstr "新子模组的名称"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1848
 msgid "url where to clone the submodule from"
 msgstr "克隆子模组的 url 地址"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1856 builtin/submodule--helper.c:3379
 msgid "depth for shallow clones"
 msgstr "浅克隆的深度"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1859 builtin/submodule--helper.c:2774
+#: builtin/submodule--helper.c:3372
 msgid "force cloning progress"
 msgstr "强制显示克隆进度"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1861
 msgid "disallow cloning into non-empty directory"
 msgstr "不允许克隆到一个非空目录"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1868
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
@@ -15637,182 +15949,182 @@ msgstr ""
 "[--name <名字>] [--depth <深度>] [--single-branch] [--filter <过滤器规格>] --"
 "url <url> --path <路径>"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1911
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr "为子模组路径 '%2$s' 配置的更新模式 '%1$s' 无效"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2021
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "子模组路径 '%s' 尚未初始化"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2025
 msgid "Maybe you want to use 'update --init'?"
 msgstr "也许您想要执行 'update --init'？"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2052
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "略过未合并的子模组 %s"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2075
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "略过子模组 '%s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2098
 #, c-format
 msgid "cannot clone submodule '%s' without a URL"
 msgstr "无法在不提供 URL 时克隆子模组 '%s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2235
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "克隆 '%s' 失败。按计划重试"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2246
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "第二次尝试克隆 '%s' 失败，退出"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2351
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "无法在子模组路径 '%2$s' 中检出 '%1$s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2356
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "无法在子模组路径 '%2$s' 中变基 '%1$s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2360
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "无法在子模组路径 '%2$s' 中合并 '%1$s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2364
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "在子模组路径 '%3$s' 中执行 '%1$s %2$s' 失败"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2380
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "子模组路径 '%s'：检出 '%s'\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2384
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "子模组路径 '%s'：变基至 '%s'\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2388
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "子模组路径 '%s'：合并入 '%s'\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2392
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "子模组路径 '%s'：'%s %s'\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2416
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr "无法在子模组路径 '%s' 中获取；尝试直接获取 %s："
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2425
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
 "of that commit failed."
 msgstr "获取了子模组路径 '%s'，但是它没有包含 %s。直接获取该提交失败。"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2441
 #, c-format
 msgid "could not initialize submodule at path '%s'"
 msgstr "无法在路径 '%s' 初始化子模组"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2464
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
 "the superproject is not on any branch"
 msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2598
 #, c-format
 msgid "Unable to find current revision in submodule path '%s'"
 msgstr "无法在子模组路径 '%s' 中找到当前版本"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2620
 #, c-format
 msgid "Unable to fetch in submodule path '%s'"
 msgstr "无法在子模组路径 '%s' 中获取"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2626
 #, c-format
 msgid "Unable to find %s revision in submodule path '%s'"
 msgstr "无法在子模组路径 '%2$s' 中找到当前版本 %1$s"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2653
 #, c-format
 msgid "Failed to recurse into submodule path '%s'"
 msgstr "无法递归进入子模组路径 '%s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2743
 msgid "force checkout updates"
 msgstr "强制检出更新"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2745
 msgid "initialize uninitialized submodules before update"
 msgstr "在更新前初始化尚未初始化的子模组"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2747
 msgid "use SHA-1 of submodule's remote tracking branch"
 msgstr "使用子模组远程追踪分支的 SHA-1"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2749
 msgid "traverse submodules recursively"
 msgstr "递归遍历子模组"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2751
 msgid "don't fetch new objects from the remote site"
 msgstr "不要从远程地址获取新对象"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2753
 msgid "use the 'checkout' update strategy (default)"
 msgstr "使用 'checkout' 更新策略（默认）"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2756
 msgid "use the 'merge' update strategy"
 msgstr "使用 'merge' 更新策略"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2759
 msgid "use the 'rebase' update strategy"
 msgstr "使用 'rebase' 更新策略"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2766
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2769
 msgid "parallel jobs"
 msgstr "并发任务"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2771
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2772
 msgid "don't print cloning progress"
 msgstr "不要输出克隆进度"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2776
 msgid "disallow cloning into non-empty directory, implies --init"
 msgstr "不允许克隆到一个非空目录，暗含 --init"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2783
 msgid ""
 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
 "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
@@ -15824,55 +16136,55 @@ msgstr ""
 "shallow] [--reference <仓库>] [--recursive] [--[no-]single-branch] [--] [<路"
 "径>...]"
 
-#: builtin/submodule--helper.c submodule.c
+#: builtin/submodule--helper.c:2879 submodule.c:1251
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "无法将 HEAD 解析为有效引用。"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2945
 msgid "git submodule absorbgitdirs [<options>] [<path>...]"
 msgstr "git submodule absorbgitdirs [<选项>] [<路径>...]"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2974
 msgid "suppress output for setting url of a submodule"
 msgstr "抑制设置子模组 URL 的输出"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2978
 msgid "git submodule set-url [--quiet] <path> <newurl>"
 msgstr "git submodule set-url [--quiet] <路径> <新地址>"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3020
 msgid "set the default tracking branch to master"
 msgstr "设置默认跟踪分支为 master"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3022
 msgid "set the default tracking branch"
 msgstr "设置默认跟踪分支"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3026
 msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <路径>"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3027
 msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3035
 msgid "--branch or --default required"
 msgstr "需要 --branch 或 --default"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3061 builtin/submodule--helper.c:3371
 msgid "print only error messages"
 msgstr "只打印错误消息"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3062
 msgid "force creation"
 msgstr "强制创建"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3070
 msgid "show whether the branch would be created"
 msgstr "显示是否将要创建分支"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3074
 msgid ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
@@ -15880,27 +16192,27 @@ msgstr ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <名称> <起始对象 ID> <起始名称>"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3086
 #, c-format
 msgid "creating branch '%s'"
 msgstr "正在创建分支 '%s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3148
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "向索引中添加位于 '%s' 的已存在的仓库\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3151
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "'%s' 已存在并且不是一个有效的 git 仓库"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3165
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr "发现一个本地 git 目录 '%s' 及其远程仓库：\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3172
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -15915,134 +16227,137 @@ msgstr ""
 "使用 '--force' 选项。如果本地 git 目录不是正确的仓库，或者如果您不确定这里\n"
 "的含义，使用 '--name' 选项指定另外的名称。"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3184
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "为子模组 '%s' 重新激活本地 git 目录\n"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3223
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "无法检出子模组 '%s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3237 builtin/submodule--helper.c:3392
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "请确认 .gitmodules 文件在工作区里"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3264
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "无法添加子模组 '%s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3268 builtin/submodule--helper.c:3273
+#: builtin/submodule--helper.c:3281
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "无法注册子模组 '%s'"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3336
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "'%s' 已经存在于索引中"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3339
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "'%s' 已经存在于索引中且不是一个子模组"
 
-#: builtin/submodule--helper.c read-cache.c
+#: builtin/submodule--helper.c:3356 read-cache.c:719
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "'%s' 没有检出一个提交"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3368
 msgid "branch of repository to add as submodule"
 msgstr "要添加为子模组的仓库的分支"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3369
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "允许添加一个被忽略的子模组路径"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3375
 msgid "borrow the objects from reference repositories"
 msgstr "从引用仓库中借用对象"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3377
 msgid ""
 "sets the submodule's name to the given string instead of defaulting to its "
 "path"
 msgstr "将子模组的名称设置为给定的字符串，而非默认为其路径"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3383
 msgid "git submodule add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule add [<选项>] [--] <仓库> [<路径>]"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3417
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "只能在工作区的顶级目录中使用相对路径"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3426
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr "仓库 URL：'%s' 必须是绝对路径或以 ./|../ 起始"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3461
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "'%s' 不是一个有效的子模组名称"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:3486
 msgid "git submodule--helper <command>"
 msgstr "git submodule--helper <命令>"
 
-#: builtin/symbolic-ref.c
+#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref [-m <reason>] <name> <ref>"
 msgstr "git symbolic-ref [-m <理由>] <名称> <引用>"
 
-#: builtin/symbolic-ref.c
+#: builtin/symbolic-ref.c:10
 msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>"
 msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <名称>"
 
-#: builtin/symbolic-ref.c
+#: builtin/symbolic-ref.c:11
 msgid "git symbolic-ref --delete [-q] <name>"
 msgstr "git symbolic-ref --delete [-q] <名称>"
 
-#: builtin/symbolic-ref.c
+#: builtin/symbolic-ref.c:50
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "不显示非符号（分离的）引用的错误信息"
 
-#: builtin/symbolic-ref.c
+#: builtin/symbolic-ref.c:51
 msgid "delete symbolic ref"
 msgstr "删除符号引用"
 
-#: builtin/symbolic-ref.c
+#: builtin/symbolic-ref.c:52
 msgid "shorten ref output"
 msgstr "缩短引用输出"
 
-#: builtin/symbolic-ref.c
+#: builtin/symbolic-ref.c:53
 msgid "recursively dereference (default)"
 msgstr "递归解引用（默认）"
 
-#: builtin/symbolic-ref.c builtin/update-ref.c
+#: builtin/symbolic-ref.c:54 builtin/update-ref.c:723
 msgid "reason"
 msgstr "原因"
 
-#: builtin/symbolic-ref.c builtin/update-ref.c
+#: builtin/symbolic-ref.c:54 builtin/update-ref.c:723
 msgid "reason of the update"
 msgstr "更新的原因"
 
-#: builtin/tag.c
+#: builtin/tag.c:34
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+"        [(--trailer <token>[(=|:)<value>])...]\n"
 "        <tagname> [<commit> | <object>]"
 msgstr ""
-"git tag [-a | -s | -u <私钥 ID>] [-f] [-m <消息> | -F <文件>] [-e]\n"
+"git tag [-a | -s | -u <私钥 id>] [-f] [-m <消息> | -F <文件>] [-e]\n"
+"        [(--trailer <令牌>[(=|:)<值>])...]\n"
 "        <标签名> [<提交> | <对象>]"
 
-#: builtin/tag.c
+#: builtin/tag.c:37
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <标签名>..."
 
-#: builtin/tag.c
+#: builtin/tag.c:38
 msgid ""
 "git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n"
 "        [--points-at <object>] [--column[=<options>] | --no-column]\n"
@@ -16054,21 +16369,21 @@ msgstr ""
 "        [--create-reflog] [--sort=<键>] [--format=<格式>]\n"
 "        [--merged <提交>] [--no-merged <提交>] [<模式>...]"
 
-#: builtin/tag.c
+#: builtin/tag.c:42
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<格式>] <标签名>..."
 
-#: builtin/tag.c
+#: builtin/tag.c:93
 #, c-format
 msgid "tag '%s' not found."
 msgstr "未发现标签 '%s'。"
 
-#: builtin/tag.c
+#: builtin/tag.c:128
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "已删除标签 '%s'（曾为 %s）\n"
 
-#: builtin/tag.c
+#: builtin/tag.c:197
 #, c-format
 msgid ""
 "\n"
@@ -16081,7 +16396,7 @@ msgstr ""
 "  %s\n"
 "以 '%s' 开头的行将被忽略。\n"
 
-#: builtin/tag.c
+#: builtin/tag.c:201
 #, c-format
 msgid ""
 "\n"
@@ -16095,11 +16410,11 @@ msgstr ""
 "  %s\n"
 "以 '%s' 开头的行将被保留，如果您愿意也可以删除它们。\n"
 
-#: builtin/tag.c
+#: builtin/tag.c:268
 msgid "unable to sign the tag"
 msgstr "无法签署标签"
 
-#: builtin/tag.c
+#: builtin/tag.c:287
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -16112,362 +16427,362 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c
+#: builtin/tag.c:304
 msgid "bad object type."
 msgstr "坏的对象类型。"
 
-#: builtin/tag.c
+#: builtin/tag.c:368
 msgid "no tag message?"
 msgstr "无标签说明？"
 
-#: builtin/tag.c
+#: builtin/tag.c:375 builtin/tag.c:689
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "标签说明被保留在 %s\n"
 
-#: builtin/tag.c
+#: builtin/tag.c:485
 msgid "list tag names"
 msgstr "列出标签名称"
 
-#: builtin/tag.c
+#: builtin/tag.c:487
 msgid "print <n> lines of each tag message"
 msgstr "每个标签信息打印 <n> 行"
 
-#: builtin/tag.c
+#: builtin/tag.c:489
 msgid "delete tags"
 msgstr "删除标签"
 
-#: builtin/tag.c
+#: builtin/tag.c:490
 msgid "verify tags"
 msgstr "验证标签"
 
-#: builtin/tag.c
+#: builtin/tag.c:492
 msgid "Tag creation options"
 msgstr "标签创建选项"
 
-#: builtin/tag.c
+#: builtin/tag.c:494
 msgid "annotated tag, needs a message"
 msgstr "附注标签，需要一个说明"
 
-#: builtin/tag.c
+#: builtin/tag.c:496
 msgid "tag message"
 msgstr "标签说明"
 
-#: builtin/tag.c
+#: builtin/tag.c:500
 msgid "force edit of tag message"
 msgstr "强制编辑标签说明"
 
-#: builtin/tag.c
+#: builtin/tag.c:501
 msgid "annotated and GPG-signed tag"
 msgstr "附注并附加 GPG 签名的标签"
 
-#: builtin/tag.c
+#: builtin/tag.c:504
 msgid "use another key to sign the tag"
 msgstr "使用另外的私钥签名该标签"
 
-#: builtin/tag.c
+#: builtin/tag.c:505
 msgid "replace the tag if exists"
 msgstr "如果存在，替换现有的标签"
 
-#: builtin/tag.c builtin/update-ref.c
+#: builtin/tag.c:506 builtin/update-ref.c:729
 msgid "create a reflog"
 msgstr "创建引用日志"
 
-#: builtin/tag.c
+#: builtin/tag.c:508
 msgid "Tag listing options"
 msgstr "标签列表选项"
 
-#: builtin/tag.c
+#: builtin/tag.c:509
 msgid "show tag list in columns"
 msgstr "以列的方式显示标签列表"
 
-#: builtin/tag.c
+#: builtin/tag.c:510 builtin/tag.c:512
 msgid "print only tags that contain the commit"
 msgstr "只打印包含该提交的标签"
 
-#: builtin/tag.c
+#: builtin/tag.c:511 builtin/tag.c:513
 msgid "print only tags that don't contain the commit"
 msgstr "只打印不包含该提交的标签"
 
-#: builtin/tag.c
+#: builtin/tag.c:514
 msgid "print only tags that are merged"
 msgstr "只打印已经合并的标签"
 
-#: builtin/tag.c
+#: builtin/tag.c:515
 msgid "print only tags that are not merged"
 msgstr "只打印尚未合并的标签"
 
-#: builtin/tag.c
+#: builtin/tag.c:521
 msgid "print only tags of the object"
 msgstr "只打印指向该对象的标签"
 
-#: builtin/tag.c
+#: builtin/tag.c:590
 msgid "could not start 'git column'"
 msgstr "无法启动 'git column'"
 
-#: builtin/tag.c
+#: builtin/tag.c:611
 #, c-format
 msgid "the '%s' option is only allowed in list mode"
 msgstr "'%s' 选项只允许用在列表显示模式"
 
-#: builtin/tag.c
+#: builtin/tag.c:650
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' 不是一个有效的标签名称。"
 
-#: builtin/tag.c
+#: builtin/tag.c:655
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "标签 '%s' 已存在"
 
-#: builtin/tag.c sequencer.c
+#: builtin/tag.c:667 sequencer.c:701
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "无效的清理模式 %s"
 
-#: builtin/tag.c
+#: builtin/tag.c:699
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新标签 '%s'（曾为 %s）\n"
 
-#: builtin/unpack-objects.c
+#: builtin/unpack-objects.c:97
 msgid "pack exceeds maximum allowed size"
 msgstr "包超过了最大允许大小"
 
-#: builtin/unpack-objects.c
+#: builtin/unpack-objects.c:402
 msgid "failed to write object in stream"
 msgstr "无法在流中写入对象"
 
-#: builtin/unpack-objects.c
+#: builtin/unpack-objects.c:405
 #, c-format
 msgid "inflate returned (%d)"
 msgstr "解压缩返回了 (%d)"
 
-#: builtin/unpack-objects.c
+#: builtin/unpack-objects.c:412
 msgid "invalid blob object from stream"
 msgstr "流中无效的数据对象"
 
-#: builtin/unpack-objects.c
+#: builtin/unpack-objects.c:590
 msgid "Unpacking objects"
 msgstr "展开对象中"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:103
 #, c-format
 msgid "failed to create directory %s"
 msgstr "无法创建目录 %s"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:125
 #, c-format
 msgid "failed to delete file %s"
 msgstr "无法删除文件 %s"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:132 builtin/update-index.c:238
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "无法删除目录 %s"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:157
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "在 '%s' 中测试 mtime "
 
-#: builtin/update-index.c
+#: builtin/update-index.c:171
 msgid "directory stat info does not change after adding a new file"
 msgstr "添加一个新文件后，目录的状态信息未改变"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:184
 msgid "directory stat info does not change after adding a new directory"
 msgstr "添加一个新目录后，目录的状态信息未改变"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:197
 msgid "directory stat info changes after updating a file"
 msgstr "更新一个文件后，目录的状态信息被修改"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:208
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr "在子目录中添加文件后，目录的状态信息被修改"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:219
 msgid "directory stat info does not change after deleting a file"
 msgstr "删除一个文件后，目录的状态信息未改变"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:232
 msgid "directory stat info does not change after deleting a directory"
 msgstr "删除一个目录后，目录的状态信息未改变"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:239
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:609
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<选项>] [--] [<文件>...]"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:940
 msgid "continue refresh even when index needs update"
 msgstr "当索引需要更新时继续刷新"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:943
 msgid "refresh: ignore submodules"
 msgstr "刷新：忽略子模组"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:946
 msgid "do not ignore new files"
 msgstr "不忽略新的文件"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:948
 msgid "let files replace directories and vice-versa"
 msgstr "让文件替换目录（反之亦然）"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:950
 msgid "notice files missing from worktree"
 msgstr "通知文件从工作区丢失"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:952
 msgid "refresh even if index contains unmerged entries"
 msgstr "即使索引区包含未合并的条目也执行刷新"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:955
 msgid "refresh stat information"
 msgstr "刷新统计信息"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:959
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:963
 msgid "<mode>,<object>,<path>"
 msgstr "<存取模式>,<对象>,<路径>"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:964
 msgid "add the specified entry to the index"
 msgstr "添加指定的条目到索引区"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:974
 msgid "mark files as \"not changing\""
 msgstr "把文件标记为 \"没有变更\""
 
-#: builtin/update-index.c
+#: builtin/update-index.c:977
 msgid "clear assumed-unchanged bit"
 msgstr "清除 assumed-unchanged 位"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:980
 msgid "mark files as \"index-only\""
 msgstr "把文件标记为 \"仅索引\""
 
-#: builtin/update-index.c
+#: builtin/update-index.c:983
 msgid "clear skip-worktree bit"
 msgstr "清除 skip-worktree 位"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:986
 msgid "do not touch index-only entries"
 msgstr "不要触碰仅索引条目"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:988
 msgid "add to index only; do not add content to object database"
 msgstr "只添加到索引区；不添加对象到对象库"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:990
 msgid "remove named paths even if present in worktree"
 msgstr "即使存在工作区里，也删除路径"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:992
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "携带 --stdin：输入的行以 null 字符终止"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:994
 msgid "read list of paths to be updated from standard input"
 msgstr "从标准输入中读取需要更新的路径列表"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:998
 msgid "add entries from standard input to the index"
 msgstr "从标准输入添加条目到索引区"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1002
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "为指定文件重新生成第2和第3暂存区"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1006
 msgid "only update entries that differ from HEAD"
 msgstr "只更新与 HEAD 不同的条目"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1010
 msgid "ignore files missing from worktree"
 msgstr "忽略工作区丢失的文件"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1013
 msgid "report actions to standard output"
 msgstr "在标准输出显示操作"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1015
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(for porcelains) 忘记保存的未解决的冲突"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1019
 msgid "write index in this format"
 msgstr "以这种格式写入索引区"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1021
 msgid "report on-disk index format version"
 msgstr "报告磁盘索引格式的版本"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1023
 msgid "enable or disable split index"
 msgstr "启用或禁用索引拆分"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1025
 msgid "enable/disable untracked cache"
 msgstr "启用/禁用对未跟踪文件的缓存"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1027
 msgid "test if the filesystem supports untracked cache"
 msgstr "测试文件系统是否支持未跟踪文件缓存"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1029
 msgid "enable untracked cache without testing the filesystem"
 msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1031
 msgid "write out the index even if is not flagged as changed"
 msgstr "即使没有被标记为已更改，也要写出索引"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1033
 msgid "enable or disable file system monitor"
 msgstr "启用或禁用文件系统监控"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1035
 msgid "mark files as fsmonitor valid"
 msgstr "标记文件为 fsmonitor 有效"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1038
 msgid "clear fsmonitor valid bit"
 msgstr "清除 fsmonitor 有效位"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1115
 #, c-format
 msgid "%d\n"
 msgstr "%d\n"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1124
 #, c-format
 msgid "index-version: was %d, set to %d"
 msgstr "索引版本：从 %d 设置为 %d"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1160
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
 "core.splitIndex 被设置为 false。如果您确实要启用索引拆分，请删除或修改它。"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1169
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
 "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分，请删除或修改它。"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1181
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -16475,11 +16790,11 @@ msgstr ""
 "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
 "改它。"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1185
 msgid "Untracked cache disabled"
 msgstr "缓存未跟踪文件被禁用"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1193
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -16487,61 +16802,61 @@ msgstr ""
 "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
 "修改它。"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1197
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "缓存未跟踪文件在 '%s' 启用"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1222
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr "core.fsmonitor 未设置；如果想要启用 fsmonitor 请设置该选项"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1227
 msgid "fsmonitor enabled"
 msgstr "fsmonitor 被启用"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1231
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr "core.fsmonitor 已设置；如果想要禁用 fsmonitor 请移除该选项"
 
-#: builtin/update-index.c
+#: builtin/update-index.c:1235
 msgid "fsmonitor disabled"
 msgstr "fsmonitor 被禁用"
 
-#: builtin/update-ref.c
+#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] -d <refname> [<old-oid>]"
 msgstr "git update-ref [<选项>] -d <引用名> [<旧对象>]"
 
-#: builtin/update-ref.c
+#: builtin/update-ref.c:13
 msgid "git update-ref [<options>]    <refname> <new-oid> [<old-oid>]"
 msgstr "git update-ref [<选项>]    <引用名> <新对象> [<旧对象>]"
 
-#: builtin/update-ref.c
+#: builtin/update-ref.c:14
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<选项>] --stdin [-z]"
 
-#: builtin/update-ref.c
+#: builtin/update-ref.c:724
 msgid "delete the reference"
 msgstr "删除引用"
 
-#: builtin/update-ref.c
+#: builtin/update-ref.c:726
 msgid "update <refname> not the one it points to"
 msgstr "更新 <引用名> 本身而不是它指向的引用"
 
-#: builtin/update-ref.c
+#: builtin/update-ref.c:727
 msgid "stdin has NUL-terminated arguments"
 msgstr "标准输入有以 NUL 字符终止的参数"
 
-#: builtin/update-ref.c
+#: builtin/update-ref.c:728
 msgid "read updates from stdin"
 msgstr "从标准输入读取更新"
 
-#: builtin/update-server-info.c
+#: builtin/update-server-info.c:16
 msgid "update the info files from scratch"
 msgstr "从头开始更新文件信息"
 
-#: builtin/upload-pack.c
+#: builtin/upload-pack.c:15
 msgid ""
 "git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"
 "                [--advertise-refs] <directory>"
@@ -16549,55 +16864,55 @@ msgstr ""
 "git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"
 "                [--advertise-refs] <目录>"
 
-#: builtin/upload-pack.c t/helper/test-serve-v2.c
+#: builtin/upload-pack.c:29 t/helper/test-serve-v2.c:18
 msgid "quit after a single request/response exchange"
 msgstr "在一次单独的请求/响应之后退出"
 
-#: builtin/upload-pack.c
+#: builtin/upload-pack.c:31
 msgid "serve up the info/refs for git-http-backend"
 msgstr "为 git-http-backend 提供 info/refs"
 
-#: builtin/upload-pack.c
+#: builtin/upload-pack.c:34
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "如果 <目录> 不是一个 Git 目录，不要尝试 <目录>/.git/"
 
-#: builtin/upload-pack.c
+#: builtin/upload-pack.c:36
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "不活动 <n> 秒钟后终止传输"
 
-#: builtin/verify-commit.c
+#: builtin/verify-commit.c:18
 msgid "git verify-commit [-v | --verbose] [--raw] <commit>..."
 msgstr "git verify-commit [-v | --verbose] [--raw] <提交>..."
 
-#: builtin/verify-commit.c
+#: builtin/verify-commit.c:59
 msgid "print commit contents"
 msgstr "打印提交内容"
 
-#: builtin/verify-commit.c builtin/verify-tag.c
+#: builtin/verify-commit.c:60 builtin/verify-tag.c:29
 msgid "print raw gpg status output"
 msgstr "打印原始 gpg 状态输出"
 
-#: builtin/verify-pack.c
+#: builtin/verify-pack.c:60
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <包>.idx..."
 
-#: builtin/verify-pack.c
+#: builtin/verify-pack.c:71
 msgid "verbose"
 msgstr "冗长输出"
 
-#: builtin/verify-pack.c
+#: builtin/verify-pack.c:73
 msgid "show statistics only"
 msgstr "只显示统计"
 
-#: builtin/verify-tag.c
+#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<格式>] [--raw] <标签>..."
 
-#: builtin/verify-tag.c
+#: builtin/verify-tag.c:28
 msgid "print tag contents"
 msgstr "打印标签内容"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:30
 msgid ""
 "git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
 "                 [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
@@ -16605,39 +16920,39 @@ msgstr ""
 "git worktree add [-f] [--detach] [--checkout] [--lock [--reason <字符串>]]\n"
 "                 [--orphan] [(-b | -B) <新分支>] <路径> [<提交号>]"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:34
 msgid "git worktree list [-v | --porcelain [-z]]"
 msgstr "git worktree list [-v | --porcelain [-z]]"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:36
 msgid "git worktree lock [--reason <string>] <worktree>"
 msgstr "git worktree lock [--reason <字符串>] <工作区>"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:38
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <工作区> <新路径>"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:40
 msgid "git worktree prune [-n] [-v] [--expire <expire>]"
 msgstr "git worktree prune [-n] [-v] [--expire <过期>]"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:42
 msgid "git worktree remove [-f] <worktree>"
 msgstr "git worktree remove [-f] <工作区>"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:44
 msgid "git worktree repair [<path>...]"
 msgstr "git worktree repair [<路径>...]"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:46
 msgid "git worktree unlock <worktree>"
 msgstr "git worktree unlock <工作区>"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:49
 msgid "No possible source branch, inferring '--orphan'"
 msgstr "没有可用的源分支，将基于 '--orphan' 选项进行推断"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:52
 #, c-format
 msgid ""
 "If you meant to create a worktree containing a new unborn branch\n"
@@ -16652,7 +16967,7 @@ msgstr ""
 "\n"
 "    git worktree add --orphan -b %s %s\n"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:59
 #, c-format
 msgid ""
 "If you meant to create a worktree containing a new unborn branch\n"
@@ -16667,30 +16982,30 @@ msgstr ""
 "\n"
 "    git worktree add --orphan %s\n"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:165
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "删除 %s/%s: %s"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:238
 msgid "report pruned working trees"
 msgstr "报告清除的工作区"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:240
 msgid "expire working trees older than <time>"
 msgstr "将早于 <时间> 的工作区过期"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:311
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' 已经存在"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:320
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "无法使用的工作区目标 '%s'"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:325
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -16699,7 +17014,7 @@ msgstr ""
 "'%s' 是一个丢失但锁定的工作区，\n"
 "使用 '%s -f -f' 覆盖，或用 'unlock' 和 'prune' 或 'remove' 清除"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:327
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -16708,61 +17023,61 @@ msgstr ""
 "'%s' 是一个丢失但已经注册的工作区，\n"
 "使用 '%s -f' 覆盖，或用 'prune' 或 'remove' 清除"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:338
 #, c-format
 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
 msgstr "无法将 '%s' 复制至 '%s'；稀疏检出可能无法正确工作"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:357
 #, c-format
 msgid "failed to copy worktree config from '%s' to '%s'"
 msgstr "无法把工作树配置从 '%s' 拷贝到 '%s'"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:369 builtin/worktree.c:374
 #, c-format
 msgid "failed to unset '%s' in '%s'"
 msgstr "无法在 '%2$s' 中取消配置 '%1$s'"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:461
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "不能创建目录 '%s'"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:483
 msgid "initializing"
 msgstr "初始化"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:507
 #, c-format
 msgid "could not find created worktree '%s'"
 msgstr "无法找到已创建的工作树 '%s'"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:598 builtin/worktree.c:604
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "准备工作区（新分支 '%s'）"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:600
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "准备工作区（重置分支 '%s'，之前为 %s）"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:609
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "准备工作区（检出 '%s'）"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:614
 #, c-format
 msgid "unreachable: invalid reference: %s"
 msgstr "不可达：无效引用：%s"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:615
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "准备工作区（分离头指针 %s）"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:663
 #, c-format
 msgid ""
 "HEAD points to an invalid (or orphaned) reference.\n"
@@ -16773,7 +17088,7 @@ msgstr ""
 "HEAD 路径： '%s'\n"
 "HEAD 内容： '%s'"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:695
 msgid ""
 "No local or remote refs exist despite at least one remote\n"
 "present, stopping; use 'add -f' to override or fetch a remote first"
@@ -16781,115 +17096,116 @@ msgstr ""
 "尽管已配置远程仓库，但不存在任何本地的或远程的引用，操作终止。\n"
 "请先使用 'add -f' 来覆盖或拉取一个远程仓库"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:778
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "检出 <分支>，即使已经被检出到其它工作区"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:781
 msgid "create a new branch"
 msgstr "创建一个新分支"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:783
 msgid "create or reset a branch"
 msgstr "创建或重置一个分支"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:784
 msgid "create unborn branch"
 msgstr "创建一个尚未诞生的分支"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:786
 msgid "populate the new working tree"
 msgstr "生成新的工作区"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:787
 msgid "keep the new working tree locked"
 msgstr "锁定新工作区"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:789 builtin/worktree.c:1088
 msgid "reason for locking"
 msgstr "锁定原因"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:792
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "设置跟踪模式（参见 git-branch(1)）"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:795
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "尝试为新分支名匹配一个远程跟踪分支"
 
-#: builtin/worktree.c diff.c parse-options.c
+#: builtin/worktree.c:804 diff.c:4870 parse-options.c:1322
 #, c-format
 msgid "options '%s', '%s', and '%s' cannot be used together"
 msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:815
 #, c-format
 msgid "option '%s' and commit-ish cannot be used together"
 msgstr "选项 '%s' 和提交号不能同时使用"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:822
 msgid "added with --lock"
 msgstr "由 --lock 添加"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:921
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "只能在创建新分支时使用选项 --[no-]track "
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1045
 msgid "show extended annotations and reasons, if available"
 msgstr "显示扩展的注释和原因（如果有）"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1047
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr "向早于 <时间> 的工作区添添加“可修剪”注释"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1049
 msgid "terminate records with a NUL character"
 msgstr "使用 NUL 字符终结记录"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1100 builtin/worktree.c:1133 builtin/worktree.c:1208
+#: builtin/worktree.c:1332
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' 不是一个工作区"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1102 builtin/worktree.c:1135
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作区无法被加锁或解锁"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1107
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被锁定，原因：%s"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1109
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被锁定"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1137
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被锁定"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1178
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "不能移动或删除包含子模组的工作区"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1186
 msgid "force move even if worktree is dirty or locked"
 msgstr "强制移动，即使工作区是脏的或已锁定"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1210 builtin/worktree.c:1334
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' 是一个主工作区"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1215
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "无法从 '%s' 算出目标名称"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1228
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -16898,7 +17214,7 @@ msgstr ""
 "无法移动一个锁定的工作区，锁定原因：%s\n"
 "使用 'move -f -f' 覆盖或先解锁"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1230
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -16906,36 +17222,36 @@ msgstr ""
 "无法移动一个锁定的工作区，\n"
 "使用 'move -f -f' 覆盖或先解锁"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1233
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "验证失败，无法移动工作区：%s"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1238
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "无法移动 '%s' 到 '%s'"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1284
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "无法在 '%s' 中执行 'git status'"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1288
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1293
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "无法在 '%s' 中执行 'git status'，退出码 %d"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1316
 msgid "force removal even if worktree is dirty or locked"
 msgstr "强制删除，即使工作区是脏的或已锁定"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1339
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -16944,7 +17260,7 @@ msgstr ""
 "无法删除一个锁定的工作区，锁定原因：%s\n"
 "使用 'remove -f -f' 覆盖或先解锁"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1341
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -16952,1292 +17268,1307 @@ msgstr ""
 "无法删除一个锁定的工作区，\n"
 "使用 'remove -f -f' 覆盖或先解锁"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1344
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "验证失败，无法删除工作区：%s"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1368
 #, c-format
 msgid "repair: %s: %s"
 msgstr "修理：%s：%s"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:1371
 #, c-format
 msgid "error: %s: %s"
 msgstr "错误：%s：%s"
 
-#: builtin/write-tree.c
+#: builtin/write-tree.c:18
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
 
-#: builtin/write-tree.c
+#: builtin/write-tree.c:31
 msgid "<prefix>/"
 msgstr "<前缀>/"
 
-#: builtin/write-tree.c
+#: builtin/write-tree.c:32
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "将 <前缀> 子目录内容写到一个树对象"
 
-#: builtin/write-tree.c
+#: builtin/write-tree.c:34
 msgid "only useful for debugging"
 msgstr "只对调试有用"
 
-#: bulk-checkin.c
+#: bulk-checkin.c:350
 msgid "core.fsyncMethod = batch is unsupported on this platform"
 msgstr "core.fsyncMethod = batch 不支持本平台"
 
-#: bundle-uri.c
+#: bundle-uri.c:216
 #, c-format
 msgid "could not parse bundle list key %s with value '%s'"
 msgstr "不能解析归档包列表键 %s 的值 '%s'"
 
-#: bundle-uri.c
+#: bundle-uri.c:264
 #, c-format
 msgid "bundle list at '%s' has no mode"
 msgstr "在 '%s' 的归档包列表没有模式"
 
-#: bundle-uri.c
+#: bundle-uri.c:281
 msgid "failed to create temporary file"
 msgstr "无法创建临时文件"
 
-#: bundle-uri.c
+#: bundle-uri.c:330
 msgid "insufficient capabilities"
 msgstr "缺乏能力"
 
-#: bundle-uri.c
+#: bundle-uri.c:577
 #, c-format
 msgid "file downloaded from '%s' is not a bundle"
 msgstr "下载自 '%s' 的文件不是归档包"
 
-#: bundle-uri.c
+#: bundle-uri.c:627
 msgid "failed to store maximum creation token"
 msgstr "无法储存最大的创建令牌"
 
-#: bundle-uri.c
+#: bundle-uri.c:667
 #, c-format
 msgid "unrecognized bundle mode from URI '%s'"
 msgstr "不可辨认的归档包模式来自 URI '%s'"
 
-#: bundle-uri.c
+#: bundle-uri.c:711
 #, c-format
 msgid "exceeded bundle URI recursion limit (%d)"
 msgstr "超过了 URI 递归限制 (%d)"
 
-#: bundle-uri.c
+#: bundle-uri.c:723
 #, c-format
 msgid "failed to download bundle from URI '%s'"
 msgstr "无法从 URI '%s' 下载归档包"
 
-#: bundle-uri.c
+#: bundle-uri.c:731
 #, c-format
 msgid "file at URI '%s' is not a bundle or bundle list"
 msgstr "位于 URI '%s' 的文件不是归档包或归档包列表"
 
-#: bundle-uri.c
+#: bundle-uri.c:899
 #, c-format
 msgid "bundle-uri: unexpected argument: '%s'"
 msgstr "bundle-uri: 意外的参数：'%s'"
 
-#: bundle-uri.c
+#: bundle-uri.c:901
 msgid "bundle-uri: expected flush after arguments"
 msgstr "bundle-uri: 在参数之后应有一个 flush"
 
-#: bundle-uri.c
+#: bundle-uri.c:924
 msgid "bundle-uri: got an empty line"
 msgstr "bundle-uri: 获得了空行"
 
-#: bundle-uri.c
+#: bundle-uri.c:929
 msgid "bundle-uri: line is not of the form 'key=value'"
 msgstr "bundle-uri: 行不是以 'key=value' 格式"
 
-#: bundle-uri.c
+#: bundle-uri.c:931
 msgid "bundle-uri: line has empty key or value"
 msgstr "bundle-uri: 行有空的键或值"
 
-#: bundle.c
+#: bundle.c:52
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
 msgstr "未能识别的归档包哈希算法：%s"
 
-#: bundle.c
+#: bundle.c:60
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "未知能力 '%s'"
 
-#: bundle.c
+#: bundle.c:86
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
 
-#: bundle.c
+#: bundle.c:125
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "未能识别的包头：%s%s (%d)"
 
-#: bundle.c
+#: bundle.c:222
 msgid "Repository lacks these prerequisite commits:"
 msgstr "仓库中缺少这些必备的提交："
 
-#: bundle.c
-msgid "need a repository to verify a bundle"
-msgstr "需要一个仓库来校验一个归档包"
-
-#: bundle.c
+#: bundle.c:251
 msgid ""
 "some prerequisite commits exist in the object store, but are not connected "
 "to the repository's history"
 msgstr "一些前置提交存在于对象储存中，但未连接于本仓库的历史"
 
-#: bundle.c
+#: bundle.c:259
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %<PRIuMAX> refs:"
 msgstr[0] "这个归档包中含有这个引用："
 msgstr[1] "这个归档包中含有 %<PRIuMAX> 个引用："
 
-#: bundle.c
+#: bundle.c:267
 msgid "The bundle records a complete history."
 msgstr "这个归档包记录一个完整历史。"
 
-#: bundle.c
+#: bundle.c:269
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %<PRIuMAX> refs:"
 msgstr[0] "这个归档包需要这个引用："
 msgstr[1] "这个归档包需要 %<PRIuMAX> 个引用："
 
-#: bundle.c
+#: bundle.c:276
 #, c-format
 msgid "The bundle uses this hash algorithm: %s"
 msgstr "该归档包使用的哈希算法：%s"
 
-#: bundle.c
+#: bundle.c:279
 #, c-format
 msgid "The bundle uses this filter: %s"
 msgstr "归档包使用了过滤器：%s"
 
-#: bundle.c
+#: bundle.c:346
 msgid "unable to dup bundle descriptor"
 msgstr "无法复制归档包描述符"
 
-#: bundle.c
+#: bundle.c:353
 msgid "Could not spawn pack-objects"
 msgstr "不能生成 pack-objects 进程"
 
-#: bundle.c
+#: bundle.c:364
 msgid "pack-objects died"
 msgstr "pack-objects 终止"
 
-#: bundle.c
+#: bundle.c:414
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "引用 '%s' 被 rev-list 选项排除"
 
-#: bundle.c
+#: bundle.c:546
 #, c-format
 msgid "unsupported bundle version %d"
 msgstr "不支持的归档包版本 %d"
 
-#: bundle.c
+#: bundle.c:548
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "不能写入，归档包版本 %d 不支持算法 %s"
 
-#: bundle.c
+#: bundle.c:598
 msgid "Refusing to create empty bundle."
 msgstr "不能创建空的归档包。"
 
-#: bundle.c
+#: bundle.c:612
 #, c-format
 msgid "cannot create '%s'"
 msgstr "不能创建 '%s'"
 
-#: bundle.c
+#: bundle.c:651
 msgid "index-pack died"
 msgstr "index-pack 终止"
 
-#: chunk-format.c
+#: chunk-format.c:123
 msgid "terminating chunk id appears earlier than expected"
 msgstr "终止块 ID 比预期更早出现"
 
-#: chunk-format.c
+#: chunk-format.c:127
 #, c-format
 msgid "chunk id %<PRIx32> not %d-byte aligned"
 msgstr "块 id %<PRIx32> 未 %d 字节对齐"
 
-#: chunk-format.c
+#: chunk-format.c:137
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>"
 
-#: chunk-format.c
+#: chunk-format.c:144
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
 msgstr "发现重复的块ID %<PRIx32>"
 
-#: chunk-format.c
+#: chunk-format.c:158
 #, c-format
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr "最终块有非零 ID %<PRIx32>"
 
-#: chunk-format.c
+#: chunk-format.c:212
 msgid "invalid hash version"
 msgstr "无效的哈希版本"
 
-#: color.c
+#: color.c:366
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "无效的颜色值：%.*s"
 
-#: command-list.h
+#: command-list.h:54
 msgid "Add file contents to the index"
 msgstr "添加文件内容至索引"
 
-#: command-list.h
+#: command-list.h:55
 msgid "Apply a series of patches from a mailbox"
 msgstr "应用邮箱格式的系列补丁"
 
-#: command-list.h
+#: command-list.h:56
 msgid "Annotate file lines with commit information"
 msgstr "使用提交信息注释文件行"
 
-#: command-list.h
+#: command-list.h:57
 msgid "Apply a patch to files and/or to the index"
 msgstr "应用一个补丁到文件和/或索引区"
 
-#: command-list.h
+#: command-list.h:58
 msgid "Import a GNU Arch repository into Git"
 msgstr "将一个 GNU Arch 仓库导入到 Git"
 
-#: command-list.h
+#: command-list.h:59
 msgid "Create an archive of files from a named tree"
 msgstr "基于一个指定的树创建文件存档"
 
-#: command-list.h
+#: command-list.h:60
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "通过二分查找定位引入 bug 的提交"
 
-#: command-list.h
+#: command-list.h:61
 msgid "Show what revision and author last modified each line of a file"
 msgstr "显示文件每一行最后修改的版本和修改者"
 
-#: command-list.h
+#: command-list.h:62
 msgid "List, create, or delete branches"
 msgstr "列出、创建或删除分支"
 
-#: command-list.h
+#: command-list.h:63
 msgid "Collect information for user to file a bug report"
 msgstr "收集信息以供用户提交错误报告"
 
-#: command-list.h
+#: command-list.h:64
 msgid "Move objects and refs by archive"
 msgstr "通过归档移动对象和引用"
 
-#: command-list.h
+#: command-list.h:65
 msgid "Provide contents or details of repository objects"
 msgstr "提供仓库对象的内容或详情"
 
-#: command-list.h
+#: command-list.h:66
 msgid "Display gitattributes information"
 msgstr "显示 gitattributes 信息"
 
-#: command-list.h
+#: command-list.h:67
 msgid "Debug gitignore / exclude files"
 msgstr "调试 gitignore / exclude 文件"
 
-#: command-list.h
+#: command-list.h:68
 msgid "Show canonical names and email addresses of contacts"
 msgstr "显示联系人的规范名称和电子邮件"
 
-#: command-list.h
+#: command-list.h:69
 msgid "Ensures that a reference name is well formed"
 msgstr "确保引用名称格式正确"
 
-#: command-list.h
+#: command-list.h:70
 msgid "Switch branches or restore working tree files"
 msgstr "切换分支或恢复工作区文件"
 
-#: command-list.h
+#: command-list.h:71
 msgid "Copy files from the index to the working tree"
 msgstr "从索引拷贝文件到工作区"
 
-#: command-list.h
+#: command-list.h:72
 msgid "Find commits yet to be applied to upstream"
 msgstr "查找尚未应用到上游的提交"
 
-#: command-list.h
+#: command-list.h:73
 msgid "Apply the changes introduced by some existing commits"
 msgstr "应用一些现存提交引入的修改"
 
-#: command-list.h
+#: command-list.h:74
 msgid "Graphical alternative to git-commit"
 msgstr "git-commit 的图形替代界面"
 
-#: command-list.h
+#: command-list.h:75
 msgid "Remove untracked files from the working tree"
 msgstr "从工作区中删除未跟踪文件"
 
-#: command-list.h
+#: command-list.h:76
 msgid "Clone a repository into a new directory"
 msgstr "克隆仓库到一个新目录"
 
-#: command-list.h
+#: command-list.h:77
 msgid "Display data in columns"
 msgstr "以列的方式显示数据"
 
-#: command-list.h
+#: command-list.h:78
 msgid "Record changes to the repository"
 msgstr "记录变更到仓库"
 
-#: command-list.h
+#: command-list.h:79
 msgid "Write and verify Git commit-graph files"
 msgstr "写入和校验 Git 提交图文件"
 
-#: command-list.h
+#: command-list.h:80
 msgid "Create a new commit object"
 msgstr "创建一个新的提交对象"
 
-#: command-list.h
+#: command-list.h:81
 msgid "Get and set repository or global options"
 msgstr "获取和设置仓库或者全局选项"
 
-#: command-list.h
+#: command-list.h:82
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "计算未打包对象的数量和磁盘空间占用"
 
-#: command-list.h
+#: command-list.h:83
 msgid "Retrieve and store user credentials"
 msgstr "检索和存储用户密码"
 
-#: command-list.h
+#: command-list.h:84
 msgid "Helper to temporarily store passwords in memory"
 msgstr "在内存中临时存储密码的助手"
 
-#: command-list.h
+#: command-list.h:85
 msgid "Helper to store credentials on disk"
 msgstr "在磁盘存储密码的助手"
 
-#: command-list.h
+#: command-list.h:86
 msgid "Export a single commit to a CVS checkout"
 msgstr "将一个提交导出到 CVS 检出中"
 
-#: command-list.h
+#: command-list.h:87
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "从另外一个人们爱恨的配置管理系统中拯救您的数据"
 
-#: command-list.h
+#: command-list.h:88
 msgid "A CVS server emulator for Git"
 msgstr "Git 的一个 CVS 服务模拟器"
 
-#: command-list.h
+#: command-list.h:89
 msgid "A really simple server for Git repositories"
 msgstr "一个非常简单的 Git 仓库服务器"
 
-#: command-list.h
+#: command-list.h:90
 msgid "Give an object a human readable name based on an available ref"
 msgstr "基于一个现存的引用为一个对象起一个可读的名称"
 
-#: command-list.h
+#: command-list.h:91
 msgid "Generate a zip archive of diagnostic information"
 msgstr "生成诊断信息的压缩包"
 
-#: command-list.h
+#: command-list.h:92
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "显示提交之间、提交和工作区之间等的差异"
 
-#: command-list.h
+#: command-list.h:93
 msgid "Compares files in the working tree and the index"
 msgstr "比较工作区和索引区中的文件"
 
-#: command-list.h
+#: command-list.h:94
 msgid "Compare a tree to the working tree or index"
 msgstr "将一个树和工作区或索引做比较"
 
-#: command-list.h
+#: command-list.h:95
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr "比较两个树对象的文件内容和模式"
 
-#: command-list.h
+#: command-list.h:96
 msgid "Show changes using common diff tools"
 msgstr "使用常见的差异工具显示更改"
 
-#: command-list.h
+#: command-list.h:97
 msgid "Git data exporter"
 msgstr "Git 数据导出器"
 
-#: command-list.h
+#: command-list.h:98
 msgid "Backend for fast Git data importers"
 msgstr "Git 快速数据导入器后端"
 
-#: command-list.h
+#: command-list.h:99
 msgid "Download objects and refs from another repository"
 msgstr "从另外一个仓库下载对象和引用"
 
-#: command-list.h
+#: command-list.h:100
 msgid "Receive missing objects from another repository"
 msgstr "从另一个仓库获取缺失的对象"
 
-#: command-list.h
+#: command-list.h:101
 msgid "Rewrite branches"
 msgstr "重写分支"
 
-#: command-list.h
+#: command-list.h:102
 msgid "Produce a merge commit message"
 msgstr "生成一个合并提交信息"
 
-#: command-list.h
+#: command-list.h:103
 msgid "Output information on each ref"
 msgstr "对每一个引用输出信息 "
 
-#: command-list.h
+#: command-list.h:104
 msgid "Run a Git command on a list of repositories"
 msgstr "在一个仓库列表上运行 Git 命令"
 
-#: command-list.h
+#: command-list.h:105
 msgid "Prepare patches for e-mail submission"
 msgstr "准备电子邮件提交的补丁"
 
-#: command-list.h
+#: command-list.h:106
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "验证仓库中对象的连通性和有效性"
 
-#: command-list.h
+#: command-list.h:107
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "清除不必要的文件和优化本地仓库"
 
-#: command-list.h
+#: command-list.h:108
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "从 git-archive 创建的归档文件中提取提交 ID"
 
-#: command-list.h
+#: command-list.h:109
 msgid "Print lines matching a pattern"
 msgstr "输出和模式匹配的行"
 
-#: command-list.h
+#: command-list.h:110
 msgid "A portable graphical interface to Git"
 msgstr "一个便携的 Git 图形客户端"
 
-#: command-list.h
+#: command-list.h:111
 msgid "Compute object ID and optionally create an object from a file"
 msgstr "从一个文件计算对象 ID，并支持可选地创建一个对象"
 
-#: command-list.h
+#: command-list.h:112
 msgid "Display help information about Git"
 msgstr "显示 Git 的帮助信息"
 
-#: command-list.h
+#: command-list.h:113
 msgid "Run git hooks"
 msgstr "运行 git 钩子"
 
-#: command-list.h
+#: command-list.h:114
 msgid "Server side implementation of Git over HTTP"
 msgstr "Git HTTP 协议的服务端实现"
 
-#: command-list.h
+#: command-list.h:115
 msgid "Download from a remote Git repository via HTTP"
 msgstr "通过 HTTP 从远程 Git 仓库下载"
 
-#: command-list.h
+#: command-list.h:116
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "通过 HTTP/DAV 推送对象另一个仓库"
 
-#: command-list.h
+#: command-list.h:117
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "从标准输入将一组补丁发送到IMAP文件夹"
 
-#: command-list.h
+#: command-list.h:118
 msgid "Build pack index file for an existing packed archive"
 msgstr "从一个现存的包存档文件创建包索引"
 
-#: command-list.h
+#: command-list.h:119
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
 
-#: command-list.h
+#: command-list.h:120
 msgid "Instantly browse your working repository in gitweb"
 msgstr "在 gitweb 中即时浏览您的工作仓库"
 
-#: command-list.h
+#: command-list.h:121
 msgid "Add or parse structured information in commit messages"
 msgstr "添加或解析提交说明中的结构化信息"
 
-#: command-list.h
+#: command-list.h:122
 msgid "Show commit logs"
 msgstr "显示提交日志"
 
-#: command-list.h
+#: command-list.h:123
 msgid "Show information about files in the index and the working tree"
 msgstr "显示索引和工作区中文件的信息"
 
-#: command-list.h
+#: command-list.h:124
 msgid "List references in a remote repository"
 msgstr "显示一个远程仓库的引用"
 
-#: command-list.h
+#: command-list.h:125
 msgid "List the contents of a tree object"
 msgstr "显示一个树对象的内容"
 
-#: command-list.h
+#: command-list.h:126
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "从单个电子邮件中提取补丁和作者身份"
 
-#: command-list.h
+#: command-list.h:127
 msgid "Simple UNIX mbox splitter program"
 msgstr "简单的 UNIX mbox 邮箱切分程序"
 
-#: command-list.h
+#: command-list.h:128
 msgid "Run tasks to optimize Git repository data"
 msgstr "运行任务以优化仓库数据"
 
-#: command-list.h
+#: command-list.h:129
 msgid "Join two or more development histories together"
 msgstr "合并两个或更多开发历史"
 
-#: command-list.h
+#: command-list.h:130
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "为了合并查找尽可能好的公共祖先提交"
 
-#: command-list.h
+#: command-list.h:131
 msgid "Run a three-way file merge"
 msgstr "运行一个三路文件合并"
 
-#: command-list.h
+#: command-list.h:132
 msgid "Run a merge for files needing merging"
 msgstr "对于需要合并的文件执行合并"
 
-#: command-list.h
+#: command-list.h:133
 msgid "The standard helper program to use with git-merge-index"
 msgstr "与 git-merge-index 一起使用的标准向导程序"
 
-#: command-list.h
+#: command-list.h:134
 msgid "Perform merge without touching index or working tree"
 msgstr "在不触碰索引或工作树情况下应用合并"
 
-#: command-list.h
+#: command-list.h:135
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "运行合并冲突解决工具以解决合并冲突"
 
-#: command-list.h
+#: command-list.h:136
 msgid "Creates a tag object with extra validation"
 msgstr "创建一个有额外验证的标签对象"
 
-#: command-list.h
+#: command-list.h:137
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "基于 ls-tree 的格式化文本创建一个树对象"
 
-#: command-list.h
+#: command-list.h:138
 msgid "Write and verify multi-pack-indexes"
 msgstr "写入和校验多包索引"
 
-#: command-list.h
+#: command-list.h:139
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "移动或重命名一个文件、目录或符号链接"
 
 # 查找给定版本的符号名称
-#: command-list.h
+#: command-list.h:140
 msgid "Find symbolic names for given revs"
 msgstr "查找给定版本的符号名称"
 
-#: command-list.h
+#: command-list.h:141
 msgid "Add or inspect object notes"
 msgstr "添加或检查对象注释"
 
-#: command-list.h
+#: command-list.h:142
 msgid "Import from and submit to Perforce repositories"
 msgstr "导入和提交到 Perforce 仓库中"
 
-#: command-list.h
+#: command-list.h:143
 msgid "Create a packed archive of objects"
 msgstr "创建对象的存档包"
 
-#: command-list.h
+#: command-list.h:144
 msgid "Find redundant pack files"
 msgstr "查找冗余的包文件"
 
-#: command-list.h
+#: command-list.h:145
 msgid "Pack heads and tags for efficient repository access"
 msgstr "打包头和标签以实现高效的仓库访问"
 
-#: command-list.h
+#: command-list.h:146
 msgid "Compute unique ID for a patch"
 msgstr "计算一个补丁的唯一 ID"
 
-#: command-list.h
+#: command-list.h:147
 msgid "Prune all unreachable objects from the object database"
 msgstr "删除对象库中所有不可达对象"
 
-#: command-list.h
+#: command-list.h:148
 msgid "Remove extra objects that are already in pack files"
 msgstr "删除已经在包文件中的多余对象"
 
-#: command-list.h
+#: command-list.h:149
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "获取并整合另外的仓库或一个本地分支"
 
-#: command-list.h
+#: command-list.h:150
 msgid "Update remote refs along with associated objects"
 msgstr "更新远程引用和相关的对象"
 
-#: command-list.h
+#: command-list.h:151
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "将一个 quilt 补丁集应用到当前分支。"
 
-#: command-list.h
+#: command-list.h:152
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "比较两个提交范围（如一个分支的两个版本）"
 
-#: command-list.h
+#: command-list.h:153
 msgid "Reads tree information into the index"
 msgstr "将树信息读取到索引"
 
-#: command-list.h
+#: command-list.h:154
 msgid "Reapply commits on top of another base tip"
 msgstr "在另一个分支上重新应用提交"
 
-#: command-list.h
+#: command-list.h:155
 msgid "Receive what is pushed into the repository"
 msgstr "接收推送到仓库中的对象"
 
-#: command-list.h
+#: command-list.h:156
 msgid "Manage reflog information"
 msgstr "管理 reflog 信息"
 
-#: command-list.h
+#: command-list.h:157
+msgid "Low-level access to refs"
+msgstr "对引用的低级访问"
+
+#: command-list.h:158
 msgid "Manage set of tracked repositories"
 msgstr "管理已跟踪仓库"
 
-#: command-list.h
+#: command-list.h:159
 msgid "Pack unpacked objects in a repository"
 msgstr "打包仓库中未打包对象"
 
-#: command-list.h
+#: command-list.h:160
 msgid "Create, list, delete refs to replace objects"
 msgstr "创建、列出、删除对象替换引用"
 
-#: command-list.h
+#: command-list.h:161
 msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too"
 msgstr "试验中：基于一个新基线重放提交，同样适用于纯仓库"
 
-#: command-list.h
+#: command-list.h:162
 msgid "Generates a summary of pending changes"
 msgstr "生成待定更改的摘要"
 
-#: command-list.h
+#: command-list.h:163
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "重用冲突合并的解决方案记录"
 
-#: command-list.h
+#: command-list.h:164
 msgid "Reset current HEAD to the specified state"
 msgstr "重置当前 HEAD 到指定状态"
 
-#: command-list.h
+#: command-list.h:165
 msgid "Restore working tree files"
 msgstr "恢复工作区文件"
 
-#: command-list.h
+#: command-list.h:166
 msgid "Lists commit objects in reverse chronological order"
 msgstr "按时间顺序列出提交对象"
 
-#: command-list.h
+#: command-list.h:167
 msgid "Pick out and massage parameters"
 msgstr "选出并处理参数"
 
-#: command-list.h
+#: command-list.h:168
 msgid "Revert some existing commits"
 msgstr "回退一些现存提交"
 
-#: command-list.h
+#: command-list.h:169
 msgid "Remove files from the working tree and from the index"
 msgstr "从工作区和索引中删除文件"
 
-#: command-list.h
+#: command-list.h:170
 msgid "Send a collection of patches as emails"
 msgstr "通过电子邮件发送一组补丁"
 
-#: command-list.h
+#: command-list.h:171
 msgid "Push objects over Git protocol to another repository"
 msgstr "使用 Git 协议推送对象到另一个仓库"
 
-#: command-list.h
+#: command-list.h:172
 msgid "Git's i18n setup code for shell scripts"
 msgstr "为 shell 脚本准备的 Git 国际化设置代码"
 
-#: command-list.h
+#: command-list.h:173
 msgid "Common Git shell script setup code"
 msgstr "常用的 Git shell 脚本设置代码"
 
-#: command-list.h
+#: command-list.h:174
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "只允许 Git SSH 访问的受限登录shell"
 
-#: command-list.h
+#: command-list.h:175
 msgid "Summarize 'git log' output"
 msgstr "'git log' 输出摘要"
 
-#: command-list.h
+#: command-list.h:176
 msgid "Show various types of objects"
 msgstr "显示各种类型的对象"
 
-#: command-list.h
+#: command-list.h:177
 msgid "Show branches and their commits"
 msgstr "显示分支和提交"
 
-#: command-list.h
+#: command-list.h:178
 msgid "Show packed archive index"
 msgstr "显示打包归档索引"
 
-#: command-list.h
+#: command-list.h:179
 msgid "List references in a local repository"
 msgstr "显示本地仓库中的引用"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: command-list.h
+#: command-list.h:180
 msgid "Reduce your working tree to a subset of tracked files"
 msgstr "将您的工作树缩减至已追踪文件的子集"
 
-#: command-list.h
+#: command-list.h:181
 msgid "Add file contents to the staging area"
 msgstr "将文件内容添加到暂存区"
 
-#: command-list.h
+#: command-list.h:182
 msgid "Stash the changes in a dirty working directory away"
 msgstr "贮藏脏工作区中的修改"
 
-#: command-list.h
+#: command-list.h:183
 msgid "Show the working tree status"
 msgstr "显示工作区状态"
 
-#: command-list.h
+#: command-list.h:184
 msgid "Remove unnecessary whitespace"
 msgstr "删除不必要的空白字符"
 
-#: command-list.h
+#: command-list.h:185
 msgid "Initialize, update or inspect submodules"
 msgstr "初始化、更新或检查子模组"
 
-#: command-list.h
+#: command-list.h:186
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Subersion 仓库和 Git 之间的双向操作"
 
-#: command-list.h
+#: command-list.h:187
 msgid "Switch branches"
 msgstr "切换分支"
 
-#: command-list.h
+#: command-list.h:188
 msgid "Read, modify and delete symbolic refs"
 msgstr "读取、修改和删除符号引用"
 
-#: command-list.h
+#: command-list.h:189
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
 
-#: command-list.h
+#: command-list.h:190
 msgid "Creates a temporary file with a blob's contents"
 msgstr "用 blob 数据对象的内容创建一个临时文件"
 
-#: command-list.h
+#: command-list.h:191
 msgid "Unpack objects from a packed archive"
 msgstr "从打包文件中解压缩对象"
 
-#: command-list.h
+#: command-list.h:192
 msgid "Register file contents in the working tree to the index"
 msgstr "将工作区的文件内容注册到索引"
 
-#: command-list.h
+#: command-list.h:193
 msgid "Update the object name stored in a ref safely"
 msgstr "安全地更新存储于引用中的对象名称"
 
-#: command-list.h
+#: command-list.h:194
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "更新辅助信息文件以帮助哑协议服务"
 
-#: command-list.h
+#: command-list.h:195
 msgid "Send archive back to git-archive"
 msgstr "将存档发送回 git-archive"
 
-#: command-list.h
+#: command-list.h:196
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "将对象压缩包发送回 git-fetch-pack"
 
-#: command-list.h
+#: command-list.h:197
 msgid "Show a Git logical variable"
 msgstr "显示一个Git逻辑变量"
 
-#: command-list.h
+#: command-list.h:198
 msgid "Check the GPG signature of commits"
 msgstr "检查 GPG 提交签名"
 
-#: command-list.h
+#: command-list.h:199
 msgid "Validate packed Git archive files"
 msgstr "校验打包的Git存仓文件"
 
-#: command-list.h
+#: command-list.h:200
 msgid "Check the GPG signature of tags"
 msgstr "检查标签的 GPG 签名"
 
-#: command-list.h
+#: command-list.h:201
 msgid "Display version information about Git"
 msgstr "显示关于 Git 的版本信息"
 
-#: command-list.h
+#: command-list.h:202
 msgid "Show logs with differences each commit introduces"
 msgstr "显示每一个提交引入的差异日志"
 
-#: command-list.h
+#: command-list.h:203
 msgid "Manage multiple working trees"
 msgstr "管理多个工作区"
 
-#: command-list.h
+#: command-list.h:204
 msgid "Create a tree object from the current index"
 msgstr "从当前索引创建一个树对象"
 
-#: command-list.h
+#: command-list.h:205
 msgid "Defining attributes per path"
 msgstr "定义路径的属性"
 
-#: command-list.h
+#: command-list.h:206
 msgid "Git command-line interface and conventions"
 msgstr "Git 命令行界面和约定"
 
-#: command-list.h
+#: command-list.h:207
 msgid "A Git core tutorial for developers"
 msgstr "面向开发人员的 Git 核心教程"
 
-#: command-list.h
+#: command-list.h:208
 msgid "Providing usernames and passwords to Git"
 msgstr "为 Git 提供用户名和口令"
 
-#: command-list.h
+#: command-list.h:209
 msgid "Git for CVS users"
 msgstr "适合 CVS 用户的 Git 帮助"
 
-#: command-list.h
+#: command-list.h:210
 msgid "Tweaking diff output"
 msgstr "调整差异输出"
 
-#: command-list.h
+#: command-list.h:211
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "每一天 Git 的一组有用的最小命令集合"
 
-#: command-list.h
+#: command-list.h:212
 msgid "Frequently asked questions about using Git"
 msgstr "关于使用 Git 的常见问题"
 
-#: command-list.h
+#: command-list.h:213
 msgid "The bundle file format"
 msgstr "归档包文件格式"
 
-#: command-list.h
+#: command-list.h:214
 msgid "Chunk-based file formats"
 msgstr "块式文件格式"
 
-#: command-list.h
+#: command-list.h:215
 msgid "Git commit-graph format"
 msgstr "Git 提交图格式"
 
-#: command-list.h
+#: command-list.h:216
 msgid "Git index format"
 msgstr "Git 索引格式"
 
-#: command-list.h
+#: command-list.h:217
 msgid "Git pack format"
 msgstr "Git 包格式"
 
-#: command-list.h
+#: command-list.h:218
 msgid "Git cryptographic signature formats"
 msgstr "Git 密码学签名格式"
 
-#: command-list.h
+#: command-list.h:219
 msgid "A Git Glossary"
 msgstr "Git 词汇表"
 
-#: command-list.h
+#: command-list.h:220
 msgid "Hooks used by Git"
 msgstr "Git 使用的钩子"
 
-#: command-list.h
+#: command-list.h:221
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "指定故意忽略的未跟踪文件"
 
-#: command-list.h
+#: command-list.h:222
 msgid "The Git repository browser"
 msgstr "Git 仓库浏览器"
 
-#: command-list.h
+#: command-list.h:223
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "映射作者/提交者的名称和/或邮件地址"
 
-#: command-list.h
+#: command-list.h:224
 msgid "Defining submodule properties"
 msgstr "定义子模组属性"
 
-#: command-list.h
+#: command-list.h:225
 msgid "Git namespaces"
 msgstr "Git 名字空间"
 
-#: command-list.h
+#: command-list.h:226
 msgid "Protocol v0 and v1 capabilities"
 msgstr "协议 v0 和 v1 能力"
 
-#: command-list.h
+#: command-list.h:227
 msgid "Things common to various protocols"
 msgstr "不同协议的共同部分"
 
-#: command-list.h
+#: command-list.h:228
 msgid "Git HTTP-based protocols"
 msgstr "Git 基于 HTTP 的协议"
 
-#: command-list.h
+#: command-list.h:229
 msgid "How packs are transferred over-the-wire"
 msgstr "包在线路中传输的方式"
 
-#: command-list.h
+#: command-list.h:230
 msgid "Git Wire Protocol, Version 2"
 msgstr "Git 传输协议，第二版"
 
-#: command-list.h
+#: command-list.h:231
 msgid "Helper programs to interact with remote repositories"
 msgstr "与远程仓库交互的助手程序"
 
-#: command-list.h
+#: command-list.h:232
 msgid "Git Repository Layout"
 msgstr "Git 仓库布局"
 
-#: command-list.h
+#: command-list.h:233
 msgid "Specifying revisions and ranges for Git"
 msgstr "指定 Git 的版本和版本范围"
 
-#: command-list.h
+#: command-list.h:234
 msgid "Mounting one repository inside another"
 msgstr "将一个仓库安装到另外一个仓库中"
 
-#: command-list.h
+#: command-list.h:235
 msgid "A tutorial introduction to Git"
 msgstr "Git 入门教程"
 
-#: command-list.h
+#: command-list.h:236
 msgid "A tutorial introduction to Git: part two"
 msgstr "Git 入门教程：第二部分"
 
-#: command-list.h
+#: command-list.h:237
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Git web 界面（Git 仓库的 web 前端）"
 
-#: command-list.h
+#: command-list.h:238
 msgid "An overview of recommended workflows with Git"
 msgstr "Git 推荐的工作流概览"
 
-#: command-list.h
+#: command-list.h:239
 msgid "A tool for managing large Git repositories"
 msgstr "一个管理大型 Git 仓库的工具"
 
-#: commit-graph.c
+#: commit-graph.c:263
 msgid "commit-graph file is too small"
 msgstr "提交图文件太小"
 
-#: commit-graph.c
+#: commit-graph.c:286
 msgid "commit-graph oid fanout chunk is wrong size"
 msgstr "提交图中对象 ID 的扇出块大小错误"
 
-#: commit-graph.c
+#: commit-graph.c:295
 msgid "commit-graph fanout values out of order"
 msgstr "提交图的扇出值失序"
 
-#: commit-graph.c
+#: commit-graph.c:309
 msgid "commit-graph OID lookup chunk is the wrong size"
 msgstr "提交图的对象 ID 查询块大小错误"
 
-#: commit-graph.c
+#: commit-graph.c:318
 msgid "commit-graph commit data chunk is wrong size"
 msgstr "提交图的提交数据块大小错误"
 
-#: commit-graph.c
+#: commit-graph.c:328
 msgid "commit-graph generations chunk is wrong size"
 msgstr "提交图的世代块大小错误"
 
-#: commit-graph.c
+#: commit-graph.c:338
 msgid "commit-graph changed-path index chunk is too small"
 msgstr "提交图的变更路径的索引块太小"
 
-#: commit-graph.c
+#: commit-graph.c:351
 #, c-format
 msgid ""
 "ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-"
 "graph file"
 msgstr "忽略提交图文件中过小的更改路径块（%<PRIuMAX> < %<PRIuMAX>）"
 
-#: commit-graph.c
+#: commit-graph.c:389
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "提交图签名 %X 和签名 %X 不匹配"
 
-#: commit-graph.c
+#: commit-graph.c:396
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "提交图版本 %X 和版本 %X 不匹配"
 
-#: commit-graph.c
+#: commit-graph.c:403
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "提交图哈希版本 %X 和版本 %X 不匹配"
 
-#: commit-graph.c
+#: commit-graph.c:418
 #, c-format
 msgid "commit-graph file is too small to hold %u chunks"
 msgstr "提交图文件太小，容不下 %u 个块"
 
-#: commit-graph.c
+#: commit-graph.c:431
 msgid "commit-graph required OID fanout chunk missing or corrupted"
 msgstr "提交图所需的对象 ID 扇出块缺失或损坏"
 
-#: commit-graph.c
+#: commit-graph.c:435
 msgid "commit-graph required OID lookup chunk missing or corrupted"
 msgstr "提交图所需的对象 ID 查询块缺失或损坏"
 
-#: commit-graph.c
+#: commit-graph.c:439
 msgid "commit-graph required commit data chunk missing or corrupted"
 msgstr "提交图所需的提交数据块缺失或损坏"
 
-#: commit-graph.c
+#: commit-graph.c:562
+#, c-format
+msgid ""
+"disabling Bloom filters for commit-graph layer '%s' due to incompatible "
+"settings"
+msgstr "由于不兼容的设置，正在禁用提交图层 '%s' 的布隆过滤器"
+
+#: commit-graph.c:577
 msgid "commit-graph has no base graphs chunk"
 msgstr "提交图没有基础图形块"
 
-#: commit-graph.c
+#: commit-graph.c:582
 msgid "commit-graph base graphs chunk is too small"
 msgstr "提交图的基础图形块过小"
 
-#: commit-graph.c
+#: commit-graph.c:593
 msgid "commit-graph chain does not match"
 msgstr "提交图链不匹配"
 
-#: commit-graph.c
+#: commit-graph.c:603
 #, c-format
 msgid "commit count in base graph too high: %<PRIuMAX>"
 msgstr "基础图形中的提交数量过高：%<PRIuMAX>"
 
-#: commit-graph.c
+#: commit-graph.c:631
 msgid "commit-graph chain file too small"
 msgstr "提交图链文件太小"
 
-#: commit-graph.c
+#: commit-graph.c:661
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "无效的提交图链：行 '%s' 不是一个哈希值"
 
-#: commit-graph.c
+#: commit-graph.c:687
 msgid "unable to find all commit-graph files"
 msgstr "无法找到所有提交图文件"
 
-#: commit-graph.c
+#: commit-graph.c:862 commit-graph.c:900
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "无效的提交位置。提交图可能已损坏"
 
-#: commit-graph.c
+#: commit-graph.c:884
 #, c-format
 msgid "could not find commit %s"
 msgstr "无法找到提交 %s"
 
-#: commit-graph.c
+#: commit-graph.c:917
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "提交图需要溢出世代数据，但是没有"
 
-#: commit-graph.c
+#: commit-graph.c:921
 msgid "commit-graph overflow generation data is too small"
 msgstr "提交图溢出世代数据过小"
 
-#: commit-graph.c
+#: commit-graph.c:978
 msgid "commit-graph extra-edges pointer out of bounds"
 msgstr "提交图额外边的指针越界"
 
-#: commit-graph.c
+#: commit-graph.c:1536
 msgid "Loading known commits in commit graph"
 msgstr "正在加载提交图中的已知提交"
 
-#: commit-graph.c
+#: commit-graph.c:1553
 msgid "Expanding reachable commits in commit graph"
 msgstr "正在扩展提交图中的可达提交"
 
-#: commit-graph.c
+#: commit-graph.c:1573
 msgid "Clearing commit marks in commit graph"
 msgstr "正在清除提交图中的提交标记"
 
-#: commit-graph.c
+#: commit-graph.c:1690
 msgid "Computing commit graph topological levels"
 msgstr "正在计算提交图拓扑级别"
 
-#: commit-graph.c
+#: commit-graph.c:1724
 msgid "Computing commit graph generation numbers"
 msgstr "正在计算提交图世代数字"
 
-#: commit-graph.c
+#: commit-graph.c:1800
 msgid "Computing commit changed paths Bloom filters"
 msgstr "计算提交变更路径的布隆过滤器"
 
-#: commit-graph.c
+#: commit-graph.c:1878
 msgid "Collecting referenced commits"
 msgstr "正在收集引用的提交"
 
-#: commit-graph.c
+#: commit-graph.c:1905
 #, c-format
 msgid "Finding commits for commit graph in %<PRIuMAX> pack"
 msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
 msgstr[0] "正在 %<PRIuMAX> 个包中查找提交图的提交"
 msgstr[1] "正在 %<PRIuMAX> 个包中查找提交图的提交"
 
-#: commit-graph.c
+#: commit-graph.c:1918
 #, c-format
 msgid "error adding pack %s"
 msgstr "添加包 %s 出错"
 
-#: commit-graph.c
+#: commit-graph.c:1922
 #, c-format
 msgid "error opening index for %s"
 msgstr "为 %s 打开索引出错"
 
-#: commit-graph.c
+#: commit-graph.c:1960
 msgid "Finding commits for commit graph among packed objects"
 msgstr "正在打包对象中查找提交图的提交"
 
-#: commit-graph.c
+#: commit-graph.c:1978
 msgid "Finding extra edges in commit graph"
 msgstr "正在查找提交图中额外的边"
 
-#: commit-graph.c
+#: commit-graph.c:2027
 msgid "failed to write correct number of base graph ids"
 msgstr "无法写入正确数量的基础图形 ID"
 
-#: commit-graph.c
+#: commit-graph.c:2072
 msgid "unable to create temporary graph layer"
 msgstr "无法创建临时图层"
 
-#: commit-graph.c
+#: commit-graph.c:2077
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "无法为 '%s' 调整共享权限"
 
-#: commit-graph.c
+#: commit-graph.c:2133
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "正在用 %d 步写出提交图"
 msgstr[1] "正在用 %d 步写出提交图"
 
-#: commit-graph.c
+#: commit-graph.c:2168
 msgid "unable to open commit-graph chain file"
 msgstr "无法打开提交图链文件"
 
-#: commit-graph.c
+#: commit-graph.c:2184
 msgid "failed to rename base commit-graph file"
 msgstr "无法重命名基础提交图文件"
 
-#: commit-graph.c
+#: commit-graph.c:2207
 msgid "failed to rename temporary commit-graph file"
 msgstr "无法重命名临时提交图文件"
 
-#: commit-graph.c
+#: commit-graph.c:2251
 #, c-format
 msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
 msgstr ""
 "无法合并提交图，总共已累加提交数：%<PRIuMAX>，当前待累加提交数：%<PRIuMAX>"
 
-#: commit-graph.c
+#: commit-graph.c:2313
 #, c-format
 msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
 msgstr "无法合并提交图 %s, 提交过多：%<PRIuMAX>"
 
-#: commit-graph.c
+#: commit-graph.c:2350
 msgid "Scanning merged commits"
 msgstr "正在扫描合并提交"
 
-#: commit-graph.c
+#: commit-graph.c:2394
 msgid "Merging commit-graph"
 msgstr "正在合并提交图"
 
-#: commit-graph.c
+#: commit-graph.c:2506
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
 
-#: commit-graph.c
+#: commit-graph.c:2513
+#, c-format
+msgid ""
+"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' "
+"(%d) is not supported"
+msgstr "尝试写入提交图，但不支持 'commitGraph.changedPathsVersion' (%d)"
+
+#: commit-graph.c:2630
 msgid "too many commits to write graph"
 msgstr "提交太多不能画图"
 
-#: commit-graph.c
+#: commit-graph.c:2719
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "提交图文件的校验码错误，可能已经损坏"
 
-#: commit-graph.c
+#: commit-graph.c:2730
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "提交图的对象 ID 顺序不正确：%s 然后 %s"
 
-#: commit-graph.c
+#: commit-graph.c:2740 commit-graph.c:2755
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "提交图有不正确的扇出值：fanout[%d] = %u != %u"
 
-#: commit-graph.c
+#: commit-graph.c:2747
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "无法从提交图中解析提交 %s"
 
-#: commit-graph.c
+#: commit-graph.c:2777
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr "无法从提交图的对象库中解析提交 %s"
 
-#: commit-graph.c
+#: commit-graph.c:2784
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr "提交图中的提交 %s 的根树对象 ID 是 %s != %s"
 
-#: commit-graph.c
+#: commit-graph.c:2794
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "提交 %s 的提交图父提交列表太长了"
 
-#: commit-graph.c
+#: commit-graph.c:2803
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "%s 的提交图父提交是 %s != %s"
 
-#: commit-graph.c
+#: commit-graph.c:2817
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "提交 %s 的提交图父提交列表过早终止"
 
-#: commit-graph.c
+#: commit-graph.c:2839
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr "提交图中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
 
-#: commit-graph.c
+#: commit-graph.c:2845
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr "提交图中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
 
-#: commit-graph.c
+#: commit-graph.c:2852
 #, c-format
 msgid ""
 "commit-graph has both zero and non-zero generations (e.g., commits '%s' and "
 "'%s')"
 msgstr "提交图具有零和非零的世代（例如：提交 '%s' 和 '%s'）"
 
-#: commit-graph.c
+#: commit-graph.c:2876
 msgid "Verifying commits in commit graph"
 msgstr "正在校验提交图中的提交"
 
-#: commit-reach.c sequencer.c
+#: commit-reach.c:123 commit-reach.c:157 commit-reach.c:163 sequencer.c:1777
+#: sequencer.c:5330
 #, c-format
 msgid "could not parse commit %s"
 msgstr "不能解析提交 %s"
 
-#: commit.c
+#: commit.c:64
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s 不是一个提交！"
 
-#: commit.c
+#: commit.c:266
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -18257,32 +18588,32 @@ msgstr ""
 "设置 \"git config advice.graftFileDeprecated false\"\n"
 "可关闭本消息"
 
-#: commit.c
+#: commit.c:586
 #, c-format
 msgid "commit %s exists in commit-graph but not in the object database"
 msgstr "提交 %s 存在于提交图中，但不存在于对象数据库中"
 
-#: commit.c
+#: commit.c:1348
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
 
-#: commit.c
+#: commit.c:1352
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
 
-#: commit.c
+#: commit.c:1355
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "提交 %s 没有 GPG 签名。"
 
-#: commit.c
+#: commit.c:1358
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
 
-#: commit.c
+#: commit.c:1646
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -18292,260 +18623,261 @@ msgstr ""
 "您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitEncoding\n"
 "设置为您项目所用的字符编码。\n"
 
-#: compat/compiler.h
+#: compat/compiler.h:25
 msgid "no compiler information available\n"
 msgstr "编译器信息不可用\n"
 
-#: compat/compiler.h
+#: compat/compiler.h:37
 msgid "no libc information available\n"
 msgstr "libc 信息不可用\n"
 
-#: compat/disk.h
+#: compat/disk.h:19 compat/disk.h:41
 #, c-format
 msgid "could not determine free disk size for '%s'"
 msgstr "不能确定 '%s' 的空余磁盘空间"
 
-#: compat/disk.h
+#: compat/disk.h:29
 #, c-format
 msgid "could not get info for '%s'"
 msgstr "无法获得 '%s' 的信息"
 
-#: compat/fsmonitor/fsm-health-win32.c
+#: compat/fsmonitor/fsm-health-win32.c:58
 #, c-format
 msgid "[GLE %ld] health thread could not open '%ls'"
 msgstr "[GLE %ld] 健康监测线程不能打开 '%ls'"
 
-#: compat/fsmonitor/fsm-health-win32.c
+#: compat/fsmonitor/fsm-health-win32.c:64
 #, c-format
 msgid "[GLE %ld] health thread getting BHFI for '%ls'"
 msgstr "[GLE %ld] 健康监测线程正在获取 '%ls' 的 BHFI"
 
-#: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c
+#: compat/fsmonitor/fsm-health-win32.c:148
+#: compat/fsmonitor/fsm-listen-win32.c:305
 #, c-format
 msgid "could not convert to wide characters: '%s'"
 msgstr "不能转换至宽字符：'%s'"
 
-#: compat/fsmonitor/fsm-health-win32.c
+#: compat/fsmonitor/fsm-health-win32.c:164
 #, c-format
 msgid "BHFI changed '%ls'"
 msgstr "BHFI 已改变 '%ls'"
 
-#: compat/fsmonitor/fsm-health-win32.c
+#: compat/fsmonitor/fsm-health-win32.c:170
 #, c-format
 msgid "unhandled case in 'has_worktree_moved': %d"
 msgstr "'has_worktree_moved' 中未处理的情况：%d"
 
-#: compat/fsmonitor/fsm-health-win32.c
+#: compat/fsmonitor/fsm-health-win32.c:263
 #, c-format
 msgid "health thread wait failed [GLE %ld]"
 msgstr "健康监测线程等待失败 [GLE %ld]"
 
-#: compat/fsmonitor/fsm-ipc-darwin.c
+#: compat/fsmonitor/fsm-ipc-darwin.c:53
 #, c-format
 msgid "Invalid path: %s"
 msgstr "无效路径： %s"
 
-#: compat/fsmonitor/fsm-listen-darwin.c
+#: compat/fsmonitor/fsm-listen-darwin.c:457
 msgid "Unable to create FSEventStream."
 msgstr "无法创建 FSEventStream。"
 
-#: compat/fsmonitor/fsm-listen-darwin.c
+#: compat/fsmonitor/fsm-listen-darwin.c:514
 msgid "Failed to start the FSEventStream"
 msgstr "无法启动 FSEventStream"
 
-#: compat/fsmonitor/fsm-listen-win32.c
+#: compat/fsmonitor/fsm-listen-win32.c:107
 #, c-format
 msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"
 msgstr "[GLE %ld] 无法将路径转换至 UTF-8：'%.*ls'"
 
-#: compat/fsmonitor/fsm-listen-win32.c
+#: compat/fsmonitor/fsm-listen-win32.c:314
 #, c-format
 msgid "[GLE %ld] could not watch '%s'"
 msgstr "[GLE %ld] 无法监视 '%s'"
 
-#: compat/fsmonitor/fsm-listen-win32.c
+#: compat/fsmonitor/fsm-listen-win32.c:322
 #, c-format
 msgid "[GLE %ld] could not get longname of '%s'"
 msgstr "[GLE %ld] 无法获取 '%s' 的长名称"
 
-#: compat/fsmonitor/fsm-listen-win32.c
+#: compat/fsmonitor/fsm-listen-win32.c:393
 #, c-format
 msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
 msgstr "ReadDirectoryChangedW 失败于 '%s' [GLE %ld]"
 
-#: compat/fsmonitor/fsm-listen-win32.c
+#: compat/fsmonitor/fsm-listen-win32.c:446
 #, c-format
 msgid "GetOverlappedResult failed on '%s' [GLE %ld]"
 msgstr "GetOverlappedResult 失败于 '%s' [GLE %ld]"
 
-#: compat/fsmonitor/fsm-listen-win32.c
+#: compat/fsmonitor/fsm-listen-win32.c:794
 #, c-format
 msgid "could not read directory changes [GLE %ld]"
 msgstr "无法获取目录变更 [GLE %ld]"
 
-#: compat/fsmonitor/fsm-path-utils-darwin.c
+#: compat/fsmonitor/fsm-path-utils-darwin.c:79
 #, c-format
 msgid "opendir('%s') failed"
 msgstr "opendir('%s') 失败"
 
-#: compat/fsmonitor/fsm-path-utils-darwin.c
+#: compat/fsmonitor/fsm-path-utils-darwin.c:88
 #, c-format
 msgid "lstat('%s') failed"
 msgstr "lstat('%s') 失败"
 
-#: compat/fsmonitor/fsm-path-utils-darwin.c
+#: compat/fsmonitor/fsm-path-utils-darwin.c:96
 #, c-format
 msgid "strbuf_readlink('%s') failed"
 msgstr "strbuf_readlink('%s') 失败"
 
-#: compat/fsmonitor/fsm-path-utils-darwin.c
+#: compat/fsmonitor/fsm-path-utils-darwin.c:117
 #, c-format
 msgid "closedir('%s') failed"
 msgstr "closedir('%s') 失败"
 
-#: compat/fsmonitor/fsm-path-utils-win32.c
+#: compat/fsmonitor/fsm-path-utils-win32.c:21
 #, c-format
 msgid "[GLE %ld] unable to open for read '%ls'"
 msgstr "[GLE %ld] 无法打开要读取的 '%ls'"
 
-#: compat/fsmonitor/fsm-path-utils-win32.c
+#: compat/fsmonitor/fsm-path-utils-win32.c:28
 #, c-format
 msgid "[GLE %ld] unable to get protocol information for '%ls'"
 msgstr "[GLE %ld] 无法获取 '%ls' 的协议信息 "
 
-#: compat/mingw.c
+#: compat/mingw.c:2689
 #, c-format
 msgid "failed to copy SID (%ld)"
 msgstr "无法拷贝 SID (%ld)"
 
-#: compat/mingw.c
+#: compat/mingw.c:2775
 #, c-format
 msgid "failed to get owner for '%s' (%ld)"
 msgstr "无法获取 '%s' 的所有者 (%ld)"
 
-#: compat/obstack.c
+#: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:139
 msgid "Success"
 msgstr "成功"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:142
 msgid "No match"
 msgstr "无匹配"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:145
 msgid "Invalid regular expression"
 msgstr "无效的正则表达式"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:148
 msgid "Invalid collation character"
 msgstr "无效的集合字符"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:151
 msgid "Invalid character class name"
 msgstr "无效的字符类名"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:154
 msgid "Trailing backslash"
 msgstr "末尾的反斜杠"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:157
 msgid "Invalid back reference"
 msgstr "无效的反向索引"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:160
 msgid "Unmatched [ or [^"
 msgstr "未匹配的 [ 或 [^"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:163
 msgid "Unmatched ( or \\("
 msgstr "未匹配的 ( 或 \\("
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:166
 msgid "Unmatched \\{"
 msgstr "未匹配的 \\{"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:169
 msgid "Invalid content of \\{\\}"
 msgstr "\\{\\} 的内容非法"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:172
 msgid "Invalid range end"
 msgstr "无效的范围结尾"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:175
 msgid "Memory exhausted"
 msgstr "内存耗尽"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:178
 msgid "Invalid preceding regular expression"
 msgstr "非法的前置正则表达式"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:181
 msgid "Premature end of regular expression"
 msgstr "正则表达式过早结束"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:184
 msgid "Regular expression too big"
 msgstr "正则表达式太大"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:187
 msgid "Unmatched ) or \\)"
 msgstr "未匹配的 ) 或 \\)"
 
-#: compat/regex/regcomp.c
+#: compat/regex/regcomp.c:698
 msgid "No previous regular expression"
 msgstr "没有上一个正则表达式"
 
-#: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c
+#: compat/simple-ipc/ipc-unix-socket.c:206 compat/simple-ipc/ipc-win32.c:252
 msgid "could not send IPC command"
 msgstr "无法发送 IPC 命令"
 
-#: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c
+#: compat/simple-ipc/ipc-unix-socket.c:213 compat/simple-ipc/ipc-win32.c:261
 msgid "could not read IPC response"
 msgstr "无法读取 IPC 响应"
 
-#: compat/simple-ipc/ipc-unix-socket.c
+#: compat/simple-ipc/ipc-unix-socket.c:893
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr "无法启动 accept_thread '%s'"
 
-#: compat/simple-ipc/ipc-unix-socket.c
+#: compat/simple-ipc/ipc-unix-socket.c:905
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "无法启动 '%s' 的 worker[0]"
 
-#: compat/simple-ipc/ipc-win32.c
+#: compat/simple-ipc/ipc-win32.c:404
 #, c-format
 msgid "ConnectNamedPipe failed for '%s' (%lu)"
 msgstr "ConnectNamedPipe 失败于 '%s' (%lu)"
 
-#: compat/simple-ipc/ipc-win32.c
+#: compat/simple-ipc/ipc-win32.c:485
 #, c-format
 msgid "could not create fd from pipe for '%s'"
 msgstr "无法为 '%s' 从管道创建 fd"
 
-#: compat/simple-ipc/ipc-win32.c
+#: compat/simple-ipc/ipc-win32.c:824
 #, c-format
 msgid "could not start thread[0] for '%s'"
 msgstr "无法为 '%s' 启动 thread[0]"
 
-#: compat/simple-ipc/ipc-win32.c
+#: compat/simple-ipc/ipc-win32.c:865
 #, c-format
 msgid "wait for hEvent failed for '%s'"
 msgstr "为 '%s' 等待 hEvent 失败"
 
-#: compat/terminal.c
+#: compat/terminal.c:168
 msgid "cannot resume in the background, please use 'fg' to resume"
 msgstr "无法从后台中恢复，请使用 'fg' 来恢复"
 
-#: compat/terminal.c
+#: compat/terminal.c:169
 msgid "cannot restore terminal settings"
 msgstr "无法恢复终端设置"
 
-#: config.c
+#: config.c:146
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -18560,20 +18892,20 @@ msgstr ""
 "\t%2$s\n"
 "这可能是因为循环包含。"
 
-#: config.c
+#: config.c:164
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "无法扩展包含路径 '%s'"
 
-#: config.c
+#: config.c:175
 msgid "relative config includes must come from files"
 msgstr "相对路径的配置文件引用必须来自于文件"
 
-#: config.c
+#: config.c:226
 msgid "relative config include conditionals must come from files"
 msgstr "相对路径的配置文件条件引用必须来自于文件"
 
-#: config.c
+#: config.c:365
 msgid ""
 "remote URLs cannot be configured in file directly or indirectly included by "
 "includeIf.hasconfig:remote.*.url"
@@ -18581,344 +18913,344 @@ msgstr ""
 "远程 URL 不能在文件中配置，不管直接地还是通过 includeIf.hasconfig:remote.*."
 "url 间接地包含。"
 
-#: config.c
+#: config.c:512
 #, c-format
 msgid "invalid config format: %s"
 msgstr "无效的配置格式：%s"
 
-#: config.c
+#: config.c:516
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
 msgstr "配置 '%.*s' 缺少环境变量名称"
 
-#: config.c
+#: config.c:521
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
 msgstr "缺少环境变量 '%s' 于配置 '%.*s' "
 
-#: config.c
+#: config.c:557
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "键名没有包含一个小节名称：%s"
 
-#: config.c
+#: config.c:562
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr "键名没有包含变量名：%s"
 
-#: config.c sequencer.c
+#: config.c:584 sequencer.c:3098
 #, c-format
 msgid "invalid key: %s"
 msgstr "无效键名：%s"
 
-#: config.c
+#: config.c:589
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "无效键名（有换行符）：%s"
 
-#: config.c
+#: config.c:613
 msgid "empty config key"
 msgstr "空的配置键名"
 
-#: config.c
+#: config.c:645 config.c:657
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "伪配置参数：%s"
 
-#: config.c
+#: config.c:672 config.c:689 config.c:696 config.c:705
 #, c-format
 msgid "bogus format in %s"
 msgstr "%s 中格式错误"
 
-#: config.c
+#: config.c:735
 #, c-format
 msgid "bogus count in %s"
 msgstr "%s 中错误计数"
 
-#: config.c
+#: config.c:739
 #, c-format
 msgid "too many entries in %s"
 msgstr "%s 中太多的条目"
 
-#: config.c
+#: config.c:749
 #, c-format
 msgid "missing config key %s"
 msgstr "缺失配置键名 %s"
 
-#: config.c
+#: config.c:757
 #, c-format
 msgid "missing config value %s"
 msgstr "缺失配置取值 %s"
 
-#: config.c
+#: config.c:1131
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
 
-#: config.c
+#: config.c:1135
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "文件 %2$s 中错误的配置行 %1$d"
 
-#: config.c
+#: config.c:1139
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "标准输入中错误的配置行 %d"
 
-#: config.c
+#: config.c:1143
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
 
-#: config.c
+#: config.c:1147
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "命令行 %2$s 中错误的配置行 %1$d"
 
-#: config.c
+#: config.c:1151
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "在 %2$s 中错误的配置行 %1$d"
 
-#: config.c
+#: config.c:1180
 msgid "out of range"
 msgstr "超出范围"
 
-#: config.c
+#: config.c:1180
 msgid "invalid unit"
 msgstr "无效的单位"
 
-#: config.c
+#: config.c:1181
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
 
-#: config.c
+#: config.c:1194
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c
+#: config.c:1197
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c
+#: config.c:1200
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
 
-#: config.c
+#: config.c:1203
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c
+#: config.c:1206
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c
+#: config.c:1209
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c
+#: config.c:1301
 #, c-format
 msgid "invalid value for variable %s"
 msgstr "变量 %s 的值无效"
 
-#: config.c
+#: config.c:1322
 #, c-format
 msgid "ignoring unknown core.fsync component '%s'"
 msgstr "忽略未知的 core.fsync 组件 '%s'"
 
-#: config.c
+#: config.c:1349
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
 msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
 
-#: config.c
+#: config.c:1367
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "无法扩展用户目录：'%s'"
 
-#: config.c
+#: config.c:1376
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
 
-#: config.c
+#: config.c:1479
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "缩写长度超出范围：%d"
 
-#: config.c
+#: config.c:1493 config.c:1504
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "错误的 zlib 压缩级别 %d"
 
-#: config.c
+#: config.c:1598
 #, c-format
 msgid "%s cannot contain newline"
 msgstr "%s 不能包含换行符"
 
-#: config.c
+#: config.c:1602
 #, c-format
 msgid "%s must have at least one character"
 msgstr "%s 必须至少有一个字符"
 
-#: config.c
+#: config.c:1640
 #, c-format
 msgid "ignoring unknown core.fsyncMethod value '%s'"
 msgstr "忽略未知的 core.fsyncMethod 值 '%s'"
 
-#: config.c
+#: config.c:1646
 msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
 msgstr "core.fsyncObjectFiles 已经被弃用；取而代之使用 core.fsync"
 
-#: config.c
+#: config.c:1664
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "无效的对象创建模式：%s"
 
-#: config.c
+#: config.c:1757
 #, c-format
 msgid "malformed value for %s"
 msgstr "%s 的取值格式错误"
 
-#: config.c
+#: config.c:1783
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "%s 的取值格式错误：%s"
 
-#: config.c
+#: config.c:1784
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
 
-#: config.c
+#: config.c:2000
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "无法从数据对象 '%s' 加载配置"
 
-#: config.c
+#: config.c:2003
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "引用 '%s' 没有指向一个数据对象"
 
-#: config.c
+#: config.c:2022
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "不能解析配置对象 '%s'"
 
-#: config.c
+#: config.c:2132
 msgid "unable to parse command-line config"
 msgstr "无法解析命令行中的配置"
 
-#: config.c
+#: config.c:2557
 msgid "unknown error occurred while reading the configuration files"
 msgstr "在读取配置文件时遇到未知错误"
 
-#: config.c
+#: config.c:2777
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "无效 %s：'%s'"
 
-#: config.c
+#: config.c:2822
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
 
-#: config.c
+#: config.c:2854
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "无法解析命令行配置中的 '%s'"
 
-#: config.c
+#: config.c:2856
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
 
-#: config.c
+#: config.c:2942
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "无效的小节名称 '%s'"
 
-#: config.c
+#: config.c:2975
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s 有多个取值"
 
-#: config.c
+#: config.c:3004
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "无法写入新的配置文件 %s"
 
-#: config.c
+#: config.c:3228
 #, c-format
 msgid "no multi-line comment allowed: '%s'"
 msgstr "不允许多行注释：'%s'"
 
-#: config.c
+#: config.c:3328 config.c:3673
 #, c-format
 msgid "could not lock config file %s"
 msgstr "不能锁定配置文件 %s"
 
-#: config.c
+#: config.c:3339
 #, c-format
 msgid "opening %s"
 msgstr "打开 %s"
 
-#: config.c
+#: config.c:3402
 #, c-format
 msgid "invalid config file %s"
 msgstr "无效的配置文件 %s"
 
-#: config.c
+#: config.c:3415 config.c:3686
 #, c-format
 msgid "fstat on %s failed"
 msgstr "对 %s 调用 fstat 失败"
 
-#: config.c
+#: config.c:3426
 #, c-format
 msgid "unable to mmap '%s'%s"
 msgstr "不能 mmap '%s'%s"
 
-#: config.c
+#: config.c:3436 config.c:3691
 #, c-format
 msgid "chmod on %s failed"
 msgstr "对 %s 调用 chmod 失败"
 
-#: config.c
+#: config.c:3521 config.c:3798
 #, c-format
 msgid "could not write config file %s"
 msgstr "不能写入配置文件 %s"
 
-#: config.c
+#: config.c:3554
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "不能设置 '%s' 为 '%s'"
 
-#: config.c
+#: config.c:3664
 #, c-format
 msgid "invalid section name: %s"
 msgstr "无效的小节名称：%s"
 
-#: config.c
+#: config.c:3704
 #, c-format
 msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>"
 msgstr "拒绝支持内容过长的行，位于文件 '%s' 中的第 %<PRIuMAX> 行"
 
-#: config.c
+#: config.c:3843
 #, c-format
 msgid "missing value for '%s'"
 msgstr "%s 的取值缺失"
 
-#: connect.c
+#: connect.c:67
 msgid "the remote end hung up upon initial contact"
 msgstr "远端在初始连接时即挂断"
 
-#: connect.c
+#: connect.c:69
 msgid ""
 "Could not read from remote repository.\n"
 "\n"
@@ -18929,95 +19261,95 @@ msgstr ""
 "\n"
 "请确认您有正确的访问权限并且仓库存在。"
 
-#: connect.c
+#: connect.c:91
 #, c-format
 msgid "server doesn't support '%s'"
 msgstr "服务器不支持 '%s'"
 
-#: connect.c
+#: connect.c:126
 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr "服务器不支持特性 '%s'"
 
-#: connect.c
+#: connect.c:137
 msgid "expected flush after capabilities"
 msgstr "在能力之后应为一个 flush 包"
 
-#: connect.c
+#: connect.c:274
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "忽略第一行 '%s' 之后的能力字段"
 
-#: connect.c
+#: connect.c:295
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "协议错误：意外的 capabilities^{}"
 
-#: connect.c
+#: connect.c:317
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'"
 
-#: connect.c
+#: connect.c:319
 msgid "repository on the other end cannot be shallow"
 msgstr "另一端的仓库不能是浅克隆仓库"
 
-#: connect.c
+#: connect.c:358
 msgid "invalid packet"
 msgstr "无效数据包"
 
-#: connect.c
+#: connect.c:378
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "协议错误：意外的 '%s'"
 
-#: connect.c
+#: connect.c:495
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "服务器给出未知的对象格式 '%s'"
 
-#: connect.c
+#: connect.c:528
 #, c-format
 msgid "error on bundle-uri response line %d: %s"
 msgstr "于 bundle-uri 响应行 %d 发生错误：%s"
 
-#: connect.c
+#: connect.c:533
 msgid "expected flush after bundle-uri listing"
 msgstr "在 bundle-uri 列表之后应该有一个 flush 包"
 
-#: connect.c
+#: connect.c:541 connect.c:595
 msgid "expected response end packet after ref listing"
 msgstr "在引用列表之后应该有响应结束包"
 
-#: connect.c
+#: connect.c:588
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "无效的 ls-refs 响应：%s"
 
-#: connect.c
+#: connect.c:592
 msgid "expected flush after ref listing"
 msgstr "在引用列表之后应该有一个 flush 包"
 
-#: connect.c
+#: connect.c:731
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "不支持 '%s' 协议"
 
-#: connect.c
+#: connect.c:782
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "无法为 socket 设置 SO_KEEPALIVE"
 
-#: connect.c
+#: connect.c:822 connect.c:885
 #, c-format
 msgid "Looking up %s ... "
 msgstr "查找 %s ..."
 
-#: connect.c
+#: connect.c:826
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "无法查找 %s（端口 %s）（%s）"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c
+#: connect.c:830 connect.c:901
 #, c-format
 msgid ""
 "done.\n"
@@ -19026,7 +19358,7 @@ msgstr ""
 "完成。\n"
 "连接到 %s（端口 %s）... "
 
-#: connect.c
+#: connect.c:852 connect.c:929
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -19036,111 +19368,111 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c
+#: connect.c:858 connect.c:935
 msgid "done."
 msgstr "完成。"
 
-#: connect.c
+#: connect.c:889
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "无法查找 %s（%s）"
 
-#: connect.c
+#: connect.c:895
 #, c-format
 msgid "unknown port %s"
 msgstr "未知端口 %s"
 
-#: connect.c
+#: connect.c:1032 connect.c:1364
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "已阻止奇怪的主机名 '%s'"
 
-#: connect.c
+#: connect.c:1034
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "已阻止奇怪的端口号 '%s'"
 
-#: connect.c
+#: connect.c:1044
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "不能启动代理 %s"
 
-#: connect.c
+#: connect.c:1115
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
 
-#: connect.c
+#: connect.c:1255
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr "在 git:// 主机和仓库路径中禁止使用换行符"
 
-#: connect.c
+#: connect.c:1312
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh 变体 'simple' 不支持 -4"
 
-#: connect.c
+#: connect.c:1324
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh 变体 'simple' 不支持 -6"
 
-#: connect.c
+#: connect.c:1341
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh 变体 'simple' 不支持设置端口"
 
-#: connect.c
+#: connect.c:1456
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "已阻止奇怪的路径名 '%s'"
 
-#: connect.c
+#: connect.c:1504
 msgid "unable to fork"
 msgstr "无法 fork"
 
-#: connected.c
+#: connected.c:131
 msgid "Could not run 'git rev-list'"
 msgstr "不能执行 'git rev-list'"
 
-#: connected.c
+#: connected.c:156
 msgid "failed write to rev-list"
 msgstr "写入 rev-list 失败"
 
-#: connected.c
+#: connected.c:161
 msgid "failed to close rev-list's stdin"
 msgstr "无法关闭 rev-list 的标准输入"
 
-#: convert.c
+#: convert.c:192
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "非法的 crlf_action %d"
 
-#: convert.c
+#: convert.c:205
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "%s 中的 CRLF 将被 LF 替换"
 
-#: convert.c
+#: convert.c:207
 #, c-format
 msgid ""
 "in the working copy of '%s', CRLF will be replaced by LF the next time Git "
 "touches it"
 msgstr "在 '%s' 的工作拷贝中，下次 Git 接触时 CRLF 将被 LF 替换"
 
-#: convert.c
+#: convert.c:215
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "文件 %s 中的 LF 将被 CRLF 替换"
 
-#: convert.c
+#: convert.c:217
 #, c-format
 msgid ""
 "in the working copy of '%s', LF will be replaced by CRLF the next time Git "
 "touches it"
 msgstr "在 '%s' 的工作拷贝中，下次 Git 接触时 LF 将被 CRLF 替换"
 
-#: convert.c
+#: convert.c:282
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"
 
-#: convert.c
+#: convert.c:289
 #, c-format
 msgid ""
 "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
@@ -19148,12 +19480,12 @@ msgid ""
 msgstr ""
 "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。"
 
-#: convert.c
+#: convert.c:302
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"
 
-#: convert.c
+#: convert.c:304
 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -19162,145 +19494,145 @@ msgstr ""
 "文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"
 "节序）作为工作区编码。"
 
-#: convert.c
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
 
-#: convert.c
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
 
-#: convert.c
+#: convert.c:663
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "不能 fork 以执行外部过滤器 '%s'"
 
-#: convert.c
+#: convert.c:683
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "不能将输入传递给外部过滤器 '%s'"
 
-#: convert.c
+#: convert.c:690
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "外部过滤器 '%s' 失败码 %d"
 
-#: convert.c
+#: convert.c:725 convert.c:728
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "从外部过滤器 '%s' 读取失败"
 
-#: convert.c
+#: convert.c:731 convert.c:786
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "外部过滤器 '%s' 失败"
 
-#: convert.c
+#: convert.c:835
 msgid "unexpected filter type"
 msgstr "意外的过滤类型"
 
-#: convert.c
+#: convert.c:846
 msgid "path name too long for external filter"
 msgstr "外部过滤器的路径名太长"
 
-#: convert.c
+#: convert.c:944
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"
 
-#: convert.c
+#: convert.c:1247
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false 不是有效的工作区编码"
 
-#: convert.c
+#: convert.c:1427 convert.c:1460
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s：clean 过滤器 '%s' 失败"
 
-#: convert.c
+#: convert.c:1503
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s：smudge 过滤器 %s 失败"
 
-#: credential.c
+#: credential.c:155
 #, c-format
 msgid "skipping credential lookup for key: credential.%s"
 msgstr "跳过凭据查询：credential.%s"
 
-#: credential.c
+#: credential.c:171
 msgid "refusing to work with credential missing host field"
 msgstr "拒绝使用缺少主机字段的凭据"
 
-#: credential.c
+#: credential.c:173
 msgid "refusing to work with credential missing protocol field"
 msgstr "拒绝使用缺少协议字段的凭据"
 
-#: credential.c
+#: credential.c:552
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr "URL 的 %s 组件中包含换行符：%s"
 
-#: credential.c
+#: credential.c:596
 #, c-format
 msgid "url has no scheme: %s"
 msgstr "URL 没有 scheme：%s"
 
-#: credential.c
+#: credential.c:669
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr "不能解析凭据 URL：%s"
 
-#: date.c
+#: date.c:142
 msgid "in the future"
 msgstr "在将来"
 
-#: date.c
+#: date.c:148
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "%<PRIuMAX> 秒钟前"
 msgstr[1] "%<PRIuMAX> 秒钟前"
 
-#: date.c
+#: date.c:155
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "%<PRIuMAX> 分钟前"
 msgstr[1] "%<PRIuMAX> 分钟前"
 
-#: date.c
+#: date.c:162
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "%<PRIuMAX> 小时前"
 msgstr[1] "%<PRIuMAX> 小时前"
 
-#: date.c
+#: date.c:169
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "%<PRIuMAX> 天前"
 msgstr[1] "%<PRIuMAX> 天前"
 
-#: date.c
+#: date.c:175
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "%<PRIuMAX> 周前"
 msgstr[1] "%<PRIuMAX> 周前"
 
-#: date.c
+#: date.c:182
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "%<PRIuMAX> 个月前"
 msgstr[1] "%<PRIuMAX> 个月前"
 
-#: date.c
+#: date.c:193
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
@@ -19308,124 +19640,124 @@ msgstr[0] "%<PRIuMAX> 年"
 msgstr[1] "%<PRIuMAX> 年"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c
+#: date.c:196
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "%s %<PRIuMAX> 个月前"
 msgstr[1] "%s %<PRIuMAX> 个月前"
 
-#: date.c
+#: date.c:201 date.c:206
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
 msgstr[0] "%<PRIuMAX> 年前"
 msgstr[1] "%<PRIuMAX> 年前"
 
-#: delta-islands.c
+#: delta-islands.c:269
 msgid "Propagating island marks"
 msgstr "正在传播数据岛标记"
 
-#: delta-islands.c
+#: delta-islands.c:287
 #, c-format
 msgid "bad tree object %s"
 msgstr "坏的树对象 %s"
 
-#: delta-islands.c
+#: delta-islands.c:359
 #, c-format
 msgid "failed to load island regex for '%s': %s"
 msgstr "未能加载 '%s' 的数据岛正则表达式：%s"
 
-#: delta-islands.c
+#: delta-islands.c:418
 #, c-format
 msgid "island regex from config has too many capture groups (max=%d)"
 msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）"
 
-#: delta-islands.c
+#: delta-islands.c:500
 #, c-format
 msgid "Marked %d islands, done.\n"
 msgstr "已标记 %d 个数据岛，结束。\n"
 
-#: diagnose.c
+#: diagnose.c:49
 #, c-format
 msgid "invalid --%s value '%s'"
 msgstr "无效的 --%s 值 '%s'"
 
-#: diagnose.c
+#: diagnose.c:143
 #, c-format
 msgid "could not archive missing directory '%s'"
 msgstr "无法归档缺失的目录 '%s'"
 
-#: diagnose.c dir.c
+#: diagnose.c:146 dir.c:2537
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "无法打开目录 '%s'"
 
-#: diagnose.c
+#: diagnose.c:168
 #, c-format
 msgid "skipping '%s', which is neither file nor directory"
 msgstr "跳过 '%s'，既不是文件又不是目录"
 
-#: diagnose.c
+#: diagnose.c:205
 msgid "could not duplicate stdout"
 msgstr "无法复制标准输出"
 
-#: diagnose.c
+#: diagnose.c:246
 #, c-format
 msgid "could not add directory '%s' to archiver"
 msgstr "无法添加目录 '%s' 至归档器"
 
-#: diagnose.c
+#: diagnose.c:262
 msgid "failed to write archive"
 msgstr "无法写入归档"
 
-#: diff-lib.c
+#: diff-lib.c:591
 msgid "--merge-base does not work with ranges"
 msgstr "--merge-base 不适用于范围"
 
-#: diff-lib.c
+#: diff-lib.c:608
 msgid "unable to get HEAD"
 msgstr "不能解析 HEAD"
 
-#: diff-lib.c
+#: diff-lib.c:616
 msgid "no merge base found"
 msgstr "未找到合并基线"
 
-#: diff-lib.c
+#: diff-lib.c:618
 msgid "multiple merge bases found"
 msgstr "找到了多条合并基线"
 
-#: diff-no-index.c
+#: diff-no-index.c:277
 msgid "cannot compare stdin to a directory"
 msgstr "无法将标准输入和目录进行比较"
 
-#: diff-no-index.c
+#: diff-no-index.c:280
 msgid "cannot compare a named pipe to a directory"
 msgstr "无法将命名管道和目录进行比较"
 
-#: diff-no-index.c
+#: diff-no-index.c:294
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [<选项>] <路径> <路径>"
 
-#: diff-no-index.c
+#: diff-no-index.c:320
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
 msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
 
 #  译者：注意保持前导空格
-#: diff.c
+#: diff.c:176
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
 
 #  译者：注意保持前导空格
-#: diff.c
+#: diff.c:181
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  未知的 dirstat 参数 '%s'\n"
 
-#: diff.c
+#: diff.c:318
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -19433,7 +19765,7 @@ msgstr ""
 "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "
 "'plain'"
 
-#: diff.c
+#: diff.c:346
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -19442,23 +19774,23 @@ msgstr ""
 "未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
 "space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
 
-#: diff.c
+#: diff.c:354
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
 msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"
 
-#: diff.c
+#: diff.c:457
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
 
-#: diff.c transport.c
+#: diff.c:467 diff.c:507 transport.c:1032
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "配置 '%s' 未知的取值：%s"
 
-#: diff.c
+#: diff.c:527
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -19467,47 +19799,48 @@ msgstr ""
 "发现配置变量 'diff.dirstat' 中的错误：\n"
 "%s"
 
-#: diff.c
+#: diff.c:4442
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 退出，停止在 %s"
 
-#: diff.c
+#: diff.c:4831
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 明确要求只跟一个路径规格"
 
-#: diff.c
+#: diff.c:4841
 #, c-format
 msgid "pathspec magic not supported by --follow: %s"
 msgstr "指定 --follow: %s 的同时，不支持在路径规格中使用神奇前缀"
 
-#: diff.c parse-options.c
+#: diff.c:4866 parse-options.c:1318
 #, c-format
 msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
 msgstr "选项 '%s'、'%s'、'%s' 和 '%s' 不能同时使用"
 
-#: diff.c
+#: diff.c:4874
 #, c-format
 msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
 msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 一起使用 '%3$s'"
 
-#: diff.c
+#: diff.c:4878
 #, c-format
 msgid ""
 "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
 msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'"
 
-#: diff.c
+#: diff.c:5022
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "无效的 --stat 值：%s"
 
-#: diff.c parse-options.c
+#: diff.c:5027 diff.c:5032 diff.c:5037 diff.c:5042 diff.c:5549
+#: parse-options.c:180 parse-options.c:184
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s 期望一个数字值"
 
-#: diff.c
+#: diff.c:5060
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -19516,189 +19849,189 @@ msgstr ""
 "无法解析 --dirstat/-X 选项的参数：\n"
 "%s"
 
-#: diff.c
+#: diff.c:5094
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
 
-#: diff.c
+#: diff.c:5118
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "ws-error-highlight=%.*s 之后未知的值"
 
-#: diff.c
+#: diff.c:5132
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "不能解析 '%s'"
 
-#: diff.c
+#: diff.c:5182 diff.c:5188
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s 期望 <n>/<m> 格式"
 
-#: diff.c
+#: diff.c:5200
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s 期望一个字符，得到 '%s'"
 
-#: diff.c
+#: diff.c:5221
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "坏的 --color-moved 参数：%s"
 
-#: diff.c
+#: diff.c:5240
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "--color-moved-ws 中的无效模式 '%s' "
 
-#: diff.c
+#: diff.c:5332 diff.c:5352
 #, c-format
 msgid "invalid argument to %s"
 msgstr "%s 的参数无效"
 
-#: diff.c
+#: diff.c:5469
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "选项 -I 的正则表达式无效：'%s'"
 
-#: diff.c
+#: diff.c:5518
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "无法解析 --submodule 选项的参数：'%s'"
 
-#: diff.c
+#: diff.c:5574
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "坏的 --word-diff 参数：%s"
 
-#: diff.c
+#: diff.c:5615
 msgid "Diff output format options"
 msgstr "差异输出格式化选项"
 
-#: diff.c
+#: diff.c:5617 diff.c:5622
 msgid "generate patch"
 msgstr "生成补丁"
 
-#: diff.c
+#: diff.c:5624 diff.c:5741 diff.c:5748
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c
+#: diff.c:5625 diff.c:5628
 msgid "generate diffs with <n> lines context"
 msgstr "生成含 <n> 行上下文的差异"
 
-#: diff.c
+#: diff.c:5630
 msgid "generate the diff in raw format"
 msgstr "生成原始格式的差异"
 
-#: diff.c
+#: diff.c:5633
 msgid "synonym for '-p --raw'"
 msgstr "和 '-p --raw' 同义"
 
-#: diff.c
+#: diff.c:5637
 msgid "synonym for '-p --stat'"
 msgstr "和 '-p --stat' 同义"
 
-#: diff.c
+#: diff.c:5641
 msgid "machine friendly --stat"
 msgstr "机器友好的 --stat"
 
-#: diff.c
+#: diff.c:5644
 msgid "output only the last line of --stat"
 msgstr "只输出 --stat 的最后一行"
 
-#: diff.c
+#: diff.c:5646 diff.c:5654
 msgid "<param1>,<param2>..."
 msgstr "<参数1>,<参数2>..."
 
-#: diff.c
+#: diff.c:5647
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "输出每个子目录相对变更的分布"
 
-#: diff.c
+#: diff.c:5651
 msgid "synonym for --dirstat=cumulative"
 msgstr "和 --dirstat=cumulative 同义"
 
-#: diff.c
+#: diff.c:5655
 msgid "synonym for --dirstat=files,<param1>,<param2>..."
 msgstr "是 --dirstat=files,<参数1>,<参数2>... 的同义词"
 
-#: diff.c
+#: diff.c:5659
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
 
-#: diff.c
+#: diff.c:5662
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "精简摘要，例如创建、重命名和模式变更"
 
-#: diff.c
+#: diff.c:5665
 msgid "show only names of changed files"
 msgstr "只显示变更文件的文件名"
 
-#: diff.c
+#: diff.c:5668
 msgid "show only names and status of changed files"
 msgstr "只显示变更文件的文件名和状态"
 
-#: diff.c
+#: diff.c:5670
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
 
-#: diff.c
+#: diff.c:5671
 msgid "generate diffstat"
 msgstr "生成差异统计（diffstat）"
 
-#: diff.c
+#: diff.c:5673 diff.c:5676 diff.c:5679
 msgid "<width>"
 msgstr "<宽度>"
 
-#: diff.c
+#: diff.c:5674
 msgid "generate diffstat with a given width"
 msgstr "使用给定的长度生成差异统计"
 
-#: diff.c
+#: diff.c:5677
 msgid "generate diffstat with a given name width"
 msgstr "使用给定的文件名长度生成差异统计"
 
-#: diff.c
+#: diff.c:5680
 msgid "generate diffstat with a given graph width"
 msgstr "使用给定的图形长度生成差异统计"
 
-#: diff.c
+#: diff.c:5682
 msgid "<count>"
 msgstr "<次数>"
 
-#: diff.c
+#: diff.c:5683
 msgid "generate diffstat with limited lines"
 msgstr "生成有限行数的差异统计"
 
-#: diff.c
+#: diff.c:5686
 msgid "generate compact summary in diffstat"
 msgstr "生成差异统计的简洁摘要"
 
-#: diff.c
+#: diff.c:5689
 msgid "output a binary diff that can be applied"
 msgstr "输出一个可以应用的二进制差异"
 
-#: diff.c
+#: diff.c:5692
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "在 \"index\" 行显示完整的前后对象名称"
 
-#: diff.c
+#: diff.c:5694
 msgid "show colored diff"
 msgstr "显示带颜色的差异"
 
-#: diff.c
+#: diff.c:5695
 msgid "<kind>"
 msgstr "<类型>"
 
-#: diff.c
+#: diff.c:5696
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
 
-#: diff.c
+#: diff.c:5699
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -19706,364 +20039,364 @@ msgstr ""
 "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
 "符"
 
-#: diff.c
+#: diff.c:5702 diff.c:5705 diff.c:5708 diff.c:5822
 msgid "<prefix>"
 msgstr "<前缀>"
 
-#: diff.c
+#: diff.c:5703
 msgid "show the given source prefix instead of \"a/\""
 msgstr "显示给定的源前缀取代 \"a/\""
 
-#: diff.c
+#: diff.c:5706
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "显示给定的目标前缀取代 \"b/\""
 
-#: diff.c
+#: diff.c:5709
 msgid "prepend an additional prefix to every line of output"
 msgstr "输出的每一行附加前缀"
 
-#: diff.c
+#: diff.c:5712
 msgid "do not show any source or destination prefix"
 msgstr "不显示任何源和目标前缀"
 
-#: diff.c
+#: diff.c:5715
 msgid "use default prefixes a/ and b/"
 msgstr "使用 a/ 和 b/ 作为默认前缀"
 
-#: diff.c
+#: diff.c:5718
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "显示指定行数的差异块间的上下文"
 
-#: diff.c
+#: diff.c:5722 diff.c:5727 diff.c:5732
 msgid "<char>"
 msgstr "<字符>"
 
-#: diff.c
+#: diff.c:5723
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "指定一个字符取代 '+' 来表示新的一行"
 
-#: diff.c
+#: diff.c:5728
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "指定一个字符取代 '-' 来表示旧的一行"
 
-#: diff.c
+#: diff.c:5733
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "指定一个字符取代 ' ' 来表示一行上下文"
 
-#: diff.c
+#: diff.c:5736
 msgid "Diff rename options"
 msgstr "差异重命名选项"
 
-#: diff.c
+#: diff.c:5737
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c
+#: diff.c:5738
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "将完全重写的变更打破为成对的删除和创建"
 
-#: diff.c
+#: diff.c:5742
 msgid "detect renames"
 msgstr "检测重命名"
 
-#: diff.c
+#: diff.c:5746
 msgid "omit the preimage for deletes"
 msgstr "省略删除操作的差异输出"
 
-#: diff.c
+#: diff.c:5749
 msgid "detect copies"
 msgstr "检测拷贝"
 
-#: diff.c
+#: diff.c:5753
 msgid "use unmodified files as source to find copies"
 msgstr "使用未修改的文件做为发现拷贝的源"
 
-#: diff.c
+#: diff.c:5755
 msgid "disable rename detection"
 msgstr "禁用重命名探测"
 
-#: diff.c
+#: diff.c:5758
 msgid "use empty blobs as rename source"
 msgstr "使用空的数据对象做为重命名的源"
 
-#: diff.c
+#: diff.c:5760
 msgid "continue listing the history of a file beyond renames"
 msgstr "继续列出文件重命名以外的历史记录"
 
-#: diff.c
+#: diff.c:5763
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
 
-#: diff.c
+#: diff.c:5765
 msgid "Diff algorithm options"
 msgstr "差异算法选项"
 
-#: diff.c
+#: diff.c:5767
 msgid "produce the smallest possible diff"
 msgstr "生成尽可能小的差异"
 
-#: diff.c
+#: diff.c:5771
 msgid "ignore whitespace when comparing lines"
 msgstr "行比较时忽略空白字符"
 
-#: diff.c
+#: diff.c:5774
 msgid "ignore changes in amount of whitespace"
 msgstr "忽略空白字符的变更"
 
-#: diff.c
+#: diff.c:5777
 msgid "ignore changes in whitespace at EOL"
 msgstr "忽略行尾的空白字符变更"
 
-#: diff.c
+#: diff.c:5780
 msgid "ignore carrier-return at the end of line"
 msgstr "忽略行尾的回车符（CR）"
 
-#: diff.c
+#: diff.c:5783
 msgid "ignore changes whose lines are all blank"
 msgstr "忽略整行都是空白的变更"
 
-#: diff.c
+#: diff.c:5785 diff.c:5808 diff.c:5811 diff.c:5856
 msgid "<regex>"
 msgstr "<正则>"
 
-#: diff.c
+#: diff.c:5786
 msgid "ignore changes whose all lines match <regex>"
 msgstr "忽略所有行都和正则表达式匹配的变更"
 
-#: diff.c
+#: diff.c:5789
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "启发式转换差异边界以便阅读"
 
-#: diff.c
+#: diff.c:5792
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "使用 \"patience diff\" 算法生成差异"
 
-#: diff.c
+#: diff.c:5796
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "使用 \"histogram diff\" 算法生成差异"
 
-#: diff.c
+#: diff.c:5802
 msgid "<text>"
 msgstr "<文本>"
 
-#: diff.c
+#: diff.c:5803
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "使用 \"anchored diff\" 算法生成差异"
 
-#: diff.c
+#: diff.c:5805 diff.c:5814 diff.c:5817
 msgid "<mode>"
 msgstr "<模式>"
 
-#: diff.c
+#: diff.c:5806
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
 
-#: diff.c
+#: diff.c:5809
 msgid "use <regex> to decide what a word is"
 msgstr "使用 <正则表达式> 确定何为一个词"
 
-#: diff.c
+#: diff.c:5812
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
 
-#: diff.c
+#: diff.c:5815
 msgid "moved lines of code are colored differently"
 msgstr "移动的代码行用不同方式着色"
 
-#: diff.c
+#: diff.c:5818
 msgid "how white spaces are ignored in --color-moved"
 msgstr "在 --color-moved 下如何忽略空白字符"
 
-#: diff.c
+#: diff.c:5821
 msgid "Other diff options"
 msgstr "其它差异选项"
 
-#: diff.c
+#: diff.c:5823
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
 
-#: diff.c
+#: diff.c:5827
 msgid "treat all files as text"
 msgstr "把所有文件当做文本处理"
 
-#: diff.c
+#: diff.c:5829
 msgid "swap two inputs, reverse the diff"
 msgstr "交换两个输入，反转差异"
 
-#: diff.c
+#: diff.c:5831
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "有差异时退出码为 1，否则为 0"
 
-#: diff.c
+#: diff.c:5833
 msgid "disable all output of the program"
 msgstr "禁用本程序的所有输出"
 
-#: diff.c
+#: diff.c:5835
 msgid "allow an external diff helper to be executed"
 msgstr "允许执行一个外置的差异助手"
 
-#: diff.c
+#: diff.c:5837
 msgid "run external text conversion filters when comparing binary files"
 msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
 
-#: diff.c
+#: diff.c:5839
 msgid "<when>"
 msgstr "<何时>"
 
-#: diff.c
+#: diff.c:5840
 msgid "ignore changes to submodules in the diff generation"
 msgstr "在生成差异时，忽略子模组的更改"
 
-#: diff.c
+#: diff.c:5843
 msgid "<format>"
 msgstr "<格式>"
 
-#: diff.c
+#: diff.c:5844
 msgid "specify how differences in submodules are shown"
 msgstr "指定子模组的差异如何显示"
 
-#: diff.c
+#: diff.c:5848
 msgid "hide 'git add -N' entries from the index"
 msgstr "隐藏索引中 'git add -N' 条目"
 
-#: diff.c
+#: diff.c:5851
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "将索引中 'git add -N' 条目当做真实的"
 
-#: diff.c
+#: diff.c:5853
 msgid "<string>"
 msgstr "<字符串>"
 
-#: diff.c
+#: diff.c:5854
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "查找改变了指定字符串出现次数的差异"
 
-#: diff.c
+#: diff.c:5857
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr "查找改变指定正则匹配出现次数的差异"
 
-#: diff.c
+#: diff.c:5860
 msgid "show all changes in the changeset with -S or -G"
 msgstr "显示使用 -S 或 -G 的变更集的所有变更"
 
-#: diff.c
+#: diff.c:5863
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
 
-#: diff.c
+#: diff.c:5866
 msgid "control the order in which files appear in the output"
 msgstr "控制输出中的文件显示顺序"
 
-#: diff.c
+#: diff.c:5867 diff.c:5870
 msgid "<path>"
 msgstr "<路径>"
 
-#: diff.c
+#: diff.c:5868
 msgid "show the change in the specified path first"
 msgstr "先显示指定路径的变更"
 
-#: diff.c
+#: diff.c:5871
 msgid "skip the output to the specified path"
 msgstr "跳过指定路径的输出"
 
-#: diff.c
+#: diff.c:5873
 msgid "<object-id>"
 msgstr "<对象 ID>"
 
-#: diff.c
+#: diff.c:5874
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "查找改变指定对象出现次数的差异"
 
-#: diff.c
+#: diff.c:5876
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c
+#: diff.c:5877
 msgid "select files by diff type"
 msgstr "通过差异类型选择文件"
 
-#: diff.c
+#: diff.c:5879
 msgid "<file>"
 msgstr "<文件>"
 
-#: diff.c
+#: diff.c:5880
 msgid "output to a specific file"
 msgstr "输出到指定的文件"
 
-#: diff.c
+#: diff.c:6572
 msgid "exhaustive rename detection was skipped due to too many files."
 msgstr "由于文件太多，跳过详尽的重命名检查。"
 
-#: diff.c
+#: diff.c:6575
 msgid "only found copies from modified paths due to too many files."
 msgstr "由于文件太多，只在修改的路径中找到了拷贝。"
 
-#: diff.c
+#: diff.c:6578
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
 
-#: diffcore-order.c
+#: diffcore-order.c:26
 #, c-format
 msgid "failed to read orderfile '%s'"
 msgstr "无法读取排序文件 '%s'"
 
-#: diffcore-rename.c
+#: diffcore-rename.c:1571
 msgid "Performing inexact rename detection"
 msgstr "正在进行非精确的重命名探测"
 
-#: diffcore-rotate.c
+#: diffcore-rotate.c:30
 #, c-format
 msgid "No such path '%s' in the diff"
 msgstr "在差异中无此路径 '%s'"
 
-#: dir.c
+#: dir.c:627
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
 
-#: dir.c
+#: dir.c:776 dir.c:783 dir.c:812 dir.c:827
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "未识别的模式：'%s'"
 
-#: dir.c
+#: dir.c:842 dir.c:860
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "未识别的反向模式：'%s'"
 
-#: dir.c
+#: dir.c:876
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"
 
-#: dir.c
+#: dir.c:884
 msgid "disabling cone pattern matching"
 msgstr "停用锥形模式匹配"
 
-#: dir.c
+#: dir.c:1276
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "不能将 %s 用作排除文件"
 
-#: dir.c
+#: dir.c:2840
 msgid "failed to get kernel name and information"
 msgstr "无法获得内核名称和信息"
 
-#: dir.c
+#: dir.c:2977
 msgid "untracked cache is disabled on this system or location"
 msgstr "缓存未跟踪文件在本系统或位置中被禁用"
 
-#: dir.c
+#: dir.c:3265 dir.c:3303
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -20071,241 +20404,245 @@ msgstr ""
 "无法猜到目录名。\n"
 "请在命令行指定一个目录"
 
-#: dir.c
+#: dir.c:4016
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "仓库 %s 中的索引文件损坏"
 
-#: dir.c
+#: dir.c:4063 dir.c:4068
 #, c-format
 msgid "could not create directories for %s"
 msgstr "不能为 %s 创建目录"
 
-#: dir.c
+#: dir.c:4097
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
 
-#: editor.c
+#: editor.c:81
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "提示：等待您的编辑器关闭文件...%c"
 
-#: editor.c sequencer.c wrapper.c
+#: editor.c:149 sequencer.c:576 sequencer.c:3580 sequencer.c:3594
+#: sequencer.c:3862 sequencer.c:6288 wrapper.c:683
 #, c-format
 msgid "could not write to '%s'"
 msgstr "不能写入 '%s'"
 
-#: editor.c
+#: editor.c:156
 #, c-format
 msgid "could not edit '%s'"
 msgstr "不能编辑 '%s'"
 
-#: entry.c
+#: entry.c:191
 msgid "Filtering content"
 msgstr "过滤内容"
 
-#: entry.c
+#: entry.c:523
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "不能对文件 '%s' 调用 stat"
 
-#: environment.c
+#: environment.c:165
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "错误的 git 名字空间路径 \"%s\""
 
-#: exec-cmd.c
+#: exec-cmd.c:369
 #, c-format
 msgid "too many args to run %s"
 msgstr "执行 %s 的参数太多"
 
-#: fetch-pack.c
+#: fetch-pack.c:214
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack：应为 shallow 列表"
 
-#: fetch-pack.c
+#: fetch-pack.c:217
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
 
-#: fetch-pack.c
+#: fetch-pack.c:228
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
 
-#: fetch-pack.c
+#: fetch-pack.c:248
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
 
-#: fetch-pack.c
+#: fetch-pack.c:259
 msgid "unable to write to remote"
 msgstr "无法写到远程"
 
-#: fetch-pack.c
+#: fetch-pack.c:313
 msgid "Server supports filter"
 msgstr "服务器支持 filter"
 
-#: fetch-pack.c
+#: fetch-pack.c:438 fetch-pack.c:1524
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "无效的 shallow 信息：%s"
 
-#: fetch-pack.c
+#: fetch-pack.c:444 fetch-pack.c:1530
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "无效的 unshallow 信息：%s"
 
-#: fetch-pack.c
+#: fetch-pack.c:446 fetch-pack.c:1532
 #, c-format
 msgid "object not found: %s"
 msgstr "对象未找到：%s"
 
-#: fetch-pack.c
+#: fetch-pack.c:449 fetch-pack.c:1535
 #, c-format
 msgid "error in object: %s"
 msgstr "对象中出错：%s"
 
-#: fetch-pack.c
+#: fetch-pack.c:451 fetch-pack.c:1537
 #, c-format
 msgid "no shallow found: %s"
 msgstr "未发现 shallow：%s"
 
-#: fetch-pack.c
+#: fetch-pack.c:454 fetch-pack.c:1541
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "应为 shallow/unshallow，却得到 %s"
 
-#: fetch-pack.c
+#: fetch-pack.c:504
 #, c-format
 msgid "got %s %d %s"
 msgstr "得到 %s %d %s"
 
-#: fetch-pack.c
+#: fetch-pack.c:524
 #, c-format
 msgid "invalid commit %s"
 msgstr "无效提交 %s"
 
-#: fetch-pack.c
+#: fetch-pack.c:559
 msgid "giving up"
 msgstr "放弃"
 
-#: fetch-pack.c progress.h
+#: fetch-pack.c:574 progress.h:25
 msgid "done"
 msgstr "完成"
 
-#: fetch-pack.c
+#: fetch-pack.c:586
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "得到 %s (%d) %s"
 
-#: fetch-pack.c
+#: fetch-pack.c:624
 #, c-format
 msgid "Marking %s as complete"
 msgstr "标记 %s 为完成"
 
-#: fetch-pack.c
+#: fetch-pack.c:842
 #, c-format
 msgid "already have %s (%s)"
 msgstr "已经有 %s（%s）"
 
-#: fetch-pack.c
+#: fetch-pack.c:938
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack：无法派生 sideband 多路输出"
 
-#: fetch-pack.c
+#: fetch-pack.c:946
 msgid "protocol error: bad pack header"
 msgstr "协议错误：坏的包头"
 
-#: fetch-pack.c
+#: fetch-pack.c:1031
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack：无法派生进程 %s"
 
-#: fetch-pack.c
+#: fetch-pack.c:1037
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack：无效的 index-pack 输出"
 
-#: fetch-pack.c
+#: fetch-pack.c:1056
 #, c-format
 msgid "%s failed"
 msgstr "%s 失败"
 
-#: fetch-pack.c
+#: fetch-pack.c:1058
 msgid "error in sideband demultiplexer"
 msgstr "sideband 多路输出出错"
 
-#: fetch-pack.c
+#: fetch-pack.c:1114
 #, c-format
 msgid "Server version is %.*s"
 msgstr "服务器版本 %.*s"
 
-#: fetch-pack.c
+#: fetch-pack.c:1122 fetch-pack.c:1128 fetch-pack.c:1131 fetch-pack.c:1137
+#: fetch-pack.c:1141 fetch-pack.c:1145 fetch-pack.c:1149 fetch-pack.c:1153
+#: fetch-pack.c:1157 fetch-pack.c:1161 fetch-pack.c:1165 fetch-pack.c:1169
+#: fetch-pack.c:1175 fetch-pack.c:1181 fetch-pack.c:1186 fetch-pack.c:1191
 #, c-format
 msgid "Server supports %s"
 msgstr "服务器支持 %s"
 
-#: fetch-pack.c
+#: fetch-pack.c:1124
 msgid "Server does not support shallow clients"
 msgstr "服务器不支持浅客户端"
 
-#: fetch-pack.c
+#: fetch-pack.c:1184
 msgid "Server does not support --shallow-since"
 msgstr "服务器不支持 --shallow-since"
 
-#: fetch-pack.c
+#: fetch-pack.c:1189
 msgid "Server does not support --shallow-exclude"
 msgstr "服务器不支持 --shallow-exclude"
 
-#: fetch-pack.c
+#: fetch-pack.c:1193
 msgid "Server does not support --deepen"
 msgstr "服务器不支持 --deepen"
 
-#: fetch-pack.c
+#: fetch-pack.c:1195
 msgid "Server does not support this repository's object format"
 msgstr "服务器不支持这个仓库的对象格式"
 
-#: fetch-pack.c
+#: fetch-pack.c:1208
 msgid "no common commits"
 msgstr "没有共同的提交"
 
-#: fetch-pack.c
+#: fetch-pack.c:1223 fetch-pack.c:1783
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：获取失败。"
 
-#: fetch-pack.c
+#: fetch-pack.c:1337
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "不匹配的算法：客户端 %s，服务端 %s"
 
-#: fetch-pack.c
+#: fetch-pack.c:1341
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "服务器不支持算法 '%s'"
 
-#: fetch-pack.c
+#: fetch-pack.c:1374
 msgid "Server does not support shallow requests"
 msgstr "服务器不支持浅克隆请求"
 
-#: fetch-pack.c
+#: fetch-pack.c:1419 fetch-pack.c:2192
 msgid "unable to write request to remote"
 msgstr "无法将请求写到远程"
 
-#: fetch-pack.c
+#: fetch-pack.c:1443
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "预期 '%s'，得到 '%s'"
 
-#: fetch-pack.c
+#: fetch-pack.c:1446
 #, c-format
 msgid "expected '%s'"
 msgstr "预期 '%s'"
 
-#: fetch-pack.c
+#: fetch-pack.c:1480
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "意外的确认行：'%s'"
 
-#: fetch-pack.c
+#: fetch-pack.c:1485
 #, c-format
 msgid "error processing acks: %d"
 msgstr "处理 ack 出错：%d"
@@ -20313,7 +20650,7 @@ msgstr "处理 ack 出错：%d"
 #. TRANSLATORS: The parameter will be 'ready', a protocol
 #. keyword.
 #.
-#: fetch-pack.c
+#: fetch-pack.c:1499
 #, c-format
 msgid "expected packfile to be sent after '%s'"
 msgstr "预期在 '%s' 之后发送 packfile"
@@ -20321,116 +20658,119 @@ msgstr "预期在 '%s' 之后发送 packfile"
 #. TRANSLATORS: The parameter will be 'ready', a protocol
 #. keyword.
 #.
-#: fetch-pack.c
+#: fetch-pack.c:1505
 #, c-format
 msgid "expected no other sections to be sent after no '%s'"
 msgstr "在没有 '%s' 后不应该发送其它小节"
 
-#: fetch-pack.c
+#: fetch-pack.c:1546
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "处理浅克隆信息出错：%d"
 
-#: fetch-pack.c
+#: fetch-pack.c:1595
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "预期 wanted-ref，得到 '%s'"
 
-#: fetch-pack.c
+#: fetch-pack.c:1600
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "意外的 wanted-ref：'%s'"
 
-#: fetch-pack.c
+#: fetch-pack.c:1605
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "处理要获取的引用出错：%d"
 
-#: fetch-pack.c
+#: fetch-pack.c:1635
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack：预期响应结束包"
 
-#: fetch-pack.c
+#: fetch-pack.c:2076
 msgid "no matching remote head"
 msgstr "没有匹配的远程分支"
 
-#: fetch-pack.c
+#: fetch-pack.c:2214
 msgid "unexpected 'ready' from remote"
 msgstr "来自远程的意外的 'ready'"
 
-#: fetch-pack.c
+#: fetch-pack.c:2243
 #, c-format
 msgid "no such remote ref %s"
 msgstr "没有这样的远程引用 %s"
 
-#: fetch-pack.c
+#: fetch-pack.c:2246
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "服务器不允许请求未公开的对象 %s"
 
-#: fsmonitor-ipc.c
+#: fsmonitor-ipc.c:124
 #, c-format
 msgid "fsmonitor_ipc__send_query: invalid path '%s'"
 msgstr "fsmonitor_ipc__send_query: 无效路径 '%s'"
 
-#: fsmonitor-ipc.c
+#: fsmonitor-ipc.c:130
 #, c-format
 msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
 msgstr "fsmonitor_ipc__send_query: 未知错误于 '%s'"
 
-#: fsmonitor-ipc.c
+#: fsmonitor-ipc.c:160
 msgid "fsmonitor--daemon is not running"
 msgstr "fsmonitor--daemon 没有运行"
 
-#: fsmonitor-ipc.c
+#: fsmonitor-ipc.c:169
 #, c-format
 msgid "could not send '%s' command to fsmonitor--daemon"
 msgstr "无法发送 '%s' 命令至 fsmonitor--daemon"
 
-#: fsmonitor-settings.c
+#: fsmonitor-settings.c:252
 #, c-format
 msgid "bare repository '%s' is incompatible with fsmonitor"
 msgstr "纯仓库 '%s' 与 fsmonitor 不兼容"
 
-#: fsmonitor-settings.c
+#: fsmonitor-settings.c:260
 #, c-format
 msgid "repository '%s' is incompatible with fsmonitor due to errors"
 msgstr "因为错误，仓库 '%s' 与 fsmonitor 不兼容"
 
-#: fsmonitor-settings.c
+#: fsmonitor-settings.c:266
 #, c-format
 msgid "remote repository '%s' is incompatible with fsmonitor"
 msgstr "远程仓库 '%s' 与 fsmonitor 不兼容"
 
-#: fsmonitor-settings.c
+#: fsmonitor-settings.c:272
 #, c-format
 msgid "virtual repository '%s' is incompatible with fsmonitor"
 msgstr "虚拟仓库 '%s' 与 fsmonitor 不兼容"
 
-#: fsmonitor-settings.c
+#: fsmonitor-settings.c:279
 #, c-format
 msgid ""
 "socket directory '%s' is incompatible with fsmonitor due to lack of Unix "
 "sockets support"
 msgstr "因为缺少 Unix 套接字支持，套接字目录 '%s' 与 fsmonitor 不兼容"
 
-#: git.c
+#: git.c:39
 msgid ""
 "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n"
 "           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
-"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
-"           [--config-env=<name>=<envvar>] <command> [<args>]"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-"
+"lazy-fetch]\n"
+"           [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n"
+"           [--work-tree=<path>] [--namespace=<name>] [--config-"
+"env=<name>=<envvar>]\n"
+"           <command> [<args>]"
 msgstr ""
 "git [-v | --version] [-h | --help] [-C <路径>] [-c <名称>=<取值>]\n"
 "           [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
-"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\n"
-"           [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [\"--"
+"no-lazy-fetch]\n"
+"           [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<路径>]\n"
+"           [--work-tree=<路径>] [--namespace=<名称>]\n"
 "           [--config-env=<名称>=<环境变量>] <命令> [<参数>]"
 
-#: git.c
+#: git.c:47
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -20442,47 +20782,47 @@ msgstr ""
 "帮助。\n"
 "有关系统的概述，查看 'git help git'。"
 
-#: git.c help.c
+#: git.c:111 help.c:401
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "不支持的命令列表类型 '%s'"
 
-#: git.c
+#: git.c:205 git.c:233 git.c:303
 #, c-format
 msgid "no directory given for '%s' option\n"
 msgstr "没有为 '%s' 选项提供目录\n"
 
-#: git.c
+#: git.c:219
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "没有为 --namespace 提供命名空间\n"
 
-#: git.c
+#: git.c:255
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "应为 -c 提供一个配置字符串\n"
 
-#: git.c
+#: git.c:263
 #, c-format
 msgid "no config key given for --config-env\n"
 msgstr "没有为 --config-env 提供配置名称\n"
 
-#: git.c
+#: git.c:330
 #, c-format
 msgid "no attribute source given for --attr-source\n"
 msgstr "没有为 --attr-source 提供属性来源\n"
 
-#: git.c
+#: git.c:348
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "未知选项：%s\n"
 
-#: git.c
+#: git.c:395
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr "在扩展别名 '%s' 时：'%s'"
 
-#: git.c
+#: git.c:404
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
@@ -20491,39 +20831,39 @@ msgstr ""
 "别名 '%s' 修改环境变量。您可以使用在别名中\n"
 "使用 '!git'"
 
-#: git.c
+#: git.c:411
 #, c-format
 msgid "empty alias for %s"
 msgstr "%s 的空别名"
 
-#: git.c
+#: git.c:414
 #, c-format
 msgid "recursive alias: %s"
 msgstr "递归的别名：%s"
 
-#: git.c
+#: git.c:491
 msgid "write failure on standard output"
 msgstr "在标准输出写入失败"
 
-#: git.c
+#: git.c:493
 msgid "unknown write failure on standard output"
 msgstr "到标准输出的未知写入错误"
 
-#: git.c
+#: git.c:495
 msgid "close failed on standard output"
 msgstr "标准输出关闭失败"
 
-#: git.c
+#: git.c:848
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "检测到别名循环：'%s'的扩展未终止：%s"
 
-#: git.c
+#: git.c:898
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "不能作为内置命令处理 %s"
 
-#: git.c
+#: git.c:909
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -20532,32 +20872,33 @@ msgstr ""
 "用法：%s\n"
 "\n"
 
-#: git.c
+#: git.c:935
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr "展开别名命令 '%s' 失败，'%s' 不是一个 git 命令\n"
 
-#: git.c
+#: git.c:947
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "无法运行命令 '%s'：%s\n"
 
-#: gpg-interface.c
+#: gpg-interface.c:350 gpg-interface.c:477 gpg-interface.c:1039
+#: gpg-interface.c:1055
 msgid "could not create temporary file"
 msgstr "不能创建临时文件"
 
-#: gpg-interface.c
+#: gpg-interface.c:353 gpg-interface.c:480
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "无法将分离式签名写入 '%s'"
 
-#: gpg-interface.c
+#: gpg-interface.c:471
 msgid ""
 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
 "signature verification"
 msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在"
 
-#: gpg-interface.c
+#: gpg-interface.c:500
 msgid ""
 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
 "verification (available in openssh version 8.2p1+)"
@@ -20565,37 +20906,37 @@ msgstr ""
 "ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n"
 "（openssh 8.2p1+ 版本可用）"
 
-#: gpg-interface.c
+#: gpg-interface.c:571
 #, c-format
 msgid "ssh signing revocation file configured but not found: %s"
 msgstr "设置了 ssh 签名吊销文件但无法找到：%s"
 
-#: gpg-interface.c
+#: gpg-interface.c:661
 #, c-format
 msgid "bad/incompatible signature '%s'"
 msgstr "坏的/不兼容的签名 '%s‘"
 
-#: gpg-interface.c
+#: gpg-interface.c:833 gpg-interface.c:838
 #, c-format
 msgid "failed to get the ssh fingerprint for key '%s'"
 msgstr "无法得到密钥 '%s' 的 ssh 指纹"
 
-#: gpg-interface.c
+#: gpg-interface.c:861
 msgid ""
 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
 msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
 
-#: gpg-interface.c
+#: gpg-interface.c:883
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand 成功，但没有返回密钥：%s %s"
 
-#: gpg-interface.c
+#: gpg-interface.c:889
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s"
 
-#: gpg-interface.c
+#: gpg-interface.c:1003
 #, c-format
 msgid ""
 "gpg failed to sign the data:\n"
@@ -20604,37 +20945,37 @@ msgstr ""
 "gpg 无法为数据签名：\n"
 "%s"
 
-#: gpg-interface.c
+#: gpg-interface.c:1031
 msgid "user.signingKey needs to be set for ssh signing"
 msgstr "ssh 签名需要设置 user.signingKey"
 
-#: gpg-interface.c
+#: gpg-interface.c:1043
 #, c-format
 msgid "failed writing ssh signing key to '%s'"
 msgstr "无法将 ssh 签名密钥写入 '%s'"
 
-#: gpg-interface.c
+#: gpg-interface.c:1061
 #, c-format
 msgid "failed writing ssh signing key buffer to '%s'"
 msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'"
 
-#: gpg-interface.c
+#: gpg-interface.c:1081
 msgid ""
 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
 "8.2p1+)"
 msgstr "ssh 签名需要 ssh-keygen -Y sign （openssh 8.2p1+ 版本可用）"
 
-#: gpg-interface.c
+#: gpg-interface.c:1093
 #, c-format
 msgid "failed reading ssh signing data buffer from '%s'"
 msgstr "无法从 '%s' 读入 ssh 签名数据"
 
-#: graph.c
+#: graph.c:99
 #, c-format
 msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
 
-#: grep.c
+#: grep.c:506
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -20642,114 +20983,114 @@ msgstr ""
 "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
 "功能"
 
-#: grep.c
+#: grep.c:1923
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s'：无法读取 %s"
 
-#: grep.c
+#: grep.c:1951
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s'：读取不完整"
 
-#: help.c
+#: help.c:32
 msgid "start a working area (see also: git help tutorial)"
 msgstr "开始一个工作区（参见：git help tutorial）"
 
-#: help.c
+#: help.c:33
 msgid "work on the current change (see also: git help everyday)"
 msgstr "在当前变更上工作（参见：git help everyday）"
 
-#: help.c
+#: help.c:34
 msgid "examine the history and state (see also: git help revisions)"
 msgstr "检查历史和状态（参见：git help revisions）"
 
-#: help.c
+#: help.c:35
 msgid "grow, mark and tweak your common history"
 msgstr "扩展、标记和调校您的历史记录"
 
-#: help.c
+#: help.c:36
 msgid "collaborate (see also: git help workflows)"
 msgstr "协同（参见：git help workflows）"
 
-#: help.c
+#: help.c:40
 msgid "Main Porcelain Commands"
 msgstr "主要的上层命令"
 
-#: help.c
+#: help.c:41
 msgid "Ancillary Commands / Manipulators"
 msgstr "辅助命令/操作者"
 
-#: help.c
+#: help.c:42
 msgid "Ancillary Commands / Interrogators"
 msgstr "辅助命令/询问者"
 
-#: help.c
+#: help.c:43
 msgid "Interacting with Others"
 msgstr "与其它系统交互"
 
-#: help.c
+#: help.c:44
 msgid "Low-level Commands / Manipulators"
 msgstr "低级命令/操作者"
 
-#: help.c
+#: help.c:45
 msgid "Low-level Commands / Interrogators"
 msgstr "低级命令/询问者"
 
-#: help.c
+#: help.c:46
 msgid "Low-level Commands / Syncing Repositories"
 msgstr "低级命令/同步仓库"
 
-#: help.c
+#: help.c:47
 msgid "Low-level Commands / Internal Helpers"
 msgstr "低级命令/内部助手"
 
-#: help.c
+#: help.c:48
 msgid "User-facing repository, command and file interfaces"
 msgstr "面向用户的仓库、命令和文件接口"
 
-#: help.c
+#: help.c:49
 msgid "Developer-facing file formats, protocols and other interfaces"
 msgstr "面向开发者的文件格式、协议和其他接口"
 
-#: help.c
+#: help.c:335
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "在 '%s' 下可用的 git 命令"
 
-#: help.c
+#: help.c:342
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
 
-#: help.c
+#: help.c:351
 msgid "These are common Git commands used in various situations:"
 msgstr "这些是各种场合常见的 Git 命令："
 
-#: help.c
+#: help.c:441
 msgid "The Git concept guides are:"
 msgstr "Git 概念向导有："
 
-#: help.c
+#: help.c:451
 msgid "User-facing repository, command and file interfaces:"
 msgstr "面向用户的仓库、命令和文件接口："
 
-#: help.c
+#: help.c:461
 msgid "File formats, protocols and other developer interfaces:"
 msgstr "文件格式、协议和其他开发者接口列表："
 
-#: help.c
+#: help.c:489
 msgid "External commands"
 msgstr "外部命令"
 
-#: help.c
+#: help.c:511
 msgid "Command aliases"
 msgstr "命令别名"
 
-#: help.c
+#: help.c:529
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "执行　'git help <command>' 来了解特定子命令"
 
-#: help.c
+#: help.c:608
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -20758,36 +21099,36 @@ msgstr ""
 "'%s' 像是一个 git 命令，但却无法运行。\n"
 "可能是 git-%s 受损？"
 
-#: help.c
+#: help.c:630 help.c:727
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
 
-#: help.c
+#: help.c:678
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "唉呀，您的系统中未发现 Git 命令。"
 
-#: help.c
+#: help.c:700
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
 
-#: help.c
+#: help.c:705
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "假定您想要的是 '%s' 并继续。"
 
-#: help.c
+#: help.c:711
 #, c-format
 msgid "Run '%s' instead [y/N]? "
 msgstr "取而代之运行 '%s' [y/N]？"
 
-#: help.c
+#: help.c:719
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr "假定您想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
 
-#: help.c
+#: help.c:731
 msgid ""
 "\n"
 "The most similar command is"
@@ -20801,16 +21142,16 @@ msgstr[1] ""
 "\n"
 "最相似的命令是"
 
-#: help.c
+#: help.c:783
 msgid "git version [--build-options]"
 msgstr "git version [--build-options]"
 
-#: help.c
+#: help.c:840
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s：%s - %s"
 
-#: help.c
+#: help.c:844
 msgid ""
 "\n"
 "Did you mean this?"
@@ -20824,7 +21165,7 @@ msgstr[1] ""
 "\n"
 "您指的是这其中的某一个么？"
 
-#: hook.c
+#: hook.c:39
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -20833,48 +21174,60 @@ msgstr ""
 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"
 
-#: http-fetch.c
+#: http-fetch.c:133 http-fetch.c:148
+msgid "not a git repository"
+msgstr "不是 git 仓库"
+
+#: http-fetch.c:138
 #, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
 msgstr "--packfile 的参数必须是有效的哈希值（得到 '%s'）"
 
-#: http-fetch.c
-msgid "not a git repository"
-msgstr "不是 git 仓库"
-
-#: http.c
+#: http.c:487
 #, c-format
 msgid "negative value for http.postBuffer; defaulting to %d"
 msgstr "http.postBuffer 为负值，默认为 %d"
 
-#: http.c
+#: http.c:508
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "不支持委托控制，因为 cURL < 7.22.0"
 
-#: http.c
+#: http.c:517
 msgid "Public key pinning not supported with cURL < 7.39.0"
 msgstr "不支持公钥文件锁定，因为 cURL < 7.39.0"
 
-#: http.c
+#: http.c:565
+msgid "Unknown value for http.proactiveauth"
+msgstr "http.proactiveauth 为未知取值"
+
+#: http.c:1091
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0"
 
-#: http.c
+#: http.c:1317
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端："
 
-#: http.c
+#: http.c:1324
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构建"
 
-#: http.c
+#: http.c:1328
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "无法将 SSL 后端设置为 '%s'：已经设置"
 
-#: http.c
+#: http.c:1514
+msgid "refusing to read cookies from http.cookiefile '-'"
+msgstr "拒绝从 http.cookiefile '-' 读取 cookie"
+
+#: http.c:1520
+msgid "ignoring http.savecookies for empty http.cookiefile"
+msgstr "忽略空 http.cookiefile 的 http.savecookies"
+
+#: http.c:2227
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -20885,15 +21238,15 @@ msgstr ""
 "     请求：%s\n"
 "   重定向：%s"
 
-#: ident.c
+#: ident.c:430
 msgid "Author identity unknown\n"
 msgstr "作者身份未知\n"
 
-#: ident.c
+#: ident.c:433
 msgid "Committer identity unknown\n"
 msgstr "提交者身份未知\n"
 
-#: ident.c
+#: ident.c:439
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -20918,103 +21271,103 @@ msgstr ""
 "来设置您账号的缺省身份标识。\n"
 "如果仅在本仓库设置身份标识，则省略 --global 参数。\n"
 
-#: ident.c
+#: ident.c:474
 msgid "no email was given and auto-detection is disabled"
 msgstr "未提供邮件地址且自动探测被禁用"
 
-#: ident.c
+#: ident.c:479
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr "无法自动探测邮件地址（得到 '%s'）"
 
-#: ident.c
+#: ident.c:496
 msgid "no name was given and auto-detection is disabled"
 msgstr "未提供姓名且自动探测被禁用"
 
-#: ident.c
+#: ident.c:502
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "无法自动探测姓名（得到 '%s'）"
 
-#: ident.c
+#: ident.c:510
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "不允许空的姓名（对于 <%s>）"
 
-#: ident.c
+#: ident.c:516
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "姓名中仅包含禁用字符：%s"
 
-#: list-objects-filter-options.c
+#: list-objects-filter-options.c:67
 msgid "expected 'tree:<depth>'"
 msgstr "期望 'tree:<深度>'"
 
-#: list-objects-filter-options.c
+#: list-objects-filter-options.c:82
 msgid "sparse:path filters support has been dropped"
 msgstr "sparse:path 过滤器支持已被删除"
 
-#: list-objects-filter-options.c
+#: list-objects-filter-options.c:89
 #, c-format
 msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr "'object:type=<type>' 的值 '%s' 不是有效的对象类型"
 
-#: list-objects-filter-options.c
+#: list-objects-filter-options.c:108
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "无效的过滤器表达式 '%s'"
 
-#: list-objects-filter-options.c
+#: list-objects-filter-options.c:124
 #, c-format
 msgid "must escape char in sub-filter-spec: '%c'"
 msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'"
 
-#: list-objects-filter-options.c
+#: list-objects-filter-options.c:167
 msgid "expected something after combine:"
 msgstr "期望在组合后有一些东西："
 
-#: list-objects-filter-options.c
+#: list-objects-filter-options.c:247
 msgid "multiple filter-specs cannot be combined"
 msgstr "不能混用多种过滤规格"
 
-#: list-objects-filter-options.c
+#: list-objects-filter-options.c:352
 msgid "unable to upgrade repository format to support partial clone"
 msgstr "无法升级仓库格式以支持部分克隆"
 
-#: list-objects-filter-options.h
+#: list-objects-filter-options.h:121
 msgid "args"
 msgstr "参数"
 
-#: list-objects-filter-options.h
+#: list-objects-filter-options.h:122
 msgid "object filtering"
 msgstr "对象过滤"
 
-#: list-objects-filter.c
+#: list-objects-filter.c:533
 #, c-format
 msgid "unable to access sparse blob in '%s'"
 msgstr "不能访问 '%s' 中的稀疏数据对象"
 
-#: list-objects-filter.c
+#: list-objects-filter.c:536
 #, c-format
 msgid "unable to parse sparse filter data in %s"
 msgstr "无法解析 %s 中的稀疏过滤器数据"
 
-#: list-objects.c
+#: list-objects.c:123
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对象"
 
-#: list-objects.c
+#: list-objects.c:137
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象"
 
-#: list-objects.c
+#: list-objects.c:406
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "无法为提交 %s 加载根树"
 
-#: lockfile.c
+#: lockfile.c:154
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -21032,81 +21385,82 @@ msgstr ""
 "可能之前有一个 git 进程在这个仓库中异常退出：\n"
 "手动删除这个文件再继续。"
 
-#: lockfile.c
+#: lockfile.c:162
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "不能创建 '%s.lock'：%s"
 
-#: loose.c
+#: loose.c:156
 #, c-format
 msgid "could not write loose object index %s"
 msgstr "不能写入松散对象索引 %s"
 
-#: loose.c
+#: loose.c:165 loose.c:200
 #, c-format
 msgid "failed to write loose object index %s\n"
 msgstr "无法写入松散对象索引 %s\n"
 
-#: ls-refs.c
+#: ls-refs.c:181
 #, c-format
 msgid "unexpected line: '%s'"
 msgstr "意外的行：'%s'"
 
-#: ls-refs.c
+#: ls-refs.c:185
 msgid "expected flush after ls-refs arguments"
 msgstr "在 ls-refs 参数后应该有一个 flush 包"
 
-#: mailinfo.c
+#: mailinfo.c:1056
 msgid "quoted CRLF detected"
 msgstr "检测到被引用的 CRLF"
 
-#: mem-pool.c strbuf.c wrapper.c
+#: mem-pool.c:126 strbuf.c:280 strbuf.c:416 wrapper.c:673
 #, c-format
 msgid "unable to format message: %s"
 msgstr "无法格式化消息：%s"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:1823 merge-recursive.c:1241
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "无法合并子模组 %s （没有检出）"
 
-#: merge-ort.c
+#: merge-ort.c:1832
 #, c-format
 msgid "Failed to merge submodule %s (no merge base)"
 msgstr "无法合并子模组 %s （没有合并基线）"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:1842 merge-recursive.c:1248
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "无法合并子模组 %s（提交不存在）"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:1853 merge-ort.c:1864 merge-ort.c:1884 merge-ort.c:1903
+#: merge-ort.c:1937
 #, c-format
-msgid "Failed to merge submodule %s (repository corrupt)"
-msgstr "无法合并子模组 %s（仓库损坏）"
+msgid "error: failed to merge submodule %s (repository corrupt)"
+msgstr "错误：无法合并子模组 %s（仓库损坏）"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:1873 merge-recursive.c:1267
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr "无法合并子模组 %s （提交未跟随合并基线）"
 
-#: merge-ort.c
+#: merge-ort.c:1894 merge-ort.c:1913
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr "注意：快进子模组 %s 到 %s"
 
-#: merge-ort.c
+#: merge-ort.c:1945
 #, c-format
 msgid "Failed to merge submodule %s"
 msgstr "无法合并子模组 %s"
 
-#: merge-ort.c
+#: merge-ort.c:1953
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists: %s"
 msgstr "无法合并子模组 %s，但是存在一个可能的合并方案：%s"
 
-#: merge-ort.c
+#: merge-ort.c:1964
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -21115,21 +21469,22 @@ msgstr ""
 "无法合并子模组 %s，但是存在多个可能的合并：\n"
 "%s"
 
-#: merge-ort.c merge-recursive.c
-msgid "failed to execute internal merge"
-msgstr "无法执行内部合并"
+#: merge-ort.c:2210
+#, c-format
+msgid "error: failed to execute internal merge for %s"
+msgstr "错误：无法为 %s 执行内部合并"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:2220
 #, c-format
-msgid "unable to add %s to database"
-msgstr "不能添加 %s 至对象库"
+msgid "error: unable to add %s to database"
+msgstr "错误：不能添加 %s 至对象库"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:2230 merge-recursive.c:1471
 #, c-format
 msgid "Auto-merging %s"
 msgstr "自动合并 %s"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:2372 merge-recursive.c:2193
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -21138,7 +21493,7 @@ msgstr ""
 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
 "在：%s。"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:2384 merge-recursive.c:2203
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -21147,7 +21502,7 @@ msgstr ""
 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
 "径放置于此：%s"
 
-#: merge-ort.c
+#: merge-ort.c:2443
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -21157,14 +21512,14 @@ msgstr ""
 "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目"
 "录中，没有一个目标目录中包含多数文件。"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:2625 merge-recursive.c:2539
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:2799 merge-recursive.c:3326
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -21172,7 +21527,7 @@ msgid ""
 msgstr ""
 "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:2807 merge-recursive.c:3333
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -21181,7 +21536,7 @@ msgstr ""
 "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
 "动到 %5$s。"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:2821 merge-recursive.c:3329
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -21190,7 +21545,7 @@ msgstr ""
 "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
 "到 %s。"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:2830 merge-recursive.c:3336
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -21199,13 +21554,13 @@ msgstr ""
 "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
 "建议将其移动到 %5$s。"
 
-#: merge-ort.c
+#: merge-ort.c:2989
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
 "冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。"
 
-#: merge-ort.c
+#: merge-ort.c:3087
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -21215,29 +21570,29 @@ msgstr ""
 "冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这"
 "可能导致嵌套的冲突标签。"
 
-#: merge-ort.c
+#: merge-ort.c:3107 merge-ort.c:3132
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:3615
 #, c-format
-msgid "cannot read object %s"
-msgstr "不能读取对象 %s"
+msgid "error: cannot read object %s"
+msgstr "错误：不能读取对象 %s"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:3622
 #, c-format
-msgid "object %s is not a blob"
-msgstr "对象 %s 不是一个数据对象"
+msgid "error: object %s is not a blob"
+msgstr "错误：对象 %s 不是一个数据对象"
 
-#: merge-ort.c
+#: merge-ort.c:4058
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
 "%s instead."
 msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。"
 
-#: merge-ort.c
+#: merge-ort.c:4141
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -21246,7 +21601,7 @@ msgstr ""
 "冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位"
 "置。"
 
-#: merge-ort.c
+#: merge-ort.c:4150
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -21255,24 +21610,24 @@ msgstr ""
 "冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同"
 "位置。"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:4237 merge-recursive.c:3166
 msgid "content"
 msgstr "内容"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:4239 merge-recursive.c:3170
 msgid "add/add"
 msgstr "添加/添加"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:4241 merge-recursive.c:3215
 msgid "submodule"
 msgstr "子模组"
 
-#: merge-ort.c merge-recursive.c
+#: merge-ort.c:4244 merge-recursive.c:3216
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "冲突（%s）：合并冲突于 %s"
 
-#: merge-ort.c
+#: merge-ort.c:4289
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -21287,7 +21642,7 @@ msgstr ""
 #. commit that needs to be merged.  For example:
 #.  - go to submodule (mysubmodule), and either merge commit abc1234"
 #.
-#: merge-ort.c
+#: merge-ort.c:4661
 #, c-format
 msgid ""
 " - go to submodule (%s), and either merge commit %s\n"
@@ -21296,7 +21651,7 @@ msgstr ""
 " - 进入子模组（%s），要么合并提交 %s\n"
 "   要么更新至已合并这些变更的提交\n"
 
-#: merge-ort.c
+#: merge-ort.c:4672
 #, c-format
 msgid ""
 "Recursive merging with submodules currently only supports trivial cases.\n"
@@ -21324,89 +21679,95 @@ msgstr ""
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
 #.
-#: merge-ort.c
+#: merge-ort.c:5111
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "无法收集树 %s、%s、%s 的合并信息"
 
-#: merge-recursive.c
+#: merge-recursive.c:362
 msgid "(bad commit)\n"
 msgstr "（坏提交）\n"
 
-#: merge-recursive.c
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
 
-#: merge-recursive.c
+#: merge-recursive.c:399
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
 
-#: merge-recursive.c
+#: merge-recursive.c:891
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "无法创建路径 '%s'%s"
 
-#: merge-recursive.c
+#: merge-recursive.c:902
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "删除 %s 以便为子目录留出空间\n"
 
-#: merge-recursive.c
+#: merge-recursive.c:916 merge-recursive.c:935
 msgid ": perhaps a D/F conflict?"
 msgstr "：可能是一个目录/文件冲突？"
 
-#: merge-recursive.c
+#: merge-recursive.c:925
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
 
-#: merge-recursive.c
+#: merge-recursive.c:972
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s' 应为数据对象"
 
-#: merge-recursive.c
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "无法打开 '%s'：%s"
 
-#: merge-recursive.c
+#: merge-recursive.c:1008
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "无法创建符号链接 '%s'：%s"
 
-#: merge-recursive.c
+#: merge-recursive.c:1013
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "不知道如何处理 %06o %s '%s'"
 
-#: merge-recursive.c
+#: merge-recursive.c:1255 merge-recursive.c:1262 merge-recursive.c:1274
+#: merge-recursive.c:1293 merge-recursive.c:1327
+#, c-format
+msgid "Failed to merge submodule %s (repository corrupt)"
+msgstr "无法合并子模组 %s（仓库损坏）"
+
+#: merge-recursive.c:1281 merge-recursive.c:1300
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "子模组 %s 快进到如下提交："
 
-#: merge-recursive.c
+#: merge-recursive.c:1284 merge-recursive.c:1303
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "快进子模组 %s"
 
-#: merge-recursive.c
+#: merge-recursive.c:1331
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
 
-#: merge-recursive.c
+#: merge-recursive.c:1335
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "无法合并子模组 %s（非快进）"
 
-#: merge-recursive.c
+#: merge-recursive.c:1336
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "找到子模组的一个可能的合并方案：\n"
 
-#: merge-recursive.c
+#: merge-recursive.c:1339
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -21422,17 +21783,26 @@ msgstr ""
 "\n"
 "以接受此建议。\n"
 
-#: merge-recursive.c
+#: merge-recursive.c:1348
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "无法合并子模组 %s （发现多个合并）"
 
-#: merge-recursive.c
+#: merge-recursive.c:1430
+msgid "failed to execute internal merge"
+msgstr "无法执行内部合并"
+
+#: merge-recursive.c:1435
+#, c-format
+msgid "unable to add %s to database"
+msgstr "不能添加 %s 至对象库"
+
+#: merge-recursive.c:1495
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
 
-#: merge-recursive.c
+#: merge-recursive.c:1567
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -21441,7 +21811,7 @@ msgstr ""
 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本被保留。"
 
-#: merge-recursive.c
+#: merge-recursive.c:1572
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -21450,7 +21820,7 @@ msgstr ""
 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本被保留。"
 
-#: merge-recursive.c
+#: merge-recursive.c:1579
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -21459,7 +21829,7 @@ msgstr ""
 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本保留在 %8$s 中。"
 
-#: merge-recursive.c
+#: merge-recursive.c:1584
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -21468,40 +21838,40 @@ msgstr ""
 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本保留在 %9$s 中。"
 
-#: merge-recursive.c
+#: merge-recursive.c:1619
 msgid "rename"
 msgstr "重命名"
 
-#: merge-recursive.c
+#: merge-recursive.c:1619
 msgid "renamed"
 msgstr "重命名"
 
-#: merge-recursive.c
+#: merge-recursive.c:1670 merge-recursive.c:2576 merge-recursive.c:3243
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "拒绝丢失脏文件 '%s'"
 
-#: merge-recursive.c
+#: merge-recursive.c:1680
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
 
-#: merge-recursive.c
+#: merge-recursive.c:1738
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
 
-#: merge-recursive.c
+#: merge-recursive.c:1769
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
 
-#: merge-recursive.c
+#: merge-recursive.c:1774
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
 
-#: merge-recursive.c
+#: merge-recursive.c:1801
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
@@ -21510,18 +21880,18 @@ msgstr ""
 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
 
-#: merge-recursive.c
+#: merge-recursive.c:1806
 msgid " (left unresolved)"
 msgstr "（留下未解决）"
 
-#: merge-recursive.c
+#: merge-recursive.c:1898
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s-"
 ">%5$s"
 
-#: merge-recursive.c
+#: merge-recursive.c:2161
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -21531,7 +21901,7 @@ msgstr ""
 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
 "其它目录，没有目录包含大部分文件。"
 
-#: merge-recursive.c
+#: merge-recursive.c:2295
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -21540,333 +21910,343 @@ msgstr ""
 "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
 "%4$s->%5$s"
 
-#: merge-recursive.c
+#: merge-recursive.c:3087
+#, c-format
+msgid "cannot read object %s"
+msgstr "不能读取对象 %s"
+
+#: merge-recursive.c:3090
+#, c-format
+msgid "object %s is not a blob"
+msgstr "对象 %s 不是一个数据对象"
+
+#: merge-recursive.c:3154
 msgid "modify"
 msgstr "修改"
 
-#: merge-recursive.c
+#: merge-recursive.c:3154
 msgid "modified"
 msgstr "修改"
 
-#: merge-recursive.c
+#: merge-recursive.c:3193
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "略过 %s（已经做过相同合并）"
 
-#: merge-recursive.c
+#: merge-recursive.c:3246
 #, c-format
 msgid "Adding as %s instead"
 msgstr "而是以 %s 为名添加"
 
-#: merge-recursive.c
+#: merge-recursive.c:3450
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: merge-recursive.c
+#: merge-recursive.c:3473
 msgid "file/directory"
 msgstr "文件/目录"
 
-#: merge-recursive.c
+#: merge-recursive.c:3478
 msgid "directory/file"
 msgstr "目录/文件"
 
-#: merge-recursive.c
+#: merge-recursive.c:3485
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
 
-#: merge-recursive.c
+#: merge-recursive.c:3494
 #, c-format
 msgid "Adding %s"
 msgstr "添加 %s"
 
-#: merge-recursive.c
+#: merge-recursive.c:3503
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "冲突（add/add）：合并冲突于 %s"
 
-#: merge-recursive.c
+#: merge-recursive.c:3556
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "无法合并树 %s 和 %s"
 
-#: merge-recursive.c
+#: merge-recursive.c:3651
 msgid "Merging:"
 msgstr "合并："
 
-#: merge-recursive.c
+#: merge-recursive.c:3668
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "发现 %u 个共同祖先："
 msgstr[1] "发现 %u 个共同祖先："
 
-#: merge-recursive.c
+#: merge-recursive.c:3720
 msgid "merge returned no commit"
 msgstr "合并未返回提交"
 
-#: merge-recursive.c
+#: merge-recursive.c:3900
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "不能解析对象 '%s'"
 
-#: merge.c
+#: merge.c:46
 msgid "failed to read the cache"
 msgstr "无法读取缓存"
 
-#: midx-write.c
+#: midx-write.c:146
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "无法添加包文件 '%s'"
 
-#: midx-write.c
+#: midx-write.c:152
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "无法打开包索引 '%s'"
 
-#: midx-write.c
+#: midx-write.c:218
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "无法在包文件中定位对象 %d"
 
-#: midx-write.c
+#: midx-write.c:630
 msgid "cannot store reverse index file"
 msgstr "无法存储反向索引文件"
 
-#: midx-write.c
+#: midx-write.c:730
 #, c-format
 msgid "could not parse line: %s"
 msgstr "不能解析行：%s"
 
-#: midx-write.c
+#: midx-write.c:732
 #, c-format
 msgid "malformed line: %s"
 msgstr "格式错误的行：%s"
 
-#: midx-write.c
-msgid "ignoring existing multi-pack-index; checksum mismatch"
-msgstr "忽略已存在的多包索引，校验码不匹配"
-
-#: midx-write.c
+#: midx-write.c:913
 msgid "could not load pack"
 msgstr "不能载入包"
 
-#: midx-write.c
+#: midx-write.c:916
 #, c-format
 msgid "could not open index for %s"
 msgstr "不能打开 %s 的索引"
 
-#: midx-write.c
+#: midx-write.c:963
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "忽略已存在的多包索引，校验码不匹配"
+
+#: midx-write.c:982
 msgid "Adding packfiles to multi-pack-index"
 msgstr "添加包文件到多包索引"
 
-#: midx-write.c
+#: midx-write.c:1025
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "未知的首选包：'%s'"
 
-#: midx-write.c
+#: midx-write.c:1070
 #, c-format
 msgid "cannot select preferred pack %s with no objects"
 msgstr "不能选择没有对象的首选包 %s"
 
-#: midx-write.c
+#: midx-write.c:1101
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "没有看到要丢弃的包文件 %s"
 
-#: midx-write.c
+#: midx-write.c:1149
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "首选包 '%s' 已过期"
 
-#: midx-write.c
+#: midx-write.c:1162
 msgid "no pack files to index."
 msgstr "没有要索引的包文件。"
 
-#: midx-write.c
+#: midx-write.c:1169
 msgid "refusing to write multi-pack .bitmap without any objects"
 msgstr "拒绝写入没有任何对象的多包位图"
 
-#: midx-write.c
+#: midx-write.c:1237
 msgid "could not write multi-pack bitmap"
 msgstr "无法写入多包位图"
 
-#: midx-write.c
+#: midx-write.c:1256
 msgid "could not write multi-pack-index"
 msgstr "无法写入多包索引"
 
-#: midx-write.c
+#: midx-write.c:1313
 msgid "Counting referenced objects"
 msgstr "正在对引用对象计数"
 
-#: midx-write.c
+#: midx-write.c:1323
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "正在查找和删除未引用的包文件"
 
-#: midx-write.c
+#: midx-write.c:1520
 msgid "could not start pack-objects"
 msgstr "不能开始 pack-objects"
 
-#: midx-write.c
+#: midx-write.c:1540
 msgid "could not finish pack-objects"
 msgstr "不能结束 pack-objects"
 
-#: midx.c
+#: midx.c:49
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "多包索引的对象 ID 扇出表大小错误"
 
-#: midx.c
+#: midx.c:57
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr "对象 ID 扇出失序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c
+#: midx.c:73
 msgid "multi-pack-index OID lookup chunk is the wrong size"
 msgstr "多包索引的对象 ID 查询块大小错误"
 
-#: midx.c
+#: midx.c:86
 msgid "multi-pack-index object offset chunk is the wrong size"
 msgstr "多包索引的对象 ID 偏移块大小错误"
 
-#: midx.c
+#: midx.c:121
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "多包索引文件 %s 太小"
 
-#: midx.c
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
 
-#: midx.c
+#: midx.c:142
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-index 版本 %d 不能被识别"
 
-#: midx.c
+#: midx.c:147
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
 
-#: midx.c
+#: midx.c:167
 msgid "multi-pack-index required pack-name chunk missing or corrupted"
 msgstr "多包索引必需的包名块缺失或损坏"
 
-#: midx.c
+#: midx.c:169
 msgid "multi-pack-index required OID fanout chunk missing or corrupted"
 msgstr "多包索引必需的对象 ID 扇出块缺失或损坏"
 
-#: midx.c
+#: midx.c:171
 msgid "multi-pack-index required OID lookup chunk missing or corrupted"
 msgstr "多包索引必需的对象 ID 查询块缺失或损坏"
 
-#: midx.c
+#: midx.c:173
 msgid "multi-pack-index required object offsets chunk missing or corrupted"
 msgstr "多包索引必需的对象偏移块缺少或损坏"
 
-#: midx.c
+#: midx.c:199
 msgid "multi-pack-index pack-name chunk is too short"
 msgstr "多包索引包名块过短"
 
-#: midx.c
+#: midx.c:203
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
 
-#: midx.c
+#: midx.c:251
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "错的 pack-int-id：%u（共有 %u 个包）"
 
-#: midx.c
+#: midx.c:280
 msgid "MIDX does not contain the BTMP chunk"
 msgstr "多包索引中未包含 BTMP 块"
 
-#: midx.c
+#: midx.c:283
 #, c-format
 msgid "could not load bitmapped pack %<PRIu32>"
 msgstr "不能打开已被位图索引的包 %<PRIu32>"
 
-#: midx.c
+#: midx.c:324
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
 
-#: midx.c
+#: midx.c:328
 msgid "multi-pack-index large offset out of bounds"
 msgstr "多包索引大偏移区越界"
 
-#: midx.c
+#: midx.c:546
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "无法清理位于 %s 的多包索引"
 
-#: midx.c
+#: midx.c:609
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "多包索引文件存在，但无法解析"
 
-#: midx.c
+#: midx.c:617
 msgid "incorrect checksum"
 msgstr "不正确的校验码"
 
-#: midx.c
+#: midx.c:620
 msgid "Looking for referenced packfiles"
 msgstr "正在查找引用的包文件"
 
-#: midx.c
+#: midx.c:631
 msgid "the midx contains no oid"
 msgstr "midx 不包含 oid"
 
-#: midx.c
+#: midx.c:640
 msgid "Verifying OID order in multi-pack-index"
 msgstr "校验多包索引中的 OID 顺序"
 
-#: midx.c
+#: midx.c:649
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c
+#: midx.c:669
 msgid "Sorting objects by packfile"
 msgstr "通过包文件为对象排序"
 
-#: midx.c
+#: midx.c:676
 msgid "Verifying object offsets"
 msgstr "校验对象偏移"
 
-#: midx.c
+#: midx.c:692
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "无法为 oid[%d] = %s 加载包条目"
 
-#: midx.c
+#: midx.c:698
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "无法为包文件 %s 加载包索引"
 
-#: midx.c
+#: midx.c:707
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
 
-#: name-hash.c
+#: name-hash.c:548
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "不能创建 lazy_dir 线程：%s"
 
-#: name-hash.c
+#: name-hash.c:570
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "不能创建 lazy_name 线程：%s"
 
-#: name-hash.c
+#: name-hash.c:576
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "不能加入 lazy_name 线程：%s"
 
-#: notes-merge.c
+#: notes-merge.c:285
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
@@ -21877,21 +22257,21 @@ msgstr ""
 "在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "
 "notes merge --abort' 来提交/终止前一次合并。"
 
-#: notes-merge.c
+#: notes-merge.c:292
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "您尚未结束注释合并（存在 %s）。"
 
-#: notes-utils.c
+#: notes-utils.c:54
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr "不能提交未初始化/未引用的注解树"
 
-#: notes-utils.c
+#: notes-utils.c:116
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "坏的 notes.rewriteMode 值：'%s'"
 
-#: notes-utils.c
+#: notes-utils.c:128
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
@@ -21900,298 +22280,300 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
 #. the environment variable, the second %s is
 #. its value.
 #.
-#: notes-utils.c
+#: notes-utils.c:158
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "坏的 %s 值：'%s'"
 
-#: object-file-convert.c
+#: object-file-convert.c:79
 msgid "failed to decode tree entry"
 msgstr "无法解码树对象"
 
-#: object-file-convert.c
+#: object-file-convert.c:81
 #, c-format
 msgid "failed to map tree entry for %s"
 msgstr "无法为 %s 映射树对象"
 
-#: object-file-convert.c
+#: object-file-convert.c:158 object-file-convert.c:165
+#: object-file-convert.c:177 object-file-convert.c:197
+#: object-file-convert.c:233
 #, c-format
 msgid "bad %s in commit"
 msgstr "提交中有错误的 %s"
 
-#: object-file-convert.c
+#: object-file-convert.c:168 object-file-convert.c:180
 #, c-format
 msgid "unable to map %s %s in commit object"
 msgstr "无法将 %s %s 映射到提交对象中"
 
-#: object-file-convert.c
+#: object-file-convert.c:277
 #, c-format
 msgid "Failed to convert object from %s to %s"
 msgstr "无法将对象从 %s 转换为 %s"
 
-#: object-file.c
+#: object-file.c:463
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
 
-#: object-file.c
+#: object-file.c:523
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "无法规范化备用对象路径：%s"
 
-#: object-file.c
+#: object-file.c:598
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s：忽略备用对象库，嵌套太深"
 
-#: object-file.c
+#: object-file.c:645
 msgid "unable to fdopen alternates lockfile"
 msgstr "无法 fdopen 替换锁文件"
 
-#: object-file.c
+#: object-file.c:663
 msgid "unable to read alternates file"
 msgstr "无法读取替代文件"
 
-#: object-file.c
+#: object-file.c:670
 msgid "unable to move new alternates file into place"
 msgstr "无法将新的替代文件移动到位"
 
-#: object-file.c
+#: object-file.c:748
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "路径 '%s' 不存在"
 
-#: object-file.c
+#: object-file.c:769
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
 
-#: object-file.c
+#: object-file.c:775
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "参考仓库 '%s' 不是一个本地仓库。"
 
-#: object-file.c
+#: object-file.c:781
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "参考仓库 '%s' 是一个浅克隆"
 
-#: object-file.c
+#: object-file.c:789
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "参考仓库 '%s' 已被移植"
 
-#: object-file.c
+#: object-file.c:820
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr "无法找到和 %s 匹配的对象目录"
 
-#: object-file.c
+#: object-file.c:870
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "解析备用引用时无效的行：%s"
 
-#: object-file.c
+#: object-file.c:1026
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
 
-#: object-file.c
+#: object-file.c:1061
 #, c-format
 msgid "mmap failed%s"
 msgstr "mmap 失败%s"
 
-#: object-file.c
+#: object-file.c:1235
 #, c-format
 msgid "object file %s is empty"
 msgstr "对象文件 %s 为空"
 
-#: object-file.c
+#: object-file.c:1358 object-file.c:2913
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "损坏的松散对象 '%s'"
 
-#: object-file.c
+#: object-file.c:1360 object-file.c:2917
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "松散对象 '%s' 后面有垃圾数据"
 
-#: object-file.c
+#: object-file.c:1470
 #, c-format
 msgid "unable to open loose object %s"
 msgstr "无法打开松散对象 %s"
 
-#: object-file.c
+#: object-file.c:1489
 #, c-format
 msgid "unable to parse %s header"
 msgstr "无法解析 %s 头部"
 
-#: object-file.c
+#: object-file.c:1491
 msgid "invalid object type"
 msgstr "无效的对象类型"
 
-#: object-file.c
+#: object-file.c:1502
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "无法解开 %s 头部"
 
-#: object-file.c
+#: object-file.c:1506
 #, c-format
 msgid "header for %s too long, exceeds %d bytes"
 msgstr "%s 的头部太长，超出了 %d 字节"
 
-#: object-file.c
+#: object-file.c:1512
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "松散对象 %s（保存在 %s）已损坏"
 
-#: object-file.c
+#: object-file.c:1627
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "找不到 %2$s 的替代 %1$s"
 
-#: object-file.c
+#: object-file.c:1630
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "打包对象 %s（保存在 %s）已损坏"
 
-#: object-file.c
+#: object-file.c:1671 object-file.c:1732
 #, c-format
 msgid "missing mapping of %s to %s"
 msgstr "缺少 %s 到 %s 的映射"
 
-#: object-file.c
+#: object-file.c:1934
 #, c-format
 msgid "unable to write file %s"
 msgstr "无法写文件 %s"
 
-#: object-file.c
+#: object-file.c:1941
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "无法为 '%s' 设置权限"
 
-#: object-file.c
+#: object-file.c:1978
 msgid "error when closing loose object file"
 msgstr "关闭松散对象文件时出错"
 
-#: object-file.c
+#: object-file.c:2054
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
 
-#: object-file.c
+#: object-file.c:2059
 msgid "unable to create temporary file"
 msgstr "无法创建临时文件"
 
-#: object-file.c
+#: object-file.c:2102
 msgid "unable to write loose object file"
 msgstr "不能写松散对象文件"
 
-#: object-file.c
+#: object-file.c:2168
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "不能压缩新对象 %s（%d）"
 
-#: object-file.c
+#: object-file.c:2172
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
 
-#: object-file.c
+#: object-file.c:2175
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "被 %s 的不稳定对象源数据搞糊涂了"
 
-#: object-file.c
+#: object-file.c:2273
 #, c-format
 msgid "write stream object %ld != %<PRIuMAX>"
 msgstr "写入流对象 %ld != %<PRIuMAX>"
 
-#: object-file.c
+#: object-file.c:2284
 #, c-format
 msgid "unable to stream deflate new object (%d)"
 msgstr "不能流式压缩新对象（%d）"
 
-#: object-file.c
+#: object-file.c:2287
 #, c-format
 msgid "deflateEnd on stream object failed (%d)"
 msgstr "在流对象上调用 deflateEnd 失败（%d）"
 
-#: object-file.c
+#: object-file.c:2304
 #, c-format
 msgid "unable to create directory %s"
 msgstr "无法创建目录 %s"
 
-#: object-file.c
+#: object-file.c:2425
 #, c-format
 msgid "cannot read object for %s"
 msgstr "不能读取对象 %s"
 
-#: object-file.c
+#: object-file.c:2428
 #, c-format
 msgid "cannot map object %s to %s"
 msgstr "无法将对象 %s 映射到 %s"
 
-#: object-file.c
+#: object-file.c:2479
 #, c-format
 msgid "object fails fsck: %s"
 msgstr "对象 fsck 失败：%s"
 
-#: object-file.c
+#: object-file.c:2512
 msgid "refusing to create malformed object"
 msgstr "拒绝创建格式错误的对象"
 
-#: object-file.c
+#: object-file.c:2581
 #, c-format
 msgid "read error while indexing %s"
 msgstr "索引 %s 时读取错误"
 
-#: object-file.c
+#: object-file.c:2584
 #, c-format
 msgid "short read while indexing %s"
 msgstr "索引 %s 时读入不完整"
 
-#: object-file.c
+#: object-file.c:2657 object-file.c:2667
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s：无法插入数据库"
 
-#: object-file.c
+#: object-file.c:2673
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s：不支持的文件类型"
 
-#: object-file.c
+#: object-file.c:2699
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s 不是一个有效的 '%s' 对象"
 
-#: object-file.c
+#: object-file.c:2726
 #, c-format
 msgid "unable to open %s"
 msgstr "不能打开 %s"
 
-#: object-file.c
+#: object-file.c:2924
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "%s 的哈希值不匹配（预期 %s）"
 
-#: object-file.c
+#: object-file.c:2950
 #, c-format
 msgid "unable to mmap %s"
 msgstr "不能 mmap %s"
 
-#: object-file.c
+#: object-file.c:2956
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "无法解压缩 %s 的头部"
 
-#: object-file.c
+#: object-file.c:2961
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "无法解析 %s 的头部"
 
-#: object-file.c
+#: object-file.c:2972
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "无法解压缩 %s 的内容"
@@ -22200,7 +22582,7 @@ msgstr "无法解压缩 %s 的内容"
 #. output shown when we cannot look up or parse the
 #. object in question. E.g. "deadbeef [bad object]".
 #.
-#: object-name.c
+#: object-name.c:403
 #, c-format
 msgid "%s [bad object]"
 msgstr "%s [坏的对象]"
@@ -22210,7 +22592,7 @@ msgstr "%s [坏的对象]"
 #. *
 #.    "deadbeef commit 2021-01-01 - Some Commit Message"
 #.
-#: object-name.c
+#: object-name.c:430
 #, c-format
 msgid "%s commit %s - %s"
 msgstr "%s 提交 %s - %s"
@@ -22226,7 +22608,7 @@ msgstr "%s 提交 %s - %s"
 #. The third argument is the "tag" string
 #. from object.c.
 #.
-#: object-name.c
+#: object-name.c:451
 #, c-format
 msgid "%s tag %s - %s"
 msgstr "%s 标签 %s - %s"
@@ -22237,7 +22619,7 @@ msgstr "%s 标签 %s - %s"
 #. *
 #.    "deadbeef [bad tag, could not parse it]"
 #.
-#: object-name.c
+#: object-name.c:462
 #, c-format
 msgid "%s [bad tag, could not parse it]"
 msgstr "%s [坏的标签，无法解析]"
@@ -22245,7 +22627,7 @@ msgstr "%s [坏的标签，无法解析]"
 #. TRANSLATORS: This is a line of ambiguous <type>
 #. object output. E.g. "deadbeef tree".
 #.
-#: object-name.c
+#: object-name.c:470
 #, c-format
 msgid "%s tree"
 msgstr "%s 树"
@@ -22253,12 +22635,12 @@ msgstr "%s 树"
 #. TRANSLATORS: This is a line of ambiguous <type>
 #. object output. E.g. "deadbeef blob".
 #.
-#: object-name.c
+#: object-name.c:476
 #, c-format
 msgid "%s blob"
 msgstr "%s 数据对象"
 
-#: object-name.c
+#: object-name.c:601
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr "短对象ID %s 存在歧义"
@@ -22267,7 +22649,7 @@ msgstr "短对象ID %s 存在歧义"
 #. objects composed in show_ambiguous_object(). See
 #. its "TRANSLATORS" comments for details.
 #.
-#: object-name.c
+#: object-name.c:623
 #, c-format
 msgid ""
 "The candidates are:\n"
@@ -22276,7 +22658,7 @@ msgstr ""
 "候选者有：\n"
 "%s"
 
-#: object-name.c
+#: object-name.c:938
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -22297,22 +22679,22 @@ msgstr ""
 "引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
 "false\" 命令关闭本消息通知。"
 
-#: object-name.c
+#: object-name.c:1059
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr "'%.*s' 的日志仅能回到 %s"
 
-#: object-name.c
+#: object-name.c:1076
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr "'%.*s' 的日志仅有 %d 个条目"
 
-#: object-name.c
+#: object-name.c:1879
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中"
 
-#: object-name.c
+#: object-name.c:1885
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
@@ -22321,12 +22703,12 @@ msgstr ""
 "路径 '%s' 存在，而 '%s' 不存在\n"
 "提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？"
 
-#: object-name.c
+#: object-name.c:1894
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr "路径 '%s' 不在 '%.*s' 中"
 
-#: object-name.c
+#: object-name.c:1923
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
@@ -22335,7 +22717,7 @@ msgstr ""
 "路径 '%s' 在索引中，但不在暂存区 %d 中\n"
 "提示：您的意思是 ':%d:%s'？"
 
-#: object-name.c
+#: object-name.c:1940
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
@@ -22344,396 +22726,428 @@ msgstr ""
 "路径 '%s' 在索引中，但 '%s' 不在\n"
 "提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？"
 
-#: object-name.c
+#: object-name.c:1948
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
 msgstr "路径 '%s' 在磁盘上，但不在索引里"
 
-#: object-name.c
+#: object-name.c:1950
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）"
 
-#: object-name.c
+#: object-name.c:1963
 msgid "relative path syntax can't be used outside working tree"
 msgstr "不能在工作区之外使用相对路径语法"
 
-#: object-name.c
+#: object-name.c:2002
 #, c-format
 msgid "<object>:<path> required, only <object> '%s' given"
 msgstr "需要 <对象>:<路径>，只给出了 <对象> '%s'"
 
-#: object-name.c
+#: object-name.c:2118
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr "无效的对象名 '%.*s'。"
 
-#: object.c
+#: object.c:59
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr "无效的对象类型 \"%s\""
 
-#: object.c
+#: object.c:179
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "对象 %s 是一个 %s，不是一个 %s"
 
-#: object.c
+#: object.c:279
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "对象 %s 有未知的类型 id %d"
 
-#: object.c
+#: object.c:292
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "不能解析对象：%s"
 
-#: object.c
+#: object.c:321 object.c:344
 #, c-format
 msgid "hash mismatch %s"
 msgstr "哈希值与 %s 不匹配"
 
-#: pack-bitmap-write.c
+#: pack-bitmap-write.c:184
+#, c-format
+msgid "duplicate entry when writing bitmap index: %s"
+msgstr "写入位图索引时存在重复条目：'%s'"
+
+#: pack-bitmap-write.c:566
+#, c-format
+msgid "attempted to store non-selected commit: '%s'"
+msgstr "尝试存储未选定的提交：'%s'"
+
+#: pack-bitmap-write.c:866
+msgid "too many pseudo-merges"
+msgstr "太多伪合并"
+
+#: pack-bitmap-write.c:1045
 msgid "trying to write commit not in index"
 msgstr "尝试写入未在索引中的提交"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:154
 msgid "failed to load bitmap index (corrupted?)"
 msgstr "无法载入位图索引（已损坏？）"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:186
 msgid "corrupted bitmap index (too small)"
 msgstr "损坏的位图索引（太小）"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:189
 msgid "corrupted bitmap index file (wrong header)"
 msgstr "损坏的位图索引（错误的文件头）"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:193
 #, c-format
 msgid "unsupported version '%d' for bitmap index file"
 msgstr "不支持的位图索引文件版本 '%d'"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:207
 msgid "corrupted bitmap index file (too short to fit hash cache)"
 msgstr "损坏的位图索引（太小，容不下哈希缓存）"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:216
 msgid "corrupted bitmap index file (too short to fit lookup table)"
 msgstr "损坏的位图索引（太小，容不下查询表）"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:228
+msgid ""
+"corrupted bitmap index file (too short to fit pseudo-merge table header)"
+msgstr "损坏的位图索引文件（太短而无法容纳伪合并表头）"
+
+#: pack-bitmap.c:232
+msgid "corrupted bitmap index file (too short to fit pseudo-merge table)"
+msgstr "损坏的位图索引（太短而无法容纳伪合并表）"
+
+#: pack-bitmap.c:246
+msgid "corrupted bitmap index file, pseudo-merge table too short"
+msgstr "损坏的位图索引，伪合并表过短"
+
+#: pack-bitmap.c:293
 #, c-format
 msgid "duplicate entry in bitmap index: '%s'"
 msgstr "位图索引中的重复条目：'%s'"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:337
 #, c-format
 msgid "corrupt ewah bitmap: truncated header for entry %d"
 msgstr "损坏的 EWAH 位图：条目 %d 截断的文件头"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:344
 #, c-format
 msgid "corrupt ewah bitmap: commit index %u out of range"
 msgstr "损坏的 EWAH 位图：提交索引 %u 超出范围"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:352
 msgid "corrupted bitmap pack index"
 msgstr "损坏的位图包索引"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:358
 msgid "invalid XOR offset in bitmap pack index"
 msgstr "位图包索引中 XOR 偏移值无效"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:404 pack-bitmap.c:489
 msgid "cannot fstat bitmap file"
 msgstr "不能对位图文件调用 fstat"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:431
 msgid "checksum doesn't match in MIDX and bitmap"
 msgstr "MIDX 和位图中的校验码不匹配"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:436
 msgid "multi-pack bitmap is missing required reverse index"
 msgstr "多包位图缺少必需的反向索引"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:442
 #, c-format
 msgid "could not open pack %s"
 msgstr "不能打开包 %s"
 
-#: pack-bitmap.c t/helper/test-read-midx.c
+#: pack-bitmap.c:449 t/helper/test-read-midx.c:94
 msgid "could not determine MIDX preferred pack"
 msgstr "不能确定多包索引的首选包"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:455
 #, c-format
 msgid "preferred pack (%s) is invalid"
 msgstr "首选包 (%s) 无效"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:709
 msgid "corrupt bitmap lookup table: triplet position out of index"
 msgstr "损坏的位图查询表：三元组位置超出索引"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:803
 msgid "corrupt bitmap lookup table: xor chain exceeds entry count"
 msgstr "损坏的位图查询表：xor 链超出条目数"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:814
 #, c-format
 msgid "corrupt bitmap lookup table: commit index %u out of range"
 msgstr "损坏的位图查询表：提交索引 %u 超出范围"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:839 pack-bitmap.c:857
 #, c-format
 msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\""
 msgstr "损坏的 EWAH 位图：提交 \"%s\" 位图的文件头被截断"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2276
 #, c-format
 msgid "unable to load pack: '%s', disabling pack-reuse"
 msgstr "无法打开包：'%s'，禁用包重用"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2300
 msgid "unable to compute preferred pack, disabling pack-reuse"
 msgstr "无法计算首选包，禁用包重用"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2463
 #, c-format
 msgid "object '%s' not found in type bitmaps"
 msgstr "对象 %s 为在类型位图中找到"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2467
 #, c-format
 msgid "object '%s' does not have a unique type"
 msgstr "对象 '%s' 没有唯一的类型"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2471
 #, c-format
 msgid "object '%s': real type '%s', expected: '%s'"
 msgstr "对象 '%s'：实际类型 '%s'，预期：'%s'"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2486 pack-bitmap.c:2501
 #, c-format
 msgid "object not in bitmap: '%s'"
 msgstr "对象不在位图中：%s"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2518 pack-bitmap.c:2584 pack-bitmap.c:2592
 msgid "failed to load bitmap indexes"
 msgstr "无法载入位图索引"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2521
 msgid "you must specify exactly one commit to test"
 msgstr "您必须准确指定一个提交来测试"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2539
 #, c-format
 msgid "commit '%s' doesn't have an indexed bitmap"
 msgstr "提交 '%s' 没有索引位图"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2566
 msgid "mismatch in bitmap results"
 msgstr "位图结果不一致"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2713 pack-bitmap.c:2739
+#, c-format
+msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)"
+msgstr "伪合并索引超出范围 (%<PRIu32> >= %<PRIuMAX>)"
+
+#: pack-bitmap.c:2911
 #, c-format
 msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>"
 msgstr "无法在包 '%2$s' 偏移 %3$<PRIuMAX> 中找到 '%1$s'"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2948
 #, c-format
 msgid "unable to get disk usage of '%s'"
 msgstr "无法得到 '%s' 的磁盘使用量"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:3021
 #, c-format
 msgid "bitmap file '%s' has invalid checksum"
 msgstr "位图文件 '%s' 有无效的校验码"
 
-#: pack-mtimes.c
+#: pack-mtimes.c:49
 #, c-format
 msgid "mtimes file %s is too small"
 msgstr "mtimes 文件 %s 太小"
 
-#: pack-mtimes.c
+#: pack-mtimes.c:60
 #, c-format
 msgid "mtimes file %s has unknown signature"
 msgstr "mtimes 文件 %s 有未知的签名"
 
-#: pack-mtimes.c
+#: pack-mtimes.c:65
 #, c-format
 msgid "mtimes file %s has unsupported version %<PRIu32>"
 msgstr "mtimes 文件 %s 不支持的版本 %<PRIu32>"
 
-#: pack-mtimes.c
+#: pack-mtimes.c:71
 #, c-format
 msgid "mtimes file %s has unsupported hash id %<PRIu32>"
 msgstr "mtimes 文件 %s 有不支持的哈希 ID %<PRIu32>"
 
-#: pack-mtimes.c
+#: pack-mtimes.c:82
 #, c-format
 msgid "mtimes file %s is corrupt"
 msgstr "mtimes 文件 %s 损坏"
 
-#: pack-revindex.c
+#: pack-revindex.c:232
 #, c-format
 msgid "reverse-index file %s is too small"
 msgstr "反向索引文件 %s 太小"
 
-#: pack-revindex.c
+#: pack-revindex.c:237
 #, c-format
 msgid "reverse-index file %s is corrupt"
 msgstr "反向索引文件 %s 损坏"
 
-#: pack-revindex.c
+#: pack-revindex.c:245
 #, c-format
 msgid "reverse-index file %s has unknown signature"
 msgstr "反向索引文件 %s 有错误的签名"
 
-#: pack-revindex.c
+#: pack-revindex.c:249
 #, c-format
 msgid "reverse-index file %s has unsupported version %<PRIu32>"
 msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>"
 
-#: pack-revindex.c
+#: pack-revindex.c:254
 #, c-format
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>"
 
-#: pack-revindex.c
+#: pack-revindex.c:326
 msgid "invalid checksum"
 msgstr "无效的校验码 %s"
 
-#: pack-revindex.c
+#: pack-revindex.c:339
 #, c-format
 msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>"
 msgstr "位于 %<PRIu64> 的无效的反向索引：%<PRIu32> != %<PRIu32>"
 
-#: pack-revindex.c
+#: pack-revindex.c:353
 msgid "multi-pack-index reverse-index chunk is the wrong size"
 msgstr "多包索引的反向索引块大小错误"
 
-#: pack-revindex.c
+#: pack-revindex.c:545
 msgid "could not determine preferred pack"
 msgstr "无法确定首选包"
 
-#: pack-write.c
+#: pack-write.c:250
 msgid "cannot both write and verify reverse index"
 msgstr "无法同时写入和校验反向索引"
 
-#: pack-write.c
+#: pack-write.c:269
 #, c-format
 msgid "could not stat: %s"
 msgstr "不能调用 stat：%s"
 
-#: pack-write.c
+#: pack-write.c:281 pack-write.c:341
 #, c-format
 msgid "failed to make %s readable"
 msgstr "无法设置 %s 为可读"
 
-#: pack-write.c
+#: pack-write.c:593
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr "无法写入 '%s' 承诺者文件"
 
-#: packfile.c
+#: packfile.c:644
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
 
-#: packfile.c
+#: packfile.c:674
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr "包文件 %s 不能被映射%s"
 
-#: packfile.c
+#: packfile.c:1938
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
 
-#: packfile.c
+#: packfile.c:1942
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
 
-#: parse-options-cb.c
+#: parse-options-cb.c:46
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr "格式错误的到期时间：'%s'"
 
-#: parse-options-cb.c
+#: parse-options-cb.c:59
 #, c-format
 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
 
-#: parse-options-cb.c
+#: parse-options-cb.c:137 parse-options-cb.c:154
 #, c-format
 msgid "malformed object name '%s'"
 msgstr "格式错误的对象名 '%s'"
 
-#: parse-options-cb.c
+#: parse-options-cb.c:314
 #, c-format
 msgid "option `%s' expects \"%s\" or \"%s\""
 msgstr "选项 `%s' 期望 \"%s\" 或 \"%s\""
 
-#: parse-options.c
+#: parse-options.c:59
 #, c-format
 msgid "%s requires a value"
 msgstr "%s 需要一个值"
 
-#: parse-options.c
+#: parse-options.c:81 parse-options.c:85
 #, c-format
 msgid "%s takes no value"
 msgstr "%s 不取值"
 
-#: parse-options.c
+#: parse-options.c:83
 #, c-format
 msgid "%s isn't available"
 msgstr "%s 不可用"
 
-#: parse-options.c
+#: parse-options.c:200
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
 
-#: parse-options.c
+#: parse-options.c:440
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）"
 
-#: parse-options.c
+#: parse-options.c:489 parse-options.c:497
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "您的意思是 `--%s`（有两个短线）？"
 
-#: parse-options.c
+#: parse-options.c:776 parse-options.c:1239
 #, c-format
 msgid "alias of --%s"
 msgstr "--%s 的别名"
 
-#: parse-options.c
+#: parse-options.c:1039
 msgid "need a subcommand"
 msgstr "需要一个子命令"
 
-#: parse-options.c
+#: parse-options.c:1045
 #, c-format
 msgid "unknown option `%s'"
 msgstr "未知选项 `%s'"
 
-#: parse-options.c
+#: parse-options.c:1047
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "未知开关 `%c'"
 
-#: parse-options.c
+#: parse-options.c:1049
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "字符串中未知的非 ascii 字符选项：`%s'"
 
-#: parse-options.c
+#: parse-options.c:1078
 msgid "..."
 msgstr "..."
 
-#: parse-options.c
+#: parse-options.c:1115
 #, c-format
 msgid "usage: %s"
 msgstr "用法：%s"
@@ -22741,7 +23155,7 @@ msgstr "用法：%s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c
+#: parse-options.c:1130
 #, c-format
 msgid "   or: %s"
 msgstr "  或：%s"
@@ -22765,335 +23179,405 @@ msgstr "  或：%s"
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
 #.
-#: parse-options.c
+#: parse-options.c:1151
 #, c-format
 msgid "%*s%s"
 msgstr "%*s%s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c
+#: parse-options.c:1174
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c
+#: parse-options.c:1231
 msgid "-NUM"
 msgstr "-数字"
 
-#: parse-options.c
+#: parse-options.c:1260
 #, c-format
 msgid "opposite of --no-%s"
 msgstr "与 --no-%s 相反"
 
-#: parse-options.h
+#: parse-options.h:313
 msgid "expiry-date"
 msgstr "到期时间"
 
-#: parse-options.h
+#: parse-options.h:349
 msgid "no-op (backward compatibility)"
 msgstr "空操作（向后兼容）"
 
-#: parse-options.h
+#: parse-options.h:508
 msgid "be more verbose"
 msgstr "更加详细"
 
-#: parse-options.h
+#: parse-options.h:516
 msgid "be more quiet"
 msgstr "更加安静"
 
-#: parse-options.h
+#: parse-options.h:527
 msgid "use <n> digits to display object names"
 msgstr "用 <n> 位数字显示对象名"
 
-#: parse-options.h
+#: parse-options.h:533
 msgid "prefixed path to initial superproject"
 msgstr "用来初始化父项目的前缀路径"
 
-#: parse-options.h
+#: parse-options.h:581
 msgid "how to strip spaces and #comments from message"
 msgstr "设置如何删除提交说明里的空格和#注释"
 
-#: parse-options.h
+#: parse-options.h:582
 msgid "read pathspec from file"
 msgstr "从文件读取路径表达式"
 
-#: parse-options.h
+#: parse-options.h:583
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔"
 
-#: parse.c
+#: parse.c:196
 #, c-format
 msgid "bad boolean environment value '%s' for '%s'"
 msgstr "对于 '%2$s' 的错误的布尔环境取值 '%1$s'"
 
-#: parse.c
+#: parse.c:209
 #, c-format
 msgid "failed to parse %s"
 msgstr "无法解析 %s"
 
-#: path.c
+#: path.c:869
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "不能设置 %s 为组可写"
 
-#: pathspec.c
+#: pathspec.c:181
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
 
-#: pathspec.c
+#: pathspec.c:199
 msgid "Only one 'attr:' specification is allowed."
 msgstr "只允许一个 'attr:' 规格。"
 
-#: pathspec.c
+#: pathspec.c:202
 msgid "attr spec must not be empty"
 msgstr "属性规格不能为空"
 
-#: pathspec.c
+#: pathspec.c:245
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "无效的属性名 %s"
 
-#: pathspec.c
+#: pathspec.c:310
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
 
-#: pathspec.c
+#: pathspec.c:317
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
 
-#: pathspec.c
+#: pathspec.c:357
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "路径规格包含无效的神奇前缀"
 
-#: pathspec.c
+#: pathspec.c:378
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
 
-#: pathspec.c
+#: pathspec.c:383
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
 
-#: pathspec.c
+#: pathspec.c:421
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
 
-#: pathspec.c
+#: pathspec.c:480
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s：'literal' 和 'glob' 不兼容"
 
-#: pathspec.c
+#: pathspec.c:496
 #, c-format
 msgid "'%s' is outside the directory tree"
 msgstr "'%s' 位于目录树之外"
 
-#: pathspec.c
+#: pathspec.c:501
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr "%s：'%s' 在位于 '%s' 的仓库之外"
 
-#: pathspec.c
+#: pathspec.c:575
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s'（助记符：'%c'）"
 
-#: pathspec.c
+#: pathspec.c:592
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
 
-#: pathspec.c
+#: pathspec.c:659
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "路径规格 '%s' 位于符号链接中"
 
-#: pathspec.c
+#: pathspec.c:704
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr "行被错误地引用：%s"
 
-#: pkt-line.c
+#: pkt-line.c:98
 msgid "unable to write flush packet"
 msgstr "无法写 flush 包"
 
-#: pkt-line.c
+#: pkt-line.c:105
 msgid "unable to write delim packet"
 msgstr "无法写 delim 包"
 
-#: pkt-line.c
+#: pkt-line.c:112
 msgid "unable to write response end packet"
 msgstr "无法写入响应结束数据包"
 
-#: pkt-line.c
+#: pkt-line.c:119
 msgid "flush packet write failed"
 msgstr "flush 包写错误"
 
-#: pkt-line.c
+#: pkt-line.c:159
 msgid "protocol error: impossibly long line"
 msgstr "协议错误：不可能的长行"
 
-#: pkt-line.c
+#: pkt-line.c:175 pkt-line.c:177
 msgid "packet write with format failed"
 msgstr "格式化包写入错误"
 
-#: pkt-line.c
+#: pkt-line.c:210 pkt-line.c:258
 msgid "packet write failed - data exceeds max packet size"
 msgstr "写数据包失败：数据超过了包的最大长度"
 
-#: pkt-line.c
+#: pkt-line.c:228
 #, c-format
 msgid "packet write failed: %s"
 msgstr "数据包写入失败：%s"
 
-#: pkt-line.c
+#: pkt-line.c:358 pkt-line.c:359
 msgid "read error"
 msgstr "读取错误"
 
-#: pkt-line.c
+#: pkt-line.c:369 pkt-line.c:370
 msgid "the remote end hung up unexpectedly"
 msgstr "远端意外挂断了"
 
-#: pkt-line.c
+#: pkt-line.c:430 pkt-line.c:432
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "协议错误：错误的行长度字符串：%.4s"
 
-#: pkt-line.c
+#: pkt-line.c:447 pkt-line.c:449 pkt-line.c:455 pkt-line.c:457
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "协议错误：错误的行长度 %d"
 
-#: pkt-line.c sideband.c
+#: pkt-line.c:509 sideband.c:171
 #, c-format
 msgid "remote error: %s"
 msgstr "远程错误：%s"
 
-#: preload-index.c
+#: preload-index.c:131
 msgid "Refreshing index"
 msgstr "正在刷新索引"
 
-#: preload-index.c
+#: preload-index.c:150
 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr "无法创建线程 lstat：%s"
 
-#: pretty.c
+#: pretty.c:1084
 msgid "unable to parse --pretty format"
 msgstr "不能解析 --pretty 格式"
 
-#: promisor-remote.c
+#: promisor-remote.c:34
+msgid "lazy fetching disabled; some objects may not be available"
+msgstr "禁用延迟获取； 某些对象可能不可用"
+
+#: promisor-remote.c:50
 msgid "promisor-remote: unable to fork off fetch subprocess"
 msgstr "promisor-remote：无法派生 fetch 子进程"
 
-#: promisor-remote.c
+#: promisor-remote.c:57 promisor-remote.c:59
 msgid "promisor-remote: could not write to fetch subprocess"
 msgstr "promisor-remote：无法向 fetch 子进程写入"
 
-#: promisor-remote.c
+#: promisor-remote.c:63
 msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入"
 
-#: promisor-remote.c
+#: promisor-remote.c:73
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "promisor 远程名称不能以 '/' 开始：%s"
 
-#: promisor-remote.c
+#: promisor-remote.c:285
 #, c-format
 msgid "could not fetch %s from promisor remote"
 msgstr "无法从承诺者远程获取 %s"
 
-#: protocol-caps.c
+#: protocol-caps.c:105
 msgid "object-info: expected flush after arguments"
 msgstr "object-info：在参数之后应有一个 flush"
 
-#: prune-packed.c
+#: prune-packed.c:38
 msgid "Removing duplicate objects"
 msgstr "正在删除重复对象"
 
-#: range-diff.c
+#: pseudo-merge.c:140
+#, c-format
+msgid "failed to load pseudo-merge regex for %s: '%s'"
+msgstr "未能加载 %s 的伪合并正则表达式：'%s'"
+
+#: pseudo-merge.c:147 pseudo-merge.c:164
+#, c-format
+msgid "%s must be non-negative, using default"
+msgstr "%s 必须为非负整数，使用默认值"
+
+#: pseudo-merge.c:153
+#, c-format
+msgid "%s must be between 0 and 1, using default"
+msgstr "%s 必须介于 0 到 1 之间，使用默认值"
+
+#: pseudo-merge.c:175
+#, c-format
+msgid "%s must be positive, using default"
+msgstr "%s 必须为正数，使用默认值"
+
+#: pseudo-merge.c:195
+#, c-format
+msgid "pseudo-merge group '%s' missing required pattern"
+msgstr "伪合并组 '%s' 缺少所需的模式"
+
+#: pseudo-merge.c:198
+#, c-format
+msgid "pseudo-merge group '%s' has unstable threshold before stable one"
+msgstr "伪合并组 '%s' 在稳定阈值之前有不稳定阈值"
+
+#: pseudo-merge.c:236
+#, c-format
+msgid ""
+"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)"
+msgstr "来自 config 的伪合并正则表达式有太多的捕获组（最多 %<PRIuMAX> 个）"
+
+#: pseudo-merge.c:481
+#, c-format
+msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)"
+msgstr "扩展伪合并读取越界 (%<PRIuMAX> >= %<PRIuMAX>)"
+
+#: pseudo-merge.c:485
+#, c-format
+msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)"
+msgstr "扩展伪合并条目太短（％<PRIuMAX> >= ％<PRIuMAX>）"
+
+#: pseudo-merge.c:543
+#, c-format
+msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>"
+msgstr "无法在提交 %1$s 的偏移 %2$<PRIuMAX> 中找到伪合并"
+
+#: pseudo-merge.c:571
+#, c-format
+msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)"
+msgstr "扩展伪合并查找越界 (%<PRIu32> >= %<PRIu32>)"
+
+#: pseudo-merge.c:576
+#, c-format
+msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)"
+msgstr "越界读取：(%<PRIuMAX> >= %<PRIuMAX>)"
+
+#: pseudo-merge.c:645
+#, c-format
+msgid "could not read extended pseudo-merge table for commit %s"
+msgstr "无法读取提交 %s 的扩展伪合并表"
+
+#: range-diff.c:75
 msgid "could not start `log`"
 msgstr "不能启动 `log`"
 
-#: range-diff.c
+#: range-diff.c:77
 msgid "could not read `log` output"
 msgstr "不能读取 `log` 的输出"
 
-#: range-diff.c sequencer.c
+#: range-diff.c:105 sequencer.c:6272
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "不能解析提交 '%s'"
 
-#: range-diff.c
+#: range-diff.c:116
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
 "'%s'"
 msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'"
 
-#: range-diff.c
+#: range-diff.c:139
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "无法解析 git 头 '%.*s'"
 
-#: range-diff.c
+#: range-diff.c:316
 msgid "failed to generate diff"
 msgstr "无法生成 diff"
 
-#: range-diff.c
+#: range-diff.c:577 range-diff.c:579
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "不能解析 '%s' 的日志"
 
-#: reachable.c
+#: reachable.c:147
 #, c-format
 msgid "invalid extra cruft tip: '%s'"
 msgstr "无效的额外废弃提交版本：'%s'"
 
-#: reachable.c
+#: reachable.c:176
 msgid "unable to enumerate additional recent objects"
 msgstr "无法枚举额外的近期对象"
 
-#: read-cache.c
+#: read-cache.c:676
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"
 
-#: read-cache.c
+#: read-cache.c:692
 msgid "cannot create an empty blob in the object database"
 msgstr "不能在对象数据库中创建空的数据对象"
 
-#: read-cache.c
+#: read-cache.c:714
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr "%s：只能添加常规文件、符号链接或 git 目录"
 
-#: read-cache.c
+#: read-cache.c:771
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "无法索引文件 '%s'"
 
-#: read-cache.c
+#: read-cache.c:790
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "无法在索引中添加 '%s'"
 
-#: read-cache.c
+#: read-cache.c:1309
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' 看起来既是文件又是目录"
 
-#: read-cache.c
+#: read-cache.c:1524
 msgid "Refresh index"
 msgstr "刷新索引"
 
-#: read-cache.c
+#: read-cache.c:1656
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -23102,7 +23586,7 @@ msgstr ""
 "设置了 index.version，但是取值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c
+#: read-cache.c:1666
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -23111,143 +23595,143 @@ msgstr ""
 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c
+#: read-cache.c:1724
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "坏的签名 0x%08x"
 
-#: read-cache.c
+#: read-cache.c:1727
 #, c-format
 msgid "bad index version %d"
 msgstr "坏的索引版本 %d"
 
-#: read-cache.c
+#: read-cache.c:1742
 msgid "bad index file sha1 signature"
 msgstr "坏的索引文件 sha1 签名"
 
-#: read-cache.c
+#: read-cache.c:1776
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "索引使用不被支持的 %.4s 扩展"
 
-#: read-cache.c
+#: read-cache.c:1778
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "忽略 %.4s 扩展"
 
-#: read-cache.c
+#: read-cache.c:1826
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "未知的索引条目格式 0x%08x"
 
-#: read-cache.c
+#: read-cache.c:1842
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "索引中靠近路径 '%s' 有错误的名称字段"
 
-#: read-cache.c
+#: read-cache.c:1910
 msgid "unordered stage entries in index"
 msgstr "索引中有未排序的暂存条目"
 
-#: read-cache.c
+#: read-cache.c:1913
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "合并文件 '%s' 有多个暂存条目"
 
-#: read-cache.c
+#: read-cache.c:1916
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "'%s' 的未排序暂存条目"
 
-#: read-cache.c
+#: read-cache.c:2175
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "无法创建 load_cache_entries 线程：%s"
 
-#: read-cache.c
+#: read-cache.c:2188
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "无法加入 load_cache_entries 线程：%s"
 
-#: read-cache.c
+#: read-cache.c:2236
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s：打开索引文件失败"
 
-#: read-cache.c
+#: read-cache.c:2240
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s：不能对打开的索引执行 stat 操作"
 
-#: read-cache.c
+#: read-cache.c:2244
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s：索引文件比预期的小"
 
-#: read-cache.c
+#: read-cache.c:2248
 #, c-format
 msgid "%s: unable to map index file%s"
 msgstr "%s：无法映射索引文件%s"
 
-#: read-cache.c
+#: read-cache.c:2292
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "无法创建 load_index_extensions 线程：%s"
 
-#: read-cache.c
+#: read-cache.c:2319
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "无法加入 load_index_extensions 线程：%s"
 
-#: read-cache.c
+#: read-cache.c:2362
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "无法刷新共享索引 '%s'"
 
-#: read-cache.c
+#: read-cache.c:2424
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
 
-#: read-cache.c
+#: read-cache.c:3004
 msgid "cannot write split index for a sparse index"
 msgstr "无法为稀疏索引写入拆分索引"
 
-#: read-cache.c
+#: read-cache.c:3135
 msgid "failed to convert to a sparse-index"
 msgstr "无法转换为稀疏索引"
 
-#: read-cache.c
+#: read-cache.c:3219
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "不能打开 git 目录：%s"
 
-#: read-cache.c
+#: read-cache.c:3231
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "无法删除：%s"
 
-#: read-cache.c
+#: read-cache.c:3260
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "不能修复 '%s' 的权限位"
 
-#: read-cache.c
+#: read-cache.c:3416
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s：不能落到暂存区 #0"
 
-#: read-cache.c
+#: read-cache.c:3911
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "意外的差异状态 %c"
 
-#: read-cache.c
+#: read-cache.c:3926
 #, c-format
 msgid "remove '%s'\n"
 msgstr "删除 '%s'\n"
 
-#: rebase-interactive.c
+#: rebase-interactive.c:18
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'.\n"
@@ -23256,13 +23740,13 @@ msgstr ""
 "您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
 "或者您可以用 'git rebase --abort' 终止变基。\n"
 
-#: rebase-interactive.c
+#: rebase-interactive.c:40
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
 
-#: rebase-interactive.c
+#: rebase-interactive.c:49
 msgid ""
 "\n"
 "Commands:\n"
@@ -23314,14 +23798,14 @@ msgstr ""
 "\n"
 "可以对这些行重新排序，将从上至下执行。\n"
 
-#: rebase-interactive.c
+#: rebase-interactive.c:77
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "变基 %s 到 %s（%d 个提交）"
 msgstr[1] "变基 %s 到 %s（%d 个提交）"
 
-#: rebase-interactive.c
+#: rebase-interactive.c:86
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -23329,7 +23813,7 @@ msgstr ""
 "\n"
 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
 
-#: rebase-interactive.c
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -23337,7 +23821,7 @@ msgstr ""
 "\n"
 "如果您在这里删除一行，对应的提交将会丢失。\n"
 
-#: rebase-interactive.c
+#: rebase-interactive.c:95
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -23351,7 +23835,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c
+#: rebase-interactive.c:100
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -23361,12 +23845,12 @@ msgstr ""
 "然而，如果您删除全部内容，变基操作将会终止。\n"
 "\n"
 
-#: rebase-interactive.c
+#: rebase-interactive.c:133
 #, c-format
 msgid "could not write '%s'."
 msgstr "不能写入 '%s'。"
 
-#: rebase-interactive.c
+#: rebase-interactive.c:216
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -23375,7 +23859,7 @@ msgstr ""
 "警告：一些提交可能被意外丢弃。\n"
 "丢弃的提交（从新到旧）：\n"
 
-#: rebase-interactive.c
+#: rebase-interactive.c:223
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -23391,287 +23875,287 @@ msgstr ""
 "可选值有：ignore、warn、error。\n"
 "\n"
 
-#: rebase.c
+#: rebase.c:30
 #, c-format
 msgid "%s: 'preserve' superseded by 'merges'"
 msgstr "%s：'preserve' 被 'merges' 取代"
 
-#: ref-filter.c wt-status.c
+#: ref-filter.c:50 wt-status.c:2106
 msgid "gone"
 msgstr "丢失"
 
-#: ref-filter.c
+#: ref-filter.c:51
 #, c-format
 msgid "ahead %d"
 msgstr "领先 %d"
 
-#: ref-filter.c
+#: ref-filter.c:52
 #, c-format
 msgid "behind %d"
 msgstr "落后 %d"
 
-#: ref-filter.c
+#: ref-filter.c:53
 #, c-format
 msgid "ahead %d, behind %d"
 msgstr "领先 %d，落后 %d"
 
-#: ref-filter.c
+#: ref-filter.c:258
 #, c-format
 msgid "%%(%.*s) does not take arguments"
 msgstr "%%(%.*s) 不带参数"
 
-#: ref-filter.c
+#: ref-filter.c:266
 #, c-format
 msgid "unrecognized %%(%.*s) argument: %s"
 msgstr "未能识别的 %%(%.*s) 参数：%s"
 
-#: ref-filter.c
+#: ref-filter.c:379
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "期望的格式：%%(color:<颜色>)"
 
-#: ref-filter.c
+#: ref-filter.c:381
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "未能识别的颜色：%%(color:%s)"
 
-#: ref-filter.c
+#: ref-filter.c:403
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "期望整数值 refname:lstrip=%s"
 
-#: ref-filter.c
+#: ref-filter.c:407
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "期望整数值 refname:rstrip=%s"
 
-#: ref-filter.c
+#: ref-filter.c:577
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
 msgstr "预期 %%(trailers:key=<值>)"
 
-#: ref-filter.c
+#: ref-filter.c:579
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "未知的 %%(trailers) 参数：%s"
 
-#: ref-filter.c
+#: ref-filter.c:611
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "期望一个正数 contents:lines=%s"
 
-#: ref-filter.c
+#: ref-filter.c:637
 #, c-format
 msgid "argument expected for %s"
 msgstr "预期参数 %s"
 
-#: ref-filter.c
+#: ref-filter.c:641
 #, c-format
 msgid "positive value expected %s=%s"
 msgstr "预期正数参数值 %s=%s"
 
-#: ref-filter.c
+#: ref-filter.c:645
 #, c-format
 msgid "cannot fully parse %s=%s"
 msgstr "不能完整解析 %s=%s"
 
-#: ref-filter.c
+#: ref-filter.c:655 ref-filter.c:665
 #, c-format
 msgid "value expected %s="
 msgstr "预期值 %s="
 
-#: ref-filter.c
+#: ref-filter.c:724
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
 
-#: ref-filter.c
+#: ref-filter.c:809
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "期望的格式：%%(align:<宽度>,<位置>)"
 
-#: ref-filter.c
+#: ref-filter.c:821
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "未能识别的位置：%s"
 
-#: ref-filter.c
+#: ref-filter.c:828
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "未能识别的宽度：%s"
 
-#: ref-filter.c
+#: ref-filter.c:837
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "未能识别的 %%(%s) 参数：%s"
 
-#: ref-filter.c
+#: ref-filter.c:845
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "元素 %%(align) 需要一个正数的宽度"
 
-#: ref-filter.c
+#: ref-filter.c:884
 #, c-format
 msgid "expected format: %%(ahead-behind:<committish>)"
 msgstr "期望的格式：%%(ahead-behind:<提交号>)"
 
-#: ref-filter.c
+#: ref-filter.c:1009
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "格式错误的字段名：%.*s"
 
-#: ref-filter.c
+#: ref-filter.c:1036
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "未知的字段名：%.*s"
 
-#: ref-filter.c
+#: ref-filter.c:1040
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr "不是 git 仓库，但是字段 '%.*s' 需要访问对象数据"
 
-#: ref-filter.c
+#: ref-filter.c:1173 ref-filter.c:1240 ref-filter.c:1277 ref-filter.c:1279
 #, c-format
 msgid "format: %%(%s) atom used without a %%(%s) atom"
 msgstr "格式：在没有 %%(%2$s) 元素的情况下使用了 %%(%1$s) 元素"
 
-#: ref-filter.c
+#: ref-filter.c:1242
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "格式：%%(then) 元素用了多次"
 
-#: ref-filter.c
+#: ref-filter.c:1244
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
 
-#: ref-filter.c
+#: ref-filter.c:1281
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "格式：%%(else) 元素用了多次"
 
-#: ref-filter.c
+#: ref-filter.c:1297
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
 
-#: ref-filter.c
+#: ref-filter.c:1359
 #, c-format
 msgid "malformed format string %s"
 msgstr "错误的格式化字符串 %s"
 
-#: ref-filter.c
+#: ref-filter.c:1365
 #, c-format
 msgid "this command reject atom %%(%.*s)"
 msgstr "这个命令拒绝元素 %%(%.*s)"
 
-#: ref-filter.c
+#: ref-filter.c:1372
 #, c-format
 msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
 msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用"
 
-#: ref-filter.c
+#: ref-filter.c:1916
 msgid "failed to run 'describe'"
 msgstr "无法运行 'describe'"
 
-#: ref-filter.c
+#: ref-filter.c:2217
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "（非分支，正变基 %s）"
 
-#: ref-filter.c
+#: ref-filter.c:2220
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "（非分支，正变基分离头指针 %s）"
 
-#: ref-filter.c
+#: ref-filter.c:2223
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "（非分支，二分查找开始于 %s）"
 
-#: ref-filter.c
+#: ref-filter.c:2227
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "（头指针在 %s 分离）"
 
-#: ref-filter.c
+#: ref-filter.c:2230
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "（头指针自 %s 分离）"
 
-#: ref-filter.c
+#: ref-filter.c:2233
 msgid "(no branch)"
 msgstr "（非分支）"
 
-#: ref-filter.c
+#: ref-filter.c:2267 ref-filter.c:2499
 #, c-format
 msgid "missing object %s for %s"
 msgstr "缺失 %2$s 的对象 %1$s"
 
-#: ref-filter.c
+#: ref-filter.c:2277
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
 
-#: ref-filter.c
+#: ref-filter.c:2712
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "格式错误的对象 '%s'"
 
-#: ref-filter.c
+#: ref-filter.c:2794
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "忽略带有错误名称 %s 的引用"
 
-#: ref-filter.c refs.c
+#: ref-filter.c:2799 refs.c:733
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "忽略损坏的引用 %s"
 
-#: ref-filter.c
+#: ref-filter.c:3360
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "格式：缺少 %%(end) 元素"
 
-#: ref-filter.c
+#: ref-filter.c:3480
 #, c-format
 msgid "malformed object name %s"
 msgstr "格式错误的对象名 %s"
 
-#: ref-filter.c
+#: ref-filter.c:3485
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "选项 `%s' 必须指向一个提交"
 
-#: ref-filter.h
+#: ref-filter.h:130
 msgid "key"
 msgstr "key"
 
-#: ref-filter.h
+#: ref-filter.h:130
 msgid "field name to sort on"
 msgstr "排序的字段名"
 
-#: ref-filter.h
+#: ref-filter.h:133
 msgid "exclude refs which match pattern"
 msgstr "排除与 <模式> 相匹配的引用"
 
-#: reflog.c
+#: reflog.c:412
 #, c-format
 msgid "not a reflog: %s"
 msgstr "不是一个引用日志：%s"
 
-#: reflog.c
+#: reflog.c:415
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "没有 '%s' 的引用日志"
 
-#: refs.c
+#: refs.c:372
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "%s 没有指向一个有效的对象！"
 
-#: refs.c
+#: refs.c:632
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -23695,367 +24179,397 @@ msgstr ""
 "\n"
 "\tgit branch -m <name>\n"
 
-#: refs.c
+#: refs.c:654
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr "无法获取 `%s`"
 
-#: refs.c
+#: refs.c:664
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr "无效的分支名：%s = %s"
 
-#: refs.c
+#: refs.c:731
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "忽略悬空符号引用 %s"
 
-#: refs.c
+#: refs.c:1026
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "引用 %s 的日志在 %s 之后有缺口"
 
-#: refs.c
+#: refs.c:1032
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "引用 %s 的日志意外终止于 %s "
 
-#: refs.c
+#: refs.c:1102
 #, c-format
 msgid "log for %s is empty"
 msgstr "%s 的日志为空"
 
-#: refs.c
+#: refs.c:1201
+msgid "refusing to force and skip creation of reflog"
+msgstr "拒绝强制并跳过创建引用日志"
+
+#: refs.c:1209
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "拒绝更新有错误名称 '%s' 的引用"
 
-#: refs.c
+#: refs.c:1216
+#, c-format
+msgid "refusing to update pseudoref '%s'"
+msgstr "拒绝更新伪引用 '%s'"
+
+#: refs.c:1315
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "对引用 '%s' 执行 update_ref 失败：%s"
 
-#: refs.c
+#: refs.c:2119
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "不允许对引用 '%s' 多次更新"
 
-#: refs.c
+#: refs.c:2214
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "在隔离环境中禁止更新引用"
 
-#: refs.c
+#: refs.c:2225
 msgid "ref updates aborted by hook"
 msgstr "引用更新被钩子中止"
 
-#: refs.c
+#: refs.c:2333 refs.c:2363
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' 已存在，无法创建 '%s'"
 
-#: refs.c
+#: refs.c:2339 refs.c:2374
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "无法同时处理 '%s' 和 '%s'"
 
-#: refs.c
+#: refs.c:2506 refs.c:2516
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "无法删除引用 %s：%s"
 
-#: refs.c
+#: refs.c:2519
 #, c-format
 msgid "could not delete references: %s"
 msgstr "无法删除引用：%s"
 
-#: refs/reftable-backend.c
+#: refs.c:2840
+#, c-format
+msgid "Finished dry-run migration of refs, the result can be found at '%s'\n"
+msgstr "已完成 refs 的试运行迁移，结果可在 '%s' 处找到\n"
+
+#: refs.c:2875
+#, c-format
+msgid "could not remove temporary migration directory '%s'"
+msgstr "无法删除临时迁移目录 '%s'"
+
+#: refs.c:2899
+#, c-format
+msgid "migrated refs can be found at '%s'"
+msgstr "迁移的引用可以在 '%s' 处找到"
+
+#: refs/files-backend.c:2544 refs/reftable-backend.c:1049
+#, c-format
+msgid ""
+"cannot lock ref '%s': expected symref with target '%s': but is a regular ref"
+msgstr "无法锁定引用 '％s'：预期目标为 '％s' 的符号引用：但是是普通引用"
+
+#: refs/reftable-backend.c:510
 #, c-format
 msgid "refname is dangerous: %s"
 msgstr "危险的引用名称：%s"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:892
 #, c-format
 msgid "trying to write ref '%s' with nonexistent object %s"
 msgstr "试图用不存在的对象 %2$s 写入引用 '%1$s'"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:899
 #, c-format
 msgid "trying to write non-commit object %s to branch '%s'"
 msgstr "尝试将非提交对象 %s 写入分支 '%s'"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:925
 #, c-format
 msgid ""
 "multiple updates for 'HEAD' (including one via its referent '%s') are not "
 "allowed"
 msgstr "不允许对 'HEAD' 进行多次更新（包括通过其引用 '%s' 进行的更新）"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:973
 #, c-format
 msgid "cannot lock ref '%s': unable to resolve reference '%s'"
 msgstr "无法锁定引用 '%s'：无法解析引用 '%s'"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:991
 #, c-format
 msgid "cannot lock ref '%s': error reading reference"
 msgstr "无法锁定引用 '%s'：读取引用时出错"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:1030
 #, c-format
 msgid ""
 "multiple updates for '%s' (including one via symref '%s') are not allowed"
 msgstr "不允许对 '%s' 进行多次更新（包括通过符号引用 '%s' 更新）"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:1064
 #, c-format
 msgid "cannot lock ref '%s': reference already exists"
 msgstr "无法锁定引用 '%s'：引用已存在"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:1068
 #, c-format
 msgid "cannot lock ref '%s': reference is missing but expected %s"
 msgstr "无法锁定 '%s' 引用：引用丢失，但预期为 %s"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:1073
 #, c-format
 msgid "cannot lock ref '%s': is at %s but expected %s"
 msgstr "无法锁定 '%s' 引用：位于 %s，但预期为 %s"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:1112
 #, c-format
 msgid "reftable: transaction prepare: %s"
 msgstr "reftable: 事务准备：%s"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:1338
 #, c-format
 msgid "reftable: transaction failure: %s"
 msgstr "reftable: 事务失败：%s"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:1372
 #, c-format
 msgid "unable to compact stack: %s"
 msgstr "无法压缩栈：%s"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:1422
 #, c-format
 msgid "refname %s not found"
 msgstr "引用名称 %s 未找到"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:1426
 #, c-format
 msgid "refname %s is a symbolic ref, copying it is not supported"
 msgstr "引用名 %s 是一个符号引用，不支持复制"
 
-#: refspec.c
+#: refspec.c:163
 #, c-format
 msgid "invalid refspec '%s'"
 msgstr "无效的引用规格：'%s'"
 
-#: remote-curl.c
+#: remote-curl.c:192
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "在 push-option 取值中无效的引号：'%s'"
 
-#: remote-curl.c
+#: remote-curl.c:219
 #, c-format
 msgid "unknown value for object-format: %s"
 msgstr "对象格式的未知取值：%s"
 
-#: remote-curl.c
+#: remote-curl.c:328
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs 无效：这是 git 仓库么？"
 
-#: remote-curl.c
+#: remote-curl.c:429
 msgid "invalid server response; expected service, got flush packet"
 msgstr "无效的服务端响应。预期服务，得到 flush 包"
 
-#: remote-curl.c
+#: remote-curl.c:460
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "无效的服务端响应，得到 '%s'"
 
-#: remote-curl.c
+#: remote-curl.c:521
 #, c-format
 msgid "repository '%s' not found"
 msgstr "仓库 '%s' 未找到"
 
-#: remote-curl.c
+#: remote-curl.c:525
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "'%s' 鉴权失败"
 
-#: remote-curl.c
+#: remote-curl.c:529
 #, c-format
 msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
 msgstr "无法以 http.pinnedPubkey 设置访问 '%s'：%s"
 
-#: remote-curl.c
+#: remote-curl.c:533
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "无法访问 '%s'：%s"
 
-#: remote-curl.c
+#: remote-curl.c:539
 #, c-format
 msgid "redirecting to %s"
 msgstr "重定向到 %s"
 
-#: remote-curl.c
+#: remote-curl.c:673
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符"
 
-#: remote-curl.c
+#: remote-curl.c:685
 msgid "remote server sent unexpected response end packet"
 msgstr "远程服务器发送意外的响应结束数据包"
 
-#: remote-curl.c
+#: remote-curl.c:756
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
 
-#: remote-curl.c
+#: remote-curl.c:782
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr "remote-curl：错误的行宽字符：%.4s"
 
-#: remote-curl.c
+#: remote-curl.c:784
 msgid "remote-curl: unexpected response end packet"
 msgstr "remote-curl：意外响应结束包"
 
-#: remote-curl.c
+#: remote-curl.c:860
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC 失败。%s"
 
-#: remote-curl.c
+#: remote-curl.c:900
 msgid "cannot handle pushes this big"
 msgstr "不能处理这么大的推送"
 
-#: remote-curl.c
+#: remote-curl.c:1022
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "不能压缩请求，zlib 压缩错误 %d"
 
-#: remote-curl.c
+#: remote-curl.c:1026
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "不能压缩请求，zlib 结束错误 %d"
 
-#: remote-curl.c
+#: remote-curl.c:1077
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr "收到了 %d 字节长度的头信息"
 
-#: remote-curl.c
+#: remote-curl.c:1079
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr "预期仍然需要 %d 个字节的正文"
 
-#: remote-curl.c
+#: remote-curl.c:1171
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "哑 http 传输不支持浅克隆能力"
 
-#: remote-curl.c
+#: remote-curl.c:1186
 msgid "fetch failed."
 msgstr "获取失败。"
 
-#: remote-curl.c
+#: remote-curl.c:1234
 msgid "cannot fetch by sha1 over smart http"
 msgstr "无法通过智能 HTTP 获取 sha1"
 
-#: remote-curl.c
+#: remote-curl.c:1278 remote-curl.c:1284
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "协议错误：期望 sha/ref，却得到 '%s'"
 
-#: remote-curl.c
+#: remote-curl.c:1296 remote-curl.c:1437
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http 传输协议不支持 %s"
 
-#: remote-curl.c
+#: remote-curl.c:1324
 msgid "protocol error: expected '<url> <path>', missing space"
 msgstr "协议错误：预期 '<url> <path>'，缺少空格"
 
-#: remote-curl.c
+#: remote-curl.c:1330
 #, c-format
 msgid "failed to download file at URL '%s'"
 msgstr "无法下载位于 URL '%s' 的文件"
 
-#: remote-curl.c
+#: remote-curl.c:1355
 msgid "git-http-push failed"
 msgstr "git-http-push 失败"
 
-#: remote-curl.c
+#: remote-curl.c:1557
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
 
-#: remote-curl.c
+#: remote-curl.c:1589
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl：错误读取来自 git 的命令流"
 
-#: remote-curl.c
+#: remote-curl.c:1598
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl：尝试没有本地仓库下获取"
 
-#: remote-curl.c
+#: remote-curl.c:1646
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl：未知的来自 git 的命令 '%s'"
 
-#: remote.c
+#: remote.c:417
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "配置的远程短名称不能以 '/' 开始：%s"
 
-#: remote.c
+#: remote.c:463
 msgid "more than one receivepack given, using the first"
 msgstr "提供了一个以上的 receivepack，使用第一个"
 
-#: remote.c
+#: remote.c:471
 msgid "more than one uploadpack given, using the first"
 msgstr "提供了一个以上的 uploadpack，使用第一个"
 
-#: remote.c
+#: remote.c:652
 #, c-format
 msgid "unrecognized value transfer.credentialsInUrl: '%s'"
 msgstr "无法识别的 transfer.credentialsInUrl 值：'%s'"
 
-#: remote.c
+#: remote.c:668 remote.c:670
 #, c-format
 msgid "URL '%s' uses plaintext credentials"
 msgstr "URL '%s' 使用明文认证信息"
 
-#: remote.c
+#: remote.c:771
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "不能同时获取 %s 和 %s 至 %s"
 
-#: remote.c
+#: remote.c:775
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s 通常跟踪 %s，而非 %s"
 
-#: remote.c
+#: remote.c:779
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s 同时跟踪 %s 和 %s"
 
-#: remote.c
+#: remote.c:852
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "模式的键 '%s' 没有 '*'"
 
-#: remote.c
+#: remote.c:862
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "模式的值 '%s' 没有 '*'"
 
-#: remote.c
+#: remote.c:1250
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "源引用规格 %s 没有匹配"
 
-#: remote.c
+#: remote.c:1255
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "源引用规格 %s 匹配超过一个"
@@ -24064,7 +24578,7 @@ msgstr "源引用规格 %s 匹配超过一个"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c
+#: remote.c:1270
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -24086,7 +24600,7 @@ msgstr ""
 "\n"
 "都不行，所以我们已放弃。您必须给出完整的引用。"
 
-#: remote.c
+#: remote.c:1290
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -24096,7 +24610,7 @@ msgstr ""
 "引用规格的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
 "'%s:refs/heads/%s' 推送么？"
 
-#: remote.c
+#: remote.c:1295
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -24106,7 +24620,7 @@ msgstr ""
 "引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
 "'%s:refs/tags/%s' 推送么？"
 
-#: remote.c
+#: remote.c:1300
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -24116,7 +24630,7 @@ msgstr ""
 "引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
 "'%s:refs/tags/%s' 推送么？"
 
-#: remote.c
+#: remote.c:1305
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -24126,114 +24640,114 @@ msgstr ""
 "引用规格的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
 "'%s:refs/tags/%s' 推送么？"
 
-#: remote.c
+#: remote.c:1342
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s 无法被解析为分支"
 
-#: remote.c
+#: remote.c:1353
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "无法删除 '%s'：远程引用不存在"
 
-#: remote.c
+#: remote.c:1365
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "目标引用规格 %s 匹配超过一个"
 
-#: remote.c
+#: remote.c:1372
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "目标引用 %s 接收超过一个源"
 
-#: remote.c
+#: remote.c:1894 remote.c:2001
 msgid "HEAD does not point to a branch"
 msgstr "HEAD 没有指向一个分支"
 
-#: remote.c
+#: remote.c:1903
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "没有此分支：'%s'"
 
-#: remote.c
+#: remote.c:1906
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "尚未给分支 '%s' 设置上游"
 
-#: remote.c
+#: remote.c:1912
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
 
-#: remote.c
+#: remote.c:1927
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
 
-#: remote.c
+#: remote.c:1942
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "分支 '%s' 没有设置要推送的远程服务器"
 
-#: remote.c
+#: remote.c:1952
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "向 '%s' 推送引用规格未包含 '%s'"
 
-#: remote.c
+#: remote.c:1965
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "推送无目标（push.default 是 'nothing'）"
 
-#: remote.c
+#: remote.c:1987
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "无法解析 'simple' 推送至一个单独的目标"
 
-#: remote.c
+#: remote.c:2120
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "无法找到远程引用 %s"
 
-#: remote.c
+#: remote.c:2133
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* 在本地忽略可笑的引用 '%s'"
 
-#: remote.c
+#: remote.c:2302
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
 
-#: remote.c
+#: remote.c:2306
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  （使用 \"git branch --unset-upstream\" 来修复）\n"
 
-#: remote.c
+#: remote.c:2309
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "您的分支与上游分支 '%s' 一致。\n"
 
-#: remote.c
+#: remote.c:2313
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "您的分支和 '%s' 指向不同的提交。\n"
 
-#: remote.c
+#: remote.c:2316
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  （使用 \"%s\" 查看详情）\n"
 
-#: remote.c
+#: remote.c:2320
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
 
-#: remote.c
+#: remote.c:2326
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  （使用 \"git push\" 来发布您的本地提交）\n"
 
-#: remote.c
+#: remote.c:2329
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -24242,11 +24756,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
 
 #  译者：注意保持前导空格
-#: remote.c
+#: remote.c:2337
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  （使用 \"git pull\" 来更新您的本地分支）\n"
 
-#: remote.c
+#: remote.c:2340
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -24262,146 +24776,146 @@ msgstr[1] ""
 "并且分别有 %d 和 %d 处不同的提交。\n"
 
 #  译者：注意保持前导空格
-#: remote.c
+#: remote.c:2351
 msgid ""
 "  (use \"git pull\" if you want to integrate the remote branch with yours)\n"
 msgstr "  （如果您想将远程分支与您的更改合并，请使用 \"git pull\"）\n"
 
-#: remote.c
+#: remote.c:2548
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "无法解析期望的对象名 '%s'"
 
-#: remote.c
+#: remote.c:2828
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "无法从 url '%s' 剥离一个组件"
 
-#: replace-object.c
+#: replace-object.c:25
 #, c-format
 msgid "bad replace ref name: %s"
 msgstr "错误的替换引用名称：%s"
 
-#: replace-object.c
+#: replace-object.c:34
 #, c-format
 msgid "duplicate replace ref: %s"
 msgstr "重复的替换引用：%s"
 
-#: replace-object.c
+#: replace-object.c:87
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "对象 %s 的替换层级太深"
 
-#: rerere.c
+#: rerere.c:208 rerere.c:217 rerere.c:220
 msgid "corrupt MERGE_RR"
 msgstr "损坏的 MERGE_RR"
 
-#: rerere.c
+#: rerere.c:260 rerere.c:265
 msgid "unable to write rerere record"
 msgstr "无法写入 rerere 记录"
 
-#: rerere.c
+#: rerere.c:491
 #, c-format
 msgid "there were errors while writing '%s' (%s)"
 msgstr "写入 '%s' (%s) 时出错"
 
-#: rerere.c
+#: rerere.c:499 rerere.c:1043
 #, c-format
 msgid "could not parse conflict hunks in '%s'"
 msgstr "不能解析 '%s' 中的冲突块"
 
-#: rerere.c
+#: rerere.c:681
 #, c-format
 msgid "failed utime() on '%s'"
 msgstr "在 '%s' 上调用 utime() 失败"
 
-#: rerere.c
+#: rerere.c:691
 #, c-format
 msgid "writing '%s' failed"
 msgstr "写入 '%s' 失败"
 
-#: rerere.c
+#: rerere.c:711
 #, c-format
 msgid "Staged '%s' using previous resolution."
 msgstr "使用之前的解决方案暂存 '%s'。"
 
-#: rerere.c
+#: rerere.c:750
 #, c-format
 msgid "Recorded resolution for '%s'."
 msgstr "已记录 '%s' 的解决方案。"
 
-#: rerere.c
+#: rerere.c:785
 #, c-format
 msgid "Resolved '%s' using previous resolution."
 msgstr "使用之前的解决方案解决 '%s'。"
 
-#: rerere.c
+#: rerere.c:800
 #, c-format
 msgid "cannot unlink stray '%s'"
 msgstr "不能删除 stray '%s'"
 
-#: rerere.c
+#: rerere.c:804
 #, c-format
 msgid "Recorded preimage for '%s'"
 msgstr "为 '%s' 记录 preimage"
 
-#: rerere.c
+#: rerere.c:1061
 #, c-format
 msgid "failed to update conflicted state in '%s'"
 msgstr "无法更新 '%s' 中的冲突状态"
 
-#: rerere.c
+#: rerere.c:1072 rerere.c:1079
 #, c-format
 msgid "no remembered resolution for '%s'"
 msgstr "没有为 '%s' 记忆的解决方案"
 
-#: rerere.c
+#: rerere.c:1091
 #, c-format
 msgid "Updated preimage for '%s'"
 msgstr "已为 '%s' 更新 preimage"
 
-#: rerere.c
+#: rerere.c:1100
 #, c-format
 msgid "Forgot resolution for '%s'\n"
 msgstr "忘记 '%s' 的解决方案\n"
 
-#: rerere.c
+#: rerere.c:1211
 msgid "unable to open rr-cache directory"
 msgstr "不能打开 rr-cache 目录"
 
-#: rerere.h
+#: rerere.h:42
 msgid "update the index with reused conflict resolution if possible"
 msgstr "如果可能，重用冲突解决更新索引"
 
-#: reset.c
+#: reset.c:121
 msgid "could not determine HEAD revision"
 msgstr "不能确定 HEAD 版本"
 
-#: reset.c sequencer.c
+#: reset.c:151 reset.c:157 sequencer.c:4036
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "无法找到 %s 指向的树"
 
-#: revision.c
+#: revision.c:1632
 #, c-format
 msgid "unsupported section for hidden refs: %s"
 msgstr "不支持的隐藏引用片段： %s"
 
-#: revision.c
+#: revision.c:1635
 msgid "--exclude-hidden= passed more than once"
 msgstr "--exclude-hidden= 传递了不止一次"
 
-#: revision.c
+#: revision.c:1814
 #, c-format
 msgid "resolve-undo records `%s` which is missing"
 msgstr "resolve-undo 记录 `%s`，现缺失"
 
-#: revision.c
+#: revision.c:2008
 #, c-format
 msgid "%s exists but is a symbolic ref"
 msgstr "%s 存在但是一个符号引用"
 
-#: revision.c
+#: revision.c:2012
 msgid ""
 "--merge requires one of the pseudorefs MERGE_HEAD, CHERRY_PICK_HEAD, "
 "REVERT_HEAD or REBASE_HEAD"
@@ -24409,135 +24923,135 @@ msgstr ""
 "--merge 选项需要指定 MERGE_HEAD、CHERRY_PICK_HEAD、REVERT_HEAD 或 "
 "REBASE_HEAD 中的一个伪引用"
 
-#: revision.c
+#: revision.c:2395
 #, c-format
 msgid "could not get commit for --ancestry-path argument %s"
 msgstr "无法获得 --ancestry-path 参数 %s 的提交"
 
-#: revision.c
+#: revision.c:2526
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "不再支持 --unpacked=<packfile>"
 
-#: revision.c
+#: revision.c:2937
 #, c-format
 msgid "invalid option '%s' in --stdin mode"
 msgstr "在 --stdin 模式下的无效选项：'%s'"
 
-#: revision.c
+#: revision.c:2959
 msgid "your current branch appears to be broken"
 msgstr "您的当前分支好像被损坏"
 
-#: revision.c
+#: revision.c:2962
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的当前分支 '%s' 尚无任何提交"
 
-#: revision.c
+#: revision.c:3149
 msgid "object filtering requires --objects"
 msgstr "对象过滤需要 --objects"
 
-#: revision.c
+#: revision.c:3165
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
 
-#: run-command.c
+#: run-command.c:1240
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "不能创建 async 线程：%s"
 
-#: scalar.c worktree.c
+#: scalar.c:42 worktree.c:349
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' 不存在"
 
-#: scalar.c
+#: scalar.c:44 scalar.c:56 scalar.c:384 scalar.c:481 scalar.c:677
 #, c-format
 msgid "could not switch to '%s'"
 msgstr "无法切换到 '%s'"
 
-#: scalar.c
+#: scalar.c:46
 msgid "need a working directory"
 msgstr "需要一个工作目录"
 
-#: scalar.c
+#: scalar.c:63 scalar.c:225
 msgid "Scalar enlistments require a worktree"
 msgstr "Scalar 登记需要一个工作树"
 
-#: scalar.c
+#: scalar.c:180 scalar.c:187
 #, c-format
 msgid "could not configure %s=%s"
 msgstr "无法配置 %s=%s"
 
-#: scalar.c
+#: scalar.c:201
 msgid "could not configure log.excludeDecoration"
 msgstr "无法配置 log.excludeDecoration"
 
-#: scalar.c
+#: scalar.c:265
 msgid "could not add enlistment"
 msgstr "无法添加登记"
 
-#: scalar.c
+#: scalar.c:268
 msgid "could not set recommended config"
 msgstr "无法设置推荐的配置"
 
-#: scalar.c
+#: scalar.c:271
 msgid "could not turn on maintenance"
 msgstr "无法打开维护模式"
 
-#: scalar.c
+#: scalar.c:274
 msgid "could not start the FSMonitor daemon"
 msgstr "无法启动 FSMonitor 守护进程"
 
-#: scalar.c
+#: scalar.c:285
 msgid "could not turn off maintenance"
 msgstr "无法关闭维护模式"
 
-#: scalar.c
+#: scalar.c:288
 msgid "could not remove enlistment"
 msgstr "无法删除登记"
 
-#: scalar.c
+#: scalar.c:343
 #, c-format
 msgid "remote HEAD is not a branch: '%.*s'"
 msgstr "远程 HEAD 不是一个分支：'%.*s'"
 
-#: scalar.c
+#: scalar.c:349
 msgid "failed to get default branch name from remote; using local default"
 msgstr "无法从远程获取默认分支名称；使用本地默认值"
 
-#: scalar.c
+#: scalar.c:362
 msgid "failed to get default branch name"
 msgstr "无法获取默认分支名称"
 
-#: scalar.c
+#: scalar.c:373
 msgid "failed to unregister repository"
 msgstr "无法取消注册仓库"
 
-#: scalar.c
+#: scalar.c:391
 msgid "failed to stop the FSMonitor daemon"
 msgstr "无法停止 FSMonitor 守护进程"
 
-#: scalar.c
+#: scalar.c:394
 msgid "failed to delete enlistment directory"
 msgstr "无法删除登记目录"
 
-#: scalar.c
+#: scalar.c:415
 msgid "branch to checkout after clone"
 msgstr "克隆后要检出的分支"
 
-#: scalar.c
+#: scalar.c:417
 msgid "when cloning, create full working directory"
 msgstr "在克隆时，创建完整的工作目录"
 
-#: scalar.c
+#: scalar.c:419
 msgid "only download metadata for the branch that will be checked out"
 msgstr "只下载要检出的分支的元信息"
 
-#: scalar.c
+#: scalar.c:422
 msgid "create repository within 'src' directory"
 msgstr "在 'src' 目录中创建仓库"
 
-#: scalar.c
+#: scalar.c:426
 msgid ""
 "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
 "\t[--[no-]src] <url> [<enlistment>]"
@@ -24545,89 +25059,89 @@ msgstr ""
 "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
 "\t[--[no-]src] <url> [<登记>]"
 
-#: scalar.c
+#: scalar.c:452
 #, c-format
 msgid "cannot deduce worktree name from '%s'"
 msgstr "无法从 '%s' 猜测工作区名称"
 
-#: scalar.c
+#: scalar.c:461
 #, c-format
 msgid "directory '%s' exists already"
 msgstr "目录 '%s' 已存在"
 
-#: scalar.c
+#: scalar.c:491
 #, c-format
 msgid "failed to get default branch for '%s'"
 msgstr "无法获取 '%s' 的默认分支"
 
-#: scalar.c
+#: scalar.c:502
 #, c-format
 msgid "could not configure remote in '%s'"
 msgstr "无法在 '%s' 中配置远程"
 
-#: scalar.c
+#: scalar.c:511
 #, c-format
 msgid "could not configure '%s'"
 msgstr "无法配置 '%s'"
 
-#: scalar.c
+#: scalar.c:516
 msgid "partial clone failed; attempting full clone"
 msgstr "部分克隆失败；尝试完整克隆"
 
-#: scalar.c
+#: scalar.c:520
 msgid "could not configure for full clone"
 msgstr "无法配置完整克隆"
 
-#: scalar.c
+#: scalar.c:557
 msgid "scalar diagnose [<enlistment>]"
 msgstr "scalar diagnose [<登记>]"
 
-#: scalar.c
+#: scalar.c:579
 msgid "`scalar list` does not take arguments"
 msgstr "`scalar list` 不带参数"
 
-#: scalar.c
+#: scalar.c:592
 msgid "scalar register [<enlistment>]"
 msgstr "scalar register [<登记>]"
 
-#: scalar.c
+#: scalar.c:639
 msgid "reconfigure all registered enlistments"
 msgstr "重新配置所有注册的登记"
 
-#: scalar.c
+#: scalar.c:643
 msgid "scalar reconfigure [--all | <enlistment>]"
 msgstr "scalar reconfigure [--all | <登记>]"
 
-#: scalar.c
+#: scalar.c:660
 msgid "--all or <enlistment>, but not both"
 msgstr "--all 或者 <登记>，而不是两个一起"
 
-#: scalar.c
+#: scalar.c:683
 #, c-format
 msgid "could not remove stale scalar.repo '%s'"
 msgstr "无法删除过期的 scalar.repo '%s'"
 
-#: scalar.c
+#: scalar.c:686
 #, c-format
 msgid "removed stale scalar.repo '%s'"
 msgstr "已删除过期的 scalar.repo '%s'"
 
-#: scalar.c
+#: scalar.c:696
 #, c-format
 msgid "repository at '%s' has different owner"
 msgstr "位于 '%s' 处的仓库有不同的所有者"
 
-#: scalar.c
+#: scalar.c:701
 #, c-format
 msgid "repository at '%s' has a format issue"
 msgstr "位于 '%s' 处的仓库存在格式问题"
 
-#: scalar.c
+#: scalar.c:709
 #, c-format
 msgid "repository not found in '%s'"
 msgstr "在 '%s' 中找不到仓库"
 
-#: scalar.c
+#: scalar.c:729
 #, c-format
 msgid ""
 "to unregister this repository from Scalar, run\n"
@@ -24636,7 +25150,7 @@ msgstr ""
 "若希望从 Scalar 注销该仓库，执行\n"
 "\tgit config --global --unset --fixed-value scalar.repo \"%s\""
 
-#: scalar.c
+#: scalar.c:761
 msgid ""
 "scalar run <task> [<enlistment>]\n"
 "Tasks:\n"
@@ -24644,49 +25158,49 @@ msgstr ""
 "scalar run <任务> [<登记>]\n"
 "任务：\n"
 
-#: scalar.c
+#: scalar.c:779
 #, c-format
 msgid "no such task: '%s'"
 msgstr "没有此任务：'%s'"
 
-#: scalar.c
+#: scalar.c:811
 msgid "scalar unregister [<enlistment>]"
 msgstr "scalar unregister [<登记>]"
 
-#: scalar.c
+#: scalar.c:858
 msgid "scalar delete <enlistment>"
 msgstr "scalar delete <登记>"
 
-#: scalar.c
+#: scalar.c:873
 msgid "refusing to delete current working directory"
 msgstr "拒绝删除当前工作目录"
 
-#: scalar.c
+#: scalar.c:907
 msgid "include Git version"
 msgstr "包括 Git 的版本"
 
-#: scalar.c
+#: scalar.c:909
 msgid "include Git's build options"
 msgstr "包括 Git 的构建选项"
 
-#: scalar.c
+#: scalar.c:913
 msgid "scalar verbose [-v | --verbose] [--build-options]"
 msgstr "scalar verbose [-v | --verbose] [--build-options]"
 
-#: scalar.c
+#: scalar.c:956
 msgid "-C requires a <directory>"
 msgstr "-C 需要 <目录>"
 
-#: scalar.c
+#: scalar.c:958
 #, c-format
 msgid "could not change to '%s'"
 msgstr "无法变更到 '%s'"
 
-#: scalar.c
+#: scalar.c:964
 msgid "-c requires a <key>=<value> argument"
 msgstr "-c 需要 <键>=<值> 参数"
 
-#: scalar.c
+#: scalar.c:982
 msgid ""
 "scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
 "\n"
@@ -24696,82 +25210,82 @@ msgstr ""
 "\n"
 "命令：\n"
 
-#: send-pack.c
+#: send-pack.c:157
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "读取远程解包状态时收到意外的 flush 包"
 
-#: send-pack.c
+#: send-pack.c:159
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "不能解析远程解包状态：%s"
 
-#: send-pack.c
+#: send-pack.c:161
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "远程解包失败：%s"
 
-#: send-pack.c
+#: send-pack.c:385
 msgid "failed to sign the push certificate"
 msgstr "无法为推送证书签名"
 
-#: send-pack.c
+#: send-pack.c:451
 msgid "send-pack: unable to fork off fetch subprocess"
 msgstr "send-pack：无法派生 fetch 子进程"
 
-#: send-pack.c
+#: send-pack.c:473
 msgid "push negotiation failed; proceeding anyway with push"
 msgstr "推送协商失败，但还是继续推送"
 
-#: send-pack.c
+#: send-pack.c:548
 msgid "the receiving end does not support this repository's hash algorithm"
 msgstr "接收端不支持这个仓库的哈希算法"
 
-#: send-pack.c
+#: send-pack.c:557
 msgid "the receiving end does not support --signed push"
 msgstr "接收端不支持签名推送（--signed）"
 
-#: send-pack.c
+#: send-pack.c:559
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr "未发送推送证书，因为接收端不支持签名推送（--signed）"
 
-#: send-pack.c
+#: send-pack.c:566
 msgid "the receiving end does not support --atomic push"
 msgstr "接收端不支持原子推送（--atomic）"
 
-#: send-pack.c
+#: send-pack.c:571
 msgid "the receiving end does not support push options"
 msgstr "接收端不支持推送选项"
 
-#: sequencer.c
+#: sequencer.c:298
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "无效的提交信息清理模式 '%s'"
 
-#: sequencer.c
+#: sequencer.c:443
 #, c-format
 msgid "could not delete '%s'"
 msgstr "无法删除 '%s'"
 
-#: sequencer.c
+#: sequencer.c:465
 msgid "revert"
 msgstr "还原"
 
-#: sequencer.c
+#: sequencer.c:467
 msgid "cherry-pick"
 msgstr "拣选"
 
-#: sequencer.c
+#: sequencer.c:469
 msgid "rebase"
 msgstr "变基"
 
-#: sequencer.c
+#: sequencer.c:471
 #, c-format
 msgid "unknown action: %d"
 msgstr "未知动作：%d"
 
-#: sequencer.c
+#: sequencer.c:513
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -24784,7 +25298,7 @@ msgstr ""
 "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
 "\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
 
-#: sequencer.c
+#: sequencer.c:544
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -24792,7 +25306,7 @@ msgstr ""
 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
 "命令标记修正后的文件"
 
-#: sequencer.c
+#: sequencer.c:548
 msgid ""
 "After resolving the conflicts, mark them with\n"
 "\"git add/rm <pathspec>\", then run\n"
@@ -24806,7 +25320,7 @@ msgstr ""
 "\"git cherry-pick --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
 "执行 \"git cherry-pick\" 之前的状态，执行 \"git cherry-pick --abort\"。"
 
-#: sequencer.c
+#: sequencer.c:556
 msgid ""
 "After resolving the conflicts, mark them with\n"
 "\"git add/rm <pathspec>\", then run\n"
@@ -24820,86 +25334,86 @@ msgstr ""
 "\"git revert --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
 "执行 \"git revert\" 之前的状态，执行 \"git revert --abort\"。"
 
-#: sequencer.c
+#: sequencer.c:574 sequencer.c:3576
 #, c-format
 msgid "could not lock '%s'"
 msgstr "不能锁定 '%s'"
 
-#: sequencer.c
+#: sequencer.c:581
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "不能将换行符写入 '%s'"
 
-#: sequencer.c
+#: sequencer.c:586 sequencer.c:3582 sequencer.c:3596 sequencer.c:3869
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "无法完成 '%s'"
 
-#: sequencer.c
+#: sequencer.c:625
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "您的本地修改将被%s覆盖。"
 
-#: sequencer.c
+#: sequencer.c:629
 msgid "commit your changes or stash them to proceed."
 msgstr "提交您的修改或贮藏后再继续。"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c
+#: sequencer.c:815
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s：无法写入新索引文件"
 
-#: sequencer.c
+#: sequencer.c:829
 msgid "unable to update cache tree"
 msgstr "不能更新缓存树"
 
-#: sequencer.c
+#: sequencer.c:853
 msgid "could not resolve HEAD commit"
 msgstr "不能解析 HEAD 提交"
 
-#: sequencer.c
+#: sequencer.c:937
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "在 '%.*s' 中没有 key"
 
-#: sequencer.c
+#: sequencer.c:948
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "无法为 '%s' 的值去引号"
 
-#: sequencer.c
+#: sequencer.c:995
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "已经给出 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c
+#: sequencer.c:1000
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c
+#: sequencer.c:1005
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "已经给出 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c
+#: sequencer.c:1009
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "未知变量 '%s'"
 
-#: sequencer.c
+#: sequencer.c:1014
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "缺少 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c
+#: sequencer.c:1016
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "缺少 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c
+#: sequencer.c:1018
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "缺少 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c
+#: sequencer.c:1083
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -24928,11 +25442,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c
+#: sequencer.c:1375
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' 钩子失败"
 
-#: sequencer.c
+#: sequencer.c:1381
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -24956,7 +25470,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c
+#: sequencer.c:1394
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -24979,321 +25493,366 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c
+#: sequencer.c:1437
 msgid "couldn't look up newly created commit"
 msgstr "无法找到新创建的提交"
 
-#: sequencer.c
+#: sequencer.c:1439
 msgid "could not parse newly created commit"
 msgstr "不能解析新创建的提交"
 
-#: sequencer.c
+#: sequencer.c:1487
 msgid "unable to resolve HEAD after creating commit"
 msgstr "创建提交后，不能解析 HEAD"
 
-#: sequencer.c
+#: sequencer.c:1489
 msgid "detached HEAD"
 msgstr "分离头指针"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: sequencer.c
+#: sequencer.c:1493
 msgid " (root-commit)"
 msgstr "（根提交）"
 
-#: sequencer.c
+#: sequencer.c:1515 sequencer.c:5324
 msgid "could not parse HEAD"
 msgstr "不能解析 HEAD"
 
-#: sequencer.c
+#: sequencer.c:1517
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s 不是一个提交！"
 
-#: sequencer.c
+#: sequencer.c:1579 sequencer.c:2502
 msgid "unable to parse commit author"
 msgstr "不能解析提交作者"
 
-#: sequencer.c
+#: sequencer.c:1623 sequencer.c:1745
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "不能从 '%s' 读取提交说明"
 
-#: sequencer.c
+#: sequencer.c:1655 sequencer.c:1687
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "无效的作者身份 '%s'"
 
-#: sequencer.c
+#: sequencer.c:1661
 msgid "corrupt author: missing date information"
 msgstr "损坏的作者：缺失日期信息"
 
-#: sequencer.c
+#: sequencer.c:1728 sequencer.c:5102
 #, c-format
 msgid "could not update %s"
 msgstr "不能更新 %s"
 
-#: sequencer.c
+#: sequencer.c:1782
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "不能解析父提交 %s"
 
-#: sequencer.c
+#: sequencer.c:1859 sequencer.c:2145
 #, c-format
 msgid "unknown command: %d"
 msgstr "未知命令：%d"
 
-#: sequencer.c
+#: sequencer.c:1901
 msgid "This is the 1st commit message:"
 msgstr "这是第一个提交说明："
 
-#: sequencer.c
+#: sequencer.c:1902
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "这是提交说明 #%d："
 
-#: sequencer.c
+#: sequencer.c:1903
 msgid "The 1st commit message will be skipped:"
 msgstr "第一个提交说明将被跳过："
 
-#: sequencer.c
+#: sequencer.c:1904
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "提交说明 #%d 将被跳过："
 
-#: sequencer.c
+#: sequencer.c:1905
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "这是一个 %d 个提交的组合。"
 
-#: sequencer.c
+#: sequencer.c:2053 sequencer.c:2112
 #, c-format
 msgid "cannot write '%s'"
 msgstr "不能写 '%s'"
 
-#: sequencer.c
+#: sequencer.c:2101
 msgid "need a HEAD to fixup"
 msgstr "需要一个 HEAD 来修复"
 
-#: sequencer.c
+#: sequencer.c:2103 sequencer.c:3896
 msgid "could not read HEAD"
 msgstr "不能读取 HEAD"
 
-#: sequencer.c
+#: sequencer.c:2106
 msgid "could not read HEAD's commit message"
 msgstr "不能读取 HEAD 的提交说明"
 
-#: sequencer.c
+#: sequencer.c:2131
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "不能读取 %s 的提交说明"
 
-#: sequencer.c
+#: sequencer.c:2257
 msgid "your index file is unmerged."
 msgstr "您的索引文件未完成合并。"
 
-#: sequencer.c
+#: sequencer.c:2264
 msgid "cannot fixup root commit"
 msgstr "不能修复根提交"
 
-#: sequencer.c
+#: sequencer.c:2283
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
 
-#: sequencer.c
+#: sequencer.c:2291 sequencer.c:2299
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "提交 %s 没有第 %d 个父提交"
 
-#: sequencer.c
+#: sequencer.c:2305
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "不能得到 %s 的提交说明"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c
+#: sequencer.c:2324
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：不能解析父提交 %s"
 
-#: sequencer.c
+#: sequencer.c:2471
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "不能还原 %s... %s"
 
-#: sequencer.c
+#: sequencer.c:2472
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "不能应用 %s... %s"
 
-#: sequencer.c
+#: sequencer.c:2494
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
 
-#: sequencer.c
+#: sequencer.c:2552
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：无法读取索引"
 
-#: sequencer.c
+#: sequencer.c:2560
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：无法刷新索引"
 
-#: sequencer.c
+#: sequencer.c:2614
 #, c-format
 msgid "'%s' is not a valid label"
 msgstr "'%s' 不是一个有效的标签"
 
-#: sequencer.c
+#: sequencer.c:2619
 #, c-format
 msgid "'%s' is not a valid refname"
 msgstr "'%s' 不是一个有效的引用名"
 
-#: sequencer.c
+#: sequencer.c:2621
 #, c-format
 msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s"
 msgstr "update-ref 需要一个完整的引用名，例如：refs/heads/%s"
 
-#: sequencer.c
+#: sequencer.c:2636 sequencer.c:2648 sequencer.c:2661
+#, c-format
+msgid "'%s' does not accept merge commits"
+msgstr "'%s' 不接受合并提交"
+
+#. TRANSLATORS: 'pick' and 'merge -C' should not be
+#. translated.
+#.
+#: sequencer.c:2643
+msgid ""
+"'pick' does not take a merge commit. If you wanted to\n"
+"replay the merge, use 'merge -C' on the commit."
+msgstr "'pick' 不接受合并提交。如果您想要重放合并，请在提交上使用 'merge -C'。"
+
+#. TRANSLATORS: 'reword' and 'merge -c' should not be
+#. translated.
+#.
+#: sequencer.c:2655
+msgid ""
+"'reword' does not take a merge commit. If you wanted to\n"
+"replay the merge and reword the commit message, use\n"
+"'merge -c' on the commit"
+msgstr ""
+"'reword' 不接受合并提交。如果您想重放合并并重写提交\n"
+"消息，请在提交上使用 'merge -c'"
+
+#. TRANSLATORS: 'edit', 'merge -C' and 'break' should
+#. not be translated.
+#.
+#: sequencer.c:2668
+msgid ""
+"'edit' does not take a merge commit. If you wanted to\n"
+"replay the merge, use 'merge -C' on the commit, and then\n"
+"'break' to give the control back to you so that you can\n"
+"do 'git commit --amend && git rebase --continue'."
+msgstr ""
+"'edit”' 不接受合并提交。如果您想要重播合并，请在提交上使用 'merge -C'，然后使"
+"用\n"
+"'break' 将控制权交还给您，以便您可以执行 'git commit --amend && git rebase --"
+"continue'。"
+
+#: sequencer.c:2676
+msgid "cannot squash merge commit into another commit"
+msgstr "无法将提交压缩合并到另一个提交中"
+
+#: sequencer.c:2713
 #, c-format
 msgid "invalid command '%.*s'"
 msgstr "无效命令 '%.*s'"
 
-#: sequencer.c
+#: sequencer.c:2731
 #, c-format
 msgid "missing arguments for %s"
 msgstr "缺少 %s 的参数"
 
-#: sequencer.c
+#: sequencer.c:2781
 #, c-format
 msgid "could not parse '%s'"
 msgstr "无法解析 '%s'"
 
-#: sequencer.c
+#: sequencer.c:2847
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "无效行 %d：%.*s"
 
-#: sequencer.c
+#: sequencer.c:2861
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "没有父提交的情况下不能 '%s'"
 
-#: sequencer.c
+#: sequencer.c:2947
 msgid "cancelling a cherry picking in progress"
 msgstr "正在取消一个进行中的拣选"
 
-#: sequencer.c
+#: sequencer.c:2956
 msgid "cancelling a revert in progress"
 msgstr "正在取消一个进行中的还原"
 
-#: sequencer.c
+#: sequencer.c:2999
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "请用 'git rebase --edit-todo' 来修改。"
 
-#: sequencer.c
+#: sequencer.c:3001
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "不可用的指令清单：'%s'"
 
-#: sequencer.c
+#: sequencer.c:3006
 msgid "no commits parsed."
 msgstr "没有解析提交。"
 
-#: sequencer.c
+#: sequencer.c:3017
 msgid "cannot cherry-pick during a revert."
 msgstr "不能在回退中执行拣选。"
 
-#: sequencer.c
+#: sequencer.c:3019
 msgid "cannot revert during a cherry-pick."
 msgstr "不能在拣选中执行回退。"
 
-#: sequencer.c
+#: sequencer.c:3217
 msgid "unusable squash-onto"
 msgstr "不可用的 squash-onto"
 
-#: sequencer.c
+#: sequencer.c:3237
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "格式错误的选项清单：'%s'"
 
-#: sequencer.c
+#: sequencer.c:3337 sequencer.c:5531
 msgid "empty commit set passed"
 msgstr "提供了空的提交集"
 
-#: sequencer.c
+#: sequencer.c:3354
 msgid "revert is already in progress"
 msgstr "一个还原操作已在进行"
 
-#: sequencer.c
+#: sequencer.c:3356
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c
+#: sequencer.c:3359
 msgid "cherry-pick is already in progress"
 msgstr "拣选操作已在进行"
 
-#: sequencer.c
+#: sequencer.c:3361
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c
+#: sequencer.c:3375
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "不能创建序列目录 '%s'"
 
-#: sequencer.c
+#: sequencer.c:3429 sequencer.c:5184
 msgid "no cherry-pick or revert in progress"
 msgstr "拣选或还原操作并未进行"
 
-#: sequencer.c
+#: sequencer.c:3431 sequencer.c:3442
 msgid "cannot resolve HEAD"
 msgstr "不能解析 HEAD"
 
-#: sequencer.c
+#: sequencer.c:3433 sequencer.c:3477
 msgid "cannot abort from a branch yet to be born"
 msgstr "不能从尚未建立的分支终止"
 
-#: sequencer.c
+#: sequencer.c:3465
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "不能读取 '%s'：%s"
 
-#: sequencer.c
+#: sequencer.c:3466
 msgid "unexpected end of file"
 msgstr "意外的文件结束"
 
-#: sequencer.c
+#: sequencer.c:3472
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
 
-#: sequencer.c
+#: sequencer.c:3483
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
 
-#: sequencer.c
+#: sequencer.c:3524
 msgid "no revert in progress"
 msgstr "没有正在进行的还原"
 
-#: sequencer.c
+#: sequencer.c:3533
 msgid "no cherry-pick in progress"
 msgstr "没有正在进行的拣选"
 
-#: sequencer.c
+#: sequencer.c:3543
 msgid "failed to skip the commit"
 msgstr "无法跳过这个提交"
 
-#: sequencer.c
+#: sequencer.c:3550
 msgid "there is nothing to skip"
 msgstr "没有要跳过的"
 
-#: sequencer.c
+#: sequencer.c:3553
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -25302,16 +25861,15 @@ msgstr ""
 "您已经提交了么？\n"
 "试试 \"git %s --continue\""
 
-#: sequencer.c
+#: sequencer.c:3719 sequencer.c:5082
 msgid "cannot read HEAD"
 msgstr "不能读取 HEAD"
 
-#: sequencer.c
-#, c-format
-msgid "unable to copy '%s' to '%s'"
-msgstr "无法拷贝 '%s' 至 '%s'"
+#: sequencer.c:3745
+msgid "could not write commit message file"
+msgstr "无法写入提交消息文件"
 
-#: sequencer.c
+#: sequencer.c:3755
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -25330,22 +25888,22 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c
+#: sequencer.c:3765
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "不能应用 %s... %.*s"
 
-#: sequencer.c
+#: sequencer.c:3772
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "不能合并 %.*s"
 
-#: sequencer.c
+#: sequencer.c:3801
 #, c-format
 msgid "Executing: %s\n"
 msgstr "正在执行：%s\n"
 
-#: sequencer.c
+#: sequencer.c:3815
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -25360,11 +25918,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c
+#: sequencer.c:3821
 msgid "and made changes to the index and/or the working tree.\n"
 msgstr "并且修改索引和/或工作区。\n"
 
-#: sequencer.c
+#: sequencer.c:3827
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -25381,63 +25939,63 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c
+#: sequencer.c:3886
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "非法的标签名称：'%.*s'"
 
-#: sequencer.c
+#: sequencer.c:3967
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "无法解析 '%s'"
 
-#: sequencer.c
+#: sequencer.c:3993
 msgid "writing fake root commit"
 msgstr "写伪根提交"
 
-#: sequencer.c
+#: sequencer.c:3998
 msgid "writing squash-onto"
 msgstr "写入 squash-onto"
 
-#: sequencer.c
+#: sequencer.c:4095
 msgid "cannot merge without a current revision"
 msgstr "没有当前版本不能合并"
 
-#: sequencer.c
+#: sequencer.c:4117
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "无法解析 '%.*s'"
 
-#: sequencer.c
+#: sequencer.c:4126
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "无可用合并：'%.*s'"
 
-#: sequencer.c
+#: sequencer.c:4138
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "章鱼合并不能在一个新的根提交上执行"
 
-#: sequencer.c
+#: sequencer.c:4194
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "不能获取 '%s' 的提交说明"
 
-#: sequencer.c
+#: sequencer.c:4335
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "甚至不能尝试合并 '%.*s'"
 
-#: sequencer.c
+#: sequencer.c:4352
 msgid "merge: Unable to write new index file"
 msgstr "合并：无法写入新索引文件"
 
-#: sequencer.c
+#: sequencer.c:4407
 #, c-format
 msgid ""
 "another 'rebase' process appears to be running; '%s.lock' already exists"
 msgstr "另一个 'rebase' 进程似乎在运行；'%s.lock' 已存在"
 
-#: sequencer.c
+#: sequencer.c:4585
 #, c-format
 msgid ""
 "Updated the following refs with %s:\n"
@@ -25446,7 +26004,7 @@ msgstr ""
 "已用 %s 更新下列引用：\n"
 "%s"
 
-#: sequencer.c
+#: sequencer.c:4591
 #, c-format
 msgid ""
 "Failed to update the following refs with %s:\n"
@@ -25455,40 +26013,40 @@ msgstr ""
 "无法用 %s 更新下列引用：\n"
 "%s"
 
-#: sequencer.c
+#: sequencer.c:4657
 msgid "Cannot autostash"
 msgstr "无法自动贮藏"
 
-#: sequencer.c
+#: sequencer.c:4660
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "意外的贮藏响应：'%s'"
 
-#: sequencer.c
+#: sequencer.c:4667
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "不能为 '%s' 创建目录"
 
-#: sequencer.c
+#: sequencer.c:4675
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "创建了自动贮藏：%s\n"
 
-#: sequencer.c
+#: sequencer.c:4677
 msgid "could not reset --hard"
 msgstr "无法硬性重置（reset --hard）"
 
-#: sequencer.c
+#: sequencer.c:4711
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "已应用自动贮藏。\n"
 
-#: sequencer.c
+#: sequencer.c:4723
 #, c-format
 msgid "cannot store %s"
 msgstr "不能存储 %s"
 
-#: sequencer.c
+#: sequencer.c:4726
 #, c-format
 msgid ""
 "%s\n"
@@ -25499,33 +26057,33 @@ msgstr ""
 "您的修改在贮藏区中很安全。\n"
 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
 
-#: sequencer.c
+#: sequencer.c:4731
 msgid "Applying autostash resulted in conflicts."
 msgstr "应用自动贮藏导致冲突。"
 
-#: sequencer.c
+#: sequencer.c:4732
 msgid "Autostash exists; creating a new stash entry."
 msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"
 
-#: sequencer.c
+#: sequencer.c:4786
 msgid "autostash reference is a symref"
 msgstr "自动贮藏的引用是一个符号引用"
 
-#: sequencer.c
+#: sequencer.c:4823
 msgid "could not detach HEAD"
 msgstr "不能分离头指针"
 
-#: sequencer.c
+#: sequencer.c:4838
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "停止在 HEAD\n"
 
-#: sequencer.c
+#: sequencer.c:4840
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "停止在 %s\n"
 
-#: sequencer.c
+#: sequencer.c:4872
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -25545,58 +26103,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c
+#: sequencer.c:4907
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "停止在 %s... %.*s\n"
 
-#: sequencer.c
+#: sequencer.c:4984
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "正在变基（%d/%d）%s"
 
-#: sequencer.c
+#: sequencer.c:5049
 #, c-format
 msgid "unknown command %d"
 msgstr "未知命令 %d"
 
-#: sequencer.c
+#: sequencer.c:5090
 msgid "could not read orig-head"
 msgstr "不能读取 orig-head"
 
-#: sequencer.c
+#: sequencer.c:5095
 msgid "could not read 'onto'"
 msgstr "不能读取 'onto'"
 
-#: sequencer.c
+#: sequencer.c:5109
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "不能更新 HEAD 为 %s"
 
-#: sequencer.c
+#: sequencer.c:5160
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "成功变基并更新 %s。\n"
 
-#: sequencer.c
+#: sequencer.c:5216
 msgid "cannot rebase: You have unstaged changes."
 msgstr "不能变基：您有未暂存的变更。"
 
-#: sequencer.c
+#: sequencer.c:5232
 msgid "cannot amend non-existing commit"
 msgstr "不能修补不存在的提交"
 
-#: sequencer.c
+#: sequencer.c:5237
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "无效文件：'%s'"
 
-#: sequencer.c
+#: sequencer.c:5242
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "无效内容：'%s'"
 
-#: sequencer.c
+#: sequencer.c:5247
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -25605,73 +26163,73 @@ msgstr ""
 "\n"
 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
 
-#: sequencer.c
+#: sequencer.c:5285 sequencer.c:5336
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "不能写入文件：'%s'"
 
-#: sequencer.c
+#: sequencer.c:5358
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "不能删除 CHERRY_PICK_HEAD"
 
-#: sequencer.c
+#: sequencer.c:5376
 msgid "could not commit staged changes."
 msgstr "不能提交暂存的修改。"
 
-#: sequencer.c
+#: sequencer.c:5508
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s：不能拣选一个%s"
 
-#: sequencer.c
+#: sequencer.c:5512
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s：错误的版本"
 
-#: sequencer.c
+#: sequencer.c:5547
 msgid "can't revert as initial commit"
 msgstr "不能作为初始提交回退"
 
-#: sequencer.c
+#: sequencer.c:5846 sequencer.c:6085
 #, c-format
 msgid "skipped previously applied commit %s"
 msgstr "跳过了先前已应用的提交 %s"
 
-#: sequencer.c
+#: sequencer.c:5916 sequencer.c:6101
 msgid "use --reapply-cherry-picks to include skipped commits"
 msgstr "使用 --reapply-cherry-picks 来包括跳过的提交"
 
-#: sequencer.c
+#: sequencer.c:6066
 msgid "make_script: unhandled options"
 msgstr "make_script：有未能处理的选项"
 
-#: sequencer.c
+#: sequencer.c:6071
 msgid "make_script: error preparing revisions"
 msgstr "make_script：准备版本时错误"
 
-#: sequencer.c
+#: sequencer.c:6466 sequencer.c:6483
 msgid "nothing to do"
 msgstr "无事可做"
 
-#: sequencer.c
+#: sequencer.c:6503
 msgid "could not skip unnecessary pick commands"
 msgstr "无法跳过不必要的拣选"
 
-#: sequencer.c
+#: sequencer.c:6603
 msgid "the script was already rearranged."
 msgstr "脚本已经重新编排。"
 
-#: sequencer.c
+#: sequencer.c:6760 sequencer.c:6768
 #, c-format
 msgid "update-refs file at '%s' is invalid"
 msgstr "位于 '%s' 的 update-refs 文件无效"
 
-#: setup.c
+#: setup.c:153
 #, c-format
 msgid "'%s' is outside repository at '%s'"
 msgstr "'%s' 在位于 '%s' 的仓库之外"
 
-#: setup.c
+#: setup.c:205
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -25680,7 +26238,7 @@ msgstr ""
 "%s：工作区中无此路径。\n"
 "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
 
-#: setup.c
+#: setup.c:218
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -25691,12 +26249,12 @@ msgstr ""
 "使用 '--' 来分隔版本和路径，例如：\n"
 "'git <命令> [<版本>...] -- [<文件>...]'"
 
-#: setup.c
+#: setup.c:284
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "选项 '%s' 必须在其他非选项参数之前"
 
-#: setup.c
+#: setup.c:303
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -25707,101 +26265,114 @@ msgstr ""
 "使用 '--' 来分隔版本和路径，例如：\n"
 "'git <命令> [<版本>...] -- [<文件>...]'"
 
-#: setup.c
+#: setup.c:491
 msgid "unable to set up work tree using invalid config"
 msgstr "无法使用无效配置来创建工作区"
 
-#: setup.c
+#: setup.c:663
 #, c-format
 msgid "'%s' already specified as '%s'"
 msgstr "'%s' 已指定为 '%s'"
 
-#: setup.c
+#: setup.c:847
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "期望 git 仓库版本 <= %d，却得到 %d"
 
-#: setup.c
+#: setup.c:855
 msgid "unknown repository extension found:"
 msgid_plural "unknown repository extensions found:"
 msgstr[0] "发现未知的仓库扩展："
 msgstr[1] "发现未知的仓库扩展："
 
-#: setup.c
+#: setup.c:869
 msgid "repo version is 0, but v1-only extension found:"
 msgid_plural "repo version is 0, but v1-only extensions found:"
 msgstr[0] "仓库的版本是 0，但是发现仅用于 v1 的扩展："
 msgstr[1] "仓库的版本是 0，但是发现仅用于 v1 的扩展："
 
-#: setup.c
+#: setup.c:890
 #, c-format
 msgid "error opening '%s'"
 msgstr "打开 '%s' 出错"
 
-#: setup.c
+#: setup.c:892
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "文件太大，无法作为 .git 文件：'%s'"
 
-#: setup.c
+#: setup.c:894
 #, c-format
 msgid "error reading %s"
 msgstr "读取 %s 出错"
 
-#: setup.c
+#: setup.c:896
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "无效的 gitfile 格式：%s"
 
-#: setup.c
+#: setup.c:898
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "在 gitfile 中没有路径：%s"
 
-#: setup.c
+#: setup.c:900
 #, c-format
 msgid "not a git repository: %s"
 msgstr "不是 git 仓库：%s"
 
-#: setup.c
+#: setup.c:1002
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' 太大"
 
-#: setup.c
+#: setup.c:1016
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "不是 git 仓库：'%s'"
 
-#: setup.c
+#: setup.c:1045 setup.c:1047 setup.c:1078
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "不能切换目录到 '%s'"
 
-#: setup.c
+#: setup.c:1050 setup.c:1106 setup.c:1116 setup.c:1155 setup.c:1163
 msgid "cannot come back to cwd"
 msgstr "无法返回当前工作目录"
 
-#: setup.c
+#: setup.c:1177
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "无法获取 '%*s%s%s' 状态（stat）"
 
-#: setup.c
+#: setup.c:1299 setup.c:1642
+#, c-format
+msgid ""
+"detected dubious ownership in repository at '%s'\n"
+"%sTo add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"在 '%s' 检测到可疑的仓库所有权\n"
+"%s要为本仓库创建特例，请运行：\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#: setup.c:1605
 msgid "Unable to read current working directory"
 msgstr "不能读取当前工作目录"
 
-#: setup.c
+#: setup.c:1614 setup.c:1620
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "不能切换到 '%s'"
 
-#: setup.c
+#: setup.c:1625
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "不是 git 仓库（或者任何父目录）：%s"
 
-#: setup.c
+#: setup.c:1631
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -25810,25 +26381,12 @@ msgstr ""
 "不是 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
 
-#: setup.c
-#, c-format
-msgid ""
-"detected dubious ownership in repository at '%s'\n"
-"%sTo add an exception for this directory, call:\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-msgstr ""
-"在 '%s' 检测到可疑的仓库所有权\n"
-"%s要为本仓库创建特例，请运行：\n"
-"\n"
-"\tgit config --global --add safe.directory %s"
-
-#: setup.c
+#: setup.c:1653
 #, c-format
 msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')"
 msgstr "无法使用纯仓库 '%s' （safe.bareRepository 为 '%s'）"
 
-#: setup.c
+#: setup.c:1787
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -25837,173 +26395,173 @@ msgstr ""
 "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
 "文件属主必须始终拥有读写权限。"
 
-#: setup.c
+#: setup.c:1854
 msgid "fork failed"
 msgstr "fork 失败"
 
-#: setup.c
+#: setup.c:1859
 msgid "setsid failed"
 msgstr "setsid 失败"
 
-#: setup.c
+#: setup.c:1961
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "不能对模版 '%s' 调用 stat"
 
-#: setup.c
+#: setup.c:1966
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "不能打开目录 '%s'"
 
-#: setup.c
+#: setup.c:1978
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "不能读取链接 '%s'"
 
-#: setup.c
+#: setup.c:1980
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
 
-#: setup.c
+#: setup.c:1986
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "不能拷贝 '%s' 至 '%s'"
 
-#: setup.c
+#: setup.c:1990
 #, c-format
 msgid "ignoring template %s"
 msgstr "忽略模版 %s"
 
-#: setup.c
+#: setup.c:2014
 #, c-format
 msgid "templates not found in %s"
 msgstr "没有在 %s 中找到模版"
 
-#: setup.c
+#: setup.c:2029
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "没有从 '%s' 复制模版：%s"
 
-#: setup.c
+#: setup.c:2133
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "无效的初始分支名：'%s'"
 
-#: setup.c
+#: setup.c:2142
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init：已忽略 --initial-branch=%s"
 
-#: setup.c
+#: setup.c:2277
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "不能处理 %d 类型的文件"
 
-#: setup.c
+#: setup.c:2280
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "不能移动 %s 至 %s"
 
-#: setup.c
+#: setup.c:2296
 msgid "attempt to reinitialize repository with different hash"
 msgstr "尝试用不同的哈希算法重新初始化仓库"
 
-#: setup.c
+#: setup.c:2315
 msgid ""
 "attempt to reinitialize repository with different reference storage format"
 msgstr "尝试使用不同的引用存储格式重新初始化仓库"
 
-#: setup.c
+#: setup.c:2341 setup.c:2344
 #, c-format
 msgid "%s already exists"
 msgstr "%s 已经存在"
 
-#: setup.c
+#: setup.c:2416
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
 
-#: setup.c
+#: setup.c:2417
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n"
 
-#: setup.c
+#: setup.c:2421
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
 
-#: setup.c
+#: setup.c:2422
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "已初始化空的 Git 仓库于 %s%s\n"
 
-#: sparse-index.c
+#: sparse-index.c:408
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "索引条目是一个目录，但不是稀疏的 (%08x)"
 
-#: split-index.c
+#: split-index.c:16
 msgid "cannot use split index with a sparse index"
 msgstr "拆分索引无法与稀疏索引一起使用"
 
 #. TRANSLATORS: The first %s is a command like "ls-tree".
-#: strbuf.c
+#: strbuf.c:463
 #, c-format
 msgid "bad %s format: element '%s' does not start with '('"
 msgstr "坏的 %s 格式：元素 '%s' 没有以 '(' 开头"
 
 #. TRANSLATORS: The first %s is a command like "ls-tree".
-#: strbuf.c
+#: strbuf.c:469
 #, c-format
 msgid "bad %s format: element '%s' does not end in ')'"
 msgstr "坏的 %s 格式：元素 '%s' 没有以 ')' 结尾"
 
 #. TRANSLATORS: %s is a command like "ls-tree".
-#: strbuf.c
+#: strbuf.c:473
 #, c-format
 msgid "bad %s format: %%%.*s"
 msgstr "坏的 %s 格式: %%%.*s"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c
+#: strbuf.c:842
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c
+#: strbuf.c:844
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c
+#: strbuf.c:852
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c
+#: strbuf.c:854
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c
+#: strbuf.c:861
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c
+#: strbuf.c:863
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c
+#: strbuf.c:869
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -26011,120 +26569,120 @@ msgstr[0] "%u 字节"
 msgstr[1] "%u 字节"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c
+#: strbuf.c:871
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u 字节/秒"
 msgstr[1] "%u 字节/秒"
 
-#: submodule-config.c
+#: submodule-config.c:388
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
 msgstr "忽略可疑的子模组名称：%s"
 
-#: submodule-config.c
+#: submodule-config.c:456
 msgid "negative values not allowed for submodule.fetchJobs"
 msgstr "submodule.fetchJobs 不允许为负值"
 
-#: submodule-config.c
+#: submodule-config.c:556
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr "忽略可能被解析为命令行选项的 '%s'：%s"
 
-#: submodule-config.c
+#: submodule-config.c:988
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "不能更新 .gitmodules 条目 %s"
 
-#: submodule.c
+#: submodule.c:124 submodule.c:153
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
 
-#: submodule.c
+#: submodule.c:128 submodule.c:157
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
 
-#: submodule.c
+#: submodule.c:164
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "无法移除 %s 的 .gitmodules 条目"
 
-#: submodule.c
+#: submodule.c:175
 msgid "staging updated .gitmodules failed"
 msgstr "将更新后 .gitmodules 添加暂存区失败"
 
-#: submodule.c
+#: submodule.c:355
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "位于未检出的子模组 '%s'"
 
-#: submodule.c
+#: submodule.c:386
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
 
-#: submodule.c
+#: submodule.c:461
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "坏的 --ignore-submodules 参数：%s"
 
-#: submodule.c
+#: submodule.c:877
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
 "same. Skipping it."
 msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
 
-#: submodule.c
+#: submodule.c:1001
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
 
-#: submodule.c
+#: submodule.c:1086
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
 "submodule %s"
 msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'"
 
-#: submodule.c
+#: submodule.c:1221
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr "处理子模组 '%s' 失败"
 
-#: submodule.c
+#: submodule.c:1262
 #, c-format
 msgid "Pushing submodule '%s'\n"
 msgstr "正在推送子模组 '%s'\n"
 
-#: submodule.c
+#: submodule.c:1265
 #, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr "无法推送子模组 '%s'\n"
 
-#: submodule.c
+#: submodule.c:1602
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "正在获取子模组 %s%s\n"
 
-#: submodule.c
+#: submodule.c:1624
 #, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr "无法访问子模组 '%s'\n"
 
-#: submodule.c
+#: submodule.c:1653
 #, c-format
 msgid "Could not access submodule '%s' at commit %s\n"
 msgstr "无法访问子模组 '%s' 提交 %s\n"
 
-#: submodule.c
+#: submodule.c:1664
 #, c-format
 msgid "Fetching submodule %s%s at commit %s\n"
 msgstr "正在获取子模组 %s%s 提交 %s\n"
 
-#: submodule.c
+#: submodule.c:1879
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -26133,77 +26691,87 @@ msgstr ""
 "获取子模组时的错误：\n"
 "%s"
 
-#: submodule.c
+#: submodule.c:1907
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "无法将 '%s' 识别为 git 仓库"
 
-#: submodule.c
+#: submodule.c:1924
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
 
-#: submodule.c
+#: submodule.c:1965
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
 
-#: submodule.c
+#: submodule.c:2046
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "无法在子模组 '%s' 中启动 'git status'"
 
-#: submodule.c
+#: submodule.c:2059
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "无法在子模组 '%s' 中执行 'git status'"
 
-#: submodule.c
+#: submodule.c:2079
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
 
-#: submodule.c
+#: submodule.c:2101 submodule.c:2413
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "无法递归进子模组路径 '%s'"
 
-#: submodule.c
+#: submodule.c:2127
 msgid "could not reset submodule index"
 msgstr "无法重置子模组索引"
 
-#: submodule.c
+#: submodule.c:2168
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "子模组 '%s' 中有脏索引"
 
-#: submodule.c
+#: submodule.c:2239
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "子模组 '%s' 无法被更新。"
 
-#: submodule.c
+#: submodule.c:2307
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
 
-#: submodule.c
+#: submodule.c:2334
+#, c-format
+msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link"
+msgstr "子模组路径 '%2$s' 中的 '%1$.*s' 不应为符号链接"
+
+#: submodule.c:2338
+#, c-format
+msgid "expected submodule path '%s' not to be a symbolic link"
+msgstr "预期子模组路径 '％s' 不是符号链接"
+
+#: submodule.c:2360
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
 
-#: submodule.c
+#: submodule.c:2372 submodule.c:2458
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "不能查询子模组 '%s' 的名称"
 
-#: submodule.c
+#: submodule.c:2376
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "禁止移动 '%s' 到现存 git 目录中"
 
-#: submodule.c
+#: submodule.c:2382
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -26214,87 +26782,82 @@ msgstr ""
 "'%s' 迁移至\n"
 "'%s'\n"
 
-#: submodule.c
+#: submodule.c:2517
 msgid "could not start ls-files in .."
 msgstr "无法在 .. 中启动 ls-files"
 
-#: submodule.c
+#: submodule.c:2558
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree 返回未知返回值 %d"
 
-#: symlinks.c
+#: symlinks.c:247
 #, c-format
 msgid "failed to lstat '%s'"
 msgstr "无法执行 lstat '%s'"
 
-#: t/helper/test-bundle-uri.c
+#: t/helper/test-bundle-uri.c:89
 msgid "no remote configured to get bundle URIs from"
 msgstr "没有远程被设置为可以获取归档包 URI"
 
-#: t/helper/test-bundle-uri.c
-#, c-format
-msgid "remote '%s' has no configured URL"
-msgstr "远程 '%s' 没有设置 URL"
-
-#: t/helper/test-bundle-uri.c
+#: t/helper/test-bundle-uri.c:94
 msgid "could not get the bundle-uri list"
 msgstr "无法获取 bundle-uri 列表"
 
-#: t/helper/test-cache-tree.c
+#: t/helper/test-cache-tree.c:14
 msgid "test-tool cache-tree <options> (control|prime|update)"
 msgstr "test-tool cache-tree <选项> (control|prime|update)"
 
-#: t/helper/test-cache-tree.c
+#: t/helper/test-cache-tree.c:28
 msgid "clear the cache tree before each iteration"
 msgstr "在每次迭代前清除缓存树"
 
-#: t/helper/test-cache-tree.c
+#: t/helper/test-cache-tree.c:30
 msgid "number of entries in the cache tree to invalidate (default 0)"
 msgstr "缓存树中无效化的条目数量（默认 0）"
 
-#: t/helper/test-reach.c
+#: t/helper/test-reach.c:164
 #, c-format
 msgid "commit %s is not marked reachable"
 msgstr "提交 %s 没有标记为可达"
 
-#: t/helper/test-reach.c
+#: t/helper/test-reach.c:174
 msgid "too many commits marked reachable"
 msgstr "太多提交标记为可达"
 
-#: t/helper/test-serve-v2.c
+#: t/helper/test-serve-v2.c:8
 msgid "test-tool serve-v2 [<options>]"
 msgstr "test-tool serve-v2 [<选项>]"
 
-#: t/helper/test-serve-v2.c
+#: t/helper/test-serve-v2.c:20
 msgid "exit immediately after advertising capabilities"
 msgstr "通告能力之后立即退出"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr "test-helper simple-ipc is-active    [<名字>] [<选项>]"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr "test-helper simple-ipc run-daemon   [<名字>] [<线程>]"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 msgstr "test-helper simple-ipc start-daemon [<名字>] [<线程>] [<最大等待>]"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr "test-helper simple-ipc stop-daemon  [<名字>] [<最大等待>]"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr "test-helper simple-ipc send         [<名字>] [<令牌>]"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:587
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 msgstr "test-helper simple-ipc sendbytes    [<名字>] [<字节数>] [<字节>]"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:588
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
@@ -26302,192 +26865,193 @@ msgstr ""
 "test-helper simple-ipc multiple     [<名字>] [<线程>] [<字节计数>] [<批处理大"
 "小>]"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:596
 msgid "name or pathname of unix domain socket"
 msgstr "unix 域套接字的名称或路径名"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:598
 msgid "named-pipe name"
 msgstr "命名管道的名字"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:600
 msgid "number of threads in server thread pool"
 msgstr "服务器线程池中的线程数"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:601
 msgid "seconds to wait for daemon to start or stop"
 msgstr "等待守护进程启动或停止的秒数"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:603
 msgid "number of bytes"
 msgstr "字节数目"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:604
 msgid "number of requests per thread"
 msgstr "每个线程的请求数"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:606
 msgid "byte"
 msgstr "字节"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:606
 msgid "ballast character"
 msgstr "ballast character"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:607
 msgid "token"
 msgstr "令牌"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:607
 msgid "command token to send to the server"
 msgstr "发送到服务器的命令令牌"
 
-#: trailer.c
+#: trailer.c:235
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "执行 trailer 命令 '%s' 失败"
 
-#: trailer.c
+#: trailer.c:486 trailer.c:491 trailer.c:496 trailer.c:565 trailer.c:569
+#: trailer.c:573
 #, c-format
 msgid "unknown value '%s' for key '%s'"
 msgstr "键 '%2$s' 的未知取值 '%1$s'"
 
-#: trailer.c
+#: trailer.c:751
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "尾注 '%.*s' 的键为空"
 
-#: transport-helper.c
+#: transport-helper.c:68 transport-helper.c:97
 msgid "full write to remote helper failed"
 msgstr "完整写入远程助手失败"
 
-#: transport-helper.c
+#: transport-helper.c:152
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "无法为 '%s' 找到远程助手"
 
-#: transport-helper.c
+#: transport-helper.c:168 transport-helper.c:585
 msgid "can't dup helper output fd"
 msgstr "无法复制助手输出文件句柄"
 
-#: transport-helper.c
+#: transport-helper.c:221
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
 "version of Git"
 msgstr "未知的强制能力 %s，该远程助手可能需要新版本的Git"
 
-#: transport-helper.c
+#: transport-helper.c:227
 msgid "this remote helper should implement refspec capability"
 msgstr "远程助手需要实现 refspec 能力"
 
-#: transport-helper.c
+#: transport-helper.c:295 transport-helper.c:437
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s 意外地说：'%s'"
 
-#: transport-helper.c
+#: transport-helper.c:425
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s 也锁定了 %s"
 
-#: transport-helper.c
+#: transport-helper.c:507
 msgid "couldn't run fast-import"
 msgstr "不能执行 fast-import"
 
-#: transport-helper.c
+#: transport-helper.c:530
 msgid "error while running fast-import"
 msgstr "执行 fast-import 出错"
 
-#: transport-helper.c
+#: transport-helper.c:559 transport-helper.c:1265
 #, c-format
 msgid "could not read ref %s"
 msgstr "无法读取引用 %s"
 
-#: transport-helper.c
+#: transport-helper.c:604
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "连接时未知的响应：%s"
 
-#: transport-helper.c
+#: transport-helper.c:626
 msgid "setting remote service path not supported by protocol"
 msgstr "协议不支持设置远程服务路径"
 
-#: transport-helper.c
+#: transport-helper.c:628
 msgid "invalid remote service path"
 msgstr "无效的远程服务路径"
 
-#: transport-helper.c
+#: transport-helper.c:677
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "不能连接到子服务 %s"
 
-#: transport-helper.c transport.c
+#: transport-helper.c:706 transport.c:462
 msgid "--negotiate-only requires protocol v2"
 msgstr "--negotiate-only 需要协议 v2"
 
-#: transport-helper.c
+#: transport-helper.c:771
 msgid "'option' without a matching 'ok/error' directive"
 msgstr "'option' 缺乏一个匹配的 'ok/error' 指令"
 
-#: transport-helper.c
+#: transport-helper.c:814
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "预期 ok/error，助手说 '%s'"
 
-#: transport-helper.c
+#: transport-helper.c:875
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "助手报告 %s 的意外状态"
 
-#: transport-helper.c
+#: transport-helper.c:961
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "助手 %s 不支持 dry-run"
 
-#: transport-helper.c
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "助手 %s 不支持 --signed"
 
-#: transport-helper.c
+#: transport-helper.c:967
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "助手 %s 不支持 --signed=if-asked"
 
-#: transport-helper.c
+#: transport-helper.c:972
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "助手 %s 不支持 --atomic"
 
-#: transport-helper.c
+#: transport-helper.c:976
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr "助手 %s 不支持 --%s"
 
-#: transport-helper.c
+#: transport-helper.c:983
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "助手 %s 不支持 'push-option'"
 
-#: transport-helper.c
+#: transport-helper.c:1083
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-heper 不支持推送，需要引用规格"
 
-#: transport-helper.c
+#: transport-helper.c:1088
 #, c-format
 msgid "helper %s does not support '--force'"
 msgstr "助手 %s 不支持 '--force'"
 
-#: transport-helper.c
+#: transport-helper.c:1137
 msgid "couldn't run fast-export"
 msgstr "无法执行 fast-export"
 
-#: transport-helper.c
+#: transport-helper.c:1142
 msgid "error while running fast-export"
 msgstr "执行 fast-export 时出错"
 
-#: transport-helper.c
+#: transport-helper.c:1165
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -26496,107 +27060,107 @@ msgstr ""
 "没有共同的引用并且也没有指定，什么也不会做。\n"
 "也许您应该指定一个分支。\n"
 
-#: transport-helper.c
+#: transport-helper.c:1242
 #, c-format
 msgid "unsupported object format '%s'"
 msgstr "不支持的对象格式 '%s'"
 
-#: transport-helper.c
+#: transport-helper.c:1251
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "引用列表中格式错误的响应：%s"
 
-#: transport-helper.c
+#: transport-helper.c:1416
 #, c-format
 msgid "read(%s) failed"
 msgstr "读取（%s）失败"
 
-#: transport-helper.c
+#: transport-helper.c:1443
 #, c-format
 msgid "write(%s) failed"
 msgstr "写（%s）失败"
 
-#: transport-helper.c
+#: transport-helper.c:1492
 #, c-format
 msgid "%s thread failed"
 msgstr "%s 线程失败"
 
-#: transport-helper.c
+#: transport-helper.c:1496
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "%s 线程等待失败：%s"
 
-#: transport-helper.c
+#: transport-helper.c:1515 transport-helper.c:1519
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "不能启动线程来拷贝数据：%s"
 
-#: transport-helper.c
+#: transport-helper.c:1556
 #, c-format
 msgid "%s process failed to wait"
 msgstr "%s 进程等待失败"
 
-#: transport-helper.c
+#: transport-helper.c:1560
 #, c-format
 msgid "%s process failed"
 msgstr "%s 进程失败"
 
-#: transport-helper.c
+#: transport-helper.c:1578 transport-helper.c:1587
 msgid "can't start thread for copying data"
 msgstr "不能启动线程来拷贝数据"
 
-#: transport.c
+#: transport.c:123
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
 
-#: transport.c
+#: transport.c:145
 #, c-format
 msgid "could not read bundle '%s'"
 msgstr "无法读取归档包 '%s'"
 
-#: transport.c
+#: transport.c:243
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "传输：无效的深度选项 '%s'"
 
-#: transport.c
+#: transport.c:302
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
 
-#: transport.c
+#: transport.c:303
 msgid "server options require protocol version 2 or later"
 msgstr "服务端选项需要版本 2 协议或更高"
 
-#: transport.c
+#: transport.c:465
 msgid "server does not support wait-for-done"
 msgstr "服务器不支持 wait-for-done"
 
-#: transport.c
+#: transport.c:821
 msgid "could not parse transport.color.* config"
 msgstr "不能解析 transport.color.* 配置"
 
-#: transport.c
+#: transport.c:897
 msgid "support for protocol v2 not implemented yet"
 msgstr "协议 v2 的支持尚未实现"
 
-#: transport.c
+#: transport.c:1097
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "传输 '%s' 不允许"
 
-#: transport.c
+#: transport.c:1147
 msgid "git-over-rsync is no longer supported"
 msgstr "不再支持 git-over-rsync"
 
-#: transport.c
+#: transport.c:1252
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
 
-#: transport.c
+#: transport.c:1256
 #, c-format
 msgid ""
 "\n"
@@ -26623,43 +27187,43 @@ msgstr ""
 "以推送至远程。\n"
 "\n"
 
-#: transport.c
+#: transport.c:1264
 msgid "Aborting."
 msgstr "正在终止。"
 
-#: transport.c
+#: transport.c:1415
 msgid "failed to push all needed submodules"
 msgstr "不能推送全部需要的子模组"
 
-#: transport.c
+#: transport.c:1560
 msgid "bundle-uri operation not supported by protocol"
 msgstr "协议不支持 bundle-uri 操作"
 
-#: transport.c
+#: transport.c:1563
 msgid "could not retrieve server-advertised bundle-uri list"
 msgstr "无法获取服务器公布的 bundle-uri 列表"
 
-#: transport.c
+#: transport.c:1587
 msgid "operation not supported by protocol"
 msgstr "协议不支持该操作"
 
-#: tree-walk.c
+#: tree-walk.c:24
 msgid "too-short tree object"
 msgstr "太短的树对象"
 
-#: tree-walk.c
+#: tree-walk.c:30
 msgid "malformed mode in tree entry"
 msgstr "树对象中的条目模式错误"
 
-#: tree-walk.c
+#: tree-walk.c:34
 msgid "empty filename in tree entry"
 msgstr "树对象条目中空的文件名"
 
-#: tree-walk.c
+#: tree-walk.c:119
 msgid "too-short tree file"
 msgstr "太短的树文件"
 
-#: unpack-trees.c
+#: unpack-trees.c:129
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -26668,7 +27232,7 @@ msgstr ""
 "您对下列文件的本地修改将被检出操作覆盖：\n"
 "%%s请在切换分支前提交或贮藏您的修改。"
 
-#: unpack-trees.c
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -26677,7 +27241,7 @@ msgstr ""
 "您对下列文件的本地修改将被检出操作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -26686,7 +27250,7 @@ msgstr ""
 "您对下列文件的本地修改将被合并操作覆盖：\n"
 "%%s请在合并前提交或贮藏您的修改。"
 
-#: unpack-trees.c
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -26695,7 +27259,7 @@ msgstr ""
 "您对下列文件的本地修改将被合并操作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -26704,7 +27268,7 @@ msgstr ""
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s请在 %s 之前提交或贮藏您的修改。"
 
-#: unpack-trees.c
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -26713,7 +27277,7 @@ msgstr ""
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -26722,7 +27286,7 @@ msgstr ""
 "更新如下目录将会丢失其中未跟踪的文件：\n"
 "%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "Refusing to remove the current working directory:\n"
@@ -26731,7 +27295,7 @@ msgstr ""
 "拒绝删除当前工作目录：\n"
 "%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -26740,7 +27304,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
 "%%s请在切换分支之前移动或删除。"
 
-#: unpack-trees.c
+#: unpack-trees.c:155
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -26749,7 +27313,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:158
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -26758,7 +27322,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
 "%%s请在合并前移动或删除。"
 
-#: unpack-trees.c
+#: unpack-trees.c:160
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -26767,7 +27331,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:163
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -26776,7 +27340,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
 "%%s请在 %s 前移动或删除。"
 
-#: unpack-trees.c
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -26785,7 +27349,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:171
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -26795,7 +27359,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
 "%%s请在切换分支前移动或删除。"
 
-#: unpack-trees.c
+#: unpack-trees.c:173
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -26805,7 +27369,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:176
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -26814,7 +27378,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
 "%%s请在合并前移动或删除。"
 
-#: unpack-trees.c
+#: unpack-trees.c:178
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -26823,7 +27387,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:181
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -26832,7 +27396,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
 "%%s请在 %s 前移动或删除。"
 
-#: unpack-trees.c
+#: unpack-trees.c:183
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -26841,12 +27405,12 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:191
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
 
-#: unpack-trees.c
+#: unpack-trees.c:194
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -26855,7 +27419,7 @@ msgstr ""
 "无法更新子模组：\n"
 "%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:197
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -26865,7 +27429,7 @@ msgstr ""
 "尽管存在稀疏检出模板，以下路径不是最新，因而保留：\n"
 "%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:199
 #, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
@@ -26874,7 +27438,7 @@ msgstr ""
 "尽管存在稀疏检出模板，以下路径处于未合并状态，因而保留：\n"
 "%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:201
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -26884,23 +27448,23 @@ msgstr ""
 "尽管存在稀疏检出模板，以下路径已经存在，因而未更新：\n"
 "%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:283
 #, c-format
 msgid "Aborting\n"
 msgstr "正在终止\n"
 
-#: unpack-trees.c
+#: unpack-trees.c:311
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
 "reapply`.\n"
 msgstr "在修复上述路径之后，您可能要执行 `git sparse-checkout reapply`。\n"
 
-#: unpack-trees.c
+#: unpack-trees.c:373
 msgid "Updating files"
 msgstr "正在更新文件"
 
-#: unpack-trees.c
+#: unpack-trees.c:405
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -26909,362 +27473,362 @@ msgstr ""
 "以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n"
 "并且碰撞组中只有一个文件存在工作区中：\n"
 
-#: unpack-trees.c
+#: unpack-trees.c:1772
 msgid "Updating index flags"
 msgstr "正在更新索引标志"
 
-#: unpack-trees.c
+#: unpack-trees.c:3055
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr "工作树和未跟踪提交具有重复条目：%s"
 
-#: upload-pack.c
+#: upload-pack.c:1682
 msgid "expected flush after fetch arguments"
 msgstr "在 fetch 参数之后应该有一个 flush 包"
 
-#: urlmatch.c
+#: urlmatch.c:166
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
 
-#: urlmatch.c
+#: urlmatch.c:190 urlmatch.c:349 urlmatch.c:408
 #, c-format
 msgid "invalid %XX escape sequence"
 msgstr "无效的 %XX 转义序列"
 
-#: urlmatch.c
+#: urlmatch.c:218
 msgid "missing host and scheme is not 'file:'"
 msgstr "缺失主机名且 URL 方案不是 'file:'"
 
-#: urlmatch.c
+#: urlmatch.c:235
 msgid "a 'file:' URL may not have a port number"
 msgstr "一个 'file:' URL 不应该包含端口号"
 
-#: urlmatch.c
+#: urlmatch.c:250
 msgid "invalid characters in host name"
 msgstr "主机名中包含无效的字符"
 
-#: urlmatch.c
+#: urlmatch.c:295 urlmatch.c:306
 msgid "invalid port number"
 msgstr "无效的端口号"
 
-#: urlmatch.c
+#: urlmatch.c:374
 msgid "invalid '..' path segment"
 msgstr "无效的 '..' 路径片段"
 
-#: usage.c
+#: usage.c:23
 #, c-format
 msgid "error: unable to format message: %s\n"
 msgstr "错误：无法格式化消息：%s\n"
 
-#: usage.c
+#: usage.c:40
 msgid "usage: "
 msgstr "用法："
 
-#: usage.c
+#: usage.c:65
 msgid "fatal: "
 msgstr "致命错误："
 
-#: usage.c
+#: usage.c:85
 msgid "error: "
 msgstr "错误："
 
-#: usage.c
+#: usage.c:92
 msgid "warning: "
 msgstr "警告："
 
-#: walker.c
+#: walker.c:175
 msgid "Fetching objects"
 msgstr "正在获取对象"
 
-#: worktree.c
+#: worktree.c:326
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "在主工作区的 '%s' 不是仓库目录"
 
-#: worktree.c
+#: worktree.c:337
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "文件 '%s' 不包含工作区的绝对路径"
 
-#: worktree.c
+#: worktree.c:355
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' 不是一个 .git 文件，错误码 %d"
 
-#: worktree.c
+#: worktree.c:364
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' 没有指回到 '%s'"
 
-#: worktree.c
+#: worktree.c:576
 msgid "not a directory"
 msgstr "不是一个目录"
 
-#: worktree.c
+#: worktree.c:585
 msgid ".git is not a file"
 msgstr ".git 不是一个文件"
 
-#: worktree.c
+#: worktree.c:587
 msgid ".git file broken"
 msgstr ".git 文件损坏"
 
-#: worktree.c
+#: worktree.c:589
 msgid ".git file incorrect"
 msgstr ".git 文件不正确"
 
-#: worktree.c
+#: worktree.c:697
 msgid "not a valid path"
 msgstr "不是一个有效的路径"
 
-#: worktree.c
+#: worktree.c:703
 msgid "unable to locate repository; .git is not a file"
 msgstr "无法定位仓库，.git 不是一个文件"
 
-#: worktree.c
+#: worktree.c:707
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr "无法定位仓库，.git 文件没有指向一个仓库"
 
-#: worktree.c
+#: worktree.c:711
 msgid "unable to locate repository; .git file broken"
 msgstr "无法定位仓库，.git 文件损坏"
 
-#: worktree.c
+#: worktree.c:717
 msgid "gitdir unreadable"
 msgstr "gitdir 不可读"
 
-#: worktree.c
+#: worktree.c:721
 msgid "gitdir incorrect"
 msgstr "gitdir 不正确"
 
-#: worktree.c
+#: worktree.c:746
 msgid "not a valid directory"
 msgstr "不是一个有效的目录"
 
-#: worktree.c
+#: worktree.c:752
 msgid "gitdir file does not exist"
 msgstr "gitdir 文件不存在"
 
-#: worktree.c
+#: worktree.c:757 worktree.c:766
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "无法读取 gitdir 文件（%s）"
 
-#: worktree.c
+#: worktree.c:776
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
 
-#: worktree.c
+#: worktree.c:784
 msgid "invalid gitdir file"
 msgstr "无效的 gitdir 文件"
 
-#: worktree.c
+#: worktree.c:792
 msgid "gitdir file points to non-existent location"
 msgstr "gitdir 文件指向一个不存在的位置"
 
-#: worktree.c
+#: worktree.c:808
 #, c-format
 msgid "unable to set %s in '%s'"
 msgstr "无法在 '%2$s' 中设置 %1$s"
 
-#: worktree.c
+#: worktree.c:810
 #, c-format
 msgid "unable to unset %s in '%s'"
 msgstr "无法在 '%2$s' 中取消设置 %1$s"
 
-#: worktree.c
+#: worktree.c:830
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "无法设置 extensions.worktreeConfig"
 
-#: wrapper.c
+#: wrapper.c:162
 #, c-format
 msgid "could not setenv '%s'"
 msgstr "无法设置环境变量 '%s'"
 
-#: wrapper.c
+#: wrapper.c:192
 #, c-format
 msgid "unable to create '%s'"
 msgstr "无法创建 '%s'"
 
-#: wrapper.c
+#: wrapper.c:194 wrapper.c:364
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "无法打开 '%s' 进行读写"
 
-#: wrapper.c
+#: wrapper.c:395 wrapper.c:651
 #, c-format
 msgid "unable to access '%s'"
 msgstr "不能访问 '%s'"
 
-#: wrapper.c
+#: wrapper.c:659
 msgid "unable to get current working directory"
 msgstr "不能获取当前工作目录"
 
-#: wrapper.c
+#: wrapper.c:821
 msgid "unable to get random bytes"
 msgstr "无法获取随机字节"
 
-#: wt-status.c
+#: wt-status.c:176
 msgid "Unmerged paths:"
 msgstr "未合并的路径："
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:205 wt-status.c:237
 msgid "  (use \"git restore --staged <file>...\" to unstage)"
 msgstr "  （使用 \"git restore --staged <文件>...\" 以取消暂存）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:208 wt-status.c:240
 #, c-format
 msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
 msgstr "  （使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:211 wt-status.c:243
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  （使用 \"git rm --cached <文件>...\" 以取消暂存）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:215
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  （使用 \"git add <文件>...\" 标记解决方案）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:217 wt-status.c:221
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:219
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  （使用 \"git rm <文件>...\" 标记解决方案）"
 
-#: wt-status.c
+#: wt-status.c:229 wt-status.c:1168
 msgid "Changes to be committed:"
 msgstr "要提交的变更："
 
-#: wt-status.c
+#: wt-status.c:252 wt-status.c:1177
 msgid "Changes not staged for commit:"
 msgstr "尚未暂存以备提交的变更："
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:256
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add <文件>...\" 更新要提交的内容）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:258
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:259
 msgid ""
 "  (use \"git restore <file>...\" to discard changes in working directory)"
 msgstr "  （使用 \"git restore <文件>...\" 丢弃工作区的改动）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:261
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  （提交或丢弃子模组中未跟踪或修改的内容）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:272
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  （使用 \"git %s <文件>...\" 以包含要提交的内容）"
 
-#: wt-status.c
+#: wt-status.c:284
 msgid "both deleted:"
 msgstr "双方删除："
 
-#: wt-status.c
+#: wt-status.c:286
 msgid "added by us:"
 msgstr "由我们添加："
 
-#: wt-status.c
+#: wt-status.c:288
 msgid "deleted by them:"
 msgstr "由他们删除："
 
-#: wt-status.c
+#: wt-status.c:290
 msgid "added by them:"
 msgstr "由他们添加："
 
-#: wt-status.c
+#: wt-status.c:292
 msgid "deleted by us:"
 msgstr "由我们删除："
 
-#: wt-status.c
+#: wt-status.c:294
 msgid "both added:"
 msgstr "双方添加："
 
-#: wt-status.c
+#: wt-status.c:296
 msgid "both modified:"
 msgstr "双方修改："
 
-#: wt-status.c
+#: wt-status.c:306
 msgid "new file:"
 msgstr "新文件："
 
-#: wt-status.c
+#: wt-status.c:308
 msgid "copied:"
 msgstr "拷贝："
 
-#: wt-status.c
+#: wt-status.c:310
 msgid "deleted:"
 msgstr "删除："
 
-#: wt-status.c
+#: wt-status.c:312
 msgid "modified:"
 msgstr "修改："
 
-#: wt-status.c
+#: wt-status.c:314
 msgid "renamed:"
 msgstr "重命名："
 
-#: wt-status.c
+#: wt-status.c:316
 msgid "typechange:"
 msgstr "类型变更："
 
-#: wt-status.c
+#: wt-status.c:318
 msgid "unknown:"
 msgstr "未知："
 
-#: wt-status.c
+#: wt-status.c:320
 msgid "unmerged:"
 msgstr "未合并："
 
 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c
+#: wt-status.c:400
 msgid "new commits, "
 msgstr "新提交, "
 
 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c
+#: wt-status.c:402
 msgid "modified content, "
 msgstr "修改的内容, "
 
 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c
+#: wt-status.c:404
 msgid "untracked content, "
 msgstr "未跟踪的内容, "
 
-#: wt-status.c
+#: wt-status.c:994
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "您的贮藏区当前有 %d 条记录"
 msgstr[1] "您的贮藏区当前有 %d 条记录"
 
-#: wt-status.c
+#: wt-status.c:1025
 msgid "Submodules changed but not updated:"
 msgstr "子模组已修改但尚未更新："
 
-#: wt-status.c
+#: wt-status.c:1027
 msgid "Submodule changes to be committed:"
 msgstr "要提交的子模组变更："
 
-#: wt-status.c
+#: wt-status.c:1112
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -27272,7 +27836,7 @@ msgstr ""
 "不要改动或删除上面的一行。\n"
 "其下所有内容都将被忽略。"
 
-#: wt-status.c
+#: wt-status.c:1208
 #, c-format
 msgid ""
 "\n"
@@ -27283,83 +27847,83 @@ msgstr ""
 "花了 %.2f 秒才计算出分支的领先/落后范围。\n"
 "为避免，您可以使用 '--no-ahead-behind'。\n"
 
-#: wt-status.c
+#: wt-status.c:1240
 msgid "You have unmerged paths."
 msgstr "您有尚未合并的路径。"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1243
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  （解决冲突并运行 \"git commit\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1245
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  （使用 \"git merge --abort\" 终止合并）"
 
-#: wt-status.c
+#: wt-status.c:1249
 msgid "All conflicts fixed but you are still merging."
 msgstr "所有冲突已解决但您仍处于合并中。"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1252
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  （使用 \"git commit\" 结束合并）"
 
-#: wt-status.c
+#: wt-status.c:1263
 msgid "You are in the middle of an am session."
 msgstr "您正处于 am 操作过程中。"
 
-#: wt-status.c
+#: wt-status.c:1266
 msgid "The current patch is empty."
 msgstr "当前的补丁为空。"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1271
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  （解决冲突，然后运行 \"git am --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1273
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  （使用 \"git am --skip\" 跳过此补丁）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1276
 msgid ""
 "  (use \"git am --allow-empty\" to record this patch as an empty commit)"
 msgstr "  （使用 \"git am --allow-empty\" 将这个补丁记录为空提交）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1278
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  （使用 \"git am --abort\" 恢复原有分支）"
 
-#: wt-status.c
+#: wt-status.c:1417
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo 丢失。"
 
-#: wt-status.c
+#: wt-status.c:1419
 msgid "No commands done."
 msgstr "没有命令被执行。"
 
-#: wt-status.c
+#: wt-status.c:1422
 #, c-format
 msgid "Last command done (%<PRIuMAX> command done):"
 msgid_plural "Last commands done (%<PRIuMAX> commands done):"
 msgstr[0] "最后完成的命令（%<PRIuMAX> 条命令被执行）："
 msgstr[1] "最后完成的命令（%<PRIuMAX> 条命令被执行）："
 
-#: wt-status.c
+#: wt-status.c:1433
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  （更多参见文件 %s）"
 
-#: wt-status.c
+#: wt-status.c:1438
 msgid "No commands remaining."
 msgstr "未剩下任何命令。"
 
-#: wt-status.c
+#: wt-status.c:1441
 #, c-format
 msgid "Next command to do (%<PRIuMAX> remaining command):"
 msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
@@ -27367,206 +27931,206 @@ msgstr[0] "接下来要执行的命令（剩余 %<PRIuMAX> 条命令）："
 msgstr[1] "接下来要执行的命令（剩余 %<PRIuMAX> 条命令）："
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1449
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  （使用 \"git rebase --edit-todo\" 来查看和编辑）"
 
-#: wt-status.c
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
 
-#: wt-status.c
+#: wt-status.c:1466
 msgid "You are currently rebasing."
 msgstr "您在执行变基操作。"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1479
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  （解决冲突，然后运行 \"git rebase --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1481
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  （使用 \"git rebase --skip\" 跳过此补丁）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1483
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1490
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  （所有冲突已解决：运行 \"git rebase --continue\"）"
 
-#: wt-status.c
+#: wt-status.c:1494
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
 
-#: wt-status.c
+#: wt-status.c:1499
 msgid "You are currently splitting a commit during a rebase."
 msgstr "您在执行变基操作时拆分提交。"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1502
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
 
-#: wt-status.c
+#: wt-status.c:1506
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
 
-#: wt-status.c
+#: wt-status.c:1511
 msgid "You are currently editing a commit during a rebase."
 msgstr "您在执行变基操作时编辑提交。"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1514
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  （使用 \"git commit --amend\" 修补当前提交）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1516
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  （当您对您的修改满意后执行 \"git rebase --continue\"）"
 
-#: wt-status.c
+#: wt-status.c:1527
 msgid "Cherry-pick currently in progress."
 msgstr "拣选操作正在进行中。"
 
-#: wt-status.c
+#: wt-status.c:1530
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "您在执行拣选提交 %s 的操作。"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1537
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  （解决冲突并运行 \"git cherry-pick --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1540
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  （执行 \"git cherry-pick --continue\" 以继续）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1543
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1545
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  （使用 \"git cherry-pick --skip\" 跳过此补丁）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1547
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
 
-#: wt-status.c
+#: wt-status.c:1557
 msgid "Revert currently in progress."
 msgstr "还原操作正在行中。"
 
-#: wt-status.c
+#: wt-status.c:1560
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "您在执行反转提交 %s 的操作。"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1566
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  （解决冲突并执行 \"git revert --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1569
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  （执行 \"git revert --continue\" 以继续）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1572
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  （所有冲突已解决：执行 \"git revert --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1574
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  （使用 \"git revert --skip\" 跳过此补丁）"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1576
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  （使用 \"git revert --abort\" 以取消反转提交操作）"
 
-#: wt-status.c
+#: wt-status.c:1586
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
 
-#: wt-status.c
+#: wt-status.c:1590
 msgid "You are currently bisecting."
 msgstr "您在执行二分查找操作。"
 
 #  译者：注意保持前导空格
-#: wt-status.c
+#: wt-status.c:1593
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"
 
-#: wt-status.c
+#: wt-status.c:1604
 msgid "You are in a sparse checkout."
 msgstr "您处于一个稀疏检出中。"
 
-#: wt-status.c
+#: wt-status.c:1607
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr "您处于稀疏检出状态，包含 %d%% 的跟踪文件"
 
-#: wt-status.c
+#: wt-status.c:1855
 msgid "On branch "
 msgstr "位于分支 "
 
-#: wt-status.c
+#: wt-status.c:1862
 msgid "interactive rebase in progress; onto "
 msgstr "交互式变基操作正在进行中；至 "
 
-#: wt-status.c
+#: wt-status.c:1864
 msgid "rebase in progress; onto "
 msgstr "变基操作正在进行中；至 "
 
-#: wt-status.c
+#: wt-status.c:1869
 msgid "HEAD detached at "
 msgstr "头指针分离于 "
 
-#: wt-status.c
+#: wt-status.c:1871
 msgid "HEAD detached from "
 msgstr "头指针分离自 "
 
-#: wt-status.c
+#: wt-status.c:1874
 msgid "Not currently on any branch."
 msgstr "当前不在任何分支上。"
 
-#: wt-status.c
+#: wt-status.c:1891
 msgid "Initial commit"
 msgstr "初始提交"
 
-#: wt-status.c
+#: wt-status.c:1892
 msgid "No commits yet"
 msgstr "尚无提交"
 
-#: wt-status.c
+#: wt-status.c:1906
 msgid "Untracked files"
 msgstr "未跟踪的文件"
 
-#: wt-status.c
+#: wt-status.c:1908
 msgid "Ignored files"
 msgstr "忽略的文件"
 
-#: wt-status.c
+#: wt-status.c:1913
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files,\n"
@@ -27575,224 +28139,224 @@ msgstr ""
 "枚举未追踪的文件花了 %.2f 秒，\n"
 "结果已被缓存，后续的执行会更快。"
 
-#: wt-status.c
+#: wt-status.c:1918
 #, c-format
 msgid "It took %.2f seconds to enumerate untracked files."
 msgstr "枚举未追踪的文件花了 %.2f 秒。"
 
-#: wt-status.c
+#: wt-status.c:1922
 msgid "See 'git help status' for information on how to improve this."
 msgstr "参见 'git help status' 来获取如何改善的信息。"
 
-#: wt-status.c
+#: wt-status.c:1926
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: wt-status.c
+#: wt-status.c:1928
 msgid " (use -u option to show untracked files)"
 msgstr "（使用 -u 参数显示未跟踪的文件）"
 
-#: wt-status.c
+#: wt-status.c:1934
 msgid "No changes"
 msgstr "没有修改"
 
-#: wt-status.c
+#: wt-status.c:1939
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
 
-#: wt-status.c
+#: wt-status.c:1943
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入提交\n"
 
-#: wt-status.c
+#: wt-status.c:1947
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c
+#: wt-status.c:1951
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "提交为空，但是存在尚未跟踪的文件\n"
 
-#: wt-status.c
+#: wt-status.c:1955
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c
+#: wt-status.c:1959 wt-status.c:1965
 #, c-format
 msgid "nothing to commit\n"
 msgstr "无文件要提交\n"
 
-#: wt-status.c
+#: wt-status.c:1962
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
 
-#: wt-status.c
+#: wt-status.c:1967
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "无文件要提交，干净的工作区\n"
 
-#: wt-status.c
+#: wt-status.c:2072
 msgid "No commits yet on "
 msgstr "尚无提交在 "
 
-#: wt-status.c
+#: wt-status.c:2076
 msgid "HEAD (no branch)"
 msgstr "HEAD（非分支）"
 
-#: wt-status.c
+#: wt-status.c:2108
 msgid "different"
 msgstr "不同"
 
 #  译者：注意保持句尾空格
-#: wt-status.c
+#: wt-status.c:2110 wt-status.c:2118
 msgid "behind "
 msgstr "落后 "
 
-#: wt-status.c
+#: wt-status.c:2113 wt-status.c:2116
 msgid "ahead "
 msgstr "领先 "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c
+#: wt-status.c:2658
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "不能%s：您有未暂存的变更。"
 
-#: wt-status.c
+#: wt-status.c:2664
 msgid "additionally, your index contains uncommitted changes."
 msgstr "另外，您的索引中包含未提交的变更。"
 
-#: wt-status.c
+#: wt-status.c:2666
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "不能%s：您的索引中包含未提交的变更。"
 
-#: xdiff-interface.c
+#: xdiff-interface.c:336
 #, c-format
 msgid "unknown style '%s' given for '%s'"
 msgstr "'%2$s' 的未知风格取值 '%1$s'"
 
-#: git-merge-octopus.sh git-merge-resolve.sh
+#: git-merge-octopus.sh:46 git-merge-resolve.sh:13
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
 msgstr "错误：您对下列文件的本地修改将被合并操作覆盖"
 
-#: git-merge-octopus.sh
+#: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
 msgstr "自动合并未生效。"
 
-#: git-merge-octopus.sh
+#: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
 msgstr "不应该执行章鱼式合并。"
 
-#: git-merge-octopus.sh
+#: git-merge-octopus.sh:73
 #, sh-format
 msgid "Unable to find common commit with $pretty_name"
 msgstr "无法找到和 $pretty_name 的基线提交"
 
-#: git-merge-octopus.sh
+#: git-merge-octopus.sh:77
 #, sh-format
 msgid "Already up to date with $pretty_name"
 msgstr "已经和 $pretty_name 保持一致"
 
-#: git-merge-octopus.sh
+#: git-merge-octopus.sh:89
 #, sh-format
 msgid "Fast-forwarding to: $pretty_name"
 msgstr "快进至：$pretty_name"
 
-#: git-merge-octopus.sh
+#: git-merge-octopus.sh:97
 #, sh-format
 msgid "Trying simple merge with $pretty_name"
 msgstr "尝试和 $pretty_name 的简单合并"
 
-#: git-merge-octopus.sh
+#: git-merge-octopus.sh:102
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "简单合并未生效，尝试自动合并。"
 
-#: git-sh-setup.sh
+#: git-sh-setup.sh:80 git-sh-setup.sh:85
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr "用法：$dashless $USAGE"
 
-#: git-sh-setup.sh
+#: git-sh-setup.sh:173
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr "不能切换目录到 $cdup，工作区的顶级目录"
 
-#: git-sh-setup.sh
+#: git-sh-setup.sh:182 git-sh-setup.sh:189
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "致命错误：$program_name 不能在没有工作区的情况下使用"
 
-#: git-sh-setup.sh
+#: git-sh-setup.sh:203
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "不能重写分支：您有未暂存的变更。"
 
-#: git-sh-setup.sh
+#: git-sh-setup.sh:206
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "不能 $action：您有未暂存的变更。"
 
-#: git-sh-setup.sh
+#: git-sh-setup.sh:217
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr "不能 $action：您的索引中包含未提交的变更。"
 
-#: git-sh-setup.sh
+#: git-sh-setup.sh:219
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "而且您的索引中包含未提交的变更。"
 
-#: git-sh-setup.sh
+#: git-sh-setup.sh:332
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr "您需要在工作区的顶级目录中运行这个命令。"
 
-#: git-sh-setup.sh
+#: git-sh-setup.sh:337
 msgid "Unable to determine absolute path of git directory"
 msgstr "不能确定 git 目录的绝对路径"
 
-#: git-send-email.perl
+#: git-send-email.perl:152
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "本地时间和 GMT 有不到一分钟间隔\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:159 git-send-email.perl:165
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "本地时间偏移量大于等于 24 小时\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:241
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "致命错误：命令 '%s' 已终止，退出代码为 %d"
 
-#: git-send-email.perl
+#: git-send-email.perl:254
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "编辑器非正常退出，终止所有操作"
 
-#: git-send-email.perl
+#: git-send-email.perl:344
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:349
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 包含编辑的邮件。\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:482
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 和其它选项不兼容\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:552
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -27802,47 +28366,47 @@ msgstr ""
 "git-send-email 通过 sendemail.* 选项进行设置，注意字母 'e'。\n"
 "设置 sendemail.forbidSendmailVariables 为 false 来禁用这项检查。\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:557 git-send-email.perl:773
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "不能在仓库之外运行 git format-patch\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:560
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr "`batch-size` 和 `relogin` 必须同时定义（通过命令行或者配置选项）\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:573
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "未知的 --suppress-cc 字段：'%s'\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:604
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "未知的 --confirm 设置：'%s'\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:644
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "警告：不支持带引号的 sendmail 别名：%s\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:646
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "警告：不支持 `:include:`：%s\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:648
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "警告：不能识别的 sendmail 行：%s\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:738
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -27857,12 +28421,12 @@ msgstr ""
 "    * 如果含义为一个文件，使用 \"./%s\"，或者\n"
 "    * 如果含义为一个范围，使用 --format-patch 选项。\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:759
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "无法打开目录 %s: %s"
 
-#: git-send-email.perl
+#: git-send-email.perl:802
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -27872,17 +28436,17 @@ msgstr ""
 "未指定补丁文件！\n"
 "\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:815
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "在 %s 中没有标题行？"
 
-#: git-send-email.perl
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "为写入打开 %s 失败: %s"
 
-#: git-send-email.perl
+#: git-send-email.perl:840
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -27895,37 +28459,37 @@ msgstr ""
 "\n"
 "如果您不想发送摘要，清除内容。\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:867
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "无法打开 %s.final: %s"
 
-#: git-send-email.perl
+#: git-send-email.perl:870
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "无法打开 %s: %s"
 
-#: git-send-email.perl
+#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr "摘要邮件为空，跳过\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl
+#: git-send-email.perl:970
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "您确认要使用 <%s> [y/N]？"
 
-#: git-send-email.perl
+#: git-send-email.perl:999
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:1004
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？"
 
-#: git-send-email.perl
+#: git-send-email.perl:1012
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -27937,20 +28501,20 @@ msgstr ""
 "\t%s\n"
 "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:1019
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "邮件将要发送给谁？"
 
-#: git-send-email.perl
+#: git-send-email.perl:1037
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "致命错误：别名 '%s' 扩展为它自己\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:1049
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？"
 
-#: git-send-email.perl
+#: git-send-email.perl:1111 git-send-email.perl:1119
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
@@ -27958,16 +28522,16 @@ msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl
+#: git-send-email.perl:1123
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)："
 
-#: git-send-email.perl
+#: git-send-email.perl:1439
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA 路径 \"%s\" 不存在"
 
-#: git-send-email.perl
+#: git-send-email.perl:1529
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -27992,117 +28556,117 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl
+#: git-send-email.perl:1544
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "发送这封邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 
-#: git-send-email.perl
+#: git-send-email.perl:1547
 msgid "Send this email reply required"
 msgstr "发送要求的邮件回复"
 
-#: git-send-email.perl
+#: git-send-email.perl:1581
 msgid "The required SMTP server is not properly defined."
 msgstr "要求的 SMTP 服务器未被正确定义。"
 
-#: git-send-email.perl
+#: git-send-email.perl:1628
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "服务器不支持 STARTTLS！%s"
 
-#: git-send-email.perl
+#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS 失败！%s"
 
-#: git-send-email.perl
+#: git-send-email.perl:1646
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
 
-#: git-send-email.perl
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "无法发送 %s\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:1667
 #, perl-format
-msgid "Dry-Sent %s\n"
-msgstr "演习发送 %s\n"
+msgid "Dry-Sent %s"
+msgstr "演习发送 %s"
 
-#: git-send-email.perl
+#: git-send-email.perl:1667
 #, perl-format
-msgid "Sent %s\n"
-msgstr "正发送 %s\n"
+msgid "Sent %s"
+msgstr "正发送 %s"
 
-#: git-send-email.perl
-msgid "Dry-OK. Log says:\n"
-msgstr "演习成功。日志说：\n"
+#: git-send-email.perl:1670
+msgid "Dry-OK. Log says:"
+msgstr "演习成功。日志说："
 
-#: git-send-email.perl
-msgid "OK. Log says:\n"
-msgstr "OK。日志说：\n"
+#: git-send-email.perl:1670
+msgid "OK. Log says:"
+msgstr "OK。日志说："
 
-#: git-send-email.perl
+#: git-send-email.perl:1690
 msgid "Result: "
 msgstr "结果："
 
-#: git-send-email.perl
-msgid "Result: OK\n"
-msgstr "结果：OK\n"
+#: git-send-email.perl:1693
+msgid "Result: OK"
+msgstr "结果：OK"
 
-#: git-send-email.perl
+#: git-send-email.perl:1704
 #, perl-format
 msgid "can't open file %s"
 msgstr "无法打开文件 %s"
 
-#: git-send-email.perl
+#: git-send-email.perl:1753 git-send-email.perl:1773
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:1759
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:1816
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:1851
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) 添加 cc: %s 自行 '%s'\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:2012
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) 不能执行 '%s'"
 
-#: git-send-email.perl
+#: git-send-email.perl:2014
 #, perl-format
 msgid "(%s) Malformed output from '%s'"
 msgstr "(%s) 非法的输出信息，来自于: '%s'"
 
-#: git-send-email.perl
+#: git-send-email.perl:2023
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 无法关闭管道至 '%s'"
 
-#: git-send-email.perl
+#: git-send-email.perl:2067
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) 添加 %s: %s 自：'%s'\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:2099
 msgid "cannot send message as 7bit"
 msgstr "不能以 7bit 形式发送信息"
 
-#: git-send-email.perl
+#: git-send-email.perl:2107
 msgid "invalid transfer encoding"
 msgstr "无效的传送编码"
 
-#: git-send-email.perl
+#: git-send-email.perl:2160
 #, perl-format
 msgid ""
 "fatal: %s: rejected by %s hook\n"
@@ -28113,12 +28677,12 @@ msgstr ""
 "%s\n"
 "警告：补丁未能发送\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:2170 git-send-email.perl:2223 git-send-email.perl:2233
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "不能打开 %s：%s\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:2173
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -28127,13 +28691,13 @@ msgstr ""
 "致命错误：%s:%d 超过 998 字符\n"
 "警告：补丁未能发送\n"
 
-#: git-send-email.perl
+#: git-send-email.perl:2191
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "略过 %s 含备份后缀 '%s'。\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl
+#: git-send-email.perl:2195
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "您真的要发送 %s？[y|N]："