diff --git a/po/zh_TW.po b/po/zh_TW.po
index f554381a7aff7a..33ba484f67f5d1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -21,250 +21,260 @@
 #
 # Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023, 2024.
 # Kaiyang Wu <self@origincode.me>, 2022.
-# lumynou5 <lumynou5.tw@gmail.com>, 2023, 2024.
+# Lumynous <lumynou5.tw@gmail.com>, 2023, 2024.
 # Kisaragi Hiu <mail@kisaragi-hiu.com>, 2024.
+# Ngoo Ka-iu <willy04wu69@gmail.com>, 2024.
+# Nightfeather Chen <slat@nightfeather.me>, 2024.
+# hms5232 <hms5232@hhming.moe>, 2024.
 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 18:52+0800\n"
-"PO-Revision-Date: 2024-04-28 18:44+0800\n"
+"POT-Creation-Date: 2024-07-19 15:00+0800\n"
+"PO-Revision-Date: 2024-07-24 08:21+0000\n"
 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
-"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
-"po/git-cli/zh_Hant/>\n"
+"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/"
+"git-po/git-cli/zh_Hant/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.4.2\n"
-"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
-"zhconvert.org\n"
+"X-Generator: Weblate 5.6.2\n"
+"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | "
+"https://zhconvert.org\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”"
+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"
 
-#: 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 失敗"
+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"
 
-#: 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"
 
-#: 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 "檢閱差異"
 
-#: 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"
@@ -278,33 +288,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"
@@ -318,33 +328,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"
@@ -358,33 +368,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"
@@ -398,33 +408,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"
@@ -438,27 +448,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"
@@ -472,27 +482,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"
@@ -506,27 +516,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"
@@ -540,29 +550,29 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
 
-#: add-patch.c
+#: add-patch.c:352
 #, c-format
 msgid "could not parse hunk header '%.*s'"
-msgstr "無法解析區塊標頭 “%.*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”"
+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."
@@ -570,7 +580,7 @@ msgstr ""
 "您的過濾器必須在其輸入及輸出列\n"
 "維持一對一的對應關係。"
 
-#: add-patch.c
+#: add-patch.c:819
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -579,7 +589,7 @@ msgstr ""
 "預期在下述位置有上下文列 #%d：\n"
 "%.*s"
 
-#: add-patch.c
+#: add-patch.c:834
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -592,11 +602,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"
@@ -609,7 +619,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"
@@ -619,13 +629,13 @@ 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” 失敗"
+msgstr "「git apply --cached」失敗"
 
 #. TRANSLATORS: do not translate [y/n]
 #. The program will only accept that input at this point.
@@ -633,24 +643,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]? "
+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"
@@ -674,134 +684,152 @@ 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 "要跳轉到哪個區塊（<ret> 檢視更多）? "
 
-#: 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”"
+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 個可用區塊。"
 
-#: 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” 失敗"
+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"
 "Disable this message with \"git config advice.%s false\""
 msgstr ""
 "\n"
-"請使用 “git config advice.%s false” 停用此訊息"
+"請使用「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."
 msgstr ""
-"請在工作區修正檔案，然後視情況使用 “git add/rm <file>”\n"
+"請在工作區修正檔案，然後視情況使用「git add/rm <file>」\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"
@@ -819,11 +847,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"
@@ -834,7 +862,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"
@@ -844,7 +872,7 @@ msgstr ""
 "* 使用 --sparse 選項。\n"
 "* 停用或修改稀疏規則。"
 
-#: advice.c
+#: advice.c:278
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -866,7 +894,7 @@ msgid ""
 "false\n"
 "\n"
 msgstr ""
-"註：切換至 “%s”。\n"
+"註：切換至「%s」。\n"
 "\n"
 "您正處於「分離 HEAD」狀態。您可以檢視、進行實驗性修改並提交，\n"
 "而且您可以在切回分支時，捨棄在此狀態下所做的提交\n"
@@ -884,7 +912,7 @@ msgstr ""
 "將組態變數 advice.detachedHead 設定為 false，即可關閉本建議\n"
 "\n"
 
-#: advice.c
+#: advice.c:305
 #, c-format
 msgid ""
 "The following paths have been moved outside the\n"
@@ -894,112 +922,132 @@ 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"
 "* Use \"git sparse-checkout reapply\" to apply the sparsity rules"
 msgstr ""
 "若要更正這些路徑的稀疏狀態，請：\n"
-"* 使用 “git add --sparse <路徑” 更新索引\n"
-"* 使用 “git sparse-checkout reapply” 套用稀疏規則"
+"* 使用「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” 無法識別"
+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
+msgstr "空白字元忽略選項「%s」無法識別"
+
+#: 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” 選項"
+msgstr "無法同時使用「%s」和「%s」選項"
 
-#: apply.c
+#: apply.c:158 apply.c:169 apply.c:172
 #, c-format
 msgid "'%s' outside a repository"
-msgstr "“%s” 在版本庫之外"
+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 "
@@ -1009,91 +1057,91 @@ msgid_plural ""
 "components (line %d)"
 msgstr[0] "移除 %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”"
+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 列）。"
 
-#: 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"
@@ -1102,723 +1150,742 @@ msgstr ""
 "當查詢：\n"
 "%.*s"
 
-#: apply.c
+#: apply.c:3163
 #, c-format
 msgid "missing binary patch data for '%s'"
-msgstr "缺少 “%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” 的反向資料區塊的二進位修補檔"
+msgstr "無法反向套用一個缺少至「%s」的反向資料區塊的二進位修補檔"
 
-#: apply.c
+#: apply.c:3218
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
-msgstr "無法在 “%s” 上套用沒有完整索引列的二進位修補檔"
+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），但與目前內容不符。"
+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”，但其非空檔案"
+msgstr "修補檔要套用至空檔案「%s」，但其非空檔案"
 
-#: apply.c
+#: apply.c:3256
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
-msgstr "無法讀取 “%2$s” 必須的目標檔案 %1$s"
+msgstr "無法讀取「%2$s」必須的目標檔案 %1$s"
 
-#: apply.c
+#: apply.c:3269
 #, c-format
 msgid "binary patch does not apply to '%s'"
-msgstr "二進位修補檔未套用到 “%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）"
+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”"
+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” 目前的內容"
+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"
+msgstr "已套用對「%s」的修補檔，但有衝突。\n"
 
-#: apply.c
+#: apply.c:3721
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
-msgstr "已完全套用對 “%s” 的修補檔。\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” 無效"
+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” 在符號連結後"
+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"
+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”"
+msgstr "無法寫入「%s」"
 
-#: apply.c
+#: apply.c:4459
 #, c-format
 msgid "closing file '%s'"
-msgstr "關閉檔案 “%s”"
+msgstr "關閉檔案「%s」"
 
-#: apply.c
+#: apply.c:4557
 #, c-format
 msgid "unable to write file '%s' mode %o"
-msgstr "無法以模式 %2$o 寫入 “%1$s” 檔案"
+msgstr "無法以模式 %2$o 寫入「%1$s」檔案"
 
-#: 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 個被拒絕……"
 
-#: 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”"
+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”。"
+msgstr "略過修補檔「%s」。"
 
-#: apply.c
+#: apply.c:4857
 msgid "No valid patches in input (allow with \"--allow-empty\")"
-msgstr "輸入沒有有效的修補檔內容（傳入 “--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"
+msgstr "無法開啟修補檔「%s」：%s"
 
-#: apply.c
+#: apply.c:5062
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下仍有 %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 列加入了空白字元誤用。"
 
-#: 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 列。"
 
-#: 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 路徑中移除 <num> 個前導斜線"
 
-#: 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 "在所有檔案名稱前加上 <root>"
 
-#: 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” 過濾器"
+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” 過濾器回報錯誤"
+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 [<options>] <tree-ish> [<path>...]"
 
-#: archive.c
+#: archive.c:28
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 
-#: archive.c
+#: archive.c:29
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repo> [--exec <cmd>] --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”"
+msgstr "無法讀取「%s」"
 
-#: archive.c
+#: archive.c:473
 #, c-format
 msgid "pathspec '%s' matches files outside the current directory"
-msgstr "符合路徑規格 “%s” 的檔案在目前目錄之外"
+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” 未符合任何檔案"
+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”"
+msgstr "未閉合的引號：「%s」"
 
-#: archive.c
+#: archive.c:596
 #, c-format
 msgid "missing colon: '%s'"
-msgstr "缺少冒號：“%s”"
+msgstr "缺少冒號：「%s」"
 
-#: archive.c
+#: archive.c:599
 #, c-format
 msgid "empty file name: '%s'"
-msgstr "檔案名稱空白：“%s”"
+msgstr "檔案名稱空白：「%s」"
 
-#: archive.c
+#: archive.c:646
 msgid "fmt"
 msgstr "fmt"
 
-#: 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 "file"
 
-#: archive.c
+#: archive.c:650 archive.c:653
 msgid "add untracked file to archive"
 msgstr "將未追蹤檔案加進封存"
 
-#: archive.c
+#: archive.c:653
 msgid "path:content"
 msgstr "path:content"
 
-#: 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 "在 stderr 上回報封存的檔案"
 
-#: 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 "time"
 
-#: 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 "repo"
 
-#: archive.c builtin/archive.c
+#: archive.c:670 builtin/archive.c:88
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "從遠端版本庫 <repo> 擷取封存檔案"
 
-#: 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 "command"
 
-#: 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”"
+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”"
+msgstr "多出命令列參數「%s」"
 
-#: archive.c
+#: archive.c:709
 #, c-format
 msgid "Unknown archive format '%s'"
-msgstr "封存格式 “%s” 未知"
+msgstr "封存格式「%s」未知"
 
-#: archive.c
+#: archive.c:718
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
-msgstr "引數不支援 “%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."
 msgstr ""
 "git attributes 會忽略反向模式\n"
-"當字串確定要以驚嘆號開始時，請使用 “\\!”。"
+"當字串確定要以驚嘆號開始時，請使用「\\!」。"
 
-#: attr.c
+#: attr.c:748
 #, c-format
 msgid "cannot fstat gitattributes file '%s'"
-msgstr "無法 fstat gitattributes 檔案 “%s”"
+msgstr "無法 fstat gitattributes 檔案「%s」"
 
-#: attr.c
+#: attr.c:753
 #, c-format
 msgid "ignoring overly large gitattributes file '%s'"
-msgstr "忽略過大的 gitattributes 檔案 “%s”"
+msgstr "忽略過大的 gitattributes 檔案「%s」"
 
-#: attr.c
+#: attr.c:780
 #, c-format
 msgid "ignoring overly large gitattributes blob '%s'"
-msgstr "忽略過大的 gitattributes 資料物件 “%s”"
+msgstr "忽略過大的 gitattributes 資料物件「%s」"
+
+#: attr.c:1234
+msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo"
+msgstr "沒有版本庫無法使用 --attr-source 或 GIT_ATTR_SOURCE"
 
-#: attr.c
+#: 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"
+msgstr "無法統計「%s」"
 
-#: 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"
+msgstr "無法讀取 %s"
 
-#: bisect.c
+#: bisect.c:495
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
-msgstr "檔案 “%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"
@@ -1827,7 +1894,7 @@ msgstr ""
 "合併基礎 %s 是壞的。\n"
 "這意味著 bug 已經在 %s 和 [%s] 之間被修正。\n"
 
-#: bisect.c
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1836,16 +1903,16 @@ msgstr ""
 "合併基礎 %s 是新的。\n"
 "介於 %s 和 [%s] 之間的屬性已被修改。\n"
 
-#: bisect.c
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
 "This means the first '%s' commit is between %s and [%s].\n"
 msgstr ""
 "合併基礎 %s 是 %s。\n"
-"這意味著第一個 “%s” 提交位於 %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"
@@ -1856,7 +1923,7 @@ msgstr ""
 "這種情況下 git bisect 無法正常運作。\n"
 "您可能弄錯了 %s 和 %s 修訂版？\n"
 
-#: bisect.c
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1867,41 +1934,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” 檔案"
+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'"
+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” 檔案"
+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"
@@ -1910,7 +1977,7 @@ msgstr ""
 "沒找到能夠測試的提交。\n"
 "可能是傳入的路徑引數有誤？\n"
 
-#: bisect.c
+#: bisect.c:1113
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1919,72 +1986,76 @@ msgstr[0] "（大約 %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] "二分搜尋中：在此 (%2$s) 之後，尚餘 %1$d 個版本待測試\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” 分支設為其自己的上游"
+msgstr "未將「%s」分支設為其自己的上游"
 
-#: branch.c
+#: branch.c:169
 #, c-format
 msgid "branch '%s' set up to track '%s' by rebasing."
-msgstr "已藉由重訂基底，將 “%s” 分支設定為追蹤 “%s”。"
+msgstr "已藉由重訂基底，將「%s」分支設定為追蹤「%s」。"
 
-#: branch.c
+#: branch.c:170
 #, c-format
 msgid "branch '%s' set up to track '%s'."
-msgstr "已將 “%s” 分支設定為追蹤 “%s”。"
+msgstr "已將「%s」分支設定為追蹤「%s」。"
 
-#: branch.c
+#: branch.c:173
 #, c-format
 msgid "branch '%s' set up to track:"
-msgstr "“%s” 分支已設定追蹤："
+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"
@@ -1994,20 +2065,20 @@ msgstr ""
 "修正病灶後，您可以執行下述命令\n"
 "修正遠端追蹤資訊："
 
-#: branch.c
+#: branch.c:228
 #, c-format
 msgid "asked to inherit tracking from '%s', but no remote is set"
-msgstr "請求繼承 “%s” 的追蹤設定，但未設定遠端"
+msgstr "請求繼承「%s」的追蹤設定，但未設定遠端"
 
-#: branch.c
+#: branch.c:234
 #, c-format
 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
-msgstr "請求繼承 “%s” 的追蹤設定，但未設定合併設定"
+msgstr "請求繼承「%s」的追蹤設定，但未設定合併設定"
 
-#: branch.c
+#: branch.c:294
 #, c-format
 msgid "not tracking: ambiguous information for ref '%s'"
-msgstr "未追蹤：“%s” 引用有歧義"
+msgstr "未追蹤：「%s」引用有歧義"
 
 #  譯者：為保證在輸出中對齊，注意調整句中空格！
 #. #-#-#-#-#  branch.c.po  #-#-#-#-#
@@ -2021,7 +2092,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"
@@ -2029,7 +2100,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"
@@ -2042,43 +2113,43 @@ msgid ""
 "tracking namespaces."
 msgstr ""
 "有多個遠端的抓取引用規格，映射到\n"
-"遠端追蹤引用 “%s” 的規格：\n"
+"遠端追蹤引用「%s」的規格：\n"
 "%s\n"
 "這通常是設定錯誤。\n"
 "\n"
 "若要支援設定追蹤分支，請確定不同遠端的\n"
 "抓取引用規格，映射到不同的追蹤命名空間。"
 
-#: branch.c
+#: branch.c:376
 #, c-format
 msgid "'%s' is not a valid branch name"
-msgstr "“%s” 不是有效的分支名稱"
+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” 分支"
+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” 分支"
+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” 不是分支"
+msgstr "無法設定追蹤資訊：起始點「%s」不是分支"
 
-#: branch.c
+#: branch.c:506
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
-msgstr "請求的上游分支 “%s” 不存在"
+msgstr "請求的上游分支「%s」不存在"
 
-#: branch.c
+#: branch.c:508
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2097,165 +2168,158 @@ msgstr ""
 "並建立兩個分支間的追蹤關係，您可能需要使用 `git push -u`\n"
 "推送分支並設定和上游的關聯。"
 
-#: 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”"
+msgstr "物件名稱無效：「%s」"
 
-#: branch.c
+#: branch.c:577
 #, c-format
 msgid "ambiguous object name: '%s'"
-msgstr "物件名稱有歧義：“%s”"
+msgstr "物件名稱有歧義：「%s」"
 
-#: branch.c
+#: branch.c:582
 #, c-format
 msgid "not a valid branch point: '%s'"
-msgstr "分支點無效：“%s”"
+msgstr "分支點無效：「%s」"
 
-#: branch.c
+#: branch.c:774
 #, c-format
 msgid "submodule '%s': unable to find submodule"
-msgstr "“%s” 子模組：找不到子模組"
+msgstr "「%s」子模組：找不到子模組"
 
-#: branch.c
+#: branch.c:777
 #, c-format
 msgid ""
 "You may try updating the submodules using 'git checkout --no-recurse-"
 "submodules %s && git submodule update --init'"
 msgstr ""
-"您可以使用 “git checkout --no-recurse-submodules %s && git submodule update "
-"--init” 命令嘗試更新子模組"
+"您可以使用「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” 分支"
+msgstr "「%s」子模組：無法建立「%s」分支"
 
-#: branch.c
+#: branch.c:849
 #, c-format
 msgid "'%s' is already used by worktree at '%s'"
-msgstr "“%s” 已被位於 “%s” 的工作區使用"
+msgstr "「%s」已被位於「%s」的工作區使用"
 
-#: builtin/add.c
+#: builtin/add.c:29
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<options>] [--] <pathspec>..."
 
-#: 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"
+msgstr "無法統計「%s」"
 
-#: 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”"
+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）重新標準化 EOL"
 
-#: 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 "允許更新稀疏簽出 cone 外的項目"
 
-#: 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"
@@ -2284,191 +2348,203 @@ msgstr ""
 "\n"
 "\tgit rm --cached %s\n"
 "\n"
-"參見 “git help submodule” 深入了解。"
+"參見「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」。"
+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"
+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” 和路徑規格引數不得同時使用"
+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 "“%s” 動作對 “%s” 無效"
+msgstr "「%s」動作對「%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”"
+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”"
+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 掛鉤刪除"
+msgstr "「%s」被 applypatch-msg 掛鉤刪除"
 
-#: builtin/am.c
+#: builtin/am.c:528
 #, c-format
 msgid "Malformed input line: '%s'."
-msgstr "格式錯誤的輸入列：“%s”。"
+msgstr "格式錯誤的輸入列：「%s」。"
 
-#: builtin/am.c
+#: builtin/am.c:566
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "從 “%s” 拷貝註解到 “%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” 進行讀取"
+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” 進行寫入"
+msgstr "無法開啟「%s」進行寫入"
 
-#: builtin/am.c
+#: builtin/am.c:780
 #, c-format
 msgid "could not parse patch '%s'"
-msgstr "無法解析修補檔 “%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 "無效的 Date 列"
 
-#: 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”"
+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”。"
+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 "ident 列無效：%.*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."
@@ -2476,32 +2552,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 "提交內文為："
 
@@ -2510,67 +2587,67 @@ 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” 命令檢視失敗的修補檔"
+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"
 "already introduced the same changes; you might want to skip this patch."
 msgstr ""
-"沒有變更：是否忘記執行 “git add”？\n"
+"沒有變更：是否忘記執行「git add」？\n"
 "如果沒有其他要新增到暫存區的，則很可能是其它提交\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 "
@@ -2581,168 +2658,182 @@ 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” 物件。"
+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。\n"
+"您似乎在上一次「am」失敗後移動了 HEAD。\n"
 "未倒轉回 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”"
+msgstr "無法讀取「%s」"
 
-#: builtin/am.c
+#: builtin/am.c:2311
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c
+#: builtin/am.c:2312
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<options>] (--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 "format"
 
-#: 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."
@@ -2750,62 +2841,58 @@ 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"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 "發現失散的 %s 目錄。\n"
-"使用 “git am --abort” 移除。"
+"使用「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 [<options>] [<patch>...]"
 
-#: 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>...]"
@@ -2813,117 +2900,117 @@ msgstr ""
 "git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-"
 "checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:31
 msgid "git bisect (good|bad) [<rev>...]"
 msgstr "git bisect (good|bad) [<rev>...]"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:35
 msgid "git bisect skip [(<rev>|<range>)...]"
 msgstr "git bisect skip [(<rev>|<range>)...]"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:39
 msgid "git bisect reset [<commit>]"
 msgstr "git bisect reset [<commit>]"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:43
 msgid "git bisect replay <logfile>"
 msgstr "git bisect replay <logfile>"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:47
 msgid "git bisect run <cmd> [<arg>...]"
 msgstr "git bisect run <cmd> [<arg>...]"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:134
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
-msgstr "無法以 “%2$s” 模式開啟 “%1$s” 檔案"
+msgstr "無法以「%2$s」模式開啟「%1$s」檔案"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:141
 #, c-format
 msgid "could not write to file '%s'"
-msgstr "無法寫入 “%s” 檔案"
+msgstr "無法寫入「%s」檔案"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:179
 #, c-format
 msgid "cannot open file '%s' for reading"
-msgstr "無法開啟 “%s” 檔案進行讀取"
+msgstr "無法開啟「%s」檔案進行讀取"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:195
 #, c-format
 msgid "'%s' is not a valid term"
-msgstr "“%s” 不是有效術語"
+msgstr "「%s」不是有效術語"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:199
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
-msgstr "不能將內建命令 “%s” 當作術語使用"
+msgstr "不能將內建命令「%s」當作術語使用"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:209
 #, c-format
 msgid "can't change the meaning of the term '%s'"
-msgstr "不能變更術語 “%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” 不是有效的提交"
+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 <commit>”。"
+msgstr "不能簽出原始 HEAD「%s」。請嘗試「git bisect reset <commit>」。"
 
-#: 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"
+msgstr "無法取得修訂版「%s」的物件 ID"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:314
 #, c-format
 msgid "couldn't open the file '%s'"
-msgstr "無法開啟檔案 “%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"
 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
 msgstr ""
 "需指定至少一個 %s 和一個 %s 修訂版。\n"
-"為此您可以用 “git bisect %s” 和 “git bisect %s”。"
+"為此您可以用「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"
 "You then need to give me at least one %s and %s revision.\n"
 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
 msgstr ""
-"要開始，請執行 “git bisect start”。\n"
+"要開始，請執行「git bisect start」。\n"
 "接著提供至少一個 %s 和一個 %s 修訂版。\n"
-"為此您可以用 “git bisect %s” 和 “git bisect %s”。"
+"為此您可以用「git bisect %s」和「git bisect %s」。"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:392
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "在只有一個 %s 提交的情況下二分搜尋"
@@ -2933,29 +3020,29 @@ 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"
 
-#: 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"
@@ -2964,326 +3051,329 @@ msgstr ""
 "您目前針對舊狀態的術語是 %s；\n"
 "對新狀態的術語是 %s。\n"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:516
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
 msgstr ""
-"傳入 “git bisect terms” 的 %s 引數無效。\n"
+"傳入「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” 進行附加"
+msgstr "無法開啟「%s」進行附加"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:731 builtin/bisect.c:744
 msgid "'' is not a valid term"
-msgstr "“ ” 不是有效術語"
+msgstr "「 」不是有效術語"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:754
 #, c-format
 msgid "unrecognized option: '%s'"
-msgstr "無法識別選項：“%s”"
+msgstr "無法識別選項：「%s」"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:758
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
-msgstr "“%s” 似乎不是有效修訂版"
+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 <valid-branch>”。"
+msgstr "簽出「%s」失敗。請嘗試「git bisect start <valid-branch>」。"
 
-#: 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”"
+msgstr "引用無效：「%s」"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:901
 msgid "You need to start by \"git bisect start\"\n"
-msgstr "要開始，請執行 “git bisect start”\n"
+msgstr "要開始，請執行「git bisect start」\n"
 
 #  譯者：請維持句尾空格
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. 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” 只取一個引數。"
+msgstr "「git bisect %s」只取一個引數。"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:955 builtin/bisect.c:968
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "rev 輸入格式錯誤：%s"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:975
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "rev 輸入有誤（不是提交）：%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” 檔案進行寫入"
+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 離開"
+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” 不需要引數，或者得傳入一個提交"
+msgstr "「%s」不需要引數，或者得傳入一個提交"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1326
 #, c-format
 msgid "'%s' requires 0 or 1 argument"
-msgstr "“%s” 需要 0 或 1 個引數"
+msgstr "「%s」需要 0 或 1 個引數"
 
-#: builtin/bisect.c
+#: builtin/bisect.c:1350
 #, c-format
 msgid "'%s' requires 0 arguments"
-msgstr "“%s” 不需引數"
+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” 失敗：沒有提供命令。"
+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”"
+msgstr "未知命令：「%s」"
 
-#: builtin/blame.c
+#: builtin/blame.c:38
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 
-#: builtin/blame.c
+#: builtin/blame.c:39
 msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"
 
-#: builtin/blame.c
+#: builtin/blame.c:44 builtin/blame.c:51
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> 的文件在 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 "漸進式顯示發現的溯源項目"
 
-#: builtin/blame.c
+#: builtin/blame.c:885
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "不要顯示邊界提交的物件名稱（預設值：off）"
 
-#: builtin/blame.c
+#: builtin/blame.c:886
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "不把根提交當作邊界（預設值：off）"
 
-#: 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 "顯示溯源項目的輸出得分"
 
-#: builtin/blame.c
+#: builtin/blame.c:890
 msgid "show original filename (Default: auto)"
 msgstr "顯示原始檔案名稱（預設值：auto）"
 
-#: builtin/blame.c
+#: builtin/blame.c:891
 msgid "show original linenumber (Default: off)"
 msgstr "顯示原始列碼（預設值：off）"
 
-#: 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 相同的輸出模式（預設值：off）"
 
-#: builtin/blame.c
+#: builtin/blame.c:895
 msgid "show raw timestamp (Default: off)"
 msgstr "顯示原始時間戳（預設值：off）"
 
-#: builtin/blame.c
+#: builtin/blame.c:896
 msgid "show long commit SHA1 (Default: off)"
 msgstr "顯示較長的 SHA1 提交編號（預設值：off）"
 
-#: builtin/blame.c
+#: builtin/blame.c:897
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "隱藏作者名字及時間戳（預設值：off）"
 
-#: builtin/blame.c
+#: builtin/blame.c:898
 msgid "show author email instead of name (Default: off)"
 msgstr "顯示作者信箱而非名稱（預設值：off）"
 
-#: 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 "rev"
 
-#: builtin/blame.c
+#: builtin/blame.c:900
 msgid "ignore <rev> when blaming"
 msgstr "在執行溯源動作時忽略 <rev>"
 
-#: builtin/blame.c
+#: builtin/blame.c:901
 msgid "ignore revisions from <file>"
 msgstr "忽略 <file> 中的修訂版"
 
-#: 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 "使用來自 <file> 的修訂集而不是呼叫 git-rev-list"
 
-#: builtin/blame.c
+#: builtin/blame.c:906
 msgid "use <file>'s contents as the final image"
 msgstr "將 <file> 的內容當成是最終印象"
 
-#: builtin/blame.c
+#: builtin/blame.c:907 builtin/blame.c:908
 msgid "score"
 msgstr "score"
 
-#: 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 "range"
 
-#: 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 或 porcelain 格式同時使用"
 
@@ -3295,25 +3385,25 @@ msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用"
 #. 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 列"
 
-#: 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 [<options>] [-r | -a] [--merged] [--no-merged]"
 
-#: builtin/branch.c
+#: builtin/branch.c:32
 msgid ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
@@ -3321,182 +3411,182 @@ msgstr ""
 "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
 "point>]"
 
-#: builtin/branch.c
+#: builtin/branch.c:33
 msgid "git branch [<options>] [-l] [<pattern>...]"
 msgstr "git branch [<options>] [-l] [<pattern>...]"
 
-#: builtin/branch.c
+#: builtin/branch.c:34
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 
-#: builtin/branch.c
+#: builtin/branch.c:35
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 
-#: builtin/branch.c
+#: builtin/branch.c:36
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 msgstr "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
 
-#: builtin/branch.c
+#: builtin/branch.c:37
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<options>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c
+#: builtin/branch.c:38
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<options>] [-r | -a] [--format]"
 
 #  譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長
-#: builtin/branch.c
+#: builtin/branch.c:178
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD"
 msgstr ""
-"將要刪除的 “%s” 分支已經被合併到\n"
-"         “%s”，但尚未合併到 HEAD"
+"將要刪除的分支「%s」已經被合併到\n"
+"         「%s」，但尚未合併到 HEAD"
 
 #  譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長
-#: builtin/branch.c
+#: builtin/branch.c:182
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD"
 msgstr ""
-"並未刪除分支 “%s”， 雖然已經合併到 HEAD，\n"
-"         卻尚未被合併至 “%s” 分支"
+"並未刪除分支「%s」，雖然已經合併到 HEAD，\n"
+"         卻尚未被合併至「%s」分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:196
 #, c-format
 msgid "couldn't look up commit object for '%s'"
-msgstr "無法查詢 “%s” 指向的提交物件"
+msgstr "無法查詢「%s」指向的提交物件"
 
-#: builtin/branch.c
+#: builtin/branch.c:200
 #, c-format
 msgid "the branch '%s' is not fully merged"
-msgstr "分支 “%s” 沒有完全合併"
+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”"
+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” 分支"
+msgstr "無法刪除被位於「%2$s」的工作區使用的分支「%1$s」"
 
-#: builtin/branch.c
+#: builtin/branch.c:283
 #, c-format
 msgid "remote-tracking branch '%s' not found"
-msgstr "找不到 “%s” 遠端追蹤分支"
+msgstr "找不到遠端追蹤分支「%s」"
 
-#: builtin/branch.c
+#: builtin/branch.c:296
 #, c-format
 msgid ""
 "branch '%s' not found.\n"
 "Did you forget --remote?"
 msgstr ""
-"找不到 “%s” 分支。\n"
-"您可能要加上 --remote？"
+"找不到分支「%s」。\n"
+"您可能想加上 --remote？"
 
-#: builtin/branch.c
+#: builtin/branch.c:300
 #, c-format
 msgid "branch '%s' not found"
-msgstr "找不到 “%s” 分支"
+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 指針"
+msgstr "無法解析 HEAD 指標"
 
-#: builtin/branch.c
+#: builtin/branch.c:515
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
-msgstr "HEAD 指針 (%s) 指向 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"
+msgstr "分支 %s 正在重定基底至 %s"
 
-#: builtin/branch.c
+#: builtin/branch.c:534
 #, c-format
 msgid "branch %s is being bisected at %s"
-msgstr "%s 分支正於 %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 指針未被更新"
+msgstr "%s 工作區的 HEAD 指標未被更新"
 
-#: builtin/branch.c
+#: builtin/branch.c:590
 #, c-format
 msgid "invalid branch name: '%s'"
-msgstr "分支名稱無效：“%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” 尚無提交"
+msgstr "分支「%s」尚無提交"
 
-#: builtin/branch.c
+#: builtin/branch.c:612 builtin/branch.c:902
 #, c-format
 msgid "no branch named '%s'"
-msgstr "沒有名為 “%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” 分支建立拷貝"
+msgstr "已為誤命名的分支「%s」建立拷貝"
 
-#: builtin/branch.c
+#: builtin/branch.c:649
 #, c-format
 msgid "renamed a misnamed branch '%s' away"
-msgstr "已更改誤命名的 “%s” 分支的名稱"
+msgstr "已更改誤命名的分支「%s」的名稱"
 
-#: builtin/branch.c
+#: builtin/branch.c:656
 #, c-format
 msgid "branch renamed to %s, but HEAD is not updated"
-msgstr "分支已重新命名為 %s，但 HEAD 指針尚未更新"
+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"
@@ -3507,259 +3597,263 @@ 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 "upstream"
 
-#: 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 "在格式化引用結果為空之後，不要輸出換列符號"
+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 "object"
 
-#: 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 中！"
+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 "無法向分離 HEAD 指針提供描述"
+msgstr "無法向分離 HEAD 指標提供描述"
 
-#: 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：其未指向任何分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:941 builtin/branch.c:970
 #, c-format
 msgid "no such branch '%s'"
-msgstr "無 “%s” 分支"
+msgstr "無「%s」分支"
 
-#: builtin/branch.c
+#: builtin/branch.c:947
 #, c-format
 msgid "branch '%s' does not exist"
-msgstr "沒有 “%s” 分支"
+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” 沒有上游資訊"
+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>?"
 msgstr ""
-"“git branch” 的 -a 和 -r 選項不取分支名稱。\n"
+"「git branch」的 -a 和 -r 選項不取分支名稱。\n"
 "您是想使用：-a|-r --list <pattern> 嗎？"
 
-#: 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”"
+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"
+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"
@@ -3769,7 +3863,7 @@ msgstr ""
 "              [(-s | --suffix) <format> | --no-suffix]\n"
 "              [--diagnose[=<mode>]]"
 
-#: 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"
@@ -3803,58 +3897,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 "mode"
 
-#: builtin/bugreport.c
+#: builtin/bugreport.c:118
 msgid ""
 "create an additional zip archive of detailed diagnostics (default 'stats')"
-msgstr "另外建立有詳細診斷資訊的 ZIP 封存檔（預設值 “stats”）"
+msgstr "另外建立有詳細診斷資訊的 ZIP 封存檔（預設值「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”"
+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” 的前置目錄"
+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"
+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>"
@@ -3862,108 +3957,112 @@ msgstr ""
 "git bundle create [-q | --quiet | --progress]\n"
 "                  [--version=<version>] <file> <git-rev-list-args>"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:22
 msgid "git bundle verify [-q | --quiet] <file>"
 msgstr "git bundle verify [-q | --quiet] <file>"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:24
 msgid "git bundle list-heads <file> [<refname>...]"
 msgstr "git bundle list-heads <file> [<refname>...]"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:26
 msgid "git bundle unbundle [--progress] <file> [<refname>...]"
 msgstr "git bundle unbundle [--progress] <file> [<refname>...]"
 
-#: builtin/bundle.c
+#: builtin/bundle.c:65
 msgid "need a <file> argument"
 msgstr "需要提供 <file> 引數"
 
-#: 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”"
+msgstr "無法讀取物件 %s「%s」"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:679
 msgid "flush is only for --buffer mode"
 msgstr "排清功能只能用於 --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”"
+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 <type> <object>"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:939
 msgid "git cat-file (-e | -p) <object>"
 msgstr "git cat-file (-e | -p) <object>"
 
-#: 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] <object>"
 
-#: 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>]"
@@ -3971,7 +4070,7 @@ msgstr ""
 "git cat-file (--textconv | --filters)\n"
 "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:943
 msgid ""
 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
 "objects]\n"
@@ -3983,143 +4082,145 @@ 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 "檢查 <object> 是否存在"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:953
 msgid "pretty-print <object> content"
 msgstr "美化輸出 <object> 的內容"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:955
 msgid "Emit [broken] object attributes"
 msgstr "輸出 [損壞的] ([broken]) 物件屬性"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:956
 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
-msgstr "顯示物件類型（可以是 “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 "批次處理 stdin 上請求的物件（或 --batch-all-objects）"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:965
 msgid "show full <object> or <rev> contents"
 msgstr "顯示完整的 <object> 或 <rev> 內容"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:969
 msgid "like --batch, but don't emit <contents>"
 msgstr "類似 --batch 但不輸出 <contents>"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:972
 msgid "stdin is NUL-terminated"
 msgstr "stdin 以 NUL 字元終止"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:974
 msgid "stdin and stdout is NUL-terminated"
 msgstr "stdin 和 stdout 以 NUL 字元終止"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:976
 msgid "read commands from stdin"
 msgstr "從 stdin 讀取命令"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:980
 msgid "with --batch[-check]: ignores stdin, batches all known objects"
 msgstr "傳入 --batch[-check]：忽略 stdin，批次處理所有已知物件"
 
-#: 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 "轉換或過濾後輸出物件 (blob 或 tree)（單獨或批次處理）"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:991
 msgid "run textconv on object's content"
 msgstr "對物件內容進行文字轉換 (textconv)"
 
-#: 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 "blob|tree"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:995
 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
-msgstr "請在 (--textconv | --filters) 使用 <path>，而非 “batch”"
+msgstr "請在 (--textconv | --filters) 使用 <path>，而非「batch」"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1016
 #, c-format
 msgid "'%s=<%s>' needs '%s' or '%s'"
-msgstr "“%s=<%s>” 需要 “%s” 或 “%s”"
+msgstr "「%s=<%s>」需要「%s」或「%s」"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1018
 msgid "path|tree-ish"
 msgstr "path|tree-ish"
 
-#: 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” 需要批次處理模式"
+msgstr "「%s」需要批次處理模式"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1055
 #, c-format
 msgid "'-%c' is incompatible with batch mode"
-msgstr "“-%c” 與批次處理模式不相容"
+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” 需要 <rev>"
+msgstr "「%s」需要 <rev>"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1072
 #, c-format
 msgid "<object> required with '-%c'"
-msgstr "“-%c” 需要 <object>"
+msgstr "「-%c」需要 <object>"
 
-#: builtin/cat-file.c
+#: builtin/cat-file.c:1081
 #, c-format
 msgid "only two arguments allowed in <type> <object> mode, not %d"
 msgstr "只允許在 <type> <object> 模式傳入兩個引數，但傳了 %d 個"
 
-#: builtin/check-attr.c
+#: builtin/check-attr.c:18
 msgid ""
 "git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
 "<pathname>..."
@@ -4127,256 +4228,263 @@ msgstr ""
 "git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
 "<pathname>..."
 
-#: 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 <tree-ish>] [-a | --all | <attr>...]"
 
-#: 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 "從 stdin 讀出檔案名稱"
 
-#: 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 "<tree-ish>"
 
-#: 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 [<options>] <contact>..."
 
-#: builtin/check-mailmap.c
+#: builtin/check-mailmap.c:18
 msgid "also read contacts from stdin"
 msgstr "亦從 stdin 讀取聯絡地址"
 
-#: 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 [<options>]"
 
-#: 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 "string"
 
-#: 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 "建立檔案時，在前面加上 <string>"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:188
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<options>] [--] [<file>...]"
 
-#: builtin/checkout-index.c
+#: builtin/checkout-index.c:206
 msgid "stage should be between 1 and 3 or all"
 msgstr "stage 應該是 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 [<options>] <branch>"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:43
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<options>] [<branch>] -- <file>..."
 
-#: builtin/checkout.c
+#: builtin/checkout.c:48
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<options>] [<branch>]"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:53
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<options>] [--source=<branch>] <file>..."
 
-#: builtin/checkout.c
+#: builtin/checkout.c:210 builtin/checkout.c:249
 #, c-format
 msgid "path '%s' does not have our version"
-msgstr "“%s” 路徑沒有我們的版本"
+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” 路徑沒有他們的版本"
+msgstr "「%s」路徑沒有他們的版本"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:228
 #, c-format
 msgid "path '%s' does not have all necessary versions"
-msgstr "“%s” 路徑沒有所有必須的版本"
+msgstr "「%s」路徑沒有所有必須的版本"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:283
 #, c-format
 msgid "path '%s' does not have necessary versions"
-msgstr "“%s” 路徑沒有必須的版本"
+msgstr "「%s」路徑沒有必須的版本"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:303
 #, c-format
 msgid "path '%s': cannot merge"
-msgstr "path “%s”：無法合併"
+msgstr "path「%s」：無法合併"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:319
 #, c-format
 msgid "Unable to add merge result for '%s'"
-msgstr "無法為 “%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 個合併衝突"
 
-#: 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 個路徑"
 
-#: 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 個路徑"
 
-#: 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”"
+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” 分支。"
+msgstr "無法同時更新路徑和切換至「%s」分支。"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:496
 #, c-format
 msgid "neither '%s' or '%s' is specified"
-msgstr "“%s” 或 “%s” 皆未指定"
+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”"
+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 一起使用"
+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” 無法在簽出樹狀物件時使用"
+msgstr "「%s」、「%s」或「%s」無法在簽出樹狀物件時使用"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:605 builtin/checkout.c:612
 #, c-format
 msgid "path '%s' is unmerged"
-msgstr "路徑 “%s” 未合併"
+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"
@@ -4385,51 +4493,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"
+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"
+msgstr "重設分支「%s」\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1022
 #, c-format
 msgid "Already on '%s'\n"
-msgstr "已經位於 “%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"
+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"
+msgstr "已切換至新分支「%s」\n"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1030
 #, c-format
 msgid "Switched to branch '%s'\n"
-msgstr "已切換至分支 “%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"
@@ -4447,7 +4555,7 @@ msgstr[0] ""
 "\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"
@@ -4468,28 +4576,28 @@ msgstr[0] ""
 " 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 指針位置在"
+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"
 "Please use -- (and optionally --no-guess) to disambiguate"
 msgstr ""
-"“%s” 既可以是本機檔案，也可以是追蹤分支。\n"
+"「%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"
@@ -4500,223 +4608,224 @@ msgid ""
 "one remote, e.g. the 'origin' remote, consider setting\n"
 "checkout.defaultRemote=origin in your config."
 msgstr ""
-"如果您想要簽出遠端追蹤分支，例如 “origin”，\n"
+"如果您想要簽出遠端追蹤分支，例如「origin」，\n"
 "您可以使用 --track 選項寫出全名：\n"
 "\n"
 "    git checkout --track origin/<name>\n"
 "\n"
 "如果您平時比較想要使用模糊的簡短分支名稱 <name>，\n"
-"而不太想寫如 “origin” 的遠端版本庫名稱，\n"
+"而不太想寫如「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) 遠端追蹤分支"
+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”"
+msgstr "預期收到分支，卻收到標籤「%s」"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1499
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
-msgstr "預期收到分支，卻收到遠端分支 “%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”"
+msgstr "預期收到分支，卻收到「%s」"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1504
 #, c-format
 msgid "a branch is expected, got commit '%s'"
-msgstr "預期收到分支，卻收到提交 “%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 "若您想要在此提交分離 HEAD 指針，請傳入 --detach 選項重試。"
+msgstr "若您想要在此提交分離 HEAD 指標，請傳入 --detach 選項重試。"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1526
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
 msgstr ""
 "無法在合併時切換分支\n"
-"請試試 “git merge --quit” 或 “git worktree add”。"
+"請試試「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\"."
 msgstr ""
 "無法在 am 工作階段期間時切換分支\n"
-"請試試 “git am --quit” 或 “git worktree add”。"
+"請試試「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\"."
 msgstr ""
 "無法在重定基底時切換分支\n"
-"請試試 “git rebase --quit” 或 “git worktree add”。"
+"請試試「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\"."
 msgstr ""
 "無法在揀選時切換分支\n"
-"請試試 “git cherry-pick --quit” 或 “git worktree add”。"
+"請試試「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\"."
 msgstr ""
 "無法在還原時切換分支\n"
-"請試試 “git revert --quit” 或 “git worktree add”。"
+"請試試「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” 不能與切換分支同時使用"
+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” 同時使用"
+msgstr "「%s」不能與「%s」同時使用"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1604
 #, c-format
 msgid "'%s' cannot take <start-point>"
-msgstr "“%s” 不取 <start-point>"
+msgstr "「%s」不取 <start-point>"
 
-#: builtin/checkout.c
+#: builtin/checkout.c:1612
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "無法將分支切換至非提交項目 “%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 "style"
 
-#: 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 指針"
+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 "new-branch"
 
-#: 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” 選項不得同時使用"
+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” 分支"
+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”"
+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."
@@ -4724,72 +4833,75 @@ msgstr ""
 "git checkout：在從索引簽出時，--ours/--theirs、--force\n"
 "和 --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 "branch"
 
-#: 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 <無此分支>”（預設值）"
+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 <無此分支>”"
+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>...]"
@@ -4797,45 +4909,45 @@ msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
 "[<pathspec>...]"
 
-#: 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"
@@ -4848,7 +4960,7 @@ msgstr ""
 "foo        - 根據獨特前綴選擇項目\n"
 "           - （空）什麼也不選擇\n"
 
-#: builtin/clean.c
+#: builtin/clean.c:337
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -4869,32 +4981,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"
@@ -4907,275 +5019,295 @@ msgstr ""
 "clean               - 開始清理\n"
 "filter by pattern   - 透過範本排除要刪除的條目\n"
 "select by numbers   - 透過數字選擇要刪除的條目\n"
-"ask each            - 針對刪除逐一詢問（就像 “rm -i”）\n"
+"ask each            - 針對刪除逐一詢問（就像「rm -i」）\n"
 "quit                - 停止刪除並離開\n"
 "help                - 顯示本輔助說明\n"
 "?                   - 顯示如何在提示下選擇的協助"
 
-#: builtin/clean.c
+#: builtin/clean.c:855
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "將移除以下項目："
 
-#: 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 "force"
 
-#: 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 "pattern"
 
-#: builtin/clean.c
+#: builtin/clean.c:940
 msgid "add <pattern> to ignore rules"
 msgstr "將 <pattern> 加到忽略規則"
 
-#: 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 [<options>] [--] <repo> [<dir>]"
 
-#: 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 "name"
 
-#: builtin/clone.c
+#: builtin/clone.c:140
 msgid "use <name> instead of 'origin' to track upstream"
-msgstr "使用 <name> 而不是 “origin” 追蹤上游"
+msgstr "使用 <name> 而不是「origin」追蹤上游"
 
-#: builtin/clone.c
+#: builtin/clone.c:142
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "簽出 <branch> 而不是遠端 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 "depth"
 
-#: 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 "revision"
 
-#: 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 "gitdir"
 
-#: 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 複製"
+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”"
+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"
@@ -5185,215 +5317,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”"
+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 "來源版本庫是淺版本庫 (shallow)。拒絕複製。"
 
-#: 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 "無法從套件包 URL “%s” 抓取物件"
+msgstr "無法從套件包 URL「%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]"
+"git commit-graph verify [--object-dir <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 | "
@@ -5409,101 +5542,102 @@ msgstr ""
 "[no-]progress]\n"
 "                       <split-options>"
 
-#: 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 "儲存圖形的物件目錄"
+msgstr "儲存圖的物件目錄"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:81
 msgid "if the commit-graph is split, only verify the tip file"
-msgstr "如果提交圖形被分割，只驗證頭一個檔案"
+msgstr "如果提交圖被分割，只驗證頭一個檔案"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:110
 #, c-format
 msgid "Could not open commit-graph '%s'"
-msgstr "無法開啟提交圖形 '%s'"
+msgstr "無法開啟提交圖「%s」"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:114
 #, c-format
 msgid "could not open commit-graph chain '%s'"
-msgstr "無法開啟提交圖鏈 “%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 檔案中已有所有提交"
+msgstr "包含提交圖檔案中所有已有的提交"
 
-#: 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 "允許寫一個增量提交圖形檔案"
+msgstr "允許寫一個增量提交圖檔案"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:244
 msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "在非基本分割提交圖形中的最大提交數"
+msgstr "在非基礎分割提交圖中的最大提交數"
 
-#: builtin/commit-graph.c
+#: builtin/commit-graph.c:246
 msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "一個分割提交圖形的兩個級別之間的最大比率"
+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 <tree> [(-p <parent>)...]"
 
-#: builtin/commit-tree.c
+#: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
 "                [(-F <file>)...] <tree>"
@@ -5511,61 +5645,62 @@ msgstr ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
 "                [(-F <file>)...] <tree>"
 
-#: 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|"
@@ -5587,11 +5722,11 @@ msgstr ""
 "           [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n"
 "           [--] [<pathspec>...]"
 
-#: 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"
@@ -5600,7 +5735,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"
@@ -5614,15 +5749,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"
@@ -5643,121 +5778,122 @@ 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”"
+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"
@@ -5766,7 +5902,7 @@ msgstr ""
 "請輸入描述您變更的提交訊息。\n"
 "開頭是「%s」的列皆會忽略。\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:912
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -5775,7 +5911,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"
@@ -5784,7 +5920,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"
@@ -5795,7 +5931,7 @@ msgstr ""
 "「%s」的列，但也可以自己移除掉這些列。\n"
 "提交訊息空白則取消本次提交作業。\n"
 
-#: builtin/commit.c
+#: builtin/commit.c:931
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -5809,7 +5945,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"
@@ -5824,140 +5960,141 @@ 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)"
@@ -5965,442 +6102,416 @@ 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):]commit"
 
-#: builtin/commit.c
+#: builtin/commit.c:1659
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr "使用 autosquash 格式化後的說明來 fixup 或是 amend/reword 指定提交"
 
-#: builtin/commit.c
+#: builtin/commit.c:1660
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交"
 
-#: 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"
 "not exceeded, and then \"git restore --staged :/\" to recover."
 msgstr ""
 "版本庫已更新，但無法寫入新的索引檔案。請檢查磁碟是否\n"
-"已滿或磁碟配額已耗盡，然後執行 “git restore --staged :/” 復原。"
+"已滿或磁碟配額已耗盡，然後執行「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
+#: 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 [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"
+
+#: 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 "取得值：name [value-pattern]"
-
-#: builtin/config.c
-msgid "get all values: key [value-pattern]"
-msgstr "取得所有值：key [value-pattern]"
-
-#: builtin/config.c
-msgid "get values for regexp: name-regex [value-pattern]"
-msgstr "根據常規表示式取得值：name-regex [value-pattern]"
-
-#: 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 "取代所有符合的變數：name value [value-pattern]"
-
-#: builtin/config.c
-msgid "add a new variable: name value"
-msgstr "新增一個新的變數：name value"
-
-#: builtin/config.c
-msgid "remove a variable: name [value-pattern]"
-msgstr "移除一個變數：name [value-pattern]"
-
-#: builtin/config.c
-msgid "remove all matches: name [value-pattern]"
-msgstr "移除所有符合項目：name [value-pattern]"
-
-#: 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 "比較「value-pattern」的值時，使用字串相等比較"
-
-#: 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 or --int"
 
-#: builtin/config.c
+#: builtin/config.c:94
 msgid "value is --bool or string"
 msgstr "值是 --bool 或 string"
 
-#: 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 ""
 "顯示設定檔的作用域 (工作區 worktree、本機 local、全域 global、系統 system、指"
 "令 command)"
 
-#: 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"
@@ -6415,27 +6526,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 只能在一個版本庫內使用"
 
-#: builtin/config.c
+#: builtin/config.c:751
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob 只能在一個版本庫內使用"
 
-#: 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"
@@ -6444,59 +6555,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 只能用於加入、設定和取代動作"
+#: 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 僅套用至 'value-pattern'"
 
-#: 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
+#: 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 僅套用至 --value=<模式>"
+
+#: builtin/config.c:947
+msgid "--append cannot be used with --value=<pattern>"
+msgstr "--append 無法和 --value=<模式> 一起使用"
+
+#: builtin/config.c:966 builtin/config.c:1287
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -6505,16 +6656,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 [<value-pattern>]"
+
+#: builtin/config.c:1151
+msgid "get all values: key [<value-pattern>]"
+msgstr "取得所有值：key [<value-pattern>]"
+
+#: builtin/config.c:1152
+msgid "get values for regexp: name-regex [<value-pattern>]"
+msgstr "根據常規表示式取得值：name-regex [<value-pattern>]"
+
+#: 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 [<value-pattern>]"
+
+#: builtin/config.c:1155
+msgid "add a new variable: name value"
+msgstr "新增一個新的變數：name value"
+
+#: builtin/config.c:1156
+msgid "remove a variable: name [<value-pattern>]"
+msgstr "移除一個變數：name [<value-pattern>]"
+
+#: builtin/config.c:1157
+msgid "remove all matches: name [<value-pattern>]"
+msgstr "移除所有符合項目：name [<value-pattern>]"
+
+#: 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 "獲得設定的顏色：設定 [<預設值>]"
+
+#: builtin/config.c:1163
+msgid "find the color setting: slot [<stdout-is-tty>]"
+msgstr "獲得顏色設定：設定 [<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 只能用於加入、設定和取代動作"
+
+#: 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"
@@ -6527,77 +6782,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 socket 支援"
 
-#: 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 socket 支援"
 
-#: builtin/credential-store.c
+#: builtin/credential-store.c:70
 #, c-format
 msgid "unable to get credential storage lock in %d ms"
 msgstr "無法在 %d 毫秒內取得憑證儲存空間的鎖"
 
-#: 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>] [<commit-ish>...]"
 
-#: 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[=<mark>]"
 
-#: builtin/describe.c
+#: builtin/describe.c:32
 msgid "git describe <blob>"
 msgstr "git describe <blob>"
 
-#: builtin/describe.c
+#: builtin/describe.c:72
 msgid "head"
 msgstr "HEAD"
 
-#: 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"
@@ -6606,7 +6862,7 @@ msgstr ""
 "沒有附註標籤能描述 '%s'。\n"
 "然而，存在未附註標籤：嘗試 --tags。"
 
-#: builtin/describe.c
+#: builtin/describe.c:439
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -6615,12 +6871,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"
@@ -6629,87 +6885,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\"）"
+msgstr "對於髒工作區，追加 <標記>（預設值：」-dirty\"）"
 
-#: builtin/describe.c
+#: builtin/describe.c:599
 msgid "append <mark> on broken working tree (default: \"-broken\")"
-msgstr "對於損壞的工作區，追加 <標記>（預設值：”-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>]"
@@ -6717,85 +6973,85 @@ msgstr ""
 "git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"
 "             [--mode=<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 只對 2 個以上的提交有用"
 
-#: 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')."
@@ -6803,294 +7059,296 @@ msgstr ""
 "不支援在目錄比較模式（'-d' 和 '--dir-diff'）中\n"
 "採用組合差異格式（'-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-opts>]"
 
-#: 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 "期望子模組 rewrite 選項的格式是 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 "已建立鎖定檔案，但尚未回報：%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"
@@ -7100,7 +7358,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"
@@ -7111,17 +7369,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"
@@ -7131,55 +7389,55 @@ 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 "
@@ -7187,19 +7445,19 @@ msgid ""
 msgstr ""
 "無法將 HEAD 的上游從「%2$s」設定為「%1$s」，因為 HEAD 沒有指向任何分支。"
 
-#: 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"
@@ -7207,22 +7465,22 @@ 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"
@@ -7230,349 +7488,354 @@ msgstr ""
 "未指定遠端版本庫。請指定用以取得新修訂版本之\n"
 "來源 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 "使用 atomic 事務更新引用"
 
-#: 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 "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 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 "不取得 packfile，而是輸出協商的祖先提交"
 
-#: builtin/fetch.c
+#: builtin/fetch.c:2241 builtin/fetch.c:2243
 msgid "run 'maintenance --auto' after fetching"
 msgstr "取得 (fetch) 後執行 '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 "抓取後寫入分支圖"
+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 只能在擷取 (fetch) 一個遠端時使用"
 
-#: 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 "從 stdin 讀取引用模式"
 
-#: 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=<config> [--] <arguments>"
 
-#: builtin/for-each-repo.c
+#: builtin/for-each-repo.c:41
 msgid "config"
 msgstr "config"
 
-#: 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"
@@ -7581,186 +7844,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：雜湊路徑 (hash-path) 不符，找到的位置：%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：%s 的 cache-tree 中的 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：%s 的 resolve-undo 中的 sha1 指標無效"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:884
 #, c-format
 msgid "unable to load rev-index for pack '%s'"
-msgstr "無法讀取 “%s” 封裝的修訂版索引 (rev-index)"
+msgstr "無法讀取「%s」封裝的修訂版索引 (rev-index)"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:889
 #, c-format
 msgid "invalid rev-index for pack '%s'"
-msgstr "“%s” 封裝的修訂版索引 (rev-index) 無效"
+msgstr "「%s」封裝的修訂版索引 (rev-index) 無效"
 
-#: builtin/fsck.c
+#: builtin/fsck.c:900
 msgid ""
 "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
 "         [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
@@ -7772,205 +8036,205 @@ msgstr ""
 "         [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
 "         [--[no-]name-objects] [<object>...]"
 
-#: 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 "將引用日誌作為檢查的 HEAD 節點（預設值）"
 
-#: 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 [<options>]"
 
-#: builtin/fsmonitor--daemon.c
+#: builtin/fsmonitor--daemon.c:23
 msgid "git fsmonitor--daemon run [<options>]"
 msgstr "git fsmonitor--daemon run [<options>]"
 
-#: 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」的數值不是布林值或整數：%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 "無法 cd home '%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"
@@ -7984,302 +8248,303 @@ 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，限制新廢棄封裝的大小"
 
-#: 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 "無法寫入提交圖形"
+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 "frequency"
 
-#: 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 "不要在 stderr 輸出進度或其他資訊"
 
-#: 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 "無法啟動 schtasks"
 
-#: builtin/gc.c
+#: builtin/gc.c:2217
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
-msgstr "無法執行 “crontab -l”；您的系統可能不支援 “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”"
+msgstr "無法執行「crontab」；您的系統可能不支援「cron」"
 
-#: builtin/gc.c
+#: builtin/gc.c:2284
 msgid "'crontab' died"
-msgstr "“crontab” 結束運作"
+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=<scheduler>]"
 
-#: builtin/gc.c
+#: builtin/gc.c:2746
 msgid "scheduler"
 msgstr "scheduler"
 
-#: builtin/gc.c
+#: builtin/gc.c:2747
 msgid "scheduler to trigger git maintenance run"
 msgstr "要觸發 git maintenance run 的排程器"
 
-#: 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) 無效"
@@ -8289,258 +8554,259 @@ 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>..."
@@ -8548,111 +8814,111 @@ msgstr ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n"
 "                [--stdin [--literally]] [--] <file>..."
 
-#: 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 <type>] [-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]] [<command>|<doc>]"
 
-#: 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"
@@ -8661,7 +8927,7 @@ msgstr ""
 "'%s'：不支援的 man 手冊檢視器的路徑。\n"
 "請使用 'man.<工具>.cmd'。"
 
-#: builtin/help.c
+#: builtin/help.c:369
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -8670,49 +8936,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>]"
@@ -8720,277 +8986,279 @@ msgstr ""
 "git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-"
 "args>]"
 
-#: builtin/hook.c
+#: builtin/hook.c:29
 msgid "silently ignore missing requested <hook-name>"
 msgstr "靜默忽略不存在而請求的 <hook-name>"
 
-#: builtin/hook.c
+#: builtin/hook.c:31
 msgid "file to read into hooks' stdin"
 msgstr "要讀進掛鉤 stdin 的檔案"
 
-#: 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 位元組"
 
-#: 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> 位元組"
 
-#: 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 "不能對 packfile 呼叫 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 個本機物件"
 
-#: 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"
 
-#: 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 "packfile 名稱「%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 個物件"
 
-#: 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 物件"
 
-#: 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 沒有提供 packfile 名稱參數"
 
-#: 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"
@@ -9004,53 +9272,53 @@ msgstr ""
 "         [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "         [--shared[=<permissions>]] [<directory>]"
 
-#: 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 "雜湊"
 
-#: 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"
@@ -9060,234 +9328,236 @@ msgstr ""
 "                       [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n"
 "                       [--parse] [<file>...]"
 
-#: 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 "placement"
 
-#: 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 "將多列尾注值 (trailer values) 重新格式化為單列值"
 
-#: 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 "不要把 “---” 當作輸入結尾"
+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<範圍>:<檔案> 和 pathspec 不能同時使用"
 
-#: 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”"
+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"
@@ -9297,607 +9567,616 @@ 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 "reroll-count"
 
-#: 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
+#: builtin/log.c:2054
+msgid "add <rfc> (default 'RFC') before 'PATCH'"
+msgstr "在「PATCH」前冠上 <rfc>（預設為「RFC」）"
+
+#: 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 "在附函或單個修補檔中顯示和 <rev> 的差異"
 
-#: builtin/log.c
+#: builtin/log.c:2113
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異"
 
-#: 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 "從 <檔案> 讀取排除模式 (pattern)"
 
-#: 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"
 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=<exec>]\n"
+"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "              [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
 "              [--symref] [<repository> [<patterns>...]]"
 
-#: 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 "保留主旨中不是 PATCH 的方括號"
 
-#: 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>"
@@ -9905,352 +10184,352 @@ 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\""
 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 "使用基於 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” 不存在"
+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。"
 
-#: 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] [<options>] <branch1> <branch2>"
 
-#: 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] <base-tree> <branch1> <branch2>"
 
-#: 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 "列出檔名，但不附加 modes/oids/stages"
 
-#: 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 "已經是最新的。（無需壓縮 (squash)）"
 
-#: 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"
@@ -10260,84 +10539,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."
@@ -10345,7 +10624,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."
@@ -10353,37 +10632,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"
@@ -10392,101 +10671,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 "stdin 上的標籤未通過我們的嚴格 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>]"
@@ -10494,205 +10773,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 "包含成對 packfile 和包索引的物件目錄"
 
-#: 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 [<options>] --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 "
@@ -10702,11 +10981,11 @@ msgstr ""
 "separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
 "| -C) <object>] [<object>]"
 
-#: 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 "
@@ -10716,126 +10995,128 @@ msgstr ""
 "separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "
 "| -C) <object>] [<object>]"
 
-#: 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' 時失敗"
@@ -10843,94 +11124,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 "<paragraph-break>"
 
-#: builtin/notes.c
+#: builtin/notes.c:501 builtin/notes.c:676
 msgid "insert <paragraph-break> between paragraphs"
 msgstr "在段落間插入 <paragraph-break>"
 
-#: 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"
@@ -10939,97 +11220,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 "
@@ -11039,55 +11320,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 "
@@ -11095,171 +11376,173 @@ 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”"
+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-"
 "hash> <uri>' (got '%s')"
 msgstr ""
-"uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> <uri>' "
-"(收到 '%s')"
+"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"
@@ -11268,7 +11551,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"
@@ -11277,267 +11560,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 "將早於 <time> 的廢棄物件設為過期"
 
-#: 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 packfile 中的物件"
 
-#: 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-"
@@ -11546,7 +11829,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"
@@ -11560,11 +11843,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>]"
@@ -11572,128 +11855,128 @@ msgstr ""
 "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
 "<pattern>]"
 
-#: 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 packfile 以外的物件"
 
-#: 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"
@@ -11703,40 +11986,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"
@@ -11745,16 +12029,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"
@@ -11783,19 +12067,19 @@ msgstr ""
 "pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n"
 "設定的預設值。\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"
@@ -11805,7 +12089,7 @@ msgstr ""
 "fetch 更新了目前的分支。快轉您的工作區\n"
 "至提交 %s。"
 
-#: builtin/pull.c
+#: builtin/pull.c:1084
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11822,47 +12106,47 @@ 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"
 msgstr ""
 "\n"
-"若要永久選擇某個選項，請參閱 “git help config” 中的 push.default。\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"
@@ -11871,10 +12155,10 @@ msgid ""
 msgstr ""
 "\n"
 "若要避免在名稱與本機分支不同時自動設定上游分支，\n"
-"請參閱 “git help config” 中 branch.autoSetupMerge 的\n"
-"“simple” 選項。\n"
+"請參閱「git help config」中 branch.autoSetupMerge 的\n"
+"「simple」選項。\n"
 
-#: builtin/push.c
+#: builtin/push.c:168
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -11898,7 +12182,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"
@@ -11912,17 +12196,17 @@ 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"
 "upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
 msgstr ""
 "\n"
-"若要使沒有追蹤上游的分支自動配置，請參閱 “git help config” 中的\n"
-"“push.autoSetupRemote”。\n"
+"若要使沒有追蹤上游的分支自動配置，請參閱「git help config」中的\n"
+"「push.autoSetupRemote」。\n"
 
-#: builtin/push.c
+#: builtin/push.c:206
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -11937,17 +12221,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"
@@ -11957,7 +12241,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"
@@ -11965,10 +12249,10 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 "更新被拒絕，因為您目前分支的最新提交落後於其對應的遠端分支。\n"
-"如果您想要整合遠端更動，請在再次推送前使用 “git pull”。詳見\n"
-"“git push --help” 中的〈Note about fast-forwards〉小節。"
+"如果您想要整合遠端更動，請在再次推送前使用「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"
@@ -11976,10 +12260,10 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 "更新被拒絕，因為推送的某分支的最新提交落後於其對應的遠端分支。\n"
-"如果您想要整合遠端更動，請在再次推送前使用 “git pull”。詳見\n"
-"“git push --help” 中的〈Note about fast-forwards〉小節。"
+"如果您想要整合遠端更動，請在再次推送前使用「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"
@@ -11989,14 +12273,14 @@ msgid ""
 msgstr ""
 "更新被拒絕，因為遠端包含您本機沒有的提交。這通常是因為\n"
 "另一個版本庫有推送更動到同個引用。如果您想要整合遠端更動，\n"
-"請在再次推送前使用 “git pull”。詳見 “git push --help” 中的\n"
+"請在再次推送前使用「git pull」。詳見「git push --help」中的\n"
 "〈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"
@@ -12005,7 +12289,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"
@@ -12013,112 +12297,113 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 "更新被拒絕，因為遠端追蹤分支的最新提交自上次簽出後有改變。\n"
-"如果您想要整合遠端更動，請在再次推送前使用 “git pull”。\n"
-"詳見 “git push --help” 中的〈Note about fast-forwards〉小節。"
+"如果您想要整合遠端更動，請在再次推送前使用「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、--branches 或 --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 "需要遠端支援 atomic 事務"
 
-#: 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 "
@@ -12139,70 +12424,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"
@@ -12214,79 +12499,79 @@ msgstr ""
 "              [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n"
 "              (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 
-#: 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>]]"
@@ -12294,60 +12579,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 "無效的 onto：「%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"
@@ -12365,32 +12651,33 @@ msgstr ""
 "\n"
 "因此 git 無法對其重定基底。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:757
 #, c-format
 msgid "Unknown rebase-merges mode: %s"
 msgstr "未知的 rebase-merges 模式：%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 "
@@ -12399,7 +12686,7 @@ msgstr ""
 "有字串引數的 --rebase-merges 已被棄用，而且會在未來的 Git 版本停止運作。請改"
 "用無引數的 --rebase-merges，功能相同。"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1027
 #, c-format
 msgid ""
 "%s\n"
@@ -12416,7 +12703,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"
@@ -12429,168 +12716,168 @@ 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"
@@ -12600,29 +12887,29 @@ 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"
 "which is no longer supported; use 'merges' instead"
 msgstr ""
 "--preserve-merges 已被 --rebase-merges 取代\n"
-"註：您的 `pull.rebase` 設定可能也被設定為不受支援的 “preserve”；\n"
-"請改用 “merges”"
+"註：您的 `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"
@@ -12630,16 +12917,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"
@@ -12658,120 +12945,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 "apply 選項與 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 "apply 選項與 rebase.updateRefs 不相容。請考慮加上 --no-update-refs"
 
-#: builtin/rebase.c
+#: builtin/rebase.c:1549
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "未知 rebase 後端：%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"
@@ -12797,7 +13085,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"
@@ -12816,23 +13104,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-options>] [<ref>]"
 
-#: 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"
@@ -12844,7 +13132,7 @@ msgstr ""
 "                  [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
 "<refs>...]"
 
-#: builtin/reflog.c
+#: builtin/reflog.c:25
 msgid ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
@@ -12852,83 +13140,104 @@ msgstr ""
 "git reflog delete [--rewrite] [--updateref]\n"
 "                  [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
 
-#: 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 "傳入「--%s」的時間戳「%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 "剪除早於 <time> 且不能從分支目前開頭到達的項目"
 
-#: 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 "處理所有引用的 reflog"
 
-#: 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 "進行非破壞性的試執行"
+
+#: 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 "版本庫已經使用 '%s' 格式"
+
+#: builtin/remote.c:21
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -12936,86 +13245,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] <old> <new>"
 
-#: 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"
@@ -13023,16 +13332,16 @@ 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)"
@@ -13040,70 +13349,71 @@ msgstr ""
 "抓取時匯入所有的標籤和關聯物件\n"
 "或者是完全不抓取所有標籤 (--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 "master 分支"
 
-#: 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"
@@ -13114,17 +13424,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"
@@ -13135,21 +13445,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:"
@@ -13158,312 +13468,307 @@ msgid_plural ""
 "to delete them, use:"
 msgstr[0] "注意：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"
 msgstr[0] "  遠端分支：%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' 設定的本機分支："
 
-#: 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："
 
-#: 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 "刪除 URL"
 
-#: 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."
@@ -13471,209 +13776,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 "無法關閉 refs 的快照暫存檔"
 
-#: 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 不以 objdir %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 "每個 packfile 的最大尺寸"
 
-#: 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” 一起使用"
+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” 檔案"
+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"
@@ -13682,27 +13987,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"
@@ -13713,106 +14018,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"
@@ -13821,112 +14126,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>..."
@@ -13934,182 +14239,184 @@ msgstr ""
 "（實驗性功能！）git replay ([--contained] --onto <newbase> | --advance "
 "<branch>) <revision-range>..."
 
-#: 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 "演進所有包含在 revision-range 中的分支"
 
-#: 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' "
 "will be forced"
-msgstr "將覆寫部分修訂版遍歷選項，強制使用 “struct rev_info” 的 “%s” 位元"
+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 <pathspec>... | 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"
@@ -14118,67 +14425,67 @@ msgstr ""
 "重設後花費 %.2f 秒重新整理索引。\n"
 "您可以使用「--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 "標記計數 (marked counting) 與「%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 "選項旗標前缺少 opt-spec"
 
-#: 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"
@@ -14192,68 +14499,68 @@ 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 需要 1 個引數"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:749
 #, c-format
 msgid "not a gitdir '%s'"
 msgstr "'%s' 不是 git 目錄"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:777
 msgid "--git-path requires an argument"
 msgstr "--git-path 需要 1 個引數"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:787
 msgid "-n requires an argument"
 msgstr "-n 需要 1 個引數"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:801
 msgid "--path-format requires an argument"
 msgstr "--path-format 需要 1 個引數"
 
-#: 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 需要 1 個引數"
 
-#: builtin/rev-parse.c
+#: builtin/rev-parse.c:820
 msgid "--prefix requires an argument"
 msgstr "--prefix 需要 1 個引數"
 
-#: 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>..."
@@ -14261,11 +14568,11 @@ msgstr ""
 "git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] "
 "<commit>..."
 
-#: 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>..."
@@ -14273,89 +14580,89 @@ msgstr ""
 "git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n"
 "                [-S[<keyid>]] <commit>..."
 
-#: 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” 格式參考提交"
+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"
@@ -14365,7 +14672,7 @@ msgstr ""
 "       [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "       [--] [<pathspec>...]"
 
-#: builtin/rm.c
+#: builtin/rm.c:215
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -14374,7 +14681,7 @@ msgid_plural ""
 "file and the HEAD:"
 msgstr[0] "如下檔案其暫存的內容和工作區及 HEAD 中的都不一樣："
 
-#: builtin/rm.c
+#: builtin/rm.c:220
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -14382,12 +14689,12 @@ 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] "下列檔案有暫存在索引的變更："
 
-#: builtin/rm.c
+#: builtin/rm.c:228 builtin/rm.c:237
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -14395,50 +14702,50 @@ 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] "如下檔案有本機修改："
 
-#: 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"
@@ -14452,85 +14759,85 @@ msgstr ""
 "              [--[no-]signed | --signed=(true|false|if-asked)]\n"
 "              [<host>:]<directory> (--all | <ref>...)"
 
-#: 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 使用 stdin"
 
-#: 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"
@@ -14544,139 +14851,139 @@ msgstr ""
 "                [--no-name | --sha1-name] [--topics]\n"
 "                [(<rev> | <glob>)...]"
 
-#: 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 個以上的引用"
 
-#: 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 個條目。"
 
-#: 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 個以上的版本。"
 
-#: 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] [--] [<pattern>...]"
+"             [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n"
+"             [--] [<pattern>...]"
 
-#: 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"
@@ -14686,59 +14993,59 @@ msgstr ""
 "             [-s | --hash[=<n>]] [--abbrev[=<n>]]\n"
 "             [--] [<ref>...]"
 
-#: 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 <ref>"
 
-#: 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>]"
@@ -14746,89 +15053,93 @@ msgstr ""
 "git sparse-checkout (init | list | set | add | reapply | disable | check-"
 "rules) [<options>]"
 
-#: 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 "這不是稀疏工作區（sparse-checkout 檔案可能不存在）"
 
-#: 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」目錄有未追蹤的檔案，但不在稀疏提交的 cone 中"
 
-#: 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 "無法修改稀疏索引設定"
 
-#: 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 "以 cone 模式初始化稀疏簽出"
 
-#: 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 "無法去掉 '%s' C 樣式字串的引號"
 
-#: 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 "現有的稀疏簽出樣式不使用 cone 模式"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:733
 msgid "please run from the toplevel directory in non-cone mode"
 msgstr "請從上層目錄，以非 cone 模式執行"
 
-#: 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"
@@ -14836,14 +15147,14 @@ 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 "
@@ -14852,24 +15163,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 | <patterns>)"
 
-#: 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>)"
@@ -14877,15 +15188,15 @@ msgstr ""
 "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
 "(--stdin | <patterns>)"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:882
 msgid "must be in a sparse-checkout to reapply sparsity patterns"
 msgstr "必須在稀疏提交才能重新套用稀疏樣式 (sparsity pattern)"
 
-#: 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>]"
@@ -14893,24 +15204,24 @@ msgstr ""
 "git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"
 "file <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 搭配使用時，將 patterns (模式) 解釋為 cone 模式的 patterns"
 
-#: builtin/sparse-checkout.c
+#: builtin/sparse-checkout.c:996
 msgid "use patterns in <file> instead of the current ones."
 msgstr "使用 <file> 中的（而非目前使用的）模式。"
 
-#: builtin/stash.c
+#: builtin/stash.c:34
 msgid "git stash list [<log-options>]"
 msgstr "git stash list [<log-options>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:36
 msgid ""
 "git stash show [-u | --include-untracked | --only-untracked] [<diff-"
 "options>] [<stash>]"
@@ -14918,27 +15229,27 @@ msgstr ""
 "git stash show [-u | --include-untracked | --only-untracked] [<diff-"
 "options>] [<stash>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:38
 msgid "git stash drop [-q | --quiet] [<stash>]"
 msgstr "git stash drop [-q | --quiet] [<stash>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:40
 msgid "git stash pop [--index] [-q | --quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q | --quiet] [<stash>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:42
 msgid "git stash apply [--index] [-q | --quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q | --quiet] [<stash>]"
 
-#: 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) <message>] [-q | --quiet] <commit>"
 
-#: builtin/stash.c
+#: builtin/stash.c:48
 msgid ""
 "git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "
 "| --quiet]\n"
@@ -14954,7 +15265,7 @@ msgstr ""
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 
-#: builtin/stash.c
+#: builtin/stash.c:53
 msgid ""
 "git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "
 "--quiet]\n"
@@ -14964,34 +15275,34 @@ msgstr ""
 "--quiet]\n"
 "          [-u | --include-untracked] [-a | --all] [<message>]"
 
-#: builtin/stash.c
+#: builtin/stash.c:56
 msgid "git stash create [<message>]"
 msgstr "git stash create [<message>]"
 
-#: 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"
@@ -15002,217 +15313,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"
@@ -15221,7 +15533,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 "
@@ -15231,148 +15543,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] [--] <command>"
 
-#: 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 [<options>] [<path>]"
 
-#: 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(blob)->%s(submodule)"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:850
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodule)->%s(blob)"
 
-#: 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 [<options>] [<commit>] [--] [<path>]"
 
-#: 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] [<path>]"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:1405
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory. This will be replaced "
@@ -15380,52 +15694,52 @@ msgid ""
 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"
@@ -15437,75 +15751,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 "無法取得 gitdir “%s” 的版本庫控點"
+msgstr "無法取得 gitdir「%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 "
@@ -15515,182 +15832,182 @@ msgstr ""
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
 "<filter-spec>] --url <url> --path <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 "無法在沒有網址的情況下複製 “%s” 子模組"
+msgstr "無法在沒有網址的情況下複製「%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 "「%s %s」在「%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 "無法在子模組路徑「%s」中尋找 %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” 更新策略（預設值）"
+msgstr "使用「checkout」更新策略（預設值）"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2756
 msgid "use the 'merge' update strategy"
-msgstr "使用 “merge” 更新策略"
+msgstr "使用「merge」更新策略"
 
-#: builtin/submodule--helper.c
+#: builtin/submodule--helper.c:2759
 msgid "use the 'rebase' update strategy"
-msgstr "使用 “rebase” 更新策略"
+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-"
@@ -15702,55 +16019,55 @@ msgstr ""
 "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
 "[--] [<path>...]"
 
-#: 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 [<options>] [<path>...]"
 
-#: 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] <path> <newurl>"
 
-#: 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) <path>"
 
-#: 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) <branch> <path>"
 
-#: 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>"
@@ -15758,27 +16075,27 @@ msgstr ""
 "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
 "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
 
-#: 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 "在本機找到「%s」Git 目錄，與其對應的遠端版本庫：\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"
@@ -15793,134 +16110,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 [<options>] [--] <repository> [<path>]"
 
-#: 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 <command>"
 
-#: builtin/symbolic-ref.c
+#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref [-m <reason>] <name> <ref>"
 msgstr "git symbolic-ref [-m <reason>] <name> <ref>"
 
-#: 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] <name>"
 
-#: builtin/symbolic-ref.c
+#: builtin/symbolic-ref.c:11
 msgid "git symbolic-ref --delete [-q] <name>"
 msgstr "git symbolic-ref --delete [-q] <name>"
 
-#: 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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+"        [(--trailer <token>[(=|:)<value>])...]\n"
 "        <tagname> [<commit> | <object>]"
 
-#: 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"
@@ -15932,21 +16252,21 @@ msgstr ""
 "        [--create-reflog] [--sort=<key>] [--format=<format>]\n"
 "        [--merged <commit>] [--no-merged <commit>] [<pattern>...]"
 
-#: 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"
@@ -15959,7 +16279,7 @@ msgstr ""
 "  %s\n"
 "以「%s」開頭的列將被忽略。\n"
 
-#: builtin/tag.c
+#: builtin/tag.c:201
 #, c-format
 msgid ""
 "\n"
@@ -15973,11 +16293,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"
@@ -15990,360 +16310,360 @@ 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”"
+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 "inflate 回傳 (%d)"
 
-#: builtin/unpack-objects.c
+#: builtin/unpack-objects.c:412
 msgid "invalid blob object from stream"
 msgstr "源自串流的 blob 物件無效"
 
-#: 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 "index-version：曾是 %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"
@@ -16351,11 +16671,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"
@@ -16363,61 +16683,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 [<options>] -d <refname> [<old-oid>]"
 
-#: builtin/update-ref.c
+#: builtin/update-ref.c:13
 msgid "git update-ref [<options>]    <refname> <new-oid> [<old-oid>]"
 msgstr "git update-ref [<options>]    <refname> <new-oid> [<old-oid>]"
 
-#: 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>"
@@ -16425,55 +16745,55 @@ msgstr ""
 "git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"
 "                [--advertise-refs] <directory>"
 
-#: 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] <commit>..."
 
-#: 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] [--] <pack>.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=<format>] [--raw] <tag>..."
 
-#: 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>]"
@@ -16481,39 +16801,39 @@ msgstr ""
 "git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
 "                 [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"
 
-#: 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 <string>] <worktree>"
 
-#: 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 <expire>]"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:42
 msgid "git worktree remove [-f] <worktree>"
 msgstr "git worktree remove [-f] <worktree>"
 
-#: 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 <worktree>"
 
-#: builtin/worktree.c
+#: builtin/worktree.c:49
 msgid "No possible source branch, inferring '--orphan'"
-msgstr "沒有可能的來源分支，推測為 “--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"
@@ -16528,7 +16848,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"
@@ -16543,30 +16863,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"
@@ -16575,7 +16895,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"
@@ -16584,61 +16904,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"
@@ -16646,126 +16966,127 @@ msgid ""
 "HEAD contents: '%s'"
 msgstr ""
 "HEAD 指向無效（或孤立）引用。\n"
-"HEAD 路徑：“%s”\n"
-"HEAD 內容：“%s”"
+"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"
 msgstr ""
 "即使有提供一個遠端，卻不存在本機或遠端引用，\n"
-"故停止。使用 “add -f” 先覆蓋或抓取遠端"
+"故停止。使用「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 "對舊於 <時間> 的工作區加上 ‘prunable’ 標示"
 
-#: 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"
@@ -16774,7 +17095,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"
@@ -16782,36 +17103,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"
@@ -16820,7 +17141,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"
@@ -16828,1287 +17149,1302 @@ 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”"
+msgstr "無法解析套件包清單鍵 %s 的值「%s」"
 
-#: bundle-uri.c
+#: bundle-uri.c:264
 #, c-format
 msgid "bundle list at '%s' has no mode"
-msgstr "位於 “%s” 的套件包清單沒有模式"
+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” 下載的檔案不是套件包"
+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” 取回的套件包模式"
+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 "無法從 “%s” URI 下載套件包"
+msgstr "無法從「%s」URI 下載套件包"
 
-#: bundle-uri.c
+#: bundle-uri.c:731
 #, c-format
 msgid "file at URI '%s' is not a bundle or bundle list"
-msgstr "位於 URI “%s” 的檔案不是套件包或套件包清單"
+msgstr "位於 URI「%s」的檔案不是套件包或套件包清單"
 
-#: bundle-uri.c
+#: bundle-uri.c:899
 #, c-format
 msgid "bundle-uri: unexpected argument: '%s'"
-msgstr "bundle-uri: 非預期的引數：“%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”"
+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 版本的套件包檔案"
+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] "這個套件包，含有這 %<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] "這個套件包需要這 %<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 "無法 spawn 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 "無法寫入使用 %2$s 演算法的套件包版本 %1$d"
 
-#: 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 "產生診斷資訊的 zip 封存檔"
 
-#: 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 "執行用來最佳化 Git 版本庫資料的作業"
 
-#: 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 "將檔案內容新增到索引"
+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 "Subversion 版本庫和 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 "用資料物件的內容建立暫存檔"
 
-#: 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 密碼編譯簽章格式"
+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 Wire 通訊協定，第 2 版"
 
-#: 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 "提交圖形檔案太小"
+msgstr "提交圖檔案太小"
 
-#: commit-graph.c
+#: commit-graph.c:286
 msgid "commit-graph oid fanout chunk is wrong size"
-msgstr "提交圖形 OID 扇出區塊大小有誤"
+msgstr "提交圖 OID 扇出區塊大小有誤"
 
-#: commit-graph.c
+#: commit-graph.c:295
 msgid "commit-graph fanout values out of order"
-msgstr "提交圖形扇出的數值失序"
+msgstr "提交圖扇出的數值失序"
 
-#: commit-graph.c
+#: commit-graph.c:309
 msgid "commit-graph OID lookup chunk is the wrong size"
-msgstr "提交圖形 OID 查詢區塊的大小有誤"
+msgstr "提交圖 OID 查詢區塊的大小有誤"
 
-#: commit-graph.c
+#: commit-graph.c:318
 msgid "commit-graph commit data chunk is wrong size"
-msgstr "提交圖形的提交資料區塊大小有誤"
+msgstr "提交圖的提交資料區塊大小有誤"
 
-#: commit-graph.c
+#: commit-graph.c:328
 msgid "commit-graph generations chunk is wrong size"
-msgstr "提交圖形的世代區塊大小有誤"
+msgstr "提交圖的世代區塊大小有誤"
 
-#: commit-graph.c
+#: commit-graph.c:338
 msgid "commit-graph changed-path index chunk is too small"
-msgstr "提交圖形的更動路徑索引區塊過小"
+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>)"
+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 不符合"
+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 不符合"
+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 不符合"
+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 個區塊"
+msgstr "提交圖檔案不夠放置 %u 個區塊"
 
-#: commit-graph.c
+#: commit-graph.c:431
 msgid "commit-graph required OID fanout chunk missing or corrupted"
-msgstr "提交圖形需要的 OID 扇出區塊遺失或損壞"
+msgstr "提交圖需要的 OID 扇出區塊遺失或損壞"
 
-#: commit-graph.c
+#: commit-graph.c:435
 msgid "commit-graph required OID lookup chunk missing or corrupted"
-msgstr "提交圖形需要的 OID 查詢區塊遺失或損壞"
+msgstr "提交圖需要的 OID 查詢區塊遺失或損壞"
 
-#: commit-graph.c
+#: commit-graph.c:439
 msgid "commit-graph required commit data chunk missing or corrupted"
-msgstr "提交圖形需要的提交資料區塊遺失或損壞"
+msgstr "提交圖需要的提交資料區塊遺失或損壞"
+
+#: commit-graph.c:562
+#, c-format
+msgid ""
+"disabling Bloom filters for commit-graph layer '%s' due to incompatible "
+"settings"
+msgstr "由於不相容的設定，停用提交圖層 '%s' 的布隆過濾器"
 
-#: commit-graph.c
+#: commit-graph.c:577
 msgid "commit-graph has no base graphs chunk"
-msgstr "提交圖形沒有基礎圖形區塊"
+msgstr "提交圖沒有基礎圖區塊"
 
-#: commit-graph.c
+#: commit-graph.c:582
 msgid "commit-graph base graphs chunk is too small"
-msgstr "提交圖形的基礎圖形區塊過小"
+msgstr "提交圖的基礎圖區塊過小"
 
-#: commit-graph.c
+#: commit-graph.c:593
 msgid "commit-graph chain does not match"
-msgstr "提交圖形鏈不符合"
+msgstr "提交圖鏈不符"
 
-#: commit-graph.c
+#: commit-graph.c:603
 #, c-format
 msgid "commit count in base graph too high: %<PRIuMAX>"
-msgstr "基礎圖 (base graph) 中的提交數過多：%<PRIuMAX>"
+msgstr "基礎圖中的提交數過多：%<PRIuMAX>"
 
-#: commit-graph.c
+#: commit-graph.c:631
 msgid "commit-graph chain file too small"
-msgstr "提交圖形鏈檔案過小"
+msgstr "提交圖鏈檔案過小"
 
-#: commit-graph.c
+#: commit-graph.c:661
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "無效的提交圖形鏈：「%s」列不是雜湊值"
+msgstr "無效的提交圖鏈：「%s」列不是雜湊值"
 
-#: commit-graph.c
+#: commit-graph.c:687
 msgid "unable to find all commit-graph files"
-msgstr "無法找到所有提交圖形檔案"
+msgstr "無法找到所有提交圖檔案"
 
-#: commit-graph.c
+#: commit-graph.c:862 commit-graph.c:900
 msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "無效的提交位置。提交圖形可能已損壞"
+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 "提交圖需要比目前更多的世代資料，但沒有相關資料"
+msgstr "缺少提交圖需要的溢位世代資料"
 
-#: commit-graph.c
+#: commit-graph.c:921
 msgid "commit-graph overflow generation data is too small"
-msgstr "提交圖形的溢出世代資料過小"
+msgstr "提交圖的溢位世代資料過小"
 
-#: commit-graph.c
+#: commit-graph.c:978
 msgid "commit-graph extra-edges pointer out of bounds"
-msgstr "提交圖形的延伸邊界指針超出範圍"
+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 "正在展開提交圖中的可以取得的提交"
+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 "正在計算提交圖拓樸級別"
+msgstr "正在計算提交圖的拓樸層級"
 
-#: commit-graph.c
+#: commit-graph.c:1724
 msgid "Computing commit graph generation numbers"
-msgstr "正在計算提交圖世代數字"
+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> 個包中尋找提交圖的提交"
 
-#: 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 "正在打包物件中尋找提交圖的提交"
+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"
+msgstr "無法寫入正確數量的基礎圖 ID"
 
-#: commit-graph.c
+#: commit-graph.c:2072
 msgid "unable to create temporary graph layer"
-msgstr "無法建立暫時的圖形層"
+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 步寫出提交圖"
 
-#: commit-graph.c
+#: commit-graph.c:2168
 msgid "unable to open commit-graph chain file"
-msgstr "無法開啟提交圖形鏈檔案"
+msgstr "無法開啟提交圖鏈檔案"
 
-#: commit-graph.c
+#: commit-graph.c:2184
 msgid "failed to rename base commit-graph file"
-msgstr "無法重新命名基礎提交圖形檔案"
+msgstr "無法重新命名基礎提交圖檔案"
 
-#: commit-graph.c
+#: commit-graph.c:2207
 msgid "failed to rename temporary commit-graph file"
-msgstr "無法重新命名暫時提交圖形檔案"
+msgstr "無法重新命名暫時性提交圖檔案"
 
-#: commit-graph.c
+#: commit-graph.c:2251
 #, c-format
 msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
-msgstr "無法將圖與 %<PRIuMAX>, %<PRIuMAX> 個提交進行合併"
+msgstr "無法合併圖，兩者分別有 %<PRIuMAX>、%<PRIuMAX> 個提交"
 
-#: commit-graph.c
+#: commit-graph.c:2313
 #, c-format
 msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
-msgstr "無法合併 %s 圖，太多提交：%<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 "正在合併提交圖形"
+msgstr "正在合併提交圖"
 
-#: commit-graph.c
+#: commit-graph.c:2506
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
-msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用"
+msgstr "嘗試寫入提交圖，但「core.commitGraph」已停用"
+
+#: 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
+#: commit-graph.c:2630
 msgid "too many commits to write graph"
-msgstr "提交太多不能畫圖"
+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"
+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"
+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"
+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"
+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"
+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 的提交圖形父提交列表太長了"
+msgstr "提交 %s 的提交圖上級清單過長"
 
-#: commit-graph.c
+#: commit-graph.c:2803
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
-msgstr "%s 的提交圖形父提交是 %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 的提交圖形父提交列表過早終止"
+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> 世代"
+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>"
+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 "提交圖形中包含 0 和非 0 兩個世代號（例如 “%s” 和 “%s” 提交）"
+msgstr "提交圖中包含 0 和非 0 兩個世代數（例如提交「%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"
@@ -18128,32 +18464,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 提交在提交圖形中，但不在物件資料庫中"
+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"
@@ -18163,260 +18499,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” 的剩餘磁碟大小"
+msgstr "無法判斷「%s」的剩餘磁碟大小"
 
-#: compat/disk.h
+#: compat/disk.h:29
 #, c-format
 msgid "could not get info for '%s'"
-msgstr "無法取得 “%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”"
+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"
+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”"
+msgstr "無法轉換至較寬字元：「%s」"
 
-#: compat/fsmonitor/fsm-health-win32.c
+#: compat/fsmonitor/fsm-health-win32.c:164
 #, c-format
 msgid "BHFI changed '%ls'"
-msgstr "BHFI 更改了 “%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"
+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”"
+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” 的 longname"
+msgstr "[GLE %ld] 無法取得「%s」的 longname"
 
-#: compat/fsmonitor/fsm-listen-win32.c
+#: compat/fsmonitor/fsm-listen-win32.c:393
 #, c-format
 msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"
-msgstr "在 “%s” 上呼叫 ReadDirectoryChangedW 失敗 [GLE %ld]"
+msgstr "在「%s」上呼叫 ReadDirectoryChangedW 失敗 [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 "在 “%s” 上呼叫 GetOverlappedResult 失敗 [GLE %ld]"
+msgstr "在「%s」上呼叫 GetOverlappedResult 失敗 [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)"
+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”"
+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 "對 “%s” 進行 ConnectNamedPipe 失敗 (%lu)"
+msgstr "對「%s」進行 ConnectNamedPipe 失敗 (%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"
+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]"
+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 失敗"
+msgstr "等待「%s」的 hEvent 失敗"
 
-#: compat/terminal.c
+#: compat/terminal.c:168
 msgid "cannot resume in the background, please use 'fg' to resume"
-msgstr "無法在背景繼續；請使用 “fg” 繼續"
+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"
@@ -18431,20 +18768,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"
@@ -18452,344 +18789,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」"
+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 得有至少 1 個字元"
 
-#: 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 "因為第 %2$<PRIuMAX> 列中 “%1$s” 的文字列太長，故拒絕運作"
+msgstr "因為第 %2$<PRIuMAX> 列中「%1$s」的文字列太長，故拒絕運作"
 
-#: 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"
@@ -18800,95 +19137,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"
@@ -18897,7 +19234,7 @@ msgstr ""
 "完成。\n"
 "連線到 %s（埠 %s）... "
 
-#: connect.c
+#: connect.c:852 connect.c:929
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -18907,123 +19244,123 @@ 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 接觸到時會用 LF 取代 CRLF"
+msgstr "在「%s」的工作複本中，下次 Git 接觸到時會用 LF 取代 CRLF"
 
-#: 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 接觸到時會用 CRLF 取代 LF"
+msgstr "在「%s」的工作複本中，下次 Git 接觸到時會用 CRLF 取代 LF"
 
-#: 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 "
 "working-tree-encoding."
 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-"
@@ -19032,261 +19369,261 @@ 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> 秒鐘前"
 
-#: date.c
+#: date.c:155
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "%<PRIuMAX> 分鐘前"
 
-#: date.c
+#: date.c:162
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "%<PRIuMAX> 小時前"
 
-#: date.c
+#: date.c:169
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "%<PRIuMAX> 天前"
 
-#: date.c
+#: date.c:175
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "%<PRIuMAX> 周前"
 
-#: date.c
+#: date.c:182
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "%<PRIuMAX> 個月前"
 
-#: date.c
+#: date.c:193
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
 msgstr[0] "%<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> 個月前"
 
-#: date.c
+#: date.c:201 date.c:206
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
 msgstr[0] "%<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”，其非檔案或目錄"
+msgstr "略過「%s」，其非檔案或目錄"
 
-#: diagnose.c
+#: diagnose.c:205
 msgid "could not duplicate stdout"
 msgstr "無法複製 stdout"
 
-#: 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 "無法比對 stdin 和目錄"
 
-#: diff-no-index.c
+#: diff-no-index.c:280
 msgid "cannot compare a named pipe to a directory"
 msgstr "無法比對命名管線 (pipe) 和目錄"
 
-#: 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'"
@@ -19294,7 +19631,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', "
@@ -19303,23 +19640,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"
@@ -19328,47 +19665,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 "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」"
 
-#: diff.c
+#: diff.c:4878
 #, c-format
 msgid ""
 "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
 msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%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"
@@ -19377,189 +19715,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 "<param1>,<param2>..."
 
-#: 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,<param1>,<param2>... 的同義詞"
 
-#: 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 "使用提供的圖形長度生成差異統計"
+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"
@@ -19567,364 +19905,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 "忽略行尾的Enter符（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 "忽略整行符合 <regex> 的變更"
 
-#: 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 "diff 中沒有「%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 "您的稀疏簽出檔案可能有問題：「%s」樣式重複"
 
-#: dir.c
+#: dir.c:884
 msgid "disabling cone pattern matching"
 msgstr "停用 cone 樣式符合模式"
 
-#: 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"
@@ -19932,241 +20270,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：無法 fork %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 "伺服器不支援 shallow 用戶端"
 
-#: 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 "伺服器不支援 shallow 請求"
 
-#: 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”"
+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"
@@ -20174,7 +20516,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"
@@ -20182,116 +20524,120 @@ 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 不相容"
+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 不相容"
+msgstr "版本庫「%s」因錯誤而與 fsmonitor 不相容"
 
-#: fsmonitor-settings.c
+#: fsmonitor-settings.c:266
 #, c-format
 msgid "remote repository '%s' is incompatible with fsmonitor"
-msgstr "遠端版本庫 “%s” 與 fsmonitor 不相容"
+msgstr "遠端版本庫「%s」與 fsmonitor 不相容"
 
-#: fsmonitor-settings.c
+#: fsmonitor-settings.c:272
 #, c-format
 msgid "virtual repository '%s' is incompatible with fsmonitor"
-msgstr "虛擬版本庫 “%s” 與 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 "通訊端 “%s” 因缺少 Unix 通訊端支援，而與 fsmonitor 不相容"
+msgstr "通訊端「%s」因缺少 Unix 通訊端支援，而與 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 <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>]"
 
-#: 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"
@@ -20303,47 +20649,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"
@@ -20352,39 +20698,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"
@@ -20393,32 +20739,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+)"
@@ -20426,37 +20773,37 @@ msgstr ""
 "SSH 簽名驗證需要 ssh-keygen -Y find-principals/verify（可以在 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"
@@ -20465,37 +20812,37 @@ msgstr ""
 "gpg 無法簽名資料：\n"
 "%s"
 
-#: gpg-interface.c
+#: gpg-interface.c:1031
 msgid "user.signingKey needs to be set for ssh signing"
 msgstr "需要設定 user.signingKey 才能進行 SSH 簽名"
 
-#: 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” 色彩"
+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"
@@ -20503,114 +20850,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"
@@ -20619,36 +20966,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"
@@ -20659,16 +21006,16 @@ msgstr[0] ""
 "\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?"
@@ -20679,7 +21026,7 @@ msgstr[0] ""
 "\n"
 "您指的是這個嗎？"
 
-#: hook.c
+#: hook.c:39
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -20688,48 +21035,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 時未加入 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"
@@ -20740,15 +21099,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"
@@ -20774,103 +21133,103 @@ msgstr ""
 "若只要在這個版本庫設定身份標記，請省略 --global 參數。\n"
 "\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” 不是有效的物件格式"
+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"
@@ -20889,81 +21248,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 "偵測到由可列印字元 (quoted) 所組成的 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"
@@ -20972,21 +21332,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 "
@@ -20995,7 +21356,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; "
@@ -21004,7 +21365,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 "
@@ -21014,14 +21375,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; "
@@ -21029,7 +21390,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 "
@@ -21038,7 +21399,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 "
@@ -21047,7 +21408,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 "
@@ -21056,14 +21417,14 @@ 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 "
@@ -21073,30 +21434,30 @@ 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 "
@@ -21105,7 +21466,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 "
@@ -21114,24 +21475,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 "
@@ -21146,7 +21507,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"
@@ -21155,7 +21516,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"
@@ -21183,89 +21544,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"
@@ -21281,17 +21648,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 "
@@ -21300,7 +21676,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 "
@@ -21309,7 +21685,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 "
@@ -21318,7 +21694,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 "
@@ -21327,41 +21703,41 @@ 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 "
@@ -21370,18 +21746,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 "
@@ -21391,7 +21767,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-"
@@ -21400,332 +21776,342 @@ 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 個共同祖先："
 
-#: 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 "新增 packfile '%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 "在 packfile 中定位物件 %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 "正在新增 packfile 至多包索引"
 
-#: 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 "沒有看到要捨棄的 packfile %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 "沒有要索引的 pack 檔案。"
 
-#: midx-write.c
+#: midx-write.c:1169
 msgid "refusing to write multi-pack .bitmap without any objects"
 msgstr "拒絕寫入無任何物件的多包 .bitmap"
 
-#: 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 "正在尋找並刪除沒有引用的 packfile"
 
-#: midx-write.c
+#: midx-write.c:1521
 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 fanout 大小錯誤"
 
-#: 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 "多包索引 OID 查詢區塊的大小有誤"
 
-#: midx.c
+#: midx.c:86
 msgid "multi-pack-index object offset chunk is the wrong size"
 msgstr "多包索引的物件偏移區塊大小有誤"
 
-#: 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 "multi-pack-index 雜湊版本 %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 "多包索引所需的 OID fanout 區塊不存在或損壞"
 
-#: midx.c
+#: midx.c:171
 msgid "multi-pack-index required OID lookup chunk missing or corrupted"
 msgstr "多包索引所需的 OID 查詢區塊不存在或損壞"
 
-#: 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 "MIDX 未包含 BTMP 區塊"
 
-#: midx.c
+#: midx.c:283
 #, c-format
 msgid "could not load bitmapped pack %<PRIu32>"
 msgstr "無法載入位圖化 (bitmapped) 的封裝 %<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 "有 multi-pack-index 檔案，但無法解析"
 
-#: midx.c
+#: midx.c:617
 msgid "incorrect checksum"
 msgstr "總和檢查碼不正確"
 
-#: midx.c
+#: midx.c:620
 msgid "Looking for referenced packfiles"
 msgstr "正在尋找引用的 packfile"
 
-#: 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 "正在驗證多包索引中的物件 ID 順序"
 
-#: 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 "透過 packfile 為物件排序"
 
-#: 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 "為 packfile %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"
@@ -21736,21 +22122,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/ 之外）寫入註解"
@@ -21759,298 +22145,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 的內容"
@@ -22059,7 +22447,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 [無效物件]"
@@ -22069,7 +22457,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"
@@ -22085,7 +22473,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"
@@ -22096,7 +22484,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 [無效標籤，無法解析]"
@@ -22104,7 +22492,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 樹"
@@ -22112,12 +22500,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 blob"
 
-#: object-name.c
+#: object-name.c:601
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr "短物件 ID %s 存在歧義"
@@ -22126,7 +22514,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"
@@ -22135,7 +22523,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"
@@ -22157,22 +22545,22 @@ msgstr ""
 "請檢查這些引用，並視需要刪除。執行\n"
 "「git config advice.objectNameWarning 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"
@@ -22181,12 +22569,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"
@@ -22195,7 +22583,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"
@@ -22204,396 +22592,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 "需要指定 <object>:<path>，卻只指定 <object>「%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” 不支援"
+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 "無法確定 MIDX 偏好的封裝"
 
-#: 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” 之位圖的標頭遭截斷"
+msgstr "ewah 位圖損壞：提交「%s」之位圖的標頭遭截斷"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2276
 #, c-format
 msgid "unable to load pack: '%s', disabling pack-reuse"
 msgstr "無法載入「%s」封裝，停用 pack-reuse"
 
-#: pack-bitmap.c
+#: pack-bitmap.c:2300
 msgid "unable to compute preferred pack, disabling pack-reuse"
 msgstr "無法計算偏好封裝，停用 pack-reuse"
 
-#: 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” 位圖檔案的總和檢查碼無效"
+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 有不支援的 hash 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 "無效的總和檢查碼"
 
-#: pack-revindex.c
+#: pack-revindex.c:339
 #, c-format
 msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>"
 msgstr "%<PRIu64> 位置的修訂版索引 (rev-index) 無效：%<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」promisor 檔案"
 
-#: packfile.c
+#: packfile.c:644
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"
 
-#: packfile.c
+#: packfile.c:674
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr "packfile %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"
@@ -22601,7 +23021,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"
@@ -22625,335 +23045,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，則 <路徑規格> 元件會使用 NUL 字元分隔"
 
-#: 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 "有無效的神奇前綴「%.*s」出現在路徑規格「%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” 在目錄樹之外"
+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: 無法 fork 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 子處理程序的 stdin"
 
-#: 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 "來自組態的偽合併常規表示式包含太多的擷取群組（最多 %<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 "無法在偏移 %2$<PRIuMAX> 處找到提交 %1$s 的偽合併"
+
+#: 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”"
+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"
@@ -22962,7 +23452,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"
@@ -22971,144 +23461,144 @@ 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：無法 map 索引檔案%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 "非預期的 diff 狀態 %c"
 
-#: read-cache.c
+#: read-cache.c:3926
 #, c-format
 msgid "remove '%s'\n"
-msgstr "移除 “%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"
@@ -23117,13 +23607,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"
@@ -23156,11 +23646,11 @@ msgstr ""
 "r, reword <提交> = 使用提交，但編輯提交說明\n"
 "e, edit <提交> = 使用提交，但不直接修補 (amend) \n"
 "s, squash <提交> = 使用提交，但融合至上個提交\n"
-"f, fixup [-C | -c] <提交> = 跟 “squash” 相似，但除非傳入 -C，\n"
+"f, fixup [-C | -c] <提交> = 跟「squash」相似，但除非傳入 -C，\n"
 "                   否則只保留上一個提交的日誌訊息。傳入 -C 表示只保留這個\n"
 "                   提交的訊息；傳入 -c 與 -C 功能相同，但會開啟編輯器\n"
 "x, exec <命令> = 使用 shell 執行命令（這一列的剩餘部分）\n"
-"b, break = 在此停止（使用 “git rebase --continue” 繼續重定基底）\n"
+"b, break = 在此停止（使用「git rebase --continue」繼續重定基底）\n"
 "d, drop <提交> = 移除提交\n"
 "l, label <標籤> = 為目前 HEAD 打上指定名字標籤\n"
 "t, reset <標籤> = 重設 HEAD 到指定標籤\n"
@@ -23174,13 +23664,13 @@ 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 個提交）"
 
-#: rebase-interactive.c
+#: rebase-interactive.c:86
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -23188,7 +23678,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"
@@ -23196,7 +23686,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"
@@ -23210,7 +23700,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"
@@ -23220,12 +23710,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"
@@ -23234,7 +23724,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"
@@ -23250,287 +23740,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=<value>)"
 
-#: 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:<committish>)"
 
-#: 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 "format：使用 %%(%s) 元素卻缺少 %%(%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 "本命令拒絕 atom %%(%.*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”"
+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"
@@ -23550,372 +24040,402 @@ msgstr ""
 "\n"
 "\tgit config --global init.defaultBranch <name>\n"
 "\n"
-"除了 “master” 外，常用的分支名稱有 “main”, “trunk” 以及\n"
-"“development”。剛建立的分支可以用這個命令重新命名：\n"
+"除了「master」外，常用的分支名稱有「main」,「trunk」以及\n"
+"「development」。剛建立的分支可以用這個命令重新命名：\n"
 "\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 "完成引用移轉的測試執行，可以在「%s」找到結果\n"
+
+#: refs.c:2867
+#, c-format
+msgid "could not remove temporary migration directory '%s'"
+msgstr "無法移除暫時性遷移目錄「%s」"
+
+#: refs.c:2887
+#, 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 "嘗試以不存在的物件 %s 寫入引用「%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 "引用表：準備事務：%s"
 
-#: refs/reftable-backend.c
+#: refs/reftable-backend.c:1338
 #, c-format
 msgid "reftable: transaction failure: %s"
 msgstr "引用表：事務失敗：%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 "未知的 object-format 值：%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 位元組的本文 (body)"
 
-#: remote-curl.c
+#: remote-curl.c:1171
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "啞 http 傳輸不支援 shallow 能力"
 
-#: 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> <路徑>」，但缺少空白"
 
-#: remote-curl.c
+#: remote-curl.c:1330
 #, c-format
 msgid "failed to download file at URL '%s'"
-msgstr "無法下載位於 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”"
+msgstr "數值 transfer.credentialsInUrl 無法識別：「%s」"
 
-#: remote.c
+#: remote.c:668 remote.c:670
 #, c-format
 msgid "URL '%s' uses plaintext credentials"
-msgstr "URL “%s” 使用明文憑證"
+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 符合超過一個"
@@ -23924,7 +24444,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"
@@ -23946,7 +24466,7 @@ msgstr ""
 "\n"
 "由於這些猜測都不正確，我們放棄了。您必須給出完整引用。"
 
-#: remote.c
+#: remote.c:1290
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -23957,7 +24477,7 @@ msgstr ""
 "您是想透過推送至「%s:refs/heads/%s」\n"
 "來建立新分支嗎？"
 
-#: remote.c
+#: remote.c:1295
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -23968,7 +24488,7 @@ msgstr ""
 "您是想透過推送至「%s:refs/tags/%s」\n"
 "來建立新標籤嗎？"
 
-#: remote.c
+#: remote.c:1300
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -23979,7 +24499,7 @@ msgstr ""
 "您是想透過推送至「%s:refs/tags/%s」\n"
 "為新樹狀物件貼上標籤嗎？"
 
-#: remote.c
+#: remote.c:1305
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -23990,113 +24510,113 @@ msgstr ""
 "您是想透過推送至「%s:refs/tags/%s」\n"
 "為新資料物件貼上標籤嗎？"
 
-#: 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"
 
-#: 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 ""
@@ -24104,11 +24624,11 @@ msgid_plural ""
 msgstr[0] "您的分支落後 '%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"
@@ -24121,146 +24641,146 @@ msgstr[0] ""
 "並且分別有 %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"
+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 "無法刪除失散檔案 “%s”"
+msgstr "無法刪除失散檔案「%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"
@@ -24268,135 +24788,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” 選項無效"
+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.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” 目錄建立版本庫"
+msgstr "在「src」目錄建立版本庫"
 
-#: scalar.c
+#: scalar.c:426
 msgid ""
 "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
 "\t[--[no-]src] <url> [<enlistment>]"
@@ -24404,89 +24924,89 @@ msgstr ""
 "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
 "\t[--[no-]src] <url> [<enlistment>]"
 
-#: 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 [<enlistment>]"
 
-#: 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 [<enlistment>]"
 
-#: 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 | <enlistment>]"
 
-#: scalar.c
+#: scalar.c:660
 msgid "--all or <enlistment>, but not both"
 msgstr "--all 或 <enlistment> 但不能傳入兩者"
 
-#: scalar.c
+#: scalar.c:683
 #, c-format
 msgid "could not remove stale scalar.repo '%s'"
-msgstr "無法移除過時的 scalar.repo “%s”"
+msgstr "無法移除過時的 scalar.repo「%s」"
 
-#: scalar.c
+#: scalar.c:686
 #, c-format
 msgid "removed stale scalar.repo '%s'"
-msgstr "已移除過時的 scalar.repo “%s”"
+msgstr "已移除過時的 scalar.repo「%s」"
 
-#: scalar.c
+#: scalar.c:696
 #, c-format
 msgid "repository at '%s' has different owner"
-msgstr "位於 “%s” 的版本庫有不同的擁有者"
+msgstr "位於「%s」的版本庫有不同的擁有者"
 
-#: scalar.c
+#: scalar.c:701
 #, c-format
 msgid "repository at '%s' has a format issue"
-msgstr "位於 “%s” 的版本庫有格式問題"
+msgstr "位於「%s」的版本庫有格式問題"
 
-#: scalar.c
+#: scalar.c:709
 #, c-format
 msgid "repository not found in '%s'"
-msgstr "版本庫不在 “%s”"
+msgstr "版本庫不在「%s」"
 
-#: scalar.c
+#: scalar.c:729
 #, c-format
 msgid ""
 "to unregister this repository from Scalar, run\n"
@@ -24495,7 +25015,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"
@@ -24503,49 +25023,49 @@ msgstr ""
 "scalar run <task> [<enlistment>]\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 [<enlistment>]"
 
-#: scalar.c
+#: scalar.c:858
 msgid "scalar delete <enlistment>"
 msgstr "scalar delete <enlistment>"
 
-#: 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 需要 <directory>"
 
-#: 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 需要 <key>=<value> 引數"
 
-#: scalar.c
+#: scalar.c:982
 msgid ""
 "scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
 "\n"
@@ -24555,82 +25075,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：無法 fork 一個 fetch 子處理程序"
 
-#: send-pack.c
+#: send-pack.c:473
 msgid "push negotiation failed; proceeding anyway with push"
 msgstr "push 協商失敗。繼續使用 push 處理"
 
-#: 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"
@@ -24643,7 +25163,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>'"
@@ -24651,7 +25171,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"
@@ -24667,7 +25187,7 @@ msgstr ""
 "若要取消並返回 \"git cherry-pick\" 前的狀態，\n"
 "請執行 \"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"
@@ -24683,86 +25203,86 @@ msgstr ""
 "若要取消並返回 \"git revert\" 前的狀態，\n"
 "請執行 \"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"
@@ -24791,11 +25311,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"
@@ -24819,7 +25339,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"
@@ -24842,321 +25362,369 @@ 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 "分離 HEAD"
 
 #  譯者：中文字串拼接，可刪除前導空格
-#: 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 "略過第 1 個提交說明："
 
-#: 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” 不是有效的標籤"
+msgstr "「%s」不是有效的標籤"
 
-#: sequencer.c
+#: sequencer.c:2619
 #, c-format
 msgid "'%s' is not a valid refname"
-msgstr "“%s” 不是有效的引用名稱"
+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」選擇一個合併提交。\n"
+"如果你想要重放這個合併，請對這個提交使用「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"
+"如果你希望合併並改寫提交訊息，\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」並無法使用合併提交作為參數。\n"
+"如果你希望重放這個合併，請對這個提交使用「merge -C」，\n"
+"並使用「break」取回控制權，\n"
+"這樣才能執行「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”"
+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"
@@ -25165,16 +25733,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"
@@ -25193,23 +25760,23 @@ 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"
@@ -25224,11 +25791,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"
@@ -25245,63 +25812,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” 已經存在"
+msgstr "似乎有另一個「rebase」程序正在進行；「%s.lock」已經存在"
 
-#: sequencer.c
+#: sequencer.c:4585
 #, c-format
 msgid ""
 "Updated the following refs with %s:\n"
@@ -25310,7 +25877,7 @@ msgstr ""
 "已使用 %s 更新下述引用：\n"
 "%s"
 
-#: sequencer.c
+#: sequencer.c:4591
 #, c-format
 msgid ""
 "Failed to update the following refs with %s:\n"
@@ -25319,40 +25886,40 @@ msgstr ""
 "無法使用 %s 更新下述引用：\n"
 "%s"
 
-#: sequencer.c
+#: sequencer.c:4657
 msgid "Cannot autostash"
 msgstr "無法 autostash"
 
-#: sequencer.c
+#: sequencer.c:4660
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "意外的 stash 回應：'%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 "建立了 autostash：%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 "已套用 autostash。\n"
 
-#: sequencer.c
+#: sequencer.c:4723
 #, c-format
 msgid "cannot store %s"
 msgstr "不能儲存 %s"
 
-#: sequencer.c
+#: sequencer.c:4726
 #, c-format
 msgid ""
 "%s\n"
@@ -25363,33 +25930,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 "autostash 引用是符號引用"
 
-#: 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"
@@ -25409,58 +25976,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"
@@ -25469,73 +26036,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"
@@ -25544,7 +26111,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"
@@ -25555,12 +26122,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"
@@ -25571,99 +26138,112 @@ 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] "找到未知的儲存庫擴充元件："
 
-#: 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] "repo 版本是 0 (v0)，但找到只支援 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"
@@ -25672,25 +26252,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”）"
+msgstr "無法使用「%s」純版本庫（safe.bareRepository 是「%s」）"
 
-#: setup.c
+#: setup.c:1787
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -25699,292 +26266,292 @@ 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"
 msgstr[0] "%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 位元組/秒"
 
-#: 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 "無法存取 %2$s 提交的子模組「%1$s」\n"
 
-#: submodule.c
+#: submodule.c:1664
 #, c-format
 msgid "Fetching submodule %s%s at commit %s\n"
 msgstr "正在抓取 %3$s 提交的 %1$s%2$s 子模組\n"
 
-#: submodule.c
+#: submodule.c:1879
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -25993,77 +26560,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 "「%s」子模組 git 目錄在「%.*s」git 路徑中"
 
-#: submodule.c
+#: submodule.c:2334
+#, c-format
+msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link"
+msgstr "預期「%.*s」（位於子模組路徑「%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"
@@ -26074,87 +26651,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”"
+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 "沒有設定可以用來取得套件包 URIs 的遠端"
 
-#: 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 <options> (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    [<name>] [<options>]"
 
-#: 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   [<name>] [<threads>]"
 
-#: 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 [<name>] [<threads>] [<max-wait>]"
 
-#: 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  [<name>] [<max-wait>]"
 
-#: 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         [<name>] [<token>]"
 
-#: 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    [<name>] [<bytecount>] [<byte>]"
 
-#: t/helper/test-simple-ipc.c
+#: t/helper/test-simple-ipc.c:588
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
@@ -26162,192 +26734,193 @@ msgstr ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
 
-#: 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) 字元"
 
-#: 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 不支援 push，需要引用規格"
 
-#: 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"
@@ -26356,107 +26929,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"
@@ -26483,43 +27056,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"
@@ -26528,7 +27101,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"
@@ -26537,7 +27110,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"
@@ -26546,7 +27119,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"
@@ -26555,7 +27128,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"
@@ -26564,7 +27137,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"
@@ -26573,7 +27146,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"
@@ -26582,7 +27155,7 @@ msgstr ""
 "更新如下目錄將會遺失其中未追蹤的檔案：\n"
 "%s"
 
-#: unpack-trees.c
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "Refusing to remove the current working directory:\n"
@@ -26591,7 +27164,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"
@@ -26600,7 +27173,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"
@@ -26609,7 +27182,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"
@@ -26618,7 +27191,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"
@@ -26627,7 +27200,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"
@@ -26636,7 +27209,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"
@@ -26645,7 +27218,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 "
@@ -26655,7 +27228,7 @@ msgstr ""
 "工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
 "%%s請在切換分支前移動或刪除。"
 
-#: unpack-trees.c
+#: unpack-trees.c:173
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -26665,7 +27238,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"
@@ -26674,7 +27247,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"
@@ -26683,7 +27256,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"
@@ -26692,7 +27265,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"
@@ -26701,12 +27274,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"
@@ -26715,7 +27288,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 "
@@ -26725,7 +27298,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"
@@ -26734,7 +27307,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 "
@@ -26744,23 +27317,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"
@@ -26769,361 +27342,361 @@ 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 "無法 setenv '%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 條紀錄"
 
-#: 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."
@@ -27131,7 +27704,7 @@ msgstr ""
 "不要改動或刪除上面的一行。\n"
 "其下所有內容都將被忽略。"
 
-#: wt-status.c
+#: wt-status.c:1208
 #, c-format
 msgid ""
 "\n"
@@ -27142,288 +27715,288 @@ 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> 條指令）："
 
-#: 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):"
 msgstr[0] "接下來要執行的命令（剩餘 %<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"
@@ -27432,227 +28005,227 @@ 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” 深入了解如何改善。"
+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"
@@ -27662,47 +28235,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"
@@ -27717,12 +28290,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"
@@ -27732,17 +28305,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"
@@ -27755,37 +28328,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"
@@ -27797,20 +28370,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"
@@ -27818,16 +28391,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"
@@ -27852,117 +28425,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” 讀到格式錯誤的輸出"
+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"
@@ -27973,12 +28546,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"
@@ -27987,17 +28560,45 @@ 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]： "
 
+#~ 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” 中的對應條目。"
+
+#~ msgid "git archive: Remote with no URL"
+#~ msgstr "git archive: 未提供遠端 URL"
+
+#~ msgid "only one action at a time"
+#~ msgstr "一次只能有一個動作"
+
+#~ msgid "use [RFC PATCH] instead of [PATCH]"
+#~ msgstr "使用 [RFC PATCH] 代替 [PATCH]"
+
+#, c-format
+#~ msgid "no URLs configured for remote '%s'"
+#~ msgstr "沒有給遠端版本庫 '%s' 設定 URL"
+
+#, c-format
+#~ msgid "unable to copy '%s' to '%s'"
+#~ msgstr "無法複製 '%s' 至 '%s'"
+
+#, c-format
+#~ msgid "remote '%s' has no configured URL"
+#~ msgstr "“%s” 遠端未設定 URL"
+
 #, c-format
 #~ msgid "truncating .rej filename to %.*s.rej"
 #~ msgstr "正在將 .rej 檔案名稱截短為 %.*s.rej"
@@ -28045,9 +28646,6 @@ msgstr "您真的要傳送 %s？[y|N]： "
 #~ msgid "core.commentChar should only be one ASCII character"
 #~ msgstr "core.commentChar 應該是一個 ASCII 字元"
 
-#~ msgid "-x and -X cannot be used together"
-#~ msgstr "-x 和 -X 不能同時使用"
-
 #~ msgid ""
 #~ "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-"
 #~ "exclude"