81e30fc0c7 · matheusbsbs/matheus-bagliano

@@ -4,20 +4,20 @@

5 # This file is distributed under the same license as the Git package.

6 # Contributors (CN):

7 -# - Fangyi Zhou <me AT fangyi.io>

8 -# - Jiang Xin <worldhello.net AT gmail.com>

9 -# - Lian Cheng <rhythm.mail AT gmail.com>

10 -# - Ray Chen <oldsharp AT gmail.com>

11 -# - Riku <lu.riku AT gmail.com>

12 -# - Thynson <lanxingcan AT gmail.com>

13 -# - ws3389 <willsmith3389 AT gmail.com>

14 -# - Wang Sheng <wangsheng2008love AT 163.com>

15 -# - 依云 <lilydjwg AT gmail.com>

16 -# - Yichao Yu <yyc1992 AT gmail.com>

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

7 +# - Fangyi Zhou <me AT fangyi.io>

8 +# - Jiang Xin <worldhello.net AT gmail.com>

9 +# - Lian Cheng <rhythm.mail AT gmail.com>

10 +# - Ray Chen <oldsharp AT gmail.com>

11 +# - Riku <lu.riku AT gmail.com>

12 +# - Thynson <lanxingcan AT gmail.com>

13 +# - ws3389 <willsmith3389 AT gmail.com>

14 +# - Wang Sheng <wangsheng2008love AT 163.com>

15 +# - 依云 <lilydjwg AT gmail.com>

16 +# - Yichao Yu <yyc1992 AT gmail.com>

17 +# - Zhuang Ya <zhuangya AT me.com>

18 #

19 -# Git glossary for Chinese translators

20 -# updated on 5/23/2020

19 +# Git glossary for Chinese translators

20 +# updated on 5/23/2020

21 #

22 # 原文翻譯

23 # 3 way merge 三方合併

@@ -288,20 +288,22 @@

288 # Working tree 工作目錄

289 # You might need 您可能需要

290 #

291 +# Yi-Jyun Pan <pan93412@gmail.com>, 2021.

292 msgid ""

293 msgstr ""

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

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

295 -"POT-Creation-Date: 2021-05-17 16:02+0800\n"

296 -"PO-Revision-Date: 2021-05-23 15:30+0800\n"

296 +"POT-Creation-Date: 2021-08-14 07:56+0800\n"

297 +"PO-Revision-Date: 2021-08-14 13:55+0800\n"

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

298 -"Language-Team: Chinese (Traditional) <zh-l10n@lists.linux.org.tw>\n"

299 +"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"

300 +"po/git-cli/zh_Hant/>\n"

301 "Language: zh_TW\n"

302 "MIME-Version: 1.0\n"

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

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

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

304 -"X-Generator: Poedit 2.4.3\n"

306 +"X-Generator: Poedit 3.0\n"

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

308 "zhconvert.org\n"

309

@@ -310,8 +312,8 @@ msgstr ""

312 msgid "Huh (%s)?"

313 msgstr "嗯（%s）？"

314

313 -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493

314 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528

315 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493

316 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528

317 #: builtin/rebase.c:1953

318 msgid "could not read index"

319 msgstr "無法讀取索引"

@@ -340,7 +342,7 @@ msgstr "更新"

342 msgid "could not stage '%s'"

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

344

343 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687

345 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707

346 msgid "could not write index"

347 msgstr "無法寫入索引"

348

@@ -395,12 +397,12 @@ msgstr[0] "增加了 %d 個路徑\n"

397 msgid "ignoring unmerged: %s"

398 msgstr "忽略未合併：%s"

399

398 -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369

400 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369

401 #, c-format

402 msgid "Only binary files changed.\n"

403 msgstr "只有二進位檔案被修改。\n"

404

403 -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371

405 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371

406 #, c-format

407 msgid "No changes.\n"

408 msgstr "沒有修改。\n"

@@ -477,11 +479,11 @@ msgstr "選擇編號過的項目"

479 msgid "(empty) select nothing"

480 msgstr "（空）全不選取"

481

480 -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896

482 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896

483 msgid "*** Commands ***"

484 msgstr "*** 指令 ***"

485

484 -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893

486 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893

487 msgid "What now"

488 msgstr "請選擇"

489

@@ -493,12 +495,13 @@ msgstr "快取"

495 msgid "unstaged"

496 msgstr "未快取"

497

496 -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308

497 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128

498 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309

499 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128

500 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190

499 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819

500 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327

501 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573

501 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886

502 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343

503 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589

504 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893

505 #: git-add--interactive.perl:213

506 msgid "path"

507 msgstr "路徑"

@@ -507,7 +510,7 @@ msgstr "路徑"

510 msgid "could not refresh index"

511 msgstr "無法重新整理索引"

512

510 -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803

513 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803

514 #, c-format

515 msgid "Bye.\n"

516 msgstr "再見。\n"

@@ -798,40 +801,42 @@ msgstr ""

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

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

803

801 -#: add-patch.c:342

804 +#: add-patch.c:343

805 #, c-format

806 msgid "could not parse hunk header '%.*s'"

807 msgstr "無法解析區塊標頭 '%.*s'"

808

806 -#: add-patch.c:361 add-patch.c:365

809 +#: add-patch.c:362 add-patch.c:366

810 #, c-format

811 msgid "could not parse colored hunk header '%.*s'"

812 msgstr "無法解析上色過的區塊標頭 '%.*s'"

813

811 -#: add-patch.c:419

814 +#: add-patch.c:420

815 msgid "could not parse diff"

816 msgstr "無法解析差異 (diff)"

817

815 -#: add-patch.c:438

818 +#: add-patch.c:439

819 msgid "could not parse colored diff"

820 msgstr "無法解析上色過的差異 (diff)"

821

819 -#: add-patch.c:452

822 +#: add-patch.c:453

823 #, c-format

824 msgid "failed to run '%s'"

825 msgstr "無法執行 '%s'"

826

824 -#: add-patch.c:611

827 +#: add-patch.c:612

828 msgid "mismatched output from interactive.diffFilter"

829 msgstr "interactive.diffFilter 的輸出不符"

830

828 -#: add-patch.c:612

831 +#: add-patch.c:613

832 msgid ""

833 "Your filter must maintain a one-to-one correspondence\n"

834 "between its input and output lines."

832 -msgstr "您的過濾器必須在其輸入及輸出行維持一對一的對應關係。"

835 +msgstr ""

836 +"您的過濾器必須在其輸入及輸出行\n"

837 +"維持一對一的對應關係。"

838

834 -#: add-patch.c:790

839 +#: add-patch.c:791

840 #, c-format

841 msgid ""

842 "expected context line #%d in\n"

@@ -840,7 +845,7 @@ msgstr ""

845 "應有上下文行 #%d 於\n"

846 "%.*s"

847

843 -#: add-patch.c:805

848 +#: add-patch.c:806

849 #, c-format

850 msgid ""

851 "hunks do not overlap:\n"

@@ -853,11 +858,11 @@ msgstr ""

858 "\t不以下述結尾：\n"

859 "%.*s"

860

856 -#: add-patch.c:1081 git-add--interactive.perl:1115

861 +#: add-patch.c:1082 git-add--interactive.perl:1115

862 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

863 msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"

864

860 -#: add-patch.c:1085

865 +#: add-patch.c:1086

866 #, c-format

867 msgid ""

868 "---\n"

@@ -871,20 +876,21 @@ msgstr ""

876 "以 %c 開始的行將被刪除。\n"

877

878 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

874 -#: add-patch.c:1099 git-add--interactive.perl:1129

879 +#: add-patch.c:1100 git-add--interactive.perl:1129

880 msgid ""

881 "If it does not apply cleanly, you will be given an opportunity to\n"

882 "edit again. If all lines of the hunk are removed, then the edit is\n"

883 "aborted and the hunk is left unchanged.\n"

884 msgstr ""

880 -"如果未乾淨套用，您就有機會重新編輯。若刪掉此區塊的全部內容，則會中止\n"

885 +"如果未乾淨套用，您就有機會重新編輯。\n"

886 +"若刪掉此區塊的全部內容，則會中止\n"

887 "本次編輯，區塊則不會被修改。\n"

888

883 -#: add-patch.c:1132

889 +#: add-patch.c:1133

890 msgid "could not parse hunk header"

891 msgstr "無法解析區塊標頭"

892

887 -#: add-patch.c:1177

893 +#: add-patch.c:1178

894 msgid "'git apply --cached' failed"

895 msgstr "「git apply --cached」失敗"

896

@@ -900,24 +906,24 @@ msgstr "「git apply --cached」失敗"

906 #. Consider translating (saying "no" discards!) as

907 #. (saying "n" for "no" discards!) if the translation

908 #. of the word "no" does not start with n.

903 -#: add-patch.c:1246 git-add--interactive.perl:1242

909 +#: add-patch.c:1247 git-add--interactive.perl:1242

910 msgid ""

911 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

912 msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? "

913

908 -#: add-patch.c:1289

914 +#: add-patch.c:1290

915 msgid "The selected hunks do not apply to the index!"

916 msgstr "選取的區塊不會套用進索引！"

917

912 -#: add-patch.c:1290 git-add--interactive.perl:1346

918 +#: add-patch.c:1291 git-add--interactive.perl:1346

919 msgid "Apply them to the worktree anyway? "

920 msgstr "無論如何都要套用到工作區嗎？"

921

916 -#: add-patch.c:1297 git-add--interactive.perl:1349

922 +#: add-patch.c:1298 git-add--interactive.perl:1349

923 msgid "Nothing was applied.\n"

924 msgstr "未套用。\n"

925

920 -#: add-patch.c:1354

926 +#: add-patch.c:1355

927 msgid ""

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

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

@@ -939,68 +945,68 @@ msgstr ""

945 "e - 手動編輯目前區塊\n"

946 "? - 顯示說明\n"

947

942 -#: add-patch.c:1516 add-patch.c:1526

948 +#: add-patch.c:1517 add-patch.c:1527

949 msgid "No previous hunk"

950 msgstr "沒有上一個區塊"

951

946 -#: add-patch.c:1521 add-patch.c:1531

952 +#: add-patch.c:1522 add-patch.c:1532

953 msgid "No next hunk"

954 msgstr "沒有下一個區塊"

955

950 -#: add-patch.c:1537

956 +#: add-patch.c:1538

957 msgid "No other hunks to goto"

958 msgstr "沒有其它可供跳轉的區塊"

959

954 -#: add-patch.c:1548 git-add--interactive.perl:1606

960 +#: add-patch.c:1549 git-add--interactive.perl:1606

961 msgid "go to which hunk (<ret> to see more)? "

962 msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ "

963

958 -#: add-patch.c:1549 git-add--interactive.perl:1608

964 +#: add-patch.c:1550 git-add--interactive.perl:1608

965 msgid "go to which hunk? "

966 msgstr "跳轉到哪個區塊？"

967

962 -#: add-patch.c:1560

968 +#: add-patch.c:1561

969 #, c-format

970 msgid "Invalid number: '%s'"

971 msgstr "無效數字：'%s'"

972

967 -#: add-patch.c:1565

973 +#: add-patch.c:1566

974 #, c-format

975 msgid "Sorry, only %d hunk available."

976 msgid_plural "Sorry, only %d hunks available."

977 msgstr[0] "對不起，只有 %d 個可用區塊。"

978

973 -#: add-patch.c:1574

979 +#: add-patch.c:1575

980 msgid "No other hunks to search"

981 msgstr "沒有其它可供尋找的區塊"

982

977 -#: add-patch.c:1580 git-add--interactive.perl:1661

983 +#: add-patch.c:1581 git-add--interactive.perl:1661

984 msgid "search for regex? "

985 msgstr "使用正規表示式搜尋？"

986

981 -#: add-patch.c:1595

987 +#: add-patch.c:1596

988 #, c-format

989 msgid "Malformed search regexp %s: %s"

990 msgstr "錯誤的正規表示式 %s：%s"

991

986 -#: add-patch.c:1612

992 +#: add-patch.c:1613

993 msgid "No hunk matches the given pattern"

994 msgstr "沒有和提供模式相符合的區塊"

995

990 -#: add-patch.c:1619

996 +#: add-patch.c:1620

997 msgid "Sorry, cannot split this hunk"

998 msgstr "對不起，不能分割這個區塊"

999

994 -#: add-patch.c:1623

1000 +#: add-patch.c:1624

1001 #, c-format

1002 msgid "Split into %d hunks."

1003 msgstr "分割為 %d 個區塊。"

1004

999 -#: add-patch.c:1627

1005 +#: add-patch.c:1628

1006 msgid "Sorry, cannot edit this hunk"

1007 msgstr "對不起，不能編輯這個區塊"

1008

1003 -#: add-patch.c:1679

1009 +#: add-patch.c:1680

1010 msgid "'git apply' failed"

1011 msgstr "'git apply' 失敗"

1012

@@ -1055,7 +1061,7 @@ msgstr ""

1061 msgid "Exiting because of an unresolved conflict."

1062 msgstr "因為存在未解決的衝突而離開。"

1063

1058 -#: advice.c:283 builtin/merge.c:1374

1064 +#: advice.c:283 builtin/merge.c:1375

1065 msgid "You have not concluded your merge (MERGE_HEAD exists)."

1066 msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"

1067

@@ -1068,12 +1074,14 @@ msgid "Exiting because of unfinished merge."

1074 msgstr "因為存在未完成的合併而離開。"

1075

1076 #: advice.c:296

1071 -#, fuzzy, c-format

1077 +#, c-format

1078 msgid ""

1079 "The following pathspecs didn't match any eligible path, but they do match "

1080 "index\n"

1081 "entries outside the current sparse checkout:\n"

1076 -msgstr "沒有符合下列路徑規格的合規路徑，但有符合目前稀疏簽出之外的索引項目：\n"

1082 +msgstr ""

1083 +"下列路徑規格不符合任何適合路徑，\n"

1084 +"但符合目前稀疏簽出外的索引項目：\n"

1085

1086 #: advice.c:303

1087 msgid ""

@@ -1351,7 +1359,7 @@ msgstr "打修補檔失敗：%s:%ld"

1359 #: apply.c:3352

1360 #, c-format

1361 msgid "cannot checkout %s"

1354 -msgstr "不能檢出 %s"

1362 +msgstr "不能簽出 %s"

1363

1364 #: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214

1365 #: setup.c:308

@@ -1411,7 +1419,7 @@ msgstr "成功套用修補檔到 '%s'。\n"

1419 #: apply.c:3642

1420 #, c-format

1421 msgid "Falling back to direct application...\n"

1414 -msgstr ""

1422 +msgstr "回復至直接套用模式⋯⋯\n"

1423

1424 #: apply.c:3654

1425 msgid "removal patch leaves file contents"

@@ -1427,8 +1435,8 @@ msgstr "%s：錯誤類型"

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

1436 msgstr "%s 的類型是 %o，應為 %o"

1437

1430 -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890

1431 -#: read-cache.c:1351

1438 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892

1439 +#: read-cache.c:1353

1440 #, c-format

1441 msgid "invalid path '%s'"

1442 msgstr "無效路徑 '%s'"

@@ -1518,7 +1526,7 @@ msgstr "不能為建立檔案 %s 建立後端儲存"

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

1527 msgstr "無法為 %s 新增快取條目"

1528

1521 -#: apply.c:4376 builtin/bisect--helper.c:523

1529 +#: apply.c:4376 builtin/bisect--helper.c:525

1530 #, c-format

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

1532 msgstr "寫入 '%s' 失敗"

@@ -1604,7 +1612,7 @@ msgid "%d line applied after fixing whitespace errors."

1612 msgid_plural "%d lines applied after fixing whitespace errors."

1613 msgstr[0] "修復空白錯誤後，套用了 %d 行。"

1614

1607 -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423

1615 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423

1616 msgid "Unable to write new index file"

1617 msgstr "無法寫入新索引檔案"

1618

@@ -1616,7 +1624,7 @@ msgstr "不要套用符合提供路徑的變更"

1624 msgid "apply changes matching the given path"

1625 msgstr "套用符合提供路徑的變更"

1626

1619 -#: apply.c:5000 builtin/am.c:2317

1627 +#: apply.c:5000 builtin/am.c:2318

1628 msgid "num"

1629 msgstr "數字"

1630

@@ -1680,9 +1688,9 @@ msgstr "路徑以 NUL 字元分隔"

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

1689 msgstr "確保至少符合 <n> 行上下文"

1690

1683 -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296

1691 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297

1692 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1685 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831

1693 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991

1694 #: builtin/rebase.c:1347

1695 msgid "action"

1696 msgstr "動作"

@@ -1712,8 +1720,8 @@ msgid "allow overlapping hunks"

1720 msgstr "允許重疊的修補檔區塊"

1721

1722 #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22

1715 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755

1716 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128

1723 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756

1724 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128

1725 msgid "be verbose"

1726 msgstr "詳細輸出"

1727

@@ -1725,7 +1733,7 @@ msgstr "允許不正確的檔案末尾換行符號"

1733 msgid "do not trust the line counts in the hunk headers"

1734 msgstr "不信任修補檔區塊的標頭訊息中的行號"

1735

1728 -#: apply.c:5059 builtin/am.c:2305

1736 +#: apply.c:5059 builtin/am.c:2306

1737 msgid "root"

1738 msgstr "根目錄"

1739

@@ -1767,7 +1775,7 @@ msgstr "路徑不是有效的 UTF-8：%s"

1775 msgid "path too long (%d chars, SHA1: %s): %s"

1776 msgstr "路徑太長（%d 字元，SHA1：%s）：%s"

1777

1770 -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247

1778 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368

1779 #, c-format

1780 msgid "deflate error (%d)"

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

@@ -1801,13 +1809,13 @@ msgid "cannot read %s"

1809 msgstr "不能讀取 %s"

1810

1811 #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

1804 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833

1805 -#: builtin/merge.c:1143

1812 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833

1813 +#: builtin/merge.c:1144

1814 #, c-format

1815 msgid "could not read '%s'"

1816 msgstr "不能讀取 '%s'"

1817

1810 -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328

1818 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328

1819 #, c-format

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

1821 msgstr "路徑規格 '%s' 未符合任何檔案"

@@ -1849,7 +1857,7 @@ msgstr "格式"

1857 msgid "archive format"

1858 msgstr "歸檔格式"

1859

1852 -#: archive.c:553 builtin/log.c:1772

1860 +#: archive.c:553 builtin/log.c:1775

1861 msgid "prefix"

1862 msgstr "前綴"

1863

@@ -1860,7 +1868,7 @@ msgstr "為歸檔中每個路徑名加上前綴"

1868 #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888

1869 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135

1870 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209

1863 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105

1871 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105

1872 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412

1873 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191

1874 msgid "file"

@@ -1891,7 +1899,8 @@ msgid "list supported archive formats"

1899 msgstr "列出支援的歸檔格式"

1900

1901 #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121

1894 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336

1902 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352

1903 +#: builtin/submodule--helper.c:2902

1904 msgid "repo"

1905 msgstr "版本庫"

1906

@@ -1899,7 +1908,7 @@ msgstr "版本庫"

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

1909 msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案"

1910

1902 -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718

1911 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717

1912 #: builtin/notes.c:498

1913 msgid "command"

1914 msgstr "指令"

@@ -2081,11 +2090,11 @@ msgstr "不能將 --contents 和最終的提交物件名共用"

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

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

2092

2084 -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333

2085 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411

2086 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344

2087 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646

2088 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255

2093 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333

2094 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414

2095 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346

2096 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806

2097 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255

2098 msgid "revision walk setup failed"

2099 msgstr "版本遍歷設定失敗"

2100

@@ -2230,123 +2239,123 @@ msgstr "無效的分支點：'%s'。"

2239 #: branch.c:366

2240 #, c-format

2241 msgid "'%s' is already checked out at '%s'"

2233 -msgstr "'%s' 已經檢出到 '%s'"

2242 +msgstr "'%s' 已經簽出到 '%s'"

2243

2244 #: branch.c:389

2245 #, c-format

2246 msgid "HEAD of working tree %s is not updated"

2247 msgstr "工作區 %s 的 HEAD 指向沒有被更新"

2248

2240 -#: bundle.c:41

2249 +#: bundle.c:44

2250 #, c-format

2251 msgid "unrecognized bundle hash algorithm: %s"

2252 msgstr "無法識別的包雜湊演算法：%s"

2253

2245 -#: bundle.c:45

2254 +#: bundle.c:48

2255 #, c-format

2256 msgid "unknown capability '%s'"

2257 msgstr "未知功能 '%s'"

2258

2250 -#: bundle.c:71

2259 +#: bundle.c:74

2260 #, c-format

2261 msgid "'%s' does not look like a v2 or v3 bundle file"

2262 msgstr "'%s' 不像是一個 v2 或 v3 版本的包檔案"

2263

2255 -#: bundle.c:110

2264 +#: bundle.c:113

2265 #, c-format

2266 msgid "unrecognized header: %s%s (%d)"

2267 msgstr "無法識別的包頭：%s%s (%d)"

2268

2260 -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

2269 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

2270 #: builtin/commit.c:861

2271 #, c-format

2272 msgid "could not open '%s'"

2273 msgstr "不能開啟 '%s'"

2274

2266 -#: bundle.c:189

2275 +#: bundle.c:198

2276 msgid "Repository lacks these prerequisite commits:"

2277 msgstr "版本庫中缺少這些必備的提交："

2278

2270 -#: bundle.c:192

2279 +#: bundle.c:201

2280 msgid "need a repository to verify a bundle"

2281 msgstr "需要版本庫驗證一個包"

2282

2274 -#: bundle.c:243

2283 +#: bundle.c:257

2284 #, c-format

2285 msgid "The bundle contains this ref:"

2286 msgid_plural "The bundle contains these %d refs:"

2287 msgstr[0] "這個包中含有這 %d 個引用："

2288

2280 -#: bundle.c:250

2289 +#: bundle.c:264

2290 msgid "The bundle records a complete history."

2291 msgstr "這個包記錄一個完整歷史。"

2292

2284 -#: bundle.c:252

2293 +#: bundle.c:266

2294 #, c-format

2295 msgid "The bundle requires this ref:"

2296 msgid_plural "The bundle requires these %d refs:"

2297 msgstr[0] "這個包需要這 %d 個引用："

2298

2290 -#: bundle.c:319

2299 +#: bundle.c:333

2300 msgid "unable to dup bundle descriptor"

2301 msgstr "無法複製 bundle 描述符"

2302

2294 -#: bundle.c:326

2303 +#: bundle.c:340

2304 msgid "Could not spawn pack-objects"

2305 msgstr "不能生成 pack-objects 進程"

2306

2298 -#: bundle.c:337

2307 +#: bundle.c:351

2308 msgid "pack-objects died"

2309 msgstr "pack-objects 終止"

2310

2302 -#: bundle.c:386

2311 +#: bundle.c:400

2312 #, c-format

2313 msgid "ref '%s' is excluded by the rev-list options"

2314 msgstr "引用 '%s' 被 rev-list 選項排除"

2315

2307 -#: bundle.c:490

2316 +#: bundle.c:504

2317 #, c-format

2318 msgid "unsupported bundle version %d"

2319 msgstr "不支援的包版本 %d"

2320

2312 -#: bundle.c:492

2321 +#: bundle.c:506

2322 #, c-format

2323 msgid "cannot write bundle version %d with algorithm %s"

2324 msgstr "無法寫入 %2$s 演算法的包版本 %1$d"

2325

2317 -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396

2326 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396

2327 #, c-format

2328 msgid "unrecognized argument: %s"

2329 msgstr "無法識別的參數：%s"

2330

2322 -#: bundle.c:539

2331 +#: bundle.c:553

2332 msgid "Refusing to create empty bundle."

2333 msgstr "不能建立空包。"

2334

2326 -#: bundle.c:549

2335 +#: bundle.c:563

2336 #, c-format

2337 msgid "cannot create '%s'"

2338 msgstr "不能建立 '%s'"

2339

2331 -#: bundle.c:574

2340 +#: bundle.c:588

2341 msgid "index-pack died"

2342 msgstr "index-pack 終止"

2343

2335 -#: chunk-format.c:113

2344 +#: chunk-format.c:117

2345 msgid "terminating chunk id appears earlier than expected"

2346 msgstr "終止區塊 id 出現的時間早於預期"

2347

2339 -#: chunk-format.c:122

2348 +#: chunk-format.c:126

2349 #, c-format

2350 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"

2351 msgstr "不正確的區塊偏移 %<PRIx64> 及 %<PRIx64>"

2352

2344 -#: chunk-format.c:129

2353 +#: chunk-format.c:133

2354 #, c-format

2355 msgid "duplicate chunk ID %<PRIx32> found"

2356 msgstr "找到重複的區塊 ID %<PRIx32>"

2357

2349 -#: chunk-format.c:143

2358 +#: chunk-format.c:147

2359 #, c-format

2360 msgid "final chunk has non-zero id %<PRIx32>"

2361 msgstr "最終區塊有非零 ID %<PRIx32>"

@@ -2414,12 +2423,12 @@ msgstr "無法找到提交 %s"

2423 msgid "commit-graph requires overflow generation data but has none"

2424 msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料"

2425

2417 -#: commit-graph.c:1075 builtin/am.c:1340

2426 +#: commit-graph.c:1075 builtin/am.c:1341

2427 #, c-format

2428 msgid "unable to parse commit %s"

2429 msgstr "不能解析提交 %s"

2430

2422 -#: commit-graph.c:1337 builtin/pack-objects.c:2897

2431 +#: commit-graph.c:1337 builtin/pack-objects.c:3057

2432 #, c-format

2433 msgid "unable to get type of object %s"

2434 msgstr "無法獲得物件 %s 類型"

@@ -2480,7 +2489,7 @@ msgstr "正在尋找提交圖中額外的邊"

2489 msgid "failed to write correct number of base graph ids"

2490 msgstr "無法寫入正確數量的基礎圖形 ID"

2491

2483 -#: commit-graph.c:1812 midx.c:906

2492 +#: commit-graph.c:1812 midx.c:911

2493 #, c-format

2494 msgid "unable to create leading directories of %s"

2495 msgstr "不能為 %s 建立先導目錄"

@@ -2522,84 +2531,84 @@ msgstr "正在合併提交圖形"

2531

2532 #: commit-graph.c:2244

2533 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2525 -msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用。"

2534 +msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用"

2535

2536 #: commit-graph.c:2351

2537 msgid "too many commits to write graph"

2538 msgstr "提交太多不能畫圖"

2539

2531 -#: commit-graph.c:2450

2540 +#: commit-graph.c:2449

2541 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2542 msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"

2543

2535 -#: commit-graph.c:2460

2544 +#: commit-graph.c:2459

2545 #, c-format

2546 msgid "commit-graph has incorrect OID order: %s then %s"

2547 msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"

2548

2540 -#: commit-graph.c:2470 commit-graph.c:2485

2549 +#: commit-graph.c:2469 commit-graph.c:2484

2550 #, c-format

2551 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2552 msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"

2553

2545 -#: commit-graph.c:2477

2554 +#: commit-graph.c:2476

2555 #, c-format

2556 msgid "failed to parse commit %s from commit-graph"

2557 msgstr "無法從提交圖形中解析提交 %s"

2558

2550 -#: commit-graph.c:2495

2559 +#: commit-graph.c:2494

2560 msgid "Verifying commits in commit graph"

2561 msgstr "正在驗證提交圖中的提交"

2562

2554 -#: commit-graph.c:2510

2563 +#: commit-graph.c:2509

2564 #, c-format

2565 msgid "failed to parse commit %s from object database for commit-graph"

2566 msgstr "無法從提交圖形的物件庫中解析提交 %s"

2567

2559 -#: commit-graph.c:2517

2568 +#: commit-graph.c:2516

2569 #, c-format

2570 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2571 msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"

2572

2564 -#: commit-graph.c:2527

2573 +#: commit-graph.c:2526

2574 #, c-format

2575 msgid "commit-graph parent list for commit %s is too long"

2576 msgstr "提交 %s 的提交圖形父提交列表太長了"

2577

2569 -#: commit-graph.c:2536

2578 +#: commit-graph.c:2535

2579 #, c-format

2580 msgid "commit-graph parent for %s is %s != %s"

2581 msgstr "%s 的提交圖形父提交是 %s != %s"

2582

2574 -#: commit-graph.c:2550

2583 +#: commit-graph.c:2549

2584 #, c-format

2585 msgid "commit-graph parent list for commit %s terminates early"

2586 msgstr "提交 %s 的提交圖形父提交列表過早終止"

2587

2579 -#: commit-graph.c:2555

2588 +#: commit-graph.c:2554

2589 #, c-format

2590 msgid ""

2591 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

2592 msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"

2593

2585 -#: commit-graph.c:2559

2594 +#: commit-graph.c:2558

2595 #, c-format

2596 msgid ""

2597 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

2598 msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"

2599

2591 -#: commit-graph.c:2576

2600 +#: commit-graph.c:2575

2601 #, c-format

2602 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2603 msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"

2604

2596 -#: commit-graph.c:2582

2605 +#: commit-graph.c:2581

2606 #, c-format

2607 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2608 msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"

2609

2601 -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416

2602 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457

2610 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417

2611 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457

2612 #, c-format

2613 msgid "could not parse %s"

2614 msgstr "不能解析 %s"

@@ -2881,7 +2890,7 @@ msgstr "%s 的取值格式錯誤：%s"

2890 msgid "must be one of nothing, matching, simple, upstream or current"

2891 msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"

2892

2884 -#: config.c:1687 builtin/pack-objects.c:3924

2893 +#: config.c:1687 builtin/pack-objects.c:4084

2894 #, c-format

2895 msgid "bad pack compression level %d"

2896 msgstr "錯誤的打包壓縮級別 %d"

@@ -2901,110 +2910,110 @@ msgstr "引用 '%s' 沒有指向一個資料物件"

2910 msgid "unable to resolve config blob '%s'"

2911 msgstr "不能解析設定物件 '%s'"

2912

2904 -#: config.c:1873

2913 +#: config.c:1874

2914 #, c-format

2915 msgid "failed to parse %s"

2916 msgstr "解析 %s 失敗"

2917

2909 -#: config.c:1929

2918 +#: config.c:1930

2919 msgid "unable to parse command-line config"

2920 msgstr "無法解析指令列中的設定"

2921

2913 -#: config.c:2293

2922 +#: config.c:2294

2923 msgid "unknown error occurred while reading the configuration files"

2924 msgstr "在讀取設定檔案時遇到未知錯誤"

2925

2917 -#: config.c:2467

2926 +#: config.c:2468

2927 #, c-format

2928 msgid "Invalid %s: '%s'"

2929 msgstr "無效 %s：'%s'"

2930

2922 -#: config.c:2512

2931 +#: config.c:2513

2932 #, c-format

2933 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2934 msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"

2935

2927 -#: config.c:2558

2936 +#: config.c:2559

2937 #, c-format

2938 msgid "unable to parse '%s' from command-line config"

2939 msgstr "無法解析指令列設定中的 '%s'"

2940

2932 -#: config.c:2560

2941 +#: config.c:2561

2942 #, c-format

2943 msgid "bad config variable '%s' in file '%s' at line %d"

2944 msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"

2945

2937 -#: config.c:2644

2946 +#: config.c:2645

2947 #, c-format

2948 msgid "invalid section name '%s'"

2949 msgstr "無效的小節名稱 '%s'"

2950

2942 -#: config.c:2676

2951 +#: config.c:2677

2952 #, c-format

2953 msgid "%s has multiple values"

2954 msgstr "%s 有多個取值"

2955

2947 -#: config.c:2705

2956 +#: config.c:2706

2957 #, c-format

2958 msgid "failed to write new configuration file %s"

2959 msgstr "寫入新的設定檔案 %s 失敗"

2960

2952 -#: config.c:2957 config.c:3283

2961 +#: config.c:2958 config.c:3285

2962 #, c-format

2963 msgid "could not lock config file %s"

2964 msgstr "不能鎖定設定檔案 %s"

2965

2957 -#: config.c:2968

2966 +#: config.c:2969

2967 #, c-format

2968 msgid "opening %s"

2969 msgstr "開啟 %s"

2970

2962 -#: config.c:3005 builtin/config.c:361

2971 +#: config.c:3006 builtin/config.c:361

2972 #, c-format

2973 msgid "invalid pattern: %s"

2974 msgstr "無效模式：%s"

2975

2967 -#: config.c:3030

2976 +#: config.c:3031

2977 #, c-format

2978 msgid "invalid config file %s"

2979 msgstr "無效的設定檔案 %s"

2980

2972 -#: config.c:3043 config.c:3296

2981 +#: config.c:3044 config.c:3298

2982 #, c-format

2983 msgid "fstat on %s failed"

2984 msgstr "對 %s 呼叫 fstat 失敗"

2985

2977 -#: config.c:3054

2986 +#: config.c:3055

2987 #, c-format

2979 -msgid "unable to mmap '%s'"

2980 -msgstr "不能 mmap '%s'"

2988 +msgid "unable to mmap '%s'%s"

2989 +msgstr "無法 mmap '%s'%s"

2990

2982 -#: config.c:3063 config.c:3301

2991 +#: config.c:3065 config.c:3303

2992 #, c-format

2993 msgid "chmod on %s failed"

2994 msgstr "對 %s 呼叫 chmod 失敗"

2995

2987 -#: config.c:3148 config.c:3398

2996 +#: config.c:3150 config.c:3400

2997 #, c-format

2998 msgid "could not write config file %s"

2999 msgstr "不能寫入設定檔案 %s"

3000

2992 -#: config.c:3182

3001 +#: config.c:3184

3002 #, c-format

3003 msgid "could not set '%s' to '%s'"

3004 msgstr "不能設定 '%s' 為 '%s'"

3005

2997 -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

3006 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

3007 #, c-format

3008 msgid "could not unset '%s'"

3009 msgstr "不能取消設定 '%s'"

3010

3002 -#: config.c:3274

3011 +#: config.c:3276

3012 #, c-format

3013 msgid "invalid section name: %s"

3014 msgstr "無效的小節名稱：%s"

3015

3007 -#: config.c:3441

3016 +#: config.c:3443

3017 #, c-format

3018 msgid "missing value for '%s'"

3019 msgstr "%s 的取值缺少"

@@ -3180,7 +3189,7 @@ msgstr "已阻止奇怪的路徑名 '%s'"

3189 msgid "unable to fork"

3190 msgstr "無法 fork"

3191

3183 -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45

3192 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45

3193 msgid "Checking connectivity"

3194 msgstr "正在檢查連通性"

3195

@@ -3298,23 +3307,23 @@ msgstr "意外的過濾類型"

3307 msgid "path name too long for external filter"

3308 msgstr "外部過濾器的路徑名太長"

3309

3301 -#: convert.c:934

3310 +#: convert.c:935

3311 #, c-format

3312 msgid ""

3313 "external filter '%s' is not available anymore although not all paths have "

3314 "been filtered"

3315 msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾"

3316

3308 -#: convert.c:1234

3317 +#: convert.c:1236

3318 msgid "true/false are no valid working-tree-encodings"

3319 msgstr "true/false 不是有效的工作區編碼"

3320

3312 -#: convert.c:1414 convert.c:1447

3321 +#: convert.c:1416 convert.c:1449

3322 #, c-format

3323 msgid "%s: clean filter '%s' failed"

3324 msgstr "%s：clean 過濾器 '%s' 失敗"

3325

3317 -#: convert.c:1490

3326 +#: convert.c:1492

3327 #, c-format

3328 msgid "%s: smudge filter %s failed"

3329 msgstr "%s：smudge 過濾器 %s 失敗"

@@ -3430,36 +3439,36 @@ msgstr "來自 config 的資料島正規表示式有太多的捕獲組（最多

3439 msgid "Marked %d islands, done.\n"

3440 msgstr "已標記 %d 個資料島，結束。\n"

3441

3433 -#: diff-merges.c:80

3442 +#: diff-merges.c:70

3443 #, c-format

3444 msgid "unknown value for --diff-merges: %s"

3445 msgstr "--diff-merges 的值無效：%s"

3446

3438 -#: diff-lib.c:538

3447 +#: diff-lib.c:557

3448 msgid "--merge-base does not work with ranges"

3440 -msgstr "—merge-base 跟範圍無法搭配運作"

3449 +msgstr "--merge-base 跟範圍無法搭配運作"

3450

3442 -#: diff-lib.c:540

3451 +#: diff-lib.c:559

3452 msgid "--merge-base only works with commits"

3453 msgstr "--merge-base 只能跟提交搭配才能運作"

3454

3446 -#: diff-lib.c:557

3455 +#: diff-lib.c:576

3456 msgid "unable to get HEAD"

3457 msgstr "不能取得 HEAD"

3458

3450 -#: diff-lib.c:564

3459 +#: diff-lib.c:583

3460 msgid "no merge base found"

3461 msgstr "找不到合併基底"

3462

3454 -#: diff-lib.c:566

3463 +#: diff-lib.c:585

3464 msgid "multiple merge bases found"

3465 msgstr "找到多個合併基底"

3466

3458 -#: diff-no-index.c:238

3467 +#: diff-no-index.c:237

3468 msgid "git diff --no-index [<options>] <path> <path>"

3469 msgstr "git diff --no-index [<選項>] <路徑> <路徑>"

3470

3462 -#: diff-no-index.c:263

3471 +#: diff-no-index.c:262

3472 msgid ""

3473 "Not a git repository. Use --no-index to compare two paths outside a working "

3474 "tree"

@@ -3482,8 +3491,8 @@ msgid ""

3491 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3492 "'dimmed-zebra', 'plain'"

3493 msgstr ""

3485 -"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "

3486 -"'plain'"

3494 +"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-"

3495 +"zebra'、'plain'"

3496

3497 #: diff.c:325

3498 #, c-format

@@ -3514,35 +3523,47 @@ msgstr ""

3523 "發現設定變數 'diff.dirstat' 中的錯誤：\n"

3524 "%s"

3525

3517 -#: diff.c:4278

3526 +#: diff.c:4282

3527 #, c-format

3528 msgid "external diff died, stopping at %s"

3529 msgstr "外部 diff 離開，停止在 %s"

3530

3522 -#: diff.c:4630

3531 +#: diff.c:4634

3532 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

3533 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

3534

3526 -#: diff.c:4633

3535 +#: diff.c:4637

3536 msgid "-G, -S and --find-object are mutually exclusive"

3537 msgstr "-G、-S 和 --find-object 是互斥的"

3538

3530 -#: diff.c:4712

3539 +#: diff.c:4640

3540 +msgid ""

3541 +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"

3542 +msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex 搭配 -S"

3543 +

3544 +#: diff.c:4643

3545 +msgid ""

3546 +"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "

3547 +"with -G and -S"

3548 +msgstr ""

3549 +"--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all 搭配 -G 和 -S"

3550 +

3551 +#: diff.c:4722

3552 msgid "--follow requires exactly one pathspec"

3553 msgstr "--follow 明確要求只跟一個路徑規格"

3554

3534 -#: diff.c:4760

3555 +#: diff.c:4770

3556 #, c-format

3557 msgid "invalid --stat value: %s"

3558 msgstr "無效的 --stat 值：%s"

3559

3539 -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308

3560 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318

3561 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3562 #, c-format

3563 msgid "%s expects a numerical value"

3564 msgstr "%s 期望一個數字值"

3565

3545 -#: diff.c:4797

3566 +#: diff.c:4807

3567 #, c-format

3568 msgid ""

3569 "Failed to parse --dirstat/-X option parameter:\n"

@@ -3551,200 +3572,200 @@ msgstr ""

3572 "無法解析 --dirstat/-X 選項的參數：\n"

3573 "%s"

3574

3554 -#: diff.c:4882

3575 +#: diff.c:4892

3576 #, c-format

3577 msgid "unknown change class '%c' in --diff-filter=%s"

3578 msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"

3579

3559 -#: diff.c:4906

3580 +#: diff.c:4916

3581 #, c-format

3582 msgid "unknown value after ws-error-highlight=%.*s"

3583 msgstr "ws-error-highlight=%.*s 之後未知的值"

3584

3564 -#: diff.c:4920

3585 +#: diff.c:4930

3586 #, c-format

3587 msgid "unable to resolve '%s'"

3588 msgstr "不能解析 '%s'"

3589

3569 -#: diff.c:4970 diff.c:4976

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

3591 #, c-format

3592 msgid "%s expects <n>/<m> form"

3593 msgstr "%s 期望 <n>/<m> 格式"

3594

3574 -#: diff.c:4988

3595 +#: diff.c:4998

3596 #, c-format

3597 msgid "%s expects a character, got '%s'"

3598 msgstr "%s 期望一個字元，得到 '%s'"

3599

3579 -#: diff.c:5009

3600 +#: diff.c:5019

3601 #, c-format

3602 msgid "bad --color-moved argument: %s"

3603 msgstr "壞的 --color-moved 參數：%s"

3604

3584 -#: diff.c:5028

3605 +#: diff.c:5038

3606 #, c-format

3607 msgid "invalid mode '%s' in --color-moved-ws"

3608 msgstr "--color-moved-ws 中的無效模式 '%s'"

3609

3589 -#: diff.c:5068

3610 +#: diff.c:5078

3611 msgid ""

3612 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3613 "\"histogram\""

3614 msgstr ""

3615 "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""

3616

3596 -#: diff.c:5104 diff.c:5124

3617 +#: diff.c:5114 diff.c:5134

3618 #, c-format

3619 msgid "invalid argument to %s"

3620 msgstr "%s 的參數無效"

3621

3601 -#: diff.c:5228

3622 +#: diff.c:5238

3623 #, c-format

3624 msgid "invalid regex given to -I: '%s'"

3625 msgstr "傳入 -I 的正規表示式無效：「%s」"

3626

3606 -#: diff.c:5277

3627 +#: diff.c:5287

3628 #, c-format

3629 msgid "failed to parse --submodule option parameter: '%s'"

3630 msgstr "無法解析 --submodule 選項的參數：'%s'"

3631

3611 -#: diff.c:5333

3632 +#: diff.c:5343

3633 #, c-format

3634 msgid "bad --word-diff argument: %s"

3635 msgstr "壞的 --word-diff 參數：%s"

3636

3616 -#: diff.c:5369

3637 +#: diff.c:5379

3638 msgid "Diff output format options"

3639 msgstr "差異輸出格式化選項"

3640

3620 -#: diff.c:5371 diff.c:5377

3641 +#: diff.c:5381 diff.c:5387

3642 msgid "generate patch"

3643 msgstr "生成修補檔"

3644

3624 -#: diff.c:5374 builtin/log.c:179

3645 +#: diff.c:5384 builtin/log.c:179

3646 msgid "suppress diff output"

3647 msgstr "不顯示差異輸出"

3648

3628 -#: diff.c:5379 diff.c:5493 diff.c:5500

3649 +#: diff.c:5389 diff.c:5503 diff.c:5510

3650 msgid "<n>"

3651 msgstr "<n>"

3652

3632 -#: diff.c:5380 diff.c:5383

3653 +#: diff.c:5390 diff.c:5393

3654 msgid "generate diffs with <n> lines context"

3655 msgstr "生成含 <n> 行上下文的差異"

3656

3636 -#: diff.c:5385

3657 +#: diff.c:5395

3658 msgid "generate the diff in raw format"

3659 msgstr "生成原始格式的差異"

3660

3640 -#: diff.c:5388

3661 +#: diff.c:5398

3662 msgid "synonym for '-p --raw'"

3663 msgstr "和 '-p --raw' 同義"

3664

3644 -#: diff.c:5392

3665 +#: diff.c:5402

3666 msgid "synonym for '-p --stat'"

3667 msgstr "和 '-p --stat' 同義"

3668

3648 -#: diff.c:5396

3669 +#: diff.c:5406

3670 msgid "machine friendly --stat"

3671 msgstr "機器友好的 --stat"

3672

3652 -#: diff.c:5399

3673 +#: diff.c:5409

3674 msgid "output only the last line of --stat"

3675 msgstr "只輸出 --stat 的最後一行"

3676

3656 -#: diff.c:5401 diff.c:5409

3677 +#: diff.c:5411 diff.c:5419

3678 msgid "<param1,param2>..."

3679 msgstr "<參數1,參數2>..."

3680

3660 -#: diff.c:5402

3681 +#: diff.c:5412

3682 msgid ""

3683 "output the distribution of relative amount of changes for each sub-directory"

3684 msgstr "輸出每個子目錄相對變更的分布"

3685

3665 -#: diff.c:5406

3686 +#: diff.c:5416

3687 msgid "synonym for --dirstat=cumulative"

3688 msgstr "和 --dirstat=cumulative 同義"

3689

3669 -#: diff.c:5410

3690 +#: diff.c:5420

3691 msgid "synonym for --dirstat=files,param1,param2..."

3692 msgstr "是 --dirstat=files,param1,param2... 的同義詞"

3693

3673 -#: diff.c:5414

3694 +#: diff.c:5424

3695 msgid "warn if changes introduce conflict markers or whitespace errors"

3696 msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"

3697

3677 -#: diff.c:5417

3698 +#: diff.c:5427

3699 msgid "condensed summary such as creations, renames and mode changes"

3700 msgstr "精簡摘要，例如建立、重新命名和模式變更"

3701

3681 -#: diff.c:5420

3702 +#: diff.c:5430

3703 msgid "show only names of changed files"

3704 msgstr "只顯示變更檔案的檔案名"

3705

3685 -#: diff.c:5423

3706 +#: diff.c:5433

3707 msgid "show only names and status of changed files"

3708 msgstr "只顯示變更檔案的檔案名和狀態"

3709

3689 -#: diff.c:5425

3710 +#: diff.c:5435

3711 msgid "<width>[,<name-width>[,<count>]]"

3712 msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"

3713

3693 -#: diff.c:5426

3714 +#: diff.c:5436

3715 msgid "generate diffstat"

3716 msgstr "生成差異統計（diffstat）"

3717

3697 -#: diff.c:5428 diff.c:5431 diff.c:5434

3718 +#: diff.c:5438 diff.c:5441 diff.c:5444

3719 msgid "<width>"

3720 msgstr "<寬度>"

3721

3701 -#: diff.c:5429

3722 +#: diff.c:5439

3723 msgid "generate diffstat with a given width"

3724 msgstr "使用提供的長度生成差異統計"

3725

3705 -#: diff.c:5432

3726 +#: diff.c:5442

3727 msgid "generate diffstat with a given name width"

3728 msgstr "使用提供的檔案名長度生成差異統計"

3729

3709 -#: diff.c:5435

3730 +#: diff.c:5445

3731 msgid "generate diffstat with a given graph width"

3732 msgstr "使用提供的圖形長度生成差異統計"

3733

3713 -#: diff.c:5437

3734 +#: diff.c:5447

3735 msgid "<count>"

3736 msgstr "<次數>"

3737

3717 -#: diff.c:5438

3738 +#: diff.c:5448

3739 msgid "generate diffstat with limited lines"

3740 msgstr "生成有限行數的差異統計"

3741

3721 -#: diff.c:5441

3742 +#: diff.c:5451

3743 msgid "generate compact summary in diffstat"

3744 msgstr "生成差異統計的簡潔摘要"

3745

3725 -#: diff.c:5444

3746 +#: diff.c:5454

3747 msgid "output a binary diff that can be applied"

3748 msgstr "輸出一個可以套用的二進位差異"

3749

3729 -#: diff.c:5447

3750 +#: diff.c:5457

3751 msgid "show full pre- and post-image object names on the \"index\" lines"

3752 msgstr "在 \"index\" 行顯示完整的前後物件名稱"

3753

3733 -#: diff.c:5449

3754 +#: diff.c:5459

3755 msgid "show colored diff"

3756 msgstr "顯示帶顏色的差異"

3757

3737 -#: diff.c:5450

3758 +#: diff.c:5460

3759 msgid "<kind>"

3760 msgstr "<類型>"

3761

3741 -#: diff.c:5451

3762 +#: diff.c:5461

3763 msgid ""

3764 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3765 "diff"

3766 msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"

3767

3747 -#: diff.c:5454

3768 +#: diff.c:5464

3769 msgid ""

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

3771 "--numstat"

@@ -3752,311 +3773,311 @@ msgstr ""

3773 "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"

3774 "符"

3775

3755 -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572

3776 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582

3777 msgid "<prefix>"

3778 msgstr "<前綴>"

3779

3759 -#: diff.c:5458

3780 +#: diff.c:5468

3781 msgid "show the given source prefix instead of \"a/\""

3782 msgstr "顯示提供的源前綴取代 \"a/\""

3783

3763 -#: diff.c:5461

3784 +#: diff.c:5471

3785 msgid "show the given destination prefix instead of \"b/\""

3786 msgstr "顯示提供的目標前綴取代 \"b/\""

3787

3767 -#: diff.c:5464

3788 +#: diff.c:5474

3789 msgid "prepend an additional prefix to every line of output"

3790 msgstr "輸出的每一行附加前綴"

3791

3771 -#: diff.c:5467

3792 +#: diff.c:5477

3793 msgid "do not show any source or destination prefix"

3794 msgstr "不顯示任何源和目標前綴"

3795

3775 -#: diff.c:5470

3796 +#: diff.c:5480

3797 msgid "show context between diff hunks up to the specified number of lines"

3798 msgstr "顯示指定行數的差異區塊間的上下文"

3799

3779 -#: diff.c:5474 diff.c:5479 diff.c:5484

3800 +#: diff.c:5484 diff.c:5489 diff.c:5494

3801 msgid "<char>"

3802 msgstr "<字元>"

3803

3783 -#: diff.c:5475

3804 +#: diff.c:5485

3805 msgid "specify the character to indicate a new line instead of '+'"

3806 msgstr "指定一個字元取代 '+' 來表示新的一行"

3807

3787 -#: diff.c:5480

3808 +#: diff.c:5490

3809 msgid "specify the character to indicate an old line instead of '-'"

3810 msgstr "指定一個字元取代 '-' 來表示舊的一行"

3811

3791 -#: diff.c:5485

3812 +#: diff.c:5495

3813 msgid "specify the character to indicate a context instead of ' '"

3814 msgstr "指定一個字元取代 ' ' 來表示一行上下文"

3815

3795 -#: diff.c:5488

3816 +#: diff.c:5498

3817 msgid "Diff rename options"

3818 msgstr "差異重新命名選項"

3819

3799 -#: diff.c:5489

3820 +#: diff.c:5499

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

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

3823

3803 -#: diff.c:5490

3824 +#: diff.c:5500

3825 msgid "break complete rewrite changes into pairs of delete and create"

3826 msgstr "將完全重寫的變更打破為成對的刪除和建立"

3827

3807 -#: diff.c:5494

3828 +#: diff.c:5504

3829 msgid "detect renames"

3830 msgstr "檢測重新命名"

3831

3811 -#: diff.c:5498

3832 +#: diff.c:5508

3833 msgid "omit the preimage for deletes"

3834 msgstr "省略刪除變更的差異輸出"

3835

3815 -#: diff.c:5501

3836 +#: diff.c:5511

3837 msgid "detect copies"

3838 msgstr "檢測複製"

3839

3819 -#: diff.c:5505

3840 +#: diff.c:5515

3841 msgid "use unmodified files as source to find copies"

3842 msgstr "使用未修改的檔案做為發現複製的源"

3843

3823 -#: diff.c:5507

3844 +#: diff.c:5517

3845 msgid "disable rename detection"

3846 msgstr "停用重新命名偵測"

3847

3827 -#: diff.c:5510

3848 +#: diff.c:5520

3849 msgid "use empty blobs as rename source"

3850 msgstr "使用空的資料物件做為重新命名的源"

3851

3831 -#: diff.c:5512

3852 +#: diff.c:5522

3853 msgid "continue listing the history of a file beyond renames"

3854 msgstr "繼續列出檔案重新命名以外的歷史記錄"

3855

3835 -#: diff.c:5515

3856 +#: diff.c:5525

3857 msgid ""

3858 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3859 "given limit"

3860 msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"

3861

3841 -#: diff.c:5517

3862 +#: diff.c:5527

3863 msgid "Diff algorithm options"

3864 msgstr "差異演算法選項"

3865

3845 -#: diff.c:5519

3866 +#: diff.c:5529

3867 msgid "produce the smallest possible diff"

3868 msgstr "生成儘可能小的差異"

3869

3849 -#: diff.c:5522

3870 +#: diff.c:5532

3871 msgid "ignore whitespace when comparing lines"

3872 msgstr "行比較時忽略空白字元"

3873

3853 -#: diff.c:5525

3874 +#: diff.c:5535

3875 msgid "ignore changes in amount of whitespace"

3876 msgstr "忽略空白字元的變更"

3877

3857 -#: diff.c:5528

3878 +#: diff.c:5538

3879 msgid "ignore changes in whitespace at EOL"

3880 msgstr "忽略行尾的空白字元變更"

3881

3861 -#: diff.c:5531

3882 +#: diff.c:5541

3883 msgid "ignore carrier-return at the end of line"

3884 msgstr "忽略行尾的Enter符（CR）"

3885

3865 -#: diff.c:5534

3886 +#: diff.c:5544

3887 msgid "ignore changes whose lines are all blank"

3888 msgstr "忽略整行都是空白的變更"

3889

3869 -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606

3890 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616

3891 msgid "<regex>"

3892 msgstr "<正則>"

3893

3873 -#: diff.c:5537

3894 +#: diff.c:5547

3895 msgid "ignore changes whose all lines match <regex>"

3896 msgstr "忽略整行符合 <regex> 的變更"

3897

3877 -#: diff.c:5540

3898 +#: diff.c:5550

3899 msgid "heuristic to shift diff hunk boundaries for easy reading"

3900 msgstr "啟發式轉換差異邊界以便閱讀"

3901

3881 -#: diff.c:5543

3902 +#: diff.c:5553

3903 msgid "generate diff using the \"patience diff\" algorithm"

3904 msgstr "使用 \"patience diff\" 演算法生成差異"

3905

3885 -#: diff.c:5547

3906 +#: diff.c:5557

3907 msgid "generate diff using the \"histogram diff\" algorithm"

3908 msgstr "使用 \"histogram diff\" 演算法生成差異"

3909

3889 -#: diff.c:5549

3910 +#: diff.c:5559

3911 msgid "<algorithm>"

3912 msgstr "<演算法>"

3913

3893 -#: diff.c:5550

3914 +#: diff.c:5560

3915 msgid "choose a diff algorithm"

3916 msgstr "選擇一個差異演算法"

3917

3897 -#: diff.c:5552

3918 +#: diff.c:5562

3919 msgid "<text>"

3920 msgstr "<文字>"

3921

3901 -#: diff.c:5553

3922 +#: diff.c:5563

3923 msgid "generate diff using the \"anchored diff\" algorithm"

3924 msgstr "使用 \"anchored diff\" 演算法生成差異"

3925

3905 -#: diff.c:5555 diff.c:5564 diff.c:5567

3926 +#: diff.c:5565 diff.c:5574 diff.c:5577

3927 msgid "<mode>"

3928 msgstr "<模式>"

3929

3909 -#: diff.c:5556

3930 +#: diff.c:5566

3931 msgid "show word diff, using <mode> to delimit changed words"

3932 msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"

3933

3913 -#: diff.c:5559

3934 +#: diff.c:5569

3935 msgid "use <regex> to decide what a word is"

3936 msgstr "使用 <正規表示式> 確定何為一個詞"

3937

3917 -#: diff.c:5562

3938 +#: diff.c:5572

3939 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3940 msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"

3941

3921 -#: diff.c:5565

3942 +#: diff.c:5575

3943 msgid "moved lines of code are colored differently"

3944 msgstr "移動的程式碼行用不同方式著色"

3945

3925 -#: diff.c:5568

3946 +#: diff.c:5578

3947 msgid "how white spaces are ignored in --color-moved"

3948 msgstr "在 --color-moved 下如何忽略空白字元"

3949

3929 -#: diff.c:5571

3950 +#: diff.c:5581

3951 msgid "Other diff options"

3952 msgstr "其它差異選項"

3953

3933 -#: diff.c:5573

3954 +#: diff.c:5583

3955 msgid "when run from subdir, exclude changes outside and show relative paths"

3956 msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"

3957

3937 -#: diff.c:5577

3958 +#: diff.c:5587

3959 msgid "treat all files as text"

3960 msgstr "把所有檔案當做文字處理"

3961

3941 -#: diff.c:5579

3962 +#: diff.c:5589

3963 msgid "swap two inputs, reverse the diff"

3964 msgstr "交換兩個輸入，反轉差異"

3965

3945 -#: diff.c:5581

3966 +#: diff.c:5591

3967 msgid "exit with 1 if there were differences, 0 otherwise"

3968 msgstr "有差異時離開碼為 1，否則為 0"

3969

3949 -#: diff.c:5583

3970 +#: diff.c:5593

3971 msgid "disable all output of the program"

3972 msgstr "停用本程式的所有輸出"

3973

3953 -#: diff.c:5585

3974 +#: diff.c:5595

3975 msgid "allow an external diff helper to be executed"

3976 msgstr "允許執行一個外部的差異協助工具"

3977

3957 -#: diff.c:5587

3978 +#: diff.c:5597

3979 msgid "run external text conversion filters when comparing binary files"

3980 msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"

3981

3961 -#: diff.c:5589

3982 +#: diff.c:5599

3983 msgid "<when>"

3984 msgstr "<何時>"

3985

3965 -#: diff.c:5590

3986 +#: diff.c:5600

3987 msgid "ignore changes to submodules in the diff generation"

3988 msgstr "在生成差異時，忽略子模組的更改"

3989

3969 -#: diff.c:5593

3990 +#: diff.c:5603

3991 msgid "<format>"

3992 msgstr "<格式>"

3993

3973 -#: diff.c:5594

3994 +#: diff.c:5604

3995 msgid "specify how differences in submodules are shown"

3996 msgstr "指定子模組的差異如何顯示"

3997

3977 -#: diff.c:5598

3998 +#: diff.c:5608

3999 msgid "hide 'git add -N' entries from the index"

4000 msgstr "隱藏索引中 'git add -N' 條目"

4001

3981 -#: diff.c:5601

4002 +#: diff.c:5611

4003 msgid "treat 'git add -N' entries as real in the index"

4004 msgstr "將索引中 'git add -N' 條目當做真實的"

4005

3985 -#: diff.c:5603

4006 +#: diff.c:5613

4007 msgid "<string>"

4008 msgstr "<字串>"

4009

3989 -#: diff.c:5604

4010 +#: diff.c:5614

4011 msgid ""

4012 "look for differences that change the number of occurrences of the specified "

4013 "string"

4014 msgstr "尋找改變了指定字串出現次數的差異"

4015

3995 -#: diff.c:5607

4016 +#: diff.c:5617

4017 msgid ""

4018 "look for differences that change the number of occurrences of the specified "

4019 "regex"

4020 msgstr "尋找改變指定正則符合出現次數的差異"

4021

4001 -#: diff.c:5610

4022 +#: diff.c:5620

4023 msgid "show all changes in the changeset with -S or -G"

4024 msgstr "顯示使用 -S 或 -G 的變更集的所有變更"

4025

4005 -#: diff.c:5613

4026 +#: diff.c:5623

4027 msgid "treat <string> in -S as extended POSIX regular expression"

4028 msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式"

4029

4009 -#: diff.c:5616

4030 +#: diff.c:5626

4031 msgid "control the order in which files appear in the output"

4032 msgstr "控制輸出中的檔案顯示順序"

4033

4013 -#: diff.c:5617 diff.c:5620

4034 +#: diff.c:5627 diff.c:5630

4035 msgid "<path>"

4036 msgstr "<路徑>"

4037

4017 -#: diff.c:5618

4038 +#: diff.c:5628

4039 msgid "show the change in the specified path first"

4040 msgstr "先顯示指定路徑的變更"

4041

4021 -#: diff.c:5621

4042 +#: diff.c:5631

4043 msgid "skip the output to the specified path"

4044 msgstr "略過輸出至指定路徑"

4045

4025 -#: diff.c:5623

4046 +#: diff.c:5633

4047 msgid "<object-id>"

4048 msgstr "<物件 ID>"

4049

4029 -#: diff.c:5624

4050 +#: diff.c:5634

4051 msgid ""

4052 "look for differences that change the number of occurrences of the specified "

4053 "object"

4054 msgstr "尋找改變指定物件出現次數的差異"

4055

4035 -#: diff.c:5626

4056 +#: diff.c:5636

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

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

4059

4039 -#: diff.c:5627

4060 +#: diff.c:5637

4061 msgid "select files by diff type"

4062 msgstr "透過差異類型選擇檔案"

4063

4043 -#: diff.c:5629

4064 +#: diff.c:5639

4065 msgid "<file>"

4066 msgstr "<檔案>"

4067

4047 -#: diff.c:5630

4068 +#: diff.c:5640

4069 msgid "Output to a specific file"

4070 msgstr "輸出到一個指定的檔案"

4071

4051 -#: diff.c:6287

4052 -msgid "inexact rename detection was skipped due to too many files."

4053 -msgstr "因為檔案太多，略過不嚴格的重新命名檢查。"

4072 +#: diff.c:6298

4073 +msgid "exhaustive rename detection was skipped due to too many files."

4074 +msgstr "因為檔案太多，已略過詳細重新命名偵測。"

4075

4055 -#: diff.c:6290

4076 +#: diff.c:6301

4077 msgid "only found copies from modified paths due to too many files."

4078 msgstr "因為檔案太多，只在修改的路徑中尋找複製。"

4079

4059 -#: diff.c:6293

4080 +#: diff.c:6304

4081 #, c-format

4082 msgid ""

4083 "you may want to set your %s variable to at least %d and retry the command."

@@ -4067,7 +4088,7 @@ msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令

4088 msgid "failed to read orderfile '%s'"

4089 msgstr "讀取排序檔案 '%s' 失敗"

4090

4070 -#: diffcore-rename.c:1418

4091 +#: diffcore-rename.c:1514

4092 msgid "Performing inexact rename detection"

4093 msgstr "正在進行非精確的重新命名偵測"

4094

@@ -4076,59 +4097,59 @@ msgstr "正在進行非精確的重新命名偵測"

4097 msgid "No such path '%s' in the diff"

4098 msgstr "diff 中沒有「%s」路徑"

4099

4079 -#: dir.c:578

4100 +#: dir.c:593

4101 #, c-format

4102 msgid "pathspec '%s' did not match any file(s) known to git"

4103 msgstr "路徑規格 '%s' 未符合任何 git 已知檔案"

4104

4084 -#: dir.c:718 dir.c:747 dir.c:760

4105 +#: dir.c:733 dir.c:762 dir.c:775

4106 #, c-format

4107 msgid "unrecognized pattern: '%s'"

4108 msgstr "無法識別樣式：「%s」"

4109

4089 -#: dir.c:777 dir.c:791

4110 +#: dir.c:790 dir.c:804

4111 #, c-format

4112 msgid "unrecognized negative pattern: '%s'"

4113 msgstr "無法識別反向模式：「%s」"

4114

4094 -#: dir.c:809

4115 +#: dir.c:820

4116 #, c-format

4117 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

4097 -msgstr "您的稀疏檢出檔案可能有問題：「%s」樣式重複"

4118 +msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複"

4119

4099 -#: dir.c:819

4120 +#: dir.c:830

4121 msgid "disabling cone pattern matching"

4122 msgstr "停用 cone 樣式符合模式"

4123

4103 -#: dir.c:1206

4124 +#: dir.c:1214

4125 #, c-format

4126 msgid "cannot use %s as an exclude file"

4127 msgstr "不能將 %s 用作排除檔案"

4128

4108 -#: dir.c:2314

4129 +#: dir.c:2351

4130 #, c-format

4131 msgid "could not open directory '%s'"

4132 msgstr "不能開啟目錄 '%s'"

4133

4113 -#: dir.c:2614

4134 +#: dir.c:2653

4135 msgid "failed to get kernel name and information"

4136 msgstr "無法獲得核心名稱和訊息"

4137

4117 -#: dir.c:2738

4138 +#: dir.c:2777

4139 msgid "untracked cache is disabled on this system or location"

4140 msgstr "快取未追蹤檔案在本系統或位置中被停用"

4141

4121 -#: dir.c:3543

4142 +#: dir.c:3610

4143 #, c-format

4144 msgid "index file corrupt in repo %s"

4145 msgstr "版本庫 %s 中的索引檔案損壞"

4146

4126 -#: dir.c:3590 dir.c:3595

4147 +#: dir.c:3657 dir.c:3662

4148 #, c-format

4149 msgid "could not create directories for %s"

4150 msgstr "不能為 %s 建立目錄"

4151

4131 -#: dir.c:3624

4152 +#: dir.c:3691

4153 #, c-format

4154 msgid "could not migrate git directory from '%s' to '%s'"

4155 msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"

@@ -4138,11 +4159,11 @@ msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"

4159 msgid "hint: Waiting for your editor to close the file...%c"

4160 msgstr "提示：等待您的編輯器關閉檔案...%c"

4161

4141 -#: entry.c:179

4162 +#: entry.c:176

4163 msgid "Filtering content"

4164 msgstr "過濾內容"

4165

4145 -#: entry.c:500

4166 +#: entry.c:497

4167 #, c-format

4168 msgid "could not stat file '%s'"

4169 msgstr "不能對檔案 '%s' 呼叫 stat"

@@ -4152,7 +4173,7 @@ msgstr "不能對檔案 '%s' 呼叫 stat"

4173 msgid "bad git namespace path \"%s\""

4174 msgstr "錯誤的 git 名字空間路徑 \"%s\""

4175

4155 -#: environment.c:335

4176 +#: environment.c:334

4177 #, c-format

4178 msgid "could not set GIT_DIR to '%s'"

4179 msgstr "不能設定 GIT_DIR 為 '%s'"

@@ -4315,9 +4336,9 @@ msgstr "沒有共同的提交"

4336

4337 #: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238

4338 msgid "source repository is shallow, reject to clone."

4318 -msgstr "來源版本庫是淺版本庫 (shallow)。拒絕 clone。"

4339 +msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。"

4340

4320 -#: fetch-pack.c:1128 fetch-pack.c:1651

4341 +#: fetch-pack.c:1128 fetch-pack.c:1660

4342 msgid "git fetch-pack: fetch failed."

4343 msgstr "git fetch-pack：取得失敗。"

4344

@@ -4339,7 +4360,7 @@ msgstr "伺服器不支援 shallow 請求"

4360 msgid "Server supports filter"

4361 msgstr "伺服器支援 filter"

4362

4342 -#: fetch-pack.c:1329 fetch-pack.c:2034

4363 +#: fetch-pack.c:1329 fetch-pack.c:2043

4364 msgid "unable to write request to remote"

4365 msgstr "無法將請求寫到遠端"

4366

@@ -4395,24 +4416,24 @@ msgstr "處理要取得的引用發生錯誤：%d"

4416 msgid "git fetch-pack: expected response end packet"

4417 msgstr "git fetch-pack: 預期要有回應結束封包"

4418

4398 -#: fetch-pack.c:1930

4419 +#: fetch-pack.c:1939

4420 msgid "no matching remote head"

4421 msgstr "沒有符合的遠端分支"

4422

4402 -#: fetch-pack.c:1953 builtin/clone.c:697

4423 +#: fetch-pack.c:1962 builtin/clone.c:697

4424 msgid "remote did not send all necessary objects"

4425 msgstr "遠端沒有傳送所有必需的物件"

4426

4406 -#: fetch-pack.c:2056

4427 +#: fetch-pack.c:2065

4428 msgid "unexpected 'ready' from remote"

4429 msgstr "從遠端收到非預期的 ‘ready’"

4430

4410 -#: fetch-pack.c:2079

4431 +#: fetch-pack.c:2088

4432 #, c-format

4433 msgid "no such remote ref %s"

4434 msgstr "沒有這樣的遠端引用 %s"

4435

4415 -#: fetch-pack.c:2082

4436 +#: fetch-pack.c:2091

4437 #, c-format

4438 msgid "Server does not allow request for unadvertised object %s"

4439 msgstr "伺服器不允許請求未公開的物件 %s"

@@ -4432,8 +4453,8 @@ msgstr "gpg 無法為資料簽名"

4453

4454 #: graph.c:98

4455 #, c-format

4435 -msgid "ignore invalid color '%.*s' in log.graphColors"

4436 -msgstr "忽略 log.graphColors 中無效的顏色 '%.*s'"

4456 +msgid "ignored invalid color '%.*s' in log.graphColors"

4457 +msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩"

4458

4459 #: grep.c:531

4460 msgid ""

@@ -4443,18 +4464,18 @@ msgstr ""

4464 "提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此"

4465 "功能"

4466

4446 -#: grep.c:1893

4467 +#: grep.c:1895

4468 #, c-format

4469 msgid "'%s': unable to read %s"

4470 msgstr "'%s'：無法讀取 %s"

4471

4451 -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4472 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4473 #: builtin/rm.c:136

4474 #, c-format

4475 msgid "failed to stat '%s'"

4476 msgstr "對 '%s' 呼叫 stat 失敗"

4477

4457 -#: grep.c:1921

4478 +#: grep.c:1923

4479 #, c-format

4480 msgid "'%s': short read"

4481 msgstr "'%s'：讀取不完整"

@@ -4685,7 +4706,7 @@ msgstr "sparse:path 過濾器支援已被刪除"

4706

4707 #: list-objects-filter-options.c:105

4708 #, c-format

4688 -msgid "'%s' for 'object:type=<type>' isnot a valid object type"

4709 +msgid "'%s' for 'object:type=<type>' is not a valid object type"

4710 msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式"

4711

4712 #: list-objects-filter-options.c:124

@@ -4730,7 +4751,7 @@ msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀

4751 msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4752 msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件"

4753

4733 -#: list-objects.c:395

4754 +#: list-objects.c:398

4755 #, c-format

4756 msgid "unable to load root tree for commit %s"

4757 msgstr "無法為提交 %s 載入根樹"

@@ -4776,32 +4797,32 @@ msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"

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

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

4799

4779 -#: merge-ort.c:1116 merge-recursive.c:1205

4800 +#: merge-ort.c:1569 merge-recursive.c:1201

4801 #, c-format

4802 msgid "Failed to merge submodule %s (not checked out)"

4782 -msgstr "無法合併子模組 %s （沒有檢出）"

4803 +msgstr "無法合併子模組 %s （沒有簽出）"

4804

4784 -#: merge-ort.c:1125 merge-recursive.c:1212

4805 +#: merge-ort.c:1578 merge-recursive.c:1208

4806 #, c-format

4807 msgid "Failed to merge submodule %s (commits not present)"

4808 msgstr "無法合併子模組 %s（提交不存在）"

4809

4789 -#: merge-ort.c:1134 merge-recursive.c:1219

4810 +#: merge-ort.c:1587 merge-recursive.c:1215

4811 #, c-format

4812 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4813 msgstr "無法合併子模組 %s （提交未跟隨合併基礎）"

4814

4794 -#: merge-ort.c:1144 merge-ort.c:1151

4815 +#: merge-ort.c:1597 merge-ort.c:1604

4816 #, c-format

4817 msgid "Note: Fast-forwarding submodule %s to %s"

4818 msgstr "注意：正在將 %s 子模組快轉到 %s"

4819

4799 -#: merge-ort.c:1172

4820 +#: merge-ort.c:1625

4821 #, c-format

4822 msgid "Failed to merge submodule %s"

4823 msgstr "無法合併 %s 子模組"

4824

4804 -#: merge-ort.c:1179

4825 +#: merge-ort.c:1632

4826 #, c-format

4827 msgid ""

4828 "Failed to merge submodule %s, but a possible merge resolution exists:\n"

@@ -4810,7 +4831,7 @@ msgstr ""

4831 "無法合併 %s 子模組，但有找到一個可行的合併方案：\n"

4832 "%s\n"

4833

4813 -#: merge-ort.c:1183 merge-recursive.c:1273

4834 +#: merge-ort.c:1636 merge-recursive.c:1269

4835 #, c-format

4836 msgid ""

4837 "If this is correct simply add it to the index for example\n"

@@ -4826,7 +4847,7 @@ msgstr ""

4847 "\n"

4848 "以接受此建議。\n"

4849

4829 -#: merge-ort.c:1196

4850 +#: merge-ort.c:1649

4851 #, c-format

4852 msgid ""

4853 "Failed to merge submodule %s, but multiple possible merges exist:\n"

@@ -4835,21 +4856,21 @@ msgstr ""

4856 "無法合併 %s 子模組，但有找到幾個可行的合併方案：\n"

4857 "%s"

4858

4838 -#: merge-ort.c:1415 merge-recursive.c:1362

4859 +#: merge-ort.c:1868 merge-recursive.c:1358

4860 msgid "Failed to execute internal merge"

4861 msgstr "無法執行內部合併"

4862

4842 -#: merge-ort.c:1420 merge-recursive.c:1367

4863 +#: merge-ort.c:1873 merge-recursive.c:1363

4864 #, c-format

4865 msgid "Unable to add %s to database"

4866 msgstr "不能新增 %s 至物件庫"

4867

4847 -#: merge-ort.c:1427 merge-recursive.c:1400

4868 +#: merge-ort.c:1880 merge-recursive.c:1396

4869 #, c-format

4870 msgid "Auto-merging %s"

4871 msgstr "自動合併 %s"

4872

4852 -#: merge-ort.c:1566 merge-recursive.c:2122

4873 +#: merge-ort.c:2019 merge-recursive.c:2118

4874 #, c-format

4875 msgid ""

4876 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -4858,7 +4879,7 @@ msgstr ""

4879 "衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"

4880 "放在：%s。"

4881

4861 -#: merge-ort.c:1576 merge-recursive.c:2132

4882 +#: merge-ort.c:2029 merge-recursive.c:2128

4883 #, c-format

4884 msgid ""

4885 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -4867,24 +4888,24 @@ msgstr ""

4888 "衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"

4889 "些路徑放置於此：%s"

4890

4870 -#: merge-ort.c:1634

4871 -#, fuzzy, c-format

4891 +#: merge-ort.c:2087

4892 +#, c-format

4893 msgid ""

4894 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "

4895 "renamed to multiple other directories, with no destination getting a "

4896 "majority of the files."

4897 msgstr ""

4877 -"衝突（分割的目錄重新命名）：未知 %s 應重新命名成什麼。其已重新命名為多個其他"

4878 -"目錄，卻沒有目的地取得檔案的主要部分。"

4898 +"衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目"

4899 +"錄，但沒有目的地取得過半檔案。"

4900

4880 -#: merge-ort.c:1788 merge-recursive.c:2468

4901 +#: merge-ort.c:2241 merge-recursive.c:2464

4902 #, c-format

4903 msgid ""

4904 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4905 "renamed."

4906 msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"

4907

4887 -#: merge-ort.c:1932 merge-recursive.c:3244

4908 +#: merge-ort.c:2385 merge-recursive.c:3247

4909 #, c-format

4910 msgid ""

4911 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4892,7 +4913,7 @@ msgid ""

4913 msgstr ""

4914 "路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"

4915

4895 -#: merge-ort.c:1939 merge-recursive.c:3251

4916 +#: merge-ort.c:2392 merge-recursive.c:3254

4917 #, c-format

4918 msgid ""

4919 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4901,7 +4922,7 @@ msgstr ""

4922 "路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"

4923 "其移動到 %5$s。"

4924

4904 -#: merge-ort.c:1952 merge-recursive.c:3247

4925 +#: merge-ort.c:2405 merge-recursive.c:3250

4926 #, c-format

4927 msgid ""

4928 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4910,7 +4931,7 @@ msgstr ""

4931 "衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"

4932 "動到 %s。"

4933

4913 -#: merge-ort.c:1960 merge-recursive.c:3254

4934 +#: merge-ort.c:2413 merge-recursive.c:3257

4935 #, c-format

4936 msgid ""

4937 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4919,14 +4940,14 @@ msgstr ""

4940 "衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "

4941 "中，建議將其移動到 %5$s。"

4942

4922 -#: merge-ort.c:2103

4943 +#: merge-ort.c:2569

4944 #, c-format

4945 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

4946 msgstr ""

4947 "衝突（重新命名/重新命名）：%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 "

4948 "%4$s。"

4949

4929 -#: merge-ort.c:2198

4950 +#: merge-ort.c:2664

4951 #, c-format

4952 msgid ""

4953 "CONFLICT (rename involved in collision): rename of %s -> %s has content "

@@ -4936,65 +4957,65 @@ msgstr ""

4957 "衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可"

4958 "能會因此出現巢狀衝突標記。"

4959

4939 -#: merge-ort.c:2217 merge-ort.c:2241

4960 +#: merge-ort.c:2683 merge-ort.c:2707

4961 #, c-format

4962 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

4963 msgstr ""

4964 "衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。"

4965

4945 -#: merge-ort.c:2550 merge-recursive.c:3002

4966 +#: merge-ort.c:3182 merge-recursive.c:3008

4967 #, c-format

4968 msgid "cannot read object %s"

4969 msgstr "不能讀取物件 %s"

4970

4950 -#: merge-ort.c:2553 merge-recursive.c:3005

4971 +#: merge-ort.c:3185 merge-recursive.c:3011

4972 #, c-format

4973 msgid "object %s is not a blob"

4974 msgstr "物件 %s 不是一個資料物件"

4975

4955 -#: merge-ort.c:2981

4956 -#, fuzzy, c-format

4976 +#: merge-ort.c:3613

4977 +#, c-format

4978 msgid ""

4979 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

4980 "%s instead."

4960 -msgstr "衝突（檔案/目錄）：目錄擋住來自 %2$s 的 %1$s。改移動到 %3$s。"

4981 +msgstr "衝突（檔案/目錄）：目錄佔住 %2$s 中 %1$s 的位置。改移動到 %3$s。"

4982

4962 -#: merge-ort.c:3055

4963 -#, fuzzy, c-format

4983 +#: merge-ort.c:3689

4984 +#, c-format

4985 msgid ""

4986 "CONFLICT (distinct types): %s had different types on each side; renamed both "

4987 "of them so each can be recorded somewhere."

4988 msgstr ""

4968 -"衝突（類型有異）：每個來源的 %s 類型不同。已經重新命名這兩個來源，這樣每個來"

4969 -"源都可以分別記錄。"

4989 +"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分"

4990 +"別記錄這兩方檔案。"

4991

4971 -#: merge-ort.c:3062

4972 -#, fuzzy, c-format

4992 +#: merge-ort.c:3696

4993 +#, c-format

4994 msgid ""

4995 "CONFLICT (distinct types): %s had different types on each side; renamed one "

4996 "of them so each can be recorded somewhere."

4997 msgstr ""

4977 -"衝突（類型有異）：每個來源的 %s 類型不同。已經重新命名其中一個來源，這樣每個"

4978 -"來源都可以分別記錄。"

4998 +"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以"

4999 +"分別記錄這兩方檔案。"

5000

4980 -#: merge-ort.c:3162 merge-recursive.c:3081

5001 +#: merge-ort.c:3796 merge-recursive.c:3087

5002 msgid "content"

5003 msgstr "內容"

5004

4984 -#: merge-ort.c:3164 merge-recursive.c:3085

5005 +#: merge-ort.c:3798 merge-recursive.c:3091

5006 msgid "add/add"

5007 msgstr "新增/新增"

5008

4988 -#: merge-ort.c:3166 merge-recursive.c:3130

5009 +#: merge-ort.c:3800 merge-recursive.c:3136

5010 msgid "submodule"

5011 msgstr "子模組"

5012

4992 -#: merge-ort.c:3168 merge-recursive.c:3131

5013 +#: merge-ort.c:3802 merge-recursive.c:3137

5014 #, c-format

5015 msgid "CONFLICT (%s): Merge conflict in %s"

5016 msgstr "衝突（%s）：合併衝突於 %s"

5017

4997 -#: merge-ort.c:3198

5018 +#: merge-ort.c:3833

5019 #, c-format

5020 msgid ""

5021 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

@@ -5003,7 +5024,7 @@ msgstr ""

5024 "衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"

5025 "上。"

5026

5006 -#: merge-ort.c:3433

5027 +#: merge-ort.c:4120

5028 #, c-format

5029 msgid ""

5030 "Note: %s not up to date and in way of checking out conflicted version; old "

@@ -5013,12 +5034,12 @@ msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重

5034 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

5035 #. base, and 2-3) the trees for the two trees we're merging.

5036 #.

5016 -#: merge-ort.c:3730

5037 +#: merge-ort.c:4487

5038 #, c-format

5039 msgid "collecting merge info failed for trees %s, %s, %s"

5040 msgstr "%s, %s, %s 樹的合併資訊收集失敗"

5041

5021 -#: merge-ort-wrappers.c:13 merge-recursive.c:3699

5042 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702

5043 #, c-format

5044 msgid ""

5045 "Your local changes to the following files would be overwritten by merge:\n"

@@ -5027,103 +5048,103 @@ msgstr ""

5048 "您對下列檔案的本機修改將被合併動作覆蓋：\n"

5049 " %s"

5050

5030 -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402

5051 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402

5052 msgid "Already up to date."

5053 msgstr "已經是最新的。"

5054

5034 -#: merge-recursive.c:356

5055 +#: merge-recursive.c:352

5056 msgid "(bad commit)\n"

5057 msgstr "（壞提交）\n"

5058

5038 -#: merge-recursive.c:379

5059 +#: merge-recursive.c:375

5060 #, c-format

5061 msgid "add_cacheinfo failed for path '%s'; merge aborting."

5062 msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。"

5063

5043 -#: merge-recursive.c:388

5064 +#: merge-recursive.c:384

5065 #, c-format

5066 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

5067 msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。"

5068

5048 -#: merge-recursive.c:876

5069 +#: merge-recursive.c:872

5070 #, c-format

5071 msgid "failed to create path '%s'%s"

5072 msgstr "建立路徑 '%s'%s 失敗"

5073

5053 -#: merge-recursive.c:887

5074 +#: merge-recursive.c:883

5075 #, c-format

5076 msgid "Removing %s to make room for subdirectory\n"

5077 msgstr "刪除 %s 以便為子目錄留出空間\n"

5078

5058 -#: merge-recursive.c:901 merge-recursive.c:920

5079 +#: merge-recursive.c:897 merge-recursive.c:916

5080 msgid ": perhaps a D/F conflict?"

5081 msgstr "：可能是一個目錄/檔案衝突？"

5082

5062 -#: merge-recursive.c:910

5083 +#: merge-recursive.c:906

5084 #, c-format

5085 msgid "refusing to lose untracked file at '%s'"

5086 msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"

5087

5067 -#: merge-recursive.c:951 builtin/cat-file.c:41

5088 +#: merge-recursive.c:947 builtin/cat-file.c:41

5089 #, c-format

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

5091 msgstr "不能讀取物件 %s '%s'"

5092

5072 -#: merge-recursive.c:956

5093 +#: merge-recursive.c:952

5094 #, c-format

5095 msgid "blob expected for %s '%s'"

5096 msgstr "%s '%s' 應為資料物件"

5097

5077 -#: merge-recursive.c:981

5098 +#: merge-recursive.c:977

5099 #, c-format

5100 msgid "failed to open '%s': %s"

5101 msgstr "開啟 '%s' 失敗：%s"

5102

5082 -#: merge-recursive.c:992

5103 +#: merge-recursive.c:988

5104 #, c-format

5105 msgid "failed to symlink '%s': %s"

5106 msgstr "建立符號連結 '%s' 失敗：%s"

5107

5087 -#: merge-recursive.c:997

5108 +#: merge-recursive.c:993

5109 #, c-format

5110 msgid "do not know what to do with %06o %s '%s'"

5111 msgstr "不知道如何處理 %06o %s '%s'"

5112

5092 -#: merge-recursive.c:1227 merge-recursive.c:1239

5113 +#: merge-recursive.c:1223 merge-recursive.c:1235

5114 #, c-format

5115 msgid "Fast-forwarding submodule %s to the following commit:"

5116 msgstr "子模組 %s 快轉到如下提交："

5117

5097 -#: merge-recursive.c:1230 merge-recursive.c:1242

5118 +#: merge-recursive.c:1226 merge-recursive.c:1238

5119 #, c-format

5120 msgid "Fast-forwarding submodule %s"

5121 msgstr "快轉子模組 %s"

5122

5102 -#: merge-recursive.c:1265

5123 +#: merge-recursive.c:1261

5124 #, c-format

5125 msgid "Failed to merge submodule %s (merge following commits not found)"

5126 msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）"

5127

5107 -#: merge-recursive.c:1269

5128 +#: merge-recursive.c:1265

5129 #, c-format

5130 msgid "Failed to merge submodule %s (not fast-forward)"

5131 msgstr "無法合併子模組 %s（非快轉）"

5132

5112 -#: merge-recursive.c:1270

5133 +#: merge-recursive.c:1266

5134 msgid "Found a possible merge resolution for the submodule:\n"

5135 msgstr "找到子模組的一個可能的合併方案：\n"

5136

5116 -#: merge-recursive.c:1282

5137 +#: merge-recursive.c:1278

5138 #, c-format

5139 msgid "Failed to merge submodule %s (multiple merges found)"

5140 msgstr "無法合併子模組 %s （發現多個合併）"

5141

5121 -#: merge-recursive.c:1424

5142 +#: merge-recursive.c:1420

5143 #, c-format

5144 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

5145 msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。"

5146

5126 -#: merge-recursive.c:1496

5147 +#: merge-recursive.c:1492

5148 #, c-format

5149 msgid ""

5150 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -5132,7 +5153,7 @@ msgstr ""

5153 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

5154 "本被保留。"

5155

5135 -#: merge-recursive.c:1501

5156 +#: merge-recursive.c:1497

5157 #, c-format

5158 msgid ""

5159 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -5141,7 +5162,7 @@ msgstr ""

5162 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

5163 "%7$s 版本被保留。"

5164

5144 -#: merge-recursive.c:1508

5165 +#: merge-recursive.c:1504

5166 #, c-format

5167 msgid ""

5168 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -5150,7 +5171,7 @@ msgstr ""

5171 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

5172 "本保留在 %8$s 中。"

5173

5153 -#: merge-recursive.c:1513

5174 +#: merge-recursive.c:1509

5175 #, c-format

5176 msgid ""

5177 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -5159,41 +5180,41 @@ msgstr ""

5180 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

5181 "%7$s 版本保留在 %9$s 中。"

5182

5162 -#: merge-recursive.c:1548

5183 +#: merge-recursive.c:1544

5184 msgid "rename"

5185 msgstr "重新命名"

5186

5166 -#: merge-recursive.c:1548

5187 +#: merge-recursive.c:1544

5188 msgid "renamed"

5189 msgstr "重新命名"

5190

5170 -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158

5191 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164

5192 #, c-format

5193 msgid "Refusing to lose dirty file at %s"

5194 msgstr "拒絕遺失髒檔案 '%s'"

5195

5175 -#: merge-recursive.c:1609

5196 +#: merge-recursive.c:1605

5197 #, c-format

5198 msgid "Refusing to lose untracked file at %s, even though it's in the way."

5199 msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。"

5200

5180 -#: merge-recursive.c:1667

5201 +#: merge-recursive.c:1663

5202 #, c-format

5203 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

5204 msgstr ""

5205 "衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"

5206

5186 -#: merge-recursive.c:1698

5207 +#: merge-recursive.c:1694

5208 #, c-format

5209 msgid "%s is a directory in %s adding as %s instead"

5210 msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增"

5211

5191 -#: merge-recursive.c:1703

5212 +#: merge-recursive.c:1699

5213 #, c-format

5214 msgid "Refusing to lose untracked file at %s; adding as %s instead"

5215 msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s"

5216

5196 -#: merge-recursive.c:1730

5217 +#: merge-recursive.c:1726

5218 #, c-format

5219 msgid ""

5220 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -5202,18 +5223,18 @@ msgstr ""

5223 "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在"

5224 "分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s"

5225

5205 -#: merge-recursive.c:1735

5226 +#: merge-recursive.c:1731

5227 msgid " (left unresolved)"

5228 msgstr " （留下未解決）"

5229

5209 -#: merge-recursive.c:1827

5230 +#: merge-recursive.c:1823

5231 #, c-format

5232 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

5233 msgstr ""

5234 "衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 "

5235 "%4$s->%5$s"

5236

5216 -#: merge-recursive.c:2090

5237 +#: merge-recursive.c:2086

5238 #, c-format

5239 msgid ""

5240 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -5223,7 +5244,7 @@ msgstr ""

5244 "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"

5245 "多個其它目錄，沒有目錄包含大部分檔案。"

5246

5226 -#: merge-recursive.c:2224

5247 +#: merge-recursive.c:2220

5248 #, c-format

5249 msgid ""

5250 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -5232,77 +5253,77 @@ msgstr ""

5253 "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"

5254 "命名目錄 %4$s->%5$s"

5255

5235 -#: merge-recursive.c:3069

5256 +#: merge-recursive.c:3075

5257 msgid "modify"

5258 msgstr "修改"

5259

5239 -#: merge-recursive.c:3069

5260 +#: merge-recursive.c:3075

5261 msgid "modified"

5262 msgstr "修改"

5263

5243 -#: merge-recursive.c:3108

5264 +#: merge-recursive.c:3114

5265 #, c-format

5266 msgid "Skipped %s (merged same as existing)"

5267 msgstr "略過 %s（已經做過相同合併）"

5268

5248 -#: merge-recursive.c:3161

5269 +#: merge-recursive.c:3167

5270 #, c-format

5271 msgid "Adding as %s instead"

5272 msgstr "而是以 %s 為名新增"

5273

5253 -#: merge-recursive.c:3368

5274 +#: merge-recursive.c:3371

5275 #, c-format

5276 msgid "Removing %s"

5277 msgstr "刪除 %s"

5278

5258 -#: merge-recursive.c:3391

5279 +#: merge-recursive.c:3394

5280 msgid "file/directory"

5281 msgstr "檔案/目錄"

5282

5262 -#: merge-recursive.c:3396

5283 +#: merge-recursive.c:3399

5284 msgid "directory/file"

5285 msgstr "目錄/檔案"

5286

5266 -#: merge-recursive.c:3403

5287 +#: merge-recursive.c:3406

5288 #, c-format

5289 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

5290 msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s"

5291

5271 -#: merge-recursive.c:3412

5292 +#: merge-recursive.c:3415

5293 #, c-format

5294 msgid "Adding %s"

5295 msgstr "新增 %s"

5296

5276 -#: merge-recursive.c:3421

5297 +#: merge-recursive.c:3424

5298 #, c-format

5299 msgid "CONFLICT (add/add): Merge conflict in %s"

5300 msgstr "衝突（add/add）：合併衝突於 %s"

5301

5281 -#: merge-recursive.c:3474

5302 +#: merge-recursive.c:3477

5303 #, c-format

5304 msgid "merging of trees %s and %s failed"

5305 msgstr "無法合併樹 %s 和 %s"

5306

5286 -#: merge-recursive.c:3568

5307 +#: merge-recursive.c:3571

5308 msgid "Merging:"

5309 msgstr "合併："

5310

5290 -#: merge-recursive.c:3581

5311 +#: merge-recursive.c:3584

5312 #, c-format

5313 msgid "found %u common ancestor:"

5314 msgid_plural "found %u common ancestors:"

5315 msgstr[0] "發現 %u 個共同祖先："

5316

5296 -#: merge-recursive.c:3631

5317 +#: merge-recursive.c:3634

5318 msgid "merge returned no commit"

5319 msgstr "合併未返回提交"

5320

5300 -#: merge-recursive.c:3796

5321 +#: merge-recursive.c:3799

5322 #, c-format

5323 msgid "Could not parse object '%s'"

5324 msgstr "不能解析物件 '%s'"

5325

5305 -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900

5326 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901

5327 #: builtin/stash.c:473

5328 msgid "Unable to write index."

5329 msgstr "不能寫入索引。"

@@ -5311,8 +5332,8 @@ msgstr "不能寫入索引。"

5332 msgid "failed to read the cache"

5333 msgstr "讀取快取失敗"

5334

5314 -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965

5315 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821

5335 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966

5336 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821

5337 #: builtin/stash.c:267

5338 msgid "unable to write new index file"

5339 msgstr "無法寫新的索引檔案"

@@ -5386,106 +5407,114 @@ msgstr "開啟包索引 '%s' 失敗"

5407 msgid "failed to locate object %d in packfile"

5408 msgstr "在 packfile 中定位物件 %d 失敗"

5409

5389 -#: midx.c:880 builtin/index-pack.c:1535

5410 +#: midx.c:880 builtin/index-pack.c:1533

5411 msgid "cannot store reverse index file"

5412 msgstr "無法儲存倒排索引檔案"

5413

5393 -#: midx.c:933

5414 +#: midx.c:920

5415 +msgid "ignoring existing multi-pack-index; checksum mismatch"

5416 +msgstr "忽略現有的多包索引：總和檢查碼不符"

5417 +

5418 +#: midx.c:943

5419 msgid "Adding packfiles to multi-pack-index"

5420 msgstr "正在新增 packfile 至多包索引"

5421

5397 -#: midx.c:979

5422 +#: midx.c:989

5423 #, c-format

5424 msgid "did not see pack-file %s to drop"

5425 msgstr "沒有看到要捨棄的包檔案 %s"

5426

5402 -#: midx.c:1024

5427 +#: midx.c:1034

5428 #, c-format

5429 msgid "unknown preferred pack: '%s'"

5430 msgstr "未知偏好包：「%s」"

5431

5407 -#: midx.c:1029

5432 +#: midx.c:1039

5433 #, c-format

5434 msgid "preferred pack '%s' is expired"

5435 msgstr "偏好包「%s」已經過期"

5436

5412 -#: midx.c:1045

5437 +#: midx.c:1055

5438 msgid "no pack files to index."

5439 msgstr "沒有要索引的 pack 檔案。"

5440

5416 -#: midx.c:1125 builtin/clean.c:37

5441 +#: midx.c:1135 builtin/clean.c:37

5442 #, c-format

5443 msgid "failed to remove %s"

5444 msgstr "刪除 %s 失敗"

5445

5421 -#: midx.c:1156

5446 +#: midx.c:1166

5447 #, c-format

5448 msgid "failed to clear multi-pack-index at %s"

5449 msgstr "清理位於 %s 的多包索引失敗"

5450

5426 -#: midx.c:1214

5451 +#: midx.c:1225

5452 msgid "multi-pack-index file exists, but failed to parse"

5453 msgstr "有 multi-pack-index 檔案，但無法解析"

5454

5430 -#: midx.c:1222

5455 +#: midx.c:1233

5456 +msgid "incorrect checksum"

5457 +msgstr "總和檢查碼不正確"

5458 +

5459 +#: midx.c:1236

5460 msgid "Looking for referenced packfiles"

5461 msgstr "正在尋找引用的 packfile"

5462

5434 -#: midx.c:1237

5463 +#: midx.c:1251

5464 #, c-format

5465 msgid ""

5466 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5467 msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5468

5440 -#: midx.c:1242

5469 +#: midx.c:1256

5470 msgid "the midx contains no oid"

5471 msgstr "midx 沒有 oid"

5472

5444 -#: midx.c:1251

5473 +#: midx.c:1265

5474 msgid "Verifying OID order in multi-pack-index"

5475 msgstr "正在驗證多包索引中的物件 ID 順序"

5476

5448 -#: midx.c:1260

5477 +#: midx.c:1274

5478 #, c-format

5479 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5480 msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"

5481

5453 -#: midx.c:1280

5482 +#: midx.c:1294

5483 msgid "Sorting objects by packfile"

5484 msgstr "透過 packfile 為物件排序"

5485

5457 -#: midx.c:1287

5486 +#: midx.c:1301

5487 msgid "Verifying object offsets"

5488 msgstr "正在驗證物件位移"

5489

5461 -#: midx.c:1303

5490 +#: midx.c:1317

5491 #, c-format

5492 msgid "failed to load pack entry for oid[%d] = %s"

5493 msgstr "為 oid[%d] = %s 載入包條目失敗"

5494

5466 -#: midx.c:1309

5495 +#: midx.c:1323

5496 #, c-format

5497 msgid "failed to load pack-index for packfile %s"

5498 msgstr "為 packfile %s 載入包索引失敗"

5499

5471 -#: midx.c:1318

5500 +#: midx.c:1332

5501 #, c-format

5502 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5503 msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"

5504

5476 -#: midx.c:1343

5505 +#: midx.c:1357

5506 msgid "Counting referenced objects"

5507 msgstr "正在計算引用物件"

5508

5480 -#: midx.c:1353

5509 +#: midx.c:1367

5510 msgid "Finding and deleting unreferenced packfiles"

5511 msgstr "正在尋找並刪除沒有參考的 packfile"

5512

5484 -#: midx.c:1544

5513 +#: midx.c:1558

5514 msgid "could not start pack-objects"

5515 msgstr "不能開始 pack-objects"

5516

5488 -#: midx.c:1564

5517 +#: midx.c:1578

5518 msgid "could not finish pack-objects"

5519 msgstr "不能結束 pack-objects"

5520

@@ -5548,265 +5577,266 @@ msgstr "壞的 %s 值：'%s'"

5577 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5578 msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"

5579

5551 -#: object-file.c:577

5580 +#: object-file.c:584

5581 #, c-format

5582 msgid "unable to normalize alternate object path: %s"

5583 msgstr "無法規範化備用物件路徑：%s"

5584

5556 -#: object-file.c:649

5585 +#: object-file.c:658

5586 #, c-format

5587 msgid "%s: ignoring alternate object stores, nesting too deep"

5588 msgstr "%s：忽略備用物件庫，嵌套太深"

5589

5561 -#: object-file.c:656

5590 +#: object-file.c:665

5591 #, c-format

5592 msgid "unable to normalize object directory: %s"

5593 msgstr "無法規範化物件目錄: %s"

5594

5566 -#: object-file.c:699

5595 +#: object-file.c:708

5596 msgid "unable to fdopen alternates lockfile"

5597 msgstr "無法 fdopen 取代鎖檔案"

5598

5570 -#: object-file.c:717

5599 +#: object-file.c:726

5600 msgid "unable to read alternates file"

5601 msgstr "無法讀取替代檔案"

5602

5574 -#: object-file.c:724

5603 +#: object-file.c:733

5604 msgid "unable to move new alternates file into place"

5605 msgstr "無法將新的替代檔案移動到位"

5606

5578 -#: object-file.c:759

5607 +#: object-file.c:768

5608 #, c-format

5609 msgid "path '%s' does not exist"

5610 msgstr "路徑 '%s' 不存在"

5611

5583 -#: object-file.c:780

5612 +#: object-file.c:789

5613 #, c-format

5614 msgid "reference repository '%s' as a linked checkout is not supported yet."

5586 -msgstr "尚不支援將參考版本庫 '%s' 作為一個連結檢出。"

5615 +msgstr "尚不支援將參考版本庫 '%s' 作為一個連結簽出。"

5616

5588 -#: object-file.c:786

5617 +#: object-file.c:795

5618 #, c-format

5619 msgid "reference repository '%s' is not a local repository."

5620 msgstr "參考版本庫 '%s' 不是一個本機版本庫。"

5621

5593 -#: object-file.c:792

5622 +#: object-file.c:801

5623 #, c-format

5624 msgid "reference repository '%s' is shallow"

5625 msgstr "參考版本庫 '%s' 是一個淺複製"

5626

5598 -#: object-file.c:800

5627 +#: object-file.c:809

5628 #, c-format

5629 msgid "reference repository '%s' is grafted"

5630 msgstr "參考版本庫 '%s' 已被移植"

5631

5603 -#: object-file.c:860

5632 +#: object-file.c:869

5633 #, c-format

5634 msgid "invalid line while parsing alternate refs: %s"

5635 msgstr "解析備用引用時無效的行：%s"

5636

5608 -#: object-file.c:1010

5637 +#: object-file.c:1019

5638 #, c-format

5639 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5640 msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>"

5641

5613 -#: object-file.c:1031

5614 -msgid "mmap failed"

5615 -msgstr "mmap 失敗"

5642 +#: object-file.c:1054

5643 +#, c-format

5644 +msgid "mmap failed%s"

5645 +msgstr "mmap 失敗%s"

5646

5617 -#: object-file.c:1195

5647 +#: object-file.c:1218

5648 #, c-format

5649 msgid "object file %s is empty"

5650 msgstr "物件檔案 %s 為空"

5651

5622 -#: object-file.c:1330 object-file.c:2524

5652 +#: object-file.c:1353 object-file.c:2548

5653 #, c-format

5654 msgid "corrupt loose object '%s'"

5655 msgstr "損壞的鬆散物件 '%s'"

5656

5627 -#: object-file.c:1332 object-file.c:2528

5657 +#: object-file.c:1355 object-file.c:2552

5658 #, c-format

5659 msgid "garbage at end of loose object '%s'"

5660 msgstr "鬆散物件 '%s' 後面有垃圾資料"

5661

5632 -#: object-file.c:1374

5662 +#: object-file.c:1397

5663 msgid "invalid object type"

5664 msgstr "無效的物件類型"

5665

5636 -#: object-file.c:1458

5666 +#: object-file.c:1481

5667 #, c-format

5668 msgid "unable to unpack %s header with --allow-unknown-type"

5669 msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"

5670

5641 -#: object-file.c:1461

5671 +#: object-file.c:1484

5672 #, c-format

5673 msgid "unable to unpack %s header"

5674 msgstr "無法解開 %s 頭部"

5675

5646 -#: object-file.c:1467

5676 +#: object-file.c:1490

5677 #, c-format

5678 msgid "unable to parse %s header with --allow-unknown-type"

5679 msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"

5680

5651 -#: object-file.c:1470

5681 +#: object-file.c:1493

5682 #, c-format

5683 msgid "unable to parse %s header"

5684 msgstr "無法解析 %s 頭部"

5685

5656 -#: object-file.c:1697

5686 +#: object-file.c:1717

5687 #, c-format

5688 msgid "failed to read object %s"

5689 msgstr "讀取物件 %s 失敗"

5690

5661 -#: object-file.c:1701

5691 +#: object-file.c:1721

5692 #, c-format

5693 msgid "replacement %s not found for %s"

5694 msgstr "找不到 %2$s 的替代 %1$s"

5695

5666 -#: object-file.c:1705

5696 +#: object-file.c:1725

5697 #, c-format

5698 msgid "loose object %s (stored in %s) is corrupt"

5699 msgstr "鬆散物件 %s（儲存在 %s）已損壞"

5700

5671 -#: object-file.c:1709

5701 +#: object-file.c:1729

5702 #, c-format

5703 msgid "packed object %s (stored in %s) is corrupt"

5704 msgstr "打包物件 %s（儲存在 %s）已損壞"

5705

5676 -#: object-file.c:1814

5706 +#: object-file.c:1834

5707 #, c-format

5708 msgid "unable to write file %s"

5709 msgstr "無法寫檔案 %s"

5710

5681 -#: object-file.c:1821

5711 +#: object-file.c:1841

5712 #, c-format

5713 msgid "unable to set permission to '%s'"

5714 msgstr "無法為 '%s' 設定權限"

5715

5686 -#: object-file.c:1828

5716 +#: object-file.c:1848

5717 msgid "file write error"

5718 msgstr "檔案寫錯誤"

5719

5690 -#: object-file.c:1848

5720 +#: object-file.c:1868

5721 msgid "error when closing loose object file"

5722 msgstr "關閉鬆散物件檔案時發生錯誤"

5723

5694 -#: object-file.c:1913

5724 +#: object-file.c:1933

5725 #, c-format

5726 msgid "insufficient permission for adding an object to repository database %s"

5727 msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件"

5728

5699 -#: object-file.c:1915

5729 +#: object-file.c:1935

5730 msgid "unable to create temporary file"

5731 msgstr "無法建立暫存檔"

5732

5703 -#: object-file.c:1939

5733 +#: object-file.c:1959

5734 msgid "unable to write loose object file"

5735 msgstr "不能寫鬆散物件檔案"

5736

5707 -#: object-file.c:1945

5737 +#: object-file.c:1965

5738 #, c-format

5739 msgid "unable to deflate new object %s (%d)"

5740 msgstr "不能壓縮新物件 %s（%d）"

5741

5712 -#: object-file.c:1949

5742 +#: object-file.c:1969

5743 #, c-format

5744 msgid "deflateEnd on object %s failed (%d)"

5745 msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"

5746

5717 -#: object-file.c:1953

5747 +#: object-file.c:1973

5748 #, c-format

5749 msgid "confused by unstable object source data for %s"

5750 msgstr "被 %s 的不穩定物件源資料搞糊塗了"

5751

5722 -#: object-file.c:1963 builtin/pack-objects.c:1097

5752 +#: object-file.c:1983 builtin/pack-objects.c:1237

5753 #, c-format

5754 msgid "failed utime() on %s"

5755 msgstr "在 %s 上呼叫 utime() 失敗"

5756

5727 -#: object-file.c:2040

5757 +#: object-file.c:2060

5758 #, c-format

5759 msgid "cannot read object for %s"

5760 msgstr "不能讀取物件 %s"

5761

5732 -#: object-file.c:2091

5762 +#: object-file.c:2111

5763 msgid "corrupt commit"

5764 msgstr "損壞的提交"

5765

5736 -#: object-file.c:2099

5766 +#: object-file.c:2119

5767 msgid "corrupt tag"

5768 msgstr "損壞的標籤"

5769

5740 -#: object-file.c:2199

5770 +#: object-file.c:2219

5771 #, c-format

5772 msgid "read error while indexing %s"

5773 msgstr "索引 %s 時讀取錯誤"

5774

5745 -#: object-file.c:2202

5775 +#: object-file.c:2222

5776 #, c-format

5777 msgid "short read while indexing %s"

5778 msgstr "索引 %s 時讀入不完整"

5779

5750 -#: object-file.c:2275 object-file.c:2285

5780 +#: object-file.c:2295 object-file.c:2305

5781 #, c-format

5782 msgid "%s: failed to insert into database"

5783 msgstr "%s：插入資料庫失敗"

5784

5755 -#: object-file.c:2291

5785 +#: object-file.c:2311

5786 #, c-format

5787 msgid "%s: unsupported file type"

5788 msgstr "%s：不支援的檔案類型"

5789

5760 -#: object-file.c:2315

5790 +#: object-file.c:2335

5791 #, c-format

5792 msgid "%s is not a valid object"

5793 msgstr "%s 不是一個有效的物件"

5794

5765 -#: object-file.c:2317

5795 +#: object-file.c:2337

5796 #, c-format

5797 msgid "%s is not a valid '%s' object"

5798 msgstr "%s 不是一個有效的 '%s' 物件"

5799

5770 -#: object-file.c:2344 builtin/index-pack.c:192

5800 +#: object-file.c:2364 builtin/index-pack.c:192

5801 #, c-format

5802 msgid "unable to open %s"

5803 msgstr "不能開啟 %s"

5804

5775 -#: object-file.c:2535 object-file.c:2588

5805 +#: object-file.c:2559 object-file.c:2612

5806 #, c-format

5807 msgid "hash mismatch for %s (expected %s)"

5808 msgstr "%s 的雜湊值不符合（預期 %s）"

5809

5780 -#: object-file.c:2559

5810 +#: object-file.c:2583

5811 #, c-format

5812 msgid "unable to mmap %s"

5813 msgstr "不能 mmap %s"

5814

5785 -#: object-file.c:2564

5815 +#: object-file.c:2588

5816 #, c-format

5817 msgid "unable to unpack header of %s"

5818 msgstr "無法解壓縮 %s 的頭部"

5819

5790 -#: object-file.c:2570

5820 +#: object-file.c:2594

5821 #, c-format

5822 msgid "unable to parse header of %s"

5823 msgstr "無法解析 %s 的頭部"

5824

5795 -#: object-file.c:2581

5825 +#: object-file.c:2605

5826 #, c-format

5827 msgid "unable to unpack contents of %s"

5828 msgstr "無法解壓縮 %s 的內容"

5829

5800 -#: object-name.c:486

5830 +#: object-name.c:480

5831 #, c-format

5832 msgid "short object ID %s is ambiguous"

5833 msgstr "短物件 ID %s 存在歧義"

5834

5805 -#: object-name.c:497

5835 +#: object-name.c:491

5836 msgid "The candidates are:"

5837 msgstr "候選者有："

5838

5809 -#: object-name.c:796

5839 +#: object-name.c:790

5840 msgid ""

5841 "Git normally never creates a ref that ends with 40 hex characters\n"

5842 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -5828,22 +5858,22 @@ msgstr ""

5858 "請檢查這些引用，並視需要刪除。執行\n"

5859 "「git config advice.objectNameWarning false」命令以關閉本訊息通知"

5860

5831 -#: object-name.c:916

5861 +#: object-name.c:910

5862 #, c-format

5863 msgid "log for '%.*s' only goes back to %s"

5864 msgstr "'%.*s' 的日誌只能回到 %s"

5865

5836 -#: object-name.c:924

5866 +#: object-name.c:918

5867 #, c-format

5868 msgid "log for '%.*s' only has %d entries"

5869 msgstr "'%.*s' 的日誌只有 %d 個項目"

5870

5841 -#: object-name.c:1702

5871 +#: object-name.c:1696

5872 #, c-format

5873 msgid "path '%s' exists on disk, but not in '%.*s'"

5874 msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'"

5875

5846 -#: object-name.c:1708

5876 +#: object-name.c:1702

5877 #, c-format

5878 msgid ""

5879 "path '%s' exists, but not '%s'\n"

@@ -5852,12 +5882,12 @@ msgstr ""

5882 "'%s' 路徑存在，但不是 '%s'\n"

5883 "提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？"

5884

5855 -#: object-name.c:1717

5885 +#: object-name.c:1711

5886 #, c-format

5887 msgid "path '%s' does not exist in '%.*s'"

5888 msgstr "'%s' 路徑不存在於 '%.*s'"

5889

5860 -#: object-name.c:1745

5890 +#: object-name.c:1739

5891 #, c-format

5892 msgid ""

5893 "path '%s' is in the index, but not at stage %d\n"

@@ -5866,7 +5896,7 @@ msgstr ""

5896 "'%s' 路徑在索引，但不在 %d 暫存區\n"

5897 "提示：你在說 ':%d:%s' 嗎？"

5898

5869 -#: object-name.c:1761

5899 +#: object-name.c:1755

5900 #, c-format

5901 msgid ""

5902 "path '%s' is in the index, but not '%s'\n"

@@ -5875,21 +5905,21 @@ msgstr ""

5905 "'%s' 路徑在索引，但不是 '%s'\n"

5906 "提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？"

5907

5878 -#: object-name.c:1769

5908 +#: object-name.c:1763

5909 #, c-format

5910 msgid "path '%s' exists on disk, but not in the index"

5911 msgstr "磁碟上存在 '%s' 路徑，但不在索引中"

5912

5883 -#: object-name.c:1771

5913 +#: object-name.c:1765

5914 #, c-format

5915 msgid "path '%s' does not exist (neither on disk nor in the index)"

5916 msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)"

5917

5888 -#: object-name.c:1784

5918 +#: object-name.c:1778

5919 msgid "relative path syntax can't be used outside working tree"

5920 msgstr "相對路徑與法不能用在工作區外"

5921

5892 -#: object-name.c:1922

5922 +#: object-name.c:1916

5923 #, c-format

5924 msgid "invalid object name '%.*s'."

5925 msgstr "'%.*s' 物件名稱無效。"

@@ -5904,27 +5934,27 @@ msgstr "無效的物件類型 \"%s\""

5934 msgid "object %s is a %s, not a %s"

5935 msgstr "物件 %s 是一個 %s，不是一個 %s"

5936

5907 -#: object.c:232

5937 +#: object.c:250

5938 #, c-format

5939 msgid "object %s has unknown type id %d"

5940 msgstr "物件 %s 有未知的類型 id %d"

5941

5912 -#: object.c:245

5942 +#: object.c:263

5943 #, c-format

5944 msgid "unable to parse object: %s"

5945 msgstr "不能解析物件：%s"

5946

5917 -#: object.c:265 object.c:277

5947 +#: object.c:283 object.c:295

5948 #, c-format

5949 msgid "hash mismatch %s"

5950 msgstr "雜湊值與 %s 不符合"

5951

5922 -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251

5952 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411

5953 #, c-format

5954 msgid "unable to get size of %s"

5955 msgstr "不能得到 %s 的大小"

5956

5927 -#: pack-bitmap.c:1547 builtin/rev-list.c:92

5957 +#: pack-bitmap.c:1571 builtin/rev-list.c:92

5958 #, c-format

5959 msgid "unable to get disk usage of %s"

5960 msgstr "無法取得 %s 的磁碟用量"

@@ -5977,12 +6007,17 @@ msgstr "無法寫入「%s」promisor 檔案"

6007 msgid "offset before end of packfile (broken .idx?)"

6008 msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"

6009

5980 -#: packfile.c:1937

6010 +#: packfile.c:655

6011 +#, c-format

6012 +msgid "packfile %s cannot be mapped%s"

6013 +msgstr "包檔案 %s 無法映射%s"

6014 +

6015 +#: packfile.c:1934

6016 #, c-format

6017 msgid "offset before start of pack index for %s (corrupt index?)"

6018 msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"

6019

5985 -#: packfile.c:1941

6020 +#: packfile.c:1938

6021 #, c-format

6022 msgid "offset beyond end of pack index for %s (truncated index?)"

6023 msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"

@@ -6184,8 +6219,8 @@ msgid "unable to write delim packet"

6219 msgstr "無法寫 delim 包"

6220

6221 #: pkt-line.c:106

6187 -msgid "unable to write stateless separator packet"

6188 -msgstr "無法寫入無狀態的分隔符號封包"

6222 +msgid "unable to write response end packet"

6223 +msgstr "無法寫入回應結尾封包"

6224

6225 #: pkt-line.c:113

6226 msgid "flush packet write failed"

@@ -6244,19 +6279,19 @@ msgstr "無法建立執行緒 lstat：%s"

6279 msgid "unable to parse --pretty format"

6280 msgstr "不能解析 --pretty 格式"

6281

6247 -#: promisor-remote.c:30

6282 +#: promisor-remote.c:31

6283 msgid "promisor-remote: unable to fork off fetch subprocess"

6284 msgstr "promisor-remote: 無法 fork fetch 子處理程序"

6285

6251 -#: promisor-remote.c:35 promisor-remote.c:37

6286 +#: promisor-remote.c:38 promisor-remote.c:40

6287 msgid "promisor-remote: could not write to fetch subprocess"

6288 msgstr "promisor-remote: 無法寫入 fetch 子處理程序"

6289

6255 -#: promisor-remote.c:41

6290 +#: promisor-remote.c:44

6291 msgid "promisor-remote: could not close stdin to fetch subprocess"

6292 msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin"

6293

6259 -#: promisor-remote.c:53

6294 +#: promisor-remote.c:54

6295 #, c-format

6296 msgid "promisor remote name cannot begin with '/': %s"

6297 msgstr "promisor 遠端名稱不能以 '/' 開始：%s"

@@ -6277,7 +6312,7 @@ msgstr "不能啟動 `log`"

6312 msgid "could not read `log` output"

6313 msgstr "不能讀取 `log` 的輸出"

6314

6280 -#: range-diff.c:101 sequencer.c:5551

6315 +#: range-diff.c:101 sequencer.c:5550

6316 #, c-format

6317 msgid "could not parse commit '%s'"

6318 msgstr "不能解析提交 '%s'"

@@ -6294,63 +6329,63 @@ msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s

6329 msgid "could not parse git header '%.*s'"

6330 msgstr "無法解析 git 頭 '%.*s'"

6331

6297 -#: range-diff.c:306

6332 +#: range-diff.c:307

6333 msgid "failed to generate diff"

6334 msgstr "生成 diff 失敗"

6335

6301 -#: range-diff.c:558

6336 +#: range-diff.c:559

6337 msgid "--left-only and --right-only are mutually exclusive"

6338 msgstr "--left-only 和 --right-only 互斥"

6339

6305 -#: range-diff.c:561 range-diff.c:563

6340 +#: range-diff.c:562 range-diff.c:564

6341 #, c-format

6342 msgid "could not parse log for '%s'"

6343 msgstr "不能解析 '%s' 的日誌"

6344

6310 -#: read-cache.c:708

6345 +#: read-cache.c:710

6346 #, c-format

6347 msgid "will not add file alias '%s' ('%s' already exists in index)"

6348 msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）"

6349

6315 -#: read-cache.c:724

6350 +#: read-cache.c:726

6351 msgid "cannot create an empty blob in the object database"

6352 msgstr "不能在物件資料庫中建立空的資料物件"

6353

6319 -#: read-cache.c:746

6354 +#: read-cache.c:748

6355 #, c-format

6356 msgid "%s: can only add regular files, symbolic links or git-directories"

6357 msgstr "%s：只能新增一般檔案、符號連結或 git 目錄"

6358

6324 -#: read-cache.c:751

6359 +#: read-cache.c:753

6360 #, c-format

6361 msgid "'%s' does not have a commit checked out"

6327 -msgstr "'%s' 沒有檢出一個提交"

6362 +msgstr "'%s' 沒有簽出一個提交"

6363

6329 -#: read-cache.c:803

6364 +#: read-cache.c:805

6365 #, c-format

6366 msgid "unable to index file '%s'"

6367 msgstr "無法索引檔案 '%s'"

6368

6334 -#: read-cache.c:822

6369 +#: read-cache.c:824

6370 #, c-format

6371 msgid "unable to add '%s' to index"

6372 msgstr "無法在索引中新增 '%s'"

6373

6339 -#: read-cache.c:833

6374 +#: read-cache.c:835

6375 #, c-format

6376 msgid "unable to stat '%s'"

6377 msgstr "無法對 %s 執行 stat"

6378

6344 -#: read-cache.c:1356

6379 +#: read-cache.c:1358

6380 #, c-format

6381 msgid "'%s' appears as both a file and as a directory"

6382 msgstr "'%s' 看起來既是檔案又是目錄"

6383

6349 -#: read-cache.c:1571

6384 +#: read-cache.c:1573

6385 msgid "Refresh index"

6386 msgstr "重新整理索引"

6387

6353 -#: read-cache.c:1700

6388 +#: read-cache.c:1705

6389 #, c-format

6390 msgid ""

6391 "index.version set, but the value is invalid.\n"

@@ -6359,7 +6394,7 @@ msgstr ""

6394 "設定了 index.version，但是取值無效。\n"

6395 "使用版本 %i"

6396

6362 -#: read-cache.c:1710

6397 +#: read-cache.c:1715

6398 #, c-format

6399 msgid ""

6400 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -6368,144 +6403,144 @@ msgstr ""

6403 "設定了 GIT_INDEX_VERSION，但是取值無效。\n"

6404 "使用版本 %i"

6405

6371 -#: read-cache.c:1766

6406 +#: read-cache.c:1771

6407 #, c-format

6408 msgid "bad signature 0x%08x"

6409 msgstr "壞的簽名 0x%08x"

6410

6376 -#: read-cache.c:1769

6411 +#: read-cache.c:1774

6412 #, c-format

6413 msgid "bad index version %d"

6414 msgstr "壞的索引版本 %d"

6415

6381 -#: read-cache.c:1778

6416 +#: read-cache.c:1783

6417 msgid "bad index file sha1 signature"

6418 msgstr "壞的索引檔案 sha1 簽名"

6419

6385 -#: read-cache.c:1812

6420 +#: read-cache.c:1817

6421 #, c-format

6422 msgid "index uses %.4s extension, which we do not understand"

6423 msgstr "索引使用不被支援的 %.4s 擴展"

6424

6425 #

6391 -#: read-cache.c:1814

6426 +#: read-cache.c:1819

6427 #, c-format

6428 msgid "ignoring %.4s extension"

6429 msgstr "忽略 %.4s 擴展"

6430

6396 -#: read-cache.c:1851

6431 +#: read-cache.c:1856

6432 #, c-format

6433 msgid "unknown index entry format 0x%08x"

6434 msgstr "未知的索引條目格式 0x%08x"

6435

6401 -#: read-cache.c:1867

6436 +#: read-cache.c:1872

6437 #, c-format

6438 msgid "malformed name field in the index, near path '%s'"

6439 msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"

6440

6406 -#: read-cache.c:1924

6441 +#: read-cache.c:1929

6442 msgid "unordered stage entries in index"

6443 msgstr "索引中有未排序的暫存條目"

6444

6410 -#: read-cache.c:1927

6445 +#: read-cache.c:1932

6446 #, c-format

6447 msgid "multiple stage entries for merged file '%s'"

6448 msgstr "合併檔案 '%s' 有多個暫存條目"

6449

6415 -#: read-cache.c:1930

6450 +#: read-cache.c:1935

6451 #, c-format

6452 msgid "unordered stage entries for '%s'"

6453 msgstr "'%s' 的未排序暫存條目"

6454

6420 -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095

6421 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183

6422 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991

6455 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095

6456 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183

6457 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987

6458 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505

6459 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291

6425 -#: builtin/submodule--helper.c:332

6460 +#: builtin/submodule--helper.c:333

6461 msgid "index file corrupt"

6462 msgstr "索引檔案損壞"

6463

6429 -#: read-cache.c:2180

6464 +#: read-cache.c:2185

6465 #, c-format

6466 msgid "unable to create load_cache_entries thread: %s"

6467 msgstr "無法建立 load_cache_entries 執行緒：%s"

6468

6434 -#: read-cache.c:2193

6469 +#: read-cache.c:2198

6470 #, c-format

6471 msgid "unable to join load_cache_entries thread: %s"

6472 msgstr "無法加入 load_cache_entries 執行緒：%s"

6473

6439 -#: read-cache.c:2226

6474 +#: read-cache.c:2231

6475 #, c-format

6476 msgid "%s: index file open failed"

6477 msgstr "%s：開啟索引檔案失敗"

6478

6444 -#: read-cache.c:2230

6479 +#: read-cache.c:2235

6480 #, c-format

6481 msgid "%s: cannot stat the open index"

6482 msgstr "%s：不能對開啟的索引執行 stat 動作"

6483

6449 -#: read-cache.c:2234

6484 +#: read-cache.c:2239

6485 #, c-format

6486 msgid "%s: index file smaller than expected"

6487 msgstr "%s：索引檔案比預期的小"

6488

6454 -#: read-cache.c:2238

6489 +#: read-cache.c:2243

6490 #, c-format

6456 -msgid "%s: unable to map index file"

6457 -msgstr "%s：無法對索引檔案執行 map 動作"

6491 +msgid "%s: unable to map index file%s"

6492 +msgstr "%s：無法 map 索引檔案%s"

6493

6459 -#: read-cache.c:2280

6494 +#: read-cache.c:2286

6495 #, c-format

6496 msgid "unable to create load_index_extensions thread: %s"

6497 msgstr "無法建立 load_index_extensions 執行緒：%s"

6498

6464 -#: read-cache.c:2307

6499 +#: read-cache.c:2313

6500 #, c-format

6501 msgid "unable to join load_index_extensions thread: %s"

6502 msgstr "無法加入 load_index_extensions 執行緒：%s"

6503

6469 -#: read-cache.c:2345

6504 +#: read-cache.c:2351

6505 #, c-format

6506 msgid "could not freshen shared index '%s'"

6507 msgstr "無法重新整理共享索引 '%s'"

6508

6474 -#: read-cache.c:2392

6509 +#: read-cache.c:2398

6510 #, c-format

6511 msgid "broken index, expect %s in %s, got %s"

6512 msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

6513

6479 -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145

6514 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146

6515 #, c-format

6516 msgid "could not close '%s'"

6517 msgstr "不能關閉 '%s'"

6518

6484 -#: read-cache.c:3138

6519 +#: read-cache.c:3075

6520 msgid "failed to convert to a sparse-index"

6521 msgstr "無法轉換成稀疏索引"

6522

6488 -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441

6523 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440

6524 #, c-format

6525 msgid "could not stat '%s'"

6526 msgstr "不能對 '%s' 呼叫 stat"

6527

6493 -#: read-cache.c:3222

6528 +#: read-cache.c:3159

6529 #, c-format

6530 msgid "unable to open git dir: %s"

6531 msgstr "不能開啟 git 目錄：%s"

6532

6498 -#: read-cache.c:3234

6533 +#: read-cache.c:3171

6534 #, c-format

6535 msgid "unable to unlink: %s"

6536 msgstr "無法刪除：%s"

6537

6503 -#: read-cache.c:3263

6538 +#: read-cache.c:3200

6539 #, c-format

6540 msgid "cannot fix permission bits on '%s'"

6541 msgstr "不能修復 '%s' 的權限位"

6542

6508 -#: read-cache.c:3412

6543 +#: read-cache.c:3349

6544 #, c-format

6545 msgid "%s: cannot drop to stage #0"

6546 msgstr "%s：不能落到暫存區 #0"

@@ -6616,8 +6651,8 @@ msgstr ""

6651 "然而，如果您刪除全部內容，重定基底動作將會終止。\n"

6652 "\n"

6653

6619 -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816

6620 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271

6654 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836

6655 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271

6656 #, c-format

6657 msgid "could not write '%s'"

6658 msgstr "不能寫入 '%s'"

@@ -6660,7 +6695,7 @@ msgstr ""

6695 msgid "could not read '%s'."

6696 msgstr "不能讀取 '%s'。"

6697

6663 -#: ref-filter.c:42 wt-status.c:1978

6698 +#: ref-filter.c:42 wt-status.c:2036

6699 msgid "gone"

6700 msgstr "遺失"

6701

@@ -6679,247 +6714,247 @@ msgstr "落後 %d"

6714 msgid "ahead %d, behind %d"

6715 msgstr "領先 %d，落後 %d"

6716

6682 -#: ref-filter.c:175

6717 +#: ref-filter.c:230

6718 #, c-format

6719 msgid "expected format: %%(color:<color>)"

6720 msgstr "期望的格式：%%(color:<顏色>)"

6721

6687 -#: ref-filter.c:177

6722 +#: ref-filter.c:232

6723 #, c-format

6724 msgid "unrecognized color: %%(color:%s)"

6725 msgstr "無法識別的顏色：%%(color:%s)"

6726

6692 -#: ref-filter.c:199

6727 +#: ref-filter.c:254

6728 #, c-format

6729 msgid "Integer value expected refname:lstrip=%s"

6730 msgstr "期望整數值 refname:lstrip=%s"

6731

6697 -#: ref-filter.c:203

6732 +#: ref-filter.c:258

6733 #, c-format

6734 msgid "Integer value expected refname:rstrip=%s"

6735 msgstr "期望整數值 refname:rstrip=%s"

6736

6702 -#: ref-filter.c:205

6737 +#: ref-filter.c:260

6738 #, c-format

6739 msgid "unrecognized %%(%s) argument: %s"

6740 msgstr "無法識別的 %%(%s) 參數：%s"

6741

6707 -#: ref-filter.c:260

6742 +#: ref-filter.c:315

6743 #, c-format

6744 msgid "%%(objecttype) does not take arguments"

6745 msgstr "%%(objecttype) 不帶參數"

6746

6712 -#: ref-filter.c:282

6747 +#: ref-filter.c:339

6748 #, c-format

6749 msgid "unrecognized %%(objectsize) argument: %s"

6750 msgstr "無法識別的 %%(objectsize) 參數：%s"

6751

6717 -#: ref-filter.c:290

6752 +#: ref-filter.c:347

6753 #, c-format

6754 msgid "%%(deltabase) does not take arguments"

6755 msgstr "%%(deltabase) 不帶參數"

6756

6722 -#: ref-filter.c:302

6757 +#: ref-filter.c:359

6758 #, c-format

6759 msgid "%%(body) does not take arguments"

6760 msgstr "%%(body) 不帶參數"

6761

6727 -#: ref-filter.c:315

6762 +#: ref-filter.c:372

6763 #, c-format

6764 msgid "unrecognized %%(subject) argument: %s"

6765 msgstr "無法識別的 %%(subject) 引數：%s"

6766

6732 -#: ref-filter.c:334

6767 +#: ref-filter.c:391

6768 #, c-format

6769 msgid "expected %%(trailers:key=<value>)"

6770 msgstr "預期是 %%(trailers:key=<value>)"

6771

6737 -#: ref-filter.c:336

6772 +#: ref-filter.c:393

6773 #, c-format

6774 msgid "unknown %%(trailers) argument: %s"

6775 msgstr "未知的 %%(trailers) 參數：%s"

6776

6742 -#: ref-filter.c:367

6777 +#: ref-filter.c:424

6778 #, c-format

6779 msgid "positive value expected contents:lines=%s"

6780 msgstr "期望一個正數 contents:lines=%s"

6781

6747 -#: ref-filter.c:369

6782 +#: ref-filter.c:426

6783 #, c-format

6784 msgid "unrecognized %%(contents) argument: %s"

6785 msgstr "無法識別的 %%(contents) 參數：%s"

6786

6752 -#: ref-filter.c:384

6787 +#: ref-filter.c:441

6788 #, c-format

6789 msgid "positive value expected '%s' in %%(%s)"

6790 msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值"

6791

6757 -#: ref-filter.c:388

6792 +#: ref-filter.c:445

6793 #, c-format

6794 msgid "unrecognized argument '%s' in %%(%s)"

6795 msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數"

6796

6762 -#: ref-filter.c:402

6797 +#: ref-filter.c:459

6798 #, c-format

6799 msgid "unrecognized email option: %s"

6800 msgstr "無法識別的 email 選項：%s"

6801

6767 -#: ref-filter.c:432

6802 +#: ref-filter.c:489

6803 #, c-format

6804 msgid "expected format: %%(align:<width>,<position>)"

6805 msgstr "期望的格式：%%(align:<寬度>,<位置>)"

6806

6772 -#: ref-filter.c:444

6807 +#: ref-filter.c:501

6808 #, c-format

6809 msgid "unrecognized position:%s"

6810 msgstr "無法識別的位置：%s"

6811

6777 -#: ref-filter.c:451

6812 +#: ref-filter.c:508

6813 #, c-format

6814 msgid "unrecognized width:%s"

6815 msgstr "無法識別的寬度：%s"

6816

6782 -#: ref-filter.c:460

6817 +#: ref-filter.c:517

6818 #, c-format

6819 msgid "unrecognized %%(align) argument: %s"

6820 msgstr "無法識別的 %%(align) 參數：%s"

6821

6787 -#: ref-filter.c:468

6822 +#: ref-filter.c:525

6823 #, c-format

6824 msgid "positive width expected with the %%(align) atom"

6825 msgstr "元素 %%(align) 需要一個正數的寬度"

6826

6792 -#: ref-filter.c:486

6827 +#: ref-filter.c:543

6828 #, c-format

6829 msgid "unrecognized %%(if) argument: %s"

6830 msgstr "無法識別的 %%(if) 參數：%s"

6831

6797 -#: ref-filter.c:588

6832 +#: ref-filter.c:645

6833 #, c-format

6834 msgid "malformed field name: %.*s"

6835 msgstr "格式錯誤的欄位名：%.*s"

6836

6802 -#: ref-filter.c:615

6837 +#: ref-filter.c:672

6838 #, c-format

6839 msgid "unknown field name: %.*s"

6840 msgstr "未知的欄位名：%.*s"

6841

6807 -#: ref-filter.c:619

6842 +#: ref-filter.c:676

6843 #, c-format

6844 msgid ""

6845 "not a git repository, but the field '%.*s' requires access to object data"

6846 msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料"

6847

6813 -#: ref-filter.c:743

6848 +#: ref-filter.c:801

6849 #, c-format

6850 msgid "format: %%(if) atom used without a %%(then) atom"

6851 msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素"

6852

6818 -#: ref-filter.c:807

6853 +#: ref-filter.c:865

6854 #, c-format

6855 msgid "format: %%(then) atom used without an %%(if) atom"

6856 msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素"

6857

6823 -#: ref-filter.c:809

6858 +#: ref-filter.c:867

6859 #, c-format

6860 msgid "format: %%(then) atom used more than once"

6861 msgstr "格式：%%(then) 元素用了多次"

6862

6828 -#: ref-filter.c:811

6863 +#: ref-filter.c:869

6864 #, c-format

6865 msgid "format: %%(then) atom used after %%(else)"

6866 msgstr "格式：%%(then) 元素用在了 %%(else) 之後"

6867

6833 -#: ref-filter.c:839

6868 +#: ref-filter.c:897

6869 #, c-format

6870 msgid "format: %%(else) atom used without an %%(if) atom"

6871 msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素"

6872

6838 -#: ref-filter.c:841

6873 +#: ref-filter.c:899

6874 #, c-format

6875 msgid "format: %%(else) atom used without a %%(then) atom"

6876 msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素"

6877

6843 -#: ref-filter.c:843

6878 +#: ref-filter.c:901

6879 #, c-format

6880 msgid "format: %%(else) atom used more than once"

6881 msgstr "格式：%%(else) 元素用了多次"

6882

6848 -#: ref-filter.c:858

6883 +#: ref-filter.c:916

6884 #, c-format

6885 msgid "format: %%(end) atom used without corresponding atom"

6886 msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素"

6887

6853 -#: ref-filter.c:915

6888 +#: ref-filter.c:973

6889 #, c-format

6890 msgid "malformed format string %s"

6891 msgstr "錯誤的格式化字串 %s"

6892

6858 -#: ref-filter.c:1556

6893 +#: ref-filter.c:1621

6894 #, c-format

6895 msgid "(no branch, rebasing %s)"

6896 msgstr "（無分支，重定 %s 的基底）"

6897

6863 -#: ref-filter.c:1559

6898 +#: ref-filter.c:1624

6899 #, c-format

6900 msgid "(no branch, rebasing detached HEAD %s)"

6901 msgstr "（無分支，重定 %s 分離開頭指標的基底）"

6902

6868 -#: ref-filter.c:1562

6903 +#: ref-filter.c:1627

6904 #, c-format

6905 msgid "(no branch, bisect started on %s)"

6906 msgstr "（無分支，二分搜尋從 %s 開始）"

6907

6873 -#: ref-filter.c:1566

6908 +#: ref-filter.c:1631

6909 #, c-format

6910 msgid "(HEAD detached at %s)"

6911 msgstr "（開頭指標分離於 %s）"

6912

6878 -#: ref-filter.c:1569

6913 +#: ref-filter.c:1634

6914 #, c-format

6915 msgid "(HEAD detached from %s)"

6916 msgstr "（開頭指標分離自 %s）"

6917

6883 -#: ref-filter.c:1572

6918 +#: ref-filter.c:1637

6919 msgid "(no branch)"

6920 msgstr "（無分支）"

6921

6887 -#: ref-filter.c:1604 ref-filter.c:1813

6922 +#: ref-filter.c:1669 ref-filter.c:1880

6923 #, c-format

6924 msgid "missing object %s for %s"

6925 msgstr "缺少 %2$s 的物件 %1$s"

6926

6892 -#: ref-filter.c:1614

6927 +#: ref-filter.c:1679

6928 #, c-format

6929 msgid "parse_object_buffer failed on %s for %s"

6930 msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"

6931

6897 -#: ref-filter.c:1997

6932 +#: ref-filter.c:2064

6933 #, c-format

6934 msgid "malformed object at '%s'"

6935 msgstr "格式錯誤的物件 '%s'"

6936

6902 -#: ref-filter.c:2086

6937 +#: ref-filter.c:2153

6938 #, c-format

6939 msgid "ignoring ref with broken name %s"

6940 msgstr "忽略帶有錯誤名稱 %s 的引用"

6941

6907 -#: ref-filter.c:2091 refs.c:676

6942 +#: ref-filter.c:2158 refs.c:676

6943 #, c-format

6944 msgid "ignoring broken ref %s"

6945 msgstr "忽略損壞的引用 %s"

6946

6912 -#: ref-filter.c:2431

6947 +#: ref-filter.c:2502

6948 #, c-format

6949 msgid "format: %%(end) atom missing"

6950 msgstr "格式：缺少 %%(end) 元素"

6951

6917 -#: ref-filter.c:2525

6952 +#: ref-filter.c:2596

6953 #, c-format

6954 msgid "malformed object name %s"

6955 msgstr "格式錯誤的物件名 %s"

6956

6922 -#: ref-filter.c:2530

6957 +#: ref-filter.c:2601

6958 #, c-format

6959 msgid "option `%s' must point to a commit"

6960 msgstr "選項 `%s' 必須指向一個提交"

@@ -6947,10 +6982,10 @@ msgstr ""

6982 "如果要設定所有新版本庫要使用的初始分支名稱，\n"

6983 "請呼叫（會隱藏這個警告）：\n"

6984 "\n"

6950 -"\tgit config —global init.defaultBranch <name>\n"

6985 +"\tgit config --global init.defaultBranch <name>\n"

6986 "\n"

6952 -"除了 ‘master’ 外，常用的分支名稱有 ‘main’, ‘trunk’ 以及\n"

6953 -"‘development’。剛建立的分支可以用這個命令重新命名：\n"

6987 +"除了 “master” 外，常用的分支名稱有 “main”, “trunk” 以及\n"

6988 +"“development”。剛建立的分支可以用這個命令重新命名：\n"

6989 "\n"

6990 "\tgit branch -m <name>\n"

6991

@@ -7365,8 +7400,8 @@ msgstr "不能刪除 stray '%s'"

7400 msgid "Recorded preimage for '%s'"

7401 msgstr "為 '%s' 記錄 preimage"

7402

7368 -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000

7369 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891

7403 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002

7404 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848

7405 #, c-format

7406 msgid "could not create directory '%s'"

7407 msgstr "不能建立目錄 '%s'"

@@ -7404,38 +7439,38 @@ msgstr "不能開啟 rr-cache 目錄"

7439 msgid "could not determine HEAD revision"

7440 msgstr "不能確定 HEAD 版本"

7441

7407 -#: reset.c:70 reset.c:76 sequencer.c:3669

7442 +#: reset.c:69 reset.c:75 sequencer.c:3689

7443 #, c-format

7444 msgid "failed to find tree of %s"

7445 msgstr "無法找到 %s 指向的樹"

7446

7412 -#: revision.c:2343

7447 +#: revision.c:2344

7448 msgid "--unpacked=<packfile> no longer supported"

7449 msgstr "--unpacked=<packfile> 已不受支援"

7450

7416 -#: revision.c:2683

7451 +#: revision.c:2684

7452 msgid "your current branch appears to be broken"

7453 msgstr "您的目前分支好像被損壞"

7454

7420 -#: revision.c:2686

7455 +#: revision.c:2687

7456 #, c-format

7457 msgid "your current branch '%s' does not have any commits yet"

7458 msgstr "您的目前分支 '%s' 尚無任何提交"

7459

7425 -#: revision.c:2892

7460 +#: revision.c:2893

7461 msgid "-L does not yet support diff formats besides -p and -s"

7462 msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"

7463

7429 -#: run-command.c:767

7464 +#: run-command.c:766

7465 msgid "open /dev/null failed"

7466 msgstr "不能開啟 /dev/null"

7467

7433 -#: run-command.c:1275

7468 +#: run-command.c:1274

7469 #, c-format

7470 msgid "cannot create async thread: %s"

7471 msgstr "不能建立 async 執行緒：%s"

7472

7438 -#: run-command.c:1345

7473 +#: run-command.c:1344

7474 #, c-format

7475 msgid ""

7476 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -7470,25 +7505,25 @@ msgstr "send-pack：無法 fork 一個 fetch 子處理程序"

7505 msgid "push negotiation failed; proceeding anyway with push"

7506 msgstr "push 協商失敗。繼續使用 push 處理"

7507

7473 -#: send-pack.c:520

7508 +#: send-pack.c:526

7509 msgid "the receiving end does not support this repository's hash algorithm"

7510 msgstr "接收端不支援此版本庫的雜湊算法"

7511

7477 -#: send-pack.c:529

7512 +#: send-pack.c:535

7513 msgid "the receiving end does not support --signed push"

7479 -msgstr "接收端不支援簽名推送"

7514 +msgstr "接收端不支援 --signed 推送"

7515

7481 -#: send-pack.c:531

7516 +#: send-pack.c:537

7517 msgid ""

7518 "not sending a push certificate since the receiving end does not support --"

7519 "signed push"

7485 -msgstr "未傳送推送證書，因為接收端不支援簽名推送"

7520 +msgstr "未傳送推送證書，因為接收端不支援 --signed 推送"

7521

7487 -#: send-pack.c:543

7522 +#: send-pack.c:544

7523 msgid "the receiving end does not support --atomic push"

7489 -msgstr "接收端不支援原子推送"

7524 +msgstr "接收端不支援 --atomic 推送"

7525

7491 -#: send-pack.c:548

7526 +#: send-pack.c:549

7527 msgid "the receiving end does not support push options"

7528 msgstr "接收端不支援推送選項"

7529

@@ -7547,7 +7582,7 @@ msgid "could not lock '%s'"

7582 msgstr "不能鎖定 '%s'"

7583

7584 #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289

7550 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631

7585 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631

7586 #, c-format

7587 msgid "could not write to '%s'"

7588 msgstr "不能寫入 '%s'"

@@ -7558,7 +7593,7 @@ msgid "could not write eol to '%s'"

7593 msgstr "不能將換行符號寫入 '%s'"

7594

7595 #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291

7561 -#: sequencer.c:3554

7596 +#: sequencer.c:3555

7597 #, c-format

7598 msgid "failed to finalize '%s'"

7599 msgstr "無法完成 '%s'"

@@ -7608,8 +7643,8 @@ msgstr "在 '%.*s' 中沒有 key"

7643 msgid "unable to dequote value of '%s'"

7644 msgstr "無法為 '%s' 的值去引號"

7645

7611 -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728

7612 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910

7646 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729

7647 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910

7648 #, c-format

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

7650 msgstr "無法開啟 '%s' 進行讀取"

@@ -7753,7 +7788,7 @@ msgstr "不能解析 HEAD"

7788 msgid "HEAD %s is not a commit!"

7789 msgstr "HEAD %s 不是一個提交！"

7790

7756 -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692

7791 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705

7792 msgid "could not parse HEAD commit"

7793 msgstr "不能解析 HEAD 提交"

7794

@@ -7761,7 +7796,7 @@ msgstr "不能解析 HEAD 提交"

7796 msgid "unable to parse commit author"

7797 msgstr "不能解析提交作者"

7798

7764 -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706

7799 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707

7800 msgid "git write-tree failed to write a tree"

7801 msgstr "git write-tree 無法寫入樹狀物件"

7802

@@ -7779,12 +7814,13 @@ msgstr "無效的作者身分 '%s'"

7814 msgid "corrupt author: missing date information"

7815 msgstr "作者資訊損壞：缺少日期資訊"

7816

7782 -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909

7783 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78

7817 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910

7818 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78

7819 msgid "failed to write commit object"

7820 msgstr "寫提交物件失敗"

7821

7787 -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198

7822 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199

7823 +#: t/helper/test-fast-rebase.c:217

7824 #, c-format

7825 msgid "could not update %s"

7826 msgstr "不能更新 %s"

@@ -7836,7 +7872,7 @@ msgstr "不能寫 '%s'"

7872 msgid "need a HEAD to fixup"

7873 msgstr "需要一個 HEAD 來修復"

7874

7839 -#: sequencer.c:1936 sequencer.c:3581

7875 +#: sequencer.c:1936 sequencer.c:3582

7876 msgid "could not read HEAD"

7877 msgstr "不能讀取 HEAD"

7878

@@ -7977,7 +8013,7 @@ msgstr "不可用的 squash-onto"

8013 msgid "malformed options sheet: '%s'"

8014 msgstr "格式錯誤的選項清單：'%s'"

8015

7980 -#: sequencer.c:3012 sequencer.c:4869

8016 +#: sequencer.c:3012 sequencer.c:4868

8017 msgid "empty commit set passed"

8018 msgstr "提供了空的提交集"

8019

@@ -8008,7 +8044,7 @@ msgstr "不能建立序列目錄 '%s'"

8044 msgid "could not lock HEAD"

8045 msgstr "不能鎖定 HEAD"

8046

8011 -#: sequencer.c:3125 sequencer.c:4582

8047 +#: sequencer.c:3125 sequencer.c:4581

8048 msgid "no cherry-pick or revert in progress"

8049 msgstr "揀選或還原動作並未進行"

8050

@@ -8020,7 +8056,7 @@ msgstr "不能解析 HEAD"

8056 msgid "cannot abort from a branch yet to be born"

8057 msgstr "不能從尚未建立的分支終止"

8058

8023 -#: sequencer.c:3159 builtin/grep.c:759

8059 +#: sequencer.c:3159 builtin/grep.c:758

8060 #, c-format

8061 msgid "cannot open '%s'"

8062 msgstr "不能開啟 '%s'"

@@ -8068,7 +8104,7 @@ msgstr ""

8104 "您已經提交了嗎？\n"

8105 "試試 \"git %s --continue\""

8106

8071 -#: sequencer.c:3411 sequencer.c:4473

8107 +#: sequencer.c:3411 sequencer.c:4472

8108 msgid "cannot read HEAD"

8109 msgstr "不能讀取 HEAD"

8110

@@ -8153,90 +8189,90 @@ msgstr ""

8189 " git rebase --continue\n"

8190 "\n"

8191

8156 -#: sequencer.c:3571

8192 +#: sequencer.c:3572

8193 #, c-format

8194 msgid "illegal label name: '%.*s'"

8195 msgstr "非法的標籤名稱：'%.*s'"

8196

8161 -#: sequencer.c:3625

8197 +#: sequencer.c:3645

8198 msgid "writing fake root commit"

8199 msgstr "寫偽根提交"

8200

8165 -#: sequencer.c:3630

8201 +#: sequencer.c:3650

8202 msgid "writing squash-onto"

8203 msgstr "寫入 squash-onto"

8204

8169 -#: sequencer.c:3714

8205 +#: sequencer.c:3734

8206 #, c-format

8207 msgid "could not resolve '%s'"

8208 msgstr "無法解析 '%s'"

8209

8174 -#: sequencer.c:3747

8210 +#: sequencer.c:3767

8211 msgid "cannot merge without a current revision"

8212 msgstr "沒有目前版本不能合併"

8213

8178 -#: sequencer.c:3769

8214 +#: sequencer.c:3789

8215 #, c-format

8216 msgid "unable to parse '%.*s'"

8217 msgstr "無法解析 '%.*s'"

8218

8183 -#: sequencer.c:3778

8219 +#: sequencer.c:3798

8220 #, c-format

8221 msgid "nothing to merge: '%.*s'"

8222 msgstr "無可用合併：'%.*s'"

8223

8188 -#: sequencer.c:3790

8224 +#: sequencer.c:3810

8225 msgid "octopus merge cannot be executed on top of a [new root]"

8226 msgstr "章魚合並不能在一個新的根提交上執行"

8227

8192 -#: sequencer.c:3806

8228 +#: sequencer.c:3826

8229 #, c-format

8230 msgid "could not get commit message of '%s'"

8231 msgstr "不能取得 '%s' 的提交說明"

8232

8197 -#: sequencer.c:3989

8233 +#: sequencer.c:4009

8234 #, c-format

8235 msgid "could not even attempt to merge '%.*s'"

8236 msgstr "甚至不能嘗試合併 '%.*s'"

8237

8202 -#: sequencer.c:4005

8238 +#: sequencer.c:4025

8239 msgid "merge: Unable to write new index file"

8240 msgstr "合併：無法寫入新索引檔案"

8241

8206 -#: sequencer.c:4079

8242 +#: sequencer.c:4099

8243 msgid "Cannot autostash"

8244 msgstr "無法 autostash"

8245

8210 -#: sequencer.c:4082

8246 +#: sequencer.c:4102

8247 #, c-format

8248 msgid "Unexpected stash response: '%s'"

8249 msgstr "意外的 stash 回應：'%s'"

8250

8215 -#: sequencer.c:4088

8251 +#: sequencer.c:4108

8252 #, c-format

8253 msgid "Could not create directory for '%s'"

8254 msgstr "不能為 '%s' 建立目錄"

8255

8220 -#: sequencer.c:4091

8256 +#: sequencer.c:4111

8257 #, c-format

8258 msgid "Created autostash: %s\n"

8259 msgstr "建立了 autostash：%s\n"

8260

8225 -#: sequencer.c:4095

8261 +#: sequencer.c:4115

8262 msgid "could not reset --hard"

8263 msgstr "無法 reset --hard"

8264

8229 -#: sequencer.c:4120

8265 +#: sequencer.c:4140

8266 #, c-format

8267 msgid "Applied autostash.\n"

8268 msgstr "已套用 autostash。\n"

8269

8234 -#: sequencer.c:4132

8270 +#: sequencer.c:4152

8271 #, c-format

8272 msgid "cannot store %s"

8273 msgstr "不能儲存 %s"

8274

8239 -#: sequencer.c:4135

8275 +#: sequencer.c:4155

8276 #, c-format

8277 msgid ""

8278 "%s\n"

@@ -8247,29 +8283,29 @@ msgstr ""

8283 "您的修改安全地儲存在儲藏區中。\n"

8284 "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"

8285

8250 -#: sequencer.c:4140

8286 +#: sequencer.c:4160

8287 msgid "Applying autostash resulted in conflicts."

8288 msgstr "因套用自動儲藏而導致衝突。"

8289

8254 -#: sequencer.c:4141

8290 +#: sequencer.c:4161

8291 msgid "Autostash exists; creating a new stash entry."

8292 msgstr "已有自動儲藏；建立新儲藏項目。"

8293

8258 -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769

8294 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769

8295 msgid "could not detach HEAD"

8296 msgstr "不能分離開頭指標"

8297

8262 -#: sequencer.c:4249

8298 +#: sequencer.c:4248

8299 #, c-format

8300 msgid "Stopped at HEAD\n"

8301 msgstr "停止在 HEAD\n"

8302

8267 -#: sequencer.c:4251

8303 +#: sequencer.c:4250

8304 #, c-format

8305 msgid "Stopped at %s\n"

8306 msgstr "停止在 %s\n"

8307

8272 -#: sequencer.c:4259

8308 +#: sequencer.c:4258

8309 #, c-format

8310 msgid ""

8311 "Could not execute the todo command\n"

@@ -8289,58 +8325,58 @@ msgstr ""

8325 " git rebase --edit-todo\n"

8326 " git rebase --continue\n"

8327

8292 -#: sequencer.c:4305

8328 +#: sequencer.c:4304

8329 #, c-format

8330 msgid "Rebasing (%d/%d)%s"

8331 msgstr "正在重定基底 (%d/%d)%s"

8332

8297 -#: sequencer.c:4351

8333 +#: sequencer.c:4350

8334 #, c-format

8335 msgid "Stopped at %s... %.*s\n"

8336 msgstr "停止在 %s... %.*s\n"

8337

8302 -#: sequencer.c:4422

8338 +#: sequencer.c:4421

8339 #, c-format

8340 msgid "unknown command %d"

8341 msgstr "未知指令 %d"

8342

8307 -#: sequencer.c:4481

8343 +#: sequencer.c:4480

8344 msgid "could not read orig-head"

8345 msgstr "不能讀取 orig-head"

8346

8311 -#: sequencer.c:4486

8347 +#: sequencer.c:4485

8348 msgid "could not read 'onto'"

8349 msgstr "不能讀取 'onto'"

8350

8315 -#: sequencer.c:4500

8351 +#: sequencer.c:4499

8352 #, c-format

8353 msgid "could not update HEAD to %s"

8354 msgstr "不能更新 HEAD 為 %s"

8355

8320 -#: sequencer.c:4560

8356 +#: sequencer.c:4559

8357 #, c-format

8358 msgid "Successfully rebased and updated %s.\n"

8359 msgstr "成功重定基底並更新 %s。\n"

8360

8325 -#: sequencer.c:4612

8361 +#: sequencer.c:4611

8362 msgid "cannot rebase: You have unstaged changes."

8363 msgstr "不能重定基底：您有未暫存的變更。"

8364

8329 -#: sequencer.c:4621

8365 +#: sequencer.c:4620

8366 msgid "cannot amend non-existing commit"

8367 msgstr "不能修補不存在的提交"

8368

8333 -#: sequencer.c:4623

8369 +#: sequencer.c:4622

8370 #, c-format

8371 msgid "invalid file: '%s'"

8372 msgstr "無效檔案：'%s'"

8373

8338 -#: sequencer.c:4625

8374 +#: sequencer.c:4624

8375 #, c-format

8376 msgid "invalid contents: '%s'"

8377 msgstr "無效內容：'%s'"

8378

8343 -#: sequencer.c:4628

8379 +#: sequencer.c:4627

8380 msgid ""

8381 "\n"

8382 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -8349,50 +8385,50 @@ msgstr ""

8385 "\n"

8386 "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"

8387

8352 -#: sequencer.c:4664 sequencer.c:4703

8388 +#: sequencer.c:4663 sequencer.c:4702

8389 #, c-format

8390 msgid "could not write file: '%s'"

8391 msgstr "不能寫入檔案：'%s'"

8392

8357 -#: sequencer.c:4719

8393 +#: sequencer.c:4718

8394 msgid "could not remove CHERRY_PICK_HEAD"

8395 msgstr "不能刪除 CHERRY_PICK_HEAD"

8396

8361 -#: sequencer.c:4726

8397 +#: sequencer.c:4725

8398 msgid "could not commit staged changes."

8399 msgstr "不能提交暫存的修改。"

8400

8365 -#: sequencer.c:4846

8401 +#: sequencer.c:4845

8402 #, c-format

8403 msgid "%s: can't cherry-pick a %s"

8404 msgstr "%s：不能揀選一個%s"

8405

8370 -#: sequencer.c:4850

8406 +#: sequencer.c:4849

8407 #, c-format

8408 msgid "%s: bad revision"

8409 msgstr "%s：錯誤的版本"

8410

8375 -#: sequencer.c:4885

8411 +#: sequencer.c:4884

8412 msgid "can't revert as initial commit"

8413 msgstr "不能作為初始提交還原提交"

8414

8379 -#: sequencer.c:5362

8415 +#: sequencer.c:5361

8416 msgid "make_script: unhandled options"

8417 msgstr "make_script：有未能處理的選項"

8418

8383 -#: sequencer.c:5365

8419 +#: sequencer.c:5364

8420 msgid "make_script: error preparing revisions"

8421 msgstr "make_script：準備版本時錯誤"

8422

8387 -#: sequencer.c:5615 sequencer.c:5632

8423 +#: sequencer.c:5614 sequencer.c:5631

8424 msgid "nothing to do"

8425 msgstr "無事可做"

8426

8391 -#: sequencer.c:5651

8427 +#: sequencer.c:5650

8428 msgid "could not skip unnecessary pick commands"

8429 msgstr "無法略過不必要的揀選"

8430

8395 -#: sequencer.c:5751

8431 +#: sequencer.c:5750

8432 msgid "the script was already rearranged."

8433 msgstr "腳本已經重新編排。"

8434

@@ -8441,92 +8477,94 @@ msgstr ""

8477 msgid "unable to set up work tree using invalid config"

8478 msgstr "無法使用無效設定來建立工作區"

8479

8444 -#: setup.c:423

8480 +#: setup.c:423 builtin/rev-parse.c:895

8481 msgid "this operation must be run in a work tree"

8482 msgstr "該動作必須在一個工作區中執行"

8483

8448 -#: setup.c:661

8484 +#: setup.c:658

8485 #, c-format

8486 msgid "Expected git repo version <= %d, found %d"

8487 msgstr "期望 git 版本庫版本 <= %d，卻得到 %d"

8488

8453 -#: setup.c:669

8454 -msgid "unknown repository extensions found:"

8455 -msgstr "發現未知的版本庫擴展："

8489 +#: setup.c:666

8490 +msgid "unknown repository extension found:"

8491 +msgid_plural "unknown repository extensions found:"

8492 +msgstr[0] "找到未知的儲存庫擴充元件："

8493

8457 -#: setup.c:681

8458 -msgid "repo version is 0, but v1-only extensions found:"

8459 -msgstr "repo 的版本是 0，但找到只支援 v1 的擴充元件："

8494 +#: setup.c:680

8495 +msgid "repo version is 0, but v1-only extension found:"

8496 +msgid_plural "repo version is 0, but v1-only extensions found:"

8497 +msgstr[0] "repo 版本是 0 (v0)，但找到只支援 v1 的擴充元件："

8498

8461 -#: setup.c:700

8499 +#: setup.c:701

8500 #, c-format

8501 msgid "error opening '%s'"

8502 msgstr "開啟 '%s' 發生錯誤"

8503

8466 -#: setup.c:702

8504 +#: setup.c:703

8505 #, c-format

8506 msgid "too large to be a .git file: '%s'"

8507 msgstr "檔案太大，無法作為 .git 檔案：'%s'"

8508

8471 -#: setup.c:704

8509 +#: setup.c:705

8510 #, c-format

8511 msgid "error reading %s"

8512 msgstr "讀取 %s 發生錯誤"

8513

8476 -#: setup.c:706

8514 +#: setup.c:707

8515 #, c-format

8516 msgid "invalid gitfile format: %s"

8517 msgstr "無效的 gitfile 格式：%s"

8518

8481 -#: setup.c:708

8519 +#: setup.c:709

8520 #, c-format

8521 msgid "no path in gitfile: %s"

8522 msgstr "在 gitfile 中沒有路徑：%s"

8523

8486 -#: setup.c:710

8524 +#: setup.c:711

8525 #, c-format

8526 msgid "not a git repository: %s"

8527 msgstr "不是一個 git 版本庫：%s"

8528

8491 -#: setup.c:812

8529 +#: setup.c:813

8530 #, c-format

8531 msgid "'$%s' too big"

8532 msgstr "'$%s' 太大"

8533

8496 -#: setup.c:826

8534 +#: setup.c:827

8535 #, c-format

8536 msgid "not a git repository: '%s'"

8537 msgstr "不是一個 git 版本庫：'%s'"

8538

8501 -#: setup.c:855 setup.c:857 setup.c:888

8539 +#: setup.c:856 setup.c:858 setup.c:889

8540 #, c-format

8541 msgid "cannot chdir to '%s'"

8542 msgstr "不能切換目錄到 '%s'"

8543

8506 -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973

8544 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974

8545 msgid "cannot come back to cwd"

8546 msgstr "無法返回目前工作目錄"

8547

8510 -#: setup.c:987

8548 +#: setup.c:988

8549 #, c-format

8550 msgid "failed to stat '%*s%s%s'"

8551 msgstr "取得 '%*s%s%s' 狀態（stat）失敗"

8552

8515 -#: setup.c:1225

8553 +#: setup.c:1231

8554 msgid "Unable to read current working directory"

8555 msgstr "不能讀取目前工作目錄"

8556

8519 -#: setup.c:1234 setup.c:1240

8557 +#: setup.c:1240 setup.c:1246

8558 #, c-format

8559 msgid "cannot change to '%s'"

8560 msgstr "不能切換到 '%s'"

8561

8524 -#: setup.c:1245

8562 +#: setup.c:1251

8563 #, c-format

8564 msgid "not a git repository (or any of the parent directories): %s"

8565 msgstr "不是一個 git 版本庫（或者任何父目錄）：%s"

8566

8529 -#: setup.c:1251

8567 +#: setup.c:1257

8568 #, c-format

8569 msgid ""

8570 "not a git repository (or any parent up to mount point %s)\n"

@@ -8535,7 +8573,7 @@ msgstr ""

8573 "不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"

8574 "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

8575

8538 -#: setup.c:1370

8576 +#: setup.c:1381

8577 #, c-format

8578 msgid ""

8579 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -8544,28 +8582,27 @@ msgstr ""

8582 "參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n"

8583 "檔案所有者必須始終擁有讀寫權限。"

8584

8547 -#: setup.c:1417

8585 +#: setup.c:1430

8586 msgid "open /dev/null or dup failed"

8587 msgstr "不能開啟或者複製 /dev/null"

8588

8551 -#: setup.c:1432

8589 +#: setup.c:1445

8590 msgid "fork failed"

8591 msgstr "fork 失敗"

8592

8555 -#: setup.c:1437 t/helper/test-simple-ipc.c:285

8593 +#: setup.c:1450 t/helper/test-simple-ipc.c:285

8594 msgid "setsid failed"

8595 msgstr "setsid 失敗"

8596

8559 -#: sparse-index.c:151

8597 +#: sparse-index.c:162

8598 msgid "attempting to use sparse-index without cone mode"

8599 msgstr "嘗試不在 cone 模式使用稀疏索引"

8600

8563 -#: sparse-index.c:156

8564 -#, fuzzy

8601 +#: sparse-index.c:176

8602 msgid "unable to update cache-tree, staying full"

8566 -msgstr "無法更新快取樹：保持用完狀態"

8603 +msgstr "無法更新快取樹，保持完整"

8604

8568 -#: sparse-index.c:239

8605 +#: sparse-index.c:263

8606 #, c-format

8607 msgid "index entry is a directory, but not sparse (%08x)"

8608 msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）"

@@ -8620,7 +8657,7 @@ msgid "%u byte/s"

8657 msgid_plural "%u bytes/s"

8658 msgstr[0] "%u 位元組/秒"

8659

8623 -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737

8660 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738

8661 #: builtin/rebase.c:866

8662 #, c-format

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

@@ -8676,7 +8713,7 @@ msgstr "將更新後 .gitmodules 新增暫存區失敗"

8713 #: submodule.c:328

8714 #, c-format

8715 msgid "in unpopulated submodule '%s'"

8679 -msgstr "位於未檢出的子模組 '%s'"

8716 +msgstr "位於未簽出的子模組 '%s'"

8717

8718 #: submodule.c:359

8719 #, c-format

@@ -8688,55 +8725,55 @@ msgstr "路徑規格 '%s' 在子模組 '%.*s' 中"

8725 msgid "bad --ignore-submodules argument: %s"

8726 msgstr "無效 --ignore-submodules 參數：%s"

8727

8691 -#: submodule.c:818

8728 +#: submodule.c:805

8729 #, c-format

8730 msgid ""

8731 "Submodule in commit %s at path: '%s' collides with a submodule named the "

8732 "same. Skipping it."

8733 msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。略過。"

8734

8698 -#: submodule.c:921

8735 +#: submodule.c:908

8736 #, c-format

8737 msgid "submodule entry '%s' (%s) is a %s, not a commit"

8738 msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交"

8739

8703 -#: submodule.c:1006

8740 +#: submodule.c:993

8741 #, c-format

8742 msgid ""

8743 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "

8744 "submodule %s"

8745 msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1' 命令"

8746

8710 -#: submodule.c:1129

8747 +#: submodule.c:1116

8748 #, c-format

8749 msgid "process for submodule '%s' failed"

8750 msgstr "處理 '%s' 子模組失敗"

8751

8715 -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470

8752 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486

8753 msgid "Failed to resolve HEAD as a valid ref."

8754 msgstr "無法將 HEAD 解析為有效引用。"

8755

8719 -#: submodule.c:1169

8756 +#: submodule.c:1156

8757 #, c-format

8758 msgid "Pushing submodule '%s'\n"

8759 msgstr "正在推送 '%s' 子模組\n"

8760

8724 -#: submodule.c:1172

8761 +#: submodule.c:1159

8762 #, c-format

8763 msgid "Unable to push submodule '%s'\n"

8764 msgstr "無法推送 '%s' 子模組\n"

8765

8729 -#: submodule.c:1464

8766 +#: submodule.c:1451

8767 #, c-format

8768 msgid "Fetching submodule %s%s\n"

8769 msgstr "正在抓取 %s%s 子模組\n"

8770

8734 -#: submodule.c:1498

8771 +#: submodule.c:1485

8772 #, c-format

8773 msgid "Could not access submodule '%s'\n"

8774 msgstr "無法存取子模組 '%s'\n"

8775

8739 -#: submodule.c:1653

8776 +#: submodule.c:1640

8777 #, c-format

8778 msgid ""

8779 "Errors during submodule fetch:\n"

@@ -8745,77 +8782,77 @@ msgstr ""

8782 "抓取子模組時發生錯誤：\n"

8783 "%s"

8784

8748 -#: submodule.c:1678

8785 +#: submodule.c:1665

8786 #, c-format

8787 msgid "'%s' not recognized as a git repository"

8788 msgstr "無法將 '%s' 識別為一個 git 版本庫"

8789

8753 -#: submodule.c:1695

8790 +#: submodule.c:1682

8791 #, c-format

8792 msgid "Could not run 'git status --porcelain=2' in submodule %s"

8793 msgstr "無法在 %s 子模組執行 'git status --porcelain=2'"

8794

8758 -#: submodule.c:1736

8795 +#: submodule.c:1723

8796 #, c-format

8797 msgid "'git status --porcelain=2' failed in submodule %s"

8798 msgstr "%s 子模組執行 'git status --porcelain=2' 失敗"

8799

8763 -#: submodule.c:1811

8800 +#: submodule.c:1798

8801 #, c-format

8802 msgid "could not start 'git status' in submodule '%s'"

8803 msgstr "無法在子模組 '%s' 中啟動 'git status'"

8804

8768 -#: submodule.c:1824

8805 +#: submodule.c:1811

8806 #, c-format

8807 msgid "could not run 'git status' in submodule '%s'"

8808 msgstr "無法在子模組 '%s' 中執行 'git status'"

8809

8773 -#: submodule.c:1839

8810 +#: submodule.c:1826

8811 #, c-format

8812 msgid "Could not unset core.worktree setting in submodule '%s'"

8813 msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定"

8814

8778 -#: submodule.c:1866 submodule.c:2176

8815 +#: submodule.c:1853 submodule.c:2163

8816 #, c-format

8817 msgid "could not recurse into submodule '%s'"

8818 msgstr "無法遞迴子模組路徑 '%s'"

8819

8783 -#: submodule.c:1887

8820 +#: submodule.c:1874

8821 msgid "could not reset submodule index"

8822 msgstr "無法重設子模組的索引"

8823

8787 -#: submodule.c:1929

8824 +#: submodule.c:1916

8825 #, c-format

8826 msgid "submodule '%s' has dirty index"

8827 msgstr "子模組 '%s' 中有髒索引"

8828

8792 -#: submodule.c:1981

8829 +#: submodule.c:1968

8830 #, c-format

8831 msgid "Submodule '%s' could not be updated."

8832 msgstr "子模組 '%s' 無法被更新。"

8833

8797 -#: submodule.c:2049

8834 +#: submodule.c:2036

8835 #, c-format

8836 msgid "submodule git dir '%s' is inside git dir '%.*s'"

8837 msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中"

8838

8802 -#: submodule.c:2070

8839 +#: submodule.c:2057

8840 #, c-format

8841 msgid ""

8842 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

8843 msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir"

8844

8808 -#: submodule.c:2082 submodule.c:2141

8845 +#: submodule.c:2069 submodule.c:2128

8846 #, c-format

8847 msgid "could not lookup name for submodule '%s'"

8848 msgstr "不能查詢子模組 '%s' 的名稱"

8849

8813 -#: submodule.c:2086

8850 +#: submodule.c:2073

8851 #, c-format

8852 msgid "refusing to move '%s' into an existing git dir"

8853 msgstr "拒絕移動「%s」至現存 git 目錄"

8854

8818 -#: submodule.c:2093

8855 +#: submodule.c:2080

8856 #, c-format

8857 msgid ""

8858 "Migrating git directory of '%s%s' from\n"

@@ -8826,11 +8863,11 @@ msgstr ""

8863 "'%s' 遷移至\n"

8864 "'%s'\n"

8865

8829 -#: submodule.c:2221

8866 +#: submodule.c:2208

8867 msgid "could not start ls-files in .."

8868 msgstr "無法在 .. 中啟動 ls-files"

8869

8833 -#: submodule.c:2261

8870 +#: submodule.c:2248

8871 #, c-format

8872 msgid "ls-tree returned unexpected return code %d"

8873 msgstr "ls-tree 返回未知返回值 %d"

@@ -8867,7 +8904,7 @@ msgstr "簽名 '%.*s' 的鍵為空"

8904 msgid "could not read input file '%s'"

8905 msgstr "不能讀取輸入檔案 '%s'"

8906

8870 -#: trailer.c:766 builtin/mktag.c:88

8907 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577

8908 msgid "could not read from stdin"

8909 msgstr "不能自標準輸入讀取"

8910

@@ -8955,7 +8992,7 @@ msgstr "協定不支援設定遠端服務路徑"

8992 msgid "invalid remote service path"

8993 msgstr "無效的遠端服務路徑"

8994

8958 -#: transport-helper.c:661 transport.c:1471

8995 +#: transport-helper.c:661 transport.c:1477

8996 msgid "operation not supported by protocol"

8997 msgstr "協定不支援該動作"

8998

@@ -8964,7 +9001,7 @@ msgstr "協定不支援該動作"

9001 msgid "can't connect to subservice %s"

9002 msgstr "不能連線到子服務 %s"

9003

8967 -#: transport-helper.c:693 transport.c:397

9004 +#: transport-helper.c:693 transport.c:400

9005 msgid "--negotiate-only requires protocol v2"

9006 msgstr "--negotiate-only 需要 v2 版協定"

9007

@@ -9097,53 +9134,53 @@ msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n"

9134 msgid "could not read bundle '%s'"

9135 msgstr "無法讀取 bundle '%s'"

9136

9100 -#: transport.c:220

9137 +#: transport.c:223

9138 #, c-format

9139 msgid "transport: invalid depth option '%s'"

9140 msgstr "傳輸：無效的深度選項 '%s'"

9141

9105 -#: transport.c:272

9142 +#: transport.c:275

9143 msgid "see protocol.version in 'git help config' for more details"

9144 msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息"

9145

9109 -#: transport.c:273

9146 +#: transport.c:276

9147 msgid "server options require protocol version 2 or later"

9148 msgstr "服務端選項需要版本 2 協定或更高"

9149

9113 -#: transport.c:400

9150 +#: transport.c:403

9151 msgid "server does not support wait-for-done"

9152 msgstr "伺服器不支援「等待完成」(wait-for-done) 功能"

9153

9117 -#: transport.c:751

9154 +#: transport.c:755

9155 msgid "could not parse transport.color.* config"

9156 msgstr "不能解析 transport.color.* 設定"

9157

9121 -#: transport.c:826

9158 +#: transport.c:830

9159 msgid "support for protocol v2 not implemented yet"

9160 msgstr "協定 v2 的支援尚未實現"

9161

9125 -#: transport.c:960

9162 +#: transport.c:965

9163 #, c-format

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

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

9166

9130 -#: transport.c:1026

9167 +#: transport.c:1031

9168 #, c-format

9169 msgid "transport '%s' not allowed"

9170 msgstr "傳輸 '%s' 不允許"

9171

9135 -#: transport.c:1079

9172 +#: transport.c:1084

9173 msgid "git-over-rsync is no longer supported"

9174 msgstr "不再支援 git-over-rsync"

9175

9139 -#: transport.c:1181

9176 +#: transport.c:1187

9177 #, c-format

9178 msgid ""

9179 "The following submodule paths contain changes that can\n"

9180 "not be found on any remote:\n"

9181 msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到：\n"

9182

9146 -#: transport.c:1185

9183 +#: transport.c:1191

9184 #, c-format

9185 msgid ""

9186 "\n"

@@ -9170,11 +9207,11 @@ msgstr ""

9207 "以推送至遠端。\n"

9208 "\n"

9209

9173 -#: transport.c:1193

9210 +#: transport.c:1199

9211 msgid "Aborting."

9212 msgstr "正在終止。"

9213

9177 -#: transport.c:1340

9214 +#: transport.c:1346

9215 msgid "failed to push all needed submodules"

9216 msgstr "不能推送全部需要的子模組"

9217

@@ -9200,7 +9237,7 @@ msgid ""

9237 "Your local changes to the following files would be overwritten by checkout:\n"

9238 "%%sPlease commit your changes or stash them before you switch branches."

9239 msgstr ""

9203 -"您對下列檔案的本機修改將被檢出動作覆蓋：\n"

9240 +"您對下列檔案的本機修改將被簽出動作覆蓋：\n"

9241 "%%s請在切換分支前提交或儲藏您的修改。"

9242

9243 #: unpack-trees.c:117

@@ -9209,7 +9246,7 @@ msgid ""

9246 "Your local changes to the following files would be overwritten by checkout:\n"

9247 "%%s"

9248 msgstr ""

9212 -"您對下列檔案的本機修改將被檢出動作覆蓋：\n"

9249 +"您對下列檔案的本機修改將被簽出動作覆蓋：\n"

9250 "%%s"

9251

9252 #: unpack-trees.c:120

@@ -9263,7 +9300,7 @@ msgid ""

9300 "The following untracked working tree files would be removed by checkout:\n"

9301 "%%sPlease move or remove them before you switch branches."

9302 msgstr ""

9266 -"工作區中下列未追蹤的檔案將會因為檢出動作而被刪除：\n"

9303 +"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"

9304 "%%s請在切換分支之前移動或刪除。"

9305

9306 #: unpack-trees.c:138

@@ -9272,7 +9309,7 @@ msgid ""

9309 "The following untracked working tree files would be removed by checkout:\n"

9310 "%%s"

9311 msgstr ""

9275 -"工作區中下列未追蹤的檔案將會因為檢出動作而被刪除：\n"

9312 +"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"

9313 "%%s"

9314

9315 #: unpack-trees.c:141

@@ -9318,7 +9355,7 @@ msgid ""

9355 "checkout:\n"

9356 "%%sPlease move or remove them before you switch branches."

9357 msgstr ""

9321 -"工作區中下列未追蹤的檔案將會因為檢出動作而被覆蓋：\n"

9358 +"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"

9359 "%%s請在切換分支前移動或刪除。"

9360

9361 #: unpack-trees.c:156

@@ -9328,7 +9365,7 @@ msgid ""

9365 "checkout:\n"

9366 "%%s"

9367 msgstr ""

9331 -"工作區中下列未追蹤的檔案將會因為檢出動作而被覆蓋：\n"

9368 +"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"

9369 "%%s"

9370

9371 #: unpack-trees.c:159

@@ -9388,7 +9425,7 @@ msgid ""

9425 "patterns:\n"

9426 "%s"

9427 msgstr ""

9391 -"即使有稀疏檢出樣板，以下路徑不是最新且保留下來：\n"

9428 +"即使有稀疏簽出樣板，以下路徑不是最新且保留下來：\n"

9429 "%s"

9430

9431 #: unpack-trees.c:182

@@ -9397,7 +9434,7 @@ msgid ""

9434 "The following paths are unmerged and were left despite sparse patterns:\n"

9435 "%s"

9436 msgstr ""

9400 -"即使有稀疏檢出樣板，以下路徑未合併且保留下來：\n"

9437 +"即使有稀疏簽出樣板，以下路徑未合併且保留下來：\n"

9438 "%s"

9439

9440 #: unpack-trees.c:184

@@ -9407,7 +9444,7 @@ msgid ""

9444 "patterns:\n"

9445 "%s"

9446 msgstr ""

9410 -"即使有稀疏檢出樣板，以下路徑已經存在而因此未更新：\n"

9447 +"即使有稀疏簽出樣板，以下路徑已經存在而因此未更新：\n"

9448 "%s"

9449

9450 #: unpack-trees.c:264

@@ -9435,11 +9472,11 @@ msgstr ""

9472 "以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n"

9473 "並且碰撞組中只有一個檔案存在工作區中：\n"

9474

9438 -#: unpack-trees.c:1519

9475 +#: unpack-trees.c:1618

9476 msgid "Updating index flags"

9477 msgstr "正在更新索引旗標"

9478

9442 -#: unpack-trees.c:2608

9479 +#: unpack-trees.c:2718

9480 #, c-format

9481 msgid "worktree and untracked commit have duplicate entries: %s"

9482 msgstr "工作區和未追蹤提交有重複項目：%s"

@@ -9481,99 +9518,99 @@ msgstr "無效的 '..' 路徑區塊"

9518 msgid "Fetching objects"

9519 msgstr "正在抓取物件"

9520

9484 -#: worktree.c:238 builtin/am.c:2151

9521 +#: worktree.c:236 builtin/am.c:2152

9522 #, c-format

9523 msgid "failed to read '%s'"

9524 msgstr "讀取 '%s' 失敗"

9525

9489 -#: worktree.c:304

9526 +#: worktree.c:303

9527 #, c-format

9528 msgid "'%s' at main working tree is not the repository directory"

9529 msgstr "在主工作區的 '%s' 不是版本庫目錄"

9530

9494 -#: worktree.c:315

9531 +#: worktree.c:314

9532 #, c-format

9533 msgid "'%s' file does not contain absolute path to the working tree location"

9534 msgstr "檔案 '%s' 不包含工作區的絕對路徑"

9535

9499 -#: worktree.c:327

9536 +#: worktree.c:326

9537 #, c-format

9538 msgid "'%s' does not exist"

9539 msgstr "'%s' 不存在"

9540

9504 -#: worktree.c:333

9541 +#: worktree.c:332

9542 #, c-format

9543 msgid "'%s' is not a .git file, error code %d"

9544 msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d"

9545

9509 -#: worktree.c:342

9546 +#: worktree.c:341

9547 #, c-format

9548 msgid "'%s' does not point back to '%s'"

9549 msgstr "'%s' 沒有指回到 '%s'"

9550

9514 -#: worktree.c:608

9551 +#: worktree.c:603

9552 msgid "not a directory"

9553 msgstr "不是目錄"

9554

9518 -#: worktree.c:617

9555 +#: worktree.c:612

9556 msgid ".git is not a file"

9557 msgstr ".git 不是檔案"

9558

9522 -#: worktree.c:619

9559 +#: worktree.c:614

9560 msgid ".git file broken"

9561 msgstr ".git 檔案損毀"

9562

9526 -#: worktree.c:621

9563 +#: worktree.c:616

9564 msgid ".git file incorrect"

9565 msgstr ".git 檔案不正確"

9566

9530 -#: worktree.c:727

9567 +#: worktree.c:722

9568 msgid "not a valid path"

9569 msgstr "非有效路徑"

9570

9534 -#: worktree.c:733

9571 +#: worktree.c:728

9572 msgid "unable to locate repository; .git is not a file"

9573 msgstr "無法定位版本庫；.git 不是檔案"

9574

9538 -#: worktree.c:737

9575 +#: worktree.c:732

9576 msgid "unable to locate repository; .git file does not reference a repository"

9577 msgstr "無法定位版本庫；.git 檔案未參考版本庫"

9578

9542 -#: worktree.c:741

9579 +#: worktree.c:736

9580 msgid "unable to locate repository; .git file broken"

9581 msgstr "無法定位版本庫；.git 檔案損壞"

9582

9546 -#: worktree.c:747

9583 +#: worktree.c:742

9584 msgid "gitdir unreadable"

9585 msgstr "無法讀取 gitdir"

9586

9550 -#: worktree.c:751

9587 +#: worktree.c:746

9588 msgid "gitdir incorrect"

9589 msgstr "不正確的 gitdir"

9590

9554 -#: worktree.c:776

9591 +#: worktree.c:771

9592 msgid "not a valid directory"

9593 msgstr "非有效目錄"

9594

9558 -#: worktree.c:782

9595 +#: worktree.c:777

9596 msgid "gitdir file does not exist"

9597 msgstr "找不到 gitdir 檔案"

9598

9562 -#: worktree.c:787 worktree.c:796

9599 +#: worktree.c:782 worktree.c:791

9600 #, c-format

9601 msgid "unable to read gitdir file (%s)"

9602 msgstr "無法讀取 gitdir 檔案 (%s)"

9603

9567 -#: worktree.c:806

9604 +#: worktree.c:801

9605 #, c-format

9606 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"

9607 msgstr "讀取過短（預期有 %<PRIuMAX> 位元組，只讀到 %<PRIuMAX>）"

9608

9572 -#: worktree.c:814

9609 +#: worktree.c:809

9610 msgid "invalid gitdir file"

9611 msgstr "gitdir 檔案無效"

9612

9576 -#: worktree.c:822

9613 +#: worktree.c:817

9614 msgid "gitdir file points to non-existent location"

9615 msgstr "gitdir 檔案指向的位置不存在"

9616

@@ -9626,11 +9663,11 @@ msgstr " （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）"

9663 msgid " (use \"git rm <file>...\" to mark resolution)"

9664 msgstr " （使用 \"git rm <檔案>...\" 標記解決方案）"

9665

9629 -#: wt-status.c:211 wt-status.c:1075

9666 +#: wt-status.c:211 wt-status.c:1125

9667 msgid "Changes to be committed:"

9668 msgstr "要提交的變更："

9669

9633 -#: wt-status.c:234 wt-status.c:1084

9670 +#: wt-status.c:234 wt-status.c:1134

9671 msgid "Changes not staged for commit:"

9672 msgstr "尚未暫存以備提交的變更："

9673

@@ -9736,21 +9773,21 @@ msgstr "修改的內容, "

9773 msgid "untracked content, "

9774 msgstr "未追蹤的內容, "

9775

9739 -#: wt-status.c:908

9776 +#: wt-status.c:958

9777 #, c-format

9778 msgid "Your stash currently has %d entry"

9779 msgid_plural "Your stash currently has %d entries"

9780 msgstr[0] "您的儲藏區目前有 %d 條紀錄"

9781

9745 -#: wt-status.c:939

9782 +#: wt-status.c:989

9783 msgid "Submodules changed but not updated:"

9784 msgstr "子模組已修改但尚未更新："

9785

9749 -#: wt-status.c:941

9786 +#: wt-status.c:991

9787 msgid "Submodule changes to be committed:"

9788 msgstr "要提交的子模組變更："

9789

9753 -#: wt-status.c:1023

9790 +#: wt-status.c:1073

9791 msgid ""

l10n: zh_TW.po: update for v2.33.0 rnd 2