d908e50fa2 · matheusbsbs/matheus-bagliano

@@ -20,19 +20,20 @@

20 # - Zhuang Ya <zhuangya AT me.com>

21 #

22 # Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023, 2024, 2025, 2026.

23 -# Kaiyang Wu <self@origincode.me>, 2022.

23 +# Kaiyang Wu <self@origincode.me>, 2022, 2026.

24 # Lumynous <lumynou5.tw@gmail.com>, 2023, 2024, 2025, 2026.

25 -# Kisaragi Hiu <mail@kisaragi-hiu.com>, 2024.

26 -# Ngoo Ka-iu <willy04wu69@gmail.com>, 2024.

27 -# Nightfeather Chen <slat@nightfeather.me>, 2024.

28 -# hms5232 <hms5232@hhming.moe>, 2024, 2025.

25 +# Kisaragi Hiu <mail@kisaragi-hiu.com>, 2024, 2026.

26 +# Ngoo Ka-iu <willy04wu69@gmail.com>, 2024, 2026.

27 +# Nightfeather Chen <slat@nightfeather.me>, 2024, 2026.

28 +# hms5232 <hms5232@hhming.moe>, 2024, 2025, 2026.

29 +# WellsTsai <admin@wellstsai.com>, 2026.

30 msgid ""

31 msgstr ""

32 "Project-Id-Version: Git\n"

33 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

33 -"POT-Creation-Date: 2026-04-19 19:19+0800\n"

34 -"PO-Revision-Date: 2026-04-19 13:40+0000\n"

35 -"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"

34 +"POT-Creation-Date: 2026-06-26 12:08+0800\n"

35 +"PO-Revision-Date: 2026-06-28 14:21+0800\n"

36 +"Last-Translator: Lumynous <lumynou5.tw@gmail.com>\n"

37 "Language-Team: Chinese (Traditional Han script) <https://weblate.slat.org/"

38 "projects/git-po/git-cli/zh_Hant/>\n"

39 "Language: zh_TW\n"

@@ -40,7 +41,7 @@ msgstr ""

41 "Content-Type: text/plain; charset=UTF-8\n"

42 "Content-Transfer-Encoding: 8bit\n"

43 "Plural-Forms: nplurals=1; plural=0;\n"

43 -"X-Generator: Weblate 5.16.2\n"

44 +"X-Generator: Poedit 3.9\n"

45 "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"

46 "zhconvert.org\n"

47

@@ -49,9 +50,7 @@ msgstr ""

50 msgid "Huh (%s)?"

51 msgstr "嗯（%s）？"

52

52 -#: add-interactive.c add-interactive.c builtin/merge.c

53 -#: builtin/rebase.c builtin/rebase.c reset.c sequencer.c

54 -#: sequencer.c sequencer.c

53 +#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c

54 msgid "could not read index"

55 msgstr "無法讀取索引"

56

@@ -71,14 +70,12 @@ msgstr "未變更"

70 msgid "Update"

71 msgstr "更新"

72

74 -#: add-interactive.c add-interactive.c add-interactive.c

73 +#: add-interactive.c

74 #, c-format

75 msgid "could not stage '%s'"

76 msgstr "無法暫存「%s」"

77

79 -#: add-interactive.c add-interactive.c builtin/stash.c

80 -#: builtin/stash.c builtin/stash.c builtin/stash.c

81 -#: builtin/stash.c reset.c sequencer.c

78 +#: add-interactive.c builtin/stash.c reset.c sequencer.c

79 msgid "could not write index"

80 msgstr "無法寫入索引"

81

@@ -93,8 +90,7 @@ msgstr[0] "已更新 %d 個路徑\n"

90 msgid "note: %s is untracked now.\n"

91 msgstr "註：現已不再追蹤 %s。\n"

92

96 -#: add-interactive.c apply.c builtin/checkout.c

97 -#: builtin/reset.c

93 +#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c

94 #, c-format

95 msgid "make_cache_entry failed for path '%s'"

96 msgstr "對「%s」路徑執行 make_cache_entry 失敗"

@@ -175,7 +171,7 @@ msgstr "檢視 HEAD 及索引之間的差異"

171 msgid "add contents of untracked files to the staged set of changes"

172 msgstr "將未追蹤檔案的內容加入至變更暫存集"

173

178 -#: add-interactive.c add-interactive.c

174 +#: add-interactive.c

175 msgid "Prompt help:"

176 msgstr "提示說明："

177

@@ -191,7 +187,7 @@ msgstr "選取範圍中項目"

187 msgid "select multiple ranges"

188 msgstr "選取多個範圍"

189

194 -#: add-interactive.c add-interactive.c

190 +#: add-interactive.c

191 msgid "select item based on unique prefix"

192 msgstr "根據獨特前綴選取項目"

193

@@ -231,11 +227,9 @@ msgstr "已暫存"

227 msgid "unstaged"

228 msgstr "未暫存"

229

234 -#: add-interactive.c apply.c apply.c builtin/am.c

235 -#: builtin/am.c builtin/bugreport.c builtin/clone.c

236 -#: builtin/diagnose.c builtin/fetch.c builtin/hook.c

237 -#: builtin/merge.c builtin/pull.c builtin/submodule--helper.c

238 -#: builtin/submodule--helper.c

230 +#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c

231 +#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c

232 +#: builtin/pull.c builtin/submodule--helper.c

233 msgid "path"

234 msgstr "路徑"

235

@@ -268,13 +262,13 @@ msgstr "暫存加入動作%s [y,n,q,a,d%s,?]? "

262 msgid "Stage this hunk%s [y,n,q,a,d%s,?]? "

263 msgstr "暫存此區塊%s [y,n,q,a,d%s,?]? "

264

271 -#: add-patch.c add-patch.c

265 +#: add-patch.c

266 msgid ""

267 "If the patch applies cleanly, the edited hunk will immediately be marked for "

268 "staging."

269 msgstr "如果修補檔能完全套用，編輯區塊將立即標記為暫存。"

270

277 -#: add-patch.c add-patch.c

271 +#: add-patch.c

272 msgid ""

273 "y - stage this hunk\n"

274 "n - do not stage this hunk\n"

@@ -388,7 +382,7 @@ msgstr "將加入動作套用至索引%s [y,n,q,a,d%s,?]? "

382 msgid "Apply this hunk to index%s [y,n,q,a,d%s,?]? "

383 msgstr "將此區塊套用到索引%s [y,n,q,a,d%s,?]? "

384

391 -#: add-patch.c add-patch.c add-patch.c

385 +#: add-patch.c

386 msgid ""

387 "If the patch applies cleanly, the edited hunk will immediately be marked for "

388 "applying."

@@ -408,33 +402,33 @@ msgstr ""

402 "a - 套用此區塊和本檔案中後面的全部區塊\n"

403 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"

404

411 -#: add-patch.c add-patch.c

405 +#: add-patch.c

406 #, c-format

407 msgid "Discard mode change from worktree%s [y,n,q,a,d%s,?]? "

408 msgstr "從工作區捨棄模式變更%s [y,n,q,a,d%s,?]？ "

409

416 -#: add-patch.c add-patch.c

410 +#: add-patch.c

411 #, c-format

412 msgid "Discard deletion from worktree%s [y,n,q,a,d%s,?]? "

413 msgstr "從工作區捨棄刪除動作%s [y,n,q,a,d%s,?]? "

414

421 -#: add-patch.c add-patch.c

415 +#: add-patch.c

416 #, c-format

417 msgid "Discard addition from worktree%s [y,n,q,a,d%s,?]? "

418 msgstr "從工作區捨棄加入動作%s [y,n,q,a,d%s,?]? "

419

426 -#: add-patch.c add-patch.c

420 +#: add-patch.c

421 #, c-format

422 msgid "Discard this hunk from worktree%s [y,n,q,a,d%s,?]? "

423 msgstr "從工作區捨棄此區塊%s [y,n,q,a,d%s,?]? "

424

431 -#: add-patch.c add-patch.c add-patch.c

425 +#: add-patch.c

426 msgid ""

427 "If the patch applies cleanly, the edited hunk will immediately be marked for "

428 "discarding."

429 msgstr "如果修補檔能完全套用，編輯區塊將立即標記為捨棄。"

430

437 -#: add-patch.c add-patch.c

431 +#: add-patch.c

432 msgid ""

433 "y - discard this hunk from worktree\n"

434 "n - do not discard this hunk from worktree\n"

@@ -550,7 +544,7 @@ msgstr ""

544 "a - 套用此區塊和本檔案中後面的全部區塊\n"

545 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"

546

553 -#: add-patch.c add-patch.c add-patch.c add-patch.c

547 +#: add-patch.c

548 #, c-format

549 msgid "%s cannot be negative"

550 msgstr "%s 不能是負數"

@@ -723,11 +717,11 @@ msgstr "沒有下一個檔案"

717 msgid "No previous file"

718 msgstr "沒有上一個檔案"

719

726 -#: add-patch.c add-patch.c

720 +#: add-patch.c

721 msgid "No other hunk"

722 msgstr "沒有其他區塊"

723

730 -#: add-patch.c add-patch.c

724 +#: add-patch.c

725 msgid "No other undecided hunk"

726 msgstr "沒有其他未決區塊"

727

@@ -994,12 +988,9 @@ msgstr "命令列以 \\ 結尾"

988 msgid "unclosed quote"

989 msgstr "未閉合的引號"

990

997 -#: alias.c builtin/cat-file.c builtin/notes.c builtin/notes.c

998 -#: builtin/notes.c builtin/notes.c builtin/notes.c

999 -#: builtin/notes.c builtin/notes.c builtin/notes.c

1000 -#: builtin/notes.c builtin/prune-packed.c builtin/receive-pack.c

1001 -#: builtin/refs.c builtin/repo.c builtin/tag.c

1002 -#: t/helper/test-pkt-line.c

991 +#: alias.c builtin/cat-file.c builtin/name-rev.c builtin/notes.c

992 +#: builtin/prune-packed.c builtin/receive-pack.c builtin/refs.c builtin/repo.c

993 +#: builtin/tag.c t/helper/test-pkt-line.c

994 msgid "too many arguments"

995 msgstr "引數過多"

996

@@ -1013,37 +1004,20 @@ msgstr "無法識別空白字元選項「%s」"

1004 msgid "unrecognized whitespace ignore option '%s'"

1005 msgstr "無法辨識空白字元忽略選項「%s」"

1006

1016 -#: apply.c archive.c builtin/add.c builtin/add.c

1017 -#: builtin/add.c builtin/add.c builtin/branch.c

1018 -#: builtin/checkout-index.c builtin/checkout.c builtin/checkout.c

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

1020 -#: builtin/clean.c builtin/clone.c builtin/clone.c

1021 -#: builtin/commit.c builtin/commit.c builtin/commit.c

1022 -#: builtin/commit.c builtin/commit.c builtin/describe.c

1023 -#: builtin/diff-tree.c builtin/difftool.c builtin/fast-export.c

1024 -#: builtin/fetch.c builtin/fetch.c builtin/fetch.c

1025 -#: builtin/fetch.c builtin/help.c builtin/index-pack.c

1026 -#: builtin/init-db.c builtin/log.c builtin/log.c

1027 -#: builtin/ls-files.c builtin/merge-base.c builtin/merge-base.c

1028 -#: builtin/merge-tree.c builtin/merge.c builtin/merge.c

1029 -#: builtin/rebase.c builtin/rebase.c builtin/rebase.c

1030 -#: builtin/repack.c builtin/reset.c builtin/reset.c

1031 -#: builtin/rev-parse.c builtin/rev-parse.c builtin/rev-parse.c

1032 -#: builtin/show-branch.c builtin/show-branch.c builtin/stash.c

1033 -#: builtin/stash.c builtin/submodule--helper.c

1034 -#: builtin/submodule--helper.c builtin/tag.c builtin/tag.c

1035 -#: builtin/worktree.c builtin/worktree.c builtin/worktree.c

1036 -#: builtin/worktree.c builtin/worktree.c builtin/worktree.c

1037 -#: parse-options.c parse-options.c range-diff.c revision.c

1038 -#: revision.c revision.c revision.c revision.c

1039 -#: revision.c revision.c revision.c revision.c

1040 -#: revision.c revision.c revision.c revision.c

1041 -#: revision.c

1007 +#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c

1008 +#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c

1009 +#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c

1010 +#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c

1011 +#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c

1012 +#: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c

1013 +#: builtin/reset.c builtin/rev-parse.c builtin/show-branch.c builtin/stash.c

1014 +#: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c

1015 +#: range-diff.c revision.c

1016 #, c-format

1017 msgid "options '%s' and '%s' cannot be used together"

1018 msgstr "無法同時使用「%s」和「%s」選項"

1019

1046 -#: apply.c apply.c apply.c

1020 +#: apply.c

1021 #, c-format

1022 msgid "'%s' outside a repository"

1023 msgstr "「%s」在版本庫之外"

@@ -1297,8 +1271,7 @@ msgstr "修補失敗：%s:%ld"

1271 msgid "cannot checkout %s"

1272 msgstr "無法簽出 %s"

1273

1300 -#: apply.c apply.c apply.c midx.c pack-mtimes.c

1301 -#: pack-revindex.c setup.c

1274 +#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c

1275 #, c-format

1276 msgid "failed to read %s"

1277 msgstr "無法讀取 %s"

@@ -1308,17 +1281,17 @@ msgstr "無法讀取 %s"

1281 msgid "reading from '%s' beyond a symbolic link"

1282 msgstr "讀取符號連結背後的「%s」"

1283

1311 -#: apply.c apply.c

1284 +#: apply.c

1285 #, c-format

1286 msgid "path %s has been renamed/deleted"

1287 msgstr "路徑 %s 已被重新命名或刪除"

1288

1316 -#: apply.c apply.c

1289 +#: apply.c

1290 #, c-format

1291 msgid "%s: does not exist in index"

1292 msgstr "%s：不在索引中"

1293

1321 -#: apply.c apply.c apply.c

1294 +#: apply.c

1295 #, c-format

1296 msgid "%s: does not match index"

1297 msgstr "%s：與索引不符"

@@ -1332,7 +1305,7 @@ msgstr "版本庫缺少用來進行三方合併，所需要的資料物件。"

1305 msgid "Performing three-way merge...\n"

1306 msgstr "正在進行三方合併……\n"

1307

1335 -#: apply.c apply.c

1308 +#: apply.c

1309 #, c-format

1310 msgid "cannot read the current contents of '%s'"

1311 msgstr "無法讀取「%s」目前的內容"

@@ -1371,9 +1344,7 @@ msgstr "%s：錯誤類型"

1344 msgid "%s has type %o, expected %o"

1345 msgstr "%s 的類型是 %o，預期是 %o"

1346

1374 -#: apply.c apply.c builtin/fast-import.c

1375 -#: builtin/fast-import.c read-cache.c read-cache.c

1376 -#: read-cache.c

1347 +#: apply.c builtin/fast-import.c read-cache.c

1348 #, c-format

1349 msgid "invalid path '%s'"

1350 msgstr "路徑「%s」無效"

@@ -1398,7 +1369,7 @@ msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符"

1369 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

1370 msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符"

1371

1401 -#: apply.c apply.c

1372 +#: apply.c

1373 #, c-format

1374 msgid "affected file '%s' is beyond a symbolic link"

1375 msgstr "受影響的檔案「%s」在符號連結後"

@@ -1458,12 +1429,12 @@ msgstr "無法對剛建立的檔案「%s」執行 stat"

1429 msgid "unable to create backing store for newly created file %s"

1430 msgstr "無法對剛建立的檔案 %s 建立後端儲存"

1431

1461 -#: apply.c apply.c

1432 +#: apply.c

1433 #, c-format

1434 msgid "unable to add cache entry for %s"

1435 msgstr "無法為 %s 加入快取項目"

1436

1466 -#: apply.c builtin/bisect.c builtin/gc.c builtin/gc.c

1437 +#: apply.c builtin/bisect.c builtin/gc.c

1438 #, c-format

1439 msgid "failed to write to '%s'"

1440 msgstr "無法寫入「%s」"

@@ -1493,7 +1464,7 @@ msgid "Applying patch %%s with %d reject..."

1464 msgid_plural "Applying patch %%s with %d rejects..."

1465 msgstr[0] "套用修補檔 %%s，其中 %d 個被拒絕……"

1466

1496 -#: apply.c apply.c apply.c

1467 +#: apply.c

1468 #, c-format

1469 msgid "cannot open %s"

1470 msgstr "無法開啟 %s"

@@ -1547,7 +1518,7 @@ msgid "squelched %d whitespace error"

1518 msgid_plural "squelched %d whitespace errors"

1519 msgstr[0] "抑制下仍有 %d 個空白字元誤用"

1520

1550 -#: apply.c apply.c

1521 +#: apply.c

1522 #, c-format

1523 msgid "%d line adds whitespace errors."

1524 msgid_plural "%d lines add whitespace errors."

@@ -1647,9 +1618,8 @@ msgstr "路徑以 NUL 字元分隔"

1618 msgid "ensure at least <n> lines of context match"

1619 msgstr "確保至少符合 <n> 列上下文"

1620

1650 -#: apply.c builtin/am.c builtin/am.c

1651 -#: builtin/interpret-trailers.c builtin/interpret-trailers.c

1652 -#: builtin/pack-objects.c builtin/rebase.c

1621 +#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c

1622 +#: builtin/rebase.c

1623 msgid "action"

1624 msgstr "動作"

1625

@@ -1657,7 +1627,7 @@ msgstr "動作"

1627 msgid "detect new or modified lines that have whitespace errors"

1628 msgstr "檢查新增和修改的列中間，是否有空白字元誤用"

1629

1660 -#: apply.c apply.c

1630 +#: apply.c

1631 msgid "ignore changes in whitespace when finding context"

1632 msgstr "尋找上下文時忽略空白字元變更"

1633

@@ -1712,7 +1682,6 @@ msgid "unsupported file mode: 0%o (SHA1: %s)"

1682 msgstr "不支援的檔案模式：0%o (SHA1：%s)"

1683

1684 #: archive-tar.c archive-zip.c builtin/pack-objects.c

1715 -#: builtin/pack-objects.c

1685 #, c-format

1686 msgid "deflate error (%d)"

1687 msgstr "壓縮錯誤 (%d)"

@@ -1760,9 +1729,7 @@ msgstr ""

1729 msgid "git archive --remote <repo> [--exec <cmd>] --list"

1730 msgstr "git archive --remote <repo> [--exec <cmd>] --list"

1731

1763 -#: archive.c archive.c builtin/fast-import.c

1764 -#: builtin/fast-import.c builtin/gc.c builtin/notes.c

1765 -#: builtin/tag.c

1732 +#: archive.c builtin/fast-import.c builtin/gc.c builtin/notes.c builtin/tag.c

1733 #, c-format

1734 msgid "cannot read '%s'"

1735 msgstr "無法讀取「%s」"

@@ -1772,7 +1739,7 @@ msgstr "無法讀取「%s」"

1739 msgid "pathspec '%s' matches files outside the current directory"

1740 msgstr "符合路徑規格「%s」的檔案在目前目錄之外"

1741

1775 -#: archive.c builtin/add.c builtin/add.c builtin/rm.c

1742 +#: archive.c builtin/add.c builtin/rm.c

1743 #, c-format

1744 msgid "pathspec '%s' did not match any files"

1745 msgstr "路徑規格「%s」未符合任何檔案"

@@ -1838,17 +1805,13 @@ msgstr "前綴"

1805 msgid "prepend prefix to each pathname in the archive"

1806 msgstr "為封存中的每個路徑名稱加上前綴"

1807

1841 -#: archive.c archive.c builtin/blame.c builtin/blame.c

1842 -#: builtin/blame.c builtin/commit-tree.c builtin/config.c

1843 -#: builtin/fast-export.c builtin/fast-export.c

1844 -#: builtin/fast-export.c builtin/gc.c builtin/gc.c

1845 -#: builtin/grep.c builtin/hash-object.c builtin/ls-files.c

1846 -#: builtin/ls-files.c builtin/notes.c builtin/notes.c

1847 -#: builtin/read-tree.c parse-options.h

1808 +#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c

1809 +#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c

1810 +#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h

1811 msgid "file"

1812 msgstr "file"

1813

1851 -#: archive.c archive.c

1814 +#: archive.c

1815 msgid "add untracked file to archive"

1816 msgstr "將未追蹤檔案加進封存"

1817

@@ -1868,8 +1831,8 @@ msgstr "讀取工作目錄中的 .gitattributes"

1831 msgid "report archived files on stderr"

1832 msgstr "在 stderr 上回報封存的檔案"

1833

1871 -#: archive.c builtin/clone.c builtin/fetch.c

1872 -#: builtin/pack-objects.c builtin/pack-objects.c builtin/pull.c

1834 +#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c

1835 +#: builtin/pull.c

1836 msgid "time"

1837 msgstr "time"

1838

@@ -1885,8 +1848,7 @@ msgstr "設定壓縮級別"

1848 msgid "list supported archive formats"

1849 msgstr "列出支援的封存格式"

1850

1888 -#: archive.c builtin/archive.c builtin/clone.c builtin/clone.c

1889 -#: builtin/submodule--helper.c builtin/submodule--helper.c

1851 +#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c

1852 msgid "repo"

1853 msgstr "repo"

1854

@@ -1894,8 +1856,7 @@ msgstr "repo"

1856 msgid "retrieve the archive from remote repository <repo>"

1857 msgstr "從遠端版本庫 <repo> 擷取封存檔案"

1858

1897 -#: archive.c builtin/archive.c builtin/difftool.c

1898 -#: builtin/notes.c

1859 +#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c

1860 msgid "command"

1861 msgstr "command"

1862

@@ -1907,18 +1868,10 @@ msgstr "遠端 git-upload-archive 命令的路徑"

1868 msgid "Unexpected option --remote"

1869 msgstr "非預期選項 --remote"

1870

1910 -#: archive.c builtin/add.c builtin/add.c builtin/add.c

1911 -#: builtin/add.c builtin/add.c builtin/checkout.c

1912 -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

1913 -#: builtin/clone.c builtin/clone.c builtin/commit.c

1914 -#: builtin/commit.c builtin/commit.c builtin/fast-export.c

1915 -#: builtin/index-pack.c builtin/log.c builtin/reset.c

1916 -#: builtin/reset.c builtin/reset.c builtin/reset.c

1917 -#: builtin/reset.c builtin/rm.c builtin/stash.c

1918 -#: builtin/stash.c builtin/stash.c builtin/stash.c

1919 -#: builtin/stash.c builtin/stash.c builtin/stash.c

1920 -#: builtin/worktree.c builtin/worktree.c fetch-pack.c

1921 -#: http-fetch.c http-fetch.c revision.c

1871 +#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c

1872 +#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c

1873 +#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c

1874 +#: revision.c

1875 #, c-format

1876 msgid "the option '%s' requires '%s'"

1877 msgstr "「%s」選項需要「%s」"

@@ -1997,10 +1950,8 @@ msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE"

1950 msgid "unable to stat '%s'"

1951 msgstr "無法 stat「%s」"

1952

2000 -#: bisect.c builtin/cat-file.c builtin/cat-file.c

2001 -#: builtin/index-pack.c builtin/notes.c builtin/pack-objects.c

2002 -#: builtin/pack-objects.c builtin/pack-objects.c combine-diff.c

2003 -#: object-file.c object-file.c rerere.c

1953 +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c

1954 +#: builtin/pack-objects.c combine-diff.c object-file.c rerere.c

1955 #, c-format

1956 msgid "unable to read %s"

1957 msgstr "無法讀取 %s"

@@ -2041,33 +1992,33 @@ msgstr ""

1992 #: bisect.c

1993 #, c-format

1994 msgid ""

2044 -"The merge base %s is %s.\n"

1995 +"The merge base %s is '%s'.\n"

1996 "This means the first '%s' commit is between %s and [%s].\n"

1997 msgstr ""

2047 -"合併基礎 %s 是 %s。\n"

2048 -"這意味著第一個「%s」提交位於 %s 和 [%s] 之間。\n"

1998 +"合併基底 %s 是「%s」。\n"

1999 +"這代表第一個「%s」提交位於 %s 和 [%s] 之間。\n"

2000

2001 #: bisect.c

2002 #, c-format

2003 msgid ""

2053 -"Some %s revs are not ancestors of the %s rev.\n"

2004 +"Some '%s' revs are not ancestors of the '%s' rev.\n"

2005 "git bisect cannot work properly in this case.\n"

2055 -"Maybe you mistook %s and %s revs?\n"

2006 +"Maybe you mistook '%s' and '%s' revs?\n"

2007 msgstr ""

2057 -"部分 %s 修訂版不是 %s 修訂版的祖先。\n"

2008 +"部分「%s」修訂版不是「%s」修訂版的祖先。\n"

2009 "這種情況下 git bisect 無法正常運作。\n"

2059 -"您可能弄錯了 %s 和 %s 修訂版？\n"

2010 +"您可能弄錯了「%s」和「%s」修訂版？\n"

2011

2012 #: bisect.c

2013 #, c-format

2014 msgid ""

2015 "the merge base between %s and [%s] must be skipped.\n"

2065 -"So we cannot be sure the first %s commit is between %s and %s.\n"

2016 +"So we cannot be sure the first '%s' commit is between %s and %s.\n"

2017 "We continue anyway."

2018 msgstr ""

2068 -"介於 %s 和 [%s] 的合併基礎一定被略過了。\n"

2069 -"所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n"

2070 -"我們仍舊繼續。"

2019 +"介於 %s 和 [%s] 之間的合併基底一定被略過了。\n"

2020 +"所以第一個「%s」提交無法確認是否介於 %s 和 %s 之間。\n"

2021 +"將依然繼續。"

2022

2023 #: bisect.c

2024 #, c-format

@@ -2076,8 +2027,8 @@ msgstr "二分搜尋中：合併基礎必須經過測試\n"

2027

2028 #: bisect.c

2029 #, c-format

2079 -msgid "a %s revision is needed"

2080 -msgstr "需要一個 %s 修訂版"

2030 +msgid "a '%s' revision is needed"

2031 +msgstr "需要一個「%s」修訂版"

2032

2033 #: bisect.c

2034 #, c-format

@@ -2100,8 +2051,8 @@ msgstr "無法讀取二分搜尋的引用"

2051

2052 #: bisect.c

2053 #, c-format

2103 -msgid "%s was both %s and %s\n"

2104 -msgstr "%s 同時為 %s 和 %s\n"

2054 +msgid "%s was both '%s' and '%s'\n"

2055 +msgstr "%s 同時為「%s」和「%s」\n"

2056

2057 #: bisect.c

2058 #, c-format

@@ -2135,21 +2086,16 @@ msgstr "--contents 和 --reverse 不能混用。"

2086 msgid "--reverse and --first-parent together require specified latest commit"

2087 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"

2088

2138 -#: blame.c builtin/bisect.c builtin/bisect.c

2139 -#: builtin/commit.c builtin/fast-export.c builtin/log.c

2140 -#: builtin/log.c builtin/log.c builtin/log.c builtin/log.c

2141 -#: builtin/merge.c builtin/pack-objects.c builtin/pack-objects.c

2142 -#: builtin/pack-objects.c builtin/pack-objects.c

2143 -#: builtin/shortlog.c midx-write.c pack-bitmap.c

2144 -#: pack-bitmap.c remote.c sequencer.c sequencer.c

2145 -#: submodule.c

2089 +#: blame.c builtin/bisect.c builtin/commit.c builtin/fast-export.c

2090 +#: builtin/log.c builtin/merge.c builtin/pack-objects.c builtin/shortlog.c

2091 +#: midx-write.c pack-bitmap.c remote.c sequencer.c submodule.c

2092 msgid "revision walk setup failed"

2093 msgstr "修訂版遍歷設定失敗"

2094

2095 #: blame.c

2096 msgid ""

2097 "--reverse --first-parent together require range along first-parent chain"

2152 -msgstr "--reverse 和 --first-parent 共用，需要第一上級鏈的提交範圍"

2098 +msgstr "--reverse 和 --first-parent 一起使用時需要沿第一親代鏈選擇範圍"

2099

2100 #: blame.c

2101 #, c-format

@@ -2217,12 +2163,10 @@ msgid "not tracking: ambiguous information for ref '%s'"

2163 msgstr "未追蹤：「%s」引用有歧義"

2164

2165 # 譯者：為保證在輸出中對齊，注意調整句中空格！

2220 -#. #-#-#-#-# branch.c.po #-#-#-#-#

2166 #. TRANSLATORS: This is a line listing a remote with duplicate

2167 #. refspecs in the advice message below. For RTL languages you'll

2168 #. probably want to swap the "%s" and leading " " space around.

2169 #.

2225 -#. #-#-#-#-# object-name.c.po #-#-#-#-#

2170 #. TRANSLATORS: This is line item of ambiguous object output

2171 #. from describe_ambiguous_object() above. For RTL languages

2172 #. you'll probably want to swap the "%s" and leading " " space

@@ -2304,8 +2248,7 @@ msgstr ""

2248 "並建立兩個分支間的追蹤關係，您可能需要使用 `git push -u`\n"

2249 "推送分支並設定和上游的關聯。"

2250

2307 -#: branch.c builtin/replace.c builtin/replace.c

2308 -#: builtin/replace.c builtin/replace.c

2251 +#: branch.c builtin/replace.c

2252 #, c-format

2253 msgid "not a valid object name: '%s'"

2254 msgstr "物件名稱無效：「%s」"

@@ -2334,7 +2277,7 @@ msgstr ""

2277 "您可以使用「git checkout --no-recurse-submodules %s && git submodule update "

2278 "--init」命令嘗試更新子模組"

2279

2337 -#: branch.c branch.c

2280 +#: branch.c

2281 #, c-format

2282 msgid "submodule '%s': cannot create branch '%s'"

2283 msgstr "「%s」子模組：無法建立「%s」分支"

@@ -2384,15 +2327,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

2327 msgstr "下列路徑根據其中一個 .gitignore 檔案而被忽略：\n"

2328

2329 #: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c

2387 -#: builtin/prune-packed.c builtin/pull.c builtin/push.c

2388 -#: builtin/remote.c builtin/rm.c builtin/send-pack.c

2389 -#: builtin/sparse-checkout.c

2330 +#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c

2331 +#: builtin/rm.c builtin/send-pack.c builtin/sparse-checkout.c

2332 msgid "dry run"

2333 msgstr "測試執行"

2334

2335 #: builtin/add.c builtin/check-ignore.c builtin/commit.c

2394 -#: builtin/count-objects.c builtin/fsck.c builtin/log.c

2395 -#: builtin/mv.c builtin/read-tree.c builtin/refs.c

2336 +#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c

2337 +#: builtin/read-tree.c builtin/refs.c

2338 msgid "be verbose"

2339 msgstr "詳細輸出"

2340

@@ -2404,8 +2346,7 @@ msgstr "互動式挑選"

2346 msgid "select hunks interactively"

2347 msgstr "互動式選取區塊"

2348

2407 -#: builtin/add.c builtin/checkout.c builtin/reset.c

2408 -#: builtin/stash.c builtin/stash.c

2349 +#: builtin/add.c builtin/checkout.c builtin/reset.c builtin/stash.c

2350 msgid "auto advance to the next file when selecting hunks interactively"

2351 msgstr "在互動式選取區塊時自動前往下一個檔案"

2352

@@ -2505,10 +2446,8 @@ msgstr "如果您確定想要加入它們，請使用 -f。"

2446 msgid "adding files failed"

2447 msgstr "加入檔案失敗"

2448

2508 -#: builtin/add.c builtin/add.c builtin/checkout.c

2509 -#: builtin/checkout.c builtin/commit.c builtin/commit.c

2510 -#: builtin/reset.c builtin/reset.c builtin/stash.c

2511 -#: builtin/stash.c builtin/stash.c builtin/stash.c

2449 +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c

2450 +#: builtin/stash.c

2451 #, c-format

2452 msgid "'%s' cannot be negative"

2453 msgstr "「%s」不能是負數"

@@ -2518,8 +2457,8 @@ msgstr "「%s」不能是負數"

2457 msgid "--chmod param '%s' must be either -x or +x"

2458 msgstr "--chmod 的參數「%s」必須是 -x 或 +x"

2459

2521 -#: builtin/add.c builtin/checkout.c builtin/commit.c

2522 -#: builtin/reset.c builtin/rm.c builtin/stash.c

2460 +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c

2461 +#: builtin/rm.c builtin/stash.c

2462 #, c-format

2463 msgid "'%s' and pathspec arguments cannot be used together"

2464 msgstr "「%s」和路徑規格引數不得同時使用"

@@ -2533,19 +2472,15 @@ msgstr "沒有指定，亦未加入檔案。\n"

2472 msgid "Maybe you wanted to say 'git add .'?"

2473 msgstr "也許您想要執行的是「git add .」？"

2474

2536 -#: builtin/add.c builtin/check-ignore.c builtin/checkout.c

2537 -#: builtin/checkout.c builtin/clean.c builtin/commit.c

2538 -#: builtin/diff-tree.c builtin/grep.c builtin/mv.c

2539 -#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c

2540 -#: builtin/submodule--helper.c read-cache.c read-cache.c

2541 -#: rerere.c rerere.c rerere.c submodule.c

2475 +#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c

2476 +#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c

2477 +#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c

2478 +#: rerere.c submodule.c

2479 msgid "index file corrupt"

2480 msgstr "索引檔案損壞"

2481

2545 -#: builtin/add.c builtin/am.c builtin/am.c builtin/checkout.c

2546 -#: builtin/checkout.c builtin/clone.c builtin/commit.c

2547 -#: builtin/commit.c builtin/commit.c builtin/history.c

2548 -#: builtin/stash.c merge.c rerere.c

2482 +#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c

2483 +#: builtin/commit.c builtin/history.c builtin/stash.c merge.c rerere.c

2484 msgid "unable to write new index file"

2485 msgstr "無法寫入新的索引檔案"

2486

@@ -2554,18 +2489,14 @@ msgstr "無法寫入新的索引檔案"

2489 msgid "bad action '%s' for '%s'"

2490 msgstr "「%s」動作對「%s」無效"

2491

2557 -#: builtin/am.c builtin/am.c builtin/am.c builtin/blame.c

2558 -#: builtin/blame.c builtin/fetch.c builtin/pack-objects.c

2559 -#: builtin/pack-objects.c builtin/pull.c builtin/pull.c

2560 -#: builtin/pull.c builtin/revert.c diff-merges.c diff.c

2561 -#: environment.c gpg-interface.c gpg-interface.c ls-refs.c

2562 -#: parallel-checkout.c sequencer.c setup.c setup.c setup.c

2492 +#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c

2493 +#: builtin/pull.c builtin/revert.c diff-merges.c diff.c environment.c

2494 +#: gpg-interface.c ls-refs.c parallel-checkout.c sequencer.c setup.c

2495 #, c-format

2496 msgid "invalid value for '%s': '%s'"

2497 msgstr "「%s」的值無效：「%s」"

2498

2567 -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c

2568 -#: sequencer.c sequencer.c sequencer.c trailer.c

2499 +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c trailer.c

2500 #, c-format

2501 msgid "could not read '%s'"

2502 msgstr "無法讀取「%s」"

@@ -2574,7 +2505,6 @@ msgstr "無法讀取「%s」"

2505 msgid "could not parse author script"

2506 msgstr "無法解析作者文稿"

2507

2577 -#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c

2508 #: builtin/am.c builtin/replace.c commit.c sequencer.c

2509 #, c-format

2510 msgid "could not parse %s"

@@ -2599,14 +2529,12 @@ msgstr "從「%s」複製註解到「%s」失敗"

2529 msgid "fseek failed"

2530 msgstr "fseek 失敗"

2531

2602 -#: builtin/am.c builtin/am.c builtin/rebase.c sequencer.c

2603 -#: wrapper.c wrapper.c

2532 +#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c

2533 #, c-format

2534 msgid "could not open '%s' for reading"

2535 msgstr "無法開啟「%s」進行讀取"

2536

2608 -#: builtin/am.c builtin/rebase.c editor.c sequencer.c

2609 -#: wrapper.c wrapper.c

2537 +#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c

2538 #, c-format

2539 msgid "could not open '%s' for writing"

2540 msgstr "無法開啟「%s」進行寫入"

@@ -2624,7 +2552,7 @@ msgstr "一次只能套用一個 StGIT 修補檔序列"

2552 msgid "invalid timestamp"

2553 msgstr "無效的時間戳"

2554

2627 -#: builtin/am.c builtin/am.c

2555 +#: builtin/am.c

2556 msgid "invalid Date line"

2557 msgstr "無效的 Date 列"

2558

@@ -2680,8 +2608,7 @@ msgstr "在提交 %s 中缺少作者列"

2608 msgid "invalid ident line: %.*s"

2609 msgstr "ident 列無效：%.*s"

2610

2683 -#: builtin/am.c builtin/checkout.c builtin/clone.c

2684 -#: commit-graph.c

2611 +#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c

2612 #, c-format

2613 msgid "unable to parse commit %s"

2614 msgstr "無法解析 %s 提交"

@@ -2718,12 +2645,11 @@ msgstr "git write-tree 無法寫入樹狀物件"

2645 msgid "applying to an empty history"

2646 msgstr "正在套用至空白歷史記錄上"

2647

2721 -#: builtin/am.c builtin/commit.c builtin/merge.c

2722 -#: builtin/merge.c replay.c sequencer.c

2648 +#: builtin/am.c builtin/commit.c builtin/merge.c replay.c sequencer.c

2649 msgid "failed to write commit object"

2650 msgstr "無法寫入提交物件"

2651

2726 -#: builtin/am.c builtin/am.c

2652 +#: builtin/am.c

2653 #, c-format

2654 msgid "cannot resume: %s does not exist."

2655 msgstr "無法繼續：%s 不存在。"

@@ -2765,7 +2691,7 @@ msgstr "建立空白提交：%.*s"

2691 msgid "Patch is empty."

2692 msgstr "修補檔空白。"

2693

2768 -#: builtin/am.c builtin/am.c

2694 +#: builtin/am.c

2695 #, c-format

2696 msgid "Applying: %.*s"

2697 msgstr "套用：%.*s"

@@ -2808,13 +2734,12 @@ msgstr ""

2734 "您應該對已經解決衝突的每一個檔案執行 `git add`，標記為已經完成。\n"

2735 "你可以對「由他們刪除」的檔案，執行 `git rm` 指令。"

2736

2811 -#: builtin/am.c builtin/am.c builtin/am.c builtin/reset.c

2812 -#: builtin/reset.c

2737 +#: builtin/am.c builtin/reset.c

2738 #, c-format

2739 msgid "Could not parse object '%s'."

2740 msgstr "無法解析物件「%s」。"

2741

2817 -#: builtin/am.c builtin/am.c

2742 +#: builtin/am.c

2743 msgid "failed to clean index"

2744 msgstr "無法清除索引"

2745

@@ -2855,8 +2780,8 @@ msgstr "歷史遺留選項——無作用"

2780 msgid "allow fall back on 3way merging if needed"

2781 msgstr "必要時允許回復至三方合併"

2782

2858 -#: builtin/am.c builtin/init-db.c builtin/prune-packed.c

2859 -#: builtin/repack.c builtin/stash.c

2783 +#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c

2784 +#: builtin/stash.c

2785 msgid "be quiet"

2786 msgstr "靜默模式"

2787

@@ -2892,30 +2817,21 @@ msgstr "截掉裁切線前的所有內容"

2817 msgid "pass it through git-mailinfo"

2818 msgstr "透過 git-mailinfo 傳入"

2819

2895 -#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c

2896 -#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c

2820 #: builtin/am.c

2821 msgid "pass it through git-apply"

2822 msgstr "透過 git-apply 傳入"

2823

2901 -#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c

2902 -#: builtin/fmt-merge-msg.c builtin/grep.c builtin/merge.c

2903 -#: builtin/pull.c builtin/pull.c builtin/pull.c

2904 -#: builtin/rebase.c builtin/repack.c builtin/repack.c

2905 -#: builtin/repack.c builtin/show-branch.c builtin/show-ref.c

2906 -#: builtin/tag.c parse-options.h parse-options.h

2907 -#: parse-options.h

2824 +#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c

2825 +#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c

2826 +#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h

2827 msgid "n"

2828 msgstr "n"

2829

2911 -#: builtin/am.c builtin/branch.c builtin/bugreport.c

2912 -#: builtin/cat-file.c builtin/cat-file.c builtin/cat-file.c

2913 -#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c

2914 -#: builtin/init-db.c builtin/ls-files.c builtin/ls-tree.c

2915 -#: builtin/refs.c builtin/replace.c builtin/repo.c

2916 -#: builtin/repo.c builtin/submodule--helper.c

2917 -#: builtin/submodule--helper.c builtin/submodule--helper.c

2918 -#: builtin/tag.c builtin/verify-tag.c

2830 +#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c

2831 +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c

2832 +#: builtin/ls-files.c builtin/ls-tree.c builtin/name-rev.c builtin/refs.c

2833 +#: builtin/replace.c builtin/repo.c builtin/submodule--helper.c builtin/tag.c

2834 +#: builtin/verify-tag.c

2835 msgid "format"

2836 msgstr "format"

2837

@@ -2967,9 +2883,8 @@ msgstr "將作者日期當作提交日期"

2883 msgid "use current timestamp for author date"

2884 msgstr "把目前時間戳當作是作者日期"

2885

2970 -#: builtin/am.c builtin/commit-tree.c builtin/commit.c

2971 -#: builtin/merge.c builtin/pull.c builtin/rebase.c

2972 -#: builtin/revert.c builtin/tag.c

2886 +#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c

2887 +#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c

2888 msgid "key-id"

2889 msgstr "key-id"

2890

@@ -3045,8 +2960,25 @@ msgid "git archive: expected a flush"

2960 msgstr "git archive：預期收到 flush 封包"

2961

2962 #: builtin/backfill.c

3048 -msgid "git backfill [--min-batch-size=<n>] [--[no-]sparse]"

3049 -msgstr "git backfill [--min-batch-size=<n>] [--[no-]sparse]"

2963 +msgid ""

2964 +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] "

2965 +"[<revision-range>]"

2966 +msgstr ""

2967 +"git backfill [--min-batch-size=<n>] [--[no-]sparse] [--[no-]include-edges] "

2968 +"[<revision-range>]"

2969 +

2970 +#: builtin/backfill.c

2971 +#, c-format

2972 +msgid "'%s' cannot be used with 'git backfill'"

2973 +msgstr "「%s」不能與「git backfill」同時使用"

2974 +

2975 +#: builtin/backfill.c

2976 +msgid "cannot backfill with these filter options"

2977 +msgstr "無法以這些過濾器選項回填"

2978 +

2979 +#: builtin/backfill.c

2980 +msgid "cannot backfill with blob size limits"

2981 +msgstr "無法帶資料物件大小限制回填"

2982

2983 #: builtin/backfill.c

2984 msgid "problem loading sparse-checkout"

@@ -3060,8 +2992,12 @@ msgstr "一次請求的最小物件數量"

2992 msgid "Restrict the missing objects to the current sparse-checkout"

2993 msgstr "將缺少的物件限制於目前的稀疏簽出"

2994

3063 -#: builtin/backfill.c builtin/diff-pairs.c builtin/log.c

3064 -#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c

2995 +#: builtin/backfill.c

2996 +msgid "Include blobs from boundary commits in the backfill"

2997 +msgstr "在回填時包含邊界提交的資料物件"

2998 +

2999 +#: builtin/backfill.c builtin/diff-pairs.c builtin/log.c builtin/replay.c

3000 +#: builtin/shortlog.c bundle.c

3001 #, c-format

3002 msgid "unrecognized argument: %s"

3003 msgstr "不認識的引數：%s"

@@ -3118,21 +3054,21 @@ msgstr "無法開啟檔案「%s」來讀取"

3054 #: builtin/bisect.c

3055 #, c-format

3056 msgid "'%s' is not a valid term"

3121 -msgstr "「%s」不是有效的術語"

3057 +msgstr "「%s」不是有效的措詞"

3058

3059 #: builtin/bisect.c

3060 #, c-format

3061 msgid "can't use the builtin command '%s' as a term"

3126 -msgstr "不能將內建命令「%s」當作術語使用"

3062 +msgstr "不能將內建命令「%s」當作措詞使用"

3063

3064 #: builtin/bisect.c

3065 #, c-format

3066 msgid "can't change the meaning of the term '%s'"

3131 -msgstr "不能變更術語「%s」的含義"

3067 +msgstr "不能變更措詞「%s」的含義"

3068

3069 #: builtin/bisect.c

3070 msgid "please use two different terms"

3135 -msgstr "請使用兩個不同的術語"

3071 +msgstr "請使用兩個不同的措詞"

3072

3073 #: builtin/bisect.c

3074 #, c-format

@@ -3168,7 +3104,7 @@ msgstr "無法開啟檔案「%s」"

3104 #: builtin/bisect.c

3105 #, c-format

3106 msgid "Invalid command: you're currently in a %s/%s bisect"

3171 -msgstr "命令無效：您正處於採用 %s/%s 術語的二分搜尋"

3107 +msgstr "命令無效：您正處於採用 %s/%s 措詞的二分搜尋"

3108

3109 #: builtin/bisect.c

3110 #, c-format

@@ -3205,31 +3141,33 @@ msgid "Are you sure [Y/n]? "

3141 msgstr "是否確定 [Y/n]? "

3142

3143 #: builtin/bisect.c

3208 -msgid "status: waiting for both good and bad commits\n"

3209 -msgstr "狀態：正在等待好和壞的提交\n"

3144 +#, c-format

3145 +msgid "status: waiting for both '%s' and '%s' commits\n"

3146 +msgstr "狀態：正在等待「%s」和「%s」提交\n"

3147

3148 #: builtin/bisect.c

3149 #, c-format

3213 -msgid "status: waiting for bad commit, %d good commit known\n"

3214 -msgid_plural "status: waiting for bad commit, %d good commits known\n"

3215 -msgstr[0] "狀態：正在等待壞的提交，已知有 %d 個好的提交\n"

3150 +msgid "status: waiting for '%s' commit, %d '%s' commit known\n"

3151 +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n"

3152 +msgstr[0] "狀態：正在等待「%s」提交，已知有 %d 個「%s」提交\n"

3153

3154 #: builtin/bisect.c

3218 -msgid "status: waiting for good commit(s), bad commit known\n"

3219 -msgstr "狀態：正在等待好的提交，已知有壞的提交\n"

3155 +#, c-format

3156 +msgid "status: waiting for '%s' commit(s), '%s' commit known\n"

3157 +msgstr "狀態：正在等待「%s」提交，已知有「%s」提交\n"

3158

3159 #: builtin/bisect.c

3160 msgid "no terms defined"

3223 -msgstr "未定義術語"

3161 +msgstr "未定義措詞"

3162

3163 #: builtin/bisect.c

3164 #, c-format

3165 msgid ""

3228 -"Your current terms are %s for the old state\n"

3229 -"and %s for the new state.\n"

3166 +"Your current terms are '%s' for the old state\n"

3167 +"and '%s' for the new state.\n"

3168 msgstr ""

3231 -"您目前針對舊狀態的術語是 %s；\n"

3232 -"對新狀態的術語是 %s。\n"

3169 +"您目前對舊狀態的措詞是「%s」；\n"

3170 +"對新狀態的措詞是「%s」。\n"

3171

3172 #: builtin/bisect.c

3173 #, c-format

@@ -3245,9 +3183,9 @@ msgstr ""

3183 msgid "could not open '%s' for appending"

3184 msgstr "無法開啟「%s」進行附加"

3185

3248 -#: builtin/bisect.c builtin/bisect.c

3186 +#: builtin/bisect.c

3187 msgid "'' is not a valid term"

3250 -msgstr "「」不是有效術語"

3188 +msgstr "「」不是有效的措詞"

3189

3190 #: builtin/bisect.c

3191 #, c-format

@@ -3299,7 +3237,7 @@ msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數"

3237 msgid "'git bisect %s' can take only one argument."

3238 msgstr "「git bisect %s」只取一個引數。"

3239

3302 -#: builtin/bisect.c builtin/bisect.c

3240 +#: builtin/bisect.c

3241 #, c-format

3242 msgid "Bad rev input: %s"

3243 msgstr "rev 輸入格式錯誤：%s"

@@ -3334,13 +3272,13 @@ msgstr "二分搜尋執行失敗：沒有提供命令。"

3272

3273 #: builtin/bisect.c

3274 #, c-format

3337 -msgid "unable to verify %s on good revision"

3338 -msgstr "無法在好的修訂版上驗證 %s"

3275 +msgid "unable to verify %s on '%s' revision"

3276 +msgstr "無法在「%2$s」修訂版上驗證 %1$s"

3277

3278 #: builtin/bisect.c

3279 #, c-format

3342 -msgid "bogus exit code %d for good revision"

3343 -msgstr "好的修訂版回傳偽造的錯誤碼 %d"

3280 +msgid "bogus exit code %d for '%s' revision"

3281 +msgstr "處理「%2$s」修訂版時遇到了虛假的結束代碼 %1$d"

3282

3283 #: builtin/bisect.c

3284 #, c-format

@@ -3361,8 +3299,9 @@ msgid "bisect run success"

3299 msgstr "二分搜尋執行成功"

3300

3301 #: builtin/bisect.c

3364 -msgid "bisect found first bad commit"

3365 -msgstr "二分搜尋發現到第一個有問題的提交"

3302 +#, c-format

3303 +msgid "bisect found first '%s' commit\n"

3304 +msgstr "二分搜尋找到了第一個「%s」提交\n"

3305

3306 #: builtin/bisect.c

3307 #, c-format

@@ -3410,7 +3349,7 @@ msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

3349 msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"

3350 msgstr "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"

3351

3413 -#: builtin/blame.c builtin/blame.c

3352 +#: builtin/blame.c

3353 msgid "<rev-opts> are documented in git-rev-list(1)"

3354 msgstr "<rev-opts> 的文件在 git-rev-list(1)"

3355

@@ -3423,7 +3362,7 @@ msgstr "預期是個顏色：%s"

3362 msgid "must end with a color"

3363 msgstr "結尾必須是一個顏色"

3364

3426 -#: builtin/blame.c diff.c diff.c merge-ort.c transport.c

3365 +#: builtin/blame.c diff.c merge-ort.c transport.c

3366 #, c-format

3367 msgid "unknown value for config '%s': %s"

3368 msgstr "設定 '%s' 的取值未知：%s"

@@ -3456,9 +3395,8 @@ msgstr "不把根提交當作邊界（預設值：off）"

3395 msgid "show work cost statistics"

3396 msgstr "顯示工作量統計"

3397

3459 -#: builtin/blame.c builtin/checkout.c builtin/clone.c

3460 -#: builtin/commit-graph.c builtin/commit-graph.c builtin/fetch.c

3461 -#: builtin/merge.c builtin/multi-pack-index.c builtin/pull.c

3398 +#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c

3399 +#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c

3400 #: builtin/push.c builtin/remote.c builtin/send-pack.c

3401 msgid "force progress reporting"

3402 msgstr "強制顯示進度報告"

@@ -3547,7 +3485,7 @@ msgstr "使用來自 <file> 的修訂集而不是呼叫 git-rev-list"

3485 msgid "use <file>'s contents as the final image"

3486 msgstr "將 <file> 的內容當成是最終印象"

3487

3550 -#: builtin/blame.c builtin/blame.c

3488 +#: builtin/blame.c

3489 msgid "score"

3490 msgstr "score"

3491

@@ -3739,12 +3677,12 @@ msgstr "%s 工作區的 HEAD 指標未被更新"

3677 msgid "invalid branch name: '%s'"

3678 msgstr "分支名稱無效：「%s」"

3679

3742 -#: builtin/branch.c builtin/branch.c builtin/branch.c

3680 +#: builtin/branch.c

3681 #, c-format

3682 msgid "no commit on branch '%s' yet"

3683 msgstr "分支「%s」尚無提交"

3684

3747 -#: builtin/branch.c builtin/branch.c

3685 +#: builtin/branch.c

3686 #, c-format

3687 msgid "no branch named '%s'"

3688 msgstr "沒有名為「%s」的分支"

@@ -3803,8 +3741,7 @@ msgstr "顯示雜湊值和主旨，若傳入兩次則顯示上游分支"

3741 msgid "suppress informational messages"

3742 msgstr "不顯示資訊訊息"

3743

3806 -#: builtin/branch.c builtin/checkout.c

3807 -#: builtin/submodule--helper.c

3744 +#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c

3745 msgid "set branch tracking configuration"

3746 msgstr "設定分支追蹤組態"

3747

@@ -3832,11 +3769,11 @@ msgstr "使用彩色輸出"

3769 msgid "act on remote-tracking branches"

3770 msgstr "作用於遠端追蹤分支"

3771

3835 -#: builtin/branch.c builtin/branch.c

3772 +#: builtin/branch.c

3773 msgid "print only branches that contain the commit"

3774 msgstr "只輸出包含此提交的分支"

3775

3839 -#: builtin/branch.c builtin/branch.c

3776 +#: builtin/branch.c

3777 msgid "print only branches that don't contain the commit"

3778 msgstr "只輸出不包含此提交的分支"

3779

@@ -3908,9 +3845,7 @@ msgstr "只輸出尚未合併的分支"

3845 msgid "list branches in columns"

3846 msgstr "以行的形式列出分支"

3847

3911 -#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c

3912 -#: builtin/notes.c builtin/notes.c builtin/notes.c

3913 -#: builtin/tag.c

3848 +#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c

3849 msgid "object"

3850 msgstr "object"

3851

@@ -3926,8 +3861,8 @@ msgstr "排序和過濾不區分大小寫"

3861 msgid "recurse through submodules"

3862 msgstr "在子模組中遞迴"

3863

3929 -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c

3930 -#: builtin/ls-tree.c builtin/tag.c builtin/verify-tag.c

3864 +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c

3865 +#: builtin/tag.c builtin/verify-tag.c

3866 msgid "format to use for the output"

3867 msgstr "輸出格式"

3868

@@ -3950,7 +3885,7 @@ msgstr ""

3885 msgid "--recurse-submodules can only be used to create branches"

3886 msgstr "--recurse-submodules 只能用來建立分支"

3887

3953 -#: builtin/branch.c builtin/branch.c

3888 +#: builtin/branch.c

3889 msgid "branch name required"

3890 msgstr "必須提供分支名稱"

3891

@@ -3988,7 +3923,7 @@ msgid ""

3923 "could not set upstream of HEAD to %s when it does not point to any branch"

3924 msgstr "HEAD 不指向任何分支時無法將其上游設為 %s"

3925

3991 -#: builtin/branch.c builtin/branch.c

3926 +#: builtin/branch.c

3927 #, c-format

3928 msgid "no such branch '%s'"

3929 msgstr "無「%s」分支"

@@ -4086,10 +4021,8 @@ msgstr ""

4021 "請檢閱臭蟲報告下方的剩餘部分。\n"

4022 "您可刪除任何您不想分享的地方。\n"

4023

4089 -#: builtin/bugreport.c builtin/commit.c builtin/commit.c

4090 -#: builtin/commit.c builtin/fast-export.c builtin/fast-export.c

4091 -#: builtin/fast-export.c builtin/fast-export.c

4092 -#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c

4024 +#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c

4025 +#: builtin/pack-objects.c builtin/rebase.c builtin/repack.c builtin/replay.c

4026 #: parse-options.h

4027 msgid "mode"

4028 msgstr "mode"

@@ -4168,7 +4101,7 @@ msgstr "需要提供 <file> 引數"

4101 msgid "do not show progress meter"

4102 msgstr "不顯示進度列"

4103

4171 -#: builtin/bundle.c builtin/bundle.c builtin/pack-objects.c

4104 +#: builtin/bundle.c builtin/pack-objects.c

4105 msgid "show progress meter"

4106 msgstr "顯示進度列"

4107

@@ -4214,6 +4147,11 @@ msgstr "正在拆分物件"

4147 msgid "cannot read object %s '%s'"

4148 msgstr "無法讀取物件 %s「%s」"

4149

4150 +#: builtin/cat-file.c

4151 +#, c-format

4152 +msgid "mailmap: invalid boolean '%s'"

4153 +msgstr "mailmap：無效的布林值「%s」"

4154 +

4155 #: builtin/cat-file.c

4156 msgid "flush is only for --buffer mode"

4157 msgstr "排清功能只能用於 --buffer 模式"

@@ -4382,8 +4320,7 @@ msgstr "「%s=<%s>」需要「%s」或「%s」"

4320 msgid "path|tree-ish"

4321 msgstr "path|tree-ish"

4322

4385 -#: builtin/cat-file.c builtin/cat-file.c builtin/cat-file.c

4386 -#: builtin/cat-file.c builtin/cat-file.c

4323 +#: builtin/cat-file.c

4324 #, c-format

4325 msgid "'%s' requires a batch mode"

4326 msgstr "「%s」需要批次處理模式"

@@ -4397,7 +4334,7 @@ msgstr "「-%c」與批次處理模式不相容"

4334 msgid "batch modes take no arguments"

4335 msgstr "批次處理模式不取引數"

4336

4400 -#: builtin/cat-file.c builtin/cat-file.c

4337 +#: builtin/cat-file.c

4338 #, c-format

4339 msgid "<rev> required with '%s'"

4340 msgstr "「%s」需要 <rev>"

@@ -4450,8 +4387,7 @@ msgstr "<tree-ish>"

4387 msgid "which tree-ish to check attributes at"

4388 msgstr "要檢查屬性的樹狀物件指示元"

4389

4453 -#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c

4454 -#: builtin/worktree.c

4390 +#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c

4391 msgid "suppress progress reporting"

4392 msgstr "不顯示進度報告"

4393

@@ -4515,10 +4451,8 @@ msgstr "未指定聯絡地址"

4451 msgid "git checkout--worker [<options>]"

4452 msgstr "git checkout--worker [<options>]"

4453

4518 -#: builtin/checkout--worker.c builtin/checkout-index.c

4519 -#: builtin/column.c builtin/column.c builtin/submodule--helper.c

4454 +#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c

4455 #: builtin/submodule--helper.c builtin/worktree.c

4521 -#: builtin/worktree.c

4456 msgid "string"

4457 msgstr "string"

4458

@@ -4570,12 +4504,12 @@ msgstr "將內容寫入暫存檔"

4504 msgid "copy out the files from named stage"

4505 msgstr "從指定暫存區中拷出檔案"

4506

4573 -#: builtin/checkout.c builtin/checkout.c

4507 +#: builtin/checkout.c

4508 #, c-format

4509 msgid "path '%s' does not have our version"

4510 msgstr "「%s」路徑沒有我們的版本"

4511

4578 -#: builtin/checkout.c builtin/checkout.c

4512 +#: builtin/checkout.c

4513 #, c-format

4514 msgid "path '%s' does not have their version"

4515 msgstr "「%s」路徑沒有他們的版本"

@@ -4618,7 +4552,6 @@ msgid "Updated %d path from the index"

4552 msgid_plural "Updated %d paths from the index"

4553 msgstr[0] "已從索引區更新 %d 個路徑"

4554

4621 -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

4555 #: builtin/checkout.c

4556 #, c-format

4557 msgid "'%s' cannot be used with updating paths"

@@ -4639,7 +4572,7 @@ msgstr "「%s」或「%s」皆未指定"

4572 msgid "'%s' must be used when '%s' is not specified"

4573 msgstr "未指定「%2$s」時，必須使用「%1$s」"

4574

4642 -#: builtin/checkout.c builtin/checkout.c

4575 +#: builtin/checkout.c

4576 #, c-format

4577 msgid "'%s' or '%s' cannot be used with %s"

4578 msgstr "「%s」或「%s」不能與 %s 同時使用"

@@ -4649,16 +4582,13 @@ msgstr "「%s」或「%s」不能與 %s 同時使用"

4582 msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree"

4583 msgstr "「%s」、「%s」或「%s」不能在簽出樹狀物件時使用"

4584

4652 -#: builtin/checkout.c builtin/checkout.c

4585 +#: builtin/checkout.c

4586 #, c-format

4587 msgid "path '%s' is unmerged"

4588 msgstr "路徑「%s」未合併"

4589

4657 -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

4658 -#: builtin/grep.c builtin/grep.c builtin/grep.c

4659 -#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c

4660 -#: builtin/reset.c merge-ort.c reset.c sequencer.c

4661 -#: sequencer.c tree-walk.c

4590 +#: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c

4591 +#: merge-ort.c reset.c sequencer.c tree-walk.c

4592 #, c-format

4593 msgid "unable to read tree (%s)"

4594 msgstr "無法讀取樹狀物件（%s）"

@@ -4667,15 +4597,6 @@ msgstr "無法讀取樹狀物件（%s）"

4597 msgid "you need to resolve your current index first"

4598 msgstr "您需要先解決目前索引區的衝突"

4599

4670 -#: builtin/checkout.c

4671 -#, c-format

4672 -msgid ""

4673 -"cannot continue with staged changes in the following files:\n"

4674 -"%s"

4675 -msgstr ""

4676 -"無法繼續，下列檔案有暫存的變更：\n"

4677 -"%s"

4678 -

4600 #: builtin/checkout.c

4601 #, c-format

4602 msgid "Can not do reflog for '%s': %s\n"

@@ -4685,7 +4606,7 @@ msgstr "無法對「%s」執行 reflog 動作：%s\n"

4606 msgid "HEAD is now at"

4607 msgstr "HEAD 目前位於"

4608

4688 -#: builtin/checkout.c builtin/clone.c builtin/clone.c

4609 +#: builtin/checkout.c builtin/clone.c

4610 msgid "unable to update HEAD"

4611 msgstr "無法更新 HEAD"

4612

@@ -4704,7 +4625,7 @@ msgstr "已經位於「%s」\n"

4625 msgid "Switched to and reset branch '%s'\n"

4626 msgstr "已切換並重設分支「%s」\n"

4627

4707 -#: builtin/checkout.c builtin/checkout.c

4628 +#: builtin/checkout.c

4629 #, c-format

4630 msgid "Switched to a new branch '%s'\n"

4631 msgstr "已切換至新分支「%s」\n"

@@ -4767,10 +4688,15 @@ msgstr "在修訂版遍歷時遇到內部錯誤"

4688 msgid "Previous HEAD position was"

4689 msgstr "之前的 HEAD 指標位置在"

4690

4770 -#: builtin/checkout.c builtin/checkout.c

4691 +#: builtin/checkout.c

4692 msgid "You are on a branch yet to be born"

4693 msgstr "您正位於一個尚未初始化的分支"

4694

4695 +#: builtin/checkout.c

4696 +#, c-format

4697 +msgid "The following paths have local changes:\n"

4698 +msgstr "如下路徑有本機變更：\n"

4699 +

4700 #: builtin/checkout.c

4701 #, c-format

4702 msgid ""

@@ -4815,12 +4741,12 @@ msgstr "預期只有一個引用"

4741 msgid "only one reference expected, %d given."

4742 msgstr "預期只有一個引用，卻提供了 %d 個。"

4743

4818 -#: builtin/checkout.c builtin/worktree.c builtin/worktree.c

4744 +#: builtin/checkout.c builtin/worktree.c

4745 #, c-format

4746 msgid "invalid reference: %s"

4747 msgstr "無效引用：%s"

4748

4823 -#: builtin/checkout.c builtin/checkout.c

4749 +#: builtin/checkout.c

4750 #, c-format

4751 msgid "reference is not a tree: %s"

4752 msgstr "引用不是樹狀物件：%s"

@@ -4835,7 +4761,7 @@ msgstr "預期收到分支，卻收到標籤「%s」"

4761 msgid "a branch is expected, got remote branch '%s'"

4762 msgstr "預期收到分支，卻收到遠端分支「%s」"

4763

4838 -#: builtin/checkout.c builtin/checkout.c

4764 +#: builtin/checkout.c

4765 #, c-format

4766 msgid "a branch is expected, got '%s'"

4767 msgstr "預期收到分支，卻收到「%s」"

@@ -4898,7 +4824,7 @@ msgstr "在進行二分搜尋時切換分支"

4824 msgid "paths cannot be used with switching branches"

4825 msgstr "切換分支時不能指定路徑"

4826

4901 -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

4827 +#: builtin/checkout.c

4828 #, c-format

4829 msgid "'%s' cannot be used with switching branches"

4830 msgstr "切換分支時不能指定「%s」"

@@ -4908,8 +4834,7 @@ msgstr "切換分支時不能指定「%s」"

4834 msgid "'%s' needs the paths to check out"

4835 msgstr "「%s」需要指定要簽出的路徑"

4836

4911 -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

4912 -#: builtin/checkout.c builtin/checkout.c

4837 +#: builtin/checkout.c

4838 #, c-format

4839 msgid "'%s' cannot be used with '%s'"

4840 msgstr "「%s」不能與「%s」同時使用"

@@ -4937,8 +4862,7 @@ msgstr "未知的衝突輸出風格「%s」"

4862 msgid "perform a 3-way merge with the new branch"

4863 msgstr "和新分支進行三方合併"

4864

4940 -#: builtin/checkout.c builtin/log.c builtin/range-diff.c

4941 -#: parse-options.h

4865 +#: builtin/checkout.c builtin/log.c builtin/range-diff.c parse-options.h

4866 msgid "style"

4867 msgstr "style"

4868

@@ -5042,12 +4966,8 @@ msgstr ""

4966 msgid "you must specify path(s) to restore"

4967 msgstr "您必須指定要還原的路徑"

4968

5045 -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c

5046 -#: builtin/checkout.c builtin/clone.c builtin/remote.c

5047 -#: builtin/remote.c builtin/replay.c builtin/replay.c

5048 -#: builtin/replay.c builtin/submodule--helper.c

4969 +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c

4970 #: builtin/submodule--helper.c builtin/worktree.c

5050 -#: builtin/worktree.c

4971 msgid "branch"

4972 msgstr "branch"

4973

@@ -5255,11 +5175,9 @@ msgstr "互動式清除"

5175 msgid "remove whole directories"

5176 msgstr "移除整個目錄"

5177

5258 -#: builtin/clean.c builtin/config.c builtin/config.c

5259 -#: builtin/config.c builtin/describe.c builtin/describe.c

5260 -#: builtin/grep.c builtin/log.c builtin/log.c

5261 -#: builtin/ls-files.c builtin/name-rev.c builtin/name-rev.c

5262 -#: builtin/show-ref.c pack-refs.c pack-refs.c ref-filter.h

5178 +#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c

5179 +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c

5180 +#: pack-refs.c ref-filter.h

5181 msgid "pattern"

5182 msgstr "pattern"

5183

@@ -5284,8 +5202,7 @@ msgstr "clean.requireForce 是 true 且未給定 -f 選項：拒絕清理"

5202 msgid "info: Could not add alternate for '%s': %s\n"

5203 msgstr "info: 不能為「%s」新增一個備用：%s\n"

5204

5287 -#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c

5288 -#: setup.c

5205 +#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c

5206 #, c-format

5207 msgid "failed to stat '%s'"

5208 msgstr "對「%s」呼叫 stat 失敗"

@@ -5396,7 +5313,7 @@ msgstr "不要拓製淺層版本庫"

5313 msgid "don't create a checkout"

5314 msgstr "不要建立簽出"

5315

5399 -#: builtin/clone.c builtin/clone.c builtin/init-db.c

5316 +#: builtin/clone.c builtin/init-db.c

5317 msgid "create a bare repository"

5318 msgstr "建立裸版本庫"

5319

@@ -5436,21 +5353,17 @@ msgstr "模板目錄"

5353 msgid "directory from which templates will be used"

5354 msgstr "將被使用的模板目錄"

5355

5439 -#: builtin/clone.c builtin/clone.c builtin/submodule--helper.c

5440 -#: builtin/submodule--helper.c builtin/submodule--helper.c

5356 +#: builtin/clone.c builtin/submodule--helper.c

5357 msgid "reference repository"

5358 msgstr "引用版本庫"

5359

5360 #: builtin/clone.c builtin/submodule--helper.c

5445 -#: builtin/submodule--helper.c

5361 msgid "use --reference only while cloning"

5362 msgstr "僅在拓製時使用 --reference"

5363

5449 -#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c

5450 -#: builtin/init-db.c builtin/merge-file.c builtin/merge.c

5451 -#: builtin/pack-objects.c builtin/repack.c

5364 +#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c

5365 +#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c

5366 #: builtin/submodule--helper.c t/helper/test-simple-ipc.c

5453 -#: t/helper/test-simple-ipc.c

5367 msgid "name"

5368 msgstr "name"

5369

@@ -5491,7 +5404,6 @@ msgid "deepen history of shallow clone, excluding ref"

5404 msgstr "取得更多淺層拓製的過往歷史記錄，除了特定修訂版"

5405

5406 #: builtin/clone.c builtin/submodule--helper.c

5494 -#: builtin/submodule--helper.c

5407 msgid "clone only one branch, HEAD or --branch"

5408 msgstr "只拓製一個分支、HEAD 或 --branch"

5409

@@ -5512,7 +5424,6 @@ msgid "separate git dir from working tree"

5424 msgstr "git 目錄和工作區分離"

5425

5426 #: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c

5515 -#: builtin/submodule--helper.c builtin/submodule--helper.c

5427 msgid "specify the reference format to use"

5428 msgstr "指定要使用的引用格式"

5429

@@ -5524,13 +5435,13 @@ msgstr "key=value"

5435 msgid "set config inside the new repository"

5436 msgstr "在新版本庫中設定設定訊息"

5437

5527 -#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c

5528 -#: builtin/pull.c builtin/push.c builtin/send-pack.c

5438 +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c

5439 +#: builtin/push.c builtin/send-pack.c

5440 msgid "server-specific"

5441 msgstr "server-specific"

5442

5532 -#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c

5533 -#: builtin/pull.c builtin/push.c builtin/send-pack.c

5443 +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c

5444 +#: builtin/push.c builtin/send-pack.c

5445 msgid "option to transmit"

5446 msgstr "傳輸選項"

5447

@@ -5566,9 +5477,8 @@ msgstr "太多參數。"

5477 msgid "You must specify a repository to clone."

5478 msgstr "您必須指定要拓製的版本庫。"

5479

5569 -#: builtin/clone.c builtin/init-db.c builtin/refs.c

5570 -#: builtin/submodule--helper.c builtin/submodule--helper.c

5571 -#: builtin/submodule--helper.c setup.c setup.c

5480 +#: builtin/clone.c builtin/init-db.c builtin/refs.c builtin/submodule--helper.c

5481 +#: setup.c

5482 #, c-format

5483 msgid "unknown ref storage format '%s'"

5484 msgstr "未知的引用儲存格式「%s」"

@@ -5598,8 +5508,7 @@ msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。"

5508 msgid "working tree '%s' already exists."

5509 msgstr "工作區 '%s' 已經存在。"

5510

5601 -#: builtin/clone.c builtin/clone.c builtin/difftool.c

5602 -#: builtin/log.c builtin/worktree.c builtin/worktree.c

5511 +#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c

5512 #, c-format

5513 msgid "could not create leading directories of '%s'"

5514 msgstr "無法為「%s」建立前導目錄"

@@ -5625,7 +5534,7 @@ msgid ""

5534 "able"

5535 msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容"

5536

5628 -#: builtin/clone.c builtin/remote.c builtin/remote.c

5537 +#: builtin/clone.c builtin/remote.c

5538 #, c-format

5539 msgid "'%s' is not a valid remote name"

5540 msgstr "'%s' 不是一個有效的遠端名稱"

@@ -5646,7 +5555,7 @@ msgstr "本機拓製會忽略 --shallow-exclude。請改用 file:// 協定。"

5555 msgid "--filter is ignored in local clones; use file:// instead."

5556 msgstr "本機拓製會忽略 --filter。請改用 file:// 協定。"

5557

5649 -#: builtin/clone.c fetch-pack.c fetch-pack.c

5558 +#: builtin/clone.c fetch-pack.c

5559 msgid "source repository is shallow, reject to clone."

5560 msgstr "來源版本庫是淺版本庫 (shallow)。拒絕拓製。"

5561

@@ -5662,7 +5571,7 @@ msgstr "--local 被忽略"

5571 msgid "cannot clone from filtered bundle"

5572 msgstr "無法從過濾後的套件包拓製"

5573

5665 -#: builtin/clone.c builtin/clone.c

5574 +#: builtin/clone.c

5575 msgid "failed to initialize the repo, skipping bundle URI"

5576 msgstr "無法初始化版本庫，略過套件包 URI"

5577

@@ -5675,7 +5584,7 @@ msgstr "無法從套件包 URL「%s」抓取物件"

5584 msgid "failed to fetch advertised bundles"

5585 msgstr "無法抓取公佈的套件包"

5586

5678 -#: builtin/clone.c builtin/clone.c

5587 +#: builtin/clone.c

5588 msgid "remote transport reported error"

5589 msgstr "遠端傳輸回報錯誤"

5590

@@ -5701,7 +5610,7 @@ msgstr "git column [<選項>]"

5610 msgid "lookup config vars"

5611 msgstr "尋找設定變數"

5612

5704 -#: builtin/column.c builtin/column.c

5613 +#: builtin/column.c

5614 msgid "layout to use"

5615 msgstr "要使用的配置"

5616

@@ -5752,8 +5661,8 @@ msgstr ""

5661 "[no-]progress]\n"

5662 " <split-options>"

5663

5755 -#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c

5756 -#: builtin/log.c builtin/repack.c builtin/repack.c

5664 +#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c builtin/log.c

5665 +#: builtin/repack.c

5666 msgid "dir"

5667 msgstr "目錄"

5668

@@ -5790,7 +5699,7 @@ msgstr "非期望的非十六進位物件 ID：%s"

5699 msgid "invalid object: %s"

5700 msgstr "物件無效：%s"

5701

5793 -#: builtin/commit-graph.c parse-options-cb.c parse-options-cb.c

5702 +#: builtin/commit-graph.c parse-options-cb.c

5703 #, c-format

5704 msgid "option `%s' expects a numerical value"

5705 msgstr "選項 `%s' 期望一個數字值"

@@ -5858,9 +5767,9 @@ msgstr ""

5767 #: builtin/commit-tree.c

5768 #, c-format

5769 msgid "duplicate parent %s ignored"

5861 -msgstr "忽略重複的父提交 %s"

5770 +msgstr "忽略重複的親代提交 %s"

5771

5863 -#: builtin/commit-tree.c builtin/commit-tree.c builtin/log.c

5772 +#: builtin/commit-tree.c builtin/log.c

5773 #, c-format

5774 msgid "not a valid object name %s"

5775 msgstr "不是一個有效的物件名 %s"

@@ -5877,15 +5786,14 @@ msgstr "git commit-tree：無法關閉 '%s'"

5786

5787 #: builtin/commit-tree.c

5788 msgid "parent"

5880 -msgstr "父提交"

5789 +msgstr "親代"

5790

5791 #: builtin/commit-tree.c

5792 msgid "id of a parent commit object"

5884 -msgstr "父提交物件 ID"

5793 +msgstr "親代提交物件 ID"

5794

5886 -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c

5887 -#: builtin/notes.c builtin/notes.c builtin/stash.c

5888 -#: builtin/tag.c

5795 +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c

5796 +#: builtin/stash.c builtin/tag.c

5797 msgid "message"

5798 msgstr "訊息"

5799

@@ -5897,8 +5805,8 @@ msgstr "提交說明"

5805 msgid "read commit log message from file"

5806 msgstr "從檔案中讀取提交說明"

5807

5900 -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c

5901 -#: builtin/pull.c builtin/revert.c

5808 +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c

5809 +#: builtin/revert.c

5810 msgid "GPG sign commit"

5811 msgstr "GPG 提交簽名"

5812

@@ -6061,7 +5969,7 @@ msgid ""

5969 "in the current commit message"

5970 msgstr "無法選擇一個未被目前提交說明使用的備註字元"

5971

6064 -#: builtin/commit.c builtin/commit.c builtin/commit.c

5972 +#: builtin/commit.c

5973 #, c-format

5974 msgid "could not lookup commit '%s'"

5975 msgstr "無法查詢提交「%s」"

@@ -6085,7 +5993,7 @@ msgstr "無法讀取日誌檔案「%s」"

5993 msgid "options '%s' and '%s:%s' cannot be used together"

5994 msgstr "「%s」和「%s:%s」選項不得同時使用"

5995

6088 -#: builtin/commit.c builtin/commit.c

5996 +#: builtin/commit.c

5997 msgid "could not read SQUASH_MSG"

5998 msgstr "無法讀取 SQUASH_MSG"

5999

@@ -6093,8 +6001,8 @@ msgstr "無法讀取 SQUASH_MSG"

6001 msgid "could not read MERGE_MSG"

6002 msgstr "無法讀取 MERGE_MSG"

6003

6096 -#: builtin/commit.c builtin/history.c builtin/submodule--helper.c

6097 -#: bundle.c rerere.c rerere.c sequencer.c sequencer.c

6004 +#: builtin/commit.c builtin/history.c builtin/submodule--helper.c bundle.c

6005 +#: rerere.c sequencer.c

6006 #, c-format

6007 msgid "could not open '%s'"

6008 msgstr "無法開啟「%s」"

@@ -6214,7 +6122,7 @@ msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者

6122 msgid "Invalid ignored mode '%s'"

6123 msgstr "無效的忽略模式 '%s'"

6124

6217 -#: builtin/commit.c builtin/commit.c

6125 +#: builtin/commit.c

6126 #, c-format

6127 msgid "Invalid untracked files mode '%s'"

6128 msgstr "無效的未追蹤檔案參數 '%s'"

@@ -6267,11 +6175,11 @@ msgstr "未知選項：--fixup=%s:%s"

6175 msgid "paths '%s ...' with -a does not make sense"

6176 msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義"

6177

6270 -#: builtin/commit.c builtin/commit.c

6178 +#: builtin/commit.c

6179 msgid "show status concisely"

6180 msgstr "以簡潔的格式顯示狀態"

6181

6274 -#: builtin/commit.c builtin/commit.c

6182 +#: builtin/commit.c

6183 msgid "show branch information"

6184 msgstr "顯示分支訊息"

6185

@@ -6279,7 +6187,7 @@ msgstr "顯示分支訊息"

6187 msgid "show stash information"

6188 msgstr "顯示貯存區訊息"

6189

6282 -#: builtin/commit.c builtin/commit.c

6190 +#: builtin/commit.c

6191 msgid "compute full ahead/behind values"

6192 msgstr "計算完整的領先/落後值"

6193

@@ -6287,20 +6195,19 @@ msgstr "計算完整的領先/落後值"

6195 msgid "version"

6196 msgstr "版本"

6197

6290 -#: builtin/commit.c builtin/commit.c builtin/fetch.c

6291 -#: builtin/push.c builtin/worktree.c

6198 +#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c

6199 msgid "machine-readable output"

6200 msgstr "機器可讀的輸出"

6201

6295 -#: builtin/commit.c builtin/commit.c

6202 +#: builtin/commit.c

6203 msgid "show status in long format (default)"

6204 msgstr "以長格式顯示狀態（預設值）"

6205

6299 -#: builtin/commit.c builtin/commit.c

6206 +#: builtin/commit.c

6207 msgid "terminate entries with NUL"

6208 msgstr "條目以 NUL 字元結尾"

6209

6303 -#: builtin/commit.c builtin/commit.c

6210 +#: builtin/commit.c

6211 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

6212 msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）"

6213

@@ -6371,8 +6278,7 @@ msgstr "日期"

6278 msgid "override date for commit"

6279 msgstr "提交時覆蓋日期"

6280

6374 -#: builtin/commit.c builtin/commit.c builtin/commit.c

6375 -#: parse-options.h ref-filter.h

6281 +#: builtin/commit.c parse-options.h ref-filter.h

6282 msgid "commit"

6283 msgstr "提交"

6284

@@ -6404,8 +6310,7 @@ msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交"

6310 msgid "the commit is authored by me now (used with -C/-c/--amend)"

6311 msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）"

6312

6407 -#: builtin/commit.c builtin/interpret-trailers.c builtin/rebase.c

6408 -#: builtin/tag.c

6313 +#: builtin/commit.c builtin/interpret-trailers.c builtin/rebase.c builtin/tag.c

6314 msgid "trailer"

6315 msgstr "結尾資訊"

6316

@@ -6413,8 +6318,8 @@ msgstr "結尾資訊"

6318 msgid "add custom trailer(s)"

6319 msgstr "加入自訂結尾資訊"

6320

6416 -#: builtin/commit.c builtin/log.c builtin/merge.c

6417 -#: builtin/pull.c builtin/revert.c

6321 +#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c

6322 +#: builtin/revert.c

6323 msgid "add a Signed-off-by trailer"

6324 msgstr "在結尾加入 Signed-off-by"

6325

@@ -6478,7 +6383,7 @@ msgstr "允許一個空提交"

6383 msgid "ok to record a change with an empty message"

6384 msgstr "允許空的提交說明"

6385

6481 -#: builtin/commit.c sequencer.c sequencer.c

6386 +#: builtin/commit.c sequencer.c

6387 msgid "could not parse HEAD commit"

6388 msgstr "無法解析 HEAD 提交"

6389

@@ -6520,7 +6425,7 @@ msgstr ""

6425 "版本庫已更新，但無法寫入新的索引檔案。請檢查磁碟是否\n"

6426 "已滿或磁碟配額已耗盡，然後執行「git restore --staged :/」復原。"

6427

6523 -#: builtin/config.c builtin/config.c

6428 +#: builtin/config.c

6429 msgid "git config list [<file-option>] [<display-option>] [--includes]"

6430 msgstr "git config list [<檔案選項>] [<顯示選項>] [--includes]"

6431

@@ -6542,7 +6447,7 @@ msgstr ""

6447 "git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "

6448 "[--fixed-value] <name> <value>"

6449

6545 -#: builtin/config.c builtin/config.c

6450 +#: builtin/config.c

6451 msgid ""

6452 "git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "

6453 "<name>"

@@ -6550,15 +6455,15 @@ msgstr ""

6455 "git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "

6456 "<name>"

6457

6553 -#: builtin/config.c builtin/config.c

6458 +#: builtin/config.c

6459 msgid "git config rename-section [<file-option>] <old-name> <new-name>"

6460 msgstr "git config rename-section [<檔案選項>] <舊名稱> <新名稱>"

6461

6557 -#: builtin/config.c builtin/config.c

6462 +#: builtin/config.c

6463 msgid "git config remove-section [<file-option>] <name>"

6464 msgstr "git config remove-section [<檔案選項>] <名稱>"

6465

6561 -#: builtin/config.c builtin/config.c

6466 +#: builtin/config.c

6467 msgid "git config edit [<file-option>]"

6468 msgstr "git config edit [<檔案選項>]"

6469

@@ -6604,7 +6509,7 @@ msgstr "使用版本庫級設定檔案"

6509 msgid "use per-worktree config file"

6510 msgstr "使用工作區級別的設定檔案"

6511

6607 -#: builtin/config.c builtin/gc.c builtin/gc.c

6512 +#: builtin/config.c builtin/gc.c

6513 msgid "use given config file"

6514 msgstr "使用指定的設定檔案"

6515

@@ -6697,6 +6602,21 @@ msgstr "錯誤的參數個數，應該為 %d 個"

6602 msgid "wrong number of arguments, should be from %d to %d"

6603 msgstr "錯誤的參數個數，應該為從 %d 個到 %d 個"

6604

6605 +#: builtin/config.c

6606 +#, c-format

6607 +msgid "missing value to set to the variable '%s'"

6608 +msgstr "缺少值來設定變數「%s」"

6609 +

6610 +#: builtin/config.c

6611 +#, c-format

6612 +msgid "did you mean \"git config set %s %s\"?"

6613 +msgstr "您是想用「git config set %s %s」嗎？"

6614 +

6615 +#: builtin/config.c

6616 +#, c-format

6617 +msgid "missing value to set to a variable with an invalid name '%s'"

6618 +msgstr "缺少值來設定具無效名稱「%s」的變數"

6619 +

6620 #: builtin/config.c

6621 #, c-format

6622 msgid "invalid key pattern: %s"

@@ -6721,7 +6641,7 @@ msgstr "無法解析顏色 '%s'"

6641 msgid "unable to parse default color value"

6642 msgstr "無法解析預設顏色值"

6643

6724 -#: builtin/config.c builtin/config.c

6644 +#: builtin/config.c

6645 msgid "not in a git directory"

6646 msgstr "不在 git 版本庫中"

6647

@@ -6764,7 +6684,7 @@ msgstr "--blob 只能在一個版本庫內使用"

6684 msgid "--worktree can only be used inside a git repository"

6685 msgstr "--worktree 只能在 git 版本庫中使用"

6686

6767 -#: builtin/config.c builtin/gc.c builtin/gc.c

6687 +#: builtin/config.c builtin/gc.c

6688 msgid "$HOME not set"

6689 msgstr "$HOME 未設定"

6690

@@ -6777,21 +6697,20 @@ msgstr ""

6697 "不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴充部分。\n"

6698 "詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節"

6699

6780 -#: builtin/config.c builtin/config.c builtin/config.c

6700 #: builtin/config.c

6701 msgid "Other"

6702 msgstr "其他"

6703

6785 -#: builtin/config.c builtin/config.c builtin/config.c

6704 +#: builtin/config.c

6705 msgid "respect include directives on lookup"

6706 msgstr "查詢時引用 include 指令遞迴尋找"

6707

6789 -#: builtin/config.c builtin/config.c

6708 +#: builtin/config.c

6709 #, c-format

6710 msgid "unable to read config file '%s'"

6711 msgstr "無法讀取設定檔案 '%s'"

6712

6794 -#: builtin/config.c builtin/config.c

6713 +#: builtin/config.c

6714 msgid "error processing config file(s)"

6715 msgstr "處理設定檔案發生錯誤"

6716

@@ -6807,11 +6726,10 @@ msgstr "回傳有多項值之組態選項的所有值"

6726 msgid "interpret the name as a regular expression"

6727 msgstr "將名稱當作常規表示式解讀"

6728

6810 -#: builtin/config.c builtin/config.c

6729 +#: builtin/config.c

6730 msgid "show config with values matching the pattern"

6731 msgstr "顯示值符合模式的組態"

6732

6814 -#: builtin/config.c builtin/config.c builtin/config.c

6733 #: builtin/config.c

6734 msgid "use string equality when comparing values to value pattern"

6735 msgstr "使用字串相等比較值和模式"

@@ -6824,7 +6742,6 @@ msgstr "URL"

6742 msgid "show config matching the given URL"

6743 msgstr "顯示符合提供 URL 的組態"

6744

6827 -#: builtin/config.c builtin/config.c builtin/config.c

6745 #: builtin/config.c

6746 msgid "value"

6747 msgstr "取值"

@@ -6833,7 +6750,7 @@ msgstr "取值"

6750 msgid "use default value when missing entry"

6751 msgstr "未指定參數時所使用的預設值"

6752

6836 -#: builtin/config.c builtin/config.c builtin/config.c

6753 +#: builtin/config.c

6754 msgid "--fixed-value only applies with 'value-pattern'"

6755 msgstr "--fixed-value 僅套用至 'value-pattern'"

6756

@@ -6845,7 +6762,7 @@ msgstr "--default= 無法和 --all 或 --url= 一起使用"

6762 msgid "--url= cannot be used with --all, --regexp or --value"

6763 msgstr "--url= 無法和 --all、--regexp、--value 一起使用"

6764

6848 -#: builtin/config.c builtin/config.c

6765 +#: builtin/config.c

6766 msgid "Filter"

6767 msgstr "過濾器"

6768

@@ -6853,7 +6770,7 @@ msgstr "過濾器"

6770 msgid "replace multi-valued config option with new value"

6771 msgstr "以新值取代有多項值的組態選項"

6772

6856 -#: builtin/config.c builtin/config.c

6773 +#: builtin/config.c

6774 msgid "human-readable comment string (# will be prepended as needed)"

6775 msgstr "人類可讀的備註字串（將按需插入 # 至前方）"

6776

@@ -6886,7 +6803,6 @@ msgstr "取消設定所有多值組態選項"

6803 msgid "unset multi-valued config options with matching values"

6804 msgstr "取消設定其值相符的多值組態選項"

6805

6889 -#: builtin/config.c builtin/config.c builtin/config.c

6806 #: builtin/config.c

6807 #, c-format

6808 msgid "no such section: %s"

@@ -7025,12 +6941,11 @@ msgstr ""

6941 msgid "print debugging messages to stderr"

6942 msgstr "除錯訊息輸出到標準錯誤"

6943

7028 -#: builtin/credential-cache--daemon.c

6944 #: builtin/credential-cache--daemon.c

6945 msgid "credential-cache--daemon unavailable; no unix socket support"

6946 msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援"

6947

7033 -#: builtin/credential-cache.c builtin/credential-cache.c

6948 +#: builtin/credential-cache.c

6949 msgid "credential-cache unavailable; no unix socket support"

6950 msgstr "credential-cache 無法使用；缺少 unix socket 支援"

6951

@@ -7167,7 +7082,7 @@ msgstr "始終使用長提交號格式"

7082

7083 #: builtin/describe.c

7084 msgid "only follow first parent"

7170 -msgstr "只跟隨第一個父提交"

7085 +msgstr "只跟隨第一個親代提交"

7086

7087 #: builtin/describe.c

7088 msgid "only output exact matches"

@@ -7189,7 +7104,7 @@ msgstr "不考慮符合 <模式> 的標籤"

7104 msgid "show abbreviated commit object as fallback"

7105 msgstr "顯示簡寫的提交號作為後備"

7106

7192 -#: builtin/describe.c builtin/describe.c

7107 +#: builtin/describe.c

7108 msgid "mark"

7109 msgstr "標記"

7110

@@ -7205,7 +7120,7 @@ msgstr "對於損壞的工作區，追加 <標記>（預設值：」-broken\"）

7120 msgid "No names found, cannot describe anything."

7121 msgstr "沒有發現名稱，無法描述任何東西。"

7122

7208 -#: builtin/describe.c builtin/describe.c

7123 +#: builtin/describe.c

7124 #, c-format

7125 msgid "option '%s' and commit-ishes cannot be used together"

7126 msgstr "「%s」選項和提交指示元不得同時使用"

@@ -7293,7 +7208,7 @@ msgstr "'%s'：不是一個正規檔案或符號連結"

7208

7209 #: builtin/diff.c

7210 msgid "no merge given, only parents."

7296 -msgstr "沒有提供合併提交，只有提供父提交。"

7211 +msgstr "沒有提供合併提交，只有提供親代提交。"

7212

7213 #: builtin/diff.c

7214 #, c-format

@@ -7305,8 +7220,7 @@ msgstr "無效選項：%s"

7220 msgid "%s...%s: no merge base"

7221 msgstr "%s...%s: 無合併基底"

7222

7308 -#: builtin/diff.c setup.c setup.c setup.c setup.c

7309 -#: setup.c

7223 +#: builtin/diff.c setup.c

7224 msgid "cannot come back to cwd"

7225 msgstr "無法返回目前工作目錄"

7226

@@ -7370,7 +7284,7 @@ msgstr "兩個檔案都被修改：'%s' 和 '%s'。"

7284 msgid "working tree file has been left."

7285 msgstr "工作區檔案被留了下來。"

7286

7373 -#: builtin/difftool.c sequencer.c sequencer.c sequencer.c

7287 +#: builtin/difftool.c sequencer.c

7288 #, c-format

7289 msgid "could not copy '%s' to '%s'"

7290 msgstr "無法將「%s」複製至「%s」"

@@ -7462,7 +7376,7 @@ msgstr "標籤之物件濾除者的模式未知：%s"

7376 msgid "unknown reencoding mode: %s"

7377 msgstr "重新編碼的模式未知：%s"

7378

7465 -#: builtin/fast-export.c builtin/fast-export.c

7379 +#: builtin/fast-export.c

7380 #, c-format

7381 msgid "could not read blob %s"

7382 msgstr "無法讀取資料物件 %s"

@@ -7482,7 +7396,7 @@ msgstr "無法寫入資料物件「%s」"

7396 msgid "unexpected comparison status '%c' for %s, %s"

7397 msgstr "%2$s、%3$s 有非預期的比較狀態「%1$c」"

7398

7485 -#: builtin/fast-export.c builtin/fast-export.c

7399 +#: builtin/fast-export.c

7400 msgid "none"

7401 msgstr "無"

7402

@@ -7584,14 +7498,12 @@ msgstr "無法為寫入開啟標記檔案 %s。"

7498 msgid "unable to write marks file %s."

7499 msgstr "無法寫入標記檔案 %s。"

7500

7587 -#: builtin/fast-export.c builtin/fast-export.c

7588 -#: builtin/fast-import.c builtin/fast-import.c

7501 +#: builtin/fast-export.c builtin/fast-import.c

7502 #, c-format

7503 msgid "corrupt mark line: %s"

7504 msgstr "損壞的標記列：%s"

7505

7593 -#: builtin/fast-export.c builtin/fast-import.c

7594 -#: builtin/fast-import.c fetch-pack.c fetch-pack.c

7506 +#: builtin/fast-export.c builtin/fast-import.c fetch-pack.c

7507 #, c-format

7508 msgid "object not found: %s"

7509 msgstr "物件未找到：%s"

@@ -7680,7 +7592,7 @@ msgstr "在匿名輸出中將 <from> 轉換為 <to>"

7592

7593 #: builtin/fast-export.c

7594 msgid "reference parents which are not in fast-export stream by object id"

7683 -msgstr "依物件 ID 引用不在 fast-export 串流中的父物件"

7595 +msgstr "依物件 ID 引用不在 fast-export 串流中的親代物件"

7596

7597 #: builtin/fast-export.c

7598 msgid "show original object ids of blobs/commits"

@@ -7764,7 +7676,7 @@ msgstr "非預期的壓縮失敗：%d"

7676 msgid "not a tree: %s"

7677 msgstr "非樹狀物件：%s"

7678

7767 -#: builtin/fast-import.c builtin/fast-import.c

7679 +#: builtin/fast-import.c

7680 #, c-format

7681 msgid "can't load tree %s"

7682 msgstr "無法載入樹狀物件 %s"

@@ -7778,7 +7690,7 @@ msgstr "%s 中有損壞的模式"

7690 msgid "root cannot be a non-directory"

7691 msgstr "根不能不是目錄"

7692

7781 -#: builtin/fast-import.c builtin/fast-import.c

7693 +#: builtin/fast-import.c

7694 msgid "empty path component found in input"

7695 msgstr "輸入中有空的路徑部分"

7696

@@ -7801,8 +7713,8 @@ msgstr "分支 %s 缺少提交。"

7713 msgid "not updating %s (new tip %s does not contain %s)"

7714 msgstr "沒有更新 %s（提示：%s 不包含 %s）"

7715

7804 -#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c

7805 -#: midx-write.c sequencer.c

7716 +#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c

7717 +#: repack-midx.c sequencer.c

7718 #, c-format

7719 msgid "unable to create leading directories of %s"

7720 msgstr "不能為 %s 建立先導目錄"

@@ -7861,7 +7773,7 @@ msgstr "身分字串中缺少 >：%s"

7773 msgid "missing space after > in ident string: %s"

7774 msgstr "身分字串的 > 後面缺少空格：%s"

7775

7864 -#: builtin/fast-import.c builtin/fast-import.c

7776 +#: builtin/fast-import.c

7777 #, c-format

7778 msgid "invalid raw date \"%s\" in ident: %s"

7779 msgstr "身分中有無效的原始日期「%s」：%s"

@@ -7921,18 +7833,17 @@ msgstr "%s 後有垃圾：%s"

7833 msgid "missing space after %s: %s"

7834 msgstr "%s 後缺少空格：%s"

7835

7924 -#: builtin/fast-import.c builtin/fast-import.c

7836 +#: builtin/fast-import.c

7837 #, c-format

7838 msgid "corrupt mode: %s"

7839 msgstr "損壞的模式：%s"

7840

7929 -#: builtin/fast-import.c builtin/fast-import.c

7930 -#: builtin/fast-import.c builtin/fast-import.c

7841 +#: builtin/fast-import.c

7842 #, c-format

7843 msgid "invalid dataref: %s"

7844 msgstr "無效的資料引用：%s"

7845

7935 -#: builtin/fast-import.c builtin/fast-import.c

7846 +#: builtin/fast-import.c

7847 #, c-format

7848 msgid "missing space after SHA1: %s"

7849 msgstr "SHA1 值後缺少空格：%s"

@@ -7975,25 +7886,22 @@ msgstr "分支中沒有路徑 %s"

7886 msgid "can't add a note on empty branch."

7887 msgstr "不能在空分支上附加註記。"

7888

7978 -#: builtin/fast-import.c builtin/fast-import.c

7889 #: builtin/fast-import.c

7890 #, c-format

7891 msgid "mark :%<PRIuMAX> not a commit"

7892 msgstr "標記 :%<PRIuMAX> 不是提交"

7893

7984 -#: builtin/fast-import.c builtin/fast-import.c

7894 #: builtin/fast-import.c

7895 #, c-format

7896 msgid "not a valid commit: %s"

7897 msgstr "不是有效的提交：%s"

7898

7990 -#: builtin/fast-import.c builtin/fast-import.c

7991 -#: builtin/fast-import.c builtin/fast-import.c

7899 +#: builtin/fast-import.c

7900 #, c-format

7901 msgid "invalid ref name or SHA1 expression: %s"

7902 msgstr "無效的引用名稱或 SHA1 表示式：%s"

7903

7996 -#: builtin/fast-import.c builtin/fast-import.c

7904 +#: builtin/fast-import.c

7905 #, c-format

7906 msgid "not a blob (actually a %s): %s"

7907 msgstr "不是資料物件（而是 %s）：%s"

@@ -8045,8 +7953,7 @@ msgstr "找到多個 %s 簽章，忽略多餘的簽章"

7953 msgid "parse_one_signature() returned unknown hash algo"

7954 msgstr "parse_one_signature() 回傳了未知的雜湊演算法"

7955

8048 -#: builtin/fast-import.c builtin/fsck.c builtin/fsck.c

8049 -#: builtin/fsck.c

7956 +#: builtin/fast-import.c builtin/fsck.c

7957 msgid "unknown"

7958 msgstr "未知"

7959

@@ -8104,7 +8011,7 @@ msgstr ""

8011 "正在取代提交的無效簽章\n"

8012 " 據稱由 %s 所簽"

8013

8107 -#: builtin/fast-import.c builtin/fast-import.c

8014 +#: builtin/fast-import.c

8015 msgid "aborting due to invalid signature"

8016 msgstr "因為簽章無效而中止"

8017

@@ -8183,7 +8090,6 @@ msgstr "物件 %s 是 %s，但預期是資料物件。"

8090 msgid "not a mark: %s"

8091 msgstr "不是標記：%s"

8092

8186 -#: builtin/fast-import.c builtin/fast-import.c

8093 #: builtin/fast-import.c

8094 #, c-format

8095 msgid "unknown mark: %s"

@@ -8378,7 +8284,7 @@ msgstr "找不到物件 %s"

8284 msgid "[up to date]"

8285 msgstr "[最新]"

8286

8381 -#: builtin/fetch.c builtin/fetch.c builtin/fetch.c

8287 +#: builtin/fetch.c

8288 msgid "[rejected]"

8289 msgstr "[已拒絕]"

8290

@@ -8390,7 +8296,6 @@ msgstr "無法抓取至已簽出分支"

8296 msgid "[tag update]"

8297 msgstr "[標籤更新]"

8298

8393 -#: builtin/fetch.c builtin/fetch.c builtin/fetch.c

8299 #: builtin/fetch.c

8300 msgid "unable to update local ref"

8301 msgstr "不能更新本機引用"

@@ -8419,8 +8324,7 @@ msgstr "強制更新"

8324 msgid "non-fast-forward"

8325 msgstr "非快轉"

8326

8422 -#: builtin/fetch.c builtin/fetch.c builtin/grep.c

8423 -#: sequencer.c

8327 +#: builtin/fetch.c builtin/grep.c sequencer.c

8328 #, c-format

8329 msgid "cannot open '%s'"

8330 msgstr "不能開啟 '%s'"

@@ -8479,15 +8383,20 @@ msgstr "選項「%s」的值「%s」對 %s 無效"

8383 msgid "option \"%s\" is ignored for %s"

8384 msgstr "選項「%s」被 %s 忽略"

8385

8482 -#: builtin/fetch.c odb.c

8386 +#: builtin/fetch.c fetch-pack.c

8387 #, c-format

8484 -msgid "%s is not a valid object"

8485 -msgstr "%s 不是一個有效的物件"

8388 +msgid "the object %s does not exist"

8389 +msgstr "%s 物件不存在"

8390

8391 #: builtin/fetch.c

8392 #, c-format

8489 -msgid "the object %s does not exist"

8490 -msgstr "%s 物件不存在"

8393 +msgid "ignoring %s=%s because it does not match any refs"

8394 +msgstr "忽略了 %s=%s，因為其與任何引用皆不符"

8395 +

8396 +#: builtin/fetch.c

8397 +#, c-format

8398 +msgid "ignoring %s because the protocol does not support it"

8399 +msgstr "忽略了 %s，因為通訊協定不支援之"

8400

8401 #: builtin/fetch.c

8402 #, c-format

@@ -8576,12 +8485,12 @@ msgstr ""

8485 "找不到來源分支。\n"

8486 "您得使用 --set-upstream 選項明確指定一個分支"

8487

8579 -#: builtin/fetch.c builtin/fetch.c

8488 +#: builtin/fetch.c

8489 #, c-format

8490 msgid "Fetching %s\n"

8491 msgstr "正在取得 %s\n"

8492

8584 -#: builtin/fetch.c builtin/fetch.c

8493 +#: builtin/fetch.c

8494 #, c-format

8495 msgid "could not fetch %s"

8496 msgstr "無法取得 %s"

@@ -8656,7 +8565,7 @@ msgid "prune local tags no longer on remote and clobber changed tags"

8565 msgstr "清除遠端不存在的本機標籤，並且取代變更標籤"

8566

8567 # 譯者：可選值，不能翻譯

8659 -#: builtin/fetch.c builtin/fetch.c builtin/pull.c

8568 +#: builtin/fetch.c builtin/pull.c

8569 msgid "on-demand"

8570 msgstr "on-demand"

8571

@@ -8676,8 +8585,7 @@ msgstr "保持下載包"

8585 msgid "allow updating of HEAD ref"

8586 msgstr "允許更新 HEAD 引用"

8587

8679 -#: builtin/fetch.c builtin/fetch.c builtin/pull.c

8680 -#: builtin/pull.c

8588 +#: builtin/fetch.c builtin/pull.c

8589 msgid "deepen history of shallow clone"

8590 msgstr "取得淺拓製的更多過去歷史記錄"

8591

@@ -8715,8 +8623,7 @@ msgstr "引用映射"

8623 msgid "specify fetch refmap"

8624 msgstr "指定取得動作的引用映射"

8625

8718 -#: builtin/fetch.c builtin/pull.c builtin/rebase.c

8719 -#: builtin/replay.c

8626 +#: builtin/fetch.c builtin/pull.c builtin/rebase.c builtin/replay.c

8627 msgid "revision"

8628 msgstr "revision"

8629

@@ -8724,11 +8631,15 @@ msgstr "revision"

8631 msgid "report that we have only objects reachable from this object"

8632 msgstr "報告我們只擁有從該物件開始可以取得的物件"

8633

8634 +#: builtin/fetch.c builtin/pull.c

8635 +msgid "ensure this ref is always sent as a negotiation have"

8636 +msgstr "確保始終在磋商中發送此引用"

8637 +

8638 #: builtin/fetch.c

8639 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"

8640 msgstr "不取得 packfile，而是輸出協商的祖先提交"

8641

8731 -#: builtin/fetch.c builtin/fetch.c

8642 +#: builtin/fetch.c

8643 msgid "run 'maintenance --auto' after fetching"

8644 msgstr "取得 (fetch) 後執行 'maintenance --auto'"

8645

@@ -8744,10 +8655,6 @@ msgstr "抓取後寫入提交圖"

8655 msgid "accept refspecs from stdin"

8656 msgstr "從標準輸入中接受引用規格"

8657

8747 -#: builtin/fetch.c

8748 -msgid "--negotiate-only needs one or more --negotiation-tip=*"

8749 -msgstr "--negotiate-only 需要一或多個 --negotiation-tip=*"

8750 -

8658 #: builtin/fetch.c

8659 msgid "negative depth in --deepen is not supported"

8660 msgstr "--deepen 不支援負數深度"

@@ -8769,7 +8676,7 @@ msgstr "fetch --all 不能帶一個版本庫參數"

8676 msgid "fetch --all does not make sense with refspecs"

8677 msgstr "fetch --all 帶引用規格沒有任何意義"

8678

8772 -#: builtin/fetch.c

8679 +#: builtin/fetch.c builtin/push.c

8680 #, c-format

8681 msgid "no such remote or remote group: %s"

8682 msgstr "無此遠端或遠端群組：%s"

@@ -8786,6 +8693,11 @@ msgstr "使用 --negotiate-only 時必須提供遠端"

8693 msgid "protocol does not support --negotiate-only, exiting"

8694 msgstr "通訊協定不支援 --negotiate-only。結束"

8695

8696 +#: builtin/fetch.c

8697 +#, c-format

8698 +msgid "%s needs one or more %s"

8699 +msgstr "%s 需要一個或數個 %s"

8700 +

8701 #: builtin/fetch.c

8702 msgid ""

8703 "--filter can only be used with the remote configured in "

@@ -8931,7 +8843,7 @@ msgid "got bad config --config=%s"

8843 msgstr "收到無效的組態 --config=%s"

8844

8845 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>

8934 -#: builtin/fsck.c builtin/fsck.c

8846 +#: builtin/fsck.c

8847 #, c-format

8848 msgid "error in %s %s: %s"

8849 msgstr "%s %s 錯誤：%s"

@@ -8942,7 +8854,7 @@ msgstr "%s %s 錯誤：%s"

8854 msgid "warning in %s %s: %s"

8855 msgstr "%s %s 警告：%s"

8856

8945 -#: builtin/fsck.c builtin/fsck.c

8857 +#: builtin/fsck.c

8858 #, c-format

8859 msgid "broken link from %7s %s"

8860 msgstr "來自 %7s %s 的損壞的連結"

@@ -8983,8 +8895,7 @@ msgstr "懸空 %s %s"

8895 msgid "could not create lost-found"

8896 msgstr "無法建立 lost-found"

8897

8986 -#: builtin/fsck.c builtin/gc.c builtin/rebase.c

8987 -#: rebase-interactive.c rerere.c rerere.c sequencer.c

8898 +#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c

8899 #: sequencer.c

8900 #, c-format

8901 msgid "could not write '%s'"

@@ -9115,7 +9026,7 @@ msgstr "無法讀取「%s」封裝的修訂版索引 (rev-index)"

9026 msgid "invalid rev-index for pack '%s'"

9027 msgstr "「%s」封裝的修訂版索引 (rev-index) 無效"

9028

9118 -#: builtin/fsck.c builtin/fsck.c

9029 +#: builtin/fsck.c

9030 msgid "Checking ref database"

9031 msgstr "正在檢查引用資料庫"

9032

@@ -9195,7 +9106,7 @@ msgstr "git fsmonitor--daemon start [<options>]"

9106 msgid "git fsmonitor--daemon run [<options>]"

9107 msgstr "git fsmonitor--daemon run [<options>]"

9108

9198 -#: builtin/fsmonitor--daemon.c builtin/fsmonitor--daemon.c

9109 +#: builtin/fsmonitor--daemon.c

9110 #, c-format

9111 msgid "value of '%s' out of range: %d"

9112 msgstr "「%s」的數值超出範圍：%d"

@@ -9205,6 +9116,11 @@ msgstr "「%s」的數值超出範圍：%d"

9116 msgid "value of '%s' not bool or int: %d"

9117 msgstr "「%s」的數值不是布林值或整數：%d"

9118

9119 +#: builtin/fsmonitor--daemon.c

9120 +#, c-format

9121 +msgid "daemon did not stop within %d seconds"

9122 +msgstr "常駐行程未在 %d 秒內停止"

9123 +

9124 #: builtin/fsmonitor--daemon.c

9125 #, c-format

9126 msgid "fsmonitor-daemon is watching '%s'\n"

@@ -9251,7 +9167,7 @@ msgstr "無法初始化健康檢查執行緒"

9167 msgid "could not cd home '%s'"

9168 msgstr "無法 cd home '%s'"

9169

9254 -#: builtin/fsmonitor--daemon.c builtin/fsmonitor--daemon.c

9170 +#: builtin/fsmonitor--daemon.c

9171 #, c-format

9172 msgid "fsmonitor--daemon is already running '%s'"

9173 msgstr "fsmonitor--daemon 已在執行「%s」"

@@ -9261,6 +9177,10 @@ msgstr "fsmonitor--daemon 已在執行「%s」"

9177 msgid "running fsmonitor-daemon in '%s'\n"

9178 msgstr "正在「%s」執行 fsmonitor-daemon\n"

9179

9180 +#: builtin/fsmonitor--daemon.c setup.c

9181 +msgid "setsid failed"

9182 +msgstr "setsid 失敗"

9183 +

9184 #: builtin/fsmonitor--daemon.c

9185 #, c-format

9186 msgid "starting fsmonitor-daemon in '%s'\n"

@@ -9490,7 +9410,7 @@ msgstr "'%s' 非有效作業"

9410 msgid "task '%s' cannot be selected multiple times"

9411 msgstr "不能多次選取 '%s' 作業"

9412

9493 -#: builtin/gc.c builtin/gc.c

9413 +#: builtin/gc.c

9414 msgid "run tasks based on the state of the repository"

9415 msgstr "基於版本庫狀態執行作業"

9416

@@ -9510,7 +9430,7 @@ msgstr "依據頻率執行工作"

9430 msgid "do not report progress or other information over stderr"

9431 msgstr "不要在 stderr 輸出進度或其他資訊"

9432

9513 -#: builtin/gc.c builtin/gc.c

9433 +#: builtin/gc.c

9434 msgid "task"

9435 msgstr "作業"

9436

@@ -9542,11 +9462,11 @@ msgstr "版本庫「%s」未註冊"

9462 msgid "failed to expand path '%s'"

9463 msgstr "無法展開「%s」路徑"

9464

9545 -#: builtin/gc.c builtin/gc.c

9465 +#: builtin/gc.c

9466 msgid "failed to start launchctl"

9467 msgstr "無法啟動 launchctl"

9468

9549 -#: builtin/gc.c builtin/gc.c builtin/gc.c

9469 +#: builtin/gc.c

9470 #, c-format

9471 msgid "failed to create directories for '%s'"

9472 msgstr "無法建立「%s」的目錄"

@@ -9584,13 +9504,12 @@ msgstr "無法執行「crontab」；您的系統可能不支援「cron」"

9504 msgid "'crontab' died"

9505 msgstr "「crontab」結束運作"

9506

9587 -#: builtin/gc.c builtin/gc.c builtin/gc.c builtin/worktree.c

9588 -#: builtin/worktree.c

9507 +#: builtin/gc.c builtin/worktree.c

9508 #, c-format

9509 msgid "failed to delete '%s'"

9510 msgstr "刪除 '%s' 失敗"

9511

9593 -#: builtin/gc.c builtin/gc.c rerere.c

9512 +#: builtin/gc.c rerere.c

9513 #, c-format

9514 msgid "failed to flush '%s'"

9515 msgstr "排清 '%s' 失敗"

@@ -9681,13 +9600,11 @@ msgstr "grep：無法建立執行緒：%s"

9600 msgid "invalid number of threads specified (%d) for %s"

9601 msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"

9602

9684 -#. #-#-#-#-# grep.c.po #-#-#-#-#

9603 #. TRANSLATORS: %s is the configuration

9604 #. variable for tweaking threads, currently

9605 #. grep.threads

9606 #.

9689 -#: builtin/grep.c builtin/index-pack.c builtin/index-pack.c

9690 -#: builtin/pack-objects.c

9607 +#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c

9608 #, c-format

9609 msgid "no threads support, ignoring %s"

9610 msgstr "沒有執行緒支援，忽略 %s"

@@ -10045,7 +9962,7 @@ msgstr "無法解析 emacsclient 版本。"

9962 msgid "emacsclient version '%d' too old (< 22)."

9963 msgstr "emacsclient 版本 '%d' 太老（< 22）。"

9964

10048 -#: builtin/help.c builtin/help.c builtin/help.c builtin/help.c

9965 +#: builtin/help.c

9966 #, c-format

9967 msgid "failed to exec '%s'"

9968 msgstr "執行 '%s' 失敗"

@@ -10081,7 +9998,7 @@ msgstr "沒有 man 檢視器處理此請求"

9998 msgid "no info viewer handled the request"

9999 msgstr "沒有 info 檢視器處理此請求"

10000

10084 -#: builtin/help.c builtin/help.c git.c

10001 +#: builtin/help.c git.c

10002 #, c-format

10003 msgid "'%s' is aliased to '%s'"

10004 msgstr "'%s' 是 '%s' 的別名"

@@ -10101,7 +10018,7 @@ msgid ""

10018 "the '--no-[external-commands|aliases]' options can only be used with '--all'"

10019 msgstr "「--no-[external-commands|aliases]」選項只能與「--all」一起使用"

10020

10104 -#: builtin/help.c builtin/help.c

10021 +#: builtin/help.c

10022 #, c-format

10023 msgid "usage: %s%s"

10024 msgstr "用法：%s%s"

@@ -10110,6 +10027,14 @@ msgstr "用法：%s%s"

10027 msgid "'git help config' for more information"

10028 msgstr "'git help config' 取得更多訊息"

10029

10030 +#: builtin/history.c

10031 +msgid ""

10032 +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"

10033 +"reedit-message] [--empty=(drop|keep|abort)]"

10034 +msgstr ""

10035 +"git history fixup <commit> [--dry-run] [--update-refs=(branches|head)] [--"

10036 +"reedit-message] [--empty=(drop|keep|abort)]"

10037 +

10038 #: builtin/history.c

10039 msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]"

10040 msgstr ""

@@ -10137,10 +10062,10 @@ msgstr ""

10062 msgid "Aborting commit as launching the editor failed.\n"

10063 msgstr "中止提交，因為無法開啟編輯器。\n"

10064

10140 -#: builtin/history.c builtin/history.c

10065 +#: builtin/history.c

10066 #, c-format

10067 msgid "unable to parse parent commit %s"

10143 -msgstr "無法解析上級提交 %s"

10068 +msgstr "無法解析親代提交 %s"

10069

10070 #: builtin/history.c

10071 #, c-format

@@ -10173,7 +10098,7 @@ msgstr "使用 --update-refs=head 時，重寫後的提交必須是 HEAD 的祖

10098 msgid "failed to begin ref transaction: %s"

10099 msgstr "無法開始引用事務：%s"

10100

10176 -#: builtin/history.c builtin/history.c builtin/replay.c

10101 +#: builtin/history.c builtin/replay.c

10102 #, c-format

10103 msgid "failed to update ref '%s': %s"

10104 msgstr "無法更新「%s」引用：%s"

@@ -10183,30 +10108,98 @@ msgstr "無法更新「%s」引用：%s"

10108 msgid "failed to commit ref transaction: %s"

10109 msgstr "無法提交引用事務：%s"

10110

10111 +#: builtin/history.c

10112 +#, c-format

10113 +msgid "unable to parse parent of %s"

10114 +msgstr "無法解析 %s 的親代"

10115 +

10116 +#: builtin/history.c

10117 +#, c-format

10118 +msgid ""

10119 +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", "

10120 +"and \"abort\"."

10121 +msgstr ""

10122 +"無法辨識「--empty=」動作「%s」；有效值為「drop」、「keep」、和「abort」。"

10123 +

10124 #: builtin/history.c

10125 msgid "control which refs should be updated"

10126 msgstr "控制要更新的引用"

10127

10190 -#: builtin/history.c builtin/history.c

10128 +#: builtin/history.c

10129 msgid "perform a dry-run without updating any refs"

10130 msgstr "進行測試執行，不更新任何引用"

10131

10132 +#: builtin/history.c

10133 +msgid "open an editor to modify the commit message"

10134 +msgstr "開啟編輯器以修改提交訊息"

10135 +

10136 +#: builtin/history.c builtin/rebase.c builtin/revert.c

10137 +msgid "how to handle commits that become empty"

10138 +msgstr "處理空白提交的方式"

10139 +

10140 #: builtin/history.c

10141 msgid "command expects a single revision"

10142 msgstr "命令預期只有一個修訂版"

10143

10198 -#: builtin/history.c builtin/history.c

10144 +#: builtin/history.c

10145 +msgid "cannot run fixup in a bare repository"

10146 +msgstr "無法在裸版本庫中進行 fixup"

10147 +

10148 +#: builtin/history.c

10149 #, c-format

10150 msgid "commit cannot be found: %s"

10151 msgstr "找不到提交：%s"

10152

10153 #: builtin/history.c

10204 -msgid "failed writing reworded commit"

10205 -msgstr "無法寫入改寫說明後的提交"

10154 +msgid "cannot get tree for HEAD"

10155 +msgstr "無法取得 HEAD 的樹狀物件"

10156

10207 -#: builtin/history.c builtin/history.c

10208 -msgid "failed replaying descendants"

10209 -msgstr "重放後代失敗"

10157 +#: builtin/history.c builtin/show-index.c

10158 +msgid "unable to read index"

10159 +msgstr "無法讀取索引"

10160 +

10161 +#: builtin/history.c

10162 +msgid "nothing to fixup: no staged changes"

10163 +msgstr "不需要 fixup：沒有已暫存的變更"

10164 +

10165 +#: builtin/history.c

10166 +msgid "unable to write index as a tree"

10167 +msgstr "無法將索引區寫入為樹狀物件"

10168 +

10169 +#: builtin/history.c

10170 +#, c-format

10171 +msgid "cannot get tree for commit %s"

10172 +msgstr "無法取得提交 %s 的樹狀物件"

10173 +

10174 +#: builtin/history.c

10175 +msgid "merge failed while applying fixup"

10176 +msgstr "套用 fixup 時合併失敗"

10177 +

10178 +#: builtin/history.c

10179 +msgid "fixup would produce conflicts; aborting"

10180 +msgstr "fixup 將產生衝突；中止"

10181 +

10182 +#: builtin/history.c

10183 +#, c-format

10184 +msgid "cannot drop root commit %s: it has no parent to replay onto"

10185 +msgstr "無法捨棄根提交 %s：其沒有親代可重放"

10186 +

10187 +#: builtin/history.c

10188 +#, c-format

10189 +msgid "fixup makes commit %s empty"

10190 +msgstr "fixup 致使提交 %s 為空"

10191 +

10192 +#: builtin/history.c

10193 +msgid "failed writing fixed-up commit"

10194 +msgstr "寫入經過 fixup 的提交失敗"

10195 +

10196 +#: builtin/history.c

10197 +msgid "failed replaying descendants"

10198 +msgstr "重放後代失敗"

10199 +

10200 +#: builtin/history.c

10201 +msgid "failed writing reworded commit"

10202 +msgstr "無法寫入改寫說明後的提交"

10203

10204 #: builtin/history.c

10205 msgid "unable to populate index with tree"

@@ -10255,10 +10248,12 @@ msgstr "無法拆分合併提交"

10248 #: builtin/hook.c

10249 msgid ""

10250 "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"

10258 -"stdin=<path>] <hook-name> [-- <hook-args>]"

10251 +"stdin=<path>] [(-j|--jobs) <n>]\n"

10252 +"<hook-name> [-- <hook-args>]"

10253 msgstr ""

10254 "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"

10261 -"stdin=<path>] <hook-name> [-- <hook-args>]"

10255 +"stdin=<path>] [(-j|--jobs) <n>]\n"

10256 +"<hook-name> [-- <hook-args>]"

10257

10258 #: builtin/hook.c

10259 msgid ""

@@ -10274,7 +10269,7 @@ msgstr "使用 NUL 作為列終止符"

10269 msgid "show the config scope that defined each hook"

10270 msgstr "顯示定義每個掛鉤的組態範圍"

10271

10277 -#: builtin/hook.c builtin/hook.c

10272 +#: builtin/hook.c

10273 msgid "allow running a hook with a non-native hook name"

10274 msgstr "允許執行非原生名稱的掛鉤"

10275

@@ -10282,7 +10277,7 @@ msgstr "允許執行非原生名稱的掛鉤"

10277 msgid "you must specify a hook event name to list"

10278 msgstr "您必須指定要列出的掛鉤事件名稱"

10279

10285 -#: builtin/hook.c builtin/hook.c

10280 +#: builtin/hook.c

10281 #, c-format

10282 msgid ""

10283 "unknown hook event '%s';\n"

@@ -10308,6 +10303,15 @@ msgstr "靜默忽略不存在而請求的 <hook-name>"

10303 msgid "file to read into hooks' stdin"

10304 msgstr "要讀進掛鉤 stdin 的檔案"

10305

10306 +#: builtin/hook.c

10307 +msgid "run up to <n> hooks simultaneously (-1 for CPU count)"

10308 +msgstr "至多同時執行 <n> 個掛鉤（-1 表示 CPU 數量）"

10309 +

10310 +#: builtin/hook.c

10311 +#, c-format

10312 +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)"

10313 +msgstr "無效的 -j 值：%d（使用 -1 表示 CPU 數量，或者一個正整數）"

10314 +

10315 #: builtin/index-pack.c

10316 #, c-format

10317 msgid "object type mismatch at %s"

@@ -10369,6 +10373,10 @@ msgstr "包中有錯誤的物件位於位移量 %<PRIuMAX>：%s"

10373 msgid "inflate returned %d"

10374 msgstr "解壓縮返回 %d"

10375

10376 +#: builtin/index-pack.c builtin/unpack-objects.c

10377 +msgid "object size too large for this platform"

10378 +msgstr "物件對此平台而言過大"

10379 +

10380 #: builtin/index-pack.c

10381 msgid "offset value overflow for delta base object"

10382 msgstr "位移值覆蓋了 delta 基準物件"

@@ -10396,8 +10404,7 @@ msgstr[0] "包檔案過早結束，缺少 %<PRIuMAX> 位元組"

10404 msgid "serious inflate inconsistency"

10405 msgstr "解壓縮嚴重的不一致"

10406

10399 -#: builtin/index-pack.c builtin/index-pack.c builtin/index-pack.c

10400 -#: builtin/index-pack.c builtin/index-pack.c

10407 +#: builtin/index-pack.c

10408 #, c-format

10409 msgid "SHA1 COLLISION FOUND WITH %s !"

10410 msgstr "發現 %s 出現 SHA1 衝突！"

@@ -10417,7 +10424,7 @@ msgstr "不能讀取現存物件 %s"

10424 msgid "invalid blob object %s"

10425 msgstr "無效的資料物件 %s"

10426

10420 -#: builtin/index-pack.c builtin/index-pack.c

10427 +#: builtin/index-pack.c

10428 msgid "fsck error in packed object"

10429 msgstr "對打包物件 fsck 檢查發生錯誤"

10430

@@ -10431,7 +10438,7 @@ msgstr "無效的 %s"

10438 msgid "Not all child objects of %s are reachable"

10439 msgstr "%s 的所有子物件並非都可以取得"

10440

10434 -#: builtin/index-pack.c builtin/index-pack.c

10441 +#: builtin/index-pack.c

10442 msgid "failed to apply delta"

10443 msgstr "套用 delta 失敗"

10444

@@ -10464,7 +10471,6 @@ msgid "Resolving deltas"

10471 msgstr "處理 delta 中"

10472

10473 #: builtin/index-pack.c builtin/pack-objects.c

10467 -#: builtin/pack-objects.c

10474 #, c-format

10475 msgid "unable to create thread: %s"

10476 msgstr "不能建立執行緒：%s"

@@ -10576,12 +10582,12 @@ msgstr "無法返回目前工作目錄"

10582 msgid "bad --pack_header: %s"

10583 msgstr "無效的 --pack_header：%s"

10584

10579 -#: builtin/index-pack.c builtin/index-pack.c

10585 +#: builtin/index-pack.c

10586 #, c-format

10587 msgid "bad %s"

10588 msgstr "錯誤選項 %s"

10589

10584 -#: builtin/index-pack.c builtin/init-db.c setup.c setup.c

10590 +#: builtin/index-pack.c builtin/init-db.c setup.c

10591 #, c-format

10592 msgid "unknown hash algorithm '%s'"

10593 msgstr "未知的「%s」雜湊算法"

@@ -10640,12 +10646,12 @@ msgstr "雜湊"

10646 msgid "specify the hash algorithm to use"

10647 msgstr "指定要使用的雜湊算法"

10648

10643 -#: builtin/init-db.c builtin/init-db.c

10649 +#: builtin/init-db.c

10650 #, c-format

10651 msgid "cannot mkdir %s"

10652 msgstr "不能建立目錄 %s"

10653

10648 -#: builtin/init-db.c builtin/init-db.c

10654 +#: builtin/init-db.c

10655 #, c-format

10656 msgid "cannot chdir to %s"

10657 msgstr "不能切換目錄到 %s"

@@ -10857,7 +10863,7 @@ msgstr ""

10863 msgid "git show %s: bad file"

10864 msgstr "git show %s: 損壞的檔案"

10865

10860 -#: builtin/log.c builtin/log.c

10866 +#: builtin/log.c

10867 #, c-format

10868 msgid "could not read object %s"

10869 msgstr "無法讀取物件 %s"

@@ -10934,13 +10940,12 @@ msgstr "git format-patch [<選項>] [<從> | <版本範圍>]"

10940 msgid "two output directories?"

10941 msgstr "兩個輸出目錄？"

10942

10937 -#: builtin/log.c builtin/log.c builtin/log.c builtin/log.c

10943 +#: builtin/log.c

10944 #, c-format

10945 msgid "unknown commit %s"

10946 msgstr "未知提交 %s"

10947

10942 -#: builtin/log.c builtin/replace.c builtin/replace.c

10943 -#: builtin/replace.c

10948 +#: builtin/log.c builtin/replace.c

10949 #, c-format

10950 msgid "failed to resolve '%s' as a valid ref"

10951 msgstr "無法將 '%s' 解析為一個有效引用"

@@ -11096,7 +11101,7 @@ msgstr "header"

11101 msgid "add email header"

11102 msgstr "新增信件頭"

11103

11099 -#: builtin/log.c builtin/log.c

11104 +#: builtin/log.c

11105 msgid "email"

11106 msgstr "信箱"

11107

@@ -11124,7 +11129,7 @@ msgstr "信件標記"

11129 msgid "make first mail a reply to <message-id>"

11130 msgstr "使第一封信件作為對 <信件標記> 的回覆"

11131

11127 -#: builtin/log.c builtin/log.c

11132 +#: builtin/log.c

11133 msgid "boundary"

11134 msgstr "邊界"

11135

@@ -11205,8 +11210,7 @@ msgstr "--check 無意義"

11210 msgid "--remerge-diff does not make sense"

11211 msgstr "--remerge-diff 無意義"

11212

11208 -#: builtin/log.c builtin/submodule--helper.c

11209 -#: builtin/submodule--helper.c rerere.c submodule.c

11213 +#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c

11214 #, c-format

11215 msgid "could not create directory '%s'"

11216 msgstr "無法建立「%s」目錄"

@@ -11398,11 +11402,11 @@ msgstr ""

11402 msgid "do not print remote URL"

11403 msgstr "不列印遠端 URL"

11404

11401 -#: builtin/ls-remote.c builtin/ls-remote.c builtin/rebase.c

11405 +#: builtin/ls-remote.c builtin/rebase.c

11406 msgid "exec"

11407 msgstr "exec"

11408

11405 -#: builtin/ls-remote.c builtin/ls-remote.c

11409 +#: builtin/ls-remote.c

11410 msgid "path of git-upload-pack on the remote host"

11411 msgstr "遠端主機上的 git-upload-pack 路徑"

11412

@@ -11454,7 +11458,7 @@ msgstr "條目以 NUL 字元終止"

11458 msgid "include object size"

11459 msgstr "包括物件大小"

11460

11457 -#: builtin/ls-tree.c builtin/ls-tree.c

11461 +#: builtin/ls-tree.c

11462 msgid "list only filenames"

11463 msgstr "只列出檔案名"

11464

@@ -11632,7 +11636,7 @@ msgstr[0] "無法處理 %d 條以上的基礎。忽略 %s。"

11636 msgid "not handling anything other than two heads merge."

11637 msgstr "不能處理兩個頭合併之外的任何動作。"

11638

11635 -#: builtin/merge-recursive.c builtin/merge-recursive.c

11639 +#: builtin/merge-recursive.c

11640 #, c-format

11641 msgid "could not resolve ref '%s'"

11642 msgstr "無法解析引用「%s」"

@@ -11642,12 +11646,12 @@ msgstr "無法解析引用「%s」"

11646 msgid "Merging %s with %s\n"

11647 msgstr "合併 %s 和 %s\n"

11648

11645 -#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c

11649 +#: builtin/merge-tree.c

11650 #, c-format

11651 msgid "could not parse as tree '%s'"

11652 msgstr "無法解析為樹狀物件「%s」"

11653

11650 -#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge.c

11654 +#: builtin/merge-tree.c builtin/merge.c

11655 msgid "not something we can merge"

11656 msgstr "不能合併"

11657

@@ -11707,7 +11711,7 @@ msgstr "option=value"

11711 msgid "option for selected merge strategy"

11712 msgstr "所選的合併策略的選項"

11713

11710 -#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c

11714 +#: builtin/merge-tree.c

11715 msgid "--trivial-merge is incompatible with all other options"

11716 msgstr "--trivial-merge 和其他所有選項都不相容"

11717

@@ -11716,7 +11720,7 @@ msgstr "--trivial-merge 和其他所有選項都不相容"

11720 msgid "unknown strategy option: -X%s"

11721 msgstr "未知的策略選項：-X%s"

11722

11719 -#: builtin/merge-tree.c builtin/merge-tree.c builtin/notes.c

11723 +#: builtin/merge-tree.c builtin/notes.c

11724 #, c-format

11725 msgid "malformed input line: '%s'."

11726 msgstr "格式錯誤的輸入行：'%s'。"

@@ -11793,8 +11797,8 @@ msgstr "如果不能快轉就放棄合併"

11797 msgid "verify that the named commit has a valid GPG signature"

11798 msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名"

11799

11796 -#: builtin/merge.c builtin/notes.c builtin/pull.c

11797 -#: builtin/rebase.c builtin/revert.c

11800 +#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c

11801 +#: builtin/revert.c

11802 msgid "strategy"

11803 msgstr "策略"

11804

@@ -11835,7 +11839,7 @@ msgstr "無法執行貯存。"

11839 msgid "stash failed"

11840 msgstr "貯存失敗"

11841

11838 -#: builtin/merge.c builtin/merge.c

11842 +#: builtin/merge.c

11843 msgid "read-tree failed"

11844 msgstr "讀取樹失敗"

11845

@@ -11868,7 +11872,7 @@ msgstr "'%s' 沒有指向一個提交"

11872 msgid "Bad branch.%s.mergeoptions string: %s"

11873 msgstr "壞的 branch.%s.mergeoptions 字串：%s"

11874

11871 -#: builtin/merge.c builtin/merge.c merge-ort-wrappers.c

11875 +#: builtin/merge.c merge-ort-wrappers.c

11876 msgid "Unable to write index."

11877 msgstr "不能寫入索引。"

11878

@@ -11948,7 +11952,7 @@ msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支"

11952 msgid "Bad value '%s' in environment '%s'"

11953 msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'"

11954

11951 -#: builtin/merge.c editor.c read-cache.c wrapper.c

11955 +#: builtin/merge.c editor.c read-cache.c t/helper/test-synthesize.c wrapper.c

11956 #, c-format

11957 msgid "could not close '%s'"

11958 msgstr "無法關閉「%s」"

@@ -12043,7 +12047,7 @@ msgstr "嘗試非常小的索引內合併...\n"

12047 msgid "Nope.\n"

12048 msgstr "無。\n"

12049

12046 -#: builtin/merge.c builtin/merge.c

12050 +#: builtin/merge.c

12051 #, c-format

12052 msgid "Rewinding the tree to pristine...\n"

12053 msgstr "將樹回滾至原始狀態...\n"

@@ -12126,19 +12130,23 @@ msgstr "允許建立一個以上的樹"

12130 msgid ""

12131 "git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n"

12132 " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n"

12129 -" [--refs-snapshot=<path>]"

12133 +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n"

12134 +" [--base=<checksum>]"

12135 msgstr ""

12136 "git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n"

12137 " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n"

12133 -" [--refs-snapshot=<path>]"

12138 +" [--refs-snapshot=<path>] [--[no-]write-chain-file]\n"

12139 +" [--base=<checksum>]"

12140

12141 #: builtin/multi-pack-index.c

12142 msgid ""

12143 "git multi-pack-index [<options>] compact [--[no-]incremental]\n"

12138 -" [--[no-]bitmap] <from> <to>"

12144 +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n"

12145 +" <from> <to>"

12146 msgstr ""

12147 "git multi-pack-index [<options>] compact [--[no-]incremental]\n"

12141 -" [--[no-]bitmap] <from> <to>"

12148 +" [--[no-]bitmap] [--base=<checksum>] [--[no-]write-chain-file]\n"

12149 +" <from> <to>"

12150

12151 #: builtin/multi-pack-index.c

12152 msgid "git multi-pack-index [<options>] verify"

@@ -12168,14 +12176,26 @@ msgstr "偏好包"

12176 msgid "pack for reuse when computing a multi-pack bitmap"

12177 msgstr "計算多包位圖時要重複使用的包"

12178

12171 -#: builtin/multi-pack-index.c builtin/multi-pack-index.c

12179 +#: builtin/multi-pack-index.c

12180 msgid "write multi-pack bitmap"

12181 msgstr "寫入多包位圖"

12182

12175 -#: builtin/multi-pack-index.c builtin/multi-pack-index.c

12183 +#: builtin/multi-pack-index.c

12184 +msgid "checksum"

12185 +msgstr "總和檢查碼"

12186 +

12187 +#: builtin/multi-pack-index.c

12188 +msgid "base MIDX for incremental writes"

12189 +msgstr "增量寫入的基礎 MIDX"

12190 +

12191 +#: builtin/multi-pack-index.c

12192 msgid "write a new incremental MIDX"

12193 msgstr "寫入新的增量 MIDX"

12194

12195 +#: builtin/multi-pack-index.c

12196 +msgid "write the multi-pack-index chain file"

12197 +msgstr "寫入多包索引鏈檔"

12198 +

12199 #: builtin/multi-pack-index.c

12200 msgid "write multi-pack index containing only given indexes"

12201 msgstr "寫入只包含指定索引的多包索引"

@@ -12184,14 +12204,23 @@ msgstr "寫入只包含指定索引的多包索引"

12204 msgid "refs snapshot for selecting bitmap commits"

12205 msgstr "用來選取位圖提交的引用快照"

12206

12187 -#: builtin/multi-pack-index.c builtin/multi-pack-index.c

12207 +#: builtin/multi-pack-index.c

12208 +#, c-format

12209 +msgid "cannot use %s without %s"

12210 +msgstr "不能不與 %2$s 一起使用 %1$s"

12211 +

12212 +#: builtin/multi-pack-index.c

12213 +msgid "cannot use --base without --no-write-chain-file"

12214 +msgstr "不能不與 --no-write-chain-file 一起使用 --base"

12215 +

12216 +#: builtin/multi-pack-index.c

12217 #, c-format

12218 msgid "could not find MIDX: %s"

12219 msgstr "找不到 MIDX：%s"

12220

12221 #: builtin/multi-pack-index.c

12222 msgid "MIDX compaction endpoints must be unique"

12194 -msgstr "MIDX 壓縮端點必須唯一"

12223 +msgstr "MIDX 緻密化端點必須唯一"

12224

12225 #: builtin/multi-pack-index.c

12226 #, c-format

@@ -12244,11 +12273,11 @@ msgstr "目的地「%s」不是目錄"

12273 msgid "Checking rename of '%s' to '%s'\n"

12274 msgstr "檢查 '%s' 到 '%s' 的重新命名\n"

12275

12247 -#: builtin/mv.c builtin/mv.c

12276 +#: builtin/mv.c

12277 msgid "bad source"

12278 msgstr "來源損壞"

12279

12251 -#: builtin/mv.c builtin/mv.c

12280 +#: builtin/mv.c

12281 msgid "destination exists"

12282 msgstr "目的地已存在"

12283

@@ -12272,7 +12301,7 @@ msgstr "不在版本控制之下"

12301 msgid "conflicted"

12302 msgstr "衝突"

12303

12275 -#: builtin/mv.c builtin/mv.c

12304 +#: builtin/mv.c

12305 #, c-format

12306 msgid "overwriting '%s'"

12307 msgstr "覆蓋 '%s'"

@@ -12361,6 +12390,60 @@ msgstr "允許列印 `未定義` 的名稱（預設值）"

12390 msgid "dereference tags in the input (internal use)"

12391 msgstr "反向解析輸入中的標籤（內部使用）"

12392

12393 +#: builtin/name-rev.c

12394 +#, c-format

12395 +msgid "'%s' needs to be either text, revs, or rev"

12396 +msgstr "「%s」應為 text、revs、或 rev"

12397 +

12398 +#: builtin/name-rev.c

12399 +msgid ""

12400 +"(EXPERIMENTAL!) git format-rev --stdin-mode=<mode> --format=<pretty> [--"

12401 +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]"

12402 +msgstr ""

12403 +"（實驗性！）git format-rev --stdin-mode=<mode> --format=<pretty> [--"

12404 +"[no-]notes=<ref>] [-z] [--[no-]null-output] [--[no-]null-input]"

12405 +

12406 +#: builtin/name-rev.c

12407 +msgid "pretty format to use"

12408 +msgstr "要使用的美化輸出格式"

12409 +

12410 +#: builtin/name-rev.c

12411 +msgid "stdin-mode"

12412 +msgstr "stdin-mode"

12413 +

12414 +#: builtin/name-rev.c

12415 +msgid "how revs are processed"

12416 +msgstr "修訂版如何處理"

12417 +

12418 +#: builtin/name-rev.c builtin/range-diff.c

12419 +msgid "notes"

12420 +msgstr "註解"

12421 +

12422 +#: builtin/name-rev.c

12423 +msgid "display notes for pretty format"

12424 +msgstr "以美化格式顯示註解"

12425 +

12426 +#: builtin/name-rev.c

12427 +msgid "z"

12428 +msgstr "z"

12429 +

12430 +#: builtin/name-rev.c

12431 +msgid "Use NUL for input and output termination"

12432 +msgstr "使用 NUL 作為輸入和輸出終止符"

12433 +

12434 +#: builtin/name-rev.c

12435 +msgid "Use NUL for input termination"

12436 +msgstr "使用 NUL 作為輸入終止符"

12437 +

12438 +#: builtin/name-rev.c

12439 +msgid "Use NUL for output termination"

12440 +msgstr "使用 NUL 作為輸出終止符"

12441 +

12442 +#: builtin/name-rev.c

12443 +#, c-format

12444 +msgid "'%s' is required"

12445 +msgstr "需要「%s」"

12446 +

12447 #: builtin/notes.c

12448 msgid "git notes [--ref <notes-ref>] [list [<object>]]"

12449 msgstr "git notes [--ref <註解引用>] [list [<物件>]]"

@@ -12493,9 +12576,7 @@ msgstr "註解內容被留在 %s 中"

12576 msgid "could not open or read '%s'"

12577 msgstr "無法開啟或讀取「%s」"

12578

12496 -#: builtin/notes.c builtin/notes.c builtin/notes.c

12497 -#: builtin/notes.c builtin/notes.c builtin/notes.c

12498 -#: builtin/notes.c builtin/notes.c builtin/notes.c

12579 +#: builtin/notes.c

12580 #, c-format

12581 msgid "failed to resolve '%s' as a valid ref."

12582 msgstr "無法解析 '%s' 為一個有效引用。"

@@ -12523,48 +12604,48 @@ msgstr "將註解從「%s」複製至「%s」失敗"

12604 msgid "refusing to %s notes in %s (outside of refs/notes/)"

12605 msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解"

12606

12526 -#: builtin/notes.c builtin/notes.c

12607 +#: builtin/notes.c

12608 #, c-format

12609 msgid "no note found for object %s."

12610 msgstr "未發現物件 %s 的註解。"

12611

12531 -#: builtin/notes.c builtin/notes.c

12612 +#: builtin/notes.c

12613 msgid "note contents as a string"

12614 msgstr "註解內容作為一個字串"

12615

12535 -#: builtin/notes.c builtin/notes.c

12616 +#: builtin/notes.c

12617 msgid "note contents in a file"

12618 msgstr "註解內容到一個檔案中"

12619

12539 -#: builtin/notes.c builtin/notes.c

12620 +#: builtin/notes.c

12621 msgid "reuse and edit specified note object"

12622 msgstr "重用和編輯指定的註解物件"

12623

12543 -#: builtin/notes.c builtin/notes.c

12624 +#: builtin/notes.c

12625 msgid "edit note message in editor"

12626 msgstr "在編輯器中編輯備註訊息"

12627

12547 -#: builtin/notes.c builtin/notes.c

12628 +#: builtin/notes.c

12629 msgid "reuse specified note object"

12630 msgstr "重用指定的註解物件"

12631

12551 -#: builtin/notes.c builtin/notes.c

12632 +#: builtin/notes.c

12633 msgid "allow storing empty note"

12634 msgstr "允許儲存空白備註"

12635

12555 -#: builtin/notes.c builtin/notes.c

12636 +#: builtin/notes.c

12637 msgid "replace existing notes"

12638 msgstr "取代已存在的註解"

12639

12559 -#: builtin/notes.c builtin/notes.c

12640 +#: builtin/notes.c

12641 msgid "<paragraph-break>"

12642 msgstr "<paragraph-break>"

12643

12563 -#: builtin/notes.c builtin/notes.c

12644 +#: builtin/notes.c

12645 msgid "insert <paragraph-break> between paragraphs"

12646 msgstr "在段落間插入 <paragraph-break>"

12647

12567 -#: builtin/notes.c builtin/notes.c

12648 +#: builtin/notes.c

12649 msgid "remove unnecessary whitespace"

12650 msgstr "移除不必要的空白字元"

12651

@@ -12575,12 +12656,12 @@ msgid ""

12656 "existing notes"

12657 msgstr "不能新增註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解"

12658

12578 -#: builtin/notes.c builtin/notes.c

12659 +#: builtin/notes.c

12660 #, c-format

12661 msgid "Overwriting existing notes for object %s\n"

12662 msgstr "覆蓋物件 %s 現存註解\n"

12663

12583 -#: builtin/notes.c builtin/notes.c builtin/notes.c

12664 +#: builtin/notes.c

12665 #, c-format

12666 msgid "Removing note for object %s\n"

12667 msgstr "刪除物件 %s 的註解\n"

@@ -12788,6 +12869,11 @@ msgstr "無效的 --name-hash-version 選項：%d"

12869 msgid "currently, --write-bitmap-index requires --name-hash-version=1"

12870 msgstr "目前 --write-bitmap-index 需要指定 --name-hash-version=1"

12871

12872 +#: builtin/pack-objects.c

12873 +#, c-format

12874 +msgid "write_reuse_object: unable to parse object header of %s"

12875 +msgstr "write_reuse_object：無法解析 %s 的物件標頭"

12876 +

12877 #: builtin/pack-objects.c

12878 #, c-format

12879 msgid ""

@@ -12866,7 +12952,7 @@ msgstr "%s 的 delta 基準位移越界"

12952 msgid "Counting objects"

12953 msgstr "正在計算物件數量"

12954

12869 -#: builtin/pack-objects.c pack-bitmap.c pack-bitmap.c

12955 +#: builtin/pack-objects.c pack-bitmap.c

12956 #, c-format

12957 msgid "unable to get size of %s"

12958 msgstr "不能得到 %s 的大小"

@@ -12876,13 +12962,12 @@ msgstr "不能得到 %s 的大小"

12962 msgid "unable to parse object header of %s"

12963 msgstr "無法解析物件 %s 標頭訊息"

12964

12879 -#: builtin/pack-objects.c builtin/pack-objects.c

12965 #: builtin/pack-objects.c

12966 #, c-format

12967 msgid "object %s cannot be read"

12968 msgstr "物件 %s 無法讀取"

12969

12885 -#: builtin/pack-objects.c builtin/pack-objects.c

12970 +#: builtin/pack-objects.c

12971 #, c-format

12972 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"

12973 msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）"

@@ -12906,7 +12991,7 @@ msgstr "無法為標籤 %s 壓縮物件"

12991 msgid "unable to get type of object %s"

12992 msgstr "無法獲得物件 %s 類型"

12993

12909 -#: builtin/pack-objects.c builtin/pack-objects.c

12994 +#: builtin/pack-objects.c

12995 msgid "Compressing objects by path"

12996 msgstr "正在根據路徑壓縮物件"

12997

@@ -12949,7 +13034,7 @@ msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')

13034 msgid "could not get type of object %s in pack %s"

13035 msgstr "無法取得 %2$s 包中 %1$s 物件的類型"

13036

12952 -#: builtin/pack-objects.c builtin/pack-objects.c

13037 +#: builtin/pack-objects.c

13038 #, c-format

13039 msgid "could not find pack '%s'"

13040 msgstr "找不到「%s」包"

@@ -12964,7 +13049,7 @@ msgstr "封包檔案 %s 是承諾者，但是指定了 --exclude-promisor-object

13049 msgid "packfile %s cannot be accessed"

13050 msgstr "無法存取封包檔案 %s"

13051

12967 -#: builtin/pack-objects.c builtin/pack-objects.c

13052 +#: builtin/pack-objects.c

13053 msgid "Enumerating cruft objects"

13054 msgstr "正在枚舉無用物件"

13055

@@ -12994,7 +13079,7 @@ msgstr ""

13079 "預期物件 ID，卻得到垃圾資料：\n"

13080 " %s"

13081

12997 -#: builtin/pack-objects.c builtin/pack-objects.c

13082 +#: builtin/pack-objects.c

13083 msgid "cannot open pack index"

13084 msgstr "無法開啟包檔案索引"

13085

@@ -13007,10 +13092,6 @@ msgstr "無法檢查 %s 處的鬆散物件"

13092 msgid "unable to force loose object"

13093 msgstr "無法強制鬆散物件"

13094

13010 -#: builtin/pack-objects.c

13011 -msgid "failed to pack objects via path-walk"

13012 -msgstr "無法使用 path-walk 封裝物件"

13013 -

13095 #: builtin/pack-objects.c

13096 #, c-format

13097 msgid "not a rev '%s'"

@@ -13021,6 +13102,10 @@ msgstr "不是一個版本 '%s'"

13102 msgid "bad revision '%s'"

13103 msgstr "壞的版本 '%s'"

13104

13105 +#: builtin/pack-objects.c

13106 +msgid "failed to pack objects via path-walk"

13107 +msgstr "無法使用 path-walk 封裝物件"

13108 +

13109 #: builtin/pack-objects.c

13110 msgid "unable to add recent objects"

13111 msgstr "無法新增最近的物件"

@@ -13347,24 +13432,23 @@ msgstr ""

13432 msgid "You are not currently on a branch."

13433 msgstr "您目前不在一個分支上。"

13434

13350 -#: builtin/pull.c builtin/pull.c

13435 +#: builtin/pull.c

13436 msgid "Please specify which branch you want to rebase against."

13437 msgstr "請指定您要重定基底到哪一個分支。"

13438

13354 -#: builtin/pull.c builtin/pull.c

13439 +#: builtin/pull.c

13440 msgid "Please specify which branch you want to merge with."

13441 msgstr "請指定您要合併哪一個分支。"

13442

13358 -#: builtin/pull.c builtin/pull.c

13443 +#: builtin/pull.c

13444 msgid "See git-pull(1) for details."

13445 msgstr "詳見 git-pull(1)。"

13446

13362 -#: builtin/pull.c builtin/pull.c builtin/pull.c

13363 -#: builtin/rebase.c

13447 +#: builtin/pull.c builtin/rebase.c

13448 msgid "<remote>"

13449 msgstr "<遠端>"

13450

13367 -#: builtin/pull.c builtin/pull.c builtin/pull.c scalar.c

13451 +#: builtin/pull.c scalar.c

13452 msgid "<branch>"

13453 msgstr "<分支>"

13454

@@ -13727,6 +13811,11 @@ msgstr "在有 push.recurseSubmodules=only; 的情況嘗試遞迴子模組；改

13811 msgid "invalid value for '%s'"

13812 msgstr "「%s」的值無效"

13813

13814 +#: builtin/push.c

13815 +#, c-format

13816 +msgid "could not push to %s"

13817 +msgstr "無法推送到 %s"

13818 +

13819 #: builtin/push.c builtin/submodule--helper.c

13820 msgid "repository"

13821 msgstr "版本庫"

@@ -13771,8 +13860,7 @@ msgstr "控制子模組的遞迴推送"

13860 msgid "use thin pack"

13861 msgstr "使用精簡打包"

13862

13774 -#: builtin/push.c builtin/push.c builtin/send-pack.c

13775 -#: builtin/send-pack.c

13863 +#: builtin/push.c builtin/send-pack.c

13864 msgid "receive pack program"

13865 msgstr "接收包程式"

13866

@@ -13820,15 +13908,35 @@ msgid ""

13908 "and then push using the remote name\n"

13909 "\n"

13910 " git push <name>\n"

13911 +"\n"

13912 +"To push to multiple remotes at once, configure a remote group using\n"

13913 +"\n"

13914 +" git config remotes.<groupname> \"<remote1> <remote2>\"\n"

13915 +"\n"

13916 +"and then push using the group name\n"

13917 +"\n"

13918 +" git push <groupname>\n"

13919 msgstr ""

13920 "沒有設定推送目的地。\n"

13825 -"請透過命令列指定 URL，或者用下面指令設定遠端版本庫\n"

13921 +"請透過命令列指定 URL，或者用以下命令設定遠端版本庫\n"

13922 "\n"

13827 -" git remote add <名稱> <位址>\n"

13923 +" git remote add <名稱> <URL>\n"

13924 "\n"

13829 -"然後使用該遠端版本庫名執行推送\n"

13925 +"然後以該遠端名稱進行推送\n"

13926 "\n"

13927 " git push <名稱>\n"

13928 +"\n"

13929 +"要一次推送到多個遠端，用以下命令設定遠端群組\n"

13930 +"\n"

13931 +" git config remotes.<群組名稱> \"<遠端1> <遠端2>\"\n"

13932 +"\n"

13933 +"然後以該群組名稱進行推送\n"

13934 +"\n"

13935 +" git push <群組名稱>\n"

13936 +

13937 +#: builtin/push.c

13938 +msgid "push options must not have new line characters"

13939 +msgstr "推送選項不能有換行符號"

13940

13941 #: builtin/push.c

13942 msgid "--all can't be combined with refspecs"

@@ -13839,8 +13947,8 @@ msgid "--mirror can't be combined with refspecs"

13947 msgstr "--mirror 不能和引用規格同時使用"

13948

13949 #: builtin/push.c

13842 -msgid "push options must not have new line characters"

13843 -msgstr "推送選項不能有換行符號"

13950 +msgid "--atomic can only be used when pushing to one remote"

13951 +msgstr "--atomic 只能在推送到一個遠端時使用"

13952

13953 #: builtin/range-diff.c

13954 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"

@@ -13864,10 +13972,6 @@ msgid "use simple diff colors"

13972 msgstr "使用簡單差異顏色"

13973

13974 #: builtin/range-diff.c

13867 -msgid "notes"

13868 -msgstr "註解"

13869 -

13870 -#: builtin/range-diff.c builtin/range-diff.c builtin/range-diff.c

13975 msgid "passed to 'git log'"

13976 msgstr "傳遞給 'git log'"

13977

@@ -13887,12 +13991,12 @@ msgstr "只發出跟第一個範圍相關的輸出"

13991 msgid "only emit output related to the second range"

13992 msgstr "只發出跟第二個範圍相關的輸出"

13993

13890 -#: builtin/range-diff.c builtin/range-diff.c builtin/range-diff.c

13994 +#: builtin/range-diff.c

13995 #, c-format

13996 msgid "not a revision: '%s'"

13997 msgstr "非修訂版：「%s」"

13998

13895 -#: builtin/range-diff.c builtin/range-diff.c

13999 +#: builtin/range-diff.c

14000 #, c-format

14001 msgid "not a commit range: '%s'"

14002 msgstr "不是提交範圍：「%s」"

@@ -14046,8 +14150,7 @@ msgstr "無效的原始 head：'%s'"

14150 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"

14151 msgstr "忽略無效的 allow_rerere_autoupdate：'%s'"

14152

14049 -#: builtin/rebase.c builtin/rebase.c builtin/rebase.c

14050 -#: builtin/rm.c sequencer.c sequencer.c

14153 +#: builtin/rebase.c builtin/rm.c sequencer.c

14154 #, c-format

14155 msgid "could not remove '%s'"

14156 msgstr "無法刪除「%s」"

@@ -14080,7 +14183,6 @@ msgstr "未知的 rebase-merges 模式：%s"

14183 msgid "could not switch to %s"

14184 msgstr "無法切換到 %s"

14185

14083 -#: builtin/rebase.c builtin/rebase.c builtin/rebase.c

14186 #: builtin/rebase.c

14187 msgid "apply options and merge options cannot be used together"

14188 msgstr "套用選項與合併選項不得同時使用"

@@ -14183,7 +14285,7 @@ msgstr "忽略製作日期而使用日前日期"

14285 msgid "synonym of --reset-author-date"

14286 msgstr "和 --reset-author-date 同義"

14287

14186 -#: builtin/rebase.c builtin/rebase.c

14288 +#: builtin/rebase.c

14289 msgid "passed to 'git apply'"

14290 msgstr "傳遞給 'git apply'"

14291

@@ -14191,7 +14293,7 @@ msgstr "傳遞給 'git apply'"

14293 msgid "ignore changes in whitespace"

14294 msgstr "忽略空白字元中的變更"

14295

14194 -#: builtin/rebase.c builtin/rebase.c

14296 +#: builtin/rebase.c

14297 msgid "cherry-pick all commits, even if unchanged"

14298 msgstr "揀選所有提交，即使未修改"

14299

@@ -14236,10 +14338,6 @@ msgstr "讓使用者編輯要重定基底的提交列表"

14338 msgid "(REMOVED) was: try to recreate merges instead of ignoring them"

14339 msgstr "（已移除）曾為：嘗試重新建立，而非忽略合併"

14340

14239 -#: builtin/rebase.c builtin/revert.c

14240 -msgid "how to handle commits that become empty"

14241 -msgstr "處理空白提交的方式"

14242 -

14341 #: builtin/rebase.c

14342 msgid "keep commits which start empty"

14343 msgstr "保留開頭是空白的提交"

@@ -14570,7 +14668,7 @@ msgstr ""

14668 " [--dry-run | -n] [--verbose] [--all [--single-worktree] | "

14669 "<refs>...]"

14670

14573 -#: builtin/reflog.c builtin/reflog.c

14671 +#: builtin/reflog.c

14672 #, c-format

14673 msgid "invalid timestamp '%s' given to '--%s'"

14674 msgstr "傳入「--%s」的時間戳「%s」無效"

@@ -14580,24 +14678,24 @@ msgstr "傳入「--%s」的時間戳「%s」無效"

14678 msgid "%s does not accept arguments: '%s'"

14679 msgstr "%s 不接受參數：'%s'"

14680

14583 -#: builtin/reflog.c builtin/reflog.c

14681 +#: builtin/reflog.c

14682 msgid "do not actually prune any entries"

14683 msgstr "不實際剪除任何項目"

14684

14587 -#: builtin/reflog.c builtin/reflog.c

14685 +#: builtin/reflog.c

14686 msgid ""

14687 "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"

14688 msgstr "將舊的 SHA1 重寫為現在比它早的新 SHA1"

14689

14592 -#: builtin/reflog.c builtin/reflog.c

14690 +#: builtin/reflog.c

14691 msgid "update the reference to the value of the top reflog entry"

14692 msgstr "更新引用至首個引用日誌項目的值"

14693

14596 -#: builtin/reflog.c builtin/reflog.c

14694 +#: builtin/reflog.c

14695 msgid "print extra information on screen"

14696 msgstr "在螢幕上輸出額外資訊"

14697

14600 -#: builtin/reflog.c builtin/reflog.c

14698 +#: builtin/reflog.c

14699 msgid "timestamp"

14700 msgstr "時間戳"

14701

@@ -14628,7 +14726,7 @@ msgstr "限制只處理目前工作區的引用日誌"

14726 msgid "Marking reachable objects..."

14727 msgstr "正在標記可以取得物件..."

14728

14631 -#: builtin/reflog.c builtin/reflog.c

14729 +#: builtin/reflog.c

14730 #, c-format

14731 msgid "reflog could not be found: '%s'"

14732 msgstr "找不到引用日誌：「%s」"

@@ -14763,15 +14861,15 @@ msgstr ""

14861 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"

14862 "mirror=<fetch|push>] <名稱> <位址>"

14863

14766 -#: builtin/remote.c builtin/remote.c

14864 +#: builtin/remote.c

14865 msgid "git remote rename [--[no-]progress] <old> <new>"

14866 msgstr "git remote rename [--[no-]progress] <old> <new>"

14867

14770 -#: builtin/remote.c builtin/remote.c

14868 +#: builtin/remote.c

14869 msgid "git remote remove <name>"

14870 msgstr "git remote remove <名稱>"

14871

14774 -#: builtin/remote.c builtin/remote.c

14872 +#: builtin/remote.c

14873 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"

14874 msgstr "git remote set-head <名稱> (-a | --auto | -d | --delete | <分支>)"

14875

@@ -14792,19 +14890,19 @@ msgstr "git remote [-v | --verbose] update [-p | --prune] [(<組> | <遠端>)...

14890 msgid "git remote set-branches [--add] <name> <branch>..."

14891 msgstr "git remote set-branches [--add] <名稱> <分支>..."

14892

14795 -#: builtin/remote.c builtin/remote.c

14893 +#: builtin/remote.c

14894 msgid "git remote get-url [--push] [--all] <name>"

14895 msgstr "git remote get-url [--push] [--all] <名稱>"

14896

14799 -#: builtin/remote.c builtin/remote.c

14897 +#: builtin/remote.c

14898 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"

14899 msgstr "git remote set-url [--push] <名稱> <新的位址> [<舊的位址>]"

14900

14803 -#: builtin/remote.c builtin/remote.c

14901 +#: builtin/remote.c

14902 msgid "git remote set-url --add <name> <newurl>"

14903 msgstr "git remote set-url --add <名稱> <新的位址>"

14904

14807 -#: builtin/remote.c builtin/remote.c

14905 +#: builtin/remote.c

14906 msgid "git remote set-url --delete <name> <url>"

14907 msgstr "git remote set-url --delete <名稱> <位址>"

14908

@@ -14897,7 +14995,7 @@ msgstr "指定一個 master 分支並使用 --mirror 選項沒有意義"

14995 msgid "specifying branches to track makes sense only with fetch mirrors"

14996 msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義"

14997

14900 -#: builtin/remote.c builtin/remote.c

14998 +#: builtin/remote.c

14999 #, c-format

15000 msgid "remote %s already exists."

15001 msgstr "遠端 %s 已經存在。"

@@ -14907,8 +15005,7 @@ msgstr "遠端 %s 已經存在。"

15005 msgid "Could not setup master '%s'"

15006 msgstr "無法配置 master「%s」"

15007

14910 -#: builtin/remote.c builtin/remote.c trailer.c trailer.c

14911 -#: trailer.c

15008 +#: builtin/remote.c trailer.c

15009 #, c-format

15010 msgid "more than one %s"

15011 msgstr "多於一個 %s"

@@ -14923,7 +15020,7 @@ msgstr "branch.%s.rebase=%s 未處理。假設成 'true'"

15020 msgid "Could not get fetch map for refspec %s"

15021 msgstr "無法取得引用規格 %s 的 fetch 映射"

15022

14926 -#: builtin/remote.c builtin/remote.c

15023 +#: builtin/remote.c

15024 msgid "(matching)"

15025 msgstr "（符合）"

15026

@@ -14936,8 +15033,7 @@ msgstr "（刪除）"

15033 msgid "could not set '%s'"

15034 msgstr "無法設定「%s」"

15035

14939 -#: builtin/remote.c builtin/remote.c builtin/remote.c

14940 -#: config.c

15036 +#: builtin/remote.c config.c

15037 #, c-format

15038 msgid "could not unset '%s'"

15039 msgstr "無法取消設定「%s」"

@@ -14969,7 +15065,7 @@ msgstr ""

15065 "\n"

15066 "若是這種情況，你可以先將遠端改為不同的名稱來解決這個問題。\n"

15067

14972 -#: builtin/remote.c builtin/remote.c builtin/remote.c

15068 +#: builtin/remote.c

15069 #, c-format

15070 msgid "No such remote: '%s'"

15071 msgstr "沒有此遠端版本庫：'%s'"

@@ -15132,7 +15228,7 @@ msgstr " 取得位址：%s"

15228 #. with the one in " Fetch URL: %s"

15229 #. translation.

15230 #.

15135 -#: builtin/remote.c builtin/remote.c

15231 +#: builtin/remote.c

15232 #, c-format

15233 msgid " Push URL: %s"

15234 msgstr " 推送位址：%s"

@@ -15141,7 +15237,7 @@ msgstr " 推送位址：%s"

15237 msgid "(no URL)"

15238 msgstr "(無 URL)"

15239

15144 -#: builtin/remote.c builtin/remote.c builtin/remote.c

15240 +#: builtin/remote.c

15241 #, c-format

15242 msgid " HEAD branch: %s"

15243 msgstr " HEAD 分支：%s"

@@ -15168,7 +15264,7 @@ msgid_plural " Remote branches:%s"

15264 msgstr[0] " 遠端分支：%s"

15265

15266 # 譯者：中文字串拼接，可刪除前導空格

15171 -#: builtin/remote.c builtin/remote.c

15267 +#: builtin/remote.c

15268 msgid " (status not queried)"

15269 msgstr " （狀態未查詢）"

15270

@@ -15269,7 +15365,7 @@ msgstr " * [已剪除] %s"

15365 msgid "prune remotes after fetching"

15366 msgstr "抓取後剪除遠端"

15367

15272 -#: builtin/remote.c builtin/remote.c builtin/remote.c

15368 +#: builtin/remote.c

15369 #, c-format

15370 msgid "No such remote '%s'"

15371 msgstr "沒有此遠端 '%s'"

@@ -15328,11 +15424,11 @@ msgstr "詳細輸出；必須置於子指令之前"

15424 msgid ""

15425 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"

15426 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"

15331 -"[--write-midx] [--name-hash-version=<n>] [--path-walk]"

15427 +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"

15428 msgstr ""

15429 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"

15430 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"

15335 -"[--write-midx] [--name-hash-version=<n>] [--path-walk]"

15431 +"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"

15432

15433 #: builtin/repack.c

15434 msgid ""

@@ -15342,6 +15438,11 @@ msgstr ""

15438 "增量 repack 和 bitmap 索引不相容。請使用 --no-write-bitmap-index\n"

15439 "或停用 pack.writeBitmaps 設定。"

15440

15441 +#: builtin/repack.c

15442 +#, c-format

15443 +msgid "unknown value for %s: %s"

15444 +msgstr "未知的 %s 值：%s"

15445 +

15446 #: builtin/repack.c

15447 msgid "pack everything in a single pack"

15448 msgstr "所有內容打包到一個包檔案中"

@@ -15354,7 +15455,7 @@ msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件"

15455 msgid "same as -a, pack unreachable cruft objects separately"

15456 msgstr "和 -a 相同，會獨立封裝無法存取的無用物件"

15457

15357 -#: builtin/repack.c builtin/repack.c

15458 +#: builtin/repack.c

15459 msgid "approxidate"

15460 msgstr "近似日期"

15461

@@ -15459,6 +15560,11 @@ msgstr "將前綴進行包裝，儲存為包含已過濾物件的封裝"

15560 msgid "cannot delete packs in a precious-objects repo"

15561 msgstr "不能刪除珍品版本庫中的封包"

15562

15563 +#: builtin/repack.c

15564 +#, c-format

15565 +msgid "invalid value for %s: %d"

15566 +msgstr "無效的 %s 值：%d"

15567 +

15568 #: builtin/repack.c

15569 #, c-format

15570 msgid "option '%s' can only be used along with '%s'"

@@ -15478,7 +15584,7 @@ msgstr "git replace [-f] --edit <物件>"

15584

15585 #: builtin/replace.c

15586 msgid "git replace [-f] --graft <commit> [<parent>...]"

15481 -msgstr "git replace [-f] --graft <提交> [<父提交>...]"

15587 +msgstr "git replace [-f] --graft <提交> [<親代提交>...]"

15588

15589 #: builtin/replace.c

15590 msgid "git replace -d <object>..."

@@ -15650,7 +15756,7 @@ msgstr "編輯現存的物件"

15756

15757 #: builtin/replace.c

15758 msgid "change a commit's parents"

15653 -msgstr "修改一個提交的父提交"

15759 +msgstr "修改一個提交的親代提交"

15760

15761 #: builtin/replace.c

15762 msgid "convert existing graft file"

@@ -15747,7 +15853,6 @@ msgstr "控制引用的更新行為（update|print）"

15853 msgid "exactly one of --onto, --advance, or --revert is required"

15854 msgstr "--onto、--advance 或 --revert 必須三選一"

15855

15750 -#: builtin/replay.c builtin/replay.c builtin/replay.c

15856 #: builtin/replay.c

15857 #, c-format

15858 msgid ""

@@ -15769,11 +15874,11 @@ msgstr "--keys 只能與 --format=lines 或 --format=nul 一起使用"

15874 msgid "invalid format '%s'"

15875 msgstr "「%s」格式無效"

15876

15772 -#: builtin/repo.c builtin/repo.c

15877 +#: builtin/repo.c

15878 msgid "output format"

15879 msgstr "輸出格式"

15880

15776 -#: builtin/repo.c builtin/repo.c

15881 +#: builtin/repo.c

15882 msgid "synonym for --format=nul"

15883 msgstr "和 --format=nul 同義"

15884

@@ -15801,7 +15906,7 @@ msgstr "--all 和 <key> 不能同時使用"

15906 msgid "References"

15907 msgstr "引用"

15908

15804 -#: builtin/repo.c builtin/repo.c

15909 +#: builtin/repo.c

15910 msgid "Count"

15911 msgstr "總數"

15912

@@ -15809,7 +15914,6 @@ msgstr "總數"

15914 msgid "Branches"

15915 msgstr "分支"

15916

15812 -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c

15917 #: builtin/repo.c

15918 msgid "Tags"

15919 msgstr "標籤"

@@ -15826,15 +15930,15 @@ msgstr "其他"

15930 msgid "Reachable objects"

15931 msgstr "可到達物件"

15932

15829 -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c

15933 +#: builtin/repo.c

15934 msgid "Commits"

15935 msgstr "提交"

15936

15833 -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c

15937 +#: builtin/repo.c

15938 msgid "Trees"

15939 msgstr "樹狀物件"

15940

15837 -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c

15941 +#: builtin/repo.c

15942 msgid "Blobs"

15943 msgstr "資料物件"

15944

@@ -15850,13 +15954,13 @@ msgstr "磁碟大小"

15954 msgid "Largest objects"

15955 msgstr "最大的物件"

15956

15853 -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c

15957 +#: builtin/repo.c

15958 msgid "Maximum size"

15959 msgstr "最大大小"

15960

15961 #: builtin/repo.c

15962 msgid "Maximum parents"

15859 -msgstr "最大父提交數"

15963 +msgstr "最大親代提交數"

15964

15965 #: builtin/repo.c

15966 msgid "Maximum entries"

@@ -15956,8 +16060,7 @@ msgstr "HEAD 現在位於 %s"

16060 msgid "Cannot do a %s reset in the middle of a merge."

16061 msgstr "在合併過程中不能做%s重設動作。"

16062

15959 -#: builtin/reset.c builtin/stash.c builtin/stash.c

15960 -#: builtin/stash.c

16063 +#: builtin/reset.c builtin/stash.c

16064 msgid "be quiet, only report errors"

16065 msgstr "安靜模式，只報告錯誤"

16066

@@ -15973,7 +16076,7 @@ msgstr "重設 HEAD 和索引"

16076 msgid "reset only HEAD"

16077 msgstr "只重設 HEAD"

16078

15976 -#: builtin/reset.c builtin/reset.c

16079 +#: builtin/reset.c

16080 msgid "reset HEAD, index and working tree"

16081 msgstr "重設 HEAD、索引和工作區"

16082

@@ -16223,11 +16326,11 @@ msgstr "編輯提交說明"

16326

16327 #: builtin/revert.c

16328 msgid "parent-number"

16226 -msgstr "父編號"

16329 +msgstr "親代編號"

16330

16331 #: builtin/revert.c

16332 msgid "select mainline parent"

16230 -msgstr "選擇主幹父提交編號"

16333 +msgstr "選擇主幹親代提交編號"

16334

16335 #: builtin/revert.c

16336 msgid "merge strategy"

@@ -16297,7 +16400,7 @@ msgid "the following file has changes staged in the index:"

16400 msgid_plural "the following files have changes staged in the index:"

16401 msgstr[0] "下列檔案有暫存在索引的變更："

16402

16300 -#: builtin/rm.c builtin/rm.c

16403 +#: builtin/rm.c

16404 msgid ""

16405 "\n"

16406 "(use --cached to keep the file, or -f to force removal)"

@@ -16394,7 +16497,7 @@ msgstr "git log --pretty=short | git shortlog [<選項>]"

16497 msgid "using multiple --group options with stdin is not supported"

16498 msgstr "不支援在標準輸入使用多個 --group 選項"

16499

16397 -#: builtin/shortlog.c builtin/shortlog.c

16500 +#: builtin/shortlog.c

16501 #, c-format

16502 msgid "using %s with stdin is not supported"

16503 msgstr "不支援對 %s 使用 stdin"

@@ -16588,10 +16691,6 @@ msgstr "無法讀取標頭"

16691 msgid "unknown index version"

16692 msgstr "未知的索引版本"

16693

16591 -#: builtin/show-index.c builtin/show-index.c

16592 -msgid "unable to read index"

16593 -msgstr "無法讀取索引"

16594 -

16694 #: builtin/show-index.c

16695 msgid "corrupt index file"

16696 msgstr "索引檔案損壞"

@@ -16669,7 +16768,7 @@ msgstr "檢查引用是否存在但不解析"

16768 msgid "stricter reference checking, requires exact ref path"

16769 msgstr "更嚴格的引用檢測，需要精確的引用路徑"

16770

16672 -#: builtin/show-ref.c builtin/show-ref.c

16771 +#: builtin/show-ref.c

16772 msgid "show the HEAD reference, even if it would be filtered out"

16773 msgstr "顯示 HEAD 引用，即使被過濾掉"

16774

@@ -16734,12 +16833,10 @@ msgstr "無法初始化工作區組態"

16833 msgid "failed to modify sparse-index config"

16834 msgstr "無法修改稀疏索引設定"

16835

16737 -#: builtin/sparse-checkout.c builtin/sparse-checkout.c

16836 #: builtin/sparse-checkout.c

16837 msgid "initialize the sparse-checkout in cone mode"

16838 msgstr "以 cone 模式初始化稀疏簽出"

16839

16742 -#: builtin/sparse-checkout.c builtin/sparse-checkout.c

16840 #: builtin/sparse-checkout.c

16841 msgid "toggle the use of a sparse index"

16842 msgstr "切換是否使用稀疏索引"

@@ -16754,12 +16851,11 @@ msgstr "無法開啟「%s」"

16851 msgid "could not normalize path %s"

16852 msgstr "無法標準化路徑 %s"

16853

16757 -#: builtin/sparse-checkout.c builtin/sparse-checkout.c

16854 +#: builtin/sparse-checkout.c

16855 #, c-format

16856 msgid "unable to unquote C-style string '%s'"

16857 msgstr "無法去掉 '%s' C 樣式字串的引號"

16858

16762 -#: builtin/sparse-checkout.c builtin/sparse-checkout.c

16859 #: builtin/sparse-checkout.c

16860 msgid "unable to load existing sparse-checkout patterns"

16861 msgstr "無法載入現存的稀疏簽出樣式"

@@ -16810,12 +16906,12 @@ msgstr ""

16906 msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"

16907 msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"

16908

16813 -#: builtin/sparse-checkout.c builtin/sparse-checkout.c

16909 +#: builtin/sparse-checkout.c

16910 msgid ""

16911 "skip some sanity checks on the given paths that might give false positives"

16912 msgstr "在可能給出誤判結果的指定目錄，略過某些完整性檢查"

16913

16818 -#: builtin/sparse-checkout.c builtin/sparse-checkout.c

16914 +#: builtin/sparse-checkout.c

16915 msgid "read patterns from standard in"

16916 msgstr "從標準輸入讀取樣式"

16917

@@ -16912,8 +17008,12 @@ msgid "git stash pop [--index] [-q | --quiet] [<stash>]"

17008 msgstr "git stash pop [--index] [-q | --quiet] [<stash>]"

17009

17010 #: builtin/stash.c

16915 -msgid "git stash apply [--index] [-q | --quiet] [<stash>]"

16916 -msgstr "git stash apply [--index] [-q | --quiet] [<stash>]"

17011 +msgid ""

17012 +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-"

17013 +"theirs=<label>] [--label-base=<label>] [<stash>]"

17014 +msgstr ""

17015 +"git stash apply [--index] [-q | --quiet] [--label-ours=<label>] [--label-"

17016 +"theirs=<label>] [--label-base=<label>] [<stash>]"

17017

17018 #: builtin/stash.c

17019 msgid "git stash branch <branchname> [<stash>]"

@@ -17025,10 +17125,26 @@ msgstr "索引未從貯存中復原。"

17125 msgid "could not restore untracked files from stash"

17126 msgstr "無法從貯存條目中復原未追蹤檔案"

17127

17028 -#: builtin/stash.c builtin/stash.c

17128 +#: builtin/stash.c

17129 msgid "attempt to recreate the index"

17130 msgstr "嘗試重建索引"

17131

17132 +#: builtin/stash.c

17133 +msgid "label"

17134 +msgstr "label"

17135 +

17136 +#: builtin/stash.c

17137 +msgid "label for the upstream side in conflict markers"

17138 +msgstr "衝突標記中表示上游的標籤"

17139 +

17140 +#: builtin/stash.c

17141 +msgid "label for the stashed side in conflict markers"

17142 +msgstr "衝突標記中表示貯存的標籤"

17143 +

17144 +#: builtin/stash.c

17145 +msgid "label for the base in diff3 conflict markers"

17146 +msgstr "diff3 衝突標記中表示基底的標籤"

17147 +

17148 #: builtin/stash.c

17149 #, c-format

17150 msgid "Dropped %s (%s)"

@@ -17068,12 +17184,12 @@ msgstr "在貯存區包含未追蹤檔案"

17184 msgid "only show untracked files in the stash"

17185 msgstr "只在貯存區顯示未追蹤檔案"

17186

17071 -#: builtin/stash.c builtin/stash.c

17187 +#: builtin/stash.c

17188 #, c-format

17189 msgid "Cannot update %s with %s"

17190 msgstr "無法用 %2$s 更新 %1$s"

17191

17076 -#: builtin/stash.c builtin/stash.c builtin/stash.c

17192 +#: builtin/stash.c

17193 msgid "stash message"

17194 msgstr "貯存說明"

17195

@@ -17101,7 +17217,7 @@ msgstr "無法儲存目前索引狀態"

17217 msgid "Cannot save the untracked files"

17218 msgstr "無法儲存未追蹤檔案"

17219

17104 -#: builtin/stash.c builtin/stash.c

17220 +#: builtin/stash.c

17221 msgid "Cannot save the current worktree state"

17222 msgstr "無法儲存目前工作區狀態"

17223

@@ -17146,31 +17262,30 @@ msgstr "儲存工作目錄和索引狀態 %s"

17262 msgid "Cannot remove worktree changes"

17263 msgstr "無法刪除工作區變更"

17264

17149 -#: builtin/stash.c builtin/stash.c

17265 +#: builtin/stash.c

17266 msgid "keep index"

17267 msgstr "保持索引"

17268

17153 -#: builtin/stash.c builtin/stash.c

17269 +#: builtin/stash.c

17270 msgid "stash staged changes only"

17271 msgstr "只貯存暫存變更"

17272

17157 -#: builtin/stash.c builtin/stash.c

17273 +#: builtin/stash.c

17274 msgid "stash in patch mode"

17275 msgstr "以修補檔模式貯存"

17276

17161 -#: builtin/stash.c builtin/stash.c

17277 +#: builtin/stash.c

17278 msgid "quiet mode"

17279 msgstr "靜默模式"

17280

17165 -#: builtin/stash.c builtin/stash.c

17281 +#: builtin/stash.c

17282 msgid "include untracked files in stash"

17283 msgstr "貯存中包含未追蹤檔案"

17284

17169 -#: builtin/stash.c builtin/stash.c

17285 +#: builtin/stash.c

17286 msgid "include ignore files"

17287 msgstr "包含忽略的檔案"

17288

17173 -#: builtin/stash.c builtin/stash.c builtin/stash.c

17289 #: builtin/stash.c

17290 #, c-format

17291 msgid "cannot parse commit %s"

@@ -17213,9 +17328,9 @@ msgstr "找到 %s 貯存提交，裡面缺少預期的前綴"

17328 #: builtin/stash.c

17329 #, c-format

17330 msgid "cannot parse parents of commit: %s"

17216 -msgstr "無法解析提交的父物件：%s"

17331 +msgstr "無法解析提交的親代物件：%s"

17332

17218 -#: builtin/stash.c builtin/stash.c builtin/stash.c

17333 +#: builtin/stash.c

17334 #, c-format

17335 msgid "%s does not look like a stash commit"

17336 msgstr "%s 似乎不是貯存提交"

@@ -17266,7 +17381,7 @@ msgid ""

17381 "authoritative upstream."

17382 msgstr "找不到「%s」組態設定。假定這個版本庫是其自身的官方上游。"

17383

17269 -#: builtin/submodule--helper.c builtin/submodule--helper.c

17384 +#: builtin/submodule--helper.c

17385 #, c-format

17386 msgid "could not get a repository handle for submodule '%s'"

17387 msgstr "無法取得子模組「%s」的版本庫控制代碼"

@@ -17275,7 +17390,6 @@ msgstr "無法取得子模組「%s」的版本庫控制代碼"

17390 msgid "git submodule--helper get-default-remote <path>"

17391 msgstr "git submodule--helper get-default-remote <path>"

17392

17278 -#: builtin/submodule--helper.c builtin/submodule--helper.c

17393 #: builtin/submodule--helper.c

17394 #, c-format

17395 msgid "No url found for submodule path '%s' in .gitmodules"

@@ -17309,7 +17423,6 @@ msgstr ""

17423 msgid "suppress output of entering each submodule command"

17424 msgstr "隱藏每個子模組進入命令的輸出"

17425

17312 -#: builtin/submodule--helper.c builtin/submodule--helper.c

17426 #: builtin/submodule--helper.c

17427 msgid "recurse into nested submodules"

17428 msgstr "遞迴進入嵌套子模組中"

@@ -17357,7 +17470,6 @@ msgstr "隱藏初始化子模組的輸出"

17470 msgid "git submodule init [<options>] [<path>]"

17471 msgstr "git submodule init [<options>] [<path>]"

17472

17360 -#: builtin/submodule--helper.c builtin/submodule--helper.c

17473 #: builtin/submodule--helper.c

17474 #, c-format

17475 msgid "no submodule mapping found in .gitmodules for path '%s'"

@@ -17368,12 +17480,12 @@ msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射"

17480 msgid "could not resolve HEAD ref inside the submodule '%s'"

17481 msgstr "無法解析子模組「%s」的 HEAD 引用"

17482

17371 -#: builtin/submodule--helper.c builtin/submodule--helper.c

17483 +#: builtin/submodule--helper.c

17484 #, c-format

17485 msgid "failed to recurse into submodule '%s'"

17486 msgstr "遞迴子模組 '%s' 失敗"

17487

17376 -#: builtin/submodule--helper.c builtin/submodule--helper.c

17488 +#: builtin/submodule--helper.c

17489 msgid "suppress submodule status output"

17490 msgstr "隱藏子模組的狀態輸出"

17491

@@ -17553,7 +17665,7 @@ msgstr ""

17665 msgid "could not get a repository handle for gitdir '%s'"

17666 msgstr "無法取得 gitdir「%s」的版本庫控制代碼"

17667

17556 -#: builtin/submodule--helper.c builtin/submodule--helper.c

17668 +#: builtin/submodule--helper.c

17669 #, c-format

17670 msgid "submodule '%s' cannot add alternate: %s"

17671 msgstr "子模組 '%s' 不能新增版本庫備選：%s"

@@ -17568,7 +17680,6 @@ msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'"

17680 msgid "Value '%s' for submodule.alternateLocation is not recognized"

17681 msgstr "不能識別 submodule.alternateLocation 的取值 '%s'"

17682

17571 -#: builtin/submodule--helper.c builtin/submodule--helper.c

17683 #: builtin/submodule--helper.c

17684 #, c-format

17685 msgid "directory not empty: '%s'"

@@ -17609,11 +17720,10 @@ msgstr "新子模組的名稱"

17720 msgid "url where to clone the submodule from"

17721 msgstr "拓製子模組的 url 位址"

17722

17612 -#: builtin/submodule--helper.c builtin/submodule--helper.c

17723 +#: builtin/submodule--helper.c

17724 msgid "depth for shallow clones"

17725 msgstr "淺拓製的深度"

17726

17616 -#: builtin/submodule--helper.c builtin/submodule--helper.c

17727 #: builtin/submodule--helper.c

17728 msgid "force cloning progress"

17729 msgstr "強制顯示拓製進度"

@@ -17860,7 +17970,7 @@ msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>"

17970 msgid "--branch or --default required"

17971 msgstr "需要 --branch 或 --default"

17972

17863 -#: builtin/submodule--helper.c builtin/submodule--helper.c

17973 +#: builtin/submodule--helper.c

17974 msgid "print only error messages"

17975 msgstr "只輸出錯誤訊息"

17976

@@ -17925,7 +18035,7 @@ msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n"

18035 msgid "unable to checkout submodule '%s'"

18036 msgstr "無法簽出「%s」子模組"

18037

17928 -#: builtin/submodule--helper.c builtin/submodule--helper.c

18038 +#: builtin/submodule--helper.c

18039 msgid "please make sure that the .gitmodules file is in the working tree"

18040 msgstr "請確認 .gitmodules 檔案在工作區裡"

18041

@@ -17934,7 +18044,6 @@ msgstr "請確認 .gitmodules 檔案在工作區裡"

18044 msgid "Failed to add submodule '%s'"

18045 msgstr "無法加入子模組「%s」"

18046

17937 -#: builtin/submodule--helper.c builtin/submodule--helper.c

18047 #: builtin/submodule--helper.c

18048 #, c-format

18049 msgid "Failed to register submodule '%s'"

@@ -18128,7 +18237,7 @@ msgstr "壞的物件類型。"

18237 msgid "no tag message?"

18238 msgstr "無標籤說明？"

18239

18131 -#: builtin/tag.c builtin/tag.c

18240 +#: builtin/tag.c

18241 #, c-format

18242 msgid "The tag message has been left in %s\n"

18243 msgstr "標籤說明被保留在 %s\n"

@@ -18189,11 +18298,11 @@ msgstr "標籤列表選項"

18298 msgid "show tag list in columns"

18299 msgstr "以列的方式顯示標籤列表"

18300

18192 -#: builtin/tag.c builtin/tag.c

18301 +#: builtin/tag.c

18302 msgid "print only tags that contain the commit"

18303 msgstr "只列印包含該提交的標籤"

18304

18196 -#: builtin/tag.c builtin/tag.c

18305 +#: builtin/tag.c

18306 msgid "print only tags that don't contain the commit"

18307 msgstr "只列印不包含該提交的標籤"

18308

@@ -18269,7 +18378,7 @@ msgstr "建立目錄 %s 失敗"

18378 msgid "failed to delete file %s"

18379 msgstr "刪除檔案 %s 失敗"

18380

18272 -#: builtin/update-index.c builtin/update-index.c

18381 +#: builtin/update-index.c

18382 #, c-format

18383 msgid "failed to delete directory %s"

18384 msgstr "刪除目錄 %s 失敗"

@@ -18575,6 +18684,18 @@ msgstr "如果 <目錄> 不是一個 Git 目錄，不要嘗試 <目錄>/.git/"

18684 msgid "interrupt transfer after <n> seconds of inactivity"

18685 msgstr "不活動 <n> 秒鐘後終止傳輸"

18686

18687 +#: builtin/url-parse.c

18688 +msgid "git url-parse [-c <component>] [--] <url>..."

18689 +msgstr "git url-parse [-c <component>] [--] <url>..."

18690 +

18691 +#: builtin/url-parse.c

18692 +msgid "component"

18693 +msgstr "component"

18694 +

18695 +#: builtin/url-parse.c

18696 +msgid "which URL component to extract"

18697 +msgstr "要提出的 URL 部件"

18698 +

18699 #: builtin/verify-commit.c

18700 msgid "git verify-commit [-v | --verbose] [--raw] <commit>..."

18701 msgstr "git verify-commit [-v | --verbose] [--raw] <commit>..."

@@ -18728,7 +18849,7 @@ msgstr "將「%s」複製至「%s」失敗；稀疏簽出可能無法正常運

18849 msgid "failed to copy worktree config from '%s' to '%s'"

18850 msgstr "將工作區組態從「%s」複製至「%s」失敗"

18851

18731 -#: builtin/worktree.c builtin/worktree.c

18852 +#: builtin/worktree.c

18853 #, c-format

18854 msgid "failed to unset '%s' in '%s'"

18855 msgstr "無法取消「%2$s」中「%1$s」的設定"

@@ -18747,7 +18868,7 @@ msgstr "正在初始化"

18868 msgid "could not find created worktree '%s'"

18869 msgstr "找不到建立的工作區「%s」"

18870

18750 -#: builtin/worktree.c builtin/worktree.c

18871 +#: builtin/worktree.c

18872 #, c-format

18873 msgid "Preparing worktree (new branch '%s')"

18874 msgstr "準備工作區（新分支 '%s'）"

@@ -18803,7 +18924,7 @@ msgstr "生成新的工作區"

18924 msgid "keep the new working tree locked"

18925 msgstr "鎖定新工作區"

18926

18806 -#: builtin/worktree.c builtin/worktree.c

18927 +#: builtin/worktree.c

18928 msgid "reason for locking"

18929 msgstr "鎖定原因"

18930

@@ -18815,7 +18936,7 @@ msgstr "設定追蹤模式（參見 git-branch(1)）"

18936 msgid "try to match the new branch name with a remote-tracking branch"

18937 msgstr "嘗試為新分支名符合一個遠端追蹤分支"

18938

18818 -#: builtin/worktree.c builtin/worktree.c builtin/worktree.c

18939 +#: builtin/worktree.c

18940 msgid "use relative paths for worktrees"

18941 msgstr "對工作區使用相對路徑"

18942

@@ -18849,13 +18970,12 @@ msgstr "對舊於 <time> 的遺失工作區加上「prunable」標示"

18970 msgid "terminate records with a NUL character"

18971 msgstr "以一個 NUL 字元終止記錄"

18972

18852 -#: builtin/worktree.c builtin/worktree.c builtin/worktree.c

18973 #: builtin/worktree.c

18974 #, c-format

18975 msgid "'%s' is not a working tree"

18976 msgstr "'%s' 不是一個工作區"

18977

18858 -#: builtin/worktree.c builtin/worktree.c

18978 +#: builtin/worktree.c

18979 msgid "The main working tree cannot be locked or unlocked"

18980 msgstr "主工作區無法被加鎖或解鎖"

18981

@@ -18882,7 +19002,7 @@ msgstr "不能移動或刪除包含子模組的工作區"

19002 msgid "force move even if worktree is dirty or locked"

19003 msgstr "強制移動，即使工作區是髒的或已鎖定"

19004

18885 -#: builtin/worktree.c builtin/worktree.c

19005 +#: builtin/worktree.c

19006 #, c-format

19007 msgid "'%s' is a main working tree"

19008 msgstr "'%s' 是一個主工作區"

@@ -19433,6 +19553,10 @@ msgstr "在列表中的版本庫中執行 Git 命令"

19553 msgid "Prepare patches for e-mail submission"

19554 msgstr "準備電子信件提交的修補檔"

19555

19556 +#: command-list.h

19557 +msgid "EXPERIMENTAL: Pretty format revisions on demand"

19558 +msgstr "實驗性：按需美化修訂集"

19559 +

19560 #: command-list.h

19561 msgid "Verifies the connectivity and validity of the objects in the database"

19562 msgstr "驗證版本庫中物件的連通性和有效性"

@@ -19466,8 +19590,8 @@ msgid "EXPERIMENTAL: Rewrite history"

19590 msgstr "實驗性：重寫歷史記錄"

19591

19592 #: command-list.h

19469 -msgid "Run git hooks"

19470 -msgstr "執行 git 掛鉤"

19593 +msgid "Run Git hooks"

19594 +msgstr "執行 Git 掛鉤"

19595

19596 #: command-list.h

19597 msgid "Server side implementation of Git over HTTP"

@@ -19723,8 +19847,8 @@ msgid "Restricted login shell for Git-only SSH access"

19847 msgstr "只允許 Git SSH 存取的受限登入shell"

19848

19849 #: command-list.h

19726 -msgid "Summarize 'git log' output"

19727 -msgstr "'git log' 輸出摘要"

19850 +msgid "Summarize `git log` output"

19851 +msgstr "總結「git log」輸出"

19852

19853 #: command-list.h

19854 msgid "Show various types of objects"

@@ -19811,6 +19935,10 @@ msgstr "將存檔傳送回 git-archive"

19935 msgid "Send objects packed back to git-fetch-pack"

19936 msgstr "將物件壓縮包傳送回 git-fetch-pack"

19937

19938 +#: command-list.h

19939 +msgid "Parse and extract git URL components"

19940 +msgstr "解析並提出 git URL 部件"

19941 +

19942 #: command-list.h

19943 msgid "Show a Git logical variable"

19944 msgstr "顯示 Git 邏輯變數"

@@ -20087,7 +20215,7 @@ msgstr "無效的提交圖鏈：「%s」列不是雜湊值"

20215 msgid "unable to find all commit-graph files"

20216 msgstr "無法找到所有提交圖檔案"

20217

20090 -#: commit-graph.c commit-graph.c

20218 +#: commit-graph.c

20219 msgid "invalid commit position. commit-graph is likely corrupt"

20220 msgstr "無效的提交位置。提交圖可能已損壞"

20221

@@ -20233,7 +20361,7 @@ msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"

20361 msgid "commit-graph has incorrect OID order: %s then %s"

20362 msgstr "提交圖的物件 ID 順序不正確：%s 然後 %s"

20363

20236 -#: commit-graph.c commit-graph.c

20364 +#: commit-graph.c

20365 #, c-format

20366 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

20367 msgstr "提交圖有不正確的扇出值：fanout[%d] = %u != %u"

@@ -20256,17 +20384,17 @@ msgstr "提交圖中的提交 %s 的根樹狀物件 ID 是 %s != %s"

20384 #: commit-graph.c

20385 #, c-format

20386 msgid "commit-graph parent list for commit %s is too long"

20259 -msgstr "提交 %s 的提交圖上級清單過長"

20387 +msgstr "提交 %s 的提交圖親代清單過長"

20388

20389 #: commit-graph.c

20390 #, c-format

20391 msgid "commit-graph parent for %s is %s != %s"

20264 -msgstr "%s 的提交圖上級是 %s != %s"

20392 +msgstr "%s 的提交圖親代是 %s != %s"

20393

20394 #: commit-graph.c

20395 #, c-format

20396 msgid "commit-graph parent list for commit %s terminates early"

20269 -msgstr "提交 %s 的提交圖上級清單過早終止"

20397 +msgstr "提交 %s 的提交圖親代清單過早終止"

20398

20399 #: commit-graph.c

20400 #, c-format

@@ -20289,8 +20417,7 @@ msgstr "提交圖中包含 0 和非 0 兩個世代數（例如提交「%s」和

20417 msgid "Verifying commits in commit graph"

20418 msgstr "正在驗證提交圖中的提交"

20419

20292 -#: commit-reach.c commit-reach.c commit-reach.c sequencer.c

20293 -#: sequencer.c

20420 +#: commit-reach.c sequencer.c

20421 #, c-format

20422 msgid "could not parse commit %s"

20423 msgstr "無法解析提交 %s"

@@ -20368,7 +20495,7 @@ msgstr "沒有可用的編譯器資訊\n"

20495 msgid "no libc information available\n"

20496 msgstr "沒有可用的 libc 資訊\n"

20497

20371 -#: compat/disk.h compat/disk.h

20498 +#: compat/disk.h

20499 #, c-format

20500 msgid "could not determine free disk size for '%s'"

20501 msgstr "無法判斷「%s」的剩餘磁碟大小"

@@ -20388,8 +20515,7 @@ msgstr "[GLE %ld] 健康監聽執行緒無法開啟「%ls」"

20515 msgid "[GLE %ld] health thread getting BHFI for '%ls'"

20516 msgstr "[GLE %ld] 健康監聽執行緒取得「%ls」的 BHFI"

20517

20391 -#: compat/fsmonitor/fsm-health-win32.c

20392 -#: compat/fsmonitor/fsm-listen-win32.c

20518 +#: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c

20519 #, c-format

20520 msgid "could not convert to wide characters: '%s'"

20521 msgstr "無法轉換至較寬字元：「%s」"

@@ -20409,7 +20535,7 @@ msgstr "「has_worktree_moved」中有未處置的情況：%d"

20535 msgid "health thread wait failed [GLE %ld]"

20536 msgstr "健康監聽執行緒等待失敗 [GLE %ld]"

20537

20412 -#: compat/fsmonitor/fsm-ipc-darwin.c

20538 +#: compat/fsmonitor/fsm-ipc-unix.c

20539 #, c-format

20540 msgid "Invalid path: %s"

20541 msgstr "無效路徑：%s"

@@ -20422,6 +20548,50 @@ msgstr "無法建立 FSEventStream。"

20548 msgid "Failed to start the FSEventStream"

20549 msgstr "無法啟動 FSEventStream"

20550

20551 +#: compat/fsmonitor/fsm-listen-linux.c

20552 +msgid "inotify watch limit reached; increase fs.inotify.max_user_watches"

20553 +msgstr "達到 inotify 監看上限；請提高 fs.inotify.max_user_watches"

20554 +

20555 +#: compat/fsmonitor/fsm-listen-linux.c

20556 +#, c-format

20557 +msgid "inotify_add_watch('%s') failed"

20558 +msgstr "inotify_add_watch('%s') 失敗"

20559 +

20560 +#: compat/fsmonitor/fsm-listen-linux.c

20561 +msgid "inotify_rm_watch() failed"

20562 +msgstr "inotify_rm_watch() 失敗"

20563 +

20564 +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c

20565 +#, c-format

20566 +msgid "opendir('%s') failed"

20567 +msgstr "opendir('%s') 失敗"

20568 +

20569 +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c

20570 +#, c-format

20571 +msgid "lstat('%s') failed"

20572 +msgstr "lstat('%s') 失敗"

20573 +

20574 +#: compat/fsmonitor/fsm-listen-linux.c compat/fsmonitor/fsm-path-utils-darwin.c

20575 +#, c-format

20576 +msgid "closedir('%s') failed"

20577 +msgstr "closedir('%s') 失敗"

20578 +

20579 +#: compat/fsmonitor/fsm-listen-linux.c

20580 +msgid "inotify_init1() failed"

20581 +msgstr "inotify_init1() 失敗"

20582 +

20583 +#: compat/fsmonitor/fsm-listen-linux.c

20584 +msgid "closing inotify file descriptor failed"

20585 +msgstr "關閉 inotify 檔案描述子失敗"

20586 +

20587 +#: compat/fsmonitor/fsm-listen-linux.c

20588 +msgid "reading inotify message stream failed"

20589 +msgstr "讀取 inotify 訊息流失敗"

20590 +

20591 +#: compat/fsmonitor/fsm-listen-linux.c

20592 +msgid "polling inotify message stream failed"

20593 +msgstr "輪詢 inotify 訊息流失敗"

20594 +

20595 #: compat/fsmonitor/fsm-listen-win32.c

20596 #, c-format

20597 msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'"

@@ -20452,26 +20622,11 @@ msgstr "在「%s」上呼叫 GetOverlappedResult 失敗 [GLE %ld]"

20622 msgid "could not read directory changes [GLE %ld]"

20623 msgstr "無法讀取目錄變化 [GLE %ld]"

20624

20455 -#: compat/fsmonitor/fsm-path-utils-darwin.c

20456 -#, c-format

20457 -msgid "opendir('%s') failed"

20458 -msgstr "opendir('%s') 失敗"

20459 -

20460 -#: compat/fsmonitor/fsm-path-utils-darwin.c

20461 -#, c-format

20462 -msgid "lstat('%s') failed"

20463 -msgstr "lstat('%s') 失敗"

20464 -

20625 #: compat/fsmonitor/fsm-path-utils-darwin.c

20626 #, c-format

20627 msgid "strbuf_readlink('%s') failed"

20628 msgstr "strbuf_readlink('%s') 失敗"

20629

20470 -#: compat/fsmonitor/fsm-path-utils-darwin.c

20471 -#, c-format

20472 -msgid "closedir('%s') failed"

20473 -msgstr "closedir('%s') 失敗"

20474 -

20630 #: compat/fsmonitor/fsm-path-utils-win32.c

20631 #, c-format

20632 msgid "[GLE %ld] unable to open for read '%ls'"

@@ -20492,7 +20647,7 @@ msgstr "複製 SID 失敗（%ld）"

20647 msgid "failed to get owner for '%s' (%ld)"

20648 msgstr "無法取得「%s」的所有者 (%ld)"

20649

20495 -#: compat/obstack.c compat/obstack.c

20650 +#: compat/obstack.c

20651 msgid "memory exhausted"

20652 msgstr "記憶體耗盡"

20653

@@ -20689,12 +20844,12 @@ msgstr "無效鍵名（有換行符號）：%s"

20844 msgid "empty config key"

20845 msgstr "空白設定鍵"

20846

20692 -#: config.c config.c

20847 +#: config.c

20848 #, c-format

20849 msgid "bogus config parameter: %s"

20850 msgstr "偽設定參數：%s"

20851

20697 -#: config.c config.c config.c config.c

20852 +#: config.c

20853 #, c-format

20854 msgid "bogus format in %s"

20855 msgstr "%s 中格式錯誤"

@@ -20907,7 +21062,7 @@ msgstr "寫入新的設定檔案 %s 失敗"

21062 msgid "no multi-line comment allowed: '%s'"

21063 msgstr "不允許多列備註：「%s」"

21064

20910 -#: config.c config.c

21065 +#: config.c

21066 #, c-format

21067 msgid "could not lock config file %s"

21068 msgstr "無法鎖定組態檔案 %s"

@@ -20922,7 +21077,7 @@ msgstr "開啟 %s"

21077 msgid "invalid config file %s"

21078 msgstr "無效的設定檔案 %s"

21079

20925 -#: config.c config.c

21080 +#: config.c

21081 #, c-format

21082 msgid "fstat on %s failed"

21083 msgstr "對 %s 呼叫 fstat 失敗"

@@ -20932,12 +21087,12 @@ msgstr "對 %s 呼叫 fstat 失敗"

21087 msgid "unable to mmap '%s'%s"

21088 msgstr "無法 mmap '%s'%s"

21089

20935 -#: config.c config.c

21090 +#: config.c

21091 #, c-format

21092 msgid "chmod on %s failed"

21093 msgstr "對 %s 呼叫 chmod 失敗"

21094

20940 -#: config.c config.c

21095 +#: config.c

21096 #, c-format

21097 msgid "could not write config file %s"

21098 msgstr "無法寫入組態檔案 %s"

@@ -21032,7 +21187,7 @@ msgstr "在 bundle-uri 回應的第 %d 列發現錯誤：%s"

21187 msgid "expected flush after bundle-uri listing"

21188 msgstr "在 bundle-uri 清單後應該有一個 flush 包"

21189

21035 -#: connect.c connect.c

21190 +#: connect.c

21191 msgid "expected response end packet after ref listing"

21192 msgstr "在引用列表後預期要有回應結束封包"

21193

@@ -21045,16 +21200,11 @@ msgstr "無效的 ls-refs 回應：%s"

21200 msgid "expected flush after ref listing"

21201 msgstr "在引用列表之後應該有一個 flush 包"

21202

21048 -#: connect.c

21049 -#, c-format

21050 -msgid "protocol '%s' is not supported"

21051 -msgstr "不支援 '%s' 協定"

21052 -

21203 #: connect.c

21204 msgid "unable to set SO_KEEPALIVE on socket"

21205 msgstr "無法為 socket 設定 SO_KEEPALIVE"

21206

21057 -#: connect.c connect.c

21207 +#: connect.c

21208 #, c-format

21209 msgid "Looking up %s ... "

21210 msgstr "尋找 %s ... "

@@ -21065,7 +21215,7 @@ msgid "unable to look up %s (port %s) (%s)"

21215 msgstr "無法尋找 %s（埠 %s）（%s）"

21216

21217 #. TRANSLATORS: this is the end of "Looking up %s ... "

21068 -#: connect.c connect.c

21218 +#: connect.c

21219 #, c-format

21220 msgid ""

21221 "done.\n"

@@ -21074,7 +21224,7 @@ msgstr ""

21224 "完成。\n"

21225 "連線到 %s（埠 %s）... "

21226

21077 -#: connect.c connect.c

21227 +#: connect.c

21228 #, c-format

21229 msgid ""

21230 "unable to connect to %s:\n"

@@ -21084,7 +21234,7 @@ msgstr ""

21234 "%s"

21235

21236 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

21087 -#: connect.c connect.c

21237 +#: connect.c

21238 msgid "done."

21239 msgstr "完成。"

21240

@@ -21098,7 +21248,7 @@ msgstr "無法尋找 %s（%s）"

21248 msgid "unknown port %s"

21249 msgstr "未知埠 %s"

21250

21101 -#: connect.c connect.c

21251 +#: connect.c

21252 #, c-format

21253 msgid "strange hostname '%s' blocked"

21254 msgstr "已阻止奇怪的主機名稱 '%s'"

@@ -21113,6 +21263,11 @@ msgstr "已阻止奇怪的埠號 '%s'"

21263 msgid "cannot start proxy %s"

21264 msgstr "不能啟動代理 %s"

21265

21266 +#: connect.c

21267 +#, c-format

21268 +msgid "protocol '%s' is not supported"

21269 +msgstr "不支援 '%s' 協定"

21270 +

21271 #: connect.c

21272 msgid "no path specified; see 'git help pull' for valid url syntax"

21273 msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"

@@ -21209,7 +21364,7 @@ msgstr ""

21364 "檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於"

21365 "字節序）作為工作區編碼。"

21366

21212 -#: convert.c convert.c

21367 +#: convert.c

21368 #, c-format

21369 msgid "failed to encode '%s' from %s to %s"

21370 msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼"

@@ -21234,12 +21389,12 @@ msgstr "不能將輸入傳遞給外部過濾器 '%s'"

21389 msgid "external filter '%s' failed %d"

21390 msgstr "外部過濾器 '%s' 失敗碼 %d"

21391

21237 -#: convert.c convert.c

21392 +#: convert.c

21393 #, c-format

21394 msgid "read from external filter '%s' failed"

21395 msgstr "從外部過濾器 '%s' 讀取失敗"

21396

21242 -#: convert.c convert.c

21397 +#: convert.c

21398 #, c-format

21399 msgid "external filter '%s' failed"

21400 msgstr "外部過濾器 '%s' 失敗"

@@ -21263,7 +21418,7 @@ msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾"

21418 msgid "true/false are no valid working-tree-encodings"

21419 msgstr "true/false 不是有效的工作區編碼"

21420

21266 -#: convert.c convert.c

21421 +#: convert.c

21422 #, c-format

21423 msgid "%s: clean filter '%s' failed"

21424 msgstr "%s：clean 過濾器 '%s' 失敗"

@@ -21369,7 +21524,7 @@ msgid "%s, %<PRIuMAX> month ago"

21524 msgid_plural "%s, %<PRIuMAX> months ago"

21525 msgstr[0] "%s %<PRIuMAX> 個月前"

21526

21372 -#: date.c date.c

21527 +#: date.c

21528 #, c-format

21529 msgid "%<PRIuMAX> year ago"

21530 msgid_plural "%<PRIuMAX> years ago"

@@ -21564,8 +21719,7 @@ msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「

21719 msgid "invalid --stat value: %s"

21720 msgstr "無效的 --stat 值：%s"

21721

21567 -#: diff.c diff.c diff.c diff.c diff.c

21568 -#: parse-options.c parse-options.c

21722 +#: diff.c parse-options.c

21723 #, c-format

21724 msgid "%s expects a numerical value"

21725 msgstr "%s 期望一個數字值"

@@ -21598,7 +21752,7 @@ msgstr "--find-object 需要一個 git 版本庫"

21752 msgid "unable to resolve '%s'"

21753 msgstr "不能解析 '%s'"

21754

21601 -#: diff.c diff.c

21755 +#: diff.c

21756 #, c-format

21757 msgid "%s expects <n>/<m> form"

21758 msgstr "%s 期望 <n>/<m> 格式"

@@ -21618,7 +21772,7 @@ msgstr "壞的 --color-moved 參數：%s"

21772 msgid "invalid mode '%s' in --color-moved-ws"

21773 msgstr "--color-moved-ws 中的無效模式 '%s'"

21774

21621 -#: diff.c diff.c

21775 +#: diff.c

21776 #, c-format

21777 msgid "invalid argument to %s"

21778 msgstr "%s 的參數無效"

@@ -21641,6 +21795,11 @@ msgstr "-S 需要非空白引數"

21795 msgid "failed to parse --submodule option parameter: '%s'"

21796 msgstr "無法解析 --submodule 選項的參數：'%s'"

21797

21798 +#: diff.c

21799 +#, c-format

21800 +msgid "%s expects a non-negative integer"

21801 +msgstr "%s 預期非負整數"

21802 +

21803 #: diff.c

21804 #, c-format

21805 msgid "bad --word-diff argument: %s"

@@ -21650,15 +21809,15 @@ msgstr "壞的 --word-diff 參數：%s"

21809 msgid "Diff output format options"

21810 msgstr "差異輸出格式化選項"

21811

21653 -#: diff.c diff.c

21812 +#: diff.c

21813 msgid "generate patch"

21814 msgstr "生成修補檔"

21815

21657 -#: diff.c diff.c diff.c

21816 +#: diff.c

21817 msgid "<n>"

21818 msgstr "<n>"

21819

21661 -#: diff.c diff.c parse-options.h

21820 +#: diff.c parse-options.h

21821 msgid "generate diffs with <n> lines context"

21822 msgstr "生成含 <n> 行上下文的差異"

21823

@@ -21682,7 +21841,7 @@ msgstr "機器友好的 --stat"

21841 msgid "output only the last line of --stat"

21842 msgstr "只輸出 --stat 的最後一行"

21843

21685 -#: diff.c diff.c

21844 +#: diff.c

21845 msgid "<param1>,<param2>..."

21846 msgstr "<param1>,<param2>..."

21847

@@ -21723,7 +21882,7 @@ msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"

21882 msgid "generate diffstat"

21883 msgstr "生成差異統計（diffstat）"

21884

21726 -#: diff.c diff.c diff.c

21885 +#: diff.c

21886 msgid "<width>"

21887 msgstr "<寬度>"

21888

@@ -21781,7 +21940,7 @@ msgstr ""

21940 "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"

21941 "符"

21942

21784 -#: diff.c diff.c diff.c diff.c

21943 +#: diff.c

21944 msgid "<prefix>"

21945 msgstr "<前綴>"

21946

@@ -21809,7 +21968,7 @@ msgstr "使用預設的前置名稱 a/ 和 b/"

21968 msgid "show context between diff hunks up to the specified number of lines"

21969 msgstr "顯示指定行數的差異區塊間的上下文"

21970

21812 -#: diff.c diff.c diff.c

21971 +#: diff.c

21972 msgid "<char>"

21973 msgstr "<字元>"

21974

@@ -21899,7 +22058,7 @@ msgstr "忽略行尾的Enter符（CR）"

22058 msgid "ignore changes whose lines are all blank"

22059 msgstr "忽略整行都是空白的變更"

22060

21902 -#: diff.c diff.c diff.c diff.c

22061 +#: diff.c

22062 msgid "<regex>"

22063 msgstr "<正則>"

22064

@@ -21927,7 +22086,7 @@ msgstr "<文字>"

22086 msgid "generate diff using the \"anchored diff\" algorithm"

22087 msgstr "使用 \"anchored diff\" 演算法生成差異"

22088

21930 -#: diff.c diff.c diff.c

22089 +#: diff.c

22090 msgid "<mode>"

22091 msgstr "<模式>"

22092

@@ -22035,7 +22194,7 @@ msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式"

22194 msgid "control the order in which files appear in the output"

22195 msgstr "控制輸出中的檔案顯示順序"

22196

22038 -#: diff.c diff.c

22197 +#: diff.c

22198 msgid "<path>"

22199 msgstr "<路徑>"

22200

@@ -22110,12 +22269,12 @@ msgstr "diff 中沒有「%s」路徑"

22269 msgid "pathspec '%s' did not match any file(s) known to git"

22270 msgstr "路徑規格 '%s' 未符合任何 git 已知檔案"

22271

22113 -#: dir.c dir.c dir.c dir.c

22272 +#: dir.c

22273 #, c-format

22274 msgid "unrecognized pattern: '%s'"

22275 msgstr "不認識樣式：「%s」"

22276

22118 -#: dir.c dir.c

22277 +#: dir.c

22278 #, c-format

22279 msgid "unrecognized negative pattern: '%s'"

22280 msgstr "不認識反向模式：「%s」"

@@ -22142,7 +22301,7 @@ msgstr "無法獲得核心名稱和訊息"

22301 msgid "untracked cache is disabled on this system or location"

22302 msgstr "快取未追蹤檔案在本系統或位置中被停用"

22303

22145 -#: dir.c dir.c

22304 +#: dir.c

22305 msgid ""

22306 "No directory name could be guessed.\n"

22307 "Please specify a directory on the command line"

@@ -22155,7 +22314,7 @@ msgstr ""

22314 msgid "index file corrupt in repo %s"

22315 msgstr "版本庫 %s 中的索引檔案損壞"

22316

22158 -#: dir.c dir.c

22317 +#: dir.c

22318 #, c-format

22319 msgid "could not create directories for %s"

22320 msgstr "無法建立 %s 的目錄"

@@ -22170,8 +22329,7 @@ msgstr "無法從「%s」遷移 git 目錄到「%s」"

22329 msgid "hint: Waiting for your editor to close the file...%c"

22330 msgstr "提示：等待您的編輯器關閉檔案...%c"

22331

22173 -#: editor.c sequencer.c sequencer.c sequencer.c

22174 -#: sequencer.c sequencer.c wrapper.c

22332 +#: editor.c sequencer.c wrapper.c

22333 #, c-format

22334 msgid "could not write to '%s'"

22335 msgstr "無法寫入「%s」"

@@ -22210,7 +22368,7 @@ msgstr "忽略未知的 core.fsync 元件「%s」"

22368 msgid "abbrev length out of range: %d"

22369 msgstr "縮寫長度超出範圍：%d"

22370

22213 -#: environment.c environment.c

22371 +#: environment.c

22372 #, c-format

22373 msgid "bad zlib compression level %d"

22374 msgstr "錯誤的 zlib 壓縮級別 %d"

@@ -22300,27 +22458,27 @@ msgstr "無法寫到遠端"

22458 msgid "Server supports filter"

22459 msgstr "伺服器支援 filter"

22460

22303 -#: fetch-pack.c fetch-pack.c

22461 +#: fetch-pack.c

22462 #, c-format

22463 msgid "invalid shallow line: %s"

22464 msgstr "無效的 shallow 訊息：%s"

22465

22308 -#: fetch-pack.c fetch-pack.c

22466 +#: fetch-pack.c

22467 #, c-format

22468 msgid "invalid unshallow line: %s"

22469 msgstr "無效的 unshallow 訊息：%s"

22470

22313 -#: fetch-pack.c fetch-pack.c

22471 +#: fetch-pack.c

22472 #, c-format

22473 msgid "error in object: %s"

22474 msgstr "物件中發生錯誤：%s"

22475

22318 -#: fetch-pack.c fetch-pack.c

22476 +#: fetch-pack.c

22477 #, c-format

22478 msgid "no shallow found: %s"

22479 msgstr "未發現 shallow：%s"

22480

22323 -#: fetch-pack.c fetch-pack.c

22481 +#: fetch-pack.c

22482 #, c-format

22483 msgid "expected shallow/unshallow, got %s"

22484 msgstr "應為 shallow/unshallow，卻得到 %s"

@@ -22389,10 +22547,7 @@ msgstr "sideband 多路輸出發生錯誤"

22547 msgid "Server version is %.*s"

22548 msgstr "伺服器版本 %.*s"

22549

22392 -#: fetch-pack.c fetch-pack.c fetch-pack.c fetch-pack.c

22393 -#: fetch-pack.c fetch-pack.c fetch-pack.c fetch-pack.c

22394 -#: fetch-pack.c fetch-pack.c fetch-pack.c fetch-pack.c

22395 -#: fetch-pack.c fetch-pack.c fetch-pack.c fetch-pack.c

22550 +#: fetch-pack.c

22551 #, c-format

22552 msgid "Server supports %s"

22553 msgstr "伺服器支援 %s"

@@ -22421,7 +22576,7 @@ msgstr "伺服器不支援此版本庫的物件格式"

22576 msgid "no common commits"

22577 msgstr "沒有共同的提交"

22578

22424 -#: fetch-pack.c fetch-pack.c

22579 +#: fetch-pack.c

22580 msgid "git fetch-pack: fetch failed."

22581 msgstr "git fetch-pack：取得失敗。"

22582

@@ -22439,7 +22594,7 @@ msgstr "伺服器不支援「%s」算法"

22594 msgid "Server does not support shallow requests"

22595 msgstr "伺服器不支援 shallow 請求"

22596

22442 -#: fetch-pack.c fetch-pack.c

22597 +#: fetch-pack.c

22598 msgid "unable to write request to remote"

22599 msgstr "無法將請求寫到遠端"

22600

@@ -22609,7 +22764,7 @@ msgstr ""

22764 msgid "unsupported command listing type '%s'"

22765 msgstr "不支援的命令列表類型 '%s'"

22766

22612 -#: git.c git.c git.c

22767 +#: git.c

22768 #, c-format

22769 msgid "no directory given for '%s' option\n"

22770 msgstr "未傳入目錄至「%s」選項\n"

@@ -22704,12 +22859,11 @@ msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n"

22859 msgid "failed to run command '%s': %s\n"

22860 msgstr "執行指令 '%s' 失敗：%s\n"

22861

22707 -#: gpg-interface.c gpg-interface.c gpg-interface.c

22862 #: gpg-interface.c

22863 msgid "could not create temporary file"

22864 msgstr "無法建立暫存檔"

22865

22712 -#: gpg-interface.c gpg-interface.c

22866 +#: gpg-interface.c

22867 #, c-format

22868 msgid "failed writing detached signature to '%s'"

22869 msgstr "無法將分離式簽名寫入 '%s'"

@@ -22743,7 +22897,7 @@ msgstr "簽名「%s」損壞或者不相容"

22897 msgid "failed to get the ssh fingerprint for key '%s'"

22898 msgstr "無法取得「%s」金鑰的 SSH 指紋"

22899

22746 -#: gpg-interface.c gpg-interface.c

22900 +#: gpg-interface.c

22901 #, c-format

22902 msgid "failed to get the ssh fingerprint for key %s"

22903 msgstr "無法取得 %s 金鑰的 SSH 指紋"

@@ -22931,7 +23085,7 @@ msgstr ""

23085 "「%s」似乎是 git 命令，但卻無法執行。\n"

23086 "可能是 git-%s 受損？"

23087

22934 -#: help.c help.c

23088 +#: help.c

23089 #, c-format

23090 msgid "git: '%s' is not a git command. See 'git --help'."

23091 msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。"

@@ -23000,6 +23154,55 @@ msgstr ""

23154 "因為沒有將掛鉤「%s」設定為可執行，因此忽略這個掛鉤。\n"

23155 "您可以透過設定「git config set advice.ignoredHook false」來關閉這則警告。"

23156

23157 +#: hook.c

23158 +#, c-format

23159 +msgid "hook.jobs must be an integer, ignoring: '%s'"

23160 +msgstr "hook.jobs 必須是整數，忽略之：「%s」"

23161 +

23162 +#: hook.c

23163 +#, c-format

23164 +msgid "hook.jobs must be a positive integer or -1, ignoring: '%s'"

23165 +msgstr "hook.jobs 必須是正整數或 -1，忽略之：「%s」"

23166 +

23167 +#: hook.c

23168 +#, c-format

23169 +msgid ""

23170 +"hook friendly-name '%s' collides with a known event name; please choose a "

23171 +"different friendly-name"

23172 +msgstr "掛鉤的可讀名稱「%s」與既有事件名稱重複；請選擇不同的可讀名稱"

23173 +

23174 +#: hook.c

23175 +#, c-format

23176 +msgid ""

23177 +"hook friendly-name '%s' is the same as its event; this may cause ambiguity "

23178 +"with hook.%s.enabled"

23179 +msgstr "掛鉤的可讀名稱「%s」與其事件相同；這可能導致 hook.%s.enabled 有歧義"

23180 +

23181 +#: hook.c

23182 +#, c-format

23183 +msgid "hook.%s.parallel must be a boolean, ignoring: '%s'"

23184 +msgstr "hook.%s.parallel 必須是布林值，忽略之：「%s」"

23185 +

23186 +#: hook.c

23187 +#, c-format

23188 +msgid "hook.%s.jobs must be an integer, ignoring: '%s'"

23189 +msgstr "hook.%s.jobs 必須是整數，忽略之：「%s」"

23190 +

23191 +#: hook.c

23192 +#, c-format

23193 +msgid "hook.%s.jobs must be a positive integer or -1, ignoring: '%s'"

23194 +msgstr "hook.%s.jobs 必須是正整數或 -1，忽略之：「%s」"

23195 +

23196 +#: hook.c

23197 +#, c-format

23198 +msgid ""

23199 +"hook.%s.jobs is set but '%s' looks like a hook friendly-name, not an event "

23200 +"name; hook.<event>.jobs uses the event name (e.g. hook.post-receive.jobs), "

23201 +"so this setting will be ignored"

23202 +msgstr ""

23203 +"設定了 hook.%s.jobs，但「%s」似乎是掛鉤的可讀名稱，而非事件名稱；hook.<事件"

23204 +">.jobs 使用事件名稱（如 hook.post-receive.jobs），所以將忽略此設定"

23205 +

23206 #: hook.c

23207 #, c-format

23208 msgid "disabled hook '%s' has no command configured"

@@ -23012,7 +23215,19 @@ msgid ""

23215 "aborting."

23216 msgstr "必須設定「hook.%s.command」或移除「hook.%s.event」，中止。"

23217

23015 -#: http-fetch.c http-fetch.c

23218 +#: hook.c

23219 +#, c-format

23220 +msgid ""

23221 +"hook '%s' is not marked as parallel=true, running in parallel anyway due to "

23222 +"-j%u"

23223 +msgstr "掛鉤「%s」並未標記為 parallel=true，因 -j%u 將依然平行執行"

23224 +

23225 +#: hook.c

23226 +#, c-format

23227 +msgid "%s must be a positive integer or -1, ignoring: %d"

23228 +msgstr "%s 必須是正整數或 -1，忽略之：%d"

23229 +

23230 +#: http-fetch.c

23231 msgid "not a git repository"

23232 msgstr "不是一個 git 版本庫"

23233

@@ -23034,7 +23249,7 @@ msgstr "不支援委託控制，因為 cURL < 7.22.0"

23249 msgid "Unknown value for http.proactiveauth"

23250 msgstr "http.proactiveauth 的值未知"

23251

23037 -#: http.c http.c parse.c

23252 +#: http.c parse.c

23253 #, c-format

23254 msgid "failed to parse %s"

23255 msgstr "解析 %s 失敗"

@@ -23226,7 +23441,7 @@ msgstr "期望在組合後有一些東西："

23441 msgid "multiple filter-specs cannot be combined"

23442 msgstr "不能混用多種過濾規格"

23443

23229 -#: list-objects-filter-options.c list-objects-filter-options.c

23444 +#: list-objects-filter-options.c

23445 msgid "an 'auto' filter is incompatible with any other filter"

23446 msgstr "「auto」過濾器與其他過濾器均不相容"

23447

@@ -23242,7 +23457,7 @@ msgstr "參數"

23457 msgid "object filtering"

23458 msgstr "物件過濾"

23459

23245 -#: list-objects-filter.c

23460 +#: list-objects-filter.c path-walk.c

23461 #, c-format

23462 msgid "unable to access sparse blob in '%s'"

23463 msgstr "不能存取 '%s' 中的稀疏資料物件"

@@ -23324,7 +23539,7 @@ msgstr "無法建立暫存物件目錄"

23539 msgid "could not write loose object index %s"

23540 msgstr "無法寫入鬆散物件索引 %s"

23541

23327 -#: loose.c loose.c

23542 +#: loose.c

23543 #, c-format

23544 msgid "failed to write loose object index %s"

23545 msgstr "寫入鬆散物件索引 %s 失敗"

@@ -23342,12 +23557,12 @@ msgstr "在 ls-refs 引數之後應該有一個 flush 包"

23557 msgid "quoted CRLF detected"

23558 msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"

23559

23345 -#: mem-pool.c strbuf.c strbuf.c wrapper.c

23560 +#: mem-pool.c strbuf.c wrapper.c

23561 #, c-format

23562 msgid "unable to format message: %s"

23563 msgstr "無法格式化訊息：%s"

23564

23350 -#: merge-ll.c merge-ll.c

23565 +#: merge-ll.c

23566 #, c-format

23567 msgid "invalid marker-size '%s', expecting an integer"

23568 msgstr "無效的 marker-size「%s」，應為整數"

@@ -23372,7 +23587,6 @@ msgstr "無法合併 %s 子模組（沒有合併基底）"

23587 msgid "Failed to merge submodule %s (commits not present)"

23588 msgstr "無法合併子模組 %s（提交不存在）"

23589

23375 -#: merge-ort.c merge-ort.c merge-ort.c merge-ort.c

23590 #: merge-ort.c

23591 #, c-format

23592 msgid "error: failed to merge submodule %s (repository corrupt)"

@@ -23383,7 +23597,7 @@ msgstr "錯誤：無法合併子模組 %s （版本庫損壞）"

23597 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

23598 msgstr "無法合併子模組 %s （提交未跟隨合併基礎）"

23599

23386 -#: merge-ort.c merge-ort.c

23600 +#: merge-ort.c

23601 #, c-format

23602 msgid "Note: Fast-forwarding submodule %s to %s"

23603 msgstr "注意：正在將 %s 子模組快轉到 %s"

@@ -23510,7 +23724,7 @@ msgstr ""

23724 "衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可"

23725 "能會因此出現巢狀衝突標記。"

23726

23513 -#: merge-ort.c merge-ort.c

23727 +#: merge-ort.c

23728 #, c-format

23729 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

23730 msgstr ""

@@ -23688,12 +23902,17 @@ msgstr "未知的 MIDX 版本：%d"

23902

23903 #: midx-write.c

23904 msgid "cannot perform MIDX compaction with v1 format"

23691 -msgstr "無法在 v1 格式下執行 MIDX 壓縮"

23905 +msgstr "無法在 v1 格式下執行 MIDX 緻密化"

23906

23907 #: midx-write.c

23908 msgid "ignoring existing multi-pack-index; checksum mismatch"

23909 msgstr "忽略現有的多包索引：總和檢查碼不符"

23910

23911 +#: midx-write.c

23912 +#, c-format

23913 +msgid "could not find base MIDX '%s'"

23914 +msgstr "無法找到基礎 MIDX「%s」"

23915 +

23916 #: midx-write.c

23917 #, c-format

23918 msgid "could not load reverse index for MIDX %s"

l10n: zh-TW.po: Update Chinese (Traditional) translation