l10n: zh_TW.po: v2.28.0 round 1 (0 untranslated)

Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 38670cb654f06fe80fd57ca03fabfb870cf9c6e9..9334b46faa144d9ef816248ce40644bffb388f58 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -292,8 +292,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

-"POT-Creation-Date: 2020-05-27 07:23+0800\n"
-"PO-Revision-Date: 2020-05-30 00:36+0800\n"
+"POT-Creation-Date: 2020-07-10 09:53+0800\n"
+"PO-Revision-Date: 2020-07-20 18:34+0800\n"

 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"
 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"


@@ -395,21 +395,21 @@ msgstr[0] "增加了 %d 個路徑\n"
 msgid "ignoring unmerged: %s"
 msgstr "忽略未合併：%s"
 
 msgid "ignoring unmerged: %s"
 msgstr "忽略未合併：%s"
 

-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368

 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "只有二進位檔案被修改。\n"
 
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "只有二進位檔案被修改。\n"
 

-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370

 #, c-format
 msgid "No changes.\n"
 msgstr "沒有修改。\n"
 
 #, c-format
 msgid "No changes.\n"
 msgstr "沒有修改。\n"
 

-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:935 git-add--interactive.perl:1378

 msgid "Patch update"
 msgstr "修補檔更新"
 
 msgid "Patch update"
 msgstr "修補檔更新"
 

-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:974 git-add--interactive.perl:1771

 msgid "Review diff"
 msgstr "檢視 diff"
 
 msgid "Review diff"
 msgstr "檢視 diff"
 


@@ -477,11 +477,11 @@ msgstr "選擇編號過的項目"
 msgid "(empty) select nothing"
 msgstr "（空）全不選取"
 
 msgid "(empty) select nothing"
 msgstr "（空）全不選取"
 

-#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851
+#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868

 msgid "*** Commands ***"
 msgstr "*** 指令 ***"
 
 msgid "*** Commands ***"
 msgstr "*** 指令 ***"
 

-#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848
+#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865

 msgid "What now"
 msgstr "請選擇"
 
 msgid "What now"
 msgstr "請選擇"
 


@@ -498,7 +498,7 @@ msgstr "未快取"
 #: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
 #: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

-#: builtin/submodule--helper.c:2148 bugreport.c:129
+#: builtin/submodule--helper.c:2148 bugreport.c:135

 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "路徑"
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "路徑"


@@ -507,33 +507,38 @@ msgstr "路徑"
 msgid "could not refresh index"
 msgstr "無法重新整理索引"
 
 msgid "could not refresh index"
 msgstr "無法重新整理索引"
 

-#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765
+#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782

 #, c-format
 msgid "Bye.\n"
 msgstr "再見。\n"
 
 #, c-format
 msgid "Bye.\n"
 msgstr "再見。\n"
 

-#: add-patch.c:34 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1430

 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "暫存模式變更 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "暫存模式變更 [y,n,q,a,d%s,?]? "
 

-#: add-patch.c:35 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1431

 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "

-msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? "
+msgstr "暫存刪除變更 [y,n,q,a,d%s,?]? "

 
 

-#: add-patch.c:36 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1432
+#, c-format, perl-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr "暫存新增變更 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37 git-add--interactive.perl:1433

 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "
 

-#: add-patch.c:38
+#: add-patch.c:39

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "staging."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。"
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "staging."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。"
 

-#: add-patch.c:41
+#: add-patch.c:42

 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"


@@ -547,28 +552,33 @@ msgstr ""
 "a - 暫存此區塊和本檔案中後面的全部區塊\n"
 "d - 不暫存此區塊和本檔案中後面的全部區塊\n"
 
 "a - 暫存此區塊和本檔案中後面的全部區塊\n"
 "d - 不暫存此區塊和本檔案中後面的全部區塊\n"
 

-#: add-patch.c:55 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1436

 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? "
 

-#: add-patch.c:56 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1437

 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "

-msgstr "儲藏刪除動作 [y,n,q,a,d%s,?]? "
+msgstr "儲藏刪除變更 [y,n,q,a,d%s,?]? "

 
 

-#: add-patch.c:57 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Stash addition [y,n,q,a,d%s,?]? "
+msgstr "儲藏新增變更 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:59 git-add--interactive.perl:1439

 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? "
 

-#: add-patch.c:59
+#: add-patch.c:61

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "stashing."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。"
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "stashing."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。"
 

-#: add-patch.c:62
+#: add-patch.c:64

 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"


@@ -582,28 +592,33 @@ msgstr ""
 "a - 儲藏此區塊和本檔案中後面的全部區塊\n"
 "d - 不儲藏此區塊和本檔案中後面的全部區塊\n"
 
 "a - 儲藏此區塊和本檔案中後面的全部區塊\n"
 "d - 不儲藏此區塊和本檔案中後面的全部區塊\n"
 

-#: add-patch.c:78 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1442

 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? "
 

-#: add-patch.c:79 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1443

 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "

-msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? "
+msgstr "取消暫存刪除變更 [y,n,q,a,d%s,?]? "

 
 

-#: add-patch.c:80 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
+msgstr "取消暫存新增變更 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:83 git-add--interactive.perl:1445

 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "
 

-#: add-patch.c:82
+#: add-patch.c:85

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "unstaging."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。"
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "unstaging."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。"
 

-#: add-patch.c:85
+#: add-patch.c:88

 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"


@@ -617,28 +632,33 @@ msgstr ""
 "a - 不暫存此區塊和本檔案中後面的全部區塊\n"
 "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"
 
 "a - 不暫存此區塊和本檔案中後面的全部區塊\n"
 "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"
 

-#: add-patch.c:100 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1448

 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? "
 

-#: add-patch.c:101 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1449

 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "

-msgstr "將刪除動作套用到索引 [y,n,q,a,d%s,?]? "
+msgstr "將刪除變更套用到索引 [y,n,q,a,d%s,?]? "

 
 

-#: add-patch.c:102 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1450
+#, c-format, perl-format
+msgid "Apply addition to index [y,n,q,a,d%s,?]? "
+msgstr "套用新增變更至索引 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:106 git-add--interactive.perl:1451

 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "
 

-#: add-patch.c:104 add-patch.c:169 add-patch.c:212
+#: add-patch.c:108 add-patch.c:176 add-patch.c:221

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "applying."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。"
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "applying."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。"
 

-#: add-patch.c:107
+#: add-patch.c:111

 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"


@@ -652,31 +672,37 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
 
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
 

-#: add-patch.c:122 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1454
+#: git-add--interactive.perl:1472

 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
 

-#: add-patch.c:123 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473

 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

-msgstr "從工作區中捨棄刪除動作 [y,n,q,a,d%s,?]? "
+msgstr "從工作區中捨棄刪除變更 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:128 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
+#, c-format, perl-format
+msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
+msgstr "放棄工作目錄的新增變更 [y,n,q,a,d%s,?]? "

 
 

-#: add-patch.c:124 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:129 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475

 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
 

-#: add-patch.c:126 add-patch.c:148 add-patch.c:191
+#: add-patch.c:131 add-patch.c:154 add-patch.c:199

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "discarding."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。"
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "discarding."
 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。"
 

-#: add-patch.c:129 add-patch.c:194
+#: add-patch.c:134 add-patch.c:202

 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"


@@ -690,22 +716,27 @@ msgstr ""
 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
 
 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
 

-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460

 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-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:145 add-patch.c:188 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461

 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? "
 

-#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462
+#, c-format, perl-format
+msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "放棄索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463

 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-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:151
+#: add-patch.c:157

 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"


@@ -719,22 +750,27 @@ msgstr ""
 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
 
 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
 

-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466

 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-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:166 add-patch.c:209 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467

 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "

-msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? "
+msgstr "將刪除變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468
+#, c-format, perl-format
+msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "套用索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? "

 
 

-#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469

 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? "
 
 #, c-format, perl-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:172
+#: add-patch.c:179

 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"


@@ -748,7 +784,7 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
 
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
 

-#: add-patch.c:215
+#: add-patch.c:224

 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"


@@ -762,40 +798,40 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
 
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
 

-#: add-patch.c:319
+#: add-patch.c:328

 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "無法解析區塊標頭 '%.*s'"
 
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "無法解析區塊標頭 '%.*s'"
 

-#: add-patch.c:338 add-patch.c:342
+#: add-patch.c:347 add-patch.c:351

 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "無法解析上色過的區塊標頭 '%.*s'"
 
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "無法解析上色過的區塊標頭 '%.*s'"
 

-#: add-patch.c:396
+#: add-patch.c:405

 msgid "could not parse diff"
 msgstr "無法解析差異 (diff)"
 
 msgid "could not parse diff"
 msgstr "無法解析差異 (diff)"
 

-#: add-patch.c:415
+#: add-patch.c:424

 msgid "could not parse colored diff"
 msgstr "無法解析上色過的差異 (diff)"
 
 msgid "could not parse colored diff"
 msgstr "無法解析上色過的差異 (diff)"
 

-#: add-patch.c:429
+#: add-patch.c:438

 #, c-format
 msgid "failed to run '%s'"
 msgstr "無法執行 '%s'"
 
 #, c-format
 msgid "failed to run '%s'"
 msgstr "無法執行 '%s'"
 

-#: add-patch.c:588
+#: add-patch.c:602

 msgid "mismatched output from interactive.diffFilter"
 msgstr "interactive.diffFilter 的輸出不符"
 
 msgid "mismatched output from interactive.diffFilter"
 msgstr "interactive.diffFilter 的輸出不符"
 

-#: add-patch.c:589
+#: add-patch.c:603

 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
 msgstr "您的過濾器必須在其輸入及輸出行維持一對一的對應關係。"
 
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
 msgstr "您的過濾器必須在其輸入及輸出行維持一對一的對應關係。"
 

-#: add-patch.c:762
+#: add-patch.c:776

 #, c-format
 msgid ""
 "expected context line #%d in\n"
 #, c-format
 msgid ""
 "expected context line #%d in\n"


@@ -804,7 +840,7 @@ msgstr ""
 "應有上下文行 #%d 於\n"
 "%.*s"
 
 "應有上下文行 #%d 於\n"
 "%.*s"
 

-#: add-patch.c:777
+#: add-patch.c:791

 #, c-format
 msgid ""
 "hunks do not overlap:\n"
 #, c-format
 msgid ""
 "hunks do not overlap:\n"


@@ -817,11 +853,11 @@ msgstr ""
 "\t不以下述結尾：\n"
 "%.*s"
 
 "\t不以下述結尾：\n"
 "%.*s"
 

-#: add-patch.c:1053 git-add--interactive.perl:1112
+#: add-patch.c:1067 git-add--interactive.perl:1114

 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"
 
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"
 

-#: add-patch.c:1057
+#: add-patch.c:1071

 #, c-format
 msgid ""
 "---\n"
 #, c-format
 msgid ""
 "---\n"


@@ -835,7 +871,7 @@ msgstr ""
 "以 %c 開始的行將被刪除。\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
 "以 %c 開始的行將被刪除。\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

-#: add-patch.c:1071 git-add--interactive.perl:1126
+#: add-patch.c:1085 git-add--interactive.perl:1128

 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"
 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"


@@ -844,11 +880,11 @@ msgstr ""
 "如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n"
 "此次編輯被終止，此區塊不會被修改。\n"
 
 "如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n"
 "此次編輯被終止，此區塊不會被修改。\n"
 

-#: add-patch.c:1104
+#: add-patch.c:1118

 msgid "could not parse hunk header"
 msgstr "無法解析區塊標頭"
 
 msgid "could not parse hunk header"
 msgstr "無法解析區塊標頭"
 

-#: add-patch.c:1149
+#: add-patch.c:1163

 msgid "'git apply --cached' failed"
 msgstr "「git apply --cached」失敗"
 
 msgid "'git apply --cached' failed"
 msgstr "「git apply --cached」失敗"
 


@@ -864,24 +900,24 @@ msgstr "「git apply --cached」失敗"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.

-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1232 git-add--interactive.perl:1241

 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? "
 
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? "
 

-#: add-patch.c:1261
+#: add-patch.c:1275

 msgid "The selected hunks do not apply to the index!"
 msgstr "選取的區塊不會套用進索引！"
 
 msgid "The selected hunks do not apply to the index!"
 msgstr "選取的區塊不會套用進索引！"
 

-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1276 git-add--interactive.perl:1345

 msgid "Apply them to the worktree anyway? "
 msgstr "無論如何都要套用到工作區嗎？"
 
 msgid "Apply them to the worktree anyway? "
 msgstr "無論如何都要套用到工作區嗎？"
 

-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1283 git-add--interactive.perl:1348

 msgid "Nothing was applied.\n"
 msgstr "未套用。\n"
 
 msgid "Nothing was applied.\n"
 msgstr "未套用。\n"
 

-#: add-patch.c:1326
+#: add-patch.c:1340

 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"


@@ -903,68 +939,68 @@ msgstr ""
 "e - 手動編輯目前區塊\n"
 "? - 顯示說明\n"
 
 "e - 手動編輯目前區塊\n"
 "? - 顯示說明\n"
 

-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1463 add-patch.c:1473

 msgid "No previous hunk"
 msgstr "沒有上一個區塊"
 
 msgid "No previous hunk"
 msgstr "沒有上一個區塊"
 

-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1468 add-patch.c:1478

 msgid "No next hunk"
 msgstr "沒有下一個區塊"
 
 msgid "No next hunk"
 msgstr "沒有下一個區塊"
 

-#: add-patch.c:1468
+#: add-patch.c:1484

 msgid "No other hunks to goto"
 msgstr "沒有其它可供跳轉的區塊"
 
 msgid "No other hunks to goto"
 msgstr "沒有其它可供跳轉的區塊"
 

-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1495 git-add--interactive.perl:1594

 msgid "go to which hunk (<ret> to see more)? "
 msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ "
 
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ "
 

-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1496 git-add--interactive.perl:1596

 msgid "go to which hunk? "
 msgstr "跳轉到哪個區塊？"
 
 msgid "go to which hunk? "
 msgstr "跳轉到哪個區塊？"
 

-#: add-patch.c:1491
+#: add-patch.c:1507

 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "無效數字：'%s'"
 
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "無效數字：'%s'"
 

-#: add-patch.c:1496
+#: add-patch.c:1512

 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "對不起，只有 %d 個可用區塊。"
 
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "對不起，只有 %d 個可用區塊。"
 

-#: add-patch.c:1505
+#: add-patch.c:1521

 msgid "No other hunks to search"
 msgstr "沒有其它可供尋找的區塊"
 
 msgid "No other hunks to search"
 msgstr "沒有其它可供尋找的區塊"
 

-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1527 git-add--interactive.perl:1640

 msgid "search for regex? "
 msgstr "使用正規表示式搜尋？"
 
 msgid "search for regex? "
 msgstr "使用正規表示式搜尋？"
 

-#: add-patch.c:1526
+#: add-patch.c:1542

 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "錯誤的正規表示式 %s：%s"
 
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "錯誤的正規表示式 %s：%s"
 

-#: add-patch.c:1543
+#: add-patch.c:1559

 msgid "No hunk matches the given pattern"
 msgstr "沒有和提供模式相符合的區塊"
 
 msgid "No hunk matches the given pattern"
 msgstr "沒有和提供模式相符合的區塊"
 

-#: add-patch.c:1550
+#: add-patch.c:1566

 msgid "Sorry, cannot split this hunk"
 msgstr "對不起，不能分割這個區塊"
 
 msgid "Sorry, cannot split this hunk"
 msgstr "對不起，不能分割這個區塊"
 

-#: add-patch.c:1554
+#: add-patch.c:1570

 #, c-format
 msgid "Split into %d hunks."
 msgstr "分割為 %d 塊。"
 
 #, c-format
 msgid "Split into %d hunks."
 msgstr "分割為 %d 塊。"
 

-#: add-patch.c:1558
+#: add-patch.c:1574

 msgid "Sorry, cannot edit this hunk"
 msgstr "對不起，不能編輯這個區塊"
 
 msgid "Sorry, cannot edit this hunk"
 msgstr "對不起，不能編輯這個區塊"
 

-#: add-patch.c:1609
+#: add-patch.c:1625

 msgid "'git apply' failed"
 msgstr "'git apply' 失敗"
 
 msgid "'git apply' failed"
 msgstr "'git apply' 失敗"
 


@@ -1631,7 +1667,7 @@ msgstr "確保至少符合 <n> 行上下文"
 
 #: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
 
 #: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

-#: builtin/pack-objects.c:3458 builtin/rebase.c:1332
+#: builtin/pack-objects.c:3530 builtin/rebase.c:1332

 msgid "action"
 msgstr "動作"
 
 msgid "action"
 msgstr "動作"
 


@@ -1720,7 +1756,7 @@ msgstr "路徑不是有效的 UTF-8：%s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
 
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
 

-#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
+#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246

 #, c-format
 msgid "deflate error (%d)"
 msgstr "壓縮錯誤 (%d)"
 #, c-format
 msgid "deflate error (%d)"
 msgstr "壓縮錯誤 (%d)"


@@ -1789,8 +1825,8 @@ msgid "prepend prefix to each pathname in the archive"
 msgstr "為歸檔中每個路徑名加上前綴"
 
 #: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
 msgstr "為歸檔中每個路徑名加上前綴"
 
 #: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208
+#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907

 #: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
 #: parse-options.h:190
 #: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
 #: parse-options.h:190


@@ -2012,10 +2048,10 @@ msgstr "不能將 --contents 和最終的提交物件名共用"
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
 
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
 

-#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
+#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018

 #: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
 #: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
 #: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
 #: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235

-#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
+#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363

 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "版本遍歷設定失敗"
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "版本遍歷設定失敗"


@@ -2168,82 +2204,86 @@ msgstr "'%s' 已經檢出到 '%s'"
 msgid "HEAD of working tree %s is not updated"
 msgstr "工作區 %s 的 HEAD 指向沒有被更新"
 
 msgid "HEAD of working tree %s is not updated"
 msgstr "工作區 %s 的 HEAD 指向沒有被更新"
 

-#: bundle.c:36
+#: bundle.c:47

 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
 msgstr "'%s' 不像是一個 v2 版本的包檔案"
 
 #, c-format
 msgid "'%s' does not look like a v2 bundle file"
 msgstr "'%s' 不像是一個 v2 版本的包檔案"
 

-#: bundle.c:64
+#: bundle.c:69
+msgid "unknown hash algorithm length"
+msgstr "未知的雜湊算法長度"
+
+#: bundle.c:84

 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "無法識別的包頭：%s%s (%d)"
 
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "無法識別的包頭：%s%s (%d)"
 

-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
+#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

 #: builtin/commit.c:814
 #, c-format
 msgid "could not open '%s'"
 msgstr "不能開啟 '%s'"
 
 #: builtin/commit.c:814
 #, c-format
 msgid "could not open '%s'"
 msgstr "不能開啟 '%s'"
 

-#: bundle.c:143
+#: bundle.c:163

 msgid "Repository lacks these prerequisite commits:"
 msgstr "版本庫中缺少這些必備的提交："
 
 msgid "Repository lacks these prerequisite commits:"
 msgstr "版本庫中缺少這些必備的提交："
 

-#: bundle.c:146
+#: bundle.c:166

 msgid "need a repository to verify a bundle"
 msgstr "需要版本庫驗證一個包"
 
 msgid "need a repository to verify a bundle"
 msgstr "需要版本庫驗證一個包"
 

-#: bundle.c:197
+#: bundle.c:217

 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "這個包中含有這 %d 個引用："
 
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "這個包中含有這 %d 個引用："
 

-#: bundle.c:204
+#: bundle.c:224

 msgid "The bundle records a complete history."
 msgstr "這個包記錄一個完整歷史。"
 
 msgid "The bundle records a complete history."
 msgstr "這個包記錄一個完整歷史。"
 

-#: bundle.c:206
+#: bundle.c:226

 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "這個包需要這 %d 個引用："
 
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "這個包需要這 %d 個引用："
 

-#: bundle.c:273
+#: bundle.c:293

 msgid "unable to dup bundle descriptor"
 msgstr "無法複製 bundle 描述符"
 
 msgid "unable to dup bundle descriptor"
 msgstr "無法複製 bundle 描述符"
 

-#: bundle.c:280
+#: bundle.c:300

 msgid "Could not spawn pack-objects"
 msgstr "不能生成 pack-objects 進程"
 
 msgid "Could not spawn pack-objects"
 msgstr "不能生成 pack-objects 進程"
 

-#: bundle.c:291
+#: bundle.c:311

 msgid "pack-objects died"
 msgstr "pack-objects 終止"
 
 msgid "pack-objects died"
 msgstr "pack-objects 終止"
 

-#: bundle.c:333
+#: bundle.c:353

 msgid "rev-list died"
 msgstr "rev-list 終止"
 
 msgid "rev-list died"
 msgstr "rev-list 終止"
 

-#: bundle.c:382
+#: bundle.c:402

 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "引用 '%s' 被 rev-list 選項排除"
 
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "引用 '%s' 被 rev-list 選項排除"
 

-#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
+#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "無法識別的參數：%s"
 
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "無法識別的參數：%s"
 

-#: bundle.c:469
+#: bundle.c:489

 msgid "Refusing to create empty bundle."
 msgstr "不能建立空包。"
 
 msgid "Refusing to create empty bundle."
 msgstr "不能建立空包。"
 

-#: bundle.c:479
+#: bundle.c:499

 #, c-format
 msgid "cannot create '%s'"
 msgstr "不能建立 '%s'"
 
 #, c-format
 msgid "cannot create '%s'"
 msgstr "不能建立 '%s'"
 

-#: bundle.c:504
+#: bundle.c:524

 msgid "index-pack died"
 msgstr "index-pack 終止"
 
 msgid "index-pack died"
 msgstr "index-pack 終止"
 


@@ -2252,266 +2292,259 @@ msgstr "index-pack 終止"
 msgid "invalid color value: %.*s"
 msgstr "無效的顏色值：%.*s"
 
 msgid "invalid color value: %.*s"
 msgstr "無效的顏色值：%.*s"
 

-#: commit-graph.c:183
+#: commit-graph.c:238

 msgid "commit-graph file is too small"
 msgstr "提交圖形檔案太小"
 
 msgid "commit-graph file is too small"
 msgstr "提交圖形檔案太小"
 

-#: commit-graph.c:248
+#: commit-graph.c:303

 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "提交圖形簽名 %X 和簽名 %X 不符合"
 
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "提交圖形簽名 %X 和簽名 %X 不符合"
 

-#: commit-graph.c:255
+#: commit-graph.c:310

 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "提交圖形版本 %X 和版本 %X 不符合"
 
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "提交圖形版本 %X 和版本 %X 不符合"
 

-#: commit-graph.c:262
+#: commit-graph.c:317

 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"
 
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"
 

-#: commit-graph.c:284
+#: commit-graph.c:339

 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
 msgstr "提交圖形區塊尋找表條目遺失，檔案可能不完整"
 
 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
 msgstr "提交圖形區塊尋找表條目遺失，檔案可能不完整"
 

-#: commit-graph.c:294
+#: commit-graph.c:349

 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr "提交圖形不正確的區塊位移 %08x%08x"
 
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr "提交圖形不正確的區塊位移 %08x%08x"
 

-#: commit-graph.c:362
+#: commit-graph.c:417

 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr "提交圖形區塊 id %08x 出現了多次"
 
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr "提交圖形區塊 id %08x 出現了多次"
 

-#: commit-graph.c:436
+#: commit-graph.c:491

 msgid "commit-graph has no base graphs chunk"
 msgstr "提交圖形沒有基礎圖形區塊"
 
 msgid "commit-graph has no base graphs chunk"
 msgstr "提交圖形沒有基礎圖形區塊"
 

-#: commit-graph.c:446
+#: commit-graph.c:501

 msgid "commit-graph chain does not match"
 msgstr "提交圖形鏈不符合"
 
 msgid "commit-graph chain does not match"
 msgstr "提交圖形鏈不符合"
 

-#: commit-graph.c:494
+#: commit-graph.c:549

 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"
 
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"
 

-#: commit-graph.c:518
+#: commit-graph.c:573

 msgid "unable to find all commit-graph files"
 msgstr "無法找到所有提交圖形檔案"
 
 msgid "unable to find all commit-graph files"
 msgstr "無法找到所有提交圖形檔案"
 

-#: commit-graph.c:651 commit-graph.c:711
+#: commit-graph.c:706 commit-graph.c:770

 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "無效的提交位置。提交圖形可能已損壞"
 
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "無效的提交位置。提交圖形可能已損壞"
 

-#: commit-graph.c:672
+#: commit-graph.c:727

 #, c-format
 msgid "could not find commit %s"
 msgstr "無法找到提交 %s"
 
 #, c-format
 msgid "could not find commit %s"
 msgstr "無法找到提交 %s"
 

-#: commit-graph.c:948 builtin/am.c:1292
+#: commit-graph.c:1009 builtin/am.c:1292

 #, c-format
 msgid "unable to parse commit %s"
 msgstr "不能解析提交 %s"
 
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "不能解析提交 %s"
 

-#: commit-graph.c:1096
+#: commit-graph.c:1157

 msgid "Writing changed paths Bloom filters index"
 msgstr "正在寫入變更路徑的布隆過濾器索引"
 
 msgid "Writing changed paths Bloom filters index"
 msgstr "正在寫入變更路徑的布隆過濾器索引"
 

-#: commit-graph.c:1121
+#: commit-graph.c:1182

 msgid "Writing changed paths Bloom filters data"
 msgstr "正在寫入變更路徑的布隆過濾器索引"
 
 msgid "Writing changed paths Bloom filters data"
 msgstr "正在寫入變更路徑的布隆過濾器索引"
 

-#: commit-graph.c:1160 builtin/pack-objects.c:2783
+#: commit-graph.c:1221 builtin/pack-objects.c:2832

 #, c-format
 msgid "unable to get type of object %s"
 msgstr "無法獲得物件 %s 類型"
 
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "無法獲得物件 %s 類型"
 

-#: commit-graph.c:1196
+#: commit-graph.c:1257

 msgid "Loading known commits in commit graph"
 msgstr "正在載入提交圖中的已知提交"
 
 msgid "Loading known commits in commit graph"
 msgstr "正在載入提交圖中的已知提交"
 

-#: commit-graph.c:1213
+#: commit-graph.c:1274

 msgid "Expanding reachable commits in commit graph"
 msgstr "正在擴展提交圖中的可以取得提交"
 
 msgid "Expanding reachable commits in commit graph"
 msgstr "正在擴展提交圖中的可以取得提交"
 

-#: commit-graph.c:1233
+#: commit-graph.c:1294

 msgid "Clearing commit marks in commit graph"
 msgstr "正在清除提交圖中的提交標記"
 
 msgid "Clearing commit marks in commit graph"
 msgstr "正在清除提交圖中的提交標記"
 

-#: commit-graph.c:1252
+#: commit-graph.c:1313

 msgid "Computing commit graph generation numbers"
 msgstr "正在計算提交圖世代數字"
 
 msgid "Computing commit graph generation numbers"
 msgstr "正在計算提交圖世代數字"
 

-#: commit-graph.c:1300
+#: commit-graph.c:1367

 msgid "Computing commit changed paths Bloom filters"
 msgstr "正在計算提交變更路徑的布隆過濾器"
 
 msgid "Computing commit changed paths Bloom filters"
 msgstr "正在計算提交變更路徑的布隆過濾器"
 

-#: commit-graph.c:1359
+#: commit-graph.c:1423
+msgid "Collecting referenced commits"
+msgstr "正在收集引用提交"
+
+#: commit-graph.c:1447

 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "正在 %d 個包中尋找提交圖的提交"
 
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "正在 %d 個包中尋找提交圖的提交"
 

-#: commit-graph.c:1372
+#: commit-graph.c:1460

 #, c-format
 msgid "error adding pack %s"
 msgstr "新增包 %s 發生錯誤"
 
 #, c-format
 msgid "error adding pack %s"
 msgstr "新增包 %s 發生錯誤"
 

-#: commit-graph.c:1376
+#: commit-graph.c:1464

 #, c-format
 msgid "error opening index for %s"
 msgstr "為 %s 開啟索引發生錯誤"
 
 #, c-format
 msgid "error opening index for %s"
 msgstr "為 %s 開啟索引發生錯誤"
 

-#: commit-graph.c:1405
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "正在從 %d 個引用中尋找提交圖的提交"
-
-#: commit-graph.c:1426
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "無效的提交物件 ID：%s"
-
-#: commit-graph.c:1442
+#: commit-graph.c:1503

 msgid "Finding commits for commit graph among packed objects"
 msgstr "正在打包物件中尋找提交圖的提交"
 
 msgid "Finding commits for commit graph among packed objects"
 msgstr "正在打包物件中尋找提交圖的提交"
 

-#: commit-graph.c:1457
+#: commit-graph.c:1518

 msgid "Counting distinct commits in commit graph"
 msgstr "正在計算提交圖中不同的提交"
 
 msgid "Counting distinct commits in commit graph"
 msgstr "正在計算提交圖中不同的提交"
 

-#: commit-graph.c:1489
+#: commit-graph.c:1550

 msgid "Finding extra edges in commit graph"
 msgstr "正在尋找提交圖中額外的邊"
 
 msgid "Finding extra edges in commit graph"
 msgstr "正在尋找提交圖中額外的邊"
 

-#: commit-graph.c:1538
+#: commit-graph.c:1599

 msgid "failed to write correct number of base graph ids"
 msgstr "無法寫入正確數量的基礎圖形 ID"
 
 msgid "failed to write correct number of base graph ids"
 msgstr "無法寫入正確數量的基礎圖形 ID"
 

-#: commit-graph.c:1572 midx.c:812
+#: commit-graph.c:1633 midx.c:812

 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "不能為 %s 建立先導目錄"
 
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "不能為 %s 建立先導目錄"
 

-#: commit-graph.c:1585
+#: commit-graph.c:1646

 msgid "unable to create temporary graph layer"
 msgstr "無法建立暫時的圖形層"
 
 msgid "unable to create temporary graph layer"
 msgstr "無法建立暫時的圖形層"
 

-#: commit-graph.c:1590
+#: commit-graph.c:1651

 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "無法調整「%s」的共用權限"
 
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "無法調整「%s」的共用權限"
 

-#: commit-graph.c:1667
+#: commit-graph.c:1728

 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "正在用 %d 步寫出提交圖"
 
 #, 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:1712
+#: commit-graph.c:1773

 msgid "unable to open commit-graph chain file"
 msgstr "無法開啟提交圖形鏈檔案"
 
 msgid "unable to open commit-graph chain file"
 msgstr "無法開啟提交圖形鏈檔案"
 

-#: commit-graph.c:1728
+#: commit-graph.c:1789

 msgid "failed to rename base commit-graph file"
 msgstr "無法重新命名基礎提交圖形檔案"
 
 msgid "failed to rename base commit-graph file"
 msgstr "無法重新命名基礎提交圖形檔案"
 

-#: commit-graph.c:1748
+#: commit-graph.c:1809

 msgid "failed to rename temporary commit-graph file"
 msgstr "無法重新命名暫時提交圖形檔案"
 
 msgid "failed to rename temporary commit-graph file"
 msgstr "無法重新命名暫時提交圖形檔案"
 

-#: commit-graph.c:1874
+#: commit-graph.c:1935

 msgid "Scanning merged commits"
 msgstr "正在掃描合併提交"
 
 msgid "Scanning merged commits"
 msgstr "正在掃描合併提交"
 

-#: commit-graph.c:1885
+#: commit-graph.c:1946

 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr "意外的重複提交 ID %s"
 
 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr "意外的重複提交 ID %s"
 

-#: commit-graph.c:1908
+#: commit-graph.c:1969

 msgid "Merging commit-graph"
 msgstr "正在合併提交圖形"
 
 msgid "Merging commit-graph"
 msgstr "正在合併提交圖形"
 

-#: commit-graph.c:2096
+#: commit-graph.c:2156

 #, c-format
 msgid "the commit graph format cannot write %d commits"
 msgstr "提交圖格式不能寫入 %d 個提交"
 
 #, c-format
 msgid "the commit graph format cannot write %d commits"
 msgstr "提交圖格式不能寫入 %d 個提交"
 

-#: commit-graph.c:2107
+#: commit-graph.c:2167

 msgid "too many commits to write graph"
 msgstr "提交太多不能畫圖"
 
 msgid "too many commits to write graph"
 msgstr "提交太多不能畫圖"
 

-#: commit-graph.c:2200
+#: commit-graph.c:2260

 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"
 
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"
 

-#: commit-graph.c:2210
+#: commit-graph.c:2270

 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"
 
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"
 

-#: commit-graph.c:2220 commit-graph.c:2235
+#: commit-graph.c:2280 commit-graph.c:2295

 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
 
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
 

-#: commit-graph.c:2227
+#: commit-graph.c:2287

 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "無法從提交圖形中解析提交 %s"
 
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "無法從提交圖形中解析提交 %s"
 

-#: commit-graph.c:2245
+#: commit-graph.c:2305

 msgid "Verifying commits in commit graph"
 msgstr "正在驗證提交圖中的提交"
 
 msgid "Verifying commits in commit graph"
 msgstr "正在驗證提交圖中的提交"
 

-#: commit-graph.c:2259
+#: commit-graph.c:2320

 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr "無法從提交圖形的物件庫中解析提交 %s"
 
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr "無法從提交圖形的物件庫中解析提交 %s"
 

-#: commit-graph.c:2266
+#: commit-graph.c:2327

 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
 
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
 

-#: commit-graph.c:2276
+#: commit-graph.c:2337

 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "提交 %s 的提交圖形父提交列表太長了"
 
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "提交 %s 的提交圖形父提交列表太長了"
 

-#: commit-graph.c:2285
+#: commit-graph.c:2346

 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "%s 的提交圖形父提交是 %s != %s"
 
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "%s 的提交圖形父提交是 %s != %s"
 

-#: commit-graph.c:2298
+#: commit-graph.c:2360

 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "提交 %s 的提交圖形父提交列表過早終止"
 
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "提交 %s 的提交圖形父提交列表過早終止"
 

-#: commit-graph.c:2303
+#: commit-graph.c:2365

 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"
 
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"
 

-#: commit-graph.c:2307
+#: commit-graph.c:2369

 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"
 
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"
 

-#: commit-graph.c:2322
+#: commit-graph.c:2385

 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr "提交圖形中的提交 %s 的世代號是 %u != %u"
 
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr "提交圖形中的提交 %s 的世代號是 %u != %u"
 

-#: commit-graph.c:2328
+#: commit-graph.c:2391

 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"


@@ -2547,27 +2580,27 @@ msgstr ""
 "設定 \"git config advice.graftFileDeprecated false\"\n"
 "可關閉本消息"
 
 "設定 \"git config advice.graftFileDeprecated false\"\n"
 "可關閉本消息"
 

-#: commit.c:1168
+#: commit.c:1172

 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
 
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
 

-#: commit.c:1172
+#: commit.c:1176

 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
 
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
 

-#: commit.c:1175
+#: commit.c:1179

 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "提交 %s 沒有 GPG 簽名。"
 
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "提交 %s 沒有 GPG 簽名。"
 

-#: commit.c:1178
+#: commit.c:1182

 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
 
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
 

-#: commit.c:1432
+#: commit.c:1436

 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"
 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"


@@ -2755,7 +2788,7 @@ msgstr "%s 的取值格式錯誤：%s"
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
 
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
 

-#: config.c:1533 builtin/pack-objects.c:3542
+#: config.c:1533 builtin/pack-objects.c:3617

 #, c-format
 msgid "bad pack compression level %d"
 msgstr "錯誤的打包壓縮級別 %d"
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "錯誤的打包壓縮級別 %d"


@@ -2903,72 +2936,81 @@ msgstr ""
 msgid "server doesn't support '%s'"
 msgstr "伺服器不支援 '%s'"
 
 msgid "server doesn't support '%s'"
 msgstr "伺服器不支援 '%s'"
 

-#: connect.c:103
+#: connect.c:118

 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr "伺服器不支援特性 '%s'"
 
 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr "伺服器不支援特性 '%s'"
 

-#: connect.c:114
+#: connect.c:129

 msgid "expected flush after capabilities"
 msgstr "在能力之後應為一個 flush 包"
 
 msgid "expected flush after capabilities"
 msgstr "在能力之後應為一個 flush 包"
 

-#: connect.c:233
+#: connect.c:263

 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "忽略第一行 '%s' 之後的能力欄位"
 
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "忽略第一行 '%s' 之後的能力欄位"
 

-#: connect.c:252
+#: connect.c:284

 msgid "protocol error: unexpected capabilities^{}"
 msgstr "協定錯誤：意外的 capabilities^{}"
 
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "協定錯誤：意外的 capabilities^{}"
 

-#: connect.c:273
+#: connect.c:306

 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'"
 
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'"
 

-#: connect.c:275
+#: connect.c:308

 msgid "repository on the other end cannot be shallow"
 msgstr "另一端的版本庫不能是淺複製版本庫"
 
 msgid "repository on the other end cannot be shallow"
 msgstr "另一端的版本庫不能是淺複製版本庫"
 

-#: connect.c:313
+#: connect.c:347

 msgid "invalid packet"
 msgstr "無效封包"
 
 msgid "invalid packet"
 msgstr "無效封包"
 

-#: connect.c:333
+#: connect.c:367

 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "協定錯誤：意外的 '%s'"
 
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "協定錯誤：意外的 '%s'"
 

-#: connect.c:441
+#: connect.c:473
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "伺服器指定的「%s」物件格式無效"
+
+#: connect.c:500

 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "無效的 ls-refs 回應：%s"
 
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "無效的 ls-refs 回應：%s"
 

-#: connect.c:445
+#: connect.c:504

 msgid "expected flush after ref listing"
 msgstr "在引用列表之後應該有一個 flush 包"
 
 msgid "expected flush after ref listing"
 msgstr "在引用列表之後應該有一個 flush 包"
 

-#: connect.c:544
+#: connect.c:507
+msgid "expected response end packet after ref listing"
+msgstr "在引用列表後預期要有回應結束封包"
+
+#: connect.c:640

 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "不支援 '%s' 協定"
 
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "不支援 '%s' 協定"
 

-#: connect.c:595
+#: connect.c:691

 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "無法為 socket 設定 SO_KEEPALIVE"
 
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "無法為 socket 設定 SO_KEEPALIVE"
 

-#: connect.c:635 connect.c:698
+#: connect.c:731 connect.c:794

 #, c-format
 msgid "Looking up %s ... "
 msgstr "尋找 %s ... "
 
 #, c-format
 msgid "Looking up %s ... "
 msgstr "尋找 %s ... "
 

-#: connect.c:639
+#: connect.c:735

 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "無法尋找 %s（埠 %s）（%s）"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
 #, 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:643 connect.c:714
+#: connect.c:739 connect.c:810

 #, c-format
 msgid ""
 "done.\n"
 #, c-format
 msgid ""
 "done.\n"


@@ -2977,7 +3019,7 @@ msgstr ""
 "完成。\n"
 "連線到 %s（埠 %s）... "
 
 "完成。\n"
 "連線到 %s（埠 %s）... "
 

-#: connect.c:665 connect.c:742
+#: connect.c:761 connect.c:838

 #, c-format
 msgid ""
 "unable to connect to %s:\n"
 #, c-format
 msgid ""
 "unable to connect to %s:\n"


@@ -2987,73 +3029,73 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

-#: connect.c:671 connect.c:748
+#: connect.c:767 connect.c:844

 msgid "done."
 msgstr "完成。"
 
 msgid "done."
 msgstr "完成。"
 

-#: connect.c:702
+#: connect.c:798

 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "無法尋找 %s（%s）"
 
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "無法尋找 %s（%s）"
 

-#: connect.c:708
+#: connect.c:804

 #, c-format
 msgid "unknown port %s"
 msgstr "未知埠 %s"
 
 #, c-format
 msgid "unknown port %s"
 msgstr "未知埠 %s"
 

-#: connect.c:845 connect.c:1175
+#: connect.c:941 connect.c:1271

 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "已阻止奇怪的主機名稱 '%s'"
 
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "已阻止奇怪的主機名稱 '%s'"
 

-#: connect.c:847
+#: connect.c:943

 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "已阻止奇怪的埠號 '%s'"
 
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "已阻止奇怪的埠號 '%s'"
 

-#: connect.c:857
+#: connect.c:953

 #, c-format
 msgid "cannot start proxy %s"
 msgstr "不能啟動代理 %s"
 
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "不能啟動代理 %s"
 

-#: connect.c:928
+#: connect.c:1024

 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"
 
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"
 

-#: connect.c:1123
+#: connect.c:1219

 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh 變體 'simple' 不支援 -4"
 
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh 變體 'simple' 不支援 -4"
 

-#: connect.c:1135
+#: connect.c:1231

 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh 變體 'simple' 不支援 -6"
 
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh 變體 'simple' 不支援 -6"
 

-#: connect.c:1152
+#: connect.c:1248

 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh 變體 'simple' 不支援設定埠"
 
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh 變體 'simple' 不支援設定埠"
 

-#: connect.c:1264
+#: connect.c:1360

 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "已阻止奇怪的路徑名 '%s'"
 
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "已阻止奇怪的路徑名 '%s'"
 

-#: connect.c:1311
+#: connect.c:1407

 msgid "unable to fork"
 msgstr "無法 fork"
 
 msgid "unable to fork"
 msgstr "無法 fork"
 

-#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45

 msgid "Checking connectivity"
 msgstr "正在檢查連通性"
 
 msgid "Checking connectivity"
 msgstr "正在檢查連通性"
 

-#: connected.c:119
+#: connected.c:121

 msgid "Could not run 'git rev-list'"
 msgstr "不能執行 'git rev-list'"
 
 msgid "Could not run 'git rev-list'"
 msgstr "不能執行 'git rev-list'"
 

-#: connected.c:139
+#: connected.c:141

 msgid "failed write to rev-list"
 msgstr "寫入 rev-list 失敗"
 
 msgid "failed write to rev-list"
 msgstr "寫入 rev-list 失敗"
 

-#: connected.c:146
+#: connected.c:148

 msgid "failed to close rev-list's stdin"
 msgstr "關閉 rev-list 的標準輸入失敗"
 
 msgid "failed to close rev-list's stdin"
 msgstr "關閉 rev-list 的標準輸入失敗"
 


@@ -3302,18 +3344,18 @@ msgid ""
 msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"
 
 #  譯者：請維持前導空格
 msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"
 
 #  譯者：請維持前導空格

-#: diff.c:155
+#: diff.c:156

 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  無法解析 dirstat 截止（cut-off）百分比 '%s'\n"
 
 #  譯者：請維持前導空格
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  無法解析 dirstat 截止（cut-off）百分比 '%s'\n"
 
 #  譯者：請維持前導空格

-#: diff.c:160
+#: diff.c:161

 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  未知的 dirstat 參數 '%s'\n"
 
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  未知的 dirstat 參數 '%s'\n"
 

-#: diff.c:296
+#: diff.c:297

 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"


@@ -3321,7 +3363,7 @@ msgstr ""
 "移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
 "'plain'"
 
 "移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
 "'plain'"
 

-#: diff.c:324
+#: diff.c:325

 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "


@@ -3330,18 +3372,18 @@ msgstr ""
 "未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
 "space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
 
 "未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
 "space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
 

-#: diff.c:332
+#: diff.c:333

 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
 msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用"
 
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
 msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用"
 

-#: diff.c:405
+#: diff.c:410

 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"
 
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"
 

-#: diff.c:465
+#: diff.c:470

 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"


@@ -3350,35 +3392,35 @@ msgstr ""
 "發現設定變數 'diff.dirstat' 中的錯誤：\n"
 "%s"
 
 "發現設定變數 'diff.dirstat' 中的錯誤：\n"
 "%s"
 

-#: diff.c:4238
+#: diff.c:4243

 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 離開，停止在 %s"
 
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 離開，停止在 %s"
 

-#: diff.c:4583
+#: diff.c:4589

 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
 
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
 

-#: diff.c:4586
+#: diff.c:4592

 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G、-S 和 --find-object 是互斥的"
 
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G、-S 和 --find-object 是互斥的"
 

-#: diff.c:4664
+#: diff.c:4670

 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 明確要求只跟一個路徑規格"
 
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 明確要求只跟一個路徑規格"
 

-#: diff.c:4712
+#: diff.c:4718

 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "無效的 --stat 值：%s"
 
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "無效的 --stat 值：%s"
 

-#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
+#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250

 #: parse-options.c:197 parse-options.c:201
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s 期望一個數字值"
 
 #: parse-options.c:197 parse-options.c:201
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s 期望一個數字值"
 

-#: diff.c:4749
+#: diff.c:4755

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


@@ -3387,195 +3429,195 @@ msgstr ""
 "無法解析 --dirstat/-X 選項的參數：\n"
 "%s"
 
 "無法解析 --dirstat/-X 選項的參數：\n"
 "%s"
 

-#: diff.c:4834
+#: diff.c:4840

 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
 
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
 

-#: diff.c:4858
+#: diff.c:4864

 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "ws-error-highlight=%.*s 之後未知的值"
 
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "ws-error-highlight=%.*s 之後未知的值"
 

-#: diff.c:4872
+#: diff.c:4878

 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "不能解析 '%s'"
 
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "不能解析 '%s'"
 

-#: diff.c:4922 diff.c:4928
+#: diff.c:4928 diff.c:4934

 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s 期望 <n>/<m> 格式"
 
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s 期望 <n>/<m> 格式"
 

-#: diff.c:4940
+#: diff.c:4946

 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s 期望一個字元，得到 '%s'"
 
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s 期望一個字元，得到 '%s'"
 

-#: diff.c:4961
+#: diff.c:4967

 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "壞的 --color-moved 參數：%s"
 
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "壞的 --color-moved 參數：%s"
 

-#: diff.c:4980
+#: diff.c:4986

 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "--color-moved-ws 中的無效模式 '%s'"
 
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "--color-moved-ws 中的無效模式 '%s'"
 

-#: diff.c:5020
+#: diff.c:5026

 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
 
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
 

-#: diff.c:5056 diff.c:5076
+#: diff.c:5062 diff.c:5082

 #, c-format
 msgid "invalid argument to %s"
 msgstr "%s 的參數無效"
 
 #, c-format
 msgid "invalid argument to %s"
 msgstr "%s 的參數無效"
 

-#: diff.c:5214
+#: diff.c:5219

 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "無法解析 --submodule 選項的參數：'%s'"
 
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "無法解析 --submodule 選項的參數：'%s'"
 

-#: diff.c:5270
+#: diff.c:5275

 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "壞的 --word-diff 參數：%s"
 
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "壞的 --word-diff 參數：%s"
 

-#: diff.c:5293
+#: diff.c:5298

 msgid "Diff output format options"
 msgstr "差異輸出格式化選項"
 
 msgid "Diff output format options"
 msgstr "差異輸出格式化選項"
 

-#: diff.c:5295 diff.c:5301
+#: diff.c:5300 diff.c:5306

 msgid "generate patch"
 msgstr "生成修補檔"
 
 msgid "generate patch"
 msgstr "生成修補檔"
 

-#: diff.c:5298 builtin/log.c:177
+#: diff.c:5303 builtin/log.c:177

 msgid "suppress diff output"
 msgstr "不顯示差異輸出"
 
 msgid "suppress diff output"
 msgstr "不顯示差異輸出"
 

-#: diff.c:5303 diff.c:5417 diff.c:5424
+#: diff.c:5308 diff.c:5422 diff.c:5429

 msgid "<n>"
 msgstr "<n>"
 
 msgid "<n>"
 msgstr "<n>"
 

-#: diff.c:5304 diff.c:5307
+#: diff.c:5309 diff.c:5312

 msgid "generate diffs with <n> lines context"
 msgstr "生成含 <n> 行上下文的差異"
 
 msgid "generate diffs with <n> lines context"
 msgstr "生成含 <n> 行上下文的差異"
 

-#: diff.c:5309
+#: diff.c:5314

 msgid "generate the diff in raw format"
 msgstr "生成原始格式的差異"
 
 msgid "generate the diff in raw format"
 msgstr "生成原始格式的差異"
 

-#: diff.c:5312
+#: diff.c:5317

 msgid "synonym for '-p --raw'"
 msgstr "和 '-p --raw' 同義"
 
 msgid "synonym for '-p --raw'"
 msgstr "和 '-p --raw' 同義"
 

-#: diff.c:5316
+#: diff.c:5321

 msgid "synonym for '-p --stat'"
 msgstr "和 '-p --stat' 同義"
 
 msgid "synonym for '-p --stat'"
 msgstr "和 '-p --stat' 同義"
 

-#: diff.c:5320
+#: diff.c:5325

 msgid "machine friendly --stat"
 msgstr "機器友好的 --stat"
 
 msgid "machine friendly --stat"
 msgstr "機器友好的 --stat"
 

-#: diff.c:5323
+#: diff.c:5328

 msgid "output only the last line of --stat"
 msgstr "只輸出 --stat 的最後一行"
 
 msgid "output only the last line of --stat"
 msgstr "只輸出 --stat 的最後一行"
 

-#: diff.c:5325 diff.c:5333
+#: diff.c:5330 diff.c:5338

 msgid "<param1,param2>..."
 msgstr "<參數1,參數2>..."
 
 msgid "<param1,param2>..."
 msgstr "<參數1,參數2>..."
 

-#: diff.c:5326
+#: diff.c:5331

 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "輸出每個子目錄相對變更的分布"
 
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "輸出每個子目錄相對變更的分布"
 

-#: diff.c:5330
+#: diff.c:5335

 msgid "synonym for --dirstat=cumulative"
 msgstr "和 --dirstat=cumulative 同義"
 
 msgid "synonym for --dirstat=cumulative"
 msgstr "和 --dirstat=cumulative 同義"
 

-#: diff.c:5334
+#: diff.c:5339

 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "是 --dirstat=files,param1,param2... 的同義詞"
 
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "是 --dirstat=files,param1,param2... 的同義詞"
 

-#: diff.c:5338
+#: diff.c:5343

 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"
 
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"
 

-#: diff.c:5341
+#: diff.c:5346

 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "精簡摘要，例如建立、重新命名和模式變更"
 
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "精簡摘要，例如建立、重新命名和模式變更"
 

-#: diff.c:5344
+#: diff.c:5349

 msgid "show only names of changed files"
 msgstr "只顯示變更檔案的檔案名"
 
 msgid "show only names of changed files"
 msgstr "只顯示變更檔案的檔案名"
 

-#: diff.c:5347
+#: diff.c:5352

 msgid "show only names and status of changed files"
 msgstr "只顯示變更檔案的檔案名和狀態"
 
 msgid "show only names and status of changed files"
 msgstr "只顯示變更檔案的檔案名和狀態"
 

-#: diff.c:5349
+#: diff.c:5354

 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"
 
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"
 

-#: diff.c:5350
+#: diff.c:5355

 msgid "generate diffstat"
 msgstr "生成差異統計（diffstat）"
 
 msgid "generate diffstat"
 msgstr "生成差異統計（diffstat）"
 

-#: diff.c:5352 diff.c:5355 diff.c:5358
+#: diff.c:5357 diff.c:5360 diff.c:5363

 msgid "<width>"
 msgstr "<寬度>"
 
 msgid "<width>"
 msgstr "<寬度>"
 

-#: diff.c:5353
+#: diff.c:5358

 msgid "generate diffstat with a given width"
 msgstr "使用提供的長度生成差異統計"
 
 msgid "generate diffstat with a given width"
 msgstr "使用提供的長度生成差異統計"
 

-#: diff.c:5356
+#: diff.c:5361

 msgid "generate diffstat with a given name width"
 msgstr "使用提供的檔案名長度生成差異統計"
 
 msgid "generate diffstat with a given name width"
 msgstr "使用提供的檔案名長度生成差異統計"
 

-#: diff.c:5359
+#: diff.c:5364

 msgid "generate diffstat with a given graph width"
 msgstr "使用提供的圖形長度生成差異統計"
 
 msgid "generate diffstat with a given graph width"
 msgstr "使用提供的圖形長度生成差異統計"
 

-#: diff.c:5361
+#: diff.c:5366

 msgid "<count>"
 msgstr "<次數>"
 
 msgid "<count>"
 msgstr "<次數>"
 

-#: diff.c:5362
+#: diff.c:5367

 msgid "generate diffstat with limited lines"
 msgstr "生成有限行數的差異統計"
 
 msgid "generate diffstat with limited lines"
 msgstr "生成有限行數的差異統計"
 

-#: diff.c:5365
+#: diff.c:5370

 msgid "generate compact summary in diffstat"
 msgstr "生成差異統計的簡潔摘要"
 
 msgid "generate compact summary in diffstat"
 msgstr "生成差異統計的簡潔摘要"
 

-#: diff.c:5368
+#: diff.c:5373

 msgid "output a binary diff that can be applied"
 msgstr "輸出一個可以應用的二進位差異"
 
 msgid "output a binary diff that can be applied"
 msgstr "輸出一個可以應用的二進位差異"
 

-#: diff.c:5371
+#: diff.c:5376

 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "在 \"index\" 行顯示完整的前後物件名稱"
 
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "在 \"index\" 行顯示完整的前後物件名稱"
 

-#: diff.c:5373
+#: diff.c:5378

 msgid "show colored diff"
 msgstr "顯示帶顏色的差異"
 
 msgid "show colored diff"
 msgstr "顯示帶顏色的差異"
 

-#: diff.c:5374
+#: diff.c:5379

 msgid "<kind>"
 msgstr "<類型>"
 
 msgid "<kind>"
 msgstr "<類型>"
 

-#: diff.c:5375
+#: diff.c:5380

 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"
 
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"
 

-#: diff.c:5378
+#: diff.c:5383

 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"


@@ -3583,295 +3625,295 @@ msgstr ""
 "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"
 "符"
 
 "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"
 "符"
 

-#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493
+#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498

 msgid "<prefix>"
 msgstr "<前綴>"
 
 msgid "<prefix>"
 msgstr "<前綴>"
 

-#: diff.c:5382
+#: diff.c:5387

 msgid "show the given source prefix instead of \"a/\""
 msgstr "顯示提供的源前綴取代 \"a/\""
 
 msgid "show the given source prefix instead of \"a/\""
 msgstr "顯示提供的源前綴取代 \"a/\""
 

-#: diff.c:5385
+#: diff.c:5390

 msgid "show the given destination prefix instead of \"b/\""
 msgstr "顯示提供的目標前綴取代 \"b/\""
 
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "顯示提供的目標前綴取代 \"b/\""
 

-#: diff.c:5388
+#: diff.c:5393

 msgid "prepend an additional prefix to every line of output"
 msgstr "輸出的每一行附加前綴"
 
 msgid "prepend an additional prefix to every line of output"
 msgstr "輸出的每一行附加前綴"
 

-#: diff.c:5391
+#: diff.c:5396

 msgid "do not show any source or destination prefix"
 msgstr "不顯示任何源和目標前綴"
 
 msgid "do not show any source or destination prefix"
 msgstr "不顯示任何源和目標前綴"
 

-#: diff.c:5394
+#: diff.c:5399

 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "顯示指定行數的差異區塊間的上下文"
 
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "顯示指定行數的差異區塊間的上下文"
 

-#: diff.c:5398 diff.c:5403 diff.c:5408
+#: diff.c:5403 diff.c:5408 diff.c:5413

 msgid "<char>"
 msgstr "<字元>"
 
 msgid "<char>"
 msgstr "<字元>"
 

-#: diff.c:5399
+#: diff.c:5404

 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "指定一個字元取代 '+' 來表示新的一行"
 
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "指定一個字元取代 '+' 來表示新的一行"
 

-#: diff.c:5404
+#: diff.c:5409

 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "指定一個字元取代 '-' 來表示舊的一行"
 
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "指定一個字元取代 '-' 來表示舊的一行"
 

-#: diff.c:5409
+#: diff.c:5414

 msgid "specify the character to indicate a context instead of ' '"
 msgstr "指定一個字元取代 ' ' 來表示一行上下文"
 
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "指定一個字元取代 ' ' 來表示一行上下文"
 

-#: diff.c:5412
+#: diff.c:5417

 msgid "Diff rename options"
 msgstr "差異重新命名選項"
 
 msgid "Diff rename options"
 msgstr "差異重新命名選項"
 

-#: diff.c:5413
+#: diff.c:5418

 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 

-#: diff.c:5414
+#: diff.c:5419

 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "將完全重寫的變更打破為成對的刪除和建立"
 
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "將完全重寫的變更打破為成對的刪除和建立"
 

-#: diff.c:5418
+#: diff.c:5423

 msgid "detect renames"
 msgstr "檢測重新命名"
 
 msgid "detect renames"
 msgstr "檢測重新命名"
 

-#: diff.c:5422
+#: diff.c:5427

 msgid "omit the preimage for deletes"
 msgid "omit the preimage for deletes"

-msgstr "省略刪除動作的差異輸出"
+msgstr "省略刪除變更的差異輸出"

 
 

-#: diff.c:5425
+#: diff.c:5430

 msgid "detect copies"
 msgstr "檢測複製"
 
 msgid "detect copies"
 msgstr "檢測複製"
 

-#: diff.c:5429
+#: diff.c:5434

 msgid "use unmodified files as source to find copies"
 msgstr "使用未修改的檔案做為發現複製的源"
 
 msgid "use unmodified files as source to find copies"
 msgstr "使用未修改的檔案做為發現複製的源"
 

-#: diff.c:5431
+#: diff.c:5436

 msgid "disable rename detection"
 msgstr "停用重新命名偵測"
 
 msgid "disable rename detection"
 msgstr "停用重新命名偵測"
 

-#: diff.c:5434
+#: diff.c:5439

 msgid "use empty blobs as rename source"
 msgstr "使用空的資料物件做為重新命名的源"
 
 msgid "use empty blobs as rename source"
 msgstr "使用空的資料物件做為重新命名的源"
 

-#: diff.c:5436
+#: diff.c:5441

 msgid "continue listing the history of a file beyond renames"
 msgstr "繼續列出檔案重新命名以外的歷史記錄"
 
 msgid "continue listing the history of a file beyond renames"
 msgstr "繼續列出檔案重新命名以外的歷史記錄"
 

-#: diff.c:5439
+#: diff.c:5444

 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"
 
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"
 

-#: diff.c:5441
+#: diff.c:5446

 msgid "Diff algorithm options"
 msgstr "差異演算法選項"
 
 msgid "Diff algorithm options"
 msgstr "差異演算法選項"
 

-#: diff.c:5443
+#: diff.c:5448

 msgid "produce the smallest possible diff"
 msgstr "生成儘可能小的差異"
 
 msgid "produce the smallest possible diff"
 msgstr "生成儘可能小的差異"
 

-#: diff.c:5446
+#: diff.c:5451

 msgid "ignore whitespace when comparing lines"
 msgstr "行比較時忽略空白字元"
 
 msgid "ignore whitespace when comparing lines"
 msgstr "行比較時忽略空白字元"
 

-#: diff.c:5449
+#: diff.c:5454

 msgid "ignore changes in amount of whitespace"
 msgstr "忽略空白字元的變更"
 
 msgid "ignore changes in amount of whitespace"
 msgstr "忽略空白字元的變更"
 

-#: diff.c:5452
+#: diff.c:5457

 msgid "ignore changes in whitespace at EOL"
 msgstr "忽略行尾的空白字元變更"
 
 msgid "ignore changes in whitespace at EOL"
 msgstr "忽略行尾的空白字元變更"
 

-#: diff.c:5455
+#: diff.c:5460

 msgid "ignore carrier-return at the end of line"
 msgstr "忽略行尾的Enter符（CR）"
 
 msgid "ignore carrier-return at the end of line"
 msgstr "忽略行尾的Enter符（CR）"
 

-#: diff.c:5458
+#: diff.c:5463

 msgid "ignore changes whose lines are all blank"
 msgstr "忽略整行都是空白的變更"
 
 msgid "ignore changes whose lines are all blank"
 msgstr "忽略整行都是空白的變更"
 

-#: diff.c:5461
+#: diff.c:5466

 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "啟發式轉換差異邊界以便閱讀"
 
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "啟發式轉換差異邊界以便閱讀"
 

-#: diff.c:5464
+#: diff.c:5469

 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "使用 \"patience diff\" 演算法生成差異"
 
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "使用 \"patience diff\" 演算法生成差異"
 

-#: diff.c:5468
+#: diff.c:5473

 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "使用 \"histogram diff\" 演算法生成差異"
 
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "使用 \"histogram diff\" 演算法生成差異"
 

-#: diff.c:5470
+#: diff.c:5475

 msgid "<algorithm>"
 msgstr "<演算法>"
 
 msgid "<algorithm>"
 msgstr "<演算法>"
 

-#: diff.c:5471
+#: diff.c:5476

 msgid "choose a diff algorithm"
 msgstr "選擇一個差異演算法"
 
 msgid "choose a diff algorithm"
 msgstr "選擇一個差異演算法"
 

-#: diff.c:5473
+#: diff.c:5478

 msgid "<text>"
 msgstr "<文字>"
 
 msgid "<text>"
 msgstr "<文字>"
 

-#: diff.c:5474
+#: diff.c:5479

 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "使用 \"anchored diff\" 演算法生成差異"
 
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "使用 \"anchored diff\" 演算法生成差異"
 

-#: diff.c:5476 diff.c:5485 diff.c:5488
+#: diff.c:5481 diff.c:5490 diff.c:5493

 msgid "<mode>"
 msgstr "<模式>"
 
 msgid "<mode>"
 msgstr "<模式>"
 

-#: diff.c:5477
+#: diff.c:5482

 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"
 
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"
 

-#: diff.c:5479 diff.c:5482 diff.c:5527
+#: diff.c:5484 diff.c:5487 diff.c:5532

 msgid "<regex>"
 msgstr "<正則>"
 
 msgid "<regex>"
 msgstr "<正則>"
 

-#: diff.c:5480
+#: diff.c:5485

 msgid "use <regex> to decide what a word is"
 msgstr "使用 <正規表示式> 確定何為一個詞"
 
 msgid "use <regex> to decide what a word is"
 msgstr "使用 <正規表示式> 確定何為一個詞"
 

-#: diff.c:5483
+#: diff.c:5488

 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
 
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
 

-#: diff.c:5486
+#: diff.c:5491

 msgid "moved lines of code are colored differently"
 msgstr "移動的程式碼行用不同方式著色"
 
 msgid "moved lines of code are colored differently"
 msgstr "移動的程式碼行用不同方式著色"
 

-#: diff.c:5489
+#: diff.c:5494

 msgid "how white spaces are ignored in --color-moved"
 msgstr "在 --color-moved 下如何忽略空白字元"
 
 msgid "how white spaces are ignored in --color-moved"
 msgstr "在 --color-moved 下如何忽略空白字元"
 

-#: diff.c:5492
+#: diff.c:5497

 msgid "Other diff options"
 msgstr "其它差異選項"
 
 msgid "Other diff options"
 msgstr "其它差異選項"
 

-#: diff.c:5494
+#: diff.c:5499

 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"
 
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"
 

-#: diff.c:5498
+#: diff.c:5503

 msgid "treat all files as text"
 msgstr "把所有檔案當做文字處理"
 
 msgid "treat all files as text"
 msgstr "把所有檔案當做文字處理"
 

-#: diff.c:5500
+#: diff.c:5505

 msgid "swap two inputs, reverse the diff"
 msgstr "交換兩個輸入，反轉差異"
 
 msgid "swap two inputs, reverse the diff"
 msgstr "交換兩個輸入，反轉差異"
 

-#: diff.c:5502
+#: diff.c:5507

 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "有差異時離開碼為 1，否則為 0"
 
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "有差異時離開碼為 1，否則為 0"
 

-#: diff.c:5504
+#: diff.c:5509

 msgid "disable all output of the program"
 msgstr "停用本程式的所有輸出"
 
 msgid "disable all output of the program"
 msgstr "停用本程式的所有輸出"
 

-#: diff.c:5506
+#: diff.c:5511

 msgid "allow an external diff helper to be executed"
 msgstr "允許執行一個外部的差異助手"
 
 msgid "allow an external diff helper to be executed"
 msgstr "允許執行一個外部的差異助手"
 

-#: diff.c:5508
+#: diff.c:5513

 msgid "run external text conversion filters when comparing binary files"
 msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"
 
 msgid "run external text conversion filters when comparing binary files"
 msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"
 

-#: diff.c:5510
+#: diff.c:5515

 msgid "<when>"
 msgstr "<何時>"
 
 msgid "<when>"
 msgstr "<何時>"
 

-#: diff.c:5511
+#: diff.c:5516

 msgid "ignore changes to submodules in the diff generation"
 msgstr "在生成差異時，忽略子模組的更改"
 
 msgid "ignore changes to submodules in the diff generation"
 msgstr "在生成差異時，忽略子模組的更改"
 

-#: diff.c:5514
+#: diff.c:5519

 msgid "<format>"
 msgstr "<格式>"
 
 msgid "<format>"
 msgstr "<格式>"
 

-#: diff.c:5515
+#: diff.c:5520

 msgid "specify how differences in submodules are shown"
 msgstr "指定子模組的差異如何顯示"
 
 msgid "specify how differences in submodules are shown"
 msgstr "指定子模組的差異如何顯示"
 

-#: diff.c:5519
+#: diff.c:5524

 msgid "hide 'git add -N' entries from the index"
 msgstr "隱藏索引中 'git add -N' 條目"
 
 msgid "hide 'git add -N' entries from the index"
 msgstr "隱藏索引中 'git add -N' 條目"
 

-#: diff.c:5522
+#: diff.c:5527

 msgid "treat 'git add -N' entries as real in the index"
 msgstr "將索引中 'git add -N' 條目當做真實的"
 
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "將索引中 'git add -N' 條目當做真實的"
 

-#: diff.c:5524
+#: diff.c:5529

 msgid "<string>"
 msgstr "<字串>"
 
 msgid "<string>"
 msgstr "<字串>"
 

-#: diff.c:5525
+#: diff.c:5530

 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "尋找改變了指定字串出現次數的差異"
 
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "尋找改變了指定字串出現次數的差異"
 

-#: diff.c:5528
+#: diff.c:5533

 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr "尋找改變指定正則符合出現次數的差異"
 
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr "尋找改變指定正則符合出現次數的差異"
 

-#: diff.c:5531
+#: diff.c:5536

 msgid "show all changes in the changeset with -S or -G"
 msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
 
 msgid "show all changes in the changeset with -S or -G"
 msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
 

-#: diff.c:5534
+#: diff.c:5539

 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式"
 
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式"
 

-#: diff.c:5537
+#: diff.c:5542

 msgid "control the order in which files appear in the output"
 msgstr "控制輸出中的檔案顯示順序"
 
 msgid "control the order in which files appear in the output"
 msgstr "控制輸出中的檔案顯示順序"
 

-#: diff.c:5538
+#: diff.c:5543

 msgid "<object-id>"
 msgstr "<物件 ID>"
 
 msgid "<object-id>"
 msgstr "<物件 ID>"
 

-#: diff.c:5539
+#: diff.c:5544

 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "尋找改變指定物件出現次數的差異"
 
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "尋找改變指定物件出現次數的差異"
 

-#: diff.c:5541
+#: diff.c:5546

 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 

-#: diff.c:5542
+#: diff.c:5547

 msgid "select files by diff type"
 msgstr "透過差異類型選擇檔案"
 
 msgid "select files by diff type"
 msgstr "透過差異類型選擇檔案"
 

-#: diff.c:5544
+#: diff.c:5549

 msgid "<file>"
 msgstr "<檔案>"
 
 msgid "<file>"
 msgstr "<檔案>"
 

-#: diff.c:5545
+#: diff.c:5550

 msgid "Output to a specific file"
 msgstr "輸出到一個指定的檔案"
 
 msgid "Output to a specific file"
 msgstr "輸出到一個指定的檔案"
 

-#: diff.c:6200
+#: diff.c:6205

 msgid "inexact rename detection was skipped due to too many files."
 msgstr "因為檔案太多，略過不嚴格的重新命名檢查。"
 
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "因為檔案太多，略過不嚴格的重新命名檢查。"
 

-#: diff.c:6203
+#: diff.c:6208

 msgid "only found copies from modified paths due to too many files."
 msgstr "因為檔案太多，只在修改的路徑中尋找複製。"
 
 msgid "only found copies from modified paths due to too many files."
 msgstr "因為檔案太多，只在修改的路徑中尋找複製。"
 

-#: diff.c:6206
+#: diff.c:6211

 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."


@@ -3886,59 +3928,59 @@ msgstr "讀取排序檔案 '%s' 失敗"
 msgid "Performing inexact rename detection"
 msgstr "正在進行非精確的重新命名偵測"
 
 msgid "Performing inexact rename detection"
 msgstr "正在進行非精確的重新命名偵測"
 

-#: dir.c:555
+#: dir.c:573

 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "路徑規格 '%s' 未符合任何 git 已知檔案"
 
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "路徑規格 '%s' 未符合任何 git 已知檔案"
 

-#: dir.c:695 dir.c:724 dir.c:737
+#: dir.c:713 dir.c:742 dir.c:755

 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "無法識別樣式：「%s」"
 
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "無法識別樣式：「%s」"
 

-#: dir.c:754 dir.c:768
+#: dir.c:772 dir.c:786

 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "無法識別反向模式：「%s」"
 
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "無法識別反向模式：「%s」"
 

-#: dir.c:786
+#: dir.c:804

 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr "您的稀疏檢出檔案可能有問題：「%s」樣式重複"
 
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr "您的稀疏檢出檔案可能有問題：「%s」樣式重複"
 

-#: dir.c:796
+#: dir.c:814

 msgid "disabling cone pattern matching"
 msgstr "停用 cone 樣式符合模式"
 
 msgid "disabling cone pattern matching"
 msgstr "停用 cone 樣式符合模式"
 

-#: dir.c:1173
+#: dir.c:1191

 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "不能將 %s 用作排除檔案"
 
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "不能將 %s 用作排除檔案"
 

-#: dir.c:2275
+#: dir.c:2296

 #, c-format
 msgid "could not open directory '%s'"
 msgstr "不能開啟目錄 '%s'"
 
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "不能開啟目錄 '%s'"
 

-#: dir.c:2575
+#: dir.c:2596

 msgid "failed to get kernel name and information"
 msgstr "無法獲得核心名稱和訊息"
 
 msgid "failed to get kernel name and information"
 msgstr "無法獲得核心名稱和訊息"
 

-#: dir.c:2699
+#: dir.c:2720

 msgid "untracked cache is disabled on this system or location"
 msgstr "快取未追蹤檔案在本系統或位置中被停用"
 
 msgid "untracked cache is disabled on this system or location"
 msgstr "快取未追蹤檔案在本系統或位置中被停用"
 

-#: dir.c:3481
+#: dir.c:3502

 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "版本庫 %s 中的索引檔案損壞"
 
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "版本庫 %s 中的索引檔案損壞"
 

-#: dir.c:3526 dir.c:3531
+#: dir.c:3547 dir.c:3552

 #, c-format
 msgid "could not create directories for %s"
 msgstr "不能為 %s 建立目錄"
 
 #, c-format
 msgid "could not create directories for %s"
 msgstr "不能為 %s 建立目錄"
 

-#: dir.c:3560
+#: dir.c:3581

 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"


@@ -3948,11 +3990,11 @@ msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "提示：等待您的編輯器關閉檔案...%c"
 
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "提示：等待您的編輯器關閉檔案...%c"
 

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

 msgid "Filtering content"
 msgstr "過濾內容"
 
 msgid "Filtering content"
 msgstr "過濾內容"
 

-#: entry.c:479
+#: entry.c:478

 #, c-format
 msgid "could not stat file '%s'"
 msgstr "不能對檔案 '%s' 呼叫 stat"
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "不能對檔案 '%s' 呼叫 stat"


@@ -3972,227 +4014,245 @@ msgstr "不能設定 GIT_DIR 為 '%s'"
 msgid "too many args to run %s"
 msgstr "執行 %s 的參數太多"
 
 msgid "too many args to run %s"
 msgstr "執行 %s 的參數太多"
 

-#: fetch-pack.c:151
+#: fetch-pack.c:152

 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack：應為 shallow 列表"
 
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack：應為 shallow 列表"
 

-#: fetch-pack.c:154
+#: fetch-pack.c:155

 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"
 
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"
 

-#: fetch-pack.c:165
+#: fetch-pack.c:166

 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包"
 
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包"
 

-#: fetch-pack.c:185
+#: fetch-pack.c:186

 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"
 
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"
 

-#: fetch-pack.c:196
+#: fetch-pack.c:197

 msgid "unable to write to remote"
 msgstr "無法寫到遠端"
 
 msgid "unable to write to remote"
 msgstr "無法寫到遠端"
 

-#: fetch-pack.c:258
+#: fetch-pack.c:259

 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc 需要 multi_ack_detailed"
 
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc 需要 multi_ack_detailed"
 

-#: fetch-pack.c:357 fetch-pack.c:1364
+#: fetch-pack.c:358 fetch-pack.c:1408

 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "無效的 shallow 訊息：%s"
 
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "無效的 shallow 訊息：%s"
 

-#: fetch-pack.c:363 fetch-pack.c:1370
+#: fetch-pack.c:364 fetch-pack.c:1414

 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "無效的 unshallow 訊息：%s"
 
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "無效的 unshallow 訊息：%s"
 

-#: fetch-pack.c:365 fetch-pack.c:1372
+#: fetch-pack.c:366 fetch-pack.c:1416

 #, c-format
 msgid "object not found: %s"
 msgstr "物件未找到：%s"
 
 #, c-format
 msgid "object not found: %s"
 msgstr "物件未找到：%s"
 

-#: fetch-pack.c:368 fetch-pack.c:1375
+#: fetch-pack.c:369 fetch-pack.c:1419

 #, c-format
 msgid "error in object: %s"
 msgstr "物件中發生錯誤：%s"
 
 #, c-format
 msgid "error in object: %s"
 msgstr "物件中發生錯誤：%s"
 

-#: fetch-pack.c:370 fetch-pack.c:1377
+#: fetch-pack.c:371 fetch-pack.c:1421

 #, c-format
 msgid "no shallow found: %s"
 msgstr "未發現 shallow：%s"
 
 #, c-format
 msgid "no shallow found: %s"
 msgstr "未發現 shallow：%s"
 

-#: fetch-pack.c:373 fetch-pack.c:1381
+#: fetch-pack.c:374 fetch-pack.c:1425

 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "應為 shallow/unshallow，卻得到 %s"
 
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "應為 shallow/unshallow，卻得到 %s"
 

-#: fetch-pack.c:415
+#: fetch-pack.c:416

 #, c-format
 msgid "got %s %d %s"
 msgstr "得到 %s %d %s"
 
 #, c-format
 msgid "got %s %d %s"
 msgstr "得到 %s %d %s"
 

-#: fetch-pack.c:432
+#: fetch-pack.c:433

 #, c-format
 msgid "invalid commit %s"
 msgstr "無效提交 %s"
 
 #, c-format
 msgid "invalid commit %s"
 msgstr "無效提交 %s"
 

-#: fetch-pack.c:463
+#: fetch-pack.c:464

 msgid "giving up"
 msgstr "放棄"
 
 msgid "giving up"
 msgstr "放棄"
 

-#: fetch-pack.c:476 progress.c:336
+#: fetch-pack.c:477 progress.c:336

 msgid "done"
 msgstr "完成"
 
 msgid "done"
 msgstr "完成"
 

-#: fetch-pack.c:488
+#: fetch-pack.c:489

 #, c-format
 msgid "got %s (%d) %s"
 msgstr "得到 %s (%d) %s"
 
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "得到 %s (%d) %s"
 

-#: fetch-pack.c:534
+#: fetch-pack.c:535

 #, c-format
 msgid "Marking %s as complete"
 msgstr "標記 %s 為完成"
 
 #, c-format
 msgid "Marking %s as complete"
 msgstr "標記 %s 為完成"
 

-#: fetch-pack.c:755
+#: fetch-pack.c:756

 #, c-format
 msgid "already have %s (%s)"
 msgstr "已經有 %s（%s）"
 
 #, c-format
 msgid "already have %s (%s)"
 msgstr "已經有 %s（%s）"
 

-#: fetch-pack.c:819
+#: fetch-pack.c:821

 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack：無法衍生 sideband 多路輸出"
 
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack：無法衍生 sideband 多路輸出"
 

-#: fetch-pack.c:827
+#: fetch-pack.c:829

 msgid "protocol error: bad pack header"
 msgstr "協定錯誤：壞的包頭"
 
 msgid "protocol error: bad pack header"
 msgstr "協定錯誤：壞的包頭"
 

-#: fetch-pack.c:901
+#: fetch-pack.c:910

 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack：無法衍生進程 %s"
 
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack：無法衍生進程 %s"
 

-#: fetch-pack.c:917
+#: fetch-pack.c:927

 #, c-format
 msgid "%s failed"
 msgstr "%s 失敗"
 
 #, c-format
 msgid "%s failed"
 msgstr "%s 失敗"
 

-#: fetch-pack.c:919
+#: fetch-pack.c:929

 msgid "error in sideband demultiplexer"
 msgstr "sideband 多路輸出發生錯誤"
 
 msgid "error in sideband demultiplexer"
 msgstr "sideband 多路輸出發生錯誤"
 

-#: fetch-pack.c:966
+#: fetch-pack.c:976

 #, c-format
 msgid "Server version is %.*s"
 msgstr "伺服器版本 %.*s"
 
 #, c-format
 msgid "Server version is %.*s"
 msgstr "伺服器版本 %.*s"
 

-#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986
-#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002
-#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018
-#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040
+#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996
+#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012
+#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028
+#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050

 #, c-format
 msgid "Server supports %s"
 msgstr "伺服器支援 %s"
 
 #, c-format
 msgid "Server supports %s"
 msgstr "伺服器支援 %s"
 

-#: fetch-pack.c:973
+#: fetch-pack.c:983

 msgid "Server does not support shallow clients"
 msgstr "伺服器不支援 shalllow 用戶端"
 
 msgid "Server does not support shallow clients"
 msgstr "伺服器不支援 shalllow 用戶端"
 

-#: fetch-pack.c:1033
+#: fetch-pack.c:1043

 msgid "Server does not support --shallow-since"
 msgstr "伺服器不支援 --shallow-since"
 
 msgid "Server does not support --shallow-since"
 msgstr "伺服器不支援 --shallow-since"
 

-#: fetch-pack.c:1038
+#: fetch-pack.c:1048

 msgid "Server does not support --shallow-exclude"
 msgstr "伺服器不支援 --shallow-exclude"
 
 msgid "Server does not support --shallow-exclude"
 msgstr "伺服器不支援 --shallow-exclude"
 

-#: fetch-pack.c:1042
+#: fetch-pack.c:1052

 msgid "Server does not support --deepen"
 msgstr "伺服器不支援 --deepen"
 
 msgid "Server does not support --deepen"
 msgstr "伺服器不支援 --deepen"
 

-#: fetch-pack.c:1059
+#: fetch-pack.c:1054
+msgid "Server does not support this repository's object format"
+msgstr "伺服器不支援此版本庫的物件格式"
+
+#: fetch-pack.c:1071

 msgid "no common commits"
 msgstr "沒有共同的提交"
 
 msgid "no common commits"
 msgstr "沒有共同的提交"
 

-#: fetch-pack.c:1071 fetch-pack.c:1563
+#: fetch-pack.c:1083 fetch-pack.c:1639

 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：取得失敗。"
 
 #: fetch-pack.c:1211
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：取得失敗。"
 
 #: fetch-pack.c:1211

+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "算法不一致：用戶端 %s；伺服器 %s"
+
+#: fetch-pack.c:1215
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "伺服器不支援「%s」算法"
+
+#: fetch-pack.c:1235

 msgid "Server does not support shallow requests"
 msgstr "伺服器不支援 shalllow 請求"
 
 msgid "Server does not support shallow requests"
 msgstr "伺服器不支援 shalllow 請求"
 

-#: fetch-pack.c:1218
+#: fetch-pack.c:1242

 msgid "Server supports filter"
 msgstr "伺服器支援 filter"
 
 msgid "Server supports filter"
 msgstr "伺服器支援 filter"
 

-#: fetch-pack.c:1242
+#: fetch-pack.c:1286

 msgid "unable to write request to remote"
 msgstr "無法將請求寫到遠端"
 
 msgid "unable to write request to remote"
 msgstr "無法將請求寫到遠端"
 

-#: fetch-pack.c:1260
+#: fetch-pack.c:1304

 #, c-format
 msgid "error reading section header '%s'"
 msgstr "讀取節標題 '%s' 發生錯誤"
 
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "讀取節標題 '%s' 發生錯誤"
 

-#: fetch-pack.c:1266
+#: fetch-pack.c:1310

 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "預期 '%s'，得到 '%s'"
 
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "預期 '%s'，得到 '%s'"
 

-#: fetch-pack.c:1327
+#: fetch-pack.c:1371

 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "意外的確認行：'%s'"
 
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "意外的確認行：'%s'"
 

-#: fetch-pack.c:1332
+#: fetch-pack.c:1376

 #, c-format
 msgid "error processing acks: %d"
 msgstr "處理 ack 發生錯誤：%d"
 
 #, c-format
 msgid "error processing acks: %d"
 msgstr "處理 ack 發生錯誤：%d"
 

-#: fetch-pack.c:1342
+#: fetch-pack.c:1386

 msgid "expected packfile to be sent after 'ready'"
 msgstr "預期在 'ready' 之後傳送 packfile"
 
 msgid "expected packfile to be sent after 'ready'"
 msgstr "預期在 'ready' 之後傳送 packfile"
 

-#: fetch-pack.c:1344
+#: fetch-pack.c:1388

 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "在沒有 'ready' 不應該傳送其它小節"
 
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "在沒有 'ready' 不應該傳送其它小節"
 

-#: fetch-pack.c:1386
+#: fetch-pack.c:1430

 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "處理淺複製訊息發生錯誤：%d"
 
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "處理淺複製訊息發生錯誤：%d"
 

-#: fetch-pack.c:1433
+#: fetch-pack.c:1477

 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "預期 wanted-ref，得到 '%s'"
 
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "預期 wanted-ref，得到 '%s'"
 

-#: fetch-pack.c:1438
+#: fetch-pack.c:1482

 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "意外的 wanted-ref：'%s'"
 
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "意外的 wanted-ref：'%s'"
 

-#: fetch-pack.c:1443
+#: fetch-pack.c:1487

 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "處理要取得的引用發生錯誤：%d"
 
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "處理要取得的引用發生錯誤：%d"
 

-#: fetch-pack.c:1789
+#: fetch-pack.c:1517
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: 預期要有回應結束封包"
+
+#: fetch-pack.c:1921

 msgid "no matching remote head"
 msgstr "沒有符合的遠端分支"
 
 msgid "no matching remote head"
 msgstr "沒有符合的遠端分支"
 

-#: fetch-pack.c:1812 builtin/clone.c:692
+#: fetch-pack.c:1944 builtin/clone.c:692

 msgid "remote did not send all necessary objects"
 msgstr "遠端沒有傳送所有必需的物件"
 
 msgid "remote did not send all necessary objects"
 msgstr "遠端沒有傳送所有必需的物件"
 

-#: fetch-pack.c:1839
+#: fetch-pack.c:1971

 #, c-format
 msgid "no such remote ref %s"
 msgstr "沒有這樣的遠端引用 %s"
 
 #, c-format
 msgid "no such remote ref %s"
 msgstr "沒有這樣的遠端引用 %s"
 

-#: fetch-pack.c:1842
+#: fetch-pack.c:1974

 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "伺服器不允許請求未公開的物件 %s"
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "伺服器不允許請求未公開的物件 %s"


@@ -4228,7 +4288,7 @@ msgstr ""
 msgid "'%s': unable to read %s"
 msgstr "'%s'：無法讀取 %s"
 
 msgid "'%s': unable to read %s"
 msgstr "'%s'：無法讀取 %s"
 

-#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89

 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"


@@ -4369,16 +4429,16 @@ msgstr[0] ""
 "\n"
 "最類似的指令有"
 
 "\n"
 "最類似的指令有"
 

-#: help.c:653
+#: help.c:654

 msgid "git version [<options>]"
 msgstr "git version [<選項>]"
 
 msgid "git version [<options>]"
 msgstr "git version [<選項>]"
 

-#: help.c:708
+#: help.c:709

 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s：%s - %s"
 
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s：%s - %s"
 

-#: help.c:712
+#: help.c:713

 msgid ""
 "\n"
 "Did you mean this?"
 msgid ""
 "\n"
 "Did you mean this?"


@@ -4473,6 +4533,10 @@ msgstr "期望在組合後有一些東西："
 msgid "multiple filter-specs cannot be combined"
 msgstr "不能混用多種過濾規格"
 
 msgid "multiple filter-specs cannot be combined"
 msgstr "不能混用多種過濾規格"
 

+#: list-objects-filter-options.c:330
+msgid "unable to upgrade repository format to support partial clone"
+msgstr "無法升級版本庫格式，以致不支援部分複製"
+

 #: list-objects-filter.c:492
 #, c-format
 msgid "unable to access sparse blob in '%s'"
 #: list-objects-filter.c:492
 #, c-format
 msgid "unable to access sparse blob in '%s'"


@@ -4827,7 +4891,7 @@ msgstr "新增/新增"
 msgid "Skipped %s (merged same as existing)"
 msgstr "略過 %s（已經做過相同合併）"
 
 msgid "Skipped %s (merged same as existing)"
 msgstr "略過 %s（已經做過相同合併）"
 

-#: merge-recursive.c:3101 git-submodule.sh:985
+#: merge-recursive.c:3101 git-submodule.sh:959

 msgid "submodule"
 msgstr "子模組"
 
 msgid "submodule"
 msgstr "子模組"
 


@@ -4950,7 +5014,7 @@ msgid "failed to read the cache"
 msgstr "讀取快取失敗"
 
 #: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
 msgstr "讀取快取失敗"
 
 #: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

-#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
+#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816

 #: builtin/stash.c:265
 msgid "unable to write new index file"
 msgstr "無法寫新的索引檔案"
 #: builtin/stash.c:265
 msgid "unable to write new index file"
 msgstr "無法寫新的索引檔案"


@@ -5195,21 +5259,21 @@ msgstr "不能解析物件：%s"
 msgid "hash mismatch %s"
 msgstr "雜湊值與 %s 不符合"
 
 msgid "hash mismatch %s"
 msgstr "雜湊值與 %s 不符合"
 

-#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184

 #, c-format
 msgid "unable to get size of %s"
 msgstr "不能得到 %s 的大小"
 
 #, c-format
 msgid "unable to get size of %s"
 msgstr "不能得到 %s 的大小"
 

-#: packfile.c:629
+#: packfile.c:630

 msgid "offset before end of packfile (broken .idx?)"
 msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"
 
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"
 

-#: packfile.c:1899
+#: packfile.c:1900

 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"
 
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"
 

-#: packfile.c:1903
+#: packfile.c:1904

 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"


@@ -5411,44 +5475,48 @@ msgid "unable to write delim packet"
 msgstr "無法寫 delim 包"
 
 #: pkt-line.c:106
 msgstr "無法寫 delim 包"
 
 #: pkt-line.c:106

+msgid "unable to write stateless separator packet"
+msgstr "無法寫入無狀態的分隔符號封包"
+
+#: pkt-line.c:113

 msgid "flush packet write failed"
 msgstr "flush 包寫錯誤"
 
 msgid "flush packet write failed"
 msgstr "flush 包寫錯誤"
 

-#: pkt-line.c:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:239

 msgid "protocol error: impossibly long line"
 msgstr "協定錯誤：不可能的長行"
 
 msgid "protocol error: impossibly long line"
 msgstr "協定錯誤：不可能的長行"
 

-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171

 msgid "packet write with format failed"
 msgstr "格式化包寫入錯誤"
 
 msgid "packet write with format failed"
 msgstr "格式化包寫入錯誤"
 

-#: pkt-line.c:196
+#: pkt-line.c:203

 msgid "packet write failed - data exceeds max packet size"
 msgstr "寫封包失敗：資料超過了包的最大長度"
 
 msgid "packet write failed - data exceeds max packet size"
 msgstr "寫封包失敗：資料超過了包的最大長度"
 

-#: pkt-line.c:203 pkt-line.c:210
+#: pkt-line.c:210 pkt-line.c:217

 msgid "packet write failed"
 msgstr "封包寫入失敗"
 
 msgid "packet write failed"
 msgstr "封包寫入失敗"
 

-#: pkt-line.c:295
+#: pkt-line.c:302

 msgid "read error"
 msgstr "讀取錯誤"
 
 msgid "read error"
 msgstr "讀取錯誤"
 

-#: pkt-line.c:303
+#: pkt-line.c:310

 msgid "the remote end hung up unexpectedly"
 msgstr "遠端意外掛斷了"
 
 msgid "the remote end hung up unexpectedly"
 msgstr "遠端意外掛斷了"
 

-#: pkt-line.c:331
+#: pkt-line.c:338

 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "協定錯誤：錯誤的行長度字串：%.4s"
 
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "協定錯誤：錯誤的行長度字串：%.4s"
 

-#: pkt-line.c:341 pkt-line.c:346
+#: pkt-line.c:352 pkt-line.c:357

 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "協定錯誤：錯誤的行長度 %d"
 
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "協定錯誤：錯誤的行長度 %d"
 

-#: pkt-line.c:362
+#: pkt-line.c:373

 #, c-format
 msgid "remote error: %s"
 msgstr "遠端錯誤：%s"
 #, c-format
 msgid "remote error: %s"
 msgstr "遠端錯誤：%s"


@@ -5625,7 +5693,7 @@ msgstr "'%s' 的未排序暫存條目"
 
 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
 
 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

-#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
+#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991

 #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
 #: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
 #: builtin/submodule--helper.c:332
 #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
 #: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
 #: builtin/submodule--helper.c:332


@@ -5682,7 +5750,7 @@ msgstr "無法重新整理共享索引 '%s'"
 msgid "broken index, expect %s in %s, got %s"
 msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
 
 msgid "broken index, expect %s in %s, got %s"
 msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
 

-#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
+#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130

 #, c-format
 msgid "could not close '%s'"
 msgstr "不能關閉 '%s'"
 #, c-format
 msgid "could not close '%s'"
 msgstr "不能關閉 '%s'"


@@ -5857,7 +5925,7 @@ msgstr ""
 msgid "could not read '%s'."
 msgstr "不能讀取 '%s'。"
 
 msgid "could not read '%s'."
 msgstr "不能讀取 '%s'。"
 

-#: ref-filter.c:42 wt-status.c:1936
+#: ref-filter.c:42 wt-status.c:1977

 msgid "gone"
 msgstr "遺失"
 
 msgid "gone"
 msgstr "遺失"
 


@@ -6081,7 +6149,7 @@ msgstr "格式錯誤的物件 '%s'"
 msgid "ignoring ref with broken name %s"
 msgstr "忽略帶有錯誤名稱 %s 的引用"
 
 msgid "ignoring ref with broken name %s"
 msgstr "忽略帶有錯誤名稱 %s 的引用"
 

-#: ref-filter.c:2095 refs.c:625
+#: ref-filter.c:2095 refs.c:657

 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "忽略損壞的引用 %s"
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "忽略損壞的引用 %s"


@@ -6111,94 +6179,108 @@ msgstr "格式錯誤的物件名 %s"
 msgid "option `%s' must point to a commit"
 msgstr "選項 `%s' 必須指向一個提交"
 
 msgid "option `%s' must point to a commit"
 msgstr "選項 `%s' 必須指向一個提交"
 

-#: refs.c:262
+#: refs.c:264

 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "%s 沒有指向一個有效的物件！"
 
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "%s 沒有指向一個有效的物件！"
 

-#: refs.c:623
+#: refs.c:572
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "無法擷取「%s」"
+
+#: refs.c:579
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "分支名稱無效：%s = %s"
+
+#: refs.c:655

 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "忽略懸空符號引用 %s"
 
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "忽略懸空符號引用 %s"
 

-#: refs.c:760
+#: refs.c:792

 #, c-format
 msgid "could not open '%s' for writing: %s"
 msgstr "無法為寫入開啟 '%s'：%s"
 
 #, c-format
 msgid "could not open '%s' for writing: %s"
 msgstr "無法為寫入開啟 '%s'：%s"
 

-#: refs.c:770 refs.c:821
+#: refs.c:802 refs.c:853

 #, c-format
 msgid "could not read ref '%s'"
 msgstr "無法讀取引用 '%s'"
 
 #, c-format
 msgid "could not read ref '%s'"
 msgstr "無法讀取引用 '%s'"
 

-#: refs.c:776
+#: refs.c:808

 #, c-format
 msgid "ref '%s' already exists"
 msgstr "引用 '%s' 已經存在"
 
 #, c-format
 msgid "ref '%s' already exists"
 msgstr "引用 '%s' 已經存在"
 

-#: refs.c:781
+#: refs.c:813

 #, c-format
 msgid "unexpected object ID when writing '%s'"
 msgstr "寫入 '%s' 時意外的物件 ID"
 
 #, c-format
 msgid "unexpected object ID when writing '%s'"
 msgstr "寫入 '%s' 時意外的物件 ID"
 

-#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
-#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
-#: wrapper.c:620
+#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168
+#: wrapper.c:628

 #, c-format
 msgid "could not write to '%s'"
 msgstr "不能寫入 '%s'"
 
 #, c-format
 msgid "could not write to '%s'"
 msgstr "不能寫入 '%s'"
 

-#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719

 #: builtin/rebase.c:852
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "無法開啟 '%s' 進行寫入"
 
 #: builtin/rebase.c:852
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "無法開啟 '%s' 進行寫入"
 

-#: refs.c:823
+#: refs.c:855

 #, c-format
 msgid "unexpected object ID when deleting '%s'"
 msgstr "刪除 '%s' 時意外的物件 ID"
 
 #, c-format
 msgid "unexpected object ID when deleting '%s'"
 msgstr "刪除 '%s' 時意外的物件 ID"
 

-#: refs.c:954
+#: refs.c:986

 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "引用 %s 的日誌在 %s 之後有缺口"
 
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "引用 %s 的日誌在 %s 之後有缺口"
 

-#: refs.c:960
+#: refs.c:992

 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "引用 %s 的日誌意外終止於 %s"
 
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "引用 %s 的日誌意外終止於 %s"
 

-#: refs.c:1019
+#: refs.c:1051

 #, c-format
 msgid "log for %s is empty"
 msgstr "%s 的日誌為空"
 
 #, c-format
 msgid "log for %s is empty"
 msgstr "%s 的日誌為空"
 

-#: refs.c:1111
+#: refs.c:1143

 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
 
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
 

-#: refs.c:1187
+#: refs.c:1219

 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "對引用 '%s' 執行 update_ref 失敗：%s"
 
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "對引用 '%s' 執行 update_ref 失敗：%s"
 

-#: refs.c:1979
+#: refs.c:2011

 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "不允許對引用 '%s' 多次更新"
 
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "不允許對引用 '%s' 多次更新"
 

-#: refs.c:2011
+#: refs.c:2098

 msgid "ref updates forbidden inside quarantine environment"
 msgstr "在隔離環境中禁止更新引用"
 
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "在隔離環境中禁止更新引用"
 

-#: refs.c:2107 refs.c:2137
+#: refs.c:2109
+msgid "ref updates aborted by hook"
+msgstr "引用更新被掛鉤拒絕"
+
+#: refs.c:2209 refs.c:2239

 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' 已存在，無法建立 '%s'"
 
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' 已存在，無法建立 '%s'"
 

-#: refs.c:2113 refs.c:2148
+#: refs.c:2215 refs.c:2250

 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "無法同時處理 '%s' 和 '%s'"
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "無法同時處理 '%s' 和 '%s'"


@@ -6473,7 +6555,7 @@ msgstr[0] ""
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  （使用 \"git pull\" 來合併遠端分支）\n"
 
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  （使用 \"git pull\" 來合併遠端分支）\n"
 

-#: remote.c:2233
+#: remote.c:2241

 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "無法解析期望的物件名 '%s'"
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "無法解析期望的物件名 '%s'"


@@ -6600,20 +6682,20 @@ msgstr "不能確定 HEAD 版本"
 msgid "failed to find tree of %s"
 msgstr "無法找到 %s 指向的樹"
 
 msgid "failed to find tree of %s"
 msgstr "無法找到 %s 指向的樹"
 

-#: revision.c:2655
+#: revision.c:2661

 msgid "your current branch appears to be broken"
 msgstr "您的目前分支好像被損壞"
 
 msgid "your current branch appears to be broken"
 msgstr "您的目前分支好像被損壞"
 

-#: revision.c:2658
+#: revision.c:2664

 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的目前分支 '%s' 尚無任何提交"
 
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的目前分支 '%s' 尚無任何提交"
 

-#: revision.c:2866
+#: revision.c:2873

 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent 與 --bisect 不相容"
 
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent 與 --bisect 不相容"
 

-#: revision.c:2870
+#: revision.c:2877

 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"
 
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"
 


@@ -6653,21 +6735,25 @@ msgstr "遠端解包失敗：%s"
 msgid "failed to sign the push certificate"
 msgstr "為推送證書籤名失敗"
 
 msgid "failed to sign the push certificate"
 msgstr "為推送證書籤名失敗"
 

-#: send-pack.c:399
+#: send-pack.c:394
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "接收端不支援此版本庫的雜湊算法"
+
+#: send-pack.c:403

 msgid "the receiving end does not support --signed push"
 msgstr "接收端不支援簽名推送"
 
 msgid "the receiving end does not support --signed push"
 msgstr "接收端不支援簽名推送"
 

-#: send-pack.c:401
+#: send-pack.c:405

 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr "未傳送推送證書，因為接收端不支援簽名推送"
 
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr "未傳送推送證書，因為接收端不支援簽名推送"
 

-#: send-pack.c:413
+#: send-pack.c:417

 msgid "the receiving end does not support --atomic push"
 msgstr "接收端不支援原子推送"
 
 msgid "the receiving end does not support --atomic push"
 msgstr "接收端不支援原子推送"
 

-#: send-pack.c:418
+#: send-pack.c:422

 msgid "the receiving end does not support push options"
 msgstr "接收端不支援推送選項"
 
 msgid "the receiving end does not support push options"
 msgstr "接收端不支援推送選項"
 


@@ -6787,7 +6873,7 @@ msgstr "在 '%.*s' 中沒有 key"
 msgid "unable to dequote value of '%s'"
 msgstr "無法為 '%s' 的值去引號"
 
 msgid "unable to dequote value of '%s'"
 msgstr "無法為 '%s' 的值去引號"
 

-#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710

 #: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
 #, c-format
 msgid "could not open '%s' for reading"
 #: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
 #, c-format
 msgid "could not open '%s' for reading"


@@ -7616,84 +7702,84 @@ msgstr "無法使用無效設定來建立工作區"
 msgid "this operation must be run in a work tree"
 msgstr "該動作必須在一個工作區中執行"
 
 msgid "this operation must be run in a work tree"
 msgstr "該動作必須在一個工作區中執行"
 

-#: setup.c:569
+#: setup.c:604

 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "期望 git 版本庫版本 <= %d，卻得到 %d"
 
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "期望 git 版本庫版本 <= %d，卻得到 %d"
 

-#: setup.c:577
+#: setup.c:612

 msgid "unknown repository extensions found:"
 msgstr "發現未知的版本庫擴展："
 
 msgid "unknown repository extensions found:"
 msgstr "發現未知的版本庫擴展："
 

-#: setup.c:596
+#: setup.c:631

 #, c-format
 msgid "error opening '%s'"
 msgstr "開啟 '%s' 發生錯誤"
 
 #, c-format
 msgid "error opening '%s'"
 msgstr "開啟 '%s' 發生錯誤"
 

-#: setup.c:598
+#: setup.c:633

 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "檔案太大，無法作為 .git 檔案：'%s'"
 
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "檔案太大，無法作為 .git 檔案：'%s'"
 

-#: setup.c:600
+#: setup.c:635

 #, c-format
 msgid "error reading %s"
 msgstr "讀取 %s 發生錯誤"
 
 #, c-format
 msgid "error reading %s"
 msgstr "讀取 %s 發生錯誤"
 

-#: setup.c:602
+#: setup.c:637

 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "無效的 gitfile 格式：%s"
 
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "無效的 gitfile 格式：%s"
 

-#: setup.c:604
+#: setup.c:639

 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "在 gitfile 中沒有路徑：%s"
 
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "在 gitfile 中沒有路徑：%s"
 

-#: setup.c:606
+#: setup.c:641

 #, c-format
 msgid "not a git repository: %s"
 msgstr "不是一個 git 版本庫：%s"
 
 #, c-format
 msgid "not a git repository: %s"
 msgstr "不是一個 git 版本庫：%s"
 

-#: setup.c:708
+#: setup.c:743

 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' 太大"
 
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' 太大"
 

-#: setup.c:722
+#: setup.c:757

 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "不是一個 git 版本庫：'%s'"
 
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "不是一個 git 版本庫：'%s'"
 

-#: setup.c:751 setup.c:753 setup.c:784
+#: setup.c:786 setup.c:788 setup.c:819

 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "不能切換目錄到 '%s'"
 
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "不能切換目錄到 '%s'"
 

-#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
+#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904

 msgid "cannot come back to cwd"
 msgstr "無法返回目前工作目錄"
 
 msgid "cannot come back to cwd"
 msgstr "無法返回目前工作目錄"
 

-#: setup.c:883
+#: setup.c:918

 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "取得 '%*s%s%s' 狀態（stat）失敗"
 
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "取得 '%*s%s%s' 狀態（stat）失敗"
 

-#: setup.c:1121
+#: setup.c:1156

 msgid "Unable to read current working directory"
 msgstr "不能讀取目前工作目錄"
 
 msgid "Unable to read current working directory"
 msgstr "不能讀取目前工作目錄"
 

-#: setup.c:1130 setup.c:1136
+#: setup.c:1165 setup.c:1171

 #, c-format
 msgid "cannot change to '%s'"
 msgstr "不能切換到 '%s'"
 
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "不能切換到 '%s'"
 

-#: setup.c:1141
+#: setup.c:1176

 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "不是一個 git 版本庫（或者任何父目錄）：%s"
 
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "不是一個 git 版本庫（或者任何父目錄）：%s"
 

-#: setup.c:1147
+#: setup.c:1182

 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"


@@ -7702,7 +7788,7 @@ msgstr ""
 "不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"
 "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
 
 "不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"
 "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
 

-#: setup.c:1258
+#: setup.c:1293

 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"


@@ -7711,15 +7797,15 @@ msgstr ""
 "參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n"
 "檔案所有者必須始終擁有讀寫權限。"
 
 "參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n"
 "檔案所有者必須始終擁有讀寫權限。"
 

-#: setup.c:1304
+#: setup.c:1340

 msgid "open /dev/null or dup failed"
 msgstr "不能開啟或者複製 /dev/null"
 
 msgid "open /dev/null or dup failed"
 msgstr "不能開啟或者複製 /dev/null"
 

-#: setup.c:1319
+#: setup.c:1355

 msgid "fork failed"
 msgstr "fork 失敗"
 
 msgid "fork failed"
 msgstr "fork 失敗"
 

-#: setup.c:1324
+#: setup.c:1360

 msgid "setsid failed"
 msgstr "setsid 失敗"
 
 msgid "setsid failed"
 msgstr "setsid 失敗"
 


@@ -7899,7 +7985,7 @@ msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"
 msgid "confused by unstable object source data for %s"
 msgstr "被 %s 的不穩定物件源資料搞糊塗了"
 
 msgid "confused by unstable object source data for %s"
 msgstr "被 %s 的不穩定物件源資料搞糊塗了"
 

-#: sha1-file.c:1906 builtin/pack-objects.c:1055
+#: sha1-file.c:1906 builtin/pack-objects.c:1085

 #, c-format
 msgid "failed utime() on %s"
 msgstr "在 %s 上呼叫 utime() 失敗"
 #, c-format
 msgid "failed utime() on %s"
 msgstr "在 %s 上呼叫 utime() 失敗"


@@ -8075,56 +8161,56 @@ msgid "invalid object name '%.*s'."
 msgstr "'%.*s' 物件名稱無效。"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
 msgstr "'%.*s' 物件名稱無效。"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte

-#: strbuf.c:853
+#: strbuf.c:848

 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second

-#: strbuf.c:855
+#: strbuf.c:850

 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte

-#: strbuf.c:863
+#: strbuf.c:858

 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second

-#: strbuf.c:865
+#: strbuf.c:860

 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte

-#: strbuf.c:872
+#: strbuf.c:867

 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second

-#: strbuf.c:874
+#: strbuf.c:869

 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte

-#: strbuf.c:880
+#: strbuf.c:875

 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u 位元組"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u 位元組"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second

-#: strbuf.c:882
+#: strbuf.c:877

 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u 位元組/秒"
 
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u 位元組/秒"
 

-#: strbuf.c:1180
+#: strbuf.c:1175

 #, c-format
 msgid "could not edit '%s'"
 msgstr "無法編輯 '%s'"
 #, c-format
 msgid "could not edit '%s'"
 msgstr "無法編輯 '%s'"


@@ -8363,7 +8449,7 @@ msgstr "不能讀取輸入檔案 '%s'"
 msgid "could not read from stdin"
 msgstr "不能自標準輸入讀取"
 
 msgid "could not read from stdin"
 msgstr "不能自標準輸入讀取"
 

-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1011 wrapper.c:673

 #, c-format
 msgid "could not stat %s"
 msgstr "不能對 %s 呼叫 stat"
 #, c-format
 msgid "could not stat %s"
 msgstr "不能對 %s 呼叫 stat"


@@ -8387,177 +8473,182 @@ msgstr "不能開啟暫存檔"
 msgid "could not rename temporary file to %s"
 msgstr "不能重新命名暫存檔為 %s"
 
 msgid "could not rename temporary file to %s"
 msgstr "不能重新命名暫存檔為 %s"
 

-#: transport-helper.c:61 transport-helper.c:90
+#: transport-helper.c:62 transport-helper.c:91

 msgid "full write to remote helper failed"
 msgstr "完整寫入遠端助手失敗"
 
 msgid "full write to remote helper failed"
 msgstr "完整寫入遠端助手失敗"
 

-#: transport-helper.c:144
+#: transport-helper.c:145

 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "無法為 '%s' 找到遠端助手"
 
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "無法為 '%s' 找到遠端助手"
 

-#: transport-helper.c:160 transport-helper.c:571
+#: transport-helper.c:161 transport-helper.c:575

 msgid "can't dup helper output fd"
 msgstr "無法複製助手輸出檔案句柄"
 
 msgid "can't dup helper output fd"
 msgstr "無法複製助手輸出檔案句柄"
 

-#: transport-helper.c:211
+#: transport-helper.c:214

 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
 "version of Git"
 msgstr "未知的強制能力 %s，該遠端助手可能需要新版本的Git"
 
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
 "version of Git"
 msgstr "未知的強制能力 %s，該遠端助手可能需要新版本的Git"
 

-#: transport-helper.c:217
+#: transport-helper.c:220

 msgid "this remote helper should implement refspec capability"
 msgstr "遠端助手需要實現 refspec 能力"
 
 msgid "this remote helper should implement refspec capability"
 msgstr "遠端助手需要實現 refspec 能力"
 

-#: transport-helper.c:284 transport-helper.c:425
+#: transport-helper.c:287 transport-helper.c:429

 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s 意外地說：'%s'"
 
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s 意外地說：'%s'"
 

-#: transport-helper.c:414
+#: transport-helper.c:417

 #, c-format
 msgid "%s also locked %s"
 msgstr "%s 也鎖定了 %s"
 
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s 也鎖定了 %s"
 

-#: transport-helper.c:493
+#: transport-helper.c:497

 msgid "couldn't run fast-import"
 msgstr "不能執行 fast-import"
 
 msgid "couldn't run fast-import"
 msgstr "不能執行 fast-import"
 

-#: transport-helper.c:516
+#: transport-helper.c:520

 msgid "error while running fast-import"
 msgstr "執行 fast-import 發生錯誤"
 
 msgid "error while running fast-import"
 msgstr "執行 fast-import 發生錯誤"
 

-#: transport-helper.c:545 transport-helper.c:1135
+#: transport-helper.c:549 transport-helper.c:1156

 #, c-format
 msgid "could not read ref %s"
 msgstr "無法讀取引用 %s"
 
 #, c-format
 msgid "could not read ref %s"
 msgstr "無法讀取引用 %s"
 

-#: transport-helper.c:590
+#: transport-helper.c:594

 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "連線時未知的回應：%s"
 
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "連線時未知的回應：%s"
 

-#: transport-helper.c:612
+#: transport-helper.c:616

 msgid "setting remote service path not supported by protocol"
 msgstr "協定不支援設定遠端服務路徑"
 
 msgid "setting remote service path not supported by protocol"
 msgstr "協定不支援設定遠端服務路徑"
 

-#: transport-helper.c:614
+#: transport-helper.c:618

 msgid "invalid remote service path"
 msgstr "無效的遠端服務路徑"
 
 msgid "invalid remote service path"
 msgstr "無效的遠端服務路徑"
 

-#: transport-helper.c:657 transport.c:1339
+#: transport-helper.c:661 transport.c:1347

 msgid "operation not supported by protocol"
 msgstr "協定不支援該動作"
 
 msgid "operation not supported by protocol"
 msgstr "協定不支援該動作"
 

-#: transport-helper.c:660
+#: transport-helper.c:664

 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "不能連線到子服務 %s"
 
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "不能連線到子服務 %s"
 

-#: transport-helper.c:736
+#: transport-helper.c:740

 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "預期 ok/error，助手說 '%s'"
 
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "預期 ok/error，助手說 '%s'"
 

-#: transport-helper.c:789
+#: transport-helper.c:793

 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "助手報告 %s 的意外狀態"
 
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "助手報告 %s 的意外狀態"
 

-#: transport-helper.c:850
+#: transport-helper.c:854

 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "助手 %s 不支援 dry-run"
 
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "助手 %s 不支援 dry-run"
 

-#: transport-helper.c:853
+#: transport-helper.c:857

 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "助手 %s 不支援 --signed"
 
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "助手 %s 不支援 --signed"
 

-#: transport-helper.c:856
+#: transport-helper.c:860

 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "助手 %s 不支援 --signed=if-asked"
 
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "助手 %s 不支援 --signed=if-asked"
 

-#: transport-helper.c:861
+#: transport-helper.c:865

 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "助手 %s 不支援 --atomic"
 
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "助手 %s 不支援 --atomic"
 

-#: transport-helper.c:867
+#: transport-helper.c:871

 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "助手 %s 不支援 'push-option'"
 
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "助手 %s 不支援 'push-option'"
 

-#: transport-helper.c:966
+#: transport-helper.c:970

 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-heper 不支援 push，需要引用表達式"
 
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-heper 不支援 push，需要引用表達式"
 

-#: transport-helper.c:971
+#: transport-helper.c:975

 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "助手 %s 不支援 'force'"
 
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "助手 %s 不支援 'force'"
 

-#: transport-helper.c:1018
+#: transport-helper.c:1022

 msgid "couldn't run fast-export"
 msgstr "無法執行 fast-export"
 
 msgid "couldn't run fast-export"
 msgstr "無法執行 fast-export"
 

-#: transport-helper.c:1023
+#: transport-helper.c:1027

 msgid "error while running fast-export"
 msgstr "執行 fast-export 時發生錯誤"
 
 msgid "error while running fast-export"
 msgstr "執行 fast-export 時發生錯誤"
 

-#: transport-helper.c:1048
+#: transport-helper.c:1052

 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"

-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"

 msgstr ""
 "沒有共同的引用並且也沒有指定，什麼也不會做。\n"
 msgstr ""
 "沒有共同的引用並且也沒有指定，什麼也不會做。\n"

-"可能您應該指定一個分支如 'master'。\n"
+"您或許得指定一個分支。\n"

 
 

-#: transport-helper.c:1121
+#: transport-helper.c:1133
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "不支援的物件格式「%s」"
+
+#: transport-helper.c:1142

 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "引用列表中格式錯誤的回應：%s"
 
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "引用列表中格式錯誤的回應：%s"
 

-#: transport-helper.c:1273
+#: transport-helper.c:1294

 #, c-format
 msgid "read(%s) failed"
 msgstr "讀取（%s）失敗"
 
 #, c-format
 msgid "read(%s) failed"
 msgstr "讀取（%s）失敗"
 

-#: transport-helper.c:1300
+#: transport-helper.c:1321

 #, c-format
 msgid "write(%s) failed"
 msgstr "寫（%s）失敗"
 
 #, c-format
 msgid "write(%s) failed"
 msgstr "寫（%s）失敗"
 

-#: transport-helper.c:1349
+#: transport-helper.c:1370

 #, c-format
 msgid "%s thread failed"
 msgstr "%s 執行緒失敗"
 
 #, c-format
 msgid "%s thread failed"
 msgstr "%s 執行緒失敗"
 

-#: transport-helper.c:1353
+#: transport-helper.c:1374

 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "%s 執行緒等待失敗：%s"
 
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "%s 執行緒等待失敗：%s"
 

-#: transport-helper.c:1372 transport-helper.c:1376
+#: transport-helper.c:1393 transport-helper.c:1397

 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "不能啟動執行緒來複製資料：%s"
 
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "不能啟動執行緒來複製資料：%s"
 

-#: transport-helper.c:1413
+#: transport-helper.c:1434

 #, c-format
 msgid "%s process failed to wait"
 msgstr "%s 進程等待失敗"
 
 #, c-format
 msgid "%s process failed to wait"
 msgstr "%s 進程等待失敗"
 

-#: transport-helper.c:1417
+#: transport-helper.c:1438

 #, c-format
 msgid "%s process failed"
 msgstr "%s 進程失敗"
 
 #, c-format
 msgid "%s process failed"
 msgstr "%s 進程失敗"
 

-#: transport-helper.c:1435 transport-helper.c:1444
+#: transport-helper.c:1456 transport-helper.c:1465

 msgid "can't start thread for copying data"
 msgstr "不能啟動執行緒來複製資料"
 
 msgid "can't start thread for copying data"
 msgstr "不能啟動執行緒來複製資料"
 


@@ -8571,33 +8662,33 @@ msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n"
 msgid "could not read bundle '%s'"
 msgstr "無法讀取 bundle '%s'"
 
 msgid "could not read bundle '%s'"
 msgstr "無法讀取 bundle '%s'"
 

-#: transport.c:214
+#: transport.c:220

 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "傳輸：無效的深度選項 '%s'"
 
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "傳輸：無效的深度選項 '%s'"
 

-#: transport.c:266
+#: transport.c:272

 msgid "see protocol.version in 'git help config' for more details"
 msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息"
 
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息"
 

-#: transport.c:267
+#: transport.c:273

 msgid "server options require protocol version 2 or later"
 msgstr "服務端選項需要版本 2 協定或更高"
 
 msgid "server options require protocol version 2 or later"
 msgstr "服務端選項需要版本 2 協定或更高"
 

-#: transport.c:632
+#: transport.c:631

 msgid "could not parse transport.color.* config"
 msgstr "不能解析 transport.color.* 設定"
 
 msgid "could not parse transport.color.* config"
 msgstr "不能解析 transport.color.* 設定"
 

-#: transport.c:705
+#: transport.c:704

 msgid "support for protocol v2 not implemented yet"
 msgstr "協定 v2 的支援尚未實現"
 
 msgid "support for protocol v2 not implemented yet"
 msgstr "協定 v2 的支援尚未實現"
 

-#: transport.c:839
+#: transport.c:838

 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "設定 '%s' 的取值未知：%s"
 
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "設定 '%s' 的取值未知：%s"
 

-#: transport.c:905
+#: transport.c:904

 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "傳輸 '%s' 不允許"
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "傳輸 '%s' 不允許"


@@ -8606,14 +8697,14 @@ msgstr "傳輸 '%s' 不允許"
 msgid "git-over-rsync is no longer supported"
 msgstr "不再支援 git-over-rsync"
 
 msgid "git-over-rsync is no longer supported"
 msgstr "不再支援 git-over-rsync"
 

-#: transport.c:1052
+#: transport.c:1059

 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到：\n"
 
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到：\n"
 

-#: transport.c:1056
+#: transport.c:1063

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -8640,11 +8731,11 @@ msgstr ""
 "以推送至遠端。\n"
 "\n"
 
 "以推送至遠端。\n"
 "\n"
 

-#: transport.c:1064
+#: transport.c:1071

 msgid "Aborting."
 msgstr "正在終止。"
 
 msgid "Aborting."
 msgstr "正在終止。"
 

-#: transport.c:1209
+#: transport.c:1216

 msgid "failed to push all needed submodules"
 msgstr "不能推送全部需要的子模組"
 
 msgid "failed to push all needed submodules"
 msgstr "不能推送全部需要的子模組"
 


@@ -8909,7 +9000,7 @@ msgstr ""
 msgid "Updating index flags"
 msgstr "正在更新索引旗標"
 
 msgid "Updating index flags"
 msgstr "正在更新索引旗標"
 

-#: upload-pack.c:1337
+#: upload-pack.c:1415

 msgid "expected flush after fetch arguments"
 msgstr "在 fetch 引數應為一個 flush 包"
 
 msgid "expected flush after fetch arguments"
 msgstr "在 fetch 引數應為一個 flush 包"
 


@@ -8946,47 +9037,47 @@ msgstr "無效的 '..' 路徑片段"
 msgid "Fetching objects"
 msgstr "正在抓取物件"
 
 msgid "Fetching objects"
 msgstr "正在抓取物件"
 

-#: worktree.c:262 builtin/am.c:2098
+#: worktree.c:248 builtin/am.c:2098

 #, c-format
 msgid "failed to read '%s'"
 msgstr "讀取 '%s' 失敗"
 
 #, c-format
 msgid "failed to read '%s'"
 msgstr "讀取 '%s' 失敗"
 

-#: worktree.c:309
+#: worktree.c:295

 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "在主工作區的 '%s' 不是版本庫目錄"
 
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "在主工作區的 '%s' 不是版本庫目錄"
 

-#: worktree.c:320
+#: worktree.c:306

 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "檔案 '%s' 不包含工作區的絕對路徑"
 
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "檔案 '%s' 不包含工作區的絕對路徑"
 

-#: worktree.c:332
+#: worktree.c:318

 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' 不存在"
 
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' 不存在"
 

-#: worktree.c:338
+#: worktree.c:324

 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d"
 
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d"
 

-#: worktree.c:347
+#: worktree.c:333

 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' 沒有指回到 '%s'"
 
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' 沒有指回到 '%s'"
 

-#: wrapper.c:186 wrapper.c:356
+#: wrapper.c:194 wrapper.c:364

 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "無法開啟 '%s' 進行讀寫"
 
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "無法開啟 '%s' 進行讀寫"
 

-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:395 wrapper.c:596

 #, c-format
 msgid "unable to access '%s'"
 msgstr "不能存取 '%s'"
 
 #, c-format
 msgid "unable to access '%s'"
 msgstr "不能存取 '%s'"
 

-#: wrapper.c:596
+#: wrapper.c:604

 msgid "unable to get current working directory"
 msgstr "不能取得目前工作目錄"
 
 msgid "unable to get current working directory"
 msgstr "不能取得目前工作目錄"
 


@@ -9394,39 +9485,44 @@ msgstr "您在執行二分尋找動作。"
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  （使用 \"git bisect reset\" 檢出原有分支）"
 
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  （使用 \"git bisect reset\" 檢出原有分支）"
 

-#: wt-status.c:1692
+#: wt-status.c:1494
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "您處於稀疏簽出狀態，包含 %d%% 的追蹤檔案。"
+
+#: wt-status.c:1733

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

-#: wt-status.c:1699
+#: wt-status.c:1740

 msgid "interactive rebase in progress; onto "
 msgstr "互動式重定基底動作正在進行中；至 "
 
 msgid "interactive rebase in progress; onto "
 msgstr "互動式重定基底動作正在進行中；至 "
 

-#: wt-status.c:1701
+#: wt-status.c:1742

 msgid "rebase in progress; onto "
 msgstr "重定基底動作正在進行中；至 "
 
 msgid "rebase in progress; onto "
 msgstr "重定基底動作正在進行中；至 "
 

-#: wt-status.c:1711
+#: wt-status.c:1752

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

-#: wt-status.c:1728
+#: wt-status.c:1769

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

-#: wt-status.c:1729
+#: wt-status.c:1770

 msgid "No commits yet"
 msgstr "尚無提交"
 
 msgid "No commits yet"
 msgstr "尚無提交"
 

-#: wt-status.c:1743
+#: wt-status.c:1784

 msgid "Untracked files"
 msgstr "未追蹤的檔案"
 
 msgid "Untracked files"
 msgstr "未追蹤的檔案"
 

-#: wt-status.c:1745
+#: wt-status.c:1786

 msgid "Ignored files"
 msgstr "忽略的檔案"
 
 msgid "Ignored files"
 msgstr "忽略的檔案"
 

-#: wt-status.c:1749
+#: wt-status.c:1790

 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"


@@ -9436,97 +9532,97 @@ msgstr ""
 "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n"
 "但您需要小心不要忘了新增新檔案（參見 'git help status'）。"
 
 "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n"
 "但您需要小心不要忘了新增新檔案（參見 'git help status'）。"
 

-#: wt-status.c:1755
+#: wt-status.c:1796

 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未追蹤的檔案沒有列出%s"
 
 #  譯者：中文字串拼接，可刪除前導空格
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未追蹤的檔案沒有列出%s"
 
 #  譯者：中文字串拼接，可刪除前導空格

-#: wt-status.c:1757
+#: wt-status.c:1798

 msgid " (use -u option to show untracked files)"
 msgstr " （使用 -u 參數顯示未追蹤的檔案）"
 
 msgid " (use -u option to show untracked files)"
 msgstr " （使用 -u 參數顯示未追蹤的檔案）"
 

-#: wt-status.c:1763
+#: wt-status.c:1804

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

-#: wt-status.c:1768
+#: wt-status.c:1809

 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
 
 #, 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:1771
+#: wt-status.c:1812

 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入提交\n"
 
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入提交\n"
 

-#: wt-status.c:1774
+#: wt-status.c:1815

 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n"
 
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n"
 

-#: wt-status.c:1777
+#: wt-status.c:1818

 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "提交為空，但是存在尚未追蹤的檔案\n"
 
 #  譯者：中文字串拼接，可刪除前導空格
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "提交為空，但是存在尚未追蹤的檔案\n"
 
 #  譯者：中文字串拼接，可刪除前導空格

-#: wt-status.c:1780
+#: wt-status.c:1821

 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n"
 
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n"
 

-#: wt-status.c:1783 wt-status.c:1788
+#: wt-status.c:1824 wt-status.c:1829

 #, c-format
 msgid "nothing to commit\n"
 msgstr "無檔案要提交\n"
 
 #  譯者：中文字串拼接，可刪除前導空格
 #, c-format
 msgid "nothing to commit\n"
 msgstr "無檔案要提交\n"
 
 #  譯者：中文字串拼接，可刪除前導空格

-#: wt-status.c:1786
+#: wt-status.c:1827

 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n"
 
 #  譯者：中文字串拼接，可刪除前導空格
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n"
 
 #  譯者：中文字串拼接，可刪除前導空格

-#: wt-status.c:1790
+#: wt-status.c:1831

 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "沒有要提交的檔案，工作區為乾淨狀態\n"
 
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "沒有要提交的檔案，工作區為乾淨狀態\n"
 

-#: wt-status.c:1903
+#: wt-status.c:1944

 msgid "No commits yet on "
 msgstr "尚無提交在 "
 
 msgid "No commits yet on "
 msgstr "尚無提交在 "
 

-#: wt-status.c:1907
+#: wt-status.c:1948

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

-#: wt-status.c:1938
+#: wt-status.c:1979

 msgid "different"
 msgstr "不同"
 
 #  譯者：請維持句尾空格
 msgid "different"
 msgstr "不同"
 
 #  譯者：請維持句尾空格

-#: wt-status.c:1940 wt-status.c:1948
+#: wt-status.c:1981 wt-status.c:1989

 msgid "behind "
 msgstr "落後 "
 
 msgid "behind "
 msgstr "落後 "
 

-#: wt-status.c:1943 wt-status.c:1946
+#: wt-status.c:1984 wt-status.c:1987

 msgid "ahead "
 msgstr "領先 "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
 msgid "ahead "
 msgstr "領先 "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"

-#: wt-status.c:2468
+#: wt-status.c:2509

 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "不能%s：您有未暫存的變更。"
 
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "不能%s：您有未暫存的變更。"
 

-#: wt-status.c:2474
+#: wt-status.c:2515

 msgid "additionally, your index contains uncommitted changes."
 msgstr "另外，您的索引中包含未提交的變更。"
 
 msgid "additionally, your index contains uncommitted changes."
 msgstr "另外，您的索引中包含未提交的變更。"
 

-#: wt-status.c:2476
+#: wt-status.c:2517

 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "不能%s：您的索引中包含未提交的變更。"
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "不能%s：您的索引中包含未提交的變更。"


@@ -9603,7 +9699,7 @@ msgstr "測試執行"
 msgid "interactive picking"
 msgstr "互動式揀選"
 
 msgid "interactive picking"
 msgstr "互動式揀選"
 

-#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
+#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308

 msgid "select hunks interactively"
 msgstr "互動式挑選資料區塊"
 
 msgid "select hunks interactively"
 msgstr "互動式挑選資料區塊"
 


@@ -9728,12 +9824,12 @@ msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用"
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x"
 
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x"
 

-#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351
+#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351

 #: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
 msgid "--pathspec-from-file is incompatible with pathspec arguments"
 msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容"
 
 #: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
 msgid "--pathspec-from-file is incompatible with pathspec arguments"
 msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容"
 

-#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357
+#: builtin/add.c:508 builtin/checkout.c:1713 builtin/commit.c:357

 #: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
 msgid "--pathspec-file-nul requires --pathspec-from-file"
 msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
 #: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
 msgid "--pathspec-file-nul requires --pathspec-from-file"
 msgstr "--pathspec-file-nul 需要 --pathspec-from-file"


@@ -9989,7 +10085,7 @@ msgstr "老的參數 —— 無作用"
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必要，允許使用三方合併"
 
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必要，允許使用三方合併"
 

-#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
+#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16

 #: builtin/repack.c:306 builtin/stash.c:816
 msgid "be quiet"
 msgstr "靜默模式"
 #: builtin/repack.c:306 builtin/stash.c:816
 msgid "be quiet"
 msgstr "靜默模式"


@@ -10044,7 +10140,7 @@ msgstr "n"
 
 #: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
 #: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
 
 #: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
 #: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38

-#: bugreport.c:131
+#: bugreport.c:137

 msgid "format"
 msgstr "格式"
 
 msgid "format"
 msgstr "格式"
 


@@ -10334,111 +10430,115 @@ msgstr ""
 "指令 'git bisect terms' 的參數 %s 無效。\n"
 "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。"
 
 "指令 'git bisect terms' 的參數 %s 無效。\n"
 "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。"
 

-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473
+msgid "'' is not a valid term"
+msgstr "'' 不是一個有效的術語"
+
+#: builtin/bisect--helper.c:483

 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "未識別的選項：'%s'"
 
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "未識別的選項：'%s'"
 

-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:487

 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' 看起來不是一個有效的版本"
 
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' 看起來不是一個有效的版本"
 

-#: builtin/bisect--helper.c:514
+#: builtin/bisect--helper.c:519

 msgid "bad HEAD - I need a HEAD"
 msgstr "壞的 HEAD - 我需要一個 HEAD"
 
 msgid "bad HEAD - I need a HEAD"
 msgstr "壞的 HEAD - 我需要一個 HEAD"
 

-#: builtin/bisect--helper.c:529
+#: builtin/bisect--helper.c:534

 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr "檢出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
 
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr "檢出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
 

-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:555

 msgid "won't bisect on cg-seek'ed tree"
 msgstr "不會在做了 cg-seek 的樹上做二分尋找"
 
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "不會在做了 cg-seek 的樹上做二分尋找"
 

-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:558

 msgid "bad HEAD - strange symbolic ref"
 msgstr "壞的 HEAD - 奇怪的符號引用"
 
 msgid "bad HEAD - strange symbolic ref"
 msgstr "壞的 HEAD - 奇怪的符號引用"
 

-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:582

 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "無效的引用：'%s'"
 
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "無效的引用：'%s'"
 

-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:638

 msgid "perform 'git bisect next'"
 msgstr "執行 'git bisect next'"
 
 msgid "perform 'git bisect next'"
 msgstr "執行 'git bisect next'"
 

-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:640

 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "將術語寫入 .git/BISECT_TERMS"
 
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "將術語寫入 .git/BISECT_TERMS"
 

-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:642

 msgid "cleanup the bisection state"
 msgstr "清除二分尋找狀態"
 
 msgid "cleanup the bisection state"
 msgstr "清除二分尋找狀態"
 

-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:644

 msgid "check for expected revs"
 msgstr "檢查預期的版本"
 
 msgid "check for expected revs"
 msgstr "檢查預期的版本"
 

-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:646

 msgid "reset the bisection state"
 msgstr "清除二分尋找狀態"
 
 msgid "reset the bisection state"
 msgstr "清除二分尋找狀態"
 

-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:648

 msgid "write out the bisection state in BISECT_LOG"
 msgstr "將二分尋找的狀態寫入 BISECT_LOG"
 
 msgid "write out the bisection state in BISECT_LOG"
 msgstr "將二分尋找的狀態寫入 BISECT_LOG"
 

-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:650

 msgid "check and set terms in a bisection state"
 msgstr "在一個二分尋找狀態中檢查和設定術語"
 
 msgid "check and set terms in a bisection state"
 msgstr "在一個二分尋找狀態中檢查和設定術語"
 

-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:652

 msgid "check whether bad or good terms exist"
 msgstr "檢查壞的或好的術語是否存在"
 
 msgid "check whether bad or good terms exist"
 msgstr "檢查壞的或好的術語是否存在"
 

-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:654

 msgid "print out the bisect terms"
 msgstr "列印二分尋找術語"
 
 msgid "print out the bisect terms"
 msgstr "列印二分尋找術語"
 

-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:656

 msgid "start the bisect session"
 msgstr "啟動二分尋找過程"
 
 msgid "start the bisect session"
 msgstr "啟動二分尋找過程"
 

-#: builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:658

 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "更新 BISECT_HEAD 而非檢出目前提交"
 
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "更新 BISECT_HEAD 而非檢出目前提交"
 

-#: builtin/bisect--helper.c:655
+#: builtin/bisect--helper.c:660

 msgid "no log for BISECT_WRITE"
 msgstr "BISECT_WRITE 無日誌"
 
 msgid "no log for BISECT_WRITE"
 msgstr "BISECT_WRITE 無日誌"
 

-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:678

 msgid "--write-terms requires two arguments"
 msgstr "--write-terms 需要兩個參數"
 
 msgid "--write-terms requires two arguments"
 msgstr "--write-terms 需要兩個參數"
 

-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:682

 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state 不帶參數"
 
 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state 不帶參數"
 

-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:689

 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset 無需參數或者需要一個提交"
 
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset 無需參數或者需要一個提交"
 

-#: builtin/bisect--helper.c:688
+#: builtin/bisect--helper.c:693

 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr "--bisect-write 需要 4 或 5 個參數"
 
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr "--bisect-write 需要 4 或 5 個參數"
 

-#: builtin/bisect--helper.c:694
+#: builtin/bisect--helper.c:699

 msgid "--check-and-set-terms requires 3 arguments"
 msgstr "--check-and-set-terms 需要 3 個參數"
 
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr "--check-and-set-terms 需要 3 個參數"
 

-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:705

 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check 需要 2 或 3 個參數"
 
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check 需要 2 或 3 個參數"
 

-#: builtin/bisect--helper.c:706
+#: builtin/bisect--helper.c:711

 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms 需要 0 或 1 個參數"
 
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms 需要 0 或 1 個參數"
 


@@ -11035,19 +11135,19 @@ msgstr "git bundle list-heads <檔案> [<參考名稱>...]"
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <檔案> [<參考名稱>...]"
 
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <檔案> [<參考名稱>...]"
 

-#: builtin/bundle.c:66 builtin/pack-objects.c:3376
+#: builtin/bundle.c:66 builtin/pack-objects.c:3448

 msgid "do not show progress meter"
 msgstr "不顯示進度表"
 
 msgid "do not show progress meter"
 msgstr "不顯示進度表"
 

-#: builtin/bundle.c:68 builtin/pack-objects.c:3378
+#: builtin/bundle.c:68 builtin/pack-objects.c:3450

 msgid "show progress meter"
 msgstr "顯示進度表"
 
 msgid "show progress meter"
 msgstr "顯示進度表"
 

-#: builtin/bundle.c:70 builtin/pack-objects.c:3380
+#: builtin/bundle.c:70 builtin/pack-objects.c:3452

 msgid "show progress meter during object writing phase"
 msgstr "在物件寫入階段顯示進度表"
 
 msgid "show progress meter during object writing phase"
 msgstr "在物件寫入階段顯示進度表"
 

-#: builtin/bundle.c:73 builtin/pack-objects.c:3383
+#: builtin/bundle.c:73 builtin/pack-objects.c:3455

 msgid "similar to --all-progress when progress meter is shown"
 msgstr "當進度表顯示時類似於 --all-progress"
 
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "當進度表顯示時類似於 --all-progress"
 


@@ -11086,12 +11186,15 @@ msgstr ""
 "p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"
 
 #: builtin/cat-file.c:599
 "p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"
 
 #: builtin/cat-file.c:599

+#| msgid ""
+#| "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "
+#| "--filters]"

 msgid ""
 msgid ""

-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"

 msgstr ""
 msgstr ""

-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"

 
 #: builtin/cat-file.c:620
 msgid "only one batch option may be specified"
 
 #: builtin/cat-file.c:620
 msgid "only one batch option may be specified"


@@ -11125,7 +11228,7 @@ msgstr "對於資料物件，對其內容做文字轉換"
 msgid "for blob objects, run filters on object's content"
 msgstr "對於資料物件，對其內容做過濾"
 
 msgid "for blob objects, run filters on object's content"
 msgstr "對於資料物件，對其內容做過濾"
 

-#: builtin/cat-file.c:648 git-submodule.sh:984
+#: builtin/cat-file.c:648 git-submodule.sh:958

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


@@ -11185,8 +11288,8 @@ msgstr "從標準輸入讀出檔案名"
 msgid "terminate input and output records by a NUL character"
 msgstr "輸入和輸出的紀錄使用 NUL 字元終結"
 
 msgid "terminate input and output records by a NUL character"
 msgstr "輸入和輸出的紀錄使用 NUL 字元終結"
 

-#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537
-#: builtin/worktree.c:502
+#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537
+#: builtin/worktree.c:561

 msgid "suppress progress reporting"
 msgstr "不顯示進度報告"
 
 msgid "suppress progress reporting"
 msgstr "不顯示進度報告"
 


@@ -11278,7 +11381,7 @@ msgstr "將內容寫入暫存檔"
 #: builtin/checkout-index.c:178 builtin/column.c:31
 #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
 #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
 #: builtin/checkout-index.c:178 builtin/column.c:31
 #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
 #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909

-#: builtin/worktree.c:675
+#: builtin/worktree.c:754

 msgid "string"
 msgstr "字串"
 
 msgid "string"
 msgstr "字串"
 


@@ -11390,11 +11493,11 @@ msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
 msgid "path '%s' is unmerged"
 msgstr "路徑 '%s' 未合併"
 
 msgid "path '%s' is unmerged"
 msgstr "路徑 '%s' 未合併"
 

-#: builtin/checkout.c:704
+#: builtin/checkout.c:702

 msgid "you need to resolve your current index first"
 msgstr "您需要先解決目前索引的衝突"
 
 msgid "you need to resolve your current index first"
 msgstr "您需要先解決目前索引的衝突"
 

-#: builtin/checkout.c:758
+#: builtin/checkout.c:756

 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"


@@ -11403,51 +11506,51 @@ msgstr ""
 "不能繼續，下列檔案有暫存的修改：\n"
 "%s"
 
 "不能繼續，下列檔案有暫存的修改：\n"
 "%s"
 

-#: builtin/checkout.c:861
+#: builtin/checkout.c:859

 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "不能對 '%s' 執行 reflog 動作：%s\n"
 
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "不能對 '%s' 執行 reflog 動作：%s\n"
 

-#: builtin/checkout.c:903
+#: builtin/checkout.c:901

 msgid "HEAD is now at"
 msgstr "HEAD 目前位於"
 
 msgid "HEAD is now at"
 msgstr "HEAD 目前位於"
 

-#: builtin/checkout.c:907 builtin/clone.c:720
+#: builtin/checkout.c:905 builtin/clone.c:720

 msgid "unable to update HEAD"
 msgstr "不能更新 HEAD"
 
 msgid "unable to update HEAD"
 msgstr "不能更新 HEAD"
 

-#: builtin/checkout.c:911
+#: builtin/checkout.c:909

 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "重設分支 '%s'\n"
 
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "重設分支 '%s'\n"
 

-#: builtin/checkout.c:914
+#: builtin/checkout.c:912

 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已經位於 '%s'\n"
 
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已經位於 '%s'\n"
 

-#: builtin/checkout.c:918
+#: builtin/checkout.c:916

 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切換並重設分支 '%s'\n"
 
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切換並重設分支 '%s'\n"
 

-#: builtin/checkout.c:920 builtin/checkout.c:1344
+#: builtin/checkout.c:918 builtin/checkout.c:1342

 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切換到一個新分支 '%s'\n"
 
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切換到一個新分支 '%s'\n"
 

-#: builtin/checkout.c:922
+#: builtin/checkout.c:920

 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切換到分支 '%s'\n"
 
 #  譯者：請維持前導空格
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切換到分支 '%s'\n"
 
 #  譯者：請維持前導空格

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

 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... 及其它 %d 個。\n"
 
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... 及其它 %d 個。\n"
 

-#: builtin/checkout.c:979
+#: builtin/checkout.c:977

 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"


@@ -11464,7 +11567,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
 "\n"
 "%s\n"
 

-#: builtin/checkout.c:998
+#: builtin/checkout.c:996

 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"


@@ -11485,19 +11588,19 @@ msgstr[0] ""
 " git branch <新分支名> %s\n"
 "\n"
 
 " git branch <新分支名> %s\n"
 "\n"
 

-#: builtin/checkout.c:1033
+#: builtin/checkout.c:1031

 msgid "internal error in revision walk"
 msgstr "在版本遍歷時遇到內部錯誤"
 
 msgid "internal error in revision walk"
 msgstr "在版本遍歷時遇到內部錯誤"
 

-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1035

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

-#: builtin/checkout.c:1077 builtin/checkout.c:1339
+#: builtin/checkout.c:1075 builtin/checkout.c:1337

 msgid "You are on a branch yet to be born"
 msgstr "您位於一個尚未初始化的分支"
 
 msgid "You are on a branch yet to be born"
 msgstr "您位於一個尚未初始化的分支"
 

-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1150

 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"


@@ -11506,7 +11609,7 @@ msgstr ""
 "'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n"
 "請使用 --（和可選的 --no-guess）來消除歧義"
 
 "'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n"
 "請使用 --（和可選的 --no-guess）來消除歧義"
 

-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1157

 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"
 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"


@@ -11525,51 +11628,51 @@ msgstr ""
 "如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n"
 "版本庫名，可以在設定中設定 checkout.defaultRemote=origin。"
 
 "如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n"
 "版本庫名，可以在設定中設定 checkout.defaultRemote=origin。"
 

-#: builtin/checkout.c:1169
+#: builtin/checkout.c:1167

 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' 符合多個 (%d) 遠端追蹤分支"
 
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' 符合多個 (%d) 遠端追蹤分支"
 

-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1233

 msgid "only one reference expected"
 msgstr "預期只有一個引用"
 
 msgid "only one reference expected"
 msgstr "預期只有一個引用"
 

-#: builtin/checkout.c:1252
+#: builtin/checkout.c:1250

 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "應只有一個引用，卻提供了 %d 個。"
 
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "應只有一個引用，卻提供了 %d 個。"
 

-#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451
+#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510

 #, c-format
 msgid "invalid reference: %s"
 msgstr "無效引用：%s"
 
 #, c-format
 msgid "invalid reference: %s"
 msgstr "無效引用：%s"
 

-#: builtin/checkout.c:1311 builtin/checkout.c:1677
+#: builtin/checkout.c:1309 builtin/checkout.c:1675

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

-#: builtin/checkout.c:1358
+#: builtin/checkout.c:1356

 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "期望一個分支，得到標籤 '%s'"
 
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "期望一個分支，得到標籤 '%s'"
 

-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1358

 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "期望一個分支，得到遠端分支 '%s'"
 
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "期望一個分支，得到遠端分支 '%s'"
 

-#: builtin/checkout.c:1361 builtin/checkout.c:1369
+#: builtin/checkout.c:1359 builtin/checkout.c:1367

 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "期望一個分支，得到 '%s'"
 
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "期望一個分支，得到 '%s'"
 

-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1362

 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "期望一個分支，得到提交 '%s'"
 
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "期望一個分支，得到提交 '%s'"
 

-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1378

 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."


@@ -11577,7 +11680,7 @@ msgstr ""
 "不能在合併時切換分支\n"
 "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"
 
 "不能在合併時切換分支\n"
 "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"
 

-#: builtin/checkout.c:1384
+#: builtin/checkout.c:1382

 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."


@@ -11585,7 +11688,7 @@ msgstr ""
 "不能在 am 工作階段期間切換分支\n"
 "考慮使用 \"git am --quit\" 或 \"git worktree add\"。"
 
 "不能在 am 工作階段期間切換分支\n"
 "考慮使用 \"git am --quit\" 或 \"git worktree add\"。"
 

-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1386

 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."


@@ -11593,7 +11696,7 @@ msgstr ""
 "不能在重定基底時切換分支\n"
 "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"
 
 "不能在重定基底時切換分支\n"
 "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"
 

-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1390

 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."


@@ -11601,7 +11704,7 @@ msgstr ""
 "不能在揀選時切換分支\n"
 "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
 
 "不能在揀選時切換分支\n"
 "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
 

-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1394

 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."


@@ -11609,213 +11712,214 @@ msgstr ""
 "不能在還原時切換分支\n"
 "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"
 
 "不能在還原時切換分支\n"
 "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"
 

-#: builtin/checkout.c:1400
+#: builtin/checkout.c:1398

 msgid "you are switching branch while bisecting"
 msgstr "您在執行二分尋找時切換分支"
 
 msgid "you are switching branch while bisecting"
 msgstr "您在執行二分尋找時切換分支"
 

-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405

 msgid "paths cannot be used with switching branches"
 msgstr "路徑不能和切換分支同時使用"
 
 msgid "paths cannot be used with switching branches"
 msgstr "路徑不能和切換分支同時使用"
 

-#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
+#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416

 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' 不能和切換分支同時使用"
 
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' 不能和切換分支同時使用"
 

-#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
-#: builtin/checkout.c:1433 builtin/checkout.c:1438
+#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426
+#: builtin/checkout.c:1431 builtin/checkout.c:1436

 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' 不能和 '%s' 同時使用"
 
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' 不能和 '%s' 同時使用"
 

-#: builtin/checkout.c:1435
+#: builtin/checkout.c:1433

 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' 不帶 <起始點>"
 
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' 不帶 <起始點>"
 

-#: builtin/checkout.c:1443
+#: builtin/checkout.c:1441

 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "不能切換分支到一個非提交 '%s'"
 
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "不能切換分支到一個非提交 '%s'"
 

-#: builtin/checkout.c:1450
+#: builtin/checkout.c:1448

 msgid "missing branch or commit argument"
 msgstr "缺少分支或提交參數"
 
 msgid "missing branch or commit argument"
 msgstr "缺少分支或提交參數"
 

-#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80
-#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288
+#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82
+#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288

 #: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "強制顯示進度報告"
 
 #: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
 #: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "強制顯示進度報告"
 

-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1491

 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支執行三方合併"
 
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支執行三方合併"
 

-#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322
+#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322

 msgid "style"
 msgstr "風格"
 
 msgid "style"
 msgstr "風格"
 

-#: builtin/checkout.c:1495
+#: builtin/checkout.c:1493

 msgid "conflict style (merge or diff3)"
 msgstr "衝突輸出風格（merge 或 diff3）"
 
 msgid "conflict style (merge or diff3)"
 msgstr "衝突輸出風格（merge 或 diff3）"
 

-#: builtin/checkout.c:1507 builtin/worktree.c:499
+#: builtin/checkout.c:1505 builtin/worktree.c:558

 msgid "detach HEAD at named commit"
 msgstr "HEAD 從指定的提交分離"
 
 msgid "detach HEAD at named commit"
 msgstr "HEAD 從指定的提交分離"
 

-#: builtin/checkout.c:1508
+#: builtin/checkout.c:1506

 msgid "set upstream info for new branch"
 msgstr "為新的分支設定上游訊息"
 
 msgid "set upstream info for new branch"
 msgstr "為新的分支設定上游訊息"
 

-#: builtin/checkout.c:1510
+#: builtin/checkout.c:1508

 msgid "force checkout (throw away local modifications)"
 msgstr "強制檢出（捨棄本機修改）"
 
 msgid "force checkout (throw away local modifications)"
 msgstr "強制檢出（捨棄本機修改）"
 

-#: builtin/checkout.c:1512
+#: builtin/checkout.c:1510

 msgid "new-branch"
 msgstr "新分支"
 
 msgid "new-branch"
 msgstr "新分支"
 

-#: builtin/checkout.c:1512
+#: builtin/checkout.c:1510

 msgid "new unparented branch"
 msgstr "新的沒有父提交的分支"
 
 msgid "new unparented branch"
 msgstr "新的沒有父提交的分支"
 

-#: builtin/checkout.c:1514 builtin/merge.c:292
+#: builtin/checkout.c:1512 builtin/merge.c:292

 msgid "update ignored files (default)"
 msgstr "更新忽略的檔案（預設）"
 
 msgid "update ignored files (default)"
 msgstr "更新忽略的檔案（預設）"
 

-#: builtin/checkout.c:1517
+#: builtin/checkout.c:1515

 msgid "do not check if another worktree is holding the given ref"
 msgstr "不檢查指定的引用是否被其他工作區所占用"
 
 msgid "do not check if another worktree is holding the given ref"
 msgstr "不檢查指定的引用是否被其他工作區所占用"
 

-#: builtin/checkout.c:1530
+#: builtin/checkout.c:1528

 msgid "checkout our version for unmerged files"
 msgstr "對尚未合併的檔案檢出我們的版本"
 
 msgid "checkout our version for unmerged files"
 msgstr "對尚未合併的檔案檢出我們的版本"
 

-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1531

 msgid "checkout their version for unmerged files"
 msgstr "對尚未合併的檔案檢出他們的版本"
 
 msgid "checkout their version for unmerged files"
 msgstr "對尚未合併的檔案檢出他們的版本"
 

-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535

 msgid "do not limit pathspecs to sparse entries only"
 msgstr "對路徑不做稀疏檢出的限制"
 
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "對路徑不做稀疏檢出的限制"
 

-#: builtin/checkout.c:1592
+#: builtin/checkout.c:1590

 #, c-format
 msgid "-%c, -%c and --orphan are mutually exclusive"
 msgstr "-%c、-%c 和 --orphan 是互斥的"
 
 #, c-format
 msgid "-%c, -%c and --orphan are mutually exclusive"
 msgstr "-%c、-%c 和 --orphan 是互斥的"
 

-#: builtin/checkout.c:1596
+#: builtin/checkout.c:1594

 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p 和 --overlay 互斥"
 
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p 和 --overlay 互斥"
 

-#: builtin/checkout.c:1633
+#: builtin/checkout.c:1631

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

-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1636

 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "缺少分支名稱，請嘗試 -%c"
 
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "缺少分支名稱，請嘗試 -%c"
 

-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1668

 #, c-format
 msgid "could not resolve %s"
 msgstr "無法解析 %s"
 
 #, c-format
 msgid "could not resolve %s"
 msgstr "無法解析 %s"
 

-#: builtin/checkout.c:1686
+#: builtin/checkout.c:1684

 msgid "invalid path specification"
 msgstr "無效的路徑規格"
 
 msgid "invalid path specification"
 msgstr "無效的路徑規格"
 

-#: builtin/checkout.c:1693
+#: builtin/checkout.c:1691

 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'"
 
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'"
 

-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1695

 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach 不能接收路徑參數 '%s'"
 
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach 不能接收路徑參數 '%s'"
 

-#: builtin/checkout.c:1706
+#: builtin/checkout.c:1704

 msgid "--pathspec-from-file is incompatible with --detach"
 msgstr "--pathspec-from-file 與 --detach 不相容"
 
 msgid "--pathspec-from-file is incompatible with --detach"
 msgstr "--pathspec-from-file 與 --detach 不相容"
 

-#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503
+#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503

 msgid "--pathspec-from-file is incompatible with --patch"
 msgstr "--pathspec-from-file 與 --patch 不相容"
 
 msgid "--pathspec-from-file is incompatible with --patch"
 msgstr "--pathspec-from-file 與 --patch 不相容"
 

-#: builtin/checkout.c:1720
+#: builtin/checkout.c:1718

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

-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1723

 msgid "you must specify path(s) to restore"
 msgstr "您必須指定一個要復原的路徑"
 
 msgid "you must specify path(s) to restore"
 msgstr "您必須指定一個要復原的路徑"
 

-#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802
-#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497
+#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800
+#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554
+#: builtin/worktree.c:556

 msgid "branch"
 msgstr "分支"
 
 msgid "branch"
 msgstr "分支"
 

-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750

 msgid "create and checkout a new branch"
 msgstr "建立並檢出一個新的分支"
 
 msgid "create and checkout a new branch"
 msgstr "建立並檢出一個新的分支"
 

-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1752

 msgid "create/reset and checkout a branch"
 msgstr "建立/重設並檢出一個分支"
 
 msgid "create/reset and checkout a branch"
 msgstr "建立/重設並檢出一個分支"
 

-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1753

 msgid "create reflog for new branch"
 msgstr "為新的分支建立引用日誌"
 
 msgid "create reflog for new branch"
 msgstr "為新的分支建立引用日誌"
 

-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755

 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "二次猜測 'git checkout <無此分支>'（預設）"
 
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "二次猜測 'git checkout <無此分支>'（預設）"
 

-#: builtin/checkout.c:1758
+#: builtin/checkout.c:1756

 msgid "use overlay mode (default)"
 msgstr "使用疊加模式（預設）"
 
 msgid "use overlay mode (default)"
 msgstr "使用疊加模式（預設）"
 

-#: builtin/checkout.c:1803
+#: builtin/checkout.c:1801

 msgid "create and switch to a new branch"
 msgstr "建立並切換一個新分支"
 
 msgid "create and switch to a new branch"
 msgstr "建立並切換一個新分支"
 

-#: builtin/checkout.c:1805
+#: builtin/checkout.c:1803

 msgid "create/reset and switch to a branch"
 msgstr "建立/重設並切換一個分支"
 
 msgid "create/reset and switch to a branch"
 msgstr "建立/重設並切換一個分支"
 

-#: builtin/checkout.c:1807
+#: builtin/checkout.c:1805

 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "二次猜測 'git switch <無此分支>'"
 
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "二次猜測 'git switch <無此分支>'"
 

-#: builtin/checkout.c:1809
+#: builtin/checkout.c:1807

 msgid "throw away local modifications"
 msgstr "捨棄本機修改"
 
 msgid "throw away local modifications"
 msgstr "捨棄本機修改"
 

-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1841

 msgid "which tree-ish to checkout from"
 msgstr "要檢出哪一個樹"
 
 msgid "which tree-ish to checkout from"
 msgstr "要檢出哪一個樹"
 

-#: builtin/checkout.c:1845
+#: builtin/checkout.c:1843

 msgid "restore the index"
 msgstr "復原索引"
 
 msgid "restore the index"
 msgstr "復原索引"
 

-#: builtin/checkout.c:1847
+#: builtin/checkout.c:1845

 msgid "restore the working tree (default)"
 msgstr "復原工作區（預設）"
 
 msgid "restore the working tree (default)"
 msgstr "復原工作區（預設）"
 

-#: builtin/checkout.c:1849
+#: builtin/checkout.c:1847

 msgid "ignore unmerged entries"
 msgstr "忽略未合併條目"
 
 msgid "ignore unmerged entries"
 msgstr "忽略未合併條目"
 

-#: builtin/checkout.c:1850
+#: builtin/checkout.c:1848

 msgid "use overlay mode"
 msgstr "使用疊加模式"
 
 msgid "use overlay mode"
 msgstr "使用疊加模式"
 


@@ -11977,24 +12081,24 @@ msgstr "也刪除忽略的檔案"
 msgid "remove only ignored files"
 msgstr "只刪除忽略的檔案"
 
 msgid "remove only ignored files"
 msgstr "只刪除忽略的檔案"
 

-#: builtin/clean.c:931
-msgid "-x and -X cannot be used together"
-msgstr "-x 和 -X 不能同時使用"
-
-#: builtin/clean.c:935
+#: builtin/clean.c:929

 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 "clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"
 
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 "clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"
 

-#: builtin/clean.c:938
+#: builtin/clean.c:932

 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"
 
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"
 

+#: builtin/clean.c:944
+msgid "-x and -X cannot be used together"
+msgstr "-x 和 -X 不能同時使用"
+

 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]"
 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]"


@@ -12003,7 +12107,7 @@ msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]"
 msgid "don't create a checkout"
 msgstr "不建立一個檢出"
 
 msgid "don't create a checkout"
 msgstr "不建立一個檢出"
 

-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554

 msgid "create a bare repository"
 msgstr "建立一個純版本庫"
 
 msgid "create a bare repository"
 msgstr "建立一個純版本庫"
 


@@ -12035,11 +12139,11 @@ msgstr "在複製時初始化子模組"
 msgid "number of submodules cloned in parallel"
 msgstr "並發複製的子模組的數量"
 
 msgid "number of submodules cloned in parallel"
 msgstr "並發複製的子模組的數量"
 

-#: builtin/clone.c:111 builtin/init-db.c:533
+#: builtin/clone.c:111 builtin/init-db.c:551

 msgid "template-directory"
 msgstr "範本目錄"
 
 msgid "template-directory"
 msgstr "範本目錄"
 

-#: builtin/clone.c:112 builtin/init-db.c:534
+#: builtin/clone.c:112 builtin/init-db.c:552

 msgid "directory from which templates will be used"
 msgstr "範本目錄將被使用"
 
 msgid "directory from which templates will be used"
 msgstr "範本目錄將被使用"
 


@@ -12053,8 +12157,8 @@ msgstr "參考版本庫"
 msgid "use --reference only while cloning"
 msgstr "僅在複製時參考 --reference 指向的本機版本庫"
 
 msgid "use --reference only while cloning"
 msgstr "僅在複製時參考 --reference 指向的本機版本庫"
 

-#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3442 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329

 msgid "name"
 msgstr "名稱"
 
 msgid "name"
 msgstr "名稱"
 


@@ -12079,7 +12183,7 @@ msgstr "深度"
 msgid "create a shallow clone of that depth"
 msgstr "建立一個指定深度的淺複製"
 
 msgid "create a shallow clone of that depth"
 msgstr "建立一個指定深度的淺複製"
 

-#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431
+#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503

 #: builtin/pull.c:211
 msgid "time"
 msgstr "時間"
 #: builtin/pull.c:211
 msgid "time"
 msgstr "時間"


@@ -12110,11 +12214,11 @@ msgstr "不要複製任何標籤，並且後續取得動作也不下載它們"
 msgid "any cloned submodules will be shallow"
 msgstr "子模組將以淺下載模式複製"
 
 msgid "any cloned submodules will be shallow"
 msgstr "子模組將以淺下載模式複製"
 

-#: builtin/clone.c:137 builtin/init-db.c:542
+#: builtin/clone.c:137 builtin/init-db.c:560

 msgid "gitdir"
 msgstr "git目錄"
 
 msgid "gitdir"
 msgstr "git目錄"
 

-#: builtin/clone.c:138 builtin/init-db.c:543
+#: builtin/clone.c:138 builtin/init-db.c:561

 msgid "separate git dir from working tree"
 msgstr "git目錄和工作區分離"
 
 msgid "separate git dir from working tree"
 msgstr "git目錄和工作區分離"
 


@@ -12241,7 +12345,7 @@ msgstr "無法執行 repack 來清理"
 msgid "cannot unlink temporary alternates file"
 msgstr "無法刪除暫時的 alternates 檔案"
 
 msgid "cannot unlink temporary alternates file"
 msgstr "無法刪除暫時的 alternates 檔案"
 

-#: builtin/clone.c:971 builtin/receive-pack.c:1972
+#: builtin/clone.c:971 builtin/receive-pack.c:1982

 msgid "Too many arguments."
 msgstr "太多參數。"
 
 msgid "Too many arguments."
 msgstr "太多參數。"
 


@@ -12258,83 +12362,83 @@ msgstr "--bare 和 --origin %s 選項不相容。"
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare 和 --separate-git-dir 選項不相容。"
 
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare 和 --separate-git-dir 選項不相容。"
 

-#: builtin/clone.c:1004
+#: builtin/clone.c:1007

 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "版本庫 '%s' 不存在"
 
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "版本庫 '%s' 不存在"
 

-#: builtin/clone.c:1010 builtin/fetch.c:1789
+#: builtin/clone.c:1011 builtin/fetch.c:1794

 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s 不是一個正數"
 
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s 不是一個正數"
 

-#: builtin/clone.c:1020
+#: builtin/clone.c:1021

 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目標路徑 '%s' 已經存在，並且不是一個空目錄。"
 
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目標路徑 '%s' 已經存在，並且不是一個空目錄。"
 

-#: builtin/clone.c:1030
+#: builtin/clone.c:1033

 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作區 '%s' 已經存在。"
 
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作區 '%s' 已經存在。"
 

-#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271
-#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271
+#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386

 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "不能為 '%s' 建立先導目錄"
 
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "不能為 '%s' 建立先導目錄"
 

-#: builtin/clone.c:1050
+#: builtin/clone.c:1053

 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "不能建立工作區目錄 '%s'"
 
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "不能建立工作區目錄 '%s'"
 

-#: builtin/clone.c:1070
+#: builtin/clone.c:1073

 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "複製到純版本庫 '%s'...\n"
 
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "複製到純版本庫 '%s'...\n"
 

-#: builtin/clone.c:1072
+#: builtin/clone.c:1075

 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正複製到 '%s'...\n"
 
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正複製到 '%s'...\n"
 

-#: builtin/clone.c:1096
+#: builtin/clone.c:1099

 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不相容"
 
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不相容"
 

-#: builtin/clone.c:1160
+#: builtin/clone.c:1164

 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本機複製時被忽略，請改用 file:// 協定。"
 
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本機複製時被忽略，請改用 file:// 協定。"
 

-#: builtin/clone.c:1162
+#: builtin/clone.c:1166

 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since 在本機複製時被忽略，請改用 file:// 協定。"
 
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since 在本機複製時被忽略，請改用 file:// 協定。"
 

-#: builtin/clone.c:1164
+#: builtin/clone.c:1168

 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude 在本機複製時被忽略，請改用 file:// 協定。"
 
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude 在本機複製時被忽略，請改用 file:// 協定。"
 

-#: builtin/clone.c:1166
+#: builtin/clone.c:1170

 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter 在本機複製時被忽略，請改用 file:// 協定。"
 
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter 在本機複製時被忽略，請改用 file:// 協定。"
 

-#: builtin/clone.c:1169
+#: builtin/clone.c:1173

 msgid "source repository is shallow, ignoring --local"
 msgstr "源版本庫是淺複製，忽略 --local"
 
 msgid "source repository is shallow, ignoring --local"
 msgstr "源版本庫是淺複製，忽略 --local"
 

-#: builtin/clone.c:1174
+#: builtin/clone.c:1178

 msgid "--local is ignored"
 msgstr "--local 被忽略"
 
 msgid "--local is ignored"
 msgstr "--local 被忽略"
 

-#: builtin/clone.c:1249 builtin/clone.c:1257
+#: builtin/clone.c:1262 builtin/clone.c:1270

 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "遠端分支 %s 在上游 %s 未發現"
 
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "遠端分支 %s 在上游 %s 未發現"
 

-#: builtin/clone.c:1260
+#: builtin/clone.c:1273

 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎複製了一個空版本庫。"
 
 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎複製了一個空版本庫。"
 


@@ -12370,14 +12474,14 @@ msgstr "兩列之間的填充空間"
 msgid "--command must be the first argument"
 msgstr "--command 必須是第一個參數"
 
 msgid "--command must be the first argument"
 msgstr "--command 必須是第一個參數"
 

-#: builtin/commit-graph.c:11 builtin/commit-graph.c:19
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:21

 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 "git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--"
 "[no-]progress]"
 
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 "git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--"
 "[no-]progress]"
 

-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:26

 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"


@@ -12387,79 +12491,88 @@ msgstr ""
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]progress] <split options>"
 
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]progress] <split options>"
 

-#: builtin/commit-graph.c:60
+#: builtin/commit-graph.c:62

 #, c-format
 msgid "could not find object directory matching %s"
 msgstr "找不到符合 %s 的物件目錄"
 
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr "找不到符合 %s 的物件目錄"
 

-#: builtin/commit-graph.c:76 builtin/commit-graph.c:152
-#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678
+#: builtin/commit-graph.c:78 builtin/commit-graph.c:177
+#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678

 msgid "dir"
 msgstr "目錄"
 
 msgid "dir"
 msgstr "目錄"
 

-#: builtin/commit-graph.c:77 builtin/commit-graph.c:153
-#: builtin/commit-graph.c:258
+#: builtin/commit-graph.c:79 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:277

 msgid "The object directory to store the graph"
 msgstr "儲存圖形的物件目錄"
 
 msgid "The object directory to store the graph"
 msgstr "儲存圖形的物件目錄"
 

-#: builtin/commit-graph.c:79
+#: builtin/commit-graph.c:81

 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "如果提交圖形被分割，只驗證頭一個檔案"
 
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "如果提交圖形被分割，只驗證頭一個檔案"
 

-#: builtin/commit-graph.c:102
+#: builtin/commit-graph.c:104

 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "無法開啟提交圖形 '%s'"
 
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "無法開啟提交圖形 '%s'"
 

-#: builtin/commit-graph.c:136
+#: builtin/commit-graph.c:138

 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "無法識別的 --split 參數，%s"
 
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "無法識別的 --split 參數，%s"
 

-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:151
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "非期望的非十六進位物件 ID：%s"
+
+#: builtin/commit-graph.c:156
+#, c-format
+msgid "invalid object: %s"
+msgstr "物件無效：%s"
+
+#: builtin/commit-graph.c:180

 msgid "start walk at all refs"
 msgstr "開始遍歷所有引用"
 
 msgid "start walk at all refs"
 msgstr "開始遍歷所有引用"
 

-#: builtin/commit-graph.c:157
+#: builtin/commit-graph.c:182

 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "從標準輸入中的包索引檔案列表中掃描提交"
 
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "從標準輸入中的包索引檔案列表中掃描提交"
 

-#: builtin/commit-graph.c:159
+#: builtin/commit-graph.c:184

 msgid "start walk at commits listed by stdin"
 msgstr "從標準輸入中的提交開始掃描"
 
 msgid "start walk at commits listed by stdin"
 msgstr "從標準輸入中的提交開始掃描"
 

-#: builtin/commit-graph.c:161
+#: builtin/commit-graph.c:186

 msgid "include all commits already in the commit-graph file"
 msgstr "包含 commit-graph 檔案中已有所有提交"
 
 msgid "include all commits already in the commit-graph file"
 msgstr "包含 commit-graph 檔案中已有所有提交"
 

-#: builtin/commit-graph.c:163
+#: builtin/commit-graph.c:188

 msgid "enable computation for changed paths"
 msgstr "啟用已變更路徑的計算"
 
 msgid "enable computation for changed paths"
 msgstr "啟用已變更路徑的計算"
 

-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:191

 msgid "allow writing an incremental commit-graph file"
 msgstr "允許寫一個增量提交圖形檔案"
 
 msgid "allow writing an incremental commit-graph file"
 msgstr "允許寫一個增量提交圖形檔案"
 

-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:195

 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "在非基本分割提交圖形中的最大提交數"
 
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "在非基本分割提交圖形中的最大提交數"
 

-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:197

 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "一個分割提交圖形的兩個級別之間的最大比率"
 
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "一個分割提交圖形的兩個級別之間的最大比率"
 

-#: builtin/commit-graph.c:174
+#: builtin/commit-graph.c:199

 msgid "only expire files older than a given date-time"
 msgstr "只將舊於指定日期與時間的檔案設為過期"
 
 msgid "only expire files older than a given date-time"
 msgstr "只將舊於指定日期與時間的檔案設為過期"
 

-#: builtin/commit-graph.c:190
+#: builtin/commit-graph.c:215

 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs"
 
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs"
 

-#: builtin/commit-graph.c:229
-#, c-format
-msgid "unexpected non-hex object ID: %s"
-msgstr "非期望的非十六進位物件 ID：%s"
+#: builtin/commit-graph.c:245
+msgid "Collecting commits from input"
+msgstr "正在從輸入收集提交"

 
 #: builtin/commit-tree.c:18
 msgid ""
 
 #: builtin/commit-tree.c:18
 msgid ""


@@ -12855,7 +12968,7 @@ msgid "version"
 msgstr "版本"
 
 #: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549
 msgstr "版本"
 
 #: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549

-#: builtin/worktree.c:646
+#: builtin/worktree.c:722

 msgid "machine-readable output"
 msgstr "機器可讀的輸出"
 
 msgid "machine-readable output"
 msgstr "機器可讀的輸出"
 


@@ -12868,8 +12981,8 @@ msgid "terminate entries with NUL"
 msgstr "條目以 NUL 字元結尾"
 
 #: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543
 msgstr "條目以 NUL 字元結尾"
 
 #: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543

-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336

 msgid "mode"
 msgstr "模式"
 
 msgid "mode"
 msgstr "模式"
 


@@ -13544,35 +13657,45 @@ msgstr "--dirty 與提交號不相容"
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken 與提交號不相容"
 
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken 與提交號不相容"
 

-#: builtin/diff.c:84
+#: builtin/diff.c:91

 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s'：不是一個正規檔案或符號連結"
 
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s'：不是一個正規檔案或符號連結"
 

-#: builtin/diff.c:235
+#: builtin/diff.c:242

 #, c-format
 msgid "invalid option: %s"
 msgstr "無效選項：%s"
 
 #, c-format
 msgid "invalid option: %s"
 msgstr "無效選項：%s"
 

-#: builtin/diff.c:350
+#: builtin/diff.c:359
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: 無合併基底"
+
+#: builtin/diff.c:469

 msgid "Not a git repository"
 msgstr "不是一個 git 版本庫"
 
 msgid "Not a git repository"
 msgstr "不是一個 git 版本庫"
 

-#: builtin/diff.c:394
+#: builtin/diff.c:514

 #, c-format
 msgid "invalid object '%s' given."
 msgstr "提供了無效物件 '%s'。"
 
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "提供了無效物件 '%s'。"
 

-#: builtin/diff.c:403
+#: builtin/diff.c:525

 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "提供了超過兩個資料物件：'%s'"
 
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "提供了超過兩個資料物件：'%s'"
 

-#: builtin/diff.c:408
+#: builtin/diff.c:530

 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "無法處理的物件 '%s'。"
 
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "無法處理的物件 '%s'。"
 

+#: builtin/diff.c:564
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s：多個合併基底，使用 %s"
+

 #: builtin/difftool.c:30
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<選項>] [<提交> [<提交>]] [--] [<路徑>...]"
 #: builtin/difftool.c:30
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<選項>] [<提交> [<提交>]] [--] [<路徑>...]"


@@ -13717,82 +13840,103 @@ msgstr "選項 `--default' 和 `type=ulong` 期望一個無符號長整型，不
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 

-#: builtin/fast-export.c:853
+#: builtin/fast-export.c:868

 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。"
 
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。"
 

-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c:1178
+msgid "--anonymize-map token cannot be empty"
+msgstr "--anonymize-map 的鍵不能空白"
+
+#: builtin/fast-export.c:1198

 msgid "show progress after <n> objects"
 msgstr "在 <n> 個物件之後顯示進度"
 
 msgid "show progress after <n> objects"
 msgstr "在 <n> 個物件之後顯示進度"
 

-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1200

 msgid "select handling of signed tags"
 msgstr "選擇如何處理簽名標籤"
 
 msgid "select handling of signed tags"
 msgstr "選擇如何處理簽名標籤"
 

-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1203

 msgid "select handling of tags that tag filtered objects"
 msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式"
 
 msgid "select handling of tags that tag filtered objects"
 msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式"
 

-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1206

 msgid "select handling of commit messages in an alternate encoding"
 msgstr "選擇使用備用編碼處理提交說明"
 
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "選擇使用備用編碼處理提交說明"
 

-#: builtin/fast-export.c:1163
+#: builtin/fast-export.c:1209

 msgid "Dump marks to this file"
 msgstr "把標記儲存到這個檔案"
 
 msgid "Dump marks to this file"
 msgstr "把標記儲存到這個檔案"
 

-#: builtin/fast-export.c:1165
+#: builtin/fast-export.c:1211

 msgid "Import marks from this file"
 msgstr "從這個檔案匯入標記"
 
 msgid "Import marks from this file"
 msgstr "從這個檔案匯入標記"
 

-#: builtin/fast-export.c:1169
+#: builtin/fast-export.c:1215

 msgid "Import marks from this file if it exists"
 msgstr "從該檔案匯入標記（如果存在的話）"
 
 msgid "Import marks from this file if it exists"
 msgstr "從該檔案匯入標記（如果存在的話）"
 

-#: builtin/fast-export.c:1171
+#: builtin/fast-export.c:1217

 msgid "Fake a tagger when tags lack one"
 msgstr "當標籤缺少標記者欄位時，假裝提供一個"
 
 msgid "Fake a tagger when tags lack one"
 msgstr "當標籤缺少標記者欄位時，假裝提供一個"
 

-#: builtin/fast-export.c:1173
+#: builtin/fast-export.c:1219

 msgid "Output full tree for each commit"
 msgstr "每次提交都輸出整個樹"
 
 msgid "Output full tree for each commit"
 msgstr "每次提交都輸出整個樹"
 

-#: builtin/fast-export.c:1175
+#: builtin/fast-export.c:1221

 msgid "Use the done feature to terminate the stream"
 msgstr "使用 done 功能來終止流"
 
 msgid "Use the done feature to terminate the stream"
 msgstr "使用 done 功能來終止流"
 

-#: builtin/fast-export.c:1176
+#: builtin/fast-export.c:1222

 msgid "Skip output of blob data"
 msgstr "跳過資料物件的輸出"
 
 msgid "Skip output of blob data"
 msgstr "跳過資料物件的輸出"
 

-#: builtin/fast-export.c:1177 builtin/log.c:1724
+#: builtin/fast-export.c:1223 builtin/log.c:1724

 msgid "refspec"
 msgstr "參照規格"
 
 msgid "refspec"
 msgstr "參照規格"
 

-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1224

 msgid "Apply refspec to exported refs"
 msgstr "對匯出的引用應用引用規格"
 
 msgid "Apply refspec to exported refs"
 msgstr "對匯出的引用應用引用規格"
 

-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1225

 msgid "anonymize output"
 msgstr "匿名輸出"
 
 msgid "anonymize output"
 msgstr "匿名輸出"
 

-#: builtin/fast-export.c:1181
+#: builtin/fast-export.c:1226
+msgid "from:to"
+msgstr "from:to"
+
+#: builtin/fast-export.c:1227
+msgid "convert <from> to <to> in anonymized output"
+msgstr "在匿名輸出中將 <from> 轉換為 <to>"
+
+#: builtin/fast-export.c:1230

 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr "引用父物件 ID 不在 fast-export 流中"
 
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr "引用父物件 ID 不在 fast-export 流中"
 

-#: builtin/fast-export.c:1183
+#: builtin/fast-export.c:1232

 msgid "Show original object ids of blobs/commits"
 msgstr "顯示資料物件/提交的原始物件 ID"
 
 msgid "Show original object ids of blobs/commits"
 msgstr "顯示資料物件/提交的原始物件 ID"
 

-#: builtin/fast-export.c:1185
+#: builtin/fast-export.c:1234

 msgid "Label tags with mark ids"
 msgstr "對帶有標記 ID 的標籤做標記"
 
 msgid "Label tags with mark ids"
 msgstr "對帶有標記 ID 的標籤做標記"
 

-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1257
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "缺少 --anonymize 的 --anonymize-map 沒有意義"
+
+#: builtin/fast-export.c:1272

 msgid "Cannot pass both --import-marks and --import-marks-if-exists"
 msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists"
 
 msgid "Cannot pass both --import-marks and --import-marks-if-exists"
 msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists"
 

+#: builtin/fetch-pack.c:245
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "已建立鎖定檔案，但尚未回報：%s"
+

 #: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<選項>] [<版本庫> [<引用規格>...]]"
 #: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<選項>] [<版本庫> [<引用規格>...]]"


@@ -14113,40 +14257,40 @@ msgstr "未指定遠端版本庫。請透過一個 URL 或遠端版本庫名指
 msgid "You need to specify a tag name."
 msgstr "您需要指定一個標籤名稱。"
 
 msgid "You need to specify a tag name."
 msgstr "您需要指定一個標籤名稱。"
 

-#: builtin/fetch.c:1773
+#: builtin/fetch.c:1778

 msgid "Negative depth in --deepen is not supported"
 msgstr "--deepen 不支援負數深度"
 
 msgid "Negative depth in --deepen is not supported"
 msgstr "--deepen 不支援負數深度"
 

-#: builtin/fetch.c:1775
+#: builtin/fetch.c:1780

 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen 和 --depth 是互斥的"
 
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen 和 --depth 是互斥的"
 

-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1785

 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth 和 --unshallow 不能同時使用"
 
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth 和 --unshallow 不能同時使用"
 

-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1787

 msgid "--unshallow on a complete repository does not make sense"
 msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義"
 
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義"
 

-#: builtin/fetch.c:1798
+#: builtin/fetch.c:1800

 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all 不能帶一個版本庫參數"
 
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all 不能帶一個版本庫參數"
 

-#: builtin/fetch.c:1800
+#: builtin/fetch.c:1802

 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 帶引用規格沒有任何意義"
 
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 帶引用規格沒有任何意義"
 

-#: builtin/fetch.c:1809
+#: builtin/fetch.c:1811

 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "沒有這樣的遠端或遠端組：%s"
 
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "沒有這樣的遠端或遠端組：%s"
 

-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1818

 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "取得組並指定引用規格沒有意義"
 
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "取得組並指定引用規格沒有意義"
 

-#: builtin/fetch.c:1834
+#: builtin/fetch.c:1836

 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"


@@ -14592,8 +14736,8 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
 #. variable for tweaking threads, currently
 #. grep.threads
 #.

-#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
-#: builtin/pack-objects.c:2855
+#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2904

 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "沒有執行緒支援，忽略 %s"
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "沒有執行緒支援，忽略 %s"


@@ -14823,11 +14967,11 @@ msgstr "--untracked 不支援與 --recurse-submodules 一起使用"
 msgid "invalid option combination, ignoring --threads"
 msgstr "無效的選項組合，忽略 --threads"
 
 msgid "invalid option combination, ignoring --threads"
 msgstr "無效的選項組合，忽略 --threads"
 

-#: builtin/grep.c:1084 builtin/pack-objects.c:3548
+#: builtin/grep.c:1084 builtin/pack-objects.c:3623

 msgid "no threads support, ignoring --threads"
 msgstr "沒有執行緒支援，忽略 --threads"
 
 msgid "no threads support, ignoring --threads"
 msgstr "沒有執行緒支援，忽略 --threads"
 

-#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
+#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901

 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的執行緒數無效（%d）"
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的執行緒數無效（%d）"


@@ -15027,7 +15171,7 @@ msgstr "輸入上的讀錯誤"
 msgid "used more bytes than were available"
 msgstr "用掉了超過可用的位元組"
 
 msgid "used more bytes than were available"
 msgstr "用掉了超過可用的位元組"
 

-#: builtin/index-pack.c:288 builtin/pack-objects.c:607
+#: builtin/index-pack.c:288 builtin/pack-objects.c:618

 msgid "pack too large for current definition of off_t"
 msgstr "包太大超過了目前 off_t 的定義"
 
 msgid "pack too large for current definition of off_t"
 msgstr "包太大超過了目前 off_t 的定義"
 


@@ -15097,8 +15241,8 @@ msgstr "解壓縮嚴重的不一致"
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "發現 %s 出現 SHA1 衝突！"
 
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "發現 %s 出現 SHA1 衝突！"
 

-#: builtin/index-pack.c:738 builtin/pack-objects.c:159
-#: builtin/pack-objects.c:219 builtin/pack-objects.c:314
+#: builtin/index-pack.c:738 builtin/pack-objects.c:170
+#: builtin/pack-objects.c:230 builtin/pack-objects.c:325

 #, c-format
 msgid "unable to read %s"
 msgstr "不能讀 %s"
 #, c-format
 msgid "unable to read %s"
 msgstr "不能讀 %s"


@@ -15159,7 +15303,7 @@ msgstr "parse_pack_objects() 中遇到不可理喻的問題"
 msgid "Resolving deltas"
 msgstr "處理 delta 中"
 
 msgid "Resolving deltas"
 msgstr "處理 delta 中"
 

-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665

 #, c-format
 msgid "unable to create thread: %s"
 msgstr "不能建立執行緒：%s"
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "不能建立執行緒：%s"


@@ -15222,56 +15366,65 @@ msgstr "無法儲存包檔案"
 msgid "cannot store index file"
 msgstr "無法儲存索引檔案"
 
 msgid "cannot store index file"
 msgstr "無法儲存索引檔案"
 

-#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863
+#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912

 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "壞的 pack.indexversion=%<PRIu32>"
 
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "壞的 pack.indexversion=%<PRIu32>"
 

-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1592

 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "無法開啟現存包檔案 '%s'"
 
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "無法開啟現存包檔案 '%s'"
 

-#: builtin/index-pack.c:1598
+#: builtin/index-pack.c:1594

 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "無法為 %s 開啟包索引檔案"
 
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "無法為 %s 開啟包索引檔案"
 

-#: builtin/index-pack.c:1646
+#: builtin/index-pack.c:1642

 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "非 delta：%d 個物件"
 
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "非 delta：%d 個物件"
 

-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1649

 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "鏈長 = %d: %lu 物件"
 
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "鏈長 = %d: %lu 物件"
 

-#: builtin/index-pack.c:1692
+#: builtin/index-pack.c:1689

 msgid "Cannot come back to cwd"
 msgstr "無法返回目前工作目錄"
 
 msgid "Cannot come back to cwd"
 msgstr "無法返回目前工作目錄"
 

-#: builtin/index-pack.c:1741 builtin/index-pack.c:1744
-#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761

 #, c-format
 msgid "bad %s"
 msgstr "錯誤選項 %s"
 
 #, c-format
 msgid "bad %s"
 msgstr "錯誤選項 %s"
 

-#: builtin/index-pack.c:1780
+#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "未知的「%s」雜湊算法"
+
+#: builtin/index-pack.c:1782

 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin 不能和 --stdin 同時使用"
 
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin 不能和 --stdin 同時使用"
 

-#: builtin/index-pack.c:1782
+#: builtin/index-pack.c:1784

 msgid "--stdin requires a git repository"
 msgstr "--stdin 需要一個 git 版本庫"
 
 msgid "--stdin requires a git repository"
 msgstr "--stdin 需要一個 git 版本庫"
 

-#: builtin/index-pack.c:1788
+#: builtin/index-pack.c:1786
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format 不能和 --stdin 同時使用"
+
+#: builtin/index-pack.c:1792

 msgid "--verify with no packfile name given"
 msgstr "--verify 沒有提供 packfile 名稱參數"
 
 msgid "--verify with no packfile name given"
 msgstr "--verify 沒有提供 packfile 名稱參數"
 

-#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582

 msgid "fsck error in pack objects"
 msgstr "在打包物件中 fsck 檢查發生錯誤"
 
 msgid "fsck error in pack objects"
 msgstr "在打包物件中 fsck 檢查發生錯誤"
 


@@ -15315,51 +15468,56 @@ msgstr "沒有在 %s 中找到範本"
 msgid "not copying templates from '%s': %s"
 msgstr "沒有從 '%s' 複製範本：%s"
 
 msgid "not copying templates from '%s': %s"
 msgstr "沒有從 '%s' 複製範本：%s"
 

-#: builtin/init-db.c:356
+#: builtin/init-db.c:276
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "無效的初始分支名稱：'%s'"
+
+#: builtin/init-db.c:368

 #, c-format
 msgid "unable to handle file type %d"
 msgstr "不能處理 %d 類型的檔案"
 
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "不能處理 %d 類型的檔案"
 

-#: builtin/init-db.c:359
+#: builtin/init-db.c:371

 #, c-format
 msgid "unable to move %s to %s"
 msgstr "不能移動 %s 至 %s"
 
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "不能移動 %s 至 %s"
 

-#: builtin/init-db.c:374
+#: builtin/init-db.c:386

 msgid "attempt to reinitialize repository with different hash"
 msgstr "嘗試以不同的雜湊值重新初始化版本庫"
 
 msgid "attempt to reinitialize repository with different hash"
 msgstr "嘗試以不同的雜湊值重新初始化版本庫"
 

-#: builtin/init-db.c:380 builtin/init-db.c:601
-#, c-format
-msgid "unknown hash algorithm '%s'"
-msgstr "未知的「%s」雜湊算法"
-
-#: builtin/init-db.c:397 builtin/init-db.c:400
+#: builtin/init-db.c:410 builtin/init-db.c:413

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

-#: builtin/init-db.c:458
+#: builtin/init-db.c:444
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: 忽略 --initial-branch=%s"
+
+#: builtin/init-db.c:475

 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n"
 
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n"
 

-#: builtin/init-db.c:459
+#: builtin/init-db.c:476

 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n"
 
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n"
 

-#: builtin/init-db.c:463
+#: builtin/init-db.c:480

 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "已初始化空的共享 Git 版本庫於 %s%s\n"
 
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "已初始化空的共享 Git 版本庫於 %s%s\n"
 

-#: builtin/init-db.c:464
+#: builtin/init-db.c:481

 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "已初始化空的 Git 版本庫於 %s%s\n"
 
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "已初始化空的 Git 版本庫於 %s%s\n"
 

-#: builtin/init-db.c:513
+#: builtin/init-db.c:530

 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"


@@ -15367,40 +15525,44 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] "
 "[<目錄>]"
 
 "git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] "
 "[<目錄>]"
 

-#: builtin/init-db.c:538
+#: builtin/init-db.c:556

 msgid "permissions"
 msgstr "權限"
 
 msgid "permissions"
 msgstr "權限"
 

-#: builtin/init-db.c:539
+#: builtin/init-db.c:557

 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "指定 git 版本庫是多個使用者之間共享的"
 
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "指定 git 版本庫是多個使用者之間共享的"
 

-#: builtin/init-db.c:544
+#: builtin/init-db.c:563
+msgid "override the name of the initial branch"
+msgstr "覆蓋初始分支的名稱"
+
+#: builtin/init-db.c:564

 msgid "hash"
 msgstr "雜湊"
 
 msgid "hash"
 msgstr "雜湊"
 

-#: builtin/init-db.c:545
+#: builtin/init-db.c:565 builtin/show-index.c:22

 msgid "specify the hash algorithm to use"
 msgstr "指定要使用的雜湊算法"
 
 msgid "specify the hash algorithm to use"
 msgstr "指定要使用的雜湊算法"
 

-#: builtin/init-db.c:578 builtin/init-db.c:583
+#: builtin/init-db.c:598 builtin/init-db.c:603

 #, c-format
 msgid "cannot mkdir %s"
 msgstr "不能建立目錄 %s"
 
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "不能建立目錄 %s"
 

-#: builtin/init-db.c:587
+#: builtin/init-db.c:607

 #, c-format
 msgid "cannot chdir to %s"
 msgstr "不能切換目錄到 %s"
 
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "不能切換目錄到 %s"
 

-#: builtin/init-db.c:614
+#: builtin/init-db.c:634

 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr "不允許 %s（或 --work-tree=<目錄>）而沒有指定 %s（或 --git-dir=<目錄>）"
 
 #, 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:642
+#: builtin/init-db.c:662

 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "不能存取工作區 '%s'"
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "不能存取工作區 '%s'"


@@ -17119,7 +17281,7 @@ msgstr "嘗試刪除不存在的註解不是一個錯誤"
 msgid "read object names from the standard input"
 msgstr "從標準輸入讀取物件名稱"
 
 msgid "read object names from the standard input"
 msgstr "從標準輸入讀取物件名稱"
 

-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220

 msgid "do not remove, show only"
 msgstr "不刪除，只顯示"
 
 msgid "do not remove, show only"
 msgstr "不刪除，只顯示"
 


@@ -17150,101 +17312,116 @@ msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]"
 
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]"
 

-#: builtin/pack-objects.c:431
+#: builtin/pack-objects.c:442

 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "%s 錯的包物件 CRC"
 
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "%s 錯的包物件 CRC"
 

-#: builtin/pack-objects.c:442
+#: builtin/pack-objects.c:453

 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "%s 損壞的包物件"
 
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "%s 損壞的包物件"
 

-#: builtin/pack-objects.c:573
+#: builtin/pack-objects.c:584

 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "發現物件 %s 遞迴 delta"
 
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "發現物件 %s 遞迴 delta"
 

-#: builtin/pack-objects.c:784
+#: builtin/pack-objects.c:795

 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "排序了 %u 個物件，預期 %<PRIu32> 個"
 
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "排序了 %u 個物件，預期 %<PRIu32> 個"
 

-#: builtin/pack-objects.c:973
+#: builtin/pack-objects.c:1003

 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "停用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個"
 
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "停用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個"
 

-#: builtin/pack-objects.c:986
+#: builtin/pack-objects.c:1016

 msgid "Writing objects"
 msgstr "寫入物件中"
 
 msgid "Writing objects"
 msgstr "寫入物件中"
 

-#: builtin/pack-objects.c:1047 builtin/update-index.c:90
+#: builtin/pack-objects.c:1077 builtin/update-index.c:90

 #, c-format
 msgid "failed to stat %s"
 msgstr "對 %s 呼叫 stat 失敗"
 
 #, c-format
 msgid "failed to stat %s"
 msgstr "對 %s 呼叫 stat 失敗"
 

-#: builtin/pack-objects.c:1100
+#: builtin/pack-objects.c:1130

 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個"
 
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個"
 

-#: builtin/pack-objects.c:1298
+#: builtin/pack-objects.c:1347

 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "停用 bitmap 寫入，因為一些物件將不會被打包"
 
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "停用 bitmap 寫入，因為一些物件將不會被打包"
 

-#: builtin/pack-objects.c:1725
+#: builtin/pack-objects.c:1774

 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "%s 壓縮中 delta 基準位移越界"
 
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "%s 壓縮中 delta 基準位移越界"
 

-#: builtin/pack-objects.c:1734
+#: builtin/pack-objects.c:1783

 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "%s 的 delta 基準位移越界"
 
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "%s 的 delta 基準位移越界"
 

-#: builtin/pack-objects.c:2005
+#: builtin/pack-objects.c:2054

 msgid "Counting objects"
 msgstr "物件計數中"
 
 msgid "Counting objects"
 msgstr "物件計數中"
 

-#: builtin/pack-objects.c:2150
+#: builtin/pack-objects.c:2199

 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "無法解析物件 %s 標頭訊息"
 
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "無法解析物件 %s 標頭訊息"
 

-#: builtin/pack-objects.c:2220 builtin/pack-objects.c:2236
-#: builtin/pack-objects.c:2246
+#: builtin/pack-objects.c:2269 builtin/pack-objects.c:2285
+#: builtin/pack-objects.c:2295

 #, c-format
 msgid "object %s cannot be read"
 msgstr "物件 %s 無法讀取"
 
 #, c-format
 msgid "object %s cannot be read"
 msgstr "物件 %s 無法讀取"
 

-#: builtin/pack-objects.c:2223 builtin/pack-objects.c:2250
+#: builtin/pack-objects.c:2272 builtin/pack-objects.c:2299

 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）"
 
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）"
 

-#: builtin/pack-objects.c:2260
+#: builtin/pack-objects.c:2309

 msgid "suboptimal pack - out of memory"
 msgstr "次優（suboptimal）打包 - 記憶體不足"
 
 msgid "suboptimal pack - out of memory"
 msgstr "次優（suboptimal）打包 - 記憶體不足"
 

-#: builtin/pack-objects.c:2575
+#: builtin/pack-objects.c:2624

 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "使用 %d 個執行緒進行壓縮"
 
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "使用 %d 個執行緒進行壓縮"
 

-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2763

 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "無法為標籤 %s 壓縮物件"
 
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "無法為標籤 %s 壓縮物件"
 

-#: builtin/pack-objects.c:2802
+#: builtin/pack-objects.c:2851

 msgid "Compressing objects"
 msgstr "壓縮物件中"
 
 msgid "Compressing objects"
 msgstr "壓縮物件中"
 

-#: builtin/pack-objects.c:2808
+#: builtin/pack-objects.c:2857

 msgid "inconsistency with delta count"
 msgstr "不一致的差異計數"
 
 msgid "inconsistency with delta count"
 msgstr "不一致的差異計數"
 

-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2929
+#, 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')"
+
+#: builtin/pack-objects.c:2932
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')"
+
+#: builtin/pack-objects.c:2961

 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"


@@ -17253,7 +17430,7 @@ msgstr ""
 "預期邊界物件（edge object）ID，卻得到垃圾資料：\n"
 " %s"
 
 "預期邊界物件（edge object）ID，卻得到垃圾資料：\n"
 " %s"
 

-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2967

 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"


@@ -17262,226 +17439,234 @@ msgstr ""
 "預期物件 ID，卻得到垃圾資料：\n"
 " %s"
 
 "預期物件 ID，卻得到垃圾資料：\n"
 " %s"
 

-#: builtin/pack-objects.c:2993
+#: builtin/pack-objects.c:3065

 msgid "invalid value for --missing"
 msgstr "選項 --missing 的值無效"
 
 msgid "invalid value for --missing"
 msgstr "選項 --missing 的值無效"
 

-#: builtin/pack-objects.c:3052 builtin/pack-objects.c:3160
+#: builtin/pack-objects.c:3124 builtin/pack-objects.c:3232

 msgid "cannot open pack index"
 msgstr "無法開啟包檔案索引"
 
 msgid "cannot open pack index"
 msgstr "無法開啟包檔案索引"
 

-#: builtin/pack-objects.c:3083
+#: builtin/pack-objects.c:3155

 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "無法檢查 %s 處的鬆散物件"
 
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "無法檢查 %s 處的鬆散物件"
 

-#: builtin/pack-objects.c:3168
+#: builtin/pack-objects.c:3240

 msgid "unable to force loose object"
 msgstr "無法強制鬆散物件"
 
 msgid "unable to force loose object"
 msgstr "無法強制鬆散物件"
 

-#: builtin/pack-objects.c:3261
+#: builtin/pack-objects.c:3333

 #, c-format
 msgid "not a rev '%s'"
 msgstr "不是一個版本 '%s'"
 
 #, c-format
 msgid "not a rev '%s'"
 msgstr "不是一個版本 '%s'"
 

-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3336

 #, c-format
 msgid "bad revision '%s'"
 msgstr "壞的版本 '%s'"
 
 #, c-format
 msgid "bad revision '%s'"
 msgstr "壞的版本 '%s'"
 

-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3361

 msgid "unable to add recent objects"
 msgstr "無法新增最近的物件"
 
 msgid "unable to add recent objects"
 msgstr "無法新增最近的物件"
 

-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3414

 #, c-format
 msgid "unsupported index version %s"
 msgstr "不支援的索引版本 %s"
 
 #, c-format
 msgid "unsupported index version %s"
 msgstr "不支援的索引版本 %s"
 

-#: builtin/pack-objects.c:3346
+#: builtin/pack-objects.c:3418

 #, c-format
 msgid "bad index version '%s'"
 msgstr "壞的索引版本 '%s'"
 
 #, c-format
 msgid "bad index version '%s'"
 msgstr "壞的索引版本 '%s'"
 

-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3456

 msgid "<version>[,<offset>]"
 msgstr "<版本>[,<位移>]"
 
 msgid "<version>[,<offset>]"
 msgstr "<版本>[,<位移>]"
 

-#: builtin/pack-objects.c:3385
+#: builtin/pack-objects.c:3457

 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格式版本來寫包索引檔案"
 
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格式版本來寫包索引檔案"
 

-#: builtin/pack-objects.c:3388
+#: builtin/pack-objects.c:3460

 msgid "maximum size of each output pack file"
 msgstr "每個輸出包的最大尺寸"
 
 msgid "maximum size of each output pack file"
 msgstr "每個輸出包的最大尺寸"
 

-#: builtin/pack-objects.c:3390
+#: builtin/pack-objects.c:3462

 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略從備用物件儲存裡借用物件"
 
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略從備用物件儲存裡借用物件"
 

-#: builtin/pack-objects.c:3392
+#: builtin/pack-objects.c:3464

 msgid "ignore packed objects"
 msgstr "忽略包物件"
 
 msgid "ignore packed objects"
 msgstr "忽略包物件"
 

-#: builtin/pack-objects.c:3394
+#: builtin/pack-objects.c:3466

 msgid "limit pack window by objects"
 msgstr "限制打包視窗的物件數"
 
 msgid "limit pack window by objects"
 msgstr "限制打包視窗的物件數"
 

-#: builtin/pack-objects.c:3396
+#: builtin/pack-objects.c:3468

 msgid "limit pack window by memory in addition to object limit"
 msgstr "除物件數量限制外設定打包視窗的記憶體限制"
 
 msgid "limit pack window by memory in addition to object limit"
 msgstr "除物件數量限制外設定打包視窗的記憶體限制"
 

-#: builtin/pack-objects.c:3398
+#: builtin/pack-objects.c:3470

 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包允許的 delta 鏈的最大長度"
 
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包允許的 delta 鏈的最大長度"
 

-#: builtin/pack-objects.c:3400
+#: builtin/pack-objects.c:3472

 msgid "reuse existing deltas"
 msgstr "重用已存在的 deltas"
 
 msgid "reuse existing deltas"
 msgstr "重用已存在的 deltas"
 

-#: builtin/pack-objects.c:3402
+#: builtin/pack-objects.c:3474

 msgid "reuse existing objects"
 msgstr "重用已存在的物件"
 
 msgid "reuse existing objects"
 msgstr "重用已存在的物件"
 

-#: builtin/pack-objects.c:3404
+#: builtin/pack-objects.c:3476

 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 物件"
 
 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 物件"
 

-#: builtin/pack-objects.c:3406
+#: builtin/pack-objects.c:3478

 msgid "use threads when searching for best delta matches"
 msgstr "使用執行緒查詢最佳 delta 符合"
 
 msgid "use threads when searching for best delta matches"
 msgstr "使用執行緒查詢最佳 delta 符合"
 

-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3480

 msgid "do not create an empty pack output"
 msgstr "不建立空的包輸出"
 
 msgid "do not create an empty pack output"
 msgstr "不建立空的包輸出"
 

-#: builtin/pack-objects.c:3410
+#: builtin/pack-objects.c:3482

 msgid "read revision arguments from standard input"
 msgstr "從標準輸入讀取版本號參數"
 
 msgid "read revision arguments from standard input"
 msgstr "從標準輸入讀取版本號參數"
 

-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3484

 msgid "limit the objects to those that are not yet packed"
 msgstr "限制那些尚未打包的物件"
 
 msgid "limit the objects to those that are not yet packed"
 msgstr "限制那些尚未打包的物件"
 

-#: builtin/pack-objects.c:3415
+#: builtin/pack-objects.c:3487

 msgid "include objects reachable from any reference"
 msgstr "包括可以從任何引用存取到的物件"
 
 msgid "include objects reachable from any reference"
 msgstr "包括可以從任何引用存取到的物件"
 

-#: builtin/pack-objects.c:3418
+#: builtin/pack-objects.c:3490

 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日誌引用到的物件"
 
 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日誌引用到的物件"
 

-#: builtin/pack-objects.c:3421
+#: builtin/pack-objects.c:3493

 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的物件"
 
 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的物件"
 

-#: builtin/pack-objects.c:3424
+#: builtin/pack-objects.c:3496

 msgid "output pack to stdout"
 msgstr "輸出包到標準輸出"
 
 msgid "output pack to stdout"
 msgstr "輸出包到標準輸出"
 

-#: builtin/pack-objects.c:3426
+#: builtin/pack-objects.c:3498

 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包物件的標籤物件"
 
 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包物件的標籤物件"
 

-#: builtin/pack-objects.c:3428
+#: builtin/pack-objects.c:3500

 msgid "keep unreachable objects"
 msgstr "維持無法取得的物件"
 
 msgid "keep unreachable objects"
 msgstr "維持無法取得的物件"
 

-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3502

 msgid "pack loose unreachable objects"
 msgstr "打包鬆散的無法取得物件"
 
 msgid "pack loose unreachable objects"
 msgstr "打包鬆散的無法取得物件"
 

-#: builtin/pack-objects.c:3432
+#: builtin/pack-objects.c:3504

 msgid "unpack unreachable objects newer than <time>"
 msgstr "將比提供 <時間> 新的無法存取的物件解包"
 
 msgid "unpack unreachable objects newer than <time>"
 msgstr "將比提供 <時間> 新的無法存取的物件解包"
 

-#: builtin/pack-objects.c:3435
+#: builtin/pack-objects.c:3507

 msgid "use the sparse reachability algorithm"
 msgstr "使用稀疏可以取得性演算法"
 
 msgid "use the sparse reachability algorithm"
 msgstr "使用稀疏可以取得性演算法"
 

-#: builtin/pack-objects.c:3437
+#: builtin/pack-objects.c:3509

 msgid "create thin packs"
 msgstr "建立精簡包"
 
 msgid "create thin packs"
 msgstr "建立精簡包"
 

-#: builtin/pack-objects.c:3439
+#: builtin/pack-objects.c:3511

 msgid "create packs suitable for shallow fetches"
 msgstr "建立適合淺複製版本庫取得的包"
 
 msgid "create packs suitable for shallow fetches"
 msgstr "建立適合淺複製版本庫取得的包"
 

-#: builtin/pack-objects.c:3441
+#: builtin/pack-objects.c:3513

 msgid "ignore packs that have companion .keep file"
 msgstr "忽略配有 .keep 檔案的包"
 
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略配有 .keep 檔案的包"
 

-#: builtin/pack-objects.c:3443
+#: builtin/pack-objects.c:3515

 msgid "ignore this pack"
 msgstr "忽略該 pack"
 
 msgid "ignore this pack"
 msgstr "忽略該 pack"
 

-#: builtin/pack-objects.c:3445
+#: builtin/pack-objects.c:3517

 msgid "pack compression level"
 msgstr "打包壓縮級別"
 
 msgid "pack compression level"
 msgstr "打包壓縮級別"
 

-#: builtin/pack-objects.c:3447
+#: builtin/pack-objects.c:3519

 msgid "do not hide commits by grafts"
 msgstr "顯示被移植隱藏的提交"
 
 msgid "do not hide commits by grafts"
 msgstr "顯示被移植隱藏的提交"
 

-#: builtin/pack-objects.c:3449
+#: builtin/pack-objects.c:3521

 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度"
 
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度"
 

-#: builtin/pack-objects.c:3451
+#: builtin/pack-objects.c:3523

 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的同時建立 bitmap 索引"
 
 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的同時建立 bitmap 索引"
 

-#: builtin/pack-objects.c:3455
+#: builtin/pack-objects.c:3527

 msgid "write a bitmap index if possible"
 msgstr "如果可能，寫 bitmap 索引"
 
 msgid "write a bitmap index if possible"
 msgstr "如果可能，寫 bitmap 索引"
 

-#: builtin/pack-objects.c:3459
+#: builtin/pack-objects.c:3531

 msgid "handling for missing objects"
 msgstr "處理遺失的物件"
 
 msgid "handling for missing objects"
 msgstr "處理遺失的物件"
 

-#: builtin/pack-objects.c:3462
+#: builtin/pack-objects.c:3534

 msgid "do not pack objects in promisor packfiles"
 msgstr "不要打包 promisor packfile 中的物件"
 
 msgid "do not pack objects in promisor packfiles"
 msgstr "不要打包 promisor packfile 中的物件"
 

-#: builtin/pack-objects.c:3464
+#: builtin/pack-objects.c:3536

 msgid "respect islands during delta compression"
 msgstr "在增量壓縮時參考資料島"
 
 msgid "respect islands during delta compression"
 msgstr "在增量壓縮時參考資料島"
 

-#: builtin/pack-objects.c:3493
+#: builtin/pack-objects.c:3538
+msgid "protocol"
+msgstr "通訊協定"
+
+#: builtin/pack-objects.c:3539
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr "排除任何設定過，使用此通訊協定的 uploadpack.blobpackfileuri"
+
+#: builtin/pack-objects.c:3568

 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "增量鏈深度 %d 太深了，強制為 %d"
 
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "增量鏈深度 %d 太深了，強制為 %d"
 

-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3573

 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d"
 
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d"
 

-#: builtin/pack-objects.c:3552
+#: builtin/pack-objects.c:3627

 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr "不能使用 --max-pack-size 來組建傳輸用的包檔案"
 
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr "不能使用 --max-pack-size 來組建傳輸用的包檔案"
 

-#: builtin/pack-objects.c:3554
+#: builtin/pack-objects.c:3629

 msgid "minimum pack size limit is 1 MiB"
 msgstr "最小的包檔案大小是 1 MiB"
 
 msgid "minimum pack size limit is 1 MiB"
 msgstr "最小的包檔案大小是 1 MiB"
 

-#: builtin/pack-objects.c:3559
+#: builtin/pack-objects.c:3634

 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin 不能用於建立一個可索引包"
 
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin 不能用於建立一個可索引包"
 

-#: builtin/pack-objects.c:3562
+#: builtin/pack-objects.c:3637

 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable 和 --unpack-unreachable 不相容"
 
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable 和 --unpack-unreachable 不相容"
 

-#: builtin/pack-objects.c:3568
+#: builtin/pack-objects.c:3643

 msgid "cannot use --filter without --stdout"
 msgstr "不能在沒有 --stdout 的情況下使用 --filter"
 
 msgid "cannot use --filter without --stdout"
 msgstr "不能在沒有 --stdout 的情況下使用 --filter"
 

-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3703

 msgid "Enumerating objects"
 msgstr "枚舉物件"
 
 msgid "Enumerating objects"
 msgstr "枚舉物件"
 

-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3734

 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"


@@ -18743,7 +18928,7 @@ msgstr "快轉 %s 到 %s。\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <版本庫目錄>"
 
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <版本庫目錄>"
 

-#: builtin/receive-pack.c:843
+#: builtin/receive-pack.c:844

 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"
 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"


@@ -18769,7 +18954,7 @@ msgstr ""
 "若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n"
 "設定變數為 'refuse'。"
 
 "若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n"
 "設定變數為 'refuse'。"
 

-#: builtin/receive-pack.c:863
+#: builtin/receive-pack.c:864

 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"
 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"


@@ -18788,11 +18973,11 @@ msgstr ""
 "\n"
 "若要封鎖此訊息，您可以設定它為 'refuse'。"
 
 "\n"
 "若要封鎖此訊息，您可以設定它為 'refuse'。"
 

-#: builtin/receive-pack.c:1960
+#: builtin/receive-pack.c:1970

 msgid "quiet"
 msgstr "靜默模式"
 
 msgid "quiet"
 msgstr "靜默模式"
 

-#: builtin/receive-pack.c:1974
+#: builtin/receive-pack.c:1984

 msgid "You must specify a directory."
 msgstr "您必須指定一個目錄。"
 
 msgid "You must specify a directory."
 msgstr "您必須指定一個目錄。"
 


@@ -20314,6 +20499,14 @@ msgstr "'%s' 不是一個有效的引用。"
 msgid "cannot find commit %s (%s)"
 msgstr "不能找到提交 %s（%s）"
 
 msgid "cannot find commit %s (%s)"
 msgstr "不能找到提交 %s（%s）"
 

+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "雜湊算法"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "未知的雜湊算法"
+

 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"


@@ -20366,50 +20559,54 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <選項>"
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）"
 
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）"
 

-#: builtin/sparse-checkout.c:212
+#: builtin/sparse-checkout.c:216

 msgid "failed to create directory for sparse-checkout file"
 msgstr "無法建立稀疏檢出檔案的目錄"
 
 msgid "failed to create directory for sparse-checkout file"
 msgstr "無法建立稀疏檢出檔案的目錄"
 

-#: builtin/sparse-checkout.c:253
+#: builtin/sparse-checkout.c:257
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr "無法升級版本庫格式，以致無法啟用 worktreeConfig"
+
+#: builtin/sparse-checkout.c:259

 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "無法設定 extensions.worktreeConfig 設定"
 
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "無法設定 extensions.worktreeConfig 設定"
 

-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:276

 msgid "git sparse-checkout init [--cone]"
 msgstr "git sparse-checkout init [--cone]"
 
 msgid "git sparse-checkout init [--cone]"
 msgstr "git sparse-checkout init [--cone]"
 

-#: builtin/sparse-checkout.c:289
+#: builtin/sparse-checkout.c:295

 msgid "initialize the sparse-checkout in cone mode"
 msgstr "以 cone 模式初始化稀疏檢出"
 
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "以 cone 模式初始化稀疏檢出"
 

-#: builtin/sparse-checkout.c:326
+#: builtin/sparse-checkout.c:332

 #, c-format
 msgid "failed to open '%s'"
 msgstr "無法開啟「%s」"
 
 #, c-format
 msgid "failed to open '%s'"
 msgstr "無法開啟「%s」"
 

-#: builtin/sparse-checkout.c:383
+#: builtin/sparse-checkout.c:389

 #, c-format
 msgid "could not normalize path %s"
 msgstr "無法標準化路徑 %s"
 
 #, c-format
 msgid "could not normalize path %s"
 msgstr "無法標準化路徑 %s"
 

-#: builtin/sparse-checkout.c:395
+#: builtin/sparse-checkout.c:401

 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
 msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)"
 
 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
 msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)"
 

-#: builtin/sparse-checkout.c:420
+#: builtin/sparse-checkout.c:426

 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "無法去掉 '%s' C 樣式字串的引號"
 
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "無法去掉 '%s' C 樣式字串的引號"
 

-#: builtin/sparse-checkout.c:474 builtin/sparse-checkout.c:498
+#: builtin/sparse-checkout.c:480 builtin/sparse-checkout.c:504

 msgid "unable to load existing sparse-checkout patterns"
 msgstr "無法載入現存的稀疏檢出樣式"
 
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "無法載入現存的稀疏檢出樣式"
 

-#: builtin/sparse-checkout.c:543
+#: builtin/sparse-checkout.c:549

 msgid "read patterns from standard in"
 msgstr "從標準輸入讀取樣式"
 
 msgid "read patterns from standard in"
 msgstr "從標準輸入讀取樣式"
 

-#: builtin/sparse-checkout.c:580
+#: builtin/sparse-checkout.c:586

 msgid "error while refreshing working directory"
 msgstr "重新整理工作目錄時發生錯誤"
 
 msgid "error while refreshing working directory"
 msgstr "重新整理工作目錄時發生錯誤"
 


@@ -21096,12 +21293,40 @@ msgstr "阻止子模組設定 URL 的輸出"
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>"
 
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>"
 

-#: builtin/submodule--helper.c:2323 git.c:436 git.c:683
+#: builtin/submodule--helper.c:2294
+msgid "set the default tracking branch to master"
+msgstr "將預設的追蹤分支設為 master"
+
+#: builtin/submodule--helper.c:2296
+msgid "set the default tracking branch"
+msgstr "設定預設追蹤分支"
+
+#: builtin/submodule--helper.c:2300
+#| msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
+msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
+
+#: builtin/submodule--helper.c:2301
+#| msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgid ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+msgstr ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+
+#: builtin/submodule--helper.c:2308
+msgid "--branch or --default required"
+msgstr "需要 --branch 或 --default"
+
+#: builtin/submodule--helper.c:2311
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch 與 --default 互斥"
+
+#: builtin/submodule--helper.c:2367 git.c:436 git.c:683

 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s 不支援 --super-prefix"
 
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s 不支援 --super-prefix"
 

-#: builtin/submodule--helper.c:2329
+#: builtin/submodule--helper.c:2373

 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' 不是一個有效的 submodule--helper 子指令"
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' 不是一個有效的 submodule--helper 子指令"


@@ -21721,193 +21946,187 @@ msgstr "git worktree remove [<選項>] <工作區>"
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <路徑>"
 
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <路徑>"
 

-#: builtin/worktree.c:60 builtin/worktree.c:894
+#: builtin/worktree.c:60 builtin/worktree.c:972

 #, c-format
 msgid "failed to delete '%s'"
 msgstr "刪除 '%s' 失敗"
 
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "刪除 '%s' 失敗"
 

-#: builtin/worktree.c:79
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "刪除工作區/%s：不是一個有效的目錄"
-

 #: builtin/worktree.c:85
 #: builtin/worktree.c:85

-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "刪除 worktrees/%s：gitdir 檔案不存在"
+msgid "not a valid directory"
+msgstr "非有效目錄"

 
 

-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "刪除 worktrees/%s：無法讀取 gitdir 檔案 (%s)"
+#: builtin/worktree.c:91
+msgid "gitdir file does not exist"
+msgstr "找不到 gitdir 檔案"

 
 

-#: builtin/worktree.c:109
+#: builtin/worktree.c:96 builtin/worktree.c:105

 #, c-format
 #, c-format

-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr "刪除工作樹/%s：讀取過短（期望 %<PRIuMAX> 位元組，讀取 %<PRIuMAX>）"
+msgid "unable to read gitdir file (%s)"
+msgstr "無法讀取 gitdir 檔案 (%s)"

 
 

-#: builtin/worktree.c:117
+#: builtin/worktree.c:115

 #, c-format
 #, c-format

-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "刪除 worktrees/%s：無效的 gitdir 檔案"
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "讀取過短（預期有 %<PRIuMAX> 位元組，只讀到 %<PRIuMAX>）"
+
+#: builtin/worktree.c:123
+msgid "invalid gitdir file"
+msgstr "gitdir 檔案無效"

 
 

-#: builtin/worktree.c:126
+#: builtin/worktree.c:131
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir 檔案指向的位置不存在"
+
+#: builtin/worktree.c:146

 #, c-format
 #, c-format

-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "刪除 worktrees/%s：gitdir 檔案的指向不存在"
+msgid "Removing %s/%s: %s"
+msgstr "移除 %s/%s: %s"

 
 

-#: builtin/worktree.c:165
+#: builtin/worktree.c:221

 msgid "report pruned working trees"
 msgstr "報告清除的工作區"
 
 msgid "report pruned working trees"
 msgstr "報告清除的工作區"
 

-#: builtin/worktree.c:167
+#: builtin/worktree.c:223

 msgid "expire working trees older than <time>"
 msgstr "將早於 <時間> 的工作區過期"
 
 msgid "expire working trees older than <time>"
 msgstr "將早於 <時間> 的工作區過期"
 

-#: builtin/worktree.c:234
+#: builtin/worktree.c:293

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

-#: builtin/worktree.c:244
+#: builtin/worktree.c:302

 #, c-format
 #, c-format

-msgid "unable to re-add worktree '%s'"
-msgstr "無法再次新增工作區 '%s'"
+msgid "unusable worktree destination '%s'"
+msgstr "無法使用的工作目錄目的地「%s」"

 
 

-#: builtin/worktree.c:249
+#: builtin/worktree.c:307

 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"

-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"

 msgstr ""
 msgstr ""

-"'%s' 是一個遺失但鎖定的工作區，使用\n"
-"'add -f -f' 覆蓋，或 'unlock' 和 'prune' 或 'remove' 清除"
+"'%s' 是個遺失但被鎖定的工作區；\n"
+"使用 '%s -f -f' 覆蓋，或 'unlock' 和 'prune' 或 'remove' 清除"

 
 

-#: builtin/worktree.c:251
+#: builtin/worktree.c:309

 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"

-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"

 msgstr ""
 msgstr ""

-"'%s' 是一個遺失但已經註冊的工作區，使用\n"
-"'add -f' 覆蓋，或 'prune' 或 'remove' 清除"
+"'%s' 是個遺失但已註冊的工作區；\n"
+"使用 '%s -f' 覆蓋，或 'prune' 或 'remove' 清除"

 
 

-#: builtin/worktree.c:301
+#: builtin/worktree.c:360

 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "不能建立目錄 '%s'"
 
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "不能建立目錄 '%s'"
 

-#: builtin/worktree.c:435 builtin/worktree.c:441
+#: builtin/worktree.c:494 builtin/worktree.c:500

 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "準備工作區（新分支 '%s'）"
 
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "準備工作區（新分支 '%s'）"
 

-#: builtin/worktree.c:437
+#: builtin/worktree.c:496

 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "準備工作區（重設分支 '%s'，之前為 %s）"
 
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "準備工作區（重設分支 '%s'，之前為 %s）"
 

-#: builtin/worktree.c:446
+#: builtin/worktree.c:505

 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "準備工作區（檢出 '%s'）"
 
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "準備工作區（檢出 '%s'）"
 

-#: builtin/worktree.c:452
+#: builtin/worktree.c:511

 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "準備工作區（分離開頭指標 %s）"
 
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "準備工作區（分離開頭指標 %s）"
 

-#: builtin/worktree.c:493
+#: builtin/worktree.c:552

 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "檢出 <分支>，即使已經被檢出到其它工作區"
 
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "檢出 <分支>，即使已經被檢出到其它工作區"
 

-#: builtin/worktree.c:496
+#: builtin/worktree.c:555

 msgid "create a new branch"
 msgstr "建立一個新分支"
 
 msgid "create a new branch"
 msgstr "建立一個新分支"
 

-#: builtin/worktree.c:498
+#: builtin/worktree.c:557

 msgid "create or reset a branch"
 msgstr "建立或重設一個分支"
 
 msgid "create or reset a branch"
 msgstr "建立或重設一個分支"
 

-#: builtin/worktree.c:500
+#: builtin/worktree.c:559

 msgid "populate the new working tree"
 msgstr "生成新的工作區"
 
 msgid "populate the new working tree"
 msgstr "生成新的工作區"
 

-#: builtin/worktree.c:501
+#: builtin/worktree.c:560

 msgid "keep the new working tree locked"
 msgstr "鎖定新工作區"
 
 msgid "keep the new working tree locked"
 msgstr "鎖定新工作區"
 

-#: builtin/worktree.c:504
+#: builtin/worktree.c:563

 msgid "set up tracking mode (see git-branch(1))"
 msgstr "設定追蹤模式（參見 git-branch(1)）"
 
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "設定追蹤模式（參見 git-branch(1)）"
 

-#: builtin/worktree.c:507
+#: builtin/worktree.c:566

 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "嘗試為新分支名符合一個遠端追蹤分支"
 
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "嘗試為新分支名符合一個遠端追蹤分支"
 

-#: builtin/worktree.c:515
+#: builtin/worktree.c:574

 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b、-B 和 --detach 是互斥的"
 
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b、-B 和 --detach 是互斥的"
 

-#: builtin/worktree.c:576
+#: builtin/worktree.c:635

 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "只能在建立新分支時使用 --[no-]track 選項"
 
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "只能在建立新分支時使用 --[no-]track 選項"
 

-#: builtin/worktree.c:676
+#: builtin/worktree.c:755

 msgid "reason for locking"
 msgstr "鎖定原因"
 
 msgid "reason for locking"
 msgstr "鎖定原因"
 

-#: builtin/worktree.c:688 builtin/worktree.c:721 builtin/worktree.c:795
-#: builtin/worktree.c:922
+#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874
+#: builtin/worktree.c:1000

 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' 不是一個工作區"
 
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' 不是一個工作區"
 

-#: builtin/worktree.c:690 builtin/worktree.c:723
+#: builtin/worktree.c:769 builtin/worktree.c:802

 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作區無法被加鎖或解鎖"
 
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作區無法被加鎖或解鎖"
 

-#: builtin/worktree.c:695
+#: builtin/worktree.c:774

 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被鎖定，原因：%s"
 
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被鎖定，原因：%s"
 

-#: builtin/worktree.c:697
+#: builtin/worktree.c:776

 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被鎖定"
 
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被鎖定"
 

-#: builtin/worktree.c:725
+#: builtin/worktree.c:804

 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被鎖定"
 
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被鎖定"
 

-#: builtin/worktree.c:766
+#: builtin/worktree.c:845

 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "不能移動或刪除包含子模組的工作區"
 
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "不能移動或刪除包含子模組的工作區"
 

-#: builtin/worktree.c:774
+#: builtin/worktree.c:853

 msgid "force move even if worktree is dirty or locked"
 msgstr "強制移動，即使工作區是髒的或已鎖定"
 
 msgid "force move even if worktree is dirty or locked"
 msgstr "強制移動，即使工作區是髒的或已鎖定"
 

-#: builtin/worktree.c:797 builtin/worktree.c:924
+#: builtin/worktree.c:876 builtin/worktree.c:1002

 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' 是一個主工作區"
 
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' 是一個主工作區"
 

-#: builtin/worktree.c:802
+#: builtin/worktree.c:881

 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "無法從 '%s' 算出目標名稱"
 
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "無法從 '%s' 算出目標名稱"
 

-#: builtin/worktree.c:808
-#, c-format
-msgid "target '%s' already exists"
-msgstr "目標 '%s' 已存在"
-
-#: builtin/worktree.c:816
+#: builtin/worktree.c:894

 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"


@@ -21916,7 +22135,7 @@ msgstr ""
 "無法移動一個鎖定的工作區，鎖定原因：%s\n"
 "使用 'move -f -f' 覆蓋或先解鎖"
 
 "無法移動一個鎖定的工作區，鎖定原因：%s\n"
 "使用 'move -f -f' 覆蓋或先解鎖"
 

-#: builtin/worktree.c:818
+#: builtin/worktree.c:896

 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"


@@ -21924,36 +22143,36 @@ msgstr ""
 "無法移動一個鎖定的工作區，\n"
 "使用 'move -f -f' 覆蓋或先解鎖"
 
 "無法移動一個鎖定的工作區，\n"
 "使用 'move -f -f' 覆蓋或先解鎖"
 

-#: builtin/worktree.c:821
+#: builtin/worktree.c:899

 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "驗證失敗，無法移動工作區：%s"
 
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "驗證失敗，無法移動工作區：%s"
 

-#: builtin/worktree.c:826
+#: builtin/worktree.c:904

 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "移動 '%s' 到 '%s' 失敗"
 
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "移動 '%s' 到 '%s' 失敗"
 

-#: builtin/worktree.c:874
+#: builtin/worktree.c:952

 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "在 '%s' 中執行 'git status' 失敗"
 
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "在 '%s' 中執行 'git status' 失敗"
 

-#: builtin/worktree.c:878
+#: builtin/worktree.c:956

 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除"
 
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除"
 

-#: builtin/worktree.c:883
+#: builtin/worktree.c:961

 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d"
 
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d"
 

-#: builtin/worktree.c:906
+#: builtin/worktree.c:984

 msgid "force removal even if worktree is dirty or locked"
 msgstr "強制刪除，即使工作區是髒的或已鎖定"
 
 msgid "force removal even if worktree is dirty or locked"
 msgstr "強制刪除，即使工作區是髒的或已鎖定"
 

-#: builtin/worktree.c:929
+#: builtin/worktree.c:1007

 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"


@@ -21962,7 +22181,7 @@ msgstr ""
 "無法刪除一個鎖定的工作區，鎖定原因：%s\n"
 "使用 'remove -f -f' 覆蓋或先解鎖"
 
 "無法刪除一個鎖定的工作區，鎖定原因：%s\n"
 "使用 'remove -f -f' 覆蓋或先解鎖"
 

-#: builtin/worktree.c:931
+#: builtin/worktree.c:1009

 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"


@@ -21970,7 +22189,7 @@ msgstr ""
 "無法刪除一個鎖定的工作區，\n"
 "使用 'remove -f -f' 覆蓋或先解鎖"
 
 "無法刪除一個鎖定的工作區，\n"
 "使用 'remove -f -f' 覆蓋或先解鎖"
 

-#: builtin/worktree.c:934
+#: builtin/worktree.c:1012

 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "驗證失敗，無法刪除工作區：%s"
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "驗證失敗，無法刪除工作區：%s"


@@ -21991,32 +22210,32 @@ msgstr "將 <前綴> 子目錄內容寫到一個樹狀物件"
 msgid "only useful for debugging"
 msgstr "只對除錯有用"
 
 msgid "only useful for debugging"
 msgstr "只對除錯有用"
 

-#: bugreport.c:14
+#: bugreport.c:15

 msgid "git version:\n"
 msgstr "git 版本：\n"
 
 msgid "git version:\n"
 msgstr "git 版本：\n"
 

-#: bugreport.c:20
+#: bugreport.c:21

 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() 失敗，錯誤：「%s」(%d)\n"
 
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() 失敗，錯誤：「%s」(%d)\n"
 

-#: bugreport.c:30
+#: bugreport.c:31

 msgid "compiler info: "
 msgstr "編譯器資訊： "
 
 msgid "compiler info: "
 msgstr "編譯器資訊： "
 

-#: bugreport.c:32
+#: bugreport.c:34

 msgid "libc info: "
 msgstr "libc 資訊： "
 
 msgid "libc info: "
 msgstr "libc 資訊： "
 

-#: bugreport.c:74
+#: bugreport.c:80

 msgid "not run from a git repository - no hooks to show\n"
 msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n"
 
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n"
 

-#: bugreport.c:84
+#: bugreport.c:90

 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格式>]"
 
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格式>]"
 

-#: bugreport.c:91
+#: bugreport.c:97

 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"


@@ -22050,66 +22269,76 @@ msgstr ""
 "請檢閱臭蟲報告下方的剩餘部分。\n"
 "您可刪除任何您不想分享的地方。\n"
 
 "請檢閱臭蟲報告下方的剩餘部分。\n"
 "您可刪除任何您不想分享的地方。\n"
 

-#: bugreport.c:130
+#: bugreport.c:136

 msgid "specify a destination for the bugreport file"
 msgstr "請指定 bugreport 檔案的目的地"
 
 msgid "specify a destination for the bugreport file"
 msgstr "請指定 bugreport 檔案的目的地"
 

-#: bugreport.c:132
+#: bugreport.c:138

 msgid "specify a strftime format suffix for the filename"
 msgstr "請指定檔案名稱的 strftime 格式後綴"
 
 msgid "specify a strftime format suffix for the filename"
 msgstr "請指定檔案名稱的 strftime 格式後綴"
 

-#: bugreport.c:156
+#: bugreport.c:162

 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "無法建立 '%s' 的前置目錄"
 
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "無法建立 '%s' 的前置目錄"
 

-#: bugreport.c:163
+#: bugreport.c:169

 msgid "System Info"
 msgstr "系統資訊"
 
 msgid "System Info"
 msgstr "系統資訊"
 

-#: bugreport.c:166
+#: bugreport.c:172

 msgid "Enabled Hooks"
 msgstr "啟用的掛鉤"
 
 msgid "Enabled Hooks"
 msgstr "啟用的掛鉤"
 

-#: bugreport.c:174
+#: bugreport.c:180

 #, c-format
 msgid "couldn't create a new file at '%s'"
 msgstr "不要在「%s」建立新檔案"
 
 #, c-format
 msgid "couldn't create a new file at '%s'"
 msgstr "不要在「%s」建立新檔案"
 

-#: bugreport.c:186
+#: bugreport.c:184
+#, c-format
+msgid "unable to write to %s"
+msgstr "無法寫入 %s"
+
+#: bugreport.c:194

 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "已在「%s」建立新報告。\n"
 
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "已在「%s」建立新報告。\n"
 

-#: fast-import.c:3085
+#: fast-import.c:3100

 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "「%s」子模組缺少 from 標記"
 
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "「%s」子模組缺少 from 標記"
 

-#: fast-import.c:3087
+#: fast-import.c:3102

 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "「%s」子模組缺少 to 標記"
 
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "「%s」子模組缺少 to 標記"
 

-#: fast-import.c:3222
+#: fast-import.c:3237

 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "預期 'mark' 指令，得到 %s"
 
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "預期 'mark' 指令，得到 %s"
 

-#: fast-import.c:3227
+#: fast-import.c:3242

 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "預期 'to' 指令，得到 %s"
 
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "預期 'to' 指令，得到 %s"
 

-#: fast-import.c:3317
+#: fast-import.c:3334

 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "期望子模組 rewrite 選項的格式是 name:filename"
 
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "期望子模組 rewrite 選項的格式是 name:filename"
 

-#: fast-import.c:3371
+#: fast-import.c:3388

 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能"
 
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能"
 

+#: http-fetch.c:111
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "傳入 --packfile 的參數必須是有效的雜湊 (收到 '%s')"
+

 #: credential-cache--daemon.c:223
 #, c-format
 msgid ""
 #: credential-cache--daemon.c:223
 #, c-format
 msgid ""


@@ -22285,30 +22514,30 @@ msgstr "不支援委託控制，因為 cURL < 7.22.0"
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.44.0"
 
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.44.0"
 

-#: http.c:914
+#: http.c:910

 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "不支援 CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0"
 
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "不支援 CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0"
 

-#: http.c:993
+#: http.c:989

 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "不支援協定限制，因為 cURL < 7.19.4"
 
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "不支援協定限制，因為 cURL < 7.19.4"
 

-#: http.c:1139
+#: http.c:1132

 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端："
 
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端："
 

-#: http.c:1146
+#: http.c:1139

 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr "無法設定 SSL 後端為 '%s'：cURL: cURL 沒有使用 SSL 後端組建"
 
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr "無法設定 SSL 後端為 '%s'：cURL: cURL 沒有使用 SSL 後端組建"
 

-#: http.c:1150
+#: http.c:1143

 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "無法將 SSL 後端設定為 '%s'：已經設定"
 
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "無法將 SSL 後端設定為 '%s'：已經設定"
 

-#: http.c:2032
+#: http.c:2025

 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"


@@ -22319,111 +22548,134 @@ msgstr ""
 "     請求：%s\n"
 "   重定向：%s"
 
 "     請求：%s\n"
 "   重定向：%s"
 

-#: remote-curl.c:166
+#: remote-curl.c:168

 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "在 push-option 取值中無效的引號：'%s'"
 
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "在 push-option 取值中無效的引號：'%s'"
 

-#: remote-curl.c:263
+#: remote-curl.c:295

 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？"
 
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？"
 

-#: remote-curl.c:364
+#: remote-curl.c:396

 msgid "invalid server response; expected service, got flush packet"
 msgstr "無效的服務端回應。預期服務，得到 flush 包"
 
 msgid "invalid server response; expected service, got flush packet"
 msgstr "無效的服務端回應。預期服務，得到 flush 包"
 

-#: remote-curl.c:395
+#: remote-curl.c:427

 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "無效的服務端回應，得到 '%s'"
 
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "無效的服務端回應，得到 '%s'"
 

-#: remote-curl.c:455
+#: remote-curl.c:487

 #, c-format
 msgid "repository '%s' not found"
 msgstr "版本庫 '%s' 未找到"
 
 #, c-format
 msgid "repository '%s' not found"
 msgstr "版本庫 '%s' 未找到"
 

-#: remote-curl.c:459
+#: remote-curl.c:491

 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "'%s' 身份驗證失敗"
 
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "'%s' 身份驗證失敗"
 

-#: remote-curl.c:463
+#: remote-curl.c:495

 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "無法存取 '%s'：%s"
 
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "無法存取 '%s'：%s"
 

-#: remote-curl.c:469
+#: remote-curl.c:501

 #, c-format
 msgid "redirecting to %s"
 msgstr "重定向到 %s"
 
 #, c-format
 msgid "redirecting to %s"
 msgstr "重定向到 %s"
 

-#: remote-curl.c:593
+#: remote-curl.c:630

 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符"
 
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符"
 

-#: remote-curl.c:673
+#: remote-curl.c:642
+msgid "remote server sent stateless separator"
+msgstr "遠端伺服器傳送了無狀態的分隔符號"
+
+#: remote-curl.c:712

 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer"
 
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer"
 

-#: remote-curl.c:733
+#: remote-curl.c:742
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: 錯誤的行長度字串：%.4s"
+
+#: remote-curl.c:744
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: 非預期的回應結束封包"
+
+#: remote-curl.c:820

 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC 失敗。%s"
 
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC 失敗。%s"
 

-#: remote-curl.c:773
+#: remote-curl.c:860

 msgid "cannot handle pushes this big"
 msgstr "不能處理這麼大的推送"
 
 msgid "cannot handle pushes this big"
 msgstr "不能處理這麼大的推送"
 

-#: remote-curl.c:888
+#: remote-curl.c:975

 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "不能壓縮請求，zlib 壓縮錯誤 %d"
 
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "不能壓縮請求，zlib 壓縮錯誤 %d"
 

-#: remote-curl.c:892
+#: remote-curl.c:979

 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "不能壓縮請求，zlib 結束錯誤 %d"
 
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "不能壓縮請求，zlib 結束錯誤 %d"
 

-#: remote-curl.c:1023
+#: remote-curl.c:1029
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "收到了 %d 位元組長度的標頭"
+
+#: remote-curl.c:1031
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "預期仍要有 %d 位元組的本文 (body)"
+
+#: remote-curl.c:1120

 msgid "dumb http transport does not support shallow capabilities"
 msgstr "啞 http 傳輸不支援 shalllow 能力"
 
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "啞 http 傳輸不支援 shalllow 能力"
 

-#: remote-curl.c:1038
+#: remote-curl.c:1135

 msgid "fetch failed."
 msgstr "取得失敗。"
 
 msgid "fetch failed."
 msgstr "取得失敗。"
 

-#: remote-curl.c:1086
+#: remote-curl.c:1183

 msgid "cannot fetch by sha1 over smart http"
 msgstr "無法透過智慧 HTTP 取得 sha1"
 
 msgid "cannot fetch by sha1 over smart http"
 msgstr "無法透過智慧 HTTP 取得 sha1"
 

-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1227 remote-curl.c:1233

 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'"
 
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'"
 

-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1245 remote-curl.c:1360

 #, c-format
 msgid "http transport does not support %s"
 msgstr "http 傳輸協定不支援 %s"
 
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http 傳輸協定不支援 %s"
 

-#: remote-curl.c:1184
+#: remote-curl.c:1281

 msgid "git-http-push failed"
 msgstr "git-http-push 失敗"
 
 msgid "git-http-push failed"
 msgstr "git-http-push 失敗"
 

-#: remote-curl.c:1369
+#: remote-curl.c:1466

 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]"
 
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]"
 

-#: remote-curl.c:1401
+#: remote-curl.c:1498

 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl：錯誤讀取來自 git 的指令流"
 
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl：錯誤讀取來自 git 的指令流"
 

-#: remote-curl.c:1408
+#: remote-curl.c:1505

 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl：嘗試沒有本機版本庫下取得"
 
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl：嘗試沒有本機版本庫下取得"
 

-#: remote-curl.c:1448
+#: remote-curl.c:1546

 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl：未知的來自 git 的指令 '%s'"
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl：未知的來自 git 的指令 '%s'"


@@ -23431,29 +23683,29 @@ msgstr "子模組 '$displaypath'：'$command $sha1'"
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "無法遞迴進子模組路徑 '$displaypath'"
 
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "無法遞迴進子模組路徑 '$displaypath'"
 

-#: git-submodule.sh:878
+#: git-submodule.sh:852

 msgid "The --cached option cannot be used with the --files option"
 msgstr "選項 --cached 不能和選項 --files 同時使用"
 
 msgid "The --cached option cannot be used with the --files option"
 msgstr "選項 --cached 不能和選項 --files 同時使用"
 

-#: git-submodule.sh:930
+#: git-submodule.sh:904

 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "意外的模式 $mod_dst"
 
 #  譯者：請維持前導空格
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "意外的模式 $mod_dst"
 
 #  譯者：請維持前導空格

-#: git-submodule.sh:950
+#: git-submodule.sh:924

 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  警告：$display_name 未包含提交 $sha1_src"
 
 #  譯者：請維持前導空格
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  警告：$display_name 未包含提交 $sha1_src"
 
 #  譯者：請維持前導空格

-#: git-submodule.sh:953
+#: git-submodule.sh:927

 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  警告：$display_name 未包含提交 $sha1_dst"
 
 #  譯者：請維持前導空格
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  警告：$display_name 未包含提交 $sha1_dst"
 
 #  譯者：請維持前導空格

-#: git-submodule.sh:956
+#: git-submodule.sh:930

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


@@ -23849,44 +24101,44 @@ msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "建立了 %d 個路徑\n"
 
 msgid_plural "touched %d paths\n"
 msgstr[0] "建立了 %d 個路徑\n"
 

-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1055

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為暫存。"
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為暫存。"
 

-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1058

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為儲藏。"
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為儲藏。"
 

-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1061

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為未暫存。"
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為未暫存。"
 

-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1064 git-add--interactive.perl:1073
+#: git-add--interactive.perl:1079

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為應用。"
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為應用。"
 

-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1067 git-add--interactive.perl:1070
+#: git-add--interactive.perl:1076

 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為捨棄。"
 
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為捨棄。"
 

-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1113

 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "為寫入開啟區塊編輯檔案失敗：%s"
 
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "為寫入開啟區塊編輯檔案失敗：%s"
 

-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1120

 #, perl-format
 msgid ""
 "---\n"
 #, perl-format
 msgid ""
 "---\n"


@@ -23899,12 +24151,12 @@ msgstr ""
 "要刪除 '%s' 開始的行，刪除它們。\n"
 "以 %s 開始的行將被刪除。\n"
 
 "要刪除 '%s' 開始的行，刪除它們。\n"
 "以 %s 開始的行將被刪除。\n"
 

-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1142

 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "無法讀取區塊編輯檔案：%s"
 
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "無法讀取區塊編輯檔案：%s"
 

-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1250

 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"


@@ -23918,7 +24170,7 @@ msgstr ""
 "a - 暫存此區塊和本檔案中後面的全部區塊\n"
 "d - 不暫存此區塊和本檔案中後面的全部區塊"
 
 "a - 暫存此區塊和本檔案中後面的全部區塊\n"
 "d - 不暫存此區塊和本檔案中後面的全部區塊"
 

-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1256

 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"


@@ -23932,7 +24184,7 @@ msgstr ""
 "a - 儲藏此區塊和本檔案中後面的全部區塊\n"
 "d - 不儲藏此區塊和本檔案中後面的全部區塊"
 
 "a - 儲藏此區塊和本檔案中後面的全部區塊\n"
 "d - 不儲藏此區塊和本檔案中後面的全部區塊"
 

-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1262

 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"


@@ -23946,7 +24198,7 @@ msgstr ""
 "a - 不暫存此區塊和本檔案中後面的全部區塊\n"
 "d - 不要不暫存此區塊和本檔案中後面的全部區塊"
 
 "a - 不暫存此區塊和本檔案中後面的全部區塊\n"
 "d - 不要不暫存此區塊和本檔案中後面的全部區塊"
 

-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1268

 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"


@@ -23960,7 +24212,7 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊"
 
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊"
 

-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1274 git-add--interactive.perl:1292

 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"


@@ -23974,7 +24226,7 @@ msgstr ""
 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
 "d - 不要捨棄此區塊和本檔案中後面的全部區塊"
 
 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
 "d - 不要捨棄此區塊和本檔案中後面的全部區塊"
 

-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1280

 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"


@@ -23988,7 +24240,7 @@ msgstr ""
 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
 "d - 不要捨棄此區塊和本檔案中後面的全部區塊"
 
 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
 "d - 不要捨棄此區塊和本檔案中後面的全部區塊"
 

-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1286

 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"


@@ -24002,7 +24254,7 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊"
 
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊"
 

-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1298

 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"


@@ -24016,7 +24268,7 @@ msgstr ""
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊"
 
 "a - 套用此區塊和本檔案中後面的全部區塊\n"
 "d - 不要套用此區塊和本檔案中後面的全部區塊"
 

-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1313

 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"


@@ -24038,83 +24290,88 @@ msgstr ""
 "e - 手動編輯目前區塊\n"
 "? - 顯示說明\n"
 
 "e - 手動編輯目前區塊\n"
 "? - 顯示說明\n"
 

-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1344

 msgid "The selected hunks do not apply to the index!\n"
 msgstr "選中的區塊不能套用到索引！\n"
 
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "選中的區塊不能套用到索引！\n"
 

-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1359

 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "忽略未套用的：%s\n"
 
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "忽略未套用的：%s\n"
 

-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1478

 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1479

 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "

-msgstr "將刪除動作套用到工作區 [y,n,q,a,d%s,?]? "
+msgstr "將刪除變更套用到工作區 [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1480
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "將新增變更套用到工作區 [y,n,q,a,d%s,?]? "

 
 

-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1481

 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? "
 
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? "
 

-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1587

 msgid "No other hunks to goto\n"
 msgstr "沒有其它可供跳轉的區塊\n"
 
 msgid "No other hunks to goto\n"
 msgstr "沒有其它可供跳轉的區塊\n"
 

-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1605

 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "無效數字：'%s'\n"
 
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "無效數字：'%s'\n"
 

-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1610

 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "對不起，只有 %d 個可用區塊。\n"
 
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "對不起，只有 %d 個可用區塊。\n"
 

-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1636

 msgid "No other hunks to search\n"
 msgstr "沒有其它可供尋找的區塊\n"
 
 msgid "No other hunks to search\n"
 msgstr "沒有其它可供尋找的區塊\n"
 

-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1653

 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "錯誤的正規表示式 %s：%s\n"
 
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "錯誤的正規表示式 %s：%s\n"
 

-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1663

 msgid "No hunk matches the given pattern\n"
 msgstr "沒有和提供模式相符合的區塊\n"
 
 msgid "No hunk matches the given pattern\n"
 msgstr "沒有和提供模式相符合的區塊\n"
 

-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1675 git-add--interactive.perl:1697

 msgid "No previous hunk\n"
 msgstr "沒有前一個區塊\n"
 
 msgid "No previous hunk\n"
 msgstr "沒有前一個區塊\n"
 

-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1684 git-add--interactive.perl:1703

 msgid "No next hunk\n"
 msgstr "沒有下一個區塊\n"
 
 msgid "No next hunk\n"
 msgstr "沒有下一個區塊\n"
 

-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1709

 msgid "Sorry, cannot split this hunk\n"
 msgstr "對不起，不能分割這個區塊\n"
 
 msgid "Sorry, cannot split this hunk\n"
 msgstr "對不起，不能分割這個區塊\n"
 

-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1715

 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "分割為 %d 塊。\n"
 
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "分割為 %d 塊。\n"
 

-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1725

 msgid "Sorry, cannot edit this hunk\n"
 msgstr "對不起，不能編輯這個區塊\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "對不起，不能編輯這個區塊\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.

-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1790

 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"


@@ -24131,19 +24388,19 @@ msgstr ""
 "diff          - 顯示 HEAD 和索引間差異\n"
 "add untracked - 新增未追蹤檔案的內容至暫存列表\n"
 
 "diff          - 顯示 HEAD 和索引間差異\n"
 "add untracked - 新增未追蹤檔案的內容至暫存列表\n"
 

-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1807 git-add--interactive.perl:1812
+#: git-add--interactive.perl:1815 git-add--interactive.perl:1822
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1832
+#: git-add--interactive.perl:1836 git-add--interactive.perl:1842

 msgid "missing --"
 msgstr "缺少 --"
 
 msgid "missing --"
 msgstr "缺少 --"
 

-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1838

 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "未知的 --patch 模式：%s"
 
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "未知的 --patch 模式：%s"
 

-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1844 git-add--interactive.perl:1850

 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "無效的參數 %s，期望是 --"
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "無效的參數 %s，期望是 --"


@@ -24446,60 +24703,89 @@ msgstr "(mbox) 新增 cc：%s 自行 '%s'\n"
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) 新增 to：%s 自行 '%s'\n"
 
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) 新增 to：%s 自行 '%s'\n"
 

-#: git-send-email.perl:1718
+#: git-send-email.perl:1722

 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n"
 
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n"
 

-#: git-send-email.perl:1753
+#: git-send-email.perl:1757

 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) 新增 cc: %s 自行 '%s'\n"
 
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) 新增 cc: %s 自行 '%s'\n"
 

-#: git-send-email.perl:1864
+#: git-send-email.perl:1868

 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) 不能執行 '%s'"
 
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) 不能執行 '%s'"
 

-#: git-send-email.perl:1871
+#: git-send-email.perl:1875

 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) 新增 %s: %s 自：'%s'\n"
 
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) 新增 %s: %s 自：'%s'\n"
 

-#: git-send-email.perl:1875
+#: git-send-email.perl:1879

 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 無法關閉管道至 '%s'"
 
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 無法關閉管道至 '%s'"
 

-#: git-send-email.perl:1905
+#: git-send-email.perl:1909

 msgid "cannot send message as 7bit"
 msgstr "不能以 7bit 形式傳送訊息"
 
 msgid "cannot send message as 7bit"
 msgstr "不能以 7bit 形式傳送訊息"
 

-#: git-send-email.perl:1913
+#: git-send-email.perl:1917

 msgid "invalid transfer encoding"
 msgstr "無效的傳送編碼"
 
 msgid "invalid transfer encoding"
 msgstr "無效的傳送編碼"
 

-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: git-send-email.perl:1958 git-send-email.perl:2010 git-send-email.perl:2020

 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "不能開啟 %s：%s\n"
 
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "不能開啟 %s：%s\n"
 

-#: git-send-email.perl:1957
+#: git-send-email.perl:1961

 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s：修補檔包含一個超過 998 字元的行"
 
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s：修補檔包含一個超過 998 字元的行"
 

-#: git-send-email.perl:1974
+#: git-send-email.perl:1978

 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "略過 %s 含備份後綴 '%s'。\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
 #, 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:1978
+#: git-send-email.perl:1982

 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "您真的要傳送 %s？[y|N]："
 
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "您真的要傳送 %s？[y|N]："
 

+#, c-format
+#~ msgid "Finding commits for commit graph from %d ref"
+#~ msgid_plural "Finding commits for commit graph from %d refs"
+#~ msgstr[0] "正在從 %d 個引用中尋找提交圖的提交"
+
+#, c-format
+#~ msgid "invalid commit object id: %s"
+#~ msgstr "無效的提交物件 ID：%s"
+
+#, c-format
+#~ msgid "Removing worktrees/%s: not a valid directory"
+#~ msgstr "刪除工作區/%s：不是一個有效的目錄"
+
+#, c-format
+#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#~ msgstr "刪除 worktrees/%s：無法讀取 gitdir 檔案 (%s)"
+
+#, c-format
+#~ msgid "Removing worktrees/%s: invalid gitdir file"
+#~ msgstr "刪除 worktrees/%s：無效的 gitdir 檔案"
+
+#, c-format
+#~ msgid "unable to re-add worktree '%s'"
+#~ msgstr "無法再次新增工作區 '%s'"
+
+#, c-format
+#~ msgid "target '%s' already exists"
+#~ msgstr "目標 '%s' 已存在"
+

 #, c-format
 #~ msgid ""
 #~ "Cannot update sparse checkout: the following entries are not up to date:\n"
 #, c-format
 #~ msgid ""
 #~ "Cannot update sparse checkout: the following entries are not up to date:\n"