diff options
| author | Yi-Jyun Pan <pan93412@gmail.com> | 2022-01-13 01:10:46 +0800 |
|---|---|---|
| committer | Yi-Jyun Pan <pan93412@gmail.com> | 2022-01-13 01:10:46 +0800 |
| commit | cb57f2502127f91cd00918a2bb70f13815f2acfe (patch) | |
| tree | 93c78a2dee16feb23426a0fdca9daf6988b0ac8c /po | |
| parent | 4b1fd488746def3f8c26f5b20e7c3f1c282ed088 (diff) | |
l10n: zh_TW: v2.35.0 round 1 (1 fuzzy)
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
Diffstat (limited to 'po')
| -rw-r--r-- | po/zh_TW.po | 6580 |
1 files changed, 3463 insertions, 3117 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po index f1df8b60a9..703094e03f 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -17,32 +17,32 @@ # - Yichao Yu <yyc1992 AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> # -# Yi-Jyun Pan <pan93412@gmail.com>, 2021. +# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-11-10 08:55+0800\n" -"PO-Revision-Date: 2021-11-11 06:38+0800\n" +"POT-Creation-Date: 2022-01-11 09:38+0800\n" +"PO-Revision-Date: 2022-01-12 17:01+0000\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" -"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-" -"po/git-cli/zh_Hant/>\n" +"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/" +"git-po/git-cli/zh_Hant/>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.0\n" -"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" -"zhconvert.org\n" +"X-Generator: Weblate 4.8.1\n" +"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | " +"https://zhconvert.org\n" #: add-interactive.c:380 #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512 -#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509 +#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233 #: builtin/rebase.c:1642 msgid "could not read index" msgstr "無法讀取索引" @@ -71,7 +71,7 @@ msgstr "更新" msgid "could not stage '%s'" msgstr "無法暫存「%s」" -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713 msgid "could not write index" msgstr "無法寫入索引" @@ -86,8 +86,8 @@ msgstr[0] "已更新 %d 個路徑\n" msgid "note: %s is untracked now.\n" msgstr "注意：%s 現已不再追蹤。\n" -#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298 -#: builtin/reset.c:151 +#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306 +#: builtin/reset.c:167 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "「%s」路徑執行 make_cache_entry 失敗" @@ -126,21 +126,21 @@ msgstr[0] "增加了 %d 個路徑\n" msgid "ignoring unmerged: %s" msgstr "忽略未合併：%s" -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371 #, c-format msgid "Only binary files changed.\n" msgstr "只有二進位檔案被修改。\n" -#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373 #, c-format msgid "No changes.\n" msgstr "沒有修改。\n" -#: add-interactive.c:947 git-add--interactive.perl:1379 +#: add-interactive.c:947 git-add--interactive.perl:1381 msgid "Patch update" msgstr "修補檔更新" -#: add-interactive.c:986 git-add--interactive.perl:1792 +#: add-interactive.c:986 git-add--interactive.perl:1794 msgid "Review diff" msgstr "檢視 diff" @@ -208,11 +208,11 @@ msgstr "選擇編號過的項目" msgid "(empty) select nothing" msgstr "（空）全不選取" -#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896 +#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898 msgid "*** Commands ***" msgstr "*** 指令 ***" -#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893 +#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895 msgid "What now" msgstr "請選擇" @@ -224,13 +224,13 @@ msgstr "快取" msgid "unstaged" msgstr "未快取" -#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311 -#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857 -#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503 -#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573 -#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811 +#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367 +#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128 +#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504 +#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812 #: git-add--interactive.perl:213 msgid "path" msgstr "路徑" @@ -239,27 +239,27 @@ msgstr "路徑" msgid "could not refresh index" msgstr "無法重新整理索引" -#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803 +#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805 #, c-format msgid "Bye.\n" msgstr "再見。\n" -#: add-patch.c:34 git-add--interactive.perl:1431 +#: add-patch.c:34 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暫存模式變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:35 git-add--interactive.perl:1432 +#: add-patch.c:35 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暫存刪除變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:36 git-add--interactive.perl:1433 +#: add-patch.c:36 git-add--interactive.perl:1435 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "暫存新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1434 +#: add-patch.c:37 git-add--interactive.perl:1436 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暫存此區塊 [y,n,q,a,d%s,?]? " @@ -284,22 +284,22 @@ msgstr "" "a - 暫存此區塊和本檔案中後面的全部區塊\n" "d - 不暫存此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:56 git-add--interactive.perl:1437 +#: add-patch.c:56 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:57 git-add--interactive.perl:1438 +#: add-patch.c:57 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "儲藏刪除變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:58 git-add--interactive.perl:1439 +#: add-patch.c:58 git-add--interactive.perl:1441 #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "儲藏新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1440 +#: add-patch.c:59 git-add--interactive.perl:1442 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? " @@ -324,22 +324,22 @@ msgstr "" "a - 儲藏此區塊和本檔案中後面的全部區塊\n" "d - 不儲藏此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:80 git-add--interactive.perl:1443 +#: add-patch.c:80 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:81 git-add--interactive.perl:1444 +#: add-patch.c:81 git-add--interactive.perl:1446 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暫存刪除變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:82 git-add--interactive.perl:1445 +#: add-patch.c:82 git-add--interactive.perl:1447 #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "取消暫存新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1446 +#: add-patch.c:83 git-add--interactive.perl:1448 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? " @@ -364,22 +364,22 @@ msgstr "" "a - 不暫存此區塊和本檔案中後面的全部區塊\n" "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:103 git-add--interactive.perl:1449 +#: add-patch.c:103 git-add--interactive.perl:1451 #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:104 git-add--interactive.perl:1450 +#: add-patch.c:104 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "將刪除變更套用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:105 git-add--interactive.perl:1451 +#: add-patch.c:105 git-add--interactive.perl:1453 #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "套用新增變更至索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1452 +#: add-patch.c:106 git-add--interactive.perl:1454 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? " @@ -404,26 +404,26 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:126 git-add--interactive.perl:1455 -#: git-add--interactive.perl:1473 +#: add-patch.c:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:127 git-add--interactive.perl:1456 -#: git-add--interactive.perl:1474 +#: add-patch.c:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "從工作區中捨棄刪除變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:128 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "放棄工作目錄的新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:129 git-add--interactive.perl:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " @@ -448,22 +448,22 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? " -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "放棄索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " @@ -482,22 +482,22 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? " -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "將刪除變更套用到索引和工作區 [y,n,q,a,d%s,?]? " -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "套用索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? " @@ -635,7 +635,7 @@ msgstr "「git apply --cached」失敗" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1247 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1244 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? " @@ -644,11 +644,11 @@ msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！ msgid "The selected hunks do not apply to the index!" msgstr "選取的區塊不會套用進索引！" -#: add-patch.c:1291 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1348 msgid "Apply them to the worktree anyway? " msgstr "無論如何都要套用到工作區嗎？ " -#: add-patch.c:1298 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1351 msgid "Nothing was applied.\n" msgstr "未套用。\n" @@ -686,11 +686,11 @@ msgstr "沒有下一個區塊" msgid "No other hunks to goto" msgstr "沒有其它可供跳轉的區塊" -#: add-patch.c:1549 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk (<ret> to see more)? " msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ " -#: add-patch.c:1550 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1610 msgid "go to which hunk? " msgstr "跳轉到哪個區塊？ " @@ -709,7 +709,7 @@ msgstr[0] "對不起，只有 %d 個可用區塊。" msgid "No other hunks to search" msgstr "沒有其它可供尋找的區塊" -#: add-patch.c:1581 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1663 msgid "search for regex? " msgstr "使用常規表示式搜尋？ " @@ -790,7 +790,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "因為存在未解決的衝突而離開。" -#: advice.c:209 builtin/merge.c:1379 +#: advice.c:209 builtin/merge.c:1382 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。" @@ -885,21 +885,33 @@ msgstr "無法識別的空白字元選項 '%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "無法識別的空白字元忽略選項 '%s'" -#: apply.c:136 -msgid "--reject and --3way cannot be used together." -msgstr "--reject 和 --3way 不能同時使用。" - -#: apply.c:139 -msgid "--3way outside a repository" -msgstr "--3way 在版本庫之外" - -#: apply.c:150 -msgid "--index outside a repository" -msgstr "--index 在版本庫之外" - -#: apply.c:153 -msgid "--cached outside a repository" -msgstr "--cached 在版本庫之外" +#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307 +#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870 +#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885 +#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541 +#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470 +#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757 +#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361 +#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155 +#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033 +#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560 +#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778 +#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073 +#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 +#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199 +#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426 +#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710 +#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316 +#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572 +#: builtin/worktree.c:702 +#, c-format +msgid "options '%s' and '%s' cannot be used together" +msgstr "不能同時使用 '%s' 和 '%s' 選項" + +#: apply.c:139 apply.c:150 apply.c:153 +#, c-format +msgid "'%s' outside a repository" +msgstr "'%s' 在版本庫之外" #: apply.c:800 #, c-format @@ -1100,8 +1112,8 @@ msgstr "打修補檔失敗：%s:%ld" msgid "cannot checkout %s" msgstr "不能簽出 %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214 -#: setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214 +#: setup.c:309 #, c-format msgid "failed to read %s" msgstr "無法讀取 %s" @@ -1111,376 +1123,374 @@ msgstr "無法讀取 %s" msgid "reading from '%s' beyond a symbolic link" msgstr "讀取位於符號連結中的 '%s'" -#: apply.c:3442 apply.c:3709 +#: apply.c:3442 apply.c:3711 #, c-format msgid "path %s has been renamed/deleted" msgstr "路徑 %s 已經被重新命名/刪除" -#: apply.c:3549 apply.c:3724 +#: apply.c:3549 apply.c:3726 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在於索引中" -#: apply.c:3558 apply.c:3732 apply.c:3976 +#: apply.c:3558 apply.c:3734 apply.c:3978 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不符合" -#: apply.c:3593 +#: apply.c:3595 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "版本庫缺少用來進行三方合併所需要的資料物件。" -#: apply.c:3596 +#: apply.c:3598 #, c-format msgid "Performing three-way merge...\n" msgstr "正在進行三方合併⋯⋯\n" -#: apply.c:3612 apply.c:3616 +#: apply.c:3614 apply.c:3618 #, c-format msgid "cannot read the current contents of '%s'" msgstr "無法讀取 '%s' 的目前內容" -#: apply.c:3628 +#: apply.c:3630 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "無法進行三方合併⋯⋯\n" -#: apply.c:3642 +#: apply.c:3644 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "套用修補檔到 '%s' 存在衝突。\n" -#: apply.c:3647 +#: apply.c:3649 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功套用修補檔到 '%s'。\n" -#: apply.c:3664 +#: apply.c:3666 #, c-format msgid "Falling back to direct application...\n" msgstr "回復至直接套用模式⋯⋯\n" -#: apply.c:3676 +#: apply.c:3678 msgid "removal patch leaves file contents" msgstr "移除修補檔仍留下了檔案內容" -#: apply.c:3749 +#: apply.c:3751 #, c-format msgid "%s: wrong type" msgstr "%s：錯誤類型" -#: apply.c:3751 +#: apply.c:3753 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，應為 %o" -#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905 -#: read-cache.c:1368 +#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918 +#: read-cache.c:1381 #, c-format msgid "invalid path '%s'" msgstr "無效路徑 '%s'" -#: apply.c:3974 +#: apply.c:3976 #, c-format msgid "%s: already exists in index" msgstr "%s：已經存在於索引中" -#: apply.c:3978 +#: apply.c:3980 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已經存在於工作區中" -#: apply.c:3998 +#: apply.c:4000 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合" -#: apply.c:4003 +#: apply.c:4005 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合" -#: apply.c:4023 +#: apply.c:4025 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影響的檔案 '%s' 位於符號連結中" -#: apply.c:4027 +#: apply.c:4029 #, c-format msgid "%s: patch does not apply" msgstr "%s：修補檔未套用" -#: apply.c:4042 +#: apply.c:4044 #, c-format msgid "Checking patch %s..." msgstr "正在檢查修補檔 %s..." -#: apply.c:4134 +#: apply.c:4136 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模組 %s 的 sha1 訊息缺少或無效" -#: apply.c:4141 +#: apply.c:4143 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式變更，但它不在目前 HEAD 中" -#: apply.c:4144 +#: apply.c:4146 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 訊息缺少或無效（%s）。" -#: apply.c:4153 +#: apply.c:4155 #, c-format msgid "could not add %s to temporary index" msgstr "不能在暫時索引中新增 %s" -#: apply.c:4163 +#: apply.c:4165 #, c-format msgid "could not write temporary index to %s" msgstr "不能把暫時索引寫入到 %s" -#: apply.c:4301 +#: apply.c:4303 #, c-format msgid "unable to remove %s from index" msgstr "不能從索引中移除 %s" -#: apply.c:4335 +#: apply.c:4337 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模組 %s 損壞的修補檔" -#: apply.c:4341 +#: apply.c:4343 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能對建立檔案 '%s' 呼叫 stat" -#: apply.c:4349 +#: apply.c:4351 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能為建立檔案 %s 建立後端儲存" -#: apply.c:4355 apply.c:4500 +#: apply.c:4357 apply.c:4502 #, c-format msgid "unable to add cache entry for %s" msgstr "無法為 %s 新增快取條目" -#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241 -#: builtin/gc.c:2276 +#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258 +#: builtin/gc.c:2293 #, c-format msgid "failed to write to '%s'" msgstr "寫入 '%s' 失敗" -#: apply.c:4402 +#: apply.c:4404 #, c-format msgid "closing file '%s'" msgstr "關閉檔案 '%s'" -#: apply.c:4472 +#: apply.c:4474 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能寫入檔案 '%s' 權限 %o" -#: apply.c:4570 +#: apply.c:4572 #, c-format msgid "Applied patch %s cleanly." msgstr "成功套用修補檔 %s。" -#: apply.c:4578 +#: apply.c:4580 msgid "internal error" msgstr "內部錯誤" -#: apply.c:4581 +#: apply.c:4583 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..." -#: apply.c:4592 +#: apply.c:4594 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 檔案名為 %.*s.rej" -#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408 +#: apply.c:4602 #, c-format msgid "cannot open %s" msgstr "不能開啟 %s" -#: apply.c:4614 +#: apply.c:4616 #, c-format msgid "Hunk #%d applied cleanly." msgstr "成功套用第 #%d 個區塊。" -#: apply.c:4618 +#: apply.c:4620 #, c-format msgid "Rejected hunk #%d." msgstr "拒絕第 #%d 個區塊。" -#: apply.c:4747 +#: apply.c:4749 #, c-format msgid "Skipped patch '%s'." msgstr "略過修補檔 '%s'。" -#: apply.c:4755 -msgid "unrecognized input" -msgstr "無法識別的輸入" +#: apply.c:4758 +msgid "No valid patches in input (allow with \"--allow-empty\")" +msgstr "輸入中沒有有效的修補檔內容（傳入「--allow-empty」允許）" -#: apply.c:4775 +#: apply.c:4779 msgid "unable to read index file" msgstr "無法讀取索引檔案" -#: apply.c:4932 +#: apply.c:4936 #, c-format msgid "can't open patch '%s': %s" msgstr "不能開啟修補檔 '%s'：%s" -#: apply.c:4959 +#: apply.c:4963 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 個空白字元誤用" -#: apply.c:4965 apply.c:4980 +#: apply.c:4969 apply.c:4984 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字元誤用。" -#: apply.c:4973 +#: apply.c:4977 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修復空白錯誤後，套用了 %d 行。" -#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429 +#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "無法寫入新索引檔案" -#: apply.c:5017 +#: apply.c:5021 msgid "don't apply changes matching the given path" msgstr "不要套用符合提供路徑的變更" -#: apply.c:5020 +#: apply.c:5024 msgid "apply changes matching the given path" msgstr "套用符合提供路徑的變更" -#: apply.c:5022 builtin/am.c:2320 +#: apply.c:5026 builtin/am.c:2376 msgid "num" msgstr "數字" -#: apply.c:5023 +#: apply.c:5027 msgid "remove <num> leading slashes from traditional diff paths" msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線" -#: apply.c:5026 +#: apply.c:5030 msgid "ignore additions made by the patch" msgstr "忽略修補檔中的新增的檔案" -#: apply.c:5028 +#: apply.c:5032 msgid "instead of applying the patch, output diffstat for the input" msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）" -#: apply.c:5032 +#: apply.c:5036 msgid "show number of added and deleted lines in decimal notation" msgstr "以十進位數顯示新增和刪除的行數" -#: apply.c:5034 +#: apply.c:5038 msgid "instead of applying the patch, output a summary for the input" msgstr "不套用修補檔，而是顯示輸入的概要" -#: apply.c:5036 +#: apply.c:5040 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不套用修補檔，而是檢視修補檔是否可套用" -#: apply.c:5038 +#: apply.c:5042 msgid "make sure the patch is applicable to the current index" msgstr "確認修補檔可以套用到目前索引" -#: apply.c:5040 +#: apply.c:5044 msgid "mark new files with `git add --intent-to-add`" msgstr "使用指令 `git add --intent-to-add` 標記新增檔案" -#: apply.c:5042 +#: apply.c:5046 msgid "apply a patch without touching the working tree" msgstr "套用修補檔而不修改工作區" -#: apply.c:5044 +#: apply.c:5048 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作區之外檔案的修補檔" -#: apply.c:5047 +#: apply.c:5051 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）" -#: apply.c:5049 +#: apply.c:5053 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式" -#: apply.c:5051 +#: apply.c:5055 msgid "build a temporary index based on embedded index information" msgstr "建立一個暫時索引基於嵌入的索引訊息" -#: apply.c:5054 builtin/checkout-index.c:196 +#: apply.c:5058 builtin/checkout-index.c:196 msgid "paths are separated with NUL character" msgstr "路徑以 NUL 字元分隔" -#: apply.c:5056 +#: apply.c:5060 msgid "ensure at least <n> lines of context match" msgstr "確保至少符合 <n> 行上下文" -#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299 +#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960 #: builtin/rebase.c:1051 msgid "action" msgstr "動作" -#: apply.c:5058 +#: apply.c:5062 msgid "detect new or modified lines that have whitespace errors" msgstr "檢查新增和修改的行中間的空白字元濫用" -#: apply.c:5061 apply.c:5064 +#: apply.c:5065 apply.c:5068 msgid "ignore changes in whitespace when finding context" msgstr "尋找上下文時忽略空白字元的變更" -#: apply.c:5067 +#: apply.c:5071 msgid "apply the patch in reverse" msgstr "反向套用修補檔" -#: apply.c:5069 +#: apply.c:5073 msgid "don't expect at least one line of context" msgstr "無需至少一行上下文" -#: apply.c:5071 +#: apply.c:5075 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中" -#: apply.c:5073 +#: apply.c:5077 msgid "allow overlapping hunks" msgstr "允許重疊的修補檔區塊" -#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22 -#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120 -msgid "be verbose" -msgstr "詳細輸出" - -#: apply.c:5076 +#: apply.c:5080 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允許不正確的檔案末尾換行符號" -#: apply.c:5079 +#: apply.c:5083 msgid "do not trust the line counts in the hunk headers" msgstr "不信任修補檔區塊的標頭訊息中的行號" -#: apply.c:5081 builtin/am.c:2308 +#: apply.c:5085 builtin/am.c:2364 msgid "root" msgstr "根目錄" -#: apply.c:5082 +#: apply.c:5086 msgid "prepend <root> to all filenames" msgstr "為所有檔案名前新增 <根目錄>" +#: apply.c:5089 +msgid "don't return error for empty patches" +msgstr "遇到空白修補檔時不回傳錯誤" + #: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" @@ -1491,16 +1501,16 @@ msgstr "不能開啟資料物件 %s" msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支援的檔案模式：0%o (SHA1: %s)" -#: archive-tar.c:450 +#: archive-tar.c:447 #, c-format msgid "unable to start '%s' filter" msgstr "無法啟動 '%s' 過濾器" -#: archive-tar.c:453 +#: archive-tar.c:450 msgid "unable to redirect descriptor" msgstr "無法重定向描述符" -#: archive-tar.c:460 +#: archive-tar.c:457 #, c-format msgid "'%s' filter reported error" msgstr "'%s' 過濾器報告了錯誤" @@ -1543,19 +1553,13 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <版本庫> [--exec <命令>] --list" -#: archive.c:188 +#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238 +#: builtin/tag.c:578 #, c-format -msgid "cannot read %s" -msgstr "不能讀取 %s" - -#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114 -#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834 -#: builtin/merge.c:1145 -#, c-format -msgid "could not read '%s'" +msgid "cannot read '%s'" msgstr "不能讀取 '%s'" -#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334 +#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路徑規格 '%s' 未符合任何檔案" @@ -1597,7 +1601,7 @@ msgstr "格式" msgid "archive format" msgstr "歸檔格式" -#: archive.c:552 builtin/log.c:1775 +#: archive.c:552 builtin/log.c:1790 msgid "prefix" msgstr "前綴" @@ -1607,9 +1611,9 @@ msgstr "為歸檔中每個路徑名加上前綴" #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103 -#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410 +#: builtin/fast-export.c:1181 builtin/fast-export.c:1183 +#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103 +#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190 msgid "file" msgstr "檔案" @@ -1639,7 +1643,7 @@ msgid "list supported archive formats" msgstr "列出支援的歸檔格式" #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512 +#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513 msgid "repo" msgstr "版本庫" @@ -1647,7 +1651,7 @@ msgstr "版本庫" msgid "retrieve the archive from remote repository <repo>" msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案" -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708 #: builtin/notes.c:496 msgid "command" msgstr "指令" @@ -1660,18 +1664,20 @@ msgstr "遠端 git-upload-archive 指令的路徑" msgid "Unexpected option --remote" msgstr "未知參數 --remote" -#: archive.c:580 -msgid "Option --exec can only be used together with --remote" -msgstr "選項 --exec 只能和 --remote 同時使用" +#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544 +#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370 +#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115 +#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281 +#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144 +#: http-fetch.c:153 +#, c-format +msgid "the option '%s' requires '%s'" +msgstr "「%s」選項需要「%s」" #: archive.c:582 msgid "Unexpected option --output" msgstr "未知參數 --output" -#: archive.c:584 -msgid "Options --add-file and --remote cannot be used together" -msgstr "--add-file 和 --remote 選項不能同時使用" - #: archive.c:606 #, c-format msgid "Unknown archive format '%s'" @@ -1779,7 +1785,7 @@ msgstr "需要一個 %s 版本" msgid "could not create file '%s'" msgstr "不能建立檔案 '%s'" -#: bisect.c:985 builtin/merge.c:154 +#: bisect.c:985 builtin/merge.c:155 #, c-format msgid "could not read file '%s'" msgstr "不能讀取檔案 '%s'" @@ -1829,10 +1835,10 @@ msgstr "不能將 --contents 和最終的提交物件名共用" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041 -#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114 -#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 -#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373 +#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158 +#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114 +#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071 +#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790 #: builtin/shortlog.c:255 msgid "revision walk setup failed" @@ -1853,98 +1859,87 @@ msgstr "在 %2$s 中無此路徑 %1$s" msgid "cannot read blob %s for path %s" msgstr "不能為路徑 %2$s 讀取資料物件 %1$s" -#: branch.c:53 -#, c-format +#: branch.c:77 msgid "" -"\n" -"After fixing the error cause you may try to fix up\n" -"the remote tracking information by invoking\n" -"\"git branch --set-upstream-to=%s%s%s\"." -msgstr "" -"\n" -"修正錯誤後，您可以執行\n" -"\"git branch --set-upstream-to=%s%s%s\"\n" -"命令修正遠端追蹤資訊。" +"cannot inherit upstream tracking configuration of multiple refs when " +"rebasing is requested" +msgstr "請求重定基底時，無法繼承多個參照的上游追蹤設定" -#: branch.c:67 +#: branch.c:88 #, c-format -msgid "Not setting branch %s as its own upstream." -msgstr "未設定分支 %s 作為它自己的上游。" +msgid "not setting branch '%s' as its own upstream" +msgstr "未將「%s」分支設定為其自己的上游" -#: branch.c:93 +#: branch.c:144 #, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." -msgstr "分支 '%1$s' 設定為使用重定基底來追蹤來自 '%3$s' 的遠端分支 '%2$s'。" +msgid "branch '%s' set up to track '%s' by rebasing." +msgstr "已將「%s」分支設定為透過重定基底追蹤「%s」。" -#: branch.c:94 +#: branch.c:145 #, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s'." -msgstr "分支 '%1$s' 設定為追蹤來自 '%3$s' 的遠端分支 '%2$s'。" +msgid "branch '%s' set up to track '%s'." +msgstr "已將「%s」分支設定為追蹤「%s」。" -#: branch.c:98 +#: branch.c:148 #, c-format -msgid "Branch '%s' set up to track local branch '%s' by rebasing." -msgstr "分支 '%s' 設定為使用重定基底來追蹤本機分支 '%s'。" +msgid "branch '%s' set up to track:" +msgstr "「%s」分支已設定追蹤：" -#: branch.c:99 -#, c-format -msgid "Branch '%s' set up to track local branch '%s'." -msgstr "分支 '%s' 設定為追蹤本機分支 '%s'。" +#: branch.c:160 +msgid "unable to write upstream branch configuration" +msgstr "無法寫入上游分支設定" -#: branch.c:104 -#, c-format -msgid "Branch '%s' set up to track remote ref '%s' by rebasing." -msgstr "分支 '%s' 設定為使用重定基底來追蹤遠端引用 '%s'。" +#: branch.c:162 +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking:" +msgstr "" +"\n" +"修正錯誤後，您可以執行下述命令\n" +"命令修正遠端追蹤資訊：" -#: branch.c:105 +#: branch.c:203 #, c-format -msgid "Branch '%s' set up to track remote ref '%s'." -msgstr "分支 '%s' 設定為追蹤遠端引用 '%s'。" +msgid "asked to inherit tracking from '%s', but no remote is set" +msgstr "請求繼承「%s」的追蹤設定，但未設定遠端" -#: branch.c:109 +#: branch.c:209 #, c-format -msgid "Branch '%s' set up to track local ref '%s' by rebasing." -msgstr "分支 '%s' 設定為使用重定基底來追蹤本機引用 '%s'。" +msgid "asked to inherit tracking from '%s', but no merge configuration is set" +msgstr "請求繼承「%s」的追蹤設定，但未設定合併設定" -#: branch.c:110 +#: branch.c:252 #, c-format -msgid "Branch '%s' set up to track local ref '%s'." -msgstr "分支 '%s' 設定為追蹤本機引用 '%s'。" +msgid "not tracking: ambiguous information for ref %s" +msgstr "未追蹤：%s 引用有歧義" -#: branch.c:119 -msgid "Unable to write upstream branch configuration" -msgstr "無法寫入上游分支設定" - -#: branch.c:156 +#: branch.c:287 #, c-format -msgid "Not tracking: ambiguous information for ref %s" -msgstr "未追蹤：引用 %s 有歧義" +msgid "'%s' is not a valid branch name" +msgstr "「%s」不是一個有效的分支名稱" -#: branch.c:189 +#: branch.c:307 #, c-format -msgid "'%s' is not a valid branch name." -msgstr "'%s' 不是一個有效的分支名稱。" +msgid "a branch named '%s' already exists" +msgstr "已有同名「%s」分支" -#: branch.c:208 +#: branch.c:313 #, c-format -msgid "A branch named '%s' already exists." -msgstr "一個分支名 '%s' 已經存在。" - -#: branch.c:213 -msgid "Cannot force update the current branch." -msgstr "無法強制更新目前分支。" +msgid "cannot force update the branch '%s'checked out at '%s'" +msgstr "無法強制更新在「%2$s」簽出的「%1$s」分支" -#: branch.c:233 +#: branch.c:336 #, c-format -msgid "Cannot setup tracking information; starting point '%s' is not a branch." -msgstr "無法設定追蹤訊息；起始點 '%s' 不是一個分支。" +msgid "cannot set up tracking information; starting point '%s' is not a branch" +msgstr "無法設定追蹤資訊：起始點「%s」不是分支" -#: branch.c:235 +#: branch.c:338 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "請求的上游分支 '%s' 不存在" -#: branch.c:237 +#: branch.c:340 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1963,27 +1958,28 @@ msgstr "" "且建立兩個分支間的追蹤關係，\n" "您可能需要使用「git push -u」推送分支並設定和上游的關聯。" -#: branch.c:281 +#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377 +#: builtin/replace.c:423 builtin/replace.c:453 #, c-format -msgid "Not a valid object name: '%s'." -msgstr "不是一個有效的物件名：'%s'。" +msgid "not a valid object name: '%s'" +msgstr "不是一個有效的物件名：'%s'" -#: branch.c:301 +#: branch.c:404 #, c-format -msgid "Ambiguous object name: '%s'." -msgstr "歧義的物件名：'%s'。" +msgid "ambiguous object name: '%s'" +msgstr "物件名稱有歧義：「%s」" -#: branch.c:306 +#: branch.c:409 #, c-format -msgid "Not a valid branch point: '%s'." -msgstr "無效的分支點：'%s'。" +msgid "not a valid branch point: '%s'" +msgstr "無效的分支點：「%s」" -#: branch.c:366 +#: branch.c:469 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已經簽出到 '%s'" -#: branch.c:389 +#: branch.c:494 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作區 %s 的 HEAD 指向沒有被更新" @@ -2008,7 +2004,7 @@ msgstr "'%s' 不像是一個 v2 或 v3 版本的包檔案" msgid "unrecognized header: %s%s (%d)" msgstr "無法識別的包頭：%s%s (%d)" -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406 #: builtin/commit.c:862 #, c-format msgid "could not open '%s'" @@ -2065,7 +2061,7 @@ msgstr "不支援的包版本 %d" msgid "cannot write bundle version %d with algorithm %s" msgstr "無法寫入 %2$s 演算法的包版本 %1$d" -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399 #, c-format msgid "unrecognized argument: %s" msgstr "無法識別的參數：%s" @@ -2102,7 +2098,7 @@ msgstr "找到重複的區塊 ID %<PRIx32>" msgid "final chunk has non-zero id %<PRIx32>" msgstr "最終區塊有非零 ID %<PRIx32>" -#: color.c:329 +#: color.c:354 #, c-format msgid "invalid color value: %.*s" msgstr "無效的顏色值：%.*s" @@ -2152,205 +2148,205 @@ msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值" msgid "unable to find all commit-graph files" msgstr "無法找到所有提交圖形檔案" -#: commit-graph.c:746 commit-graph.c:783 +#: commit-graph.c:749 commit-graph.c:786 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "無效的提交位置。提交圖形可能已損壞" -#: commit-graph.c:767 +#: commit-graph.c:770 #, c-format msgid "could not find commit %s" msgstr "無法找到提交 %s" -#: commit-graph.c:800 +#: commit-graph.c:803 msgid "commit-graph requires overflow generation data but has none" msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料" -#: commit-graph.c:1105 builtin/am.c:1342 +#: commit-graph.c:1108 builtin/am.c:1369 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1367 builtin/pack-objects.c:3070 +#: commit-graph.c:1370 builtin/pack-objects.c:3070 #, c-format msgid "unable to get type of object %s" msgstr "無法獲得物件 %s 類型" -#: commit-graph.c:1398 +#: commit-graph.c:1401 msgid "Loading known commits in commit graph" msgstr "正在載入提交圖中的已知提交" -#: commit-graph.c:1415 +#: commit-graph.c:1418 msgid "Expanding reachable commits in commit graph" msgstr "正在展開提交圖中的可以取得的提交" -#: commit-graph.c:1435 +#: commit-graph.c:1438 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交圖中的提交標記" -#: commit-graph.c:1454 +#: commit-graph.c:1457 msgid "Computing commit graph topological levels" msgstr "正在計算提交圖拓樸級別" -#: commit-graph.c:1507 +#: commit-graph.c:1510 msgid "Computing commit graph generation numbers" msgstr "正在計算提交圖世代數字" -#: commit-graph.c:1588 +#: commit-graph.c:1591 msgid "Computing commit changed paths Bloom filters" msgstr "正在計算提交變更路徑的布隆過濾器" -#: commit-graph.c:1665 +#: commit-graph.c:1668 msgid "Collecting referenced commits" msgstr "正在收集引用提交" -#: commit-graph.c:1690 +#: commit-graph.c:1693 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "正在 %d 個包中尋找提交圖的提交" -#: commit-graph.c:1703 +#: commit-graph.c:1706 #, c-format msgid "error adding pack %s" msgstr "新增包 %s 發生錯誤" -#: commit-graph.c:1707 +#: commit-graph.c:1710 #, c-format msgid "error opening index for %s" msgstr "為 %s 開啟索引發生錯誤" -#: commit-graph.c:1744 +#: commit-graph.c:1747 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包物件中尋找提交圖的提交" -#: commit-graph.c:1762 +#: commit-graph.c:1765 msgid "Finding extra edges in commit graph" msgstr "正在尋找提交圖中額外的邊" -#: commit-graph.c:1811 +#: commit-graph.c:1814 msgid "failed to write correct number of base graph ids" msgstr "無法寫入正確數量的基礎圖形 ID" -#: commit-graph.c:1842 midx.c:1146 +#: commit-graph.c:1845 midx.c:1149 #, c-format msgid "unable to create leading directories of %s" msgstr "不能為 %s 建立先導目錄" -#: commit-graph.c:1855 +#: commit-graph.c:1858 msgid "unable to create temporary graph layer" msgstr "無法建立暫時的圖形層" -#: commit-graph.c:1860 +#: commit-graph.c:1863 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "無法調整「%s」的共用權限" -#: commit-graph.c:1917 +#: commit-graph.c:1920 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "正在用 %d 步寫出提交圖" -#: commit-graph.c:1953 +#: commit-graph.c:1956 msgid "unable to open commit-graph chain file" msgstr "無法開啟提交圖形鏈檔案" -#: commit-graph.c:1969 +#: commit-graph.c:1972 msgid "failed to rename base commit-graph file" msgstr "無法重新命名基礎提交圖形檔案" -#: commit-graph.c:1989 +#: commit-graph.c:1992 msgid "failed to rename temporary commit-graph file" msgstr "無法重新命名暫時提交圖形檔案" -#: commit-graph.c:2122 +#: commit-graph.c:2125 msgid "Scanning merged commits" msgstr "正在掃描合併提交" -#: commit-graph.c:2166 +#: commit-graph.c:2169 msgid "Merging commit-graph" msgstr "正在合併提交圖形" -#: commit-graph.c:2274 +#: commit-graph.c:2277 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用" -#: commit-graph.c:2381 +#: commit-graph.c:2384 msgid "too many commits to write graph" msgstr "提交太多不能畫圖" -#: commit-graph.c:2479 +#: commit-graph.c:2482 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞" -#: commit-graph.c:2489 +#: commit-graph.c:2492 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s" -#: commit-graph.c:2499 commit-graph.c:2514 +#: commit-graph.c:2502 commit-graph.c:2517 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:2506 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "無法從提交圖形中解析提交 %s" -#: commit-graph.c:2524 +#: commit-graph.c:2527 msgid "Verifying commits in commit graph" msgstr "正在驗證提交圖中的提交" -#: commit-graph.c:2539 +#: commit-graph.c:2542 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "無法從提交圖形的物件庫中解析提交 %s" -#: commit-graph.c:2546 +#: commit-graph.c:2549 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s" -#: commit-graph.c:2556 +#: commit-graph.c:2559 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交圖形父提交列表太長了" -#: commit-graph.c:2565 +#: commit-graph.c:2568 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交圖形父提交是 %s != %s" -#: commit-graph.c:2579 +#: commit-graph.c:2582 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交圖形父提交列表過早終止" -#: commit-graph.c:2584 +#: commit-graph.c:2587 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零" -#: commit-graph.c:2588 +#: commit-graph.c:2591 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零" -#: commit-graph.c:2605 +#: commit-graph.c:2608 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代" -#: commit-graph.c:2611 +#: commit-graph.c:2614 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418 -#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457 +#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444 +#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -2380,27 +2376,27 @@ msgstr "" "設定 \"git config advice.graftFileDeprecated false\"\n" "可關閉本消息" -#: commit.c:1239 +#: commit.c:1241 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。" -#: commit.c:1243 +#: commit.c:1245 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。" -#: commit.c:1246 +#: commit.c:1248 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 沒有 GPG 簽名。" -#: commit.c:1249 +#: commit.c:1251 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n" -#: commit.c:1503 +#: commit.c:1505 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2467,7 +2463,7 @@ msgstr "鍵名沒有包含一個小節名稱：%s" msgid "key does not contain variable name: %s" msgstr "鍵名沒有包含變數名：%s" -#: config.c:470 sequencer.c:2804 +#: config.c:470 sequencer.c:2806 #, c-format msgid "invalid key: %s" msgstr "無效鍵名：%s" @@ -2618,144 +2614,144 @@ msgstr "core.commentChar 應該是一個字元" msgid "invalid mode for object creation: %s" msgstr "無效的物件建立模式：%s" -#: config.c:1581 +#: config.c:1584 #, c-format msgid "malformed value for %s" msgstr "%s 的取值格式錯誤" -#: config.c:1607 +#: config.c:1610 #, c-format msgid "malformed value for %s: %s" msgstr "%s 的取值格式錯誤：%s" -#: config.c:1608 +#: config.c:1611 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1669 builtin/pack-objects.c:4053 +#: config.c:1672 builtin/pack-objects.c:4053 #, c-format msgid "bad pack compression level %d" msgstr "錯誤的打包壓縮級別 %d" -#: config.c:1792 +#: config.c:1795 #, c-format msgid "unable to load config blob object '%s'" msgstr "無法從資料物件 '%s' 載入設定" -#: config.c:1795 +#: config.c:1798 #, c-format msgid "reference '%s' does not point to a blob" msgstr "引用 '%s' 沒有指向一個資料物件" -#: config.c:1813 +#: config.c:1816 #, c-format msgid "unable to resolve config blob '%s'" msgstr "不能解析設定物件 '%s'" -#: config.c:1858 +#: config.c:1861 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失敗" -#: config.c:1914 +#: config.c:1917 msgid "unable to parse command-line config" msgstr "無法解析指令列中的設定" -#: config.c:2282 +#: config.c:2285 msgid "unknown error occurred while reading the configuration files" msgstr "在讀取設定檔案時遇到未知錯誤" -#: config.c:2456 +#: config.c:2459 #, c-format msgid "Invalid %s: '%s'" msgstr "無效 %s：'%s'" -#: config.c:2501 +#: config.c:2504 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間" -#: config.c:2547 +#: config.c:2550 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "無法解析指令列設定中的 '%s'" -#: config.c:2549 +#: config.c:2552 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'" -#: config.c:2633 +#: config.c:2637 #, c-format msgid "invalid section name '%s'" msgstr "無效的小節名稱 '%s'" -#: config.c:2665 +#: config.c:2669 #, c-format msgid "%s has multiple values" msgstr "%s 有多個取值" -#: config.c:2694 +#: config.c:2698 #, c-format msgid "failed to write new configuration file %s" msgstr "寫入新的設定檔案 %s 失敗" -#: config.c:2946 config.c:3273 +#: config.c:2950 config.c:3277 #, c-format msgid "could not lock config file %s" msgstr "不能鎖定設定檔案 %s" -#: config.c:2957 +#: config.c:2961 #, c-format msgid "opening %s" msgstr "開啟 %s" -#: config.c:2994 builtin/config.c:361 +#: config.c:2998 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "無效模式：%s" -#: config.c:3019 +#: config.c:3023 #, c-format msgid "invalid config file %s" msgstr "無效的設定檔案 %s" -#: config.c:3032 config.c:3286 +#: config.c:3036 config.c:3290 #, c-format msgid "fstat on %s failed" msgstr "對 %s 呼叫 fstat 失敗" -#: config.c:3043 +#: config.c:3047 #, c-format msgid "unable to mmap '%s'%s" msgstr "無法 mmap '%s'%s" -#: config.c:3053 config.c:3291 +#: config.c:3057 config.c:3295 #, c-format msgid "chmod on %s failed" msgstr "對 %s 呼叫 chmod 失敗" -#: config.c:3138 config.c:3388 +#: config.c:3142 config.c:3392 #, c-format msgid "could not write config file %s" msgstr "不能寫入設定檔案 %s" -#: config.c:3172 +#: config.c:3176 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能設定 '%s' 為 '%s'" -#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 +#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 #, c-format msgid "could not unset '%s'" msgstr "不能取消設定 '%s'" -#: config.c:3264 +#: config.c:3268 #, c-format msgid "invalid section name: %s" msgstr "無效的小節名稱：%s" -#: config.c:3431 +#: config.c:3435 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺少" @@ -2931,7 +2927,7 @@ msgstr "已阻止奇怪的路徑名 '%s'" msgid "unable to fork" msgstr "無法 fork" -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57 msgid "Checking connectivity" msgstr "正在檢查連通性" @@ -3217,18 +3213,18 @@ msgid "" msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑" # 譯者：請維持前導空格 -#: diff.c:157 +#: diff.c:158 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " 無法解析 dirstat 截止（cut-off）百分比 '%s'\n" # 譯者：請維持前導空格 -#: diff.c:162 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat 參數 '%s'\n" -#: diff.c:298 +#: diff.c:299 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -3236,7 +3232,7 @@ msgstr "" "移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-" "zebra'、'plain'" -#: diff.c:326 +#: diff.c:327 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -3245,18 +3241,18 @@ msgstr "" "未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-" "space-at-eol'、'ignore-all-space'、'allow-indentation-change'" -#: diff.c:334 +#: diff.c:335 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用" -#: diff.c:411 +#: diff.c:412 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "設定變數 'diff.submodule' 未知的取值：'%s'" -#: diff.c:471 +#: diff.c:472 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -3265,47 +3261,48 @@ msgstr "" "發現設定變數 'diff.dirstat' 中的錯誤：\n" "%s" -#: diff.c:4290 +#: diff.c:4237 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 離開，停止在 %s" -#: diff.c:4642 -msgid "--name-only, --name-status, --check and -s are mutually exclusive" -msgstr "--name-only、--name-status、--check 和 -s 是互斥的" +#: diff.c:4589 +#, c-format +msgid "options '%s', '%s', '%s', and '%s' cannot be used together" +msgstr "「%s」、「%s」、「%s」和「%s」選項不得同時使用" -#: diff.c:4645 -msgid "-G, -S and --find-object are mutually exclusive" -msgstr "-G、-S 和 --find-object 是互斥的" +#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506 +#, c-format +msgid "options '%s', '%s', and '%s' cannot be used together" +msgstr "「%s」、「%s」和「%s」選項不得同時使用" -#: diff.c:4648 -msgid "" -"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" -msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex 搭配 -S" +#: diff.c:4597 +#, c-format +msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" +msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」" -#: diff.c:4651 +#: diff.c:4601 +#, c-format msgid "" -"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " -"with -G and -S" -msgstr "" -"--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all 搭配 -G 和 -S" +"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" +msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%s」" -#: diff.c:4730 +#: diff.c:4681 msgid "--follow requires exactly one pathspec" msgstr "--follow 明確要求只跟一個路徑規格" -#: diff.c:4778 +#: diff.c:4729 #, c-format msgid "invalid --stat value: %s" msgstr "無效的 --stat 值：%s" -#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326 +#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277 #: parse-options.c:217 parse-options.c:221 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一個數字值" -#: diff.c:4815 +#: diff.c:4766 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3314,200 +3311,200 @@ msgstr "" "無法解析 --dirstat/-X 選項的參數：\n" "%s" -#: diff.c:4900 +#: diff.c:4851 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'" -#: diff.c:4924 +#: diff.c:4875 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之後未知的值" -#: diff.c:4938 +#: diff.c:4889 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4988 diff.c:4994 +#: diff.c:4939 diff.c:4945 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s 期望 <n>/<m> 格式" -#: diff.c:5006 +#: diff.c:4957 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一個字元，得到 '%s'" -#: diff.c:5027 +#: diff.c:4978 #, c-format msgid "bad --color-moved argument: %s" msgstr "壞的 --color-moved 參數：%s" -#: diff.c:5046 +#: diff.c:4997 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的無效模式 '%s'" -#: diff.c:5086 +#: diff.c:5037 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5122 diff.c:5142 +#: diff.c:5073 diff.c:5093 #, c-format msgid "invalid argument to %s" msgstr "%s 的參數無效" -#: diff.c:5246 +#: diff.c:5197 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "傳入 -I 的常規表示式無效：「%s」" -#: diff.c:5295 +#: diff.c:5246 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "無法解析 --submodule 選項的參數：'%s'" -#: diff.c:5351 +#: diff.c:5302 #, c-format msgid "bad --word-diff argument: %s" msgstr "壞的 --word-diff 參數：%s" -#: diff.c:5387 +#: diff.c:5338 msgid "Diff output format options" msgstr "差異輸出格式化選項" -#: diff.c:5389 diff.c:5395 +#: diff.c:5340 diff.c:5346 msgid "generate patch" msgstr "生成修補檔" -#: diff.c:5392 builtin/log.c:179 +#: diff.c:5343 builtin/log.c:179 msgid "suppress diff output" msgstr "不顯示差異輸出" -#: diff.c:5397 diff.c:5511 diff.c:5518 +#: diff.c:5348 diff.c:5462 diff.c:5469 msgid "<n>" msgstr "<n>" -#: diff.c:5398 diff.c:5401 +#: diff.c:5349 diff.c:5352 msgid "generate diffs with <n> lines context" msgstr "生成含 <n> 行上下文的差異" -#: diff.c:5403 +#: diff.c:5354 msgid "generate the diff in raw format" msgstr "生成原始格式的差異" -#: diff.c:5406 +#: diff.c:5357 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同義" -#: diff.c:5410 +#: diff.c:5361 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同義" -#: diff.c:5414 +#: diff.c:5365 msgid "machine friendly --stat" msgstr "機器友好的 --stat" -#: diff.c:5417 +#: diff.c:5368 msgid "output only the last line of --stat" msgstr "只輸出 --stat 的最後一行" -#: diff.c:5419 diff.c:5427 +#: diff.c:5370 diff.c:5378 msgid "<param1,param2>..." msgstr "<參數1,參數2>..." -#: diff.c:5420 +#: diff.c:5371 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "輸出每個子目錄相對變更的分布" -#: diff.c:5424 +#: diff.c:5375 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同義" -#: diff.c:5428 +#: diff.c:5379 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同義詞" -#: diff.c:5432 +#: diff.c:5383 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告" -#: diff.c:5435 +#: diff.c:5386 msgid "condensed summary such as creations, renames and mode changes" msgstr "精簡摘要，例如建立、重新命名和模式變更" -#: diff.c:5438 +#: diff.c:5389 msgid "show only names of changed files" msgstr "只顯示變更檔案的檔案名" -#: diff.c:5441 +#: diff.c:5392 msgid "show only names and status of changed files" msgstr "只顯示變更檔案的檔案名和狀態" -#: diff.c:5443 +#: diff.c:5394 msgid "<width>[,<name-width>[,<count>]]" msgstr "<寬度>[,<檔案名寬度>[,<次數>]]" -#: diff.c:5444 +#: diff.c:5395 msgid "generate diffstat" msgstr "生成差異統計（diffstat）" -#: diff.c:5446 diff.c:5449 diff.c:5452 +#: diff.c:5397 diff.c:5400 diff.c:5403 msgid "<width>" msgstr "<寬度>" -#: diff.c:5447 +#: diff.c:5398 msgid "generate diffstat with a given width" msgstr "使用提供的長度生成差異統計" -#: diff.c:5450 +#: diff.c:5401 msgid "generate diffstat with a given name width" msgstr "使用提供的檔案名長度生成差異統計" -#: diff.c:5453 +#: diff.c:5404 msgid "generate diffstat with a given graph width" msgstr "使用提供的圖形長度生成差異統計" -#: diff.c:5455 +#: diff.c:5406 msgid "<count>" msgstr "<次數>" -#: diff.c:5456 +#: diff.c:5407 msgid "generate diffstat with limited lines" msgstr "生成有限行數的差異統計" -#: diff.c:5459 +#: diff.c:5410 msgid "generate compact summary in diffstat" msgstr "生成差異統計的簡潔摘要" -#: diff.c:5462 +#: diff.c:5413 msgid "output a binary diff that can be applied" msgstr "輸出一個可以套用的二進位差異" -#: diff.c:5465 +#: diff.c:5416 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行顯示完整的前後物件名稱" -#: diff.c:5467 +#: diff.c:5418 msgid "show colored diff" msgstr "顯示帶顏色的差異" -#: diff.c:5468 +#: diff.c:5419 msgid "<kind>" msgstr "<類型>" -#: diff.c:5469 +#: diff.c:5420 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元" -#: diff.c:5472 +#: diff.c:5423 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3515,311 +3512,311 @@ msgstr "" "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔" "符" -#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590 +#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541 msgid "<prefix>" msgstr "<前綴>" -#: diff.c:5476 +#: diff.c:5427 msgid "show the given source prefix instead of \"a/\"" msgstr "顯示提供的來源前綴，而非 \"a/\"" -#: diff.c:5479 +#: diff.c:5430 msgid "show the given destination prefix instead of \"b/\"" msgstr "顯示提供的目的地前綴取代 \"b/\"" -#: diff.c:5482 +#: diff.c:5433 msgid "prepend an additional prefix to every line of output" msgstr "輸出的每一行附加前綴" -#: diff.c:5485 +#: diff.c:5436 msgid "do not show any source or destination prefix" msgstr "不顯示任何來源和目的地前綴" -#: diff.c:5488 +#: diff.c:5439 msgid "show context between diff hunks up to the specified number of lines" msgstr "顯示指定行數的差異區塊間的上下文" -#: diff.c:5492 diff.c:5497 diff.c:5502 +#: diff.c:5443 diff.c:5448 diff.c:5453 msgid "<char>" msgstr "<字元>" -#: diff.c:5493 +#: diff.c:5444 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一個字元取代 '+' 來表示新的一行" -#: diff.c:5498 +#: diff.c:5449 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一個字元取代 '-' 來表示舊的一行" -#: diff.c:5503 +#: diff.c:5454 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一個字元取代 ' ' 來表示一行上下文" -#: diff.c:5506 +#: diff.c:5457 msgid "Diff rename options" msgstr "差異重新命名選項" -#: diff.c:5507 +#: diff.c:5458 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5508 +#: diff.c:5459 msgid "break complete rewrite changes into pairs of delete and create" msgstr "將完全重寫的變更打破為成對的刪除和建立" -#: diff.c:5512 +#: diff.c:5463 msgid "detect renames" msgstr "檢測重新命名" -#: diff.c:5516 +#: diff.c:5467 msgid "omit the preimage for deletes" msgstr "省略刪除變更的差異輸出" -#: diff.c:5519 +#: diff.c:5470 msgid "detect copies" msgstr "檢測複製" -#: diff.c:5523 +#: diff.c:5474 msgid "use unmodified files as source to find copies" msgstr "使用未修改的檔案做為發現拷貝的來源" -#: diff.c:5525 +#: diff.c:5476 msgid "disable rename detection" msgstr "停用重新命名偵測" -#: diff.c:5528 +#: diff.c:5479 msgid "use empty blobs as rename source" msgstr "使用空的資料物件做為重新命名的來源" -#: diff.c:5530 +#: diff.c:5481 msgid "continue listing the history of a file beyond renames" msgstr "繼續列出檔案重新命名以外的歷史記錄" -#: diff.c:5533 +#: diff.c:5484 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測" -#: diff.c:5535 +#: diff.c:5486 msgid "Diff algorithm options" msgstr "差異演算法選項" -#: diff.c:5537 +#: diff.c:5488 msgid "produce the smallest possible diff" msgstr "生成儘可能小的差異" -#: diff.c:5540 +#: diff.c:5491 msgid "ignore whitespace when comparing lines" msgstr "行比較時忽略空白字元" -#: diff.c:5543 +#: diff.c:5494 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字元的變更" -#: diff.c:5546 +#: diff.c:5497 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字元變更" -#: diff.c:5549 +#: diff.c:5500 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的Enter符（CR）" -#: diff.c:5552 +#: diff.c:5503 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的變更" -#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624 +#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575 msgid "<regex>" msgstr "<正則>" -#: diff.c:5555 +#: diff.c:5506 msgid "ignore changes whose all lines match <regex>" msgstr "忽略整行符合 <regex> 的變更" -#: diff.c:5558 +#: diff.c:5509 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "啟發式轉換差異邊界以便閱讀" -#: diff.c:5561 +#: diff.c:5512 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 演算法生成差異" -#: diff.c:5565 +#: diff.c:5516 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 演算法生成差異" -#: diff.c:5567 +#: diff.c:5518 msgid "<algorithm>" msgstr "<演算法>" -#: diff.c:5568 +#: diff.c:5519 msgid "choose a diff algorithm" msgstr "選擇一個差異演算法" -#: diff.c:5570 +#: diff.c:5521 msgid "<text>" msgstr "<文字>" -#: diff.c:5571 +#: diff.c:5522 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 演算法生成差異" -#: diff.c:5573 diff.c:5582 diff.c:5585 +#: diff.c:5524 diff.c:5533 diff.c:5536 msgid "<mode>" msgstr "<模式>" -#: diff.c:5574 +#: diff.c:5525 msgid "show word diff, using <mode> to delimit changed words" msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞" -#: diff.c:5577 +#: diff.c:5528 msgid "use <regex> to decide what a word is" msgstr "使用 <常規表示式> 確定何為一個詞" -#: diff.c:5580 +#: diff.c:5531 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "相當於 --word-diff=color --word-diff-regex=<正則>" -#: diff.c:5583 +#: diff.c:5534 msgid "moved lines of code are colored differently" msgstr "移動的程式碼行用不同方式著色" -#: diff.c:5586 +#: diff.c:5537 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字元" -#: diff.c:5589 +#: diff.c:5540 msgid "Other diff options" msgstr "其它差異選項" -#: diff.c:5591 +#: diff.c:5542 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑" -#: diff.c:5595 +#: diff.c:5546 msgid "treat all files as text" msgstr "把所有檔案當做文字處理" -#: diff.c:5597 +#: diff.c:5548 msgid "swap two inputs, reverse the diff" msgstr "交換兩個輸入，反轉差異" -#: diff.c:5599 +#: diff.c:5550 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差異時離開碼為 1，否則為 0" -#: diff.c:5601 +#: diff.c:5552 msgid "disable all output of the program" msgstr "停用本程式的所有輸出" -#: diff.c:5603 +#: diff.c:5554 msgid "allow an external diff helper to be executed" msgstr "允許執行一個外部的差異協助工具" -#: diff.c:5605 +#: diff.c:5556 msgid "run external text conversion filters when comparing binary files" msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器" -#: diff.c:5607 +#: diff.c:5558 msgid "<when>" msgstr "<何時>" -#: diff.c:5608 +#: diff.c:5559 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差異時，忽略子模組的更改" -#: diff.c:5611 +#: diff.c:5562 msgid "<format>" msgstr "<格式>" -#: diff.c:5612 +#: diff.c:5563 msgid "specify how differences in submodules are shown" msgstr "指定子模組的差異如何顯示" -#: diff.c:5616 +#: diff.c:5567 msgid "hide 'git add -N' entries from the index" msgstr "隱藏索引中 'git add -N' 條目" -#: diff.c:5619 +#: diff.c:5570 msgid "treat 'git add -N' entries as real in the index" msgstr "將索引中 'git add -N' 條目當做真實的" -#: diff.c:5621 +#: diff.c:5572 msgid "<string>" msgstr "<字串>" -#: diff.c:5622 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "尋找改變了指定字串出現次數的差異" -#: diff.c:5625 +#: diff.c:5576 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "尋找改變指定正則符合出現次數的差異" -#: diff.c:5628 +#: diff.c:5579 msgid "show all changes in the changeset with -S or -G" msgstr "顯示使用 -S 或 -G 的變更集的所有變更" -#: diff.c:5631 +#: diff.c:5582 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式" -#: diff.c:5634 +#: diff.c:5585 msgid "control the order in which files appear in the output" msgstr "控制輸出中的檔案顯示順序" -#: diff.c:5635 diff.c:5638 +#: diff.c:5586 diff.c:5589 msgid "<path>" msgstr "<路徑>" -#: diff.c:5636 +#: diff.c:5587 msgid "show the change in the specified path first" msgstr "先顯示指定路徑的變更" -#: diff.c:5639 +#: diff.c:5590 msgid "skip the output to the specified path" msgstr "略過輸出至指定路徑" -#: diff.c:5641 +#: diff.c:5592 msgid "<object-id>" msgstr "<物件 ID>" -#: diff.c:5642 +#: diff.c:5593 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "尋找改變指定物件出現次數的差異" -#: diff.c:5644 +#: diff.c:5595 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5645 +#: diff.c:5596 msgid "select files by diff type" msgstr "透過差異類型選擇檔案" -#: diff.c:5647 +#: diff.c:5598 msgid "<file>" msgstr "<檔案>" -#: diff.c:5648 +#: diff.c:5599 msgid "Output to a specific file" msgstr "輸出到一個指定的檔案" -#: diff.c:6306 +#: diff.c:6257 msgid "exhaustive rename detection was skipped due to too many files." msgstr "因為檔案太多，已略過詳細重新命名偵測。" -#: diff.c:6309 +#: diff.c:6260 msgid "only found copies from modified paths due to too many files." msgstr "因為檔案太多，只在修改的路徑中尋找複製。" -#: diff.c:6312 +#: diff.c:6263 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3859,29 +3856,29 @@ msgstr "無法識別反向模式：「%s」" msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複" -#: dir.c:830 +#: dir.c:828 msgid "disabling cone pattern matching" msgstr "停用 cone 樣式符合模式" -#: dir.c:1214 +#: dir.c:1212 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能將 %s 用作排除檔案" -#: dir.c:2464 +#: dir.c:2418 #, c-format msgid "could not open directory '%s'" msgstr "不能開啟目錄 '%s'" -#: dir.c:2766 +#: dir.c:2720 msgid "failed to get kernel name and information" msgstr "無法獲得核心名稱和訊息" -#: dir.c:2890 +#: dir.c:2844 msgid "untracked cache is disabled on this system or location" msgstr "快取未追蹤檔案在本系統或位置中被停用" -#: dir.c:3158 +#: dir.c:3112 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -3889,36 +3886,36 @@ msgstr "" "無法猜到目錄名。\n" "請在指令列指定一個目錄" -#: dir.c:3837 +#: dir.c:3800 #, c-format msgid "index file corrupt in repo %s" msgstr "版本庫 %s 中的索引檔案損壞" -#: dir.c:3884 dir.c:3889 +#: dir.c:3847 dir.c:3852 #, c-format msgid "could not create directories for %s" msgstr "不能為 %s 建立目錄" -#: dir.c:3918 +#: dir.c:3881 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" -#: editor.c:77 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的編輯器關閉檔案...%c" -#: entry.c:177 +#: entry.c:179 msgid "Filtering content" msgstr "過濾內容" -#: entry.c:498 +#: entry.c:500 #, c-format msgid "could not stat file '%s'" msgstr "不能對檔案 '%s' 呼叫 stat" -#: environment.c:143 +#: environment.c:145 #, c-format msgid "bad git namespace path \"%s\"" msgstr "錯誤的 git 名字空間路徑 \"%s\"" @@ -3928,278 +3925,274 @@ msgstr "錯誤的 git 名字空間路徑 \"%s\"" msgid "too many args to run %s" msgstr "執行 %s 的參數太多" -#: fetch-pack.c:193 +#: fetch-pack.c:194 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：應為 shallow 列表" -#: fetch-pack.c:196 +#: fetch-pack.c:197 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包" -#: fetch-pack.c:207 +#: fetch-pack.c:208 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包" -#: fetch-pack.c:227 +#: fetch-pack.c:228 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'" -#: fetch-pack.c:238 +#: fetch-pack.c:239 msgid "unable to write to remote" msgstr "無法寫到遠端" -#: fetch-pack.c:299 -msgid "--stateless-rpc requires multi_ack_detailed" -msgstr "--stateless-rpc 需要 multi_ack_detailed" - -#: fetch-pack.c:394 fetch-pack.c:1434 +#: fetch-pack.c:395 fetch-pack.c:1439 #, c-format msgid "invalid shallow line: %s" msgstr "無效的 shallow 訊息：%s" -#: fetch-pack.c:400 fetch-pack.c:1440 +#: fetch-pack.c:401 fetch-pack.c:1445 #, c-format msgid "invalid unshallow line: %s" msgstr "無效的 unshallow 訊息：%s" -#: fetch-pack.c:402 fetch-pack.c:1442 +#: fetch-pack.c:403 fetch-pack.c:1447 #, c-format msgid "object not found: %s" msgstr "物件未找到：%s" -#: fetch-pack.c:405 fetch-pack.c:1445 +#: fetch-pack.c:406 fetch-pack.c:1450 #, c-format msgid "error in object: %s" msgstr "物件中發生錯誤：%s" -#: fetch-pack.c:407 fetch-pack.c:1447 +#: fetch-pack.c:408 fetch-pack.c:1452 #, c-format msgid "no shallow found: %s" msgstr "未發現 shallow：%s" -#: fetch-pack.c:410 fetch-pack.c:1451 +#: fetch-pack.c:411 fetch-pack.c:1456 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "應為 shallow/unshallow，卻得到 %s" -#: fetch-pack.c:450 +#: fetch-pack.c:451 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:467 +#: fetch-pack.c:468 #, c-format msgid "invalid commit %s" msgstr "無效提交 %s" -#: fetch-pack.c:498 +#: fetch-pack.c:499 msgid "giving up" msgstr "放棄" -#: fetch-pack.c:511 progress.c:339 +#: fetch-pack.c:512 progress.c:339 msgid "done" msgstr "完成" -#: fetch-pack.c:523 +#: fetch-pack.c:524 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:559 +#: fetch-pack.c:560 #, c-format msgid "Marking %s as complete" msgstr "標記 %s 為完成" -#: fetch-pack.c:774 +#: fetch-pack.c:775 #, c-format msgid "already have %s (%s)" msgstr "已經有 %s（%s）" -#: fetch-pack.c:860 +#: fetch-pack.c:861 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：無法衍生 sideband 多路輸出" -#: fetch-pack.c:868 +#: fetch-pack.c:869 msgid "protocol error: bad pack header" msgstr "協定錯誤：壞的包頭" -#: fetch-pack.c:962 +#: fetch-pack.c:965 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：無法 fork %s 處理程序" -#: fetch-pack.c:968 +#: fetch-pack.c:971 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-pack：無效的 index-pack 輸出" -#: fetch-pack.c:985 +#: fetch-pack.c:988 #, c-format msgid "%s failed" msgstr "%s 失敗" -#: fetch-pack.c:987 +#: fetch-pack.c:990 msgid "error in sideband demultiplexer" msgstr "sideband 多路輸出發生錯誤" -#: fetch-pack.c:1030 +#: fetch-pack.c:1035 #, c-format msgid "Server version is %.*s" msgstr "伺服器版本 %.*s" -#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053 -#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069 -#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085 -#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090 +#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112 #, c-format msgid "Server supports %s" msgstr "伺服器支援 %s" -#: fetch-pack.c:1040 +#: fetch-pack.c:1045 msgid "Server does not support shallow clients" msgstr "伺服器不支援 shallow 用戶端" -#: fetch-pack.c:1100 +#: fetch-pack.c:1105 msgid "Server does not support --shallow-since" msgstr "伺服器不支援 --shallow-since" -#: fetch-pack.c:1105 +#: fetch-pack.c:1110 msgid "Server does not support --shallow-exclude" msgstr "伺服器不支援 --shallow-exclude" -#: fetch-pack.c:1109 +#: fetch-pack.c:1114 msgid "Server does not support --deepen" msgstr "伺服器不支援 --deepen" -#: fetch-pack.c:1111 +#: fetch-pack.c:1116 msgid "Server does not support this repository's object format" msgstr "伺服器不支援此版本庫的物件格式" -#: fetch-pack.c:1124 +#: fetch-pack.c:1129 msgid "no common commits" msgstr "沒有共同的提交" -#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130 +#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130 msgid "source repository is shallow, reject to clone." msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。" -#: fetch-pack.c:1139 fetch-pack.c:1671 +#: fetch-pack.c:1144 fetch-pack.c:1681 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：取得失敗。" -#: fetch-pack.c:1253 +#: fetch-pack.c:1258 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "算法不一致：用戶端 %s；伺服器 %s" -#: fetch-pack.c:1257 +#: fetch-pack.c:1262 #, c-format msgid "the server does not support algorithm '%s'" msgstr "伺服器不支援「%s」算法" -#: fetch-pack.c:1290 +#: fetch-pack.c:1295 msgid "Server does not support shallow requests" msgstr "伺服器不支援 shallow 請求" -#: fetch-pack.c:1297 +#: fetch-pack.c:1302 msgid "Server supports filter" msgstr "伺服器支援 filter" -#: fetch-pack.c:1340 fetch-pack.c:2053 +#: fetch-pack.c:1345 fetch-pack.c:2063 msgid "unable to write request to remote" msgstr "無法將請求寫到遠端" -#: fetch-pack.c:1358 +#: fetch-pack.c:1363 #, c-format msgid "error reading section header '%s'" msgstr "讀取節標題 '%s' 發生錯誤" -#: fetch-pack.c:1364 +#: fetch-pack.c:1369 #, c-format msgid "expected '%s', received '%s'" msgstr "預期 '%s'，得到 '%s'" -#: fetch-pack.c:1398 +#: fetch-pack.c:1403 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的確認行：'%s'" -#: fetch-pack.c:1403 +#: fetch-pack.c:1408 #, c-format msgid "error processing acks: %d" msgstr "處理 ack 發生錯誤：%d" -#: fetch-pack.c:1413 +#: fetch-pack.c:1418 msgid "expected packfile to be sent after 'ready'" msgstr "預期在 'ready' 之後傳送 packfile" -#: fetch-pack.c:1415 +#: fetch-pack.c:1420 msgid "expected no other sections to be sent after no 'ready'" msgstr "在沒有 'ready' 不應該傳送其它小節" -#: fetch-pack.c:1456 +#: fetch-pack.c:1461 #, c-format msgid "error processing shallow info: %d" msgstr "處理淺複製訊息發生錯誤：%d" -#: fetch-pack.c:1505 +#: fetch-pack.c:1510 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "預期 wanted-ref，得到 '%s'" -#: fetch-pack.c:1510 +#: fetch-pack.c:1515 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref：'%s'" -#: fetch-pack.c:1515 +#: fetch-pack.c:1520 #, c-format msgid "error processing wanted refs: %d" msgstr "處理要取得的引用發生錯誤：%d" -#: fetch-pack.c:1545 +#: fetch-pack.c:1550 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: 預期要有回應結束封包" -#: fetch-pack.c:1949 +#: fetch-pack.c:1959 msgid "no matching remote head" msgstr "沒有符合的遠端分支" -#: fetch-pack.c:1972 builtin/clone.c:581 +#: fetch-pack.c:1982 builtin/clone.c:581 msgid "remote did not send all necessary objects" msgstr "遠端沒有傳送所有必需的物件" -#: fetch-pack.c:2075 +#: fetch-pack.c:2085 msgid "unexpected 'ready' from remote" msgstr "從遠端收到非預期的 ‘ready’" -#: fetch-pack.c:2098 +#: fetch-pack.c:2108 #, c-format msgid "no such remote ref %s" msgstr "沒有這樣的遠端引用 %s" -#: fetch-pack.c:2101 +#: fetch-pack.c:2111 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "伺服器不允許請求未公開的物件 %s" -#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902 -#: gpg-interface.c:918 +#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974 +#: gpg-interface.c:990 msgid "could not create temporary file" msgstr "不能建立暫存檔" -#: gpg-interface.c:332 gpg-interface.c:454 +#: gpg-interface.c:332 gpg-interface.c:460 #, c-format msgid "failed writing detached signature to '%s'" msgstr "無法將分離式簽名寫入 '%s'" -#: gpg-interface.c:445 +#: gpg-interface.c:451 msgid "" "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " "signature verification" msgstr "SSH 簽名驗證需要設定 gpg.ssh.allowedSignersFile，簽名檔案也要存在" -#: gpg-interface.c:469 +#: gpg-interface.c:480 msgid "" "ssh-keygen -Y find-principals/verify is needed for ssh signature " "verification (available in openssh version 8.2p1+)" @@ -4207,61 +4200,61 @@ msgstr "" "SSH 簽名驗證需要 ssh-keygen -Y find-principals/verify（可以在 openssh 8.2p1+ " "版本使用）" -#: gpg-interface.c:523 +#: gpg-interface.c:536 #, c-format msgid "ssh signing revocation file configured but not found: %s" msgstr "有設定 SSH 簽名廢止檔案，但找不到檔案本體：%s" -#: gpg-interface.c:576 +#: gpg-interface.c:624 #, c-format msgid "bad/incompatible signature '%s'" msgstr "簽名「%s」損壞或者不相容" -#: gpg-interface.c:735 gpg-interface.c:740 +#: gpg-interface.c:801 gpg-interface.c:806 #, c-format msgid "failed to get the ssh fingerprint for key '%s'" msgstr "無法取得「%s」金鑰的 SSH 指紋" -#: gpg-interface.c:762 +#: gpg-interface.c:829 msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一" -#: gpg-interface.c:780 +#: gpg-interface.c:851 #, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "gpg.ssh.defaultKeyCommand 執行成功，但沒回傳按鍵：%s %s" -#: gpg-interface.c:786 +#: gpg-interface.c:857 #, c-format msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s" -#: gpg-interface.c:874 +#: gpg-interface.c:945 msgid "gpg failed to sign the data" msgstr "gpg 無法為資料簽名" -#: gpg-interface.c:895 +#: gpg-interface.c:967 msgid "user.signingkey needs to be set for ssh signing" msgstr "需要設定 user.signingkey 才能進行 SSH 簽名" -#: gpg-interface.c:906 +#: gpg-interface.c:978 #, c-format msgid "failed writing ssh signing key to '%s'" msgstr "無法將 SSH 簽名金鑰寫入「%s」" -#: gpg-interface.c:924 +#: gpg-interface.c:996 #, c-format msgid "failed writing ssh signing key buffer to '%s'" msgstr "無法將 SSH 簽名金鑰緩衝區寫入「%s」" -#: gpg-interface.c:942 +#: gpg-interface.c:1014 msgid "" "ssh-keygen -Y sign is needed for ssh signing (available in openssh version " "8.2p1+)" msgstr "SSH 簽名需要 ssh-keygen -Y sign（可以在 openssh 8.2p1+ 版本使用）" -#: gpg-interface.c:954 +#: gpg-interface.c:1026 #, c-format msgid "failed reading ssh signing data buffer from '%s'" msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區" @@ -4271,7 +4264,7 @@ msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區" msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩" -#: grep.c:533 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4279,18 +4272,18 @@ msgstr "" "提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此" "功能" -#: grep.c:1928 +#: grep.c:1942 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：無法讀取 %s" -#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90 +#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "對 '%s' 呼叫 stat 失敗" -#: grep.c:1956 +#: grep.c:1970 #, c-format msgid "'%s': short read" msgstr "'%s'：讀取不完整" @@ -4411,8 +4404,8 @@ msgstr "假定你想要的是 '%s' 並繼續。" #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "改執行「%s」？(y/N)" +msgid "Run '%s' instead [y/N]? " +msgstr "改執行「%s」[y/N]？ " #: help.c:654 #, c-format @@ -4628,7 +4621,7 @@ msgstr "在 ls-refs 引數之後應該有一個 flush 包" msgid "quoted CRLF detected" msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF" -#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46 +#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46 #, c-format msgid "bad action '%s' for '%s'" msgstr "「%s」動作對「%s」無效" @@ -4851,7 +4844,7 @@ msgstr "子模組" msgid "CONFLICT (%s): Merge conflict in %s" msgstr "衝突（%s）：合併衝突於 %s" -#: merge-ort.c:3856 +#: merge-ort.c:3869 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4860,7 +4853,7 @@ msgstr "" "衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹" "上。" -#: merge-ort.c:4152 +#: merge-ort.c:4165 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4870,7 +4863,7 @@ msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:4521 +#: merge-ort.c:4534 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "%s, %s, %s 樹的合併資訊收集失敗" @@ -4884,7 +4877,7 @@ msgstr "" "您對下列檔案的本機修改將被合併動作覆蓋：\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405 msgid "Already up to date." msgstr "已經是最新的。" @@ -5159,7 +5152,7 @@ msgstr "合併未返回提交" msgid "Could not parse object '%s'" msgstr "不能解析物件 '%s'" -#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904 +#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906 #: builtin/stash.c:489 msgid "Unable to write index." msgstr "不能寫入索引。" @@ -5168,8 +5161,8 @@ msgstr "不能寫入索引。" msgid "failed to read the cache" msgstr "讀取快取失敗" -#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967 -#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706 +#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022 +#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706 #: builtin/stash.c:269 msgid "unable to write new index file" msgstr "無法寫新的索引檔案" @@ -5178,211 +5171,211 @@ msgstr "無法寫新的索引檔案" msgid "multi-pack-index OID fanout is of the wrong size" msgstr "多包索引的物件 ID fanout 大小錯誤" -#: midx.c:109 +#: midx.c:111 #, c-format msgid "multi-pack-index file %s is too small" msgstr "多包索引檔案 %s 太小" -#: midx.c:125 +#: midx.c:127 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合" -#: midx.c:130 +#: midx.c:132 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index 版本 %d 不能被識別" -#: midx.c:135 +#: midx.c:137 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合" -#: midx.c:152 +#: midx.c:154 msgid "multi-pack-index missing required pack-name chunk" msgstr "多包索引缺少必需的包名區塊" -#: midx.c:154 +#: midx.c:156 msgid "multi-pack-index missing required OID fanout chunk" msgstr "多包索引缺少必需的物件 ID fanout 區塊" -#: midx.c:156 +#: midx.c:158 msgid "multi-pack-index missing required OID lookup chunk" msgstr "多包索引缺少必需的物件 ID 查詢區塊" -#: midx.c:158 +#: midx.c:160 msgid "multi-pack-index missing required object offsets chunk" msgstr "多包索引缺少必需的物件位移區塊" -#: midx.c:174 +#: midx.c:176 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名無序：'%s' 在 '%s' 之前" -#: midx.c:221 +#: midx.c:224 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "錯的 pack-int-id：%u（共有 %u 個包）" -#: midx.c:271 +#: midx.c:274 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引儲存一個64位位移，但是 off_t 太小" -#: midx.c:502 +#: midx.c:505 #, c-format msgid "failed to add packfile '%s'" msgstr "新增 packfile '%s' 失敗" -#: midx.c:508 +#: midx.c:511 #, c-format msgid "failed to open pack-index '%s'" msgstr "開啟包索引 '%s' 失敗" -#: midx.c:576 +#: midx.c:579 #, c-format msgid "failed to locate object %d in packfile" msgstr "在 packfile 中定位物件 %d 失敗" -#: midx.c:892 +#: midx.c:895 msgid "cannot store reverse index file" msgstr "無法儲存倒排索引檔案" -#: midx.c:990 +#: midx.c:993 #, c-format msgid "could not parse line: %s" msgstr "無法解析橫列：%s" -#: midx.c:992 +#: midx.c:995 #, c-format msgid "malformed line: %s" msgstr "橫列格式錯誤：%s" -#: midx.c:1159 +#: midx.c:1162 msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "忽略現有的多包索引：總和檢查碼不符" -#: midx.c:1184 +#: midx.c:1187 msgid "could not load pack" msgstr "無法載入包" -#: midx.c:1190 +#: midx.c:1193 #, c-format msgid "could not open index for %s" msgstr "無法開啟 %s 的索引" -#: midx.c:1201 +#: midx.c:1204 msgid "Adding packfiles to multi-pack-index" msgstr "正在新增 packfile 至多包索引" -#: midx.c:1244 +#: midx.c:1247 #, c-format msgid "unknown preferred pack: '%s'" msgstr "未知偏好包：「%s」" -#: midx.c:1289 +#: midx.c:1292 #, c-format msgid "cannot select preferred pack %s with no objects" msgstr "無法選取偏好，沒有物件的 %s 包" -#: midx.c:1321 +#: midx.c:1324 #, c-format msgid "did not see pack-file %s to drop" msgstr "沒有看到要捨棄的包檔案 %s" -#: midx.c:1367 +#: midx.c:1370 #, c-format msgid "preferred pack '%s' is expired" msgstr "偏好包「%s」已經過期" -#: midx.c:1380 +#: midx.c:1383 msgid "no pack files to index." msgstr "沒有要索引的 pack 檔案。" -#: midx.c:1417 +#: midx.c:1420 msgid "could not write multi-pack bitmap" msgstr "無法寫入多包位圖" -#: midx.c:1427 +#: midx.c:1430 msgid "could not write multi-pack-index" msgstr "無法寫入多包索引" -#: midx.c:1486 builtin/clean.c:37 +#: midx.c:1489 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "刪除 %s 失敗" -#: midx.c:1517 +#: midx.c:1522 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位於 %s 的多包索引失敗" -#: midx.c:1577 +#: midx.c:1585 msgid "multi-pack-index file exists, but failed to parse" msgstr "有 multi-pack-index 檔案，但無法解析" -#: midx.c:1585 +#: midx.c:1593 msgid "incorrect checksum" msgstr "總和檢查碼不正確" -#: midx.c:1588 +#: midx.c:1596 msgid "Looking for referenced packfiles" msgstr "正在尋找引用的 packfile" -#: midx.c:1603 +#: midx.c:1611 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1608 +#: midx.c:1616 msgid "the midx contains no oid" msgstr "midx 沒有 oid" -#: midx.c:1617 +#: midx.c:1625 msgid "Verifying OID order in multi-pack-index" msgstr "正在驗證多包索引中的物件 ID 順序" -#: midx.c:1626 +#: midx.c:1634 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1646 +#: midx.c:1654 msgid "Sorting objects by packfile" msgstr "透過 packfile 為物件排序" -#: midx.c:1653 +#: midx.c:1661 msgid "Verifying object offsets" msgstr "正在驗證物件位移" -#: midx.c:1669 +#: midx.c:1677 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "為 oid[%d] = %s 載入包條目失敗" -#: midx.c:1675 +#: midx.c:1683 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "為 packfile %s 載入包索引失敗" -#: midx.c:1684 +#: midx.c:1692 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>" -#: midx.c:1709 +#: midx.c:1719 msgid "Counting referenced objects" msgstr "正在計算引用物件" -#: midx.c:1719 +#: midx.c:1729 msgid "Finding and deleting unreferenced packfiles" msgstr "正在尋找並刪除沒有引用的 packfile" -#: midx.c:1911 +#: midx.c:1921 msgid "could not start pack-objects" msgstr "不能開始 pack-objects" -#: midx.c:1931 +#: midx.c:1941 msgid "could not finish pack-objects" msgstr "不能結束 pack-objects" @@ -5440,257 +5433,257 @@ msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解" msgid "Bad %s value: '%s'" msgstr "壞的 %s 值：'%s'" -#: object-file.c:459 +#: object-file.c:456 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates" -#: object-file.c:517 +#: object-file.c:514 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "無法規範化備用物件路徑：%s" -#: object-file.c:591 +#: object-file.c:588 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略備用物件庫，嵌套太深" -#: object-file.c:598 +#: object-file.c:595 #, c-format msgid "unable to normalize object directory: %s" msgstr "無法規範化物件目錄: %s" -#: object-file.c:641 +#: object-file.c:638 msgid "unable to fdopen alternates lockfile" msgstr "無法 fdopen 取代鎖檔案" -#: object-file.c:659 +#: object-file.c:656 msgid "unable to read alternates file" msgstr "無法讀取替代檔案" -#: object-file.c:666 +#: object-file.c:663 msgid "unable to move new alternates file into place" msgstr "無法將新的替代檔案移動到位" -#: object-file.c:701 +#: object-file.c:741 #, c-format msgid "path '%s' does not exist" msgstr "路徑 '%s' 不存在" -#: object-file.c:722 +#: object-file.c:762 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。" -#: object-file.c:728 +#: object-file.c:768 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "引用版本庫 '%s' 不是一個本機版本庫。" -#: object-file.c:734 +#: object-file.c:774 #, c-format msgid "reference repository '%s' is shallow" msgstr "引用版本庫 '%s' 是一個淺複製" -#: object-file.c:742 +#: object-file.c:782 #, c-format msgid "reference repository '%s' is grafted" msgstr "引用版本庫 '%s' 已被移植" -#: object-file.c:773 +#: object-file.c:813 #, c-format msgid "could not find object directory matching %s" msgstr "找不到符合 %s 的物件目錄" -#: object-file.c:823 +#: object-file.c:863 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析備用引用時無效的行：%s" -#: object-file.c:973 +#: object-file.c:1013 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>" -#: object-file.c:1008 +#: object-file.c:1048 #, c-format msgid "mmap failed%s" msgstr "mmap 失敗%s" -#: object-file.c:1174 +#: object-file.c:1214 #, c-format msgid "object file %s is empty" msgstr "物件檔案 %s 為空" -#: object-file.c:1293 object-file.c:2499 +#: object-file.c:1333 object-file.c:2542 #, c-format msgid "corrupt loose object '%s'" msgstr "損壞的鬆散物件 '%s'" -#: object-file.c:1295 object-file.c:2503 +#: object-file.c:1335 object-file.c:2546 #, c-format msgid "garbage at end of loose object '%s'" msgstr "鬆散物件 '%s' 後面有垃圾資料" -#: object-file.c:1417 +#: object-file.c:1457 #, c-format msgid "unable to parse %s header" msgstr "無法解析 %s 頭部" -#: object-file.c:1419 +#: object-file.c:1459 msgid "invalid object type" msgstr "無效的物件類型" -#: object-file.c:1430 +#: object-file.c:1470 #, c-format msgid "unable to unpack %s header" msgstr "無法解開 %s 頭部" -#: object-file.c:1434 +#: object-file.c:1474 #, c-format msgid "header for %s too long, exceeds %d bytes" msgstr "%s 的標頭過長，超出 %d 位元組" -#: object-file.c:1664 +#: object-file.c:1704 #, c-format msgid "failed to read object %s" msgstr "讀取物件 %s 失敗" -#: object-file.c:1668 +#: object-file.c:1708 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: object-file.c:1672 +#: object-file.c:1712 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "鬆散物件 %s（儲存在 %s）已損壞" -#: object-file.c:1676 +#: object-file.c:1716 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包物件 %s（儲存在 %s）已損壞" -#: object-file.c:1781 +#: object-file.c:1821 #, c-format msgid "unable to write file %s" msgstr "無法寫檔案 %s" -#: object-file.c:1788 +#: object-file.c:1828 #, c-format msgid "unable to set permission to '%s'" msgstr "無法為 '%s' 設定權限" -#: object-file.c:1795 +#: object-file.c:1835 msgid "file write error" msgstr "檔案寫錯誤" -#: object-file.c:1815 +#: object-file.c:1858 msgid "error when closing loose object file" msgstr "關閉鬆散物件檔案時發生錯誤" -#: object-file.c:1882 +#: object-file.c:1925 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件" -#: object-file.c:1884 +#: object-file.c:1927 msgid "unable to create temporary file" msgstr "無法建立暫存檔" -#: object-file.c:1908 +#: object-file.c:1951 msgid "unable to write loose object file" msgstr "不能寫鬆散物件檔案" -#: object-file.c:1914 +#: object-file.c:1957 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能壓縮新物件 %s（%d）" -#: object-file.c:1918 +#: object-file.c:1961 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）" -#: object-file.c:1922 +#: object-file.c:1965 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不穩定物件來源資料混淆" -#: object-file.c:1933 builtin/pack-objects.c:1243 +#: object-file.c:1976 builtin/pack-objects.c:1243 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上呼叫 utime() 失敗" -#: object-file.c:2011 +#: object-file.c:2054 #, c-format msgid "cannot read object for %s" msgstr "不能讀取物件 %s" -#: object-file.c:2062 +#: object-file.c:2105 msgid "corrupt commit" msgstr "損壞的提交" -#: object-file.c:2070 +#: object-file.c:2113 msgid "corrupt tag" msgstr "損壞的標籤" -#: object-file.c:2170 +#: object-file.c:2213 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 時讀取錯誤" -#: object-file.c:2173 +#: object-file.c:2216 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 時讀入不完整" -#: object-file.c:2246 object-file.c:2256 +#: object-file.c:2289 object-file.c:2299 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入資料庫失敗" -#: object-file.c:2262 +#: object-file.c:2305 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支援的檔案類型" -#: object-file.c:2286 builtin/fetch.c:1445 +#: object-file.c:2329 builtin/fetch.c:1448 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一個有效的物件" -#: object-file.c:2288 +#: object-file.c:2331 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一個有效的 '%s' 物件" -#: object-file.c:2315 +#: object-file.c:2358 #, c-format msgid "unable to open %s" msgstr "不能開啟 %s" -#: object-file.c:2510 +#: object-file.c:2553 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的雜湊值不符合（預期 %s）" -#: object-file.c:2533 +#: object-file.c:2576 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: object-file.c:2539 +#: object-file.c:2582 #, c-format msgid "unable to unpack header of %s" msgstr "無法解壓縮 %s 的頭部" -#: object-file.c:2544 +#: object-file.c:2587 #, c-format msgid "unable to parse header of %s" msgstr "無法解析 %s 的頭部" -#: object-file.c:2555 +#: object-file.c:2598 #, c-format msgid "unable to unpack contents of %s" msgstr "無法解壓縮 %s 的內容" @@ -5817,25 +5810,25 @@ msgstr "不能解析物件：%s" msgid "hash mismatch %s" msgstr "雜湊值與 %s 不符合" -#: pack-bitmap.c:348 +#: pack-bitmap.c:353 msgid "multi-pack bitmap is missing required reverse index" msgstr "多包位圖缺少需要的反向索引" -#: pack-bitmap.c:424 +#: pack-bitmap.c:429 msgid "load_reverse_index: could not open pack" msgstr "load_reverse_index：無法開啟包" -#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424 +#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424 #, c-format msgid "unable to get size of %s" msgstr "不能得到 %s 的大小" -#: pack-bitmap.c:1916 +#: pack-bitmap.c:1935 #, c-format msgid "could not find %s in pack %s at offset %<PRIuMAX>" msgstr "找不到 %2$s 包，偏移位置 %3$<PRIuMAX> 的 %1$s" -#: pack-bitmap.c:1952 builtin/rev-list.c:92 +#: pack-bitmap.c:1971 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "無法取得 %s 的磁碟用量" @@ -5884,45 +5877,50 @@ msgstr "無法讓 %s 能夠寫入" msgid "could not write '%s' promisor file" msgstr "無法寫入「%s」promisor 檔案" -#: packfile.c:626 +#: packfile.c:627 msgid "offset before end of packfile (broken .idx?)" msgstr "位移量在 packfile 結束之前（損壞的 .idx？）" -#: packfile.c:656 +#: packfile.c:657 #, c-format msgid "packfile %s cannot be mapped%s" msgstr "包檔案 %s 無法映射%s" -#: packfile.c:1923 +#: packfile.c:1924 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）" -#: packfile.c:1927 +#: packfile.c:1928 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）" -#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175 +#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175 #, c-format msgid "option `%s' expects a numerical value" msgstr "選項 `%s' 期望一個數字值" -#: parse-options-cb.c:41 +#: parse-options-cb.c:42 #, c-format msgid "malformed expiration date '%s'" msgstr "格式錯誤的到期時間：'%s'" -#: parse-options-cb.c:54 +#: parse-options-cb.c:55 #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" -#: parse-options-cb.c:132 parse-options-cb.c:149 +#: parse-options-cb.c:133 parse-options-cb.c:150 #, c-format msgid "malformed object name '%s'" msgstr "格式錯誤的物件名 '%s'" +#: parse-options-cb.c:307 +#, c-format +msgid "option `%s' expects \"%s\" or \"%s\"" +msgstr "選項「%s」期望「%s」或「%s」" + #: parse-options.c:58 #, c-format msgid "%s requires a value" @@ -5958,36 +5956,36 @@ msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴" msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）" -#: parse-options.c:427 parse-options.c:435 +#: parse-options.c:428 parse-options.c:436 #, c-format msgid "did you mean `--%s` (with two dashes)?" msgstr "你的意思是 `--%s`（有兩個短線）嗎？" -#: parse-options.c:677 parse-options.c:1053 +#: parse-options.c:678 parse-options.c:1054 #, c-format msgid "alias of --%s" msgstr "--%s 的別名" -#: parse-options.c:891 +#: parse-options.c:892 #, c-format msgid "unknown option `%s'" msgstr "未知選項 `%s'" -#: parse-options.c:893 +#: parse-options.c:894 #, c-format msgid "unknown switch `%c'" msgstr "未知開關 `%c'" -#: parse-options.c:895 +#: parse-options.c:896 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "字串中未知的非 ascii 字元選項：`%s'" -#: parse-options.c:919 +#: parse-options.c:920 msgid "..." msgstr "..." -#: parse-options.c:933 +#: parse-options.c:934 #, c-format msgid "usage: %s" msgstr "用法：%s" @@ -5995,7 +5993,7 @@ msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:948 +#: parse-options.c:949 #, c-format msgid " or: %s" msgstr " 或：%s" @@ -6019,18 +6017,18 @@ msgstr " 或：%s" #. translated) N_() usage string, which contained embedded #. newlines before we split it up. #. -#: parse-options.c:969 +#: parse-options.c:970 #, c-format msgid "%*s%s" msgstr "%*s%s" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: parse-options.c:992 +#: parse-options.c:993 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:1039 +#: parse-options.c:1040 msgid "-NUM" msgstr "-數字" @@ -6156,17 +6154,17 @@ msgstr "讀取錯誤" msgid "the remote end hung up unexpectedly" msgstr "遠端意外掛斷了" -#: pkt-line.c:390 pkt-line.c:392 +#: pkt-line.c:417 pkt-line.c:419 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "協定錯誤：錯誤的行長度字串：%.4s" -#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417 +#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444 #, c-format msgid "protocol error: bad line length %d" msgstr "協定錯誤：錯誤的行長度 %d" -#: pkt-line.c:434 sideband.c:165 +#: pkt-line.c:472 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "遠端錯誤：%s" @@ -6217,7 +6215,7 @@ msgstr "不能啟動 `log`" msgid "could not read `log` output" msgstr "不能讀取 `log` 的輸出" -#: range-diff.c:97 sequencer.c:5605 +#: range-diff.c:97 sequencer.c:5602 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -6238,59 +6236,55 @@ msgstr "無法解析 git 頭 '%.*s'" msgid "failed to generate diff" msgstr "生成 diff 失敗" -#: range-diff.c:559 -msgid "--left-only and --right-only are mutually exclusive" -msgstr "--left-only 和 --right-only 互斥" - #: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日誌" -#: read-cache.c:710 +#: read-cache.c:723 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）" -#: read-cache.c:726 +#: read-cache.c:739 msgid "cannot create an empty blob in the object database" msgstr "不能在物件資料庫中建立空的資料物件" -#: read-cache.c:748 +#: read-cache.c:761 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s：只能新增一般檔案、符號連結或 git 目錄" -#: read-cache.c:753 builtin/submodule--helper.c:3241 +#: read-cache.c:766 builtin/submodule--helper.c:3242 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' 沒有簽出一個提交" -#: read-cache.c:805 +#: read-cache.c:818 #, c-format msgid "unable to index file '%s'" msgstr "無法索引檔案 '%s'" -#: read-cache.c:824 +#: read-cache.c:837 #, c-format msgid "unable to add '%s' to index" msgstr "無法在索引中新增 '%s'" -#: read-cache.c:835 +#: read-cache.c:848 #, c-format msgid "unable to stat '%s'" msgstr "無法對 %s 執行 stat" -#: read-cache.c:1373 +#: read-cache.c:1386 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起來既是檔案又是目錄" -#: read-cache.c:1588 +#: read-cache.c:1601 msgid "Refresh index" msgstr "重新整理索引" -#: read-cache.c:1720 +#: read-cache.c:1733 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6299,7 +6293,7 @@ msgstr "" "設定了 index.version，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1730 +#: read-cache.c:1743 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6308,144 +6302,144 @@ msgstr "" "設定了 GIT_INDEX_VERSION，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1786 +#: read-cache.c:1799 #, c-format msgid "bad signature 0x%08x" msgstr "壞的簽名 0x%08x" -#: read-cache.c:1789 +#: read-cache.c:1802 #, c-format msgid "bad index version %d" msgstr "壞的索引版本 %d" -#: read-cache.c:1798 +#: read-cache.c:1811 msgid "bad index file sha1 signature" msgstr "壞的索引檔案 sha1 簽名" -#: read-cache.c:1832 +#: read-cache.c:1845 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支援的 %.4s 副檔名" # -#: read-cache.c:1834 +#: read-cache.c:1847 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 副檔名" -#: read-cache.c:1871 +#: read-cache.c:1884 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引條目格式 0x%08x" -#: read-cache.c:1887 +#: read-cache.c:1900 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位" -#: read-cache.c:1944 +#: read-cache.c:1957 msgid "unordered stage entries in index" msgstr "索引中有未排序的暫存條目" -#: read-cache.c:1947 +#: read-cache.c:1960 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合併檔案 '%s' 有多個暫存條目" -#: read-cache.c:1950 +#: read-cache.c:1963 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暫存條目" -#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183 -#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987 +#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183 +#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519 -#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293 -#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201 +#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293 +#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202 msgid "index file corrupt" msgstr "索引檔案損壞" -#: read-cache.c:2209 +#: read-cache.c:2222 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "無法建立 load_cache_entries 執行緒：%s" -#: read-cache.c:2222 +#: read-cache.c:2235 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "無法加入 load_cache_entries 執行緒：%s" -#: read-cache.c:2255 +#: read-cache.c:2268 #, c-format msgid "%s: index file open failed" msgstr "%s：開啟索引檔案失敗" -#: read-cache.c:2259 +#: read-cache.c:2272 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能對開啟的索引執行 stat 動作" -#: read-cache.c:2263 +#: read-cache.c:2276 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引檔案比預期的小" -#: read-cache.c:2267 +#: read-cache.c:2280 #, c-format msgid "%s: unable to map index file%s" msgstr "%s：無法 map 索引檔案%s" -#: read-cache.c:2310 +#: read-cache.c:2323 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "無法建立 load_index_extensions 執行緒：%s" -#: read-cache.c:2337 +#: read-cache.c:2350 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "無法加入 load_index_extensions 執行緒：%s" -#: read-cache.c:2375 +#: read-cache.c:2396 #, c-format msgid "could not freshen shared index '%s'" msgstr "無法重新整理共享索引 '%s'" -#: read-cache.c:2434 +#: read-cache.c:2455 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147 +#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150 #, c-format msgid "could not close '%s'" msgstr "不能關閉 '%s'" -#: read-cache.c:3108 +#: read-cache.c:3129 msgid "failed to convert to a sparse-index" msgstr "無法轉換成稀疏索引" -#: read-cache.c:3179 +#: read-cache.c:3200 #, c-format msgid "could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: read-cache.c:3192 +#: read-cache.c:3213 #, c-format msgid "unable to open git dir: %s" msgstr "不能開啟 git 目錄：%s" -#: read-cache.c:3204 +#: read-cache.c:3225 #, c-format msgid "unable to unlink: %s" msgstr "無法刪除：%s" -#: read-cache.c:3233 +#: read-cache.c:3254 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修復 '%s' 的權限位" -#: read-cache.c:3390 +#: read-cache.c:3411 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暫存區 #0" @@ -6556,8 +6550,8 @@ msgstr "" "然而，如果您刪除全部內容，重定基底動作將會終止。\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888 -#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883 +#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791 #: builtin/rebase.c:190 #, c-format msgid "could not write '%s'" @@ -6598,7 +6592,7 @@ msgstr "" msgid "%s: 'preserve' superseded by 'merges'" msgstr "%s：「preserve」已經改成「merges」" -#: ref-filter.c:42 wt-status.c:2036 +#: ref-filter.c:42 wt-status.c:2048 msgid "gone" msgstr "遺失" @@ -6637,7 +6631,8 @@ msgstr "期望整數值 refname:lstrip=%s" msgid "Integer value expected refname:rstrip=%s" msgstr "期望整數值 refname:rstrip=%s" -#: ref-filter.c:265 +#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431 +#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "無法識別的 %%(%s) 參數：%s" @@ -6647,11 +6642,6 @@ msgstr "無法識別的 %%(%s) 參數：%s" msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) 不帶參數" -#: ref-filter.c:344 -#, c-format -msgid "unrecognized %%(objectsize) argument: %s" -msgstr "無法識別的 %%(objectsize) 參數：%s" - #: ref-filter.c:352 #, c-format msgid "%%(deltabase) does not take arguments" @@ -6662,11 +6652,6 @@ msgstr "%%(deltabase) 不帶參數" msgid "%%(body) does not take arguments" msgstr "%%(body) 不帶參數" -#: ref-filter.c:377 -#, c-format -msgid "unrecognized %%(subject) argument: %s" -msgstr "無法識別的 %%(subject) 引數：%s" - #: ref-filter.c:396 #, c-format msgid "expected %%(trailers:key=<value>)" @@ -6682,26 +6667,11 @@ msgstr "未知的 %%(trailers) 參數：%s" msgid "positive value expected contents:lines=%s" msgstr "期望一個正數 contents:lines=%s" -#: ref-filter.c:431 -#, c-format -msgid "unrecognized %%(contents) argument: %s" -msgstr "無法識別的 %%(contents) 參數：%s" - -#: ref-filter.c:443 -#, c-format -msgid "unrecognized %%(raw) argument: %s" -msgstr "無法識別的 %%(raw) 引數：%s" - #: ref-filter.c:458 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值" -#: ref-filter.c:462 -#, c-format -msgid "unrecognized argument '%s' in %%(%s)" -msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數" - #: ref-filter.c:476 #, c-format msgid "unrecognized email option: %s" @@ -6722,21 +6692,11 @@ msgstr "無法識別的位置：%s" msgid "unrecognized width:%s" msgstr "無法識別的寬度：%s" -#: ref-filter.c:534 -#, c-format -msgid "unrecognized %%(align) argument: %s" -msgstr "無法識別的 %%(align) 參數：%s" - #: ref-filter.c:542 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一個正數的寬度" -#: ref-filter.c:560 -#, c-format -msgid "unrecognized %%(if) argument: %s" -msgstr "無法識別的 %%(if) 參數：%s" - #: ref-filter.c:568 #, c-format msgid "%%(rest) does not take arguments" @@ -6758,15 +6718,10 @@ msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料" -#: ref-filter.c:844 +#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948 #, c-format -msgid "format: %%(if) atom used without a %%(then) atom" -msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素" - -#: ref-filter.c:910 -#, c-format -msgid "format: %%(then) atom used without an %%(if) atom" -msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素" +msgid "format: %%(%s) atom used without a %%(%s) atom" +msgstr "format：使用 %%(%s) 元素卻缺少 %%(%s) 元素" #: ref-filter.c:912 #, c-format @@ -6778,16 +6733,6 @@ msgstr "格式：%%(then) 元素用了多次" msgid "format: %%(then) atom used after %%(else)" msgstr "格式：%%(then) 元素用在了 %%(else) 之後" -#: ref-filter.c:946 -#, c-format -msgid "format: %%(else) atom used without an %%(if) atom" -msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素" - -#: ref-filter.c:948 -#, c-format -msgid "format: %%(else) atom used without a %%(then) atom" -msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素" - #: ref-filter.c:950 #, c-format msgid "format: %%(else) atom used more than once" @@ -6862,22 +6807,22 @@ msgstr "格式錯誤的物件 '%s'" msgid "ignoring ref with broken name %s" msgstr "忽略帶有錯誤名稱 %s 的引用" -#: ref-filter.c:2250 refs.c:673 +#: ref-filter.c:2250 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "忽略損壞的引用 %s" -#: ref-filter.c:2623 +#: ref-filter.c:2629 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:2726 +#: ref-filter.c:2740 #, c-format msgid "malformed object name %s" msgstr "格式錯誤的物件名 %s" -#: ref-filter.c:2731 +#: ref-filter.c:2745 #, c-format msgid "option `%s' must point to a commit" msgstr "選項 `%s' 必須指向一個提交" @@ -6922,71 +6867,71 @@ msgstr "無法擷取「%s」" msgid "invalid branch name: %s = %s" msgstr "分支名稱無效：%s = %s" -#: refs.c:671 +#: refs.c:674 #, c-format msgid "ignoring dangling symref %s" msgstr "忽略懸空符號引用 %s" -#: refs.c:920 +#: refs.c:925 #, c-format msgid "log for ref %s has gap after %s" msgstr "引用 %s 的日誌在 %s 之後有缺口" -#: refs.c:927 +#: refs.c:932 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "引用 %s 的日誌意外終止於 %s" -#: refs.c:992 +#: refs.c:997 #, c-format msgid "log for %s is empty" msgstr "%s 的日誌為空" -#: refs.c:1084 +#: refs.c:1090 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "拒絕更新有錯誤名稱 '%s' 的引用" -#: refs.c:1155 +#: refs.c:1168 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "對引用 '%s' 執行 update_ref 失敗：%s" -#: refs.c:2062 +#: refs.c:2069 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "不允許對引用 '%s' 多次更新" -#: refs.c:2142 +#: refs.c:2152 msgid "ref updates forbidden inside quarantine environment" msgstr "在隔離環境中禁止更新引用" -#: refs.c:2153 +#: refs.c:2163 msgid "ref updates aborted by hook" msgstr "引用更新被掛鉤拒絕" -#: refs.c:2253 refs.c:2283 +#: refs.c:2271 refs.c:2301 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' 已存在，無法建立 '%s'" -#: refs.c:2259 refs.c:2294 +#: refs.c:2277 refs.c:2312 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "無法同時處理 '%s' 和 '%s'" -#: refs/files-backend.c:1271 +#: refs/files-backend.c:1268 #, c-format msgid "could not remove reference %s" msgstr "無法刪除引用 %s" -#: refs/files-backend.c:1285 refs/packed-backend.c:1549 +#: refs/files-backend.c:1282 refs/packed-backend.c:1549 #: refs/packed-backend.c:1559 #, c-format msgid "could not delete reference %s: %s" msgstr "無法刪除引用 %s：%s" -#: refs/files-backend.c:1288 refs/packed-backend.c:1562 +#: refs/files-backend.c:1285 refs/packed-backend.c:1562 #, c-format msgid "could not delete references: %s" msgstr "無法刪除引用：%s" @@ -6996,50 +6941,50 @@ msgstr "無法刪除引用：%s" msgid "invalid refspec '%s'" msgstr "無效的引用規格：「%s」" -#: remote.c:351 +#: remote.c:402 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "設定的遠端短名稱不能以 '/' 開始：%s" -#: remote.c:399 +#: remote.c:450 msgid "more than one receivepack given, using the first" msgstr "提供了一個以上的 receivepack，使用第一個" -#: remote.c:407 +#: remote.c:458 msgid "more than one uploadpack given, using the first" msgstr "提供了一個以上的 uploadpack，使用第一個" -#: remote.c:590 +#: remote.c:699 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同時取得 %s 和 %s 至 %s" -#: remote.c:594 +#: remote.c:703 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常追蹤 %s，而非 %s" -#: remote.c:598 +#: remote.c:707 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同時追蹤 %s 和 %s" -#: remote.c:666 +#: remote.c:775 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "模式的鍵 '%s' 沒有 '*'" -#: remote.c:676 +#: remote.c:785 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "模式的值 '%s' 沒有 '*'" -#: remote.c:1083 +#: remote.c:1192 #, c-format msgid "src refspec %s does not match any" msgstr "來源引用規格 %s 沒有符合項目" -#: remote.c:1088 +#: remote.c:1197 #, c-format msgid "src refspec %s matches more than one" msgstr "來源引用規格 %s 符合超過一個" @@ -7048,7 +6993,7 @@ msgstr "來源引用規格 %s 符合超過一個" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1103 +#: remote.c:1212 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -7070,7 +7015,7 @@ msgstr "" "\n" "由於這些猜測都不正確，我們放棄了。您必須給出完整引用。" -#: remote.c:1123 +#: remote.c:1232 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -7081,7 +7026,7 @@ msgstr "" "您是想透過推送至「%s:refs/heads/%s」\n" "來建立新分支嗎？" -#: remote.c:1128 +#: remote.c:1237 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -7092,7 +7037,7 @@ msgstr "" "您是想透過推送至「%s:refs/tags/%s」\n" "來建立新標籤嗎？" -#: remote.c:1133 +#: remote.c:1242 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -7103,7 +7048,7 @@ msgstr "" "您是想透過推送至「%s:refs/tags/%s」\n" "為新樹狀物件貼上標籤嗎？" -#: remote.c:1138 +#: remote.c:1247 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -7114,113 +7059,113 @@ msgstr "" "您是想透過推送至「%s:refs/tags/%s」\n" "為新資料物件貼上標籤嗎？" -#: remote.c:1174 +#: remote.c:1283 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s 無法被解析為分支" -#: remote.c:1185 +#: remote.c:1294 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "無法刪除 '%s'：遠端引用不存在" -#: remote.c:1197 +#: remote.c:1306 #, c-format msgid "dst refspec %s matches more than one" msgstr "目的地引用規格 %s 符合超過一個" -#: remote.c:1204 +#: remote.c:1313 #, c-format msgid "dst ref %s receives from more than one src" msgstr "目的地引用 %s 接收超過一個來源" -#: remote.c:1724 remote.c:1825 +#: remote.c:1834 remote.c:1941 msgid "HEAD does not point to a branch" msgstr "HEAD 沒有指向一個分支" -#: remote.c:1733 +#: remote.c:1843 #, c-format msgid "no such branch: '%s'" msgstr "沒有此分支：'%s'" -#: remote.c:1736 +#: remote.c:1846 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未給分支 '%s' 設定上游" -#: remote.c:1742 +#: remote.c:1852 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支" -#: remote.c:1757 +#: remote.c:1867 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推送目的地 '%s' 至遠端 '%s' 沒有本機追蹤分支" -#: remote.c:1769 +#: remote.c:1882 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 沒有設定要推送的遠端伺服器" -#: remote.c:1779 +#: remote.c:1892 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "向 '%s' 推送引用規格未包含 '%s'" -#: remote.c:1792 +#: remote.c:1905 msgid "push has no destination (push.default is 'nothing')" msgstr "推送沒有目的地（push.default 是 'nothing'）" -#: remote.c:1814 +#: remote.c:1927 msgid "cannot resolve 'simple' push to a single destination" msgstr "無法解析 'simple' 推送至單獨目的地" -#: remote.c:1943 +#: remote.c:2060 #, c-format msgid "couldn't find remote ref %s" msgstr "無法找到遠端引用 %s" -#: remote.c:1956 +#: remote.c:2073 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* 在本機忽略可笑的引用 '%s'" -#: remote.c:2119 +#: remote.c:2236 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n" -#: remote.c:2123 +#: remote.c:2240 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n" -#: remote.c:2126 +#: remote.c:2243 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "您的分支與上游分支 '%s' 一致。\n" -#: remote.c:2130 +#: remote.c:2247 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "您的分支和 '%s' 指向不同的提交。\n" -#: remote.c:2133 +#: remote.c:2250 #, c-format msgid " (use \"%s\" for details)\n" msgstr " （使用 \"%s\" 檢視詳情）\n" -#: remote.c:2137 +#: remote.c:2254 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n" -#: remote.c:2143 +#: remote.c:2260 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 來發布您的本機提交）\n" -#: remote.c:2146 +#: remote.c:2263 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -7228,11 +7173,11 @@ msgid_plural "" msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n" # 譯者：請維持前導空格 -#: remote.c:2154 +#: remote.c:2271 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 來更新您的本機分支）\n" -#: remote.c:2157 +#: remote.c:2274 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -7245,11 +7190,11 @@ msgstr[0] "" "並且分別有 %d 和 %d 處不同的提交。\n" # 譯者：請維持前導空格 -#: remote.c:2167 +#: remote.c:2284 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 來合併遠端分支）\n" -#: remote.c:2359 +#: remote.c:2476 #, c-format msgid "cannot parse expected object name '%s'" msgstr "無法解析期望的物件名 '%s'" @@ -7282,7 +7227,7 @@ msgstr "無法寫入 rerere 記錄" msgid "there were errors while writing '%s' (%s)" msgstr "寫入 '%s' (%s) 時發生錯誤" -#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281 +#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298 #, c-format msgid "failed to flush '%s'" msgstr "重新整理 '%s' 失敗" @@ -7327,8 +7272,8 @@ msgstr "不能刪除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "為 '%s' 記錄 preimage" -#: rerere.c:865 submodule.c:2121 builtin/log.c:2002 -#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819 +#: rerere.c:865 submodule.c:2121 builtin/log.c:2017 +#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820 #, c-format msgid "could not create directory '%s'" msgstr "不能建立目錄 '%s'" @@ -7366,37 +7311,29 @@ msgstr "不能開啟 rr-cache 目錄" msgid "could not determine HEAD revision" msgstr "不能確定 HEAD 版本" -#: reset.c:70 reset.c:76 sequencer.c:3705 +#: reset.c:70 reset.c:76 sequencer.c:3700 #, c-format msgid "failed to find tree of %s" msgstr "無法找到 %s 指向的樹" -#: revision.c:2259 -msgid "--unsorted-input is incompatible with --no-walk" -msgstr "--unsorted-input 與 --no-walk 不相容" - -#: revision.c:2346 +#: revision.c:2347 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<packfile> 已不受支援" -#: revision.c:2655 revision.c:2659 -msgid "--no-walk is incompatible with --unsorted-input" -msgstr "--no-walk 與 --unsorted-input 不相容" - -#: revision.c:2690 +#: revision.c:2686 msgid "your current branch appears to be broken" msgstr "您的目前分支好像被損壞" -#: revision.c:2693 +#: revision.c:2689 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的目前分支 '%s' 尚無任何提交" -#: revision.c:2895 +#: revision.c:2891 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L 尚不支援 -p 和 -s 之外的差異格式" -#: run-command.c:1278 +#: run-command.c:1262 #, c-format msgid "cannot create async thread: %s" msgstr "不能建立 async 執行緒：%s" @@ -7459,8 +7396,8 @@ msgstr "無效的提交說明清理模式 '%s'" msgid "could not delete '%s'" msgstr "無法刪除 '%s'" -#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297 -#: builtin/rm.c:408 +#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297 +#: builtin/rm.c:409 #, c-format msgid "could not remove '%s'" msgstr "無法刪除 '%s'" @@ -7522,13 +7459,13 @@ msgstr "" "若要取消並返回 \"git revert\" 前的狀態，\n" "請執行 \"git revert --abort\"。" -#: sequencer.c:448 sequencer.c:3290 +#: sequencer.c:448 sequencer.c:3292 #, c-format msgid "could not lock '%s'" msgstr "不能鎖定 '%s'" -#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308 -#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639 +#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310 +#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639 #, c-format msgid "could not write to '%s'" msgstr "不能寫入 '%s'" @@ -7538,12 +7475,18 @@ msgstr "不能寫入 '%s'" msgid "could not write eol to '%s'" msgstr "不能將換行符號寫入 '%s'" -#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310 -#: sequencer.c:3574 +#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312 +#: sequencer.c:3569 #, c-format msgid "failed to finalize '%s'" msgstr "無法完成 '%s'" +#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551 +#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148 +#, c-format +msgid "could not read '%s'" +msgstr "不能讀取 '%s'" + #: sequencer.c:499 #, c-format msgid "your local changes would be overwritten by %s." @@ -7558,7 +7501,7 @@ msgstr "提交您的修改或儲藏後再繼續。" msgid "%s: fast-forward" msgstr "%s：快轉" -#: sequencer.c:574 builtin/tag.c:610 +#: sequencer.c:574 builtin/tag.c:614 #, c-format msgid "Invalid cleanup mode %s" msgstr "無效的清理模式 %s" @@ -7589,8 +7532,8 @@ msgstr "在 '%.*s' 中沒有 key" msgid "unable to dequote value of '%s'" msgstr "無法為 '%s' 的值去引號" -#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730 -#: builtin/am.c:822 builtin/rebase.c:694 +#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756 +#: builtin/am.c:848 builtin/rebase.c:694 #, c-format msgid "could not open '%s' for reading" msgstr "無法開啟 '%s' 進行讀取" @@ -7653,11 +7596,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1229 +#: sequencer.c:1225 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 掛鉤失敗" -#: sequencer.c:1235 +#: sequencer.c:1231 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7681,7 +7624,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1248 +#: sequencer.c:1244 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7704,349 +7647,349 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1290 +#: sequencer.c:1288 msgid "couldn't look up newly created commit" msgstr "無法找到新建立的提交" -#: sequencer.c:1292 +#: sequencer.c:1290 msgid "could not parse newly created commit" msgstr "不能解析新建立的提交" -#: sequencer.c:1338 +#: sequencer.c:1339 msgid "unable to resolve HEAD after creating commit" msgstr "建立提交後，不能解析 HEAD" -#: sequencer.c:1340 +#: sequencer.c:1342 msgid "detached HEAD" msgstr "分離 HEAD" # 譯者：中文字串拼接，可刪除前導空格 -#: sequencer.c:1344 +#: sequencer.c:1346 msgid " (root-commit)" msgstr " (根提交)" -#: sequencer.c:1365 +#: sequencer.c:1367 msgid "could not parse HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1367 +#: sequencer.c:1369 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一個提交！" -#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707 +#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:1427 sequencer.c:2312 +#: sequencer.c:1429 sequencer.c:2314 msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708 +#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710 msgid "git write-tree failed to write a tree" msgstr "git write-tree 無法寫入樹狀物件" -#: sequencer.c:1471 sequencer.c:1591 +#: sequencer.c:1473 sequencer.c:1593 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能從 '%s' 讀取提交說明" -#: sequencer.c:1502 sequencer.c:1534 +#: sequencer.c:1504 sequencer.c:1536 #, c-format msgid "invalid author identity '%s'" msgstr "無效的作者身分 '%s'" -#: sequencer.c:1508 +#: sequencer.c:1510 msgid "corrupt author: missing date information" msgstr "作者資訊損壞：缺少日期資訊" -#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913 -#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915 +#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "寫提交物件失敗" -#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199 +#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199 #: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:1623 +#: sequencer.c:1625 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" -#: sequencer.c:1628 +#: sequencer.c:1630 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" -#: sequencer.c:1711 sequencer.c:1992 +#: sequencer.c:1713 sequencer.c:1994 #, c-format msgid "unknown command: %d" msgstr "未知指令：%d" -#: sequencer.c:1753 +#: sequencer.c:1755 msgid "This is the 1st commit message:" msgstr "這是第一個提交說明：" -#: sequencer.c:1754 +#: sequencer.c:1756 #, c-format msgid "This is the commit message #%d:" msgstr "這是提交說明 #%d：" -#: sequencer.c:1755 +#: sequencer.c:1757 msgid "The 1st commit message will be skipped:" msgstr "略過第 1 個提交說明：" -#: sequencer.c:1756 +#: sequencer.c:1758 #, c-format msgid "The commit message #%d will be skipped:" msgstr "略過第 %d 個提交說明：" -#: sequencer.c:1757 +#: sequencer.c:1759 #, c-format msgid "This is a combination of %d commits." msgstr "這是整合 %d 個提交的集合提交。" -#: sequencer.c:1904 sequencer.c:1961 +#: sequencer.c:1906 sequencer.c:1963 #, c-format msgid "cannot write '%s'" msgstr "不能寫 '%s'" -#: sequencer.c:1951 +#: sequencer.c:1953 msgid "need a HEAD to fixup" msgstr "需要一個 HEAD 來修復" -#: sequencer.c:1953 sequencer.c:3601 +#: sequencer.c:1955 sequencer.c:3596 msgid "could not read HEAD" msgstr "不能讀取 HEAD" -#: sequencer.c:1955 +#: sequencer.c:1957 msgid "could not read HEAD's commit message" msgstr "不能讀取 HEAD 的提交說明" -#: sequencer.c:1979 +#: sequencer.c:1981 #, c-format msgid "could not read commit message of %s" msgstr "不能讀取 %s 的提交說明" -#: sequencer.c:2089 +#: sequencer.c:2091 msgid "your index file is unmerged." msgstr "您的索引檔案未完成合併。" -#: sequencer.c:2096 +#: sequencer.c:2098 msgid "cannot fixup root commit" msgstr "不能修復根提交" -#: sequencer.c:2115 +#: sequencer.c:2117 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一個合併提交但未提供 -m 選項。" -#: sequencer.c:2123 sequencer.c:2131 +#: sequencer.c:2125 sequencer.c:2133 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 沒有第 %d 個父提交" -#: sequencer.c:2137 +#: sequencer.c:2139 #, c-format msgid "cannot get commit message for %s" msgstr "不能得到 %s 的提交說明" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:2156 +#: sequencer.c:2158 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:2222 +#: sequencer.c:2224 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能將 '%s' 重新命名為 '%s'" -#: sequencer.c:2282 +#: sequencer.c:2284 #, c-format msgid "could not revert %s... %s" msgstr "不能還原 %s... %s" -#: sequencer.c:2283 +#: sequencer.c:2285 #, c-format msgid "could not apply %s... %s" msgstr "不能套用 %s... %s" -#: sequencer.c:2304 +#: sequencer.c:2306 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n" -#: sequencer.c:2362 +#: sequencer.c:2364 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：無法讀取索引" -#: sequencer.c:2370 +#: sequencer.c:2372 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：無法重新整理索引" -#: sequencer.c:2450 +#: sequencer.c:2452 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受參數：'%s'" -#: sequencer.c:2459 +#: sequencer.c:2461 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的參數" -#: sequencer.c:2502 +#: sequencer.c:2504 #, c-format msgid "could not parse '%s'" msgstr "無法解析 '%s'" -#: sequencer.c:2563 +#: sequencer.c:2565 #, c-format msgid "invalid line %d: %.*s" msgstr "無效行 %d：%.*s" -#: sequencer.c:2574 +#: sequencer.c:2576 #, c-format msgid "cannot '%s' without a previous commit" msgstr "沒有父提交的情況下不能 '%s'" -#: sequencer.c:2622 builtin/rebase.c:184 +#: sequencer.c:2624 builtin/rebase.c:184 #, c-format msgid "could not read '%s'." msgstr "不能讀取 '%s'。" -#: sequencer.c:2660 +#: sequencer.c:2662 msgid "cancelling a cherry picking in progress" msgstr "正在取消一個進行中的揀選" -#: sequencer.c:2669 +#: sequencer.c:2671 msgid "cancelling a revert in progress" msgstr "正在取消一個進行中的還原" -#: sequencer.c:2709 +#: sequencer.c:2711 msgid "please fix this using 'git rebase --edit-todo'." msgstr "請用 'git rebase --edit-todo' 來修改。" -#: sequencer.c:2711 +#: sequencer.c:2713 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清單：'%s'" -#: sequencer.c:2716 +#: sequencer.c:2718 msgid "no commits parsed." msgstr "沒有解析提交。" -#: sequencer.c:2727 +#: sequencer.c:2729 msgid "cannot cherry-pick during a revert." msgstr "不能在還原提交中執行揀選。" -#: sequencer.c:2729 +#: sequencer.c:2731 msgid "cannot revert during a cherry-pick." msgstr "不能在揀選中執行還原提交。" -#: sequencer.c:2807 +#: sequencer.c:2809 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值無效：%s" -#: sequencer.c:2916 +#: sequencer.c:2918 msgid "unusable squash-onto" msgstr "不可用的 squash-onto" -#: sequencer.c:2936 +#: sequencer.c:2938 #, c-format msgid "malformed options sheet: '%s'" msgstr "格式錯誤的選項清單：'%s'" -#: sequencer.c:3031 sequencer.c:4905 +#: sequencer.c:3033 sequencer.c:4902 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:3048 +#: sequencer.c:3050 msgid "revert is already in progress" msgstr "一個還原動作已在進行" -#: sequencer.c:3050 +#: sequencer.c:3052 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:3053 +#: sequencer.c:3055 msgid "cherry-pick is already in progress" msgstr "揀選動作已在進行" -#: sequencer.c:3055 +#: sequencer.c:3057 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:3069 +#: sequencer.c:3071 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能建立序列目錄 '%s'" -#: sequencer.c:3084 +#: sequencer.c:3086 msgid "could not lock HEAD" msgstr "不能鎖定 HEAD" -#: sequencer.c:3144 sequencer.c:4615 +#: sequencer.c:3146 sequencer.c:4612 msgid "no cherry-pick or revert in progress" msgstr "揀選或還原動作並未進行" -#: sequencer.c:3146 sequencer.c:3157 +#: sequencer.c:3148 sequencer.c:3159 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:3148 sequencer.c:3192 +#: sequencer.c:3150 sequencer.c:3194 msgid "cannot abort from a branch yet to be born" msgstr "不能從尚未建立的分支終止" -#: sequencer.c:3178 builtin/grep.c:772 +#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772 #, c-format msgid "cannot open '%s'" msgstr "不能開啟 '%s'" -#: sequencer.c:3180 +#: sequencer.c:3182 #, c-format msgid "cannot read '%s': %s" msgstr "不能讀取 '%s'：%s" -#: sequencer.c:3181 +#: sequencer.c:3183 msgid "unexpected end of file" msgstr "意外的檔案結束" -#: sequencer.c:3187 +#: sequencer.c:3189 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞" -#: sequencer.c:3198 +#: sequencer.c:3200 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！" -#: sequencer.c:3239 +#: sequencer.c:3241 msgid "no revert in progress" msgstr "沒有正在進行的還原" -#: sequencer.c:3248 +#: sequencer.c:3250 msgid "no cherry-pick in progress" msgstr "沒有正在進行的揀選" -#: sequencer.c:3258 +#: sequencer.c:3260 msgid "failed to skip the commit" msgstr "無法略過這個提交" -#: sequencer.c:3265 +#: sequencer.c:3267 msgid "there is nothing to skip" msgstr "沒有要略過的" -#: sequencer.c:3268 +#: sequencer.c:3270 #, c-format msgid "" "have you committed already?\n" @@ -8055,16 +7998,16 @@ msgstr "" "您已經提交了嗎？\n" "試試 \"git %s --continue\"" -#: sequencer.c:3430 sequencer.c:4506 +#: sequencer.c:3432 sequencer.c:4503 msgid "cannot read HEAD" msgstr "不能讀取 HEAD" -#: sequencer.c:3447 +#: sequencer.c:3449 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "無法複製 '%s' 至 '%s'" -#: sequencer.c:3455 +#: sequencer.c:3457 #, c-format msgid "" "You can amend the commit now, with\n" @@ -8083,28 +8026,28 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3465 +#: sequencer.c:3467 #, c-format msgid "Could not apply %s... %.*s" msgstr "不能套用 %s... %.*s" -#: sequencer.c:3472 +#: sequencer.c:3474 #, c-format msgid "Could not merge %.*s" msgstr "不能合併 %.*s" -#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639 +#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能複製 '%s' 至 '%s'" -#: sequencer.c:3502 +#: sequencer.c:3503 #, c-format msgid "Executing: %s\n" msgstr "執行：%s\n" # 譯者：請維持前導空格 -#: sequencer.c:3517 +#: sequencer.c:3514 #, c-format msgid "" "execution failed: %s\n" @@ -8119,11 +8062,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3523 +#: sequencer.c:3520 msgid "and made changes to the index and/or the working tree\n" msgstr "並且修改索引和/或工作區\n" -#: sequencer.c:3529 +#: sequencer.c:3526 #, c-format msgid "" "execution succeeded: %s\n" @@ -8140,90 +8083,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3591 +#: sequencer.c:3586 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的標籤名稱：'%.*s'" -#: sequencer.c:3664 +#: sequencer.c:3659 msgid "writing fake root commit" msgstr "寫偽根提交" -#: sequencer.c:3669 +#: sequencer.c:3664 msgid "writing squash-onto" msgstr "寫入 squash-onto" -#: sequencer.c:3748 +#: sequencer.c:3743 #, c-format msgid "could not resolve '%s'" msgstr "無法解析 '%s'" -#: sequencer.c:3780 +#: sequencer.c:3775 msgid "cannot merge without a current revision" msgstr "沒有目前版本不能合併" -#: sequencer.c:3802 +#: sequencer.c:3797 #, c-format msgid "unable to parse '%.*s'" msgstr "無法解析 '%.*s'" -#: sequencer.c:3811 +#: sequencer.c:3806 #, c-format msgid "nothing to merge: '%.*s'" msgstr "無可用合併：'%.*s'" -#: sequencer.c:3823 +#: sequencer.c:3818 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章魚合並不能在一個新的根提交上執行" -#: sequencer.c:3878 +#: sequencer.c:3873 #, c-format msgid "could not get commit message of '%s'" msgstr "不能取得 '%s' 的提交說明" -#: sequencer.c:4024 +#: sequencer.c:4019 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能嘗試合併 '%.*s'" -#: sequencer.c:4040 +#: sequencer.c:4035 msgid "merge: Unable to write new index file" msgstr "合併：無法寫入新索引檔案" -#: sequencer.c:4121 +#: sequencer.c:4116 msgid "Cannot autostash" msgstr "無法 autostash" -#: sequencer.c:4124 +#: sequencer.c:4119 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的 stash 回應：'%s'" -#: sequencer.c:4130 +#: sequencer.c:4125 #, c-format msgid "Could not create directory for '%s'" msgstr "不能為 '%s' 建立目錄" -#: sequencer.c:4133 +#: sequencer.c:4128 #, c-format msgid "Created autostash: %s\n" msgstr "建立了 autostash：%s\n" -#: sequencer.c:4137 +#: sequencer.c:4132 msgid "could not reset --hard" msgstr "無法 reset --hard" -#: sequencer.c:4162 +#: sequencer.c:4157 #, c-format msgid "Applied autostash.\n" msgstr "已套用 autostash。\n" -#: sequencer.c:4174 +#: sequencer.c:4169 #, c-format msgid "cannot store %s" msgstr "不能儲存 %s" -#: sequencer.c:4177 +#: sequencer.c:4172 #, c-format msgid "" "%s\n" @@ -8234,29 +8177,29 @@ msgstr "" "您的修改安全地儲存在儲藏區中。\n" "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:4182 +#: sequencer.c:4177 msgid "Applying autostash resulted in conflicts." msgstr "因套用自動儲藏而導致衝突。" -#: sequencer.c:4183 +#: sequencer.c:4178 msgid "Autostash exists; creating a new stash entry." msgstr "已有自動儲藏；建立新儲藏項目。" -#: sequencer.c:4255 +#: sequencer.c:4252 msgid "could not detach HEAD" msgstr "不能分離開頭指標" -#: sequencer.c:4270 +#: sequencer.c:4267 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:4272 +#: sequencer.c:4269 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:4304 +#: sequencer.c:4301 #, c-format msgid "" "Could not execute the todo command\n" @@ -8276,58 +8219,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4350 +#: sequencer.c:4347 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "正在重定基底 (%d/%d)%s" -#: sequencer.c:4396 +#: sequencer.c:4393 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:4466 +#: sequencer.c:4463 #, c-format msgid "unknown command %d" msgstr "未知指令 %d" -#: sequencer.c:4514 +#: sequencer.c:4511 msgid "could not read orig-head" msgstr "不能讀取 orig-head" -#: sequencer.c:4519 +#: sequencer.c:4516 msgid "could not read 'onto'" msgstr "不能讀取 'onto'" -#: sequencer.c:4533 +#: sequencer.c:4530 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 為 %s" -#: sequencer.c:4593 +#: sequencer.c:4590 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "成功重定基底並更新 %s。\n" -#: sequencer.c:4645 +#: sequencer.c:4642 msgid "cannot rebase: You have unstaged changes." msgstr "不能重定基底：您有未暫存的變更。" -#: sequencer.c:4654 +#: sequencer.c:4651 msgid "cannot amend non-existing commit" msgstr "不能修補不存在的提交" -#: sequencer.c:4656 +#: sequencer.c:4653 #, c-format msgid "invalid file: '%s'" msgstr "無效檔案：'%s'" -#: sequencer.c:4658 +#: sequencer.c:4655 #, c-format msgid "invalid contents: '%s'" msgstr "無效內容：'%s'" -#: sequencer.c:4661 +#: sequencer.c:4658 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8336,68 +8279,68 @@ msgstr "" "\n" "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" -#: sequencer.c:4697 sequencer.c:4736 +#: sequencer.c:4694 sequencer.c:4733 #, c-format msgid "could not write file: '%s'" msgstr "不能寫入檔案：'%s'" -#: sequencer.c:4752 +#: sequencer.c:4749 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能刪除 CHERRY_PICK_HEAD" -#: sequencer.c:4762 +#: sequencer.c:4759 msgid "could not commit staged changes." msgstr "不能提交暫存的修改。" -#: sequencer.c:4882 +#: sequencer.c:4879 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能揀選一個%s" -#: sequencer.c:4886 +#: sequencer.c:4883 #, c-format msgid "%s: bad revision" msgstr "%s：錯誤的版本" -#: sequencer.c:4921 +#: sequencer.c:4918 msgid "can't revert as initial commit" msgstr "不能作為初始提交還原提交" -#: sequencer.c:5192 sequencer.c:5421 +#: sequencer.c:5189 sequencer.c:5418 #, c-format msgid "skipped previously applied commit %s" msgstr "已略過先前套用的 %s 提交" -#: sequencer.c:5262 sequencer.c:5437 +#: sequencer.c:5259 sequencer.c:5434 msgid "use --reapply-cherry-picks to include skipped commits" msgstr "使用 --reapply-cherry-picks 以包含略過提交" -#: sequencer.c:5408 +#: sequencer.c:5405 msgid "make_script: unhandled options" msgstr "make_script：有未能處理的選項" -#: sequencer.c:5411 +#: sequencer.c:5408 msgid "make_script: error preparing revisions" msgstr "make_script：準備版本時錯誤" -#: sequencer.c:5669 sequencer.c:5686 +#: sequencer.c:5666 sequencer.c:5683 msgid "nothing to do" msgstr "無事可做" -#: sequencer.c:5705 +#: sequencer.c:5702 msgid "could not skip unnecessary pick commands" msgstr "無法略過不必要的揀選" -#: sequencer.c:5805 +#: sequencer.c:5802 msgid "the script was already rearranged." msgstr "腳本已經重新編排。" -#: setup.c:133 +#: setup.c:134 #, c-format msgid "'%s' is outside repository at '%s'" msgstr "'%s' 在位於 '%s' 的版本庫之外" -#: setup.c:185 +#: setup.c:186 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -8406,7 +8349,7 @@ msgstr "" "%s：工作區中無此路徑。\n" "使用指令 'git <命令> -- <路徑>...' 來指定本機不存在的路徑。" -#: setup.c:198 +#: setup.c:199 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -8417,12 +8360,12 @@ msgstr "" "使用 '--' 來分隔版本和路徑，例如：\n" "'git <命令> [<版本>...] -- [<檔案>...]'" -#: setup.c:264 +#: setup.c:265 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "選項 '%s' 必須在其他非選項參數之前" -#: setup.c:283 +#: setup.c:284 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -8433,98 +8376,98 @@ msgstr "" "使用 '--' 來分隔版本和路徑，例如：\n" "'git <命令> [<版本>...] -- [<檔案>...]'" -#: setup.c:419 +#: setup.c:420 msgid "unable to set up work tree using invalid config" msgstr "無法使用無效設定來建立工作區" -#: setup.c:423 builtin/rev-parse.c:895 +#: setup.c:424 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "該動作必須在一個工作區中執行" -#: setup.c:658 +#: setup.c:722 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 版本庫版本 <= %d，卻得到 %d" -#: setup.c:666 +#: setup.c:730 msgid "unknown repository extension found:" msgid_plural "unknown repository extensions found:" msgstr[0] "找到未知的儲存庫擴充元件：" -#: setup.c:680 +#: setup.c:744 msgid "repo version is 0, but v1-only extension found:" msgid_plural "repo version is 0, but v1-only extensions found:" msgstr[0] "repo 版本是 0 (v0)，但找到只支援 v1 的擴充元件：" -#: setup.c:701 +#: setup.c:765 #, c-format msgid "error opening '%s'" msgstr "開啟 '%s' 發生錯誤" -#: setup.c:703 +#: setup.c:767 #, c-format msgid "too large to be a .git file: '%s'" msgstr "檔案太大，無法作為 .git 檔案：'%s'" -#: setup.c:705 +#: setup.c:769 #, c-format msgid "error reading %s" msgstr "讀取 %s 發生錯誤" -#: setup.c:707 +#: setup.c:771 #, c-format msgid "invalid gitfile format: %s" msgstr "無效的 gitfile 格式：%s" -#: setup.c:709 +#: setup.c:773 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中沒有路徑：%s" -#: setup.c:711 +#: setup.c:775 #, c-format msgid "not a git repository: %s" msgstr "不是一個 git 版本庫：%s" -#: setup.c:813 +#: setup.c:877 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:827 +#: setup.c:891 #, c-format msgid "not a git repository: '%s'" msgstr "不是一個 git 版本庫：'%s'" -#: setup.c:856 setup.c:858 setup.c:889 +#: setup.c:920 setup.c:922 setup.c:953 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切換目錄到 '%s'" -#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 +#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038 msgid "cannot come back to cwd" msgstr "無法返回目前工作目錄" -#: setup.c:988 +#: setup.c:1052 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "取得 '%*s%s%s' 狀態（stat）失敗" -#: setup.c:1231 +#: setup.c:1295 msgid "Unable to read current working directory" msgstr "不能讀取目前工作目錄" -#: setup.c:1240 setup.c:1246 +#: setup.c:1304 setup.c:1310 #, c-format msgid "cannot change to '%s'" msgstr "不能切換到 '%s'" -#: setup.c:1251 +#: setup.c:1315 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "不是一個 git 版本庫（或者任何父目錄）：%s" -#: setup.c:1257 +#: setup.c:1321 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -8533,7 +8476,7 @@ msgstr "" "不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n" "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1381 +#: setup.c:1446 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8542,15 +8485,15 @@ msgstr "" "參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n" "檔案所有者必須始終擁有讀寫權限。" -#: setup.c:1443 +#: setup.c:1508 msgid "fork failed" msgstr "fork 失敗" -#: setup.c:1448 +#: setup.c:1513 msgid "setsid failed" msgstr "setsid 失敗" -#: sparse-index.c:273 +#: sparse-index.c:289 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）" @@ -8605,13 +8548,13 @@ msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u 位元組/秒" -#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739 +#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765 #: builtin/rebase.c:650 #, c-format msgid "could not open '%s' for writing" msgstr "無法開啟 '%s' 進行寫入" -#: strbuf.c:1183 +#: strbuf.c:1195 #, c-format msgid "could not edit '%s'" msgstr "無法編輯 '%s'" @@ -8697,7 +8640,7 @@ msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1 msgid "process for submodule '%s' failed" msgstr "處理 '%s' 子模組失敗" -#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713 +#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714 msgid "Failed to resolve HEAD as a valid ref." msgstr "無法將 HEAD 解析為有效引用。" @@ -8940,7 +8883,7 @@ msgstr "協定不支援設定遠端服務路徑" msgid "invalid remote service path" msgstr "無效的遠端服務路徑" -#: transport-helper.c:661 transport.c:1475 +#: transport-helper.c:661 transport.c:1474 msgid "operation not supported by protocol" msgstr "協定不支援該動作" @@ -9159,7 +9102,7 @@ msgstr "" msgid "Aborting." msgstr "正在終止。" -#: transport.c:1344 +#: transport.c:1343 msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模組" @@ -9179,7 +9122,7 @@ msgstr "樹狀物件條目中空的檔案名" msgid "too-short tree file" msgstr "太短的樹檔案" -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9188,7 +9131,7 @@ msgstr "" "您對下列檔案的本機修改將被簽出動作覆蓋：\n" "%%s請在切換分支前提交或儲藏您的修改。" -#: unpack-trees.c:117 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9197,7 +9140,7 @@ msgstr "" "您對下列檔案的本機修改將被簽出動作覆蓋：\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9206,7 +9149,7 @@ msgstr "" "您對下列檔案的本機修改將被合併動作覆蓋：\n" "%%s請在合併前提交或儲藏您的修改。" -#: unpack-trees.c:122 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9215,7 +9158,7 @@ msgstr "" "您對下列檔案的本機修改將被合併動作覆蓋：\n" "%%s" -#: unpack-trees.c:125 +#: unpack-trees.c:128 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9224,7 +9167,7 @@ msgstr "" "您對下列檔案的本機修改將被 %s 覆蓋：\n" "%%s請在 %s 之前提交或儲藏您的修改。" -#: unpack-trees.c:127 +#: unpack-trees.c:130 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9233,7 +9176,7 @@ msgstr "" "您對下列檔案的本機修改將被 %s 覆蓋：\n" "%%s" -#: unpack-trees.c:132 +#: unpack-trees.c:135 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -9242,7 +9185,16 @@ msgstr "" "更新如下目錄將會遺失其中未追蹤的檔案：\n" "%s" -#: unpack-trees.c:136 +#: unpack-trees.c:138 +#, c-format +msgid "" +"Refusing to remove the current working directory:\n" +"%s" +msgstr "" +"拒絕移除目前工作目錄：\n" +"%s" + +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9251,7 +9203,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" "%%s請在切換分支之前移動或刪除。" -#: unpack-trees.c:138 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9260,7 +9212,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9269,7 +9221,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n" "%%s請在合併前移動或刪除。" -#: unpack-trees.c:143 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9278,7 +9230,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n" "%%s" -#: unpack-trees.c:146 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9287,7 +9239,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n" "%%s請在 %s 前移動或刪除。" -#: unpack-trees.c:148 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9296,7 +9248,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9306,7 +9258,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" "%%s請在切換分支前移動或刪除。" -#: unpack-trees.c:156 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9316,7 +9268,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:165 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9325,7 +9277,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n" "%%s請在合併前移動或刪除。" -#: unpack-trees.c:161 +#: unpack-trees.c:167 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9334,7 +9286,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n" "%%s" -#: unpack-trees.c:164 +#: unpack-trees.c:170 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9343,7 +9295,7 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n" "%%s請在 %s 前移動或刪除。" -#: unpack-trees.c:166 +#: unpack-trees.c:172 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9352,12 +9304,12 @@ msgstr "" "工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n" "%%s" -#: unpack-trees.c:174 +#: unpack-trees.c:180 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "條目 '%s' 和 '%s' 重疊。無法合併。" -#: unpack-trees.c:177 +#: unpack-trees.c:183 #, c-format msgid "" "Cannot update submodule:\n" @@ -9366,7 +9318,7 @@ msgstr "" "無法更新子模組：\n" "%s" -#: unpack-trees.c:180 +#: unpack-trees.c:186 #, c-format msgid "" "The following paths are not up to date and were left despite sparse " @@ -9376,7 +9328,7 @@ msgstr "" "即使有稀疏簽出樣板，以下路徑不是最新且保留下來：\n" "%s" -#: unpack-trees.c:182 +#: unpack-trees.c:188 #, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" @@ -9385,7 +9337,7 @@ msgstr "" "即使有稀疏簽出樣板，以下路徑未合併且保留下來：\n" "%s" -#: unpack-trees.c:184 +#: unpack-trees.c:190 #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " @@ -9395,23 +9347,23 @@ msgstr "" "即使有稀疏簽出樣板，以下路徑已經存在而因此未更新：\n" "%s" -#: unpack-trees.c:264 +#: unpack-trees.c:270 #, c-format msgid "Aborting\n" msgstr "正在終止\n" -#: unpack-trees.c:291 +#: unpack-trees.c:297 #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " "reapply`.\n" msgstr "修正以上路徑後，您可能想要執行「git sparse-checkout reapply」。\n" -#: unpack-trees.c:352 +#: unpack-trees.c:358 msgid "Updating files" msgstr "正在更新檔案" -#: unpack-trees.c:384 +#: unpack-trees.c:390 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -9420,16 +9372,16 @@ msgstr "" "以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n" "並且碰撞組中只有一個檔案存在工作區中：\n" -#: unpack-trees.c:1620 +#: unpack-trees.c:1636 msgid "Updating index flags" msgstr "正在更新索引旗標" -#: unpack-trees.c:2772 +#: unpack-trees.c:2803 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "工作區和未追蹤提交有重複項目：%s" -#: upload-pack.c:1561 +#: upload-pack.c:1565 msgid "expected flush after fetch arguments" msgstr "在 fetch 引數應為一個 flush 包" @@ -9466,99 +9418,99 @@ msgstr "無效的 '..' 路徑區塊" msgid "Fetching objects" msgstr "正在抓取物件" -#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156 +#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156 #, c-format msgid "failed to read '%s'" msgstr "讀取 '%s' 失敗" -#: worktree.c:303 +#: worktree.c:305 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作區的 '%s' 不是版本庫目錄" -#: worktree.c:314 +#: worktree.c:316 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "檔案 '%s' 不包含工作區的絕對路徑" -#: worktree.c:326 +#: worktree.c:328 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:332 +#: worktree.c:334 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d" -#: worktree.c:341 +#: worktree.c:343 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 沒有指回到 '%s'" -#: worktree.c:603 +#: worktree.c:604 msgid "not a directory" msgstr "不是目錄" -#: worktree.c:612 +#: worktree.c:613 msgid ".git is not a file" msgstr ".git 不是檔案" -#: worktree.c:614 +#: worktree.c:615 msgid ".git file broken" msgstr ".git 檔案損毀" -#: worktree.c:616 +#: worktree.c:617 msgid ".git file incorrect" msgstr ".git 檔案不正確" -#: worktree.c:722 +#: worktree.c:723 msgid "not a valid path" msgstr "非有效路徑" -#: worktree.c:728 +#: worktree.c:729 msgid "unable to locate repository; .git is not a file" msgstr "無法定位版本庫；.git 不是檔案" -#: worktree.c:732 +#: worktree.c:733 msgid "unable to locate repository; .git file does not reference a repository" msgstr "無法定位版本庫：.git 檔案未指向版本庫" -#: worktree.c:736 +#: worktree.c:737 msgid "unable to locate repository; .git file broken" msgstr "無法定位版本庫；.git 檔案損壞" -#: worktree.c:742 +#: worktree.c:743 msgid "gitdir unreadable" msgstr "無法讀取 gitdir" -#: worktree.c:746 +#: worktree.c:747 msgid "gitdir incorrect" msgstr "不正確的 gitdir" -#: worktree.c:771 +#: worktree.c:772 msgid "not a valid directory" msgstr "非有效目錄" -#: worktree.c:777 +#: worktree.c:778 msgid "gitdir file does not exist" msgstr "找不到 gitdir 檔案" -#: worktree.c:782 worktree.c:791 +#: worktree.c:783 worktree.c:792 #, c-format msgid "unable to read gitdir file (%s)" msgstr "無法讀取 gitdir 檔案 (%s)" -#: worktree.c:801 +#: worktree.c:802 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "讀取過短（預期有 %<PRIuMAX> 位元組，只讀到 %<PRIuMAX>）" -#: worktree.c:809 +#: worktree.c:810 msgid "invalid gitdir file" msgstr "gitdir 檔案無效" -#: worktree.c:817 +#: worktree.c:818 msgid "gitdir file points to non-existent location" msgstr "gitdir 檔案指向的位置不存在" @@ -9621,11 +9573,11 @@ msgstr " （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <檔案>...\" 標記解決方案）" -#: wt-status.c:211 wt-status.c:1125 +#: wt-status.c:211 wt-status.c:1131 msgid "Changes to be committed:" msgstr "要提交的變更：" -#: wt-status.c:234 wt-status.c:1134 +#: wt-status.c:234 wt-status.c:1140 msgid "Changes not staged for commit:" msgstr "尚未暫存以備提交的變更：" @@ -9731,21 +9683,21 @@ msgstr "修改的內容, " msgid "untracked content, " msgstr "未追蹤的內容, " -#: wt-status.c:958 +#: wt-status.c:964 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "您的儲藏區目前有 %d 條紀錄" -#: wt-status.c:989 +#: wt-status.c:995 msgid "Submodules changed but not updated:" msgstr "子模組已修改但尚未更新：" -#: wt-status.c:991 +#: wt-status.c:997 msgid "Submodule changes to be committed:" msgstr "要提交的子模組變更：" -#: wt-status.c:1073 +#: wt-status.c:1079 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9753,7 +9705,7 @@ msgstr "" "不要改動或刪除上面的一行。\n" "其下所有內容都將被忽略。" -#: wt-status.c:1165 +#: wt-status.c:1171 #, c-format msgid "" "\n" @@ -9764,282 +9716,288 @@ msgstr "" "花了 %.2f 秒才計算出分支的領先/落後範圍。\n" "為避免，您可以使用 '--no-ahead-behind'。\n" -#: wt-status.c:1195 +#: wt-status.c:1201 msgid "You have unmerged paths." msgstr "您有尚未合併的路徑。" # 譯者：請維持前導空格 -#: wt-status.c:1198 +#: wt-status.c:1204 msgid " (fix conflicts and run \"git commit\")" msgstr " （解決衝突並執行 \"git commit\"）" # 譯者：請維持前導空格 -#: wt-status.c:1200 +#: wt-status.c:1206 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 終止合併）" -#: wt-status.c:1204 +#: wt-status.c:1210 msgid "All conflicts fixed but you are still merging." msgstr "所有衝突已解決但您仍處於合併中。" # 譯者：請維持前導空格 -#: wt-status.c:1207 +#: wt-status.c:1213 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 結束合併）" -#: wt-status.c:1216 +#: wt-status.c:1224 msgid "You are in the middle of an am session." msgstr "您正處於 am 動作過程中。" -#: wt-status.c:1219 +#: wt-status.c:1227 msgid "The current patch is empty." msgstr "目前的修補檔為空。" # 譯者：請維持前導空格 -#: wt-status.c:1223 +#: wt-status.c:1232 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解決衝突，然後執行 \"git am --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1225 +#: wt-status.c:1234 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1227 +#: wt-status.c:1237 +msgid "" +" (use \"git am --allow-empty\" to record this patch as an empty commit)" +msgstr " （使用 \"git am --allow-empty\" 將目前修補檔錄製為空白提交）" + +# 譯者：請維持前導空格 +#: wt-status.c:1239 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 復原原有分支）" -#: wt-status.c:1360 +#: wt-status.c:1372 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 遺失。" -#: wt-status.c:1362 +#: wt-status.c:1374 msgid "No commands done." msgstr "沒有指令被執行。" -#: wt-status.c:1365 +#: wt-status.c:1377 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最後一條指令已完成（%d 條指令被執行）：" -#: wt-status.c:1376 +#: wt-status.c:1388 #, c-format msgid " (see more in file %s)" msgstr " （更多參見檔案 %s）" -#: wt-status.c:1381 +#: wt-status.c:1393 msgid "No commands remaining." msgstr "未剩下任何指令。" -#: wt-status.c:1384 +#: wt-status.c:1396 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "接下來要執行的指令（剩餘 %d 條指令）：" # 譯者：請維持前導空格 -#: wt-status.c:1392 +#: wt-status.c:1404 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 來檢視和編輯）" -#: wt-status.c:1404 +#: wt-status.c:1416 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。" -#: wt-status.c:1409 +#: wt-status.c:1421 msgid "You are currently rebasing." msgstr "您在執行重定基底動作。" # 譯者：請維持前導空格 -#: wt-status.c:1422 +#: wt-status.c:1434 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解決衝突，然後執行 \"git rebase --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1424 +#: wt-status.c:1436 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1426 +#: wt-status.c:1438 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以簽出原有分支）" # 譯者：請維持前導空格 -#: wt-status.c:1433 +#: wt-status.c:1445 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有衝突已解決：執行 \"git rebase --continue\"）" -#: wt-status.c:1437 +#: wt-status.c:1449 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。" -#: wt-status.c:1442 +#: wt-status.c:1454 msgid "You are currently splitting a commit during a rebase." msgstr "您在執行重定基底動作時分割提交。" # 譯者：請維持前導空格 -#: wt-status.c:1445 +#: wt-status.c:1457 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目錄提交乾淨後，執行 \"git rebase --continue\"）" -#: wt-status.c:1449 +#: wt-status.c:1461 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。" -#: wt-status.c:1454 +#: wt-status.c:1466 msgid "You are currently editing a commit during a rebase." msgstr "您在執行重定基底動作時編輯提交。" # 譯者：請維持前導空格 -#: wt-status.c:1457 +#: wt-status.c:1469 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修補目前提交）" # 譯者：請維持前導空格 -#: wt-status.c:1459 +#: wt-status.c:1471 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （當您對您的修改滿意後執行 \"git rebase --continue\"）" -#: wt-status.c:1470 +#: wt-status.c:1482 msgid "Cherry-pick currently in progress." msgstr "揀選動作正在進行中。" -#: wt-status.c:1473 +#: wt-status.c:1485 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在執行揀選提交 %s 的動作。" # 譯者：請維持前導空格 -#: wt-status.c:1480 +#: wt-status.c:1492 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解決衝突並執行 \"git cherry-pick --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1483 +#: wt-status.c:1495 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " （執行 \"git cherry-pick --continue\" 以繼續）" # 譯者：請維持前導空格 -#: wt-status.c:1486 +#: wt-status.c:1498 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有衝突已解決：執行 \"git cherry-pick --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1488 +#: wt-status.c:1500 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " （使用 \"git cherry-pick --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1490 +#: wt-status.c:1502 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消揀選動作）" -#: wt-status.c:1500 +#: wt-status.c:1512 msgid "Revert currently in progress." msgstr "還原動作正在進行中。" -#: wt-status.c:1503 +#: wt-status.c:1515 #, c-format msgid "You are currently reverting commit %s." msgstr "您在執行反轉提交 %s 的動作。" # 譯者：請維持前導空格 -#: wt-status.c:1509 +#: wt-status.c:1521 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解決衝突並執行 \"git revert --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1512 +#: wt-status.c:1524 msgid " (run \"git revert --continue\" to continue)" msgstr " （執行 \"git revert --continue\" 以繼續）" # 譯者：請維持前導空格 -#: wt-status.c:1515 +#: wt-status.c:1527 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有衝突已解決：執行 \"git revert --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1517 +#: wt-status.c:1529 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " （使用 \"git revert --skip\" 略過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1519 +#: wt-status.c:1531 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反轉提交動作）" -#: wt-status.c:1529 +#: wt-status.c:1541 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在執行從分支 '%s' 開始的二分搜尋動作。" -#: wt-status.c:1533 +#: wt-status.c:1545 msgid "You are currently bisecting." msgstr "您在執行二分搜尋動作。" # 譯者：請維持前導空格 -#: wt-status.c:1536 +#: wt-status.c:1548 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 簽出原有分支）" -#: wt-status.c:1547 +#: wt-status.c:1559 msgid "You are in a sparse checkout." msgstr "您正在稀疏簽出的工作區中。" -#: wt-status.c:1550 +#: wt-status.c:1562 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "您處於稀疏簽出狀態，包含 %d%% 的追蹤檔案。" -#: wt-status.c:1794 +#: wt-status.c:1806 msgid "On branch " msgstr "位於分支 " -#: wt-status.c:1801 +#: wt-status.c:1813 msgid "interactive rebase in progress; onto " msgstr "互動式重定基底動作正在進行中；至 " -#: wt-status.c:1803 +#: wt-status.c:1815 msgid "rebase in progress; onto " msgstr "重定基底動作正在進行中；至 " -#: wt-status.c:1808 +#: wt-status.c:1820 msgid "HEAD detached at " msgstr "開頭指標分離於 " -#: wt-status.c:1810 +#: wt-status.c:1822 msgid "HEAD detached from " msgstr "開頭指標分離自 " -#: wt-status.c:1813 +#: wt-status.c:1825 msgid "Not currently on any branch." msgstr "目前不在任何分支上。" -#: wt-status.c:1830 +#: wt-status.c:1842 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1831 +#: wt-status.c:1843 msgid "No commits yet" msgstr "尚無提交" -#: wt-status.c:1845 +#: wt-status.c:1857 msgid "Untracked files" msgstr "未追蹤的檔案" -#: wt-status.c:1847 +#: wt-status.c:1859 msgid "Ignored files" msgstr "忽略的檔案" -#: wt-status.c:1851 +#: wt-status.c:1863 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -10049,115 +10007,115 @@ msgstr "" "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n" "但您需要小心不要忘了新增新檔案（參見 'git help status'）。" -#: wt-status.c:1857 +#: wt-status.c:1869 #, c-format msgid "Untracked files not listed%s" msgstr "未追蹤的檔案沒有列出%s" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1859 +#: wt-status.c:1871 msgid " (use -u option to show untracked files)" msgstr " （使用 -u 參數顯示未追蹤的檔案）" -#: wt-status.c:1865 +#: wt-status.c:1877 msgid "No changes" msgstr "沒有修改" -#: wt-status.c:1870 +#: wt-status.c:1882 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1874 +#: wt-status.c:1886 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1878 +#: wt-status.c:1890 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n" -#: wt-status.c:1882 +#: wt-status.c:1894 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交為空，但是存在尚未追蹤的檔案\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1886 +#: wt-status.c:1898 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n" -#: wt-status.c:1890 wt-status.c:1896 +#: wt-status.c:1902 wt-status.c:1908 #, c-format msgid "nothing to commit\n" msgstr "無檔案要提交\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1893 +#: wt-status.c:1905 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1898 +#: wt-status.c:1910 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "沒有要提交的檔案，工作區為乾淨狀態\n" -#: wt-status.c:2003 +#: wt-status.c:2015 msgid "No commits yet on " msgstr "尚無提交在 " -#: wt-status.c:2007 +#: wt-status.c:2019 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:2038 +#: wt-status.c:2050 msgid "different" msgstr "不同" # 譯者：請維持句尾空格 -#: wt-status.c:2040 wt-status.c:2048 +#: wt-status.c:2052 wt-status.c:2060 msgid "behind " msgstr "落後 " -#: wt-status.c:2043 wt-status.c:2046 +#: wt-status.c:2055 wt-status.c:2058 msgid "ahead " msgstr "領先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2569 +#: wt-status.c:2596 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暫存的變更。" -#: wt-status.c:2575 +#: wt-status.c:2602 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的變更。" -#: wt-status.c:2577 +#: wt-status.c:2604 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的變更。" -#: compat/simple-ipc/ipc-unix-socket.c:183 +#: compat/simple-ipc/ipc-unix-socket.c:205 msgid "could not send IPC command" msgstr "無法傳送 IPC 命令" -#: compat/simple-ipc/ipc-unix-socket.c:190 +#: compat/simple-ipc/ipc-unix-socket.c:212 msgid "could not read IPC response" msgstr "無法讀取 IPC 回應" -#: compat/simple-ipc/ipc-unix-socket.c:870 +#: compat/simple-ipc/ipc-unix-socket.c:892 #, c-format msgid "could not start accept_thread '%s'" msgstr "無法啟動 accept_thread “%s”" -#: compat/simple-ipc/ipc-unix-socket.c:882 +#: compat/simple-ipc/ipc-unix-socket.c:904 #, c-format msgid "could not start worker[0] for '%s'" msgstr "無法啟動「%s」的 worker[0]" @@ -10194,107 +10152,113 @@ msgstr "刪除 '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "重新整理索引之後尚未被暫存的變更：" -#: builtin/add.c:317 builtin/rev-parse.c:993 +#: builtin/add.c:313 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "不能讀取索引" -#: builtin/add.c:330 +#: builtin/add.c:326 msgid "Could not write patch" msgstr "不能生成修補檔" -#: builtin/add.c:333 +#: builtin/add.c:329 msgid "editing patch failed" msgstr "編輯修補檔失敗" -#: builtin/add.c:336 +#: builtin/add.c:332 #, c-format msgid "Could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: builtin/add.c:338 +#: builtin/add.c:334 msgid "Empty patch. Aborted." msgstr "空修補檔。異常終止。" -#: builtin/add.c:343 +#: builtin/add.c:340 #, c-format msgid "Could not apply '%s'" msgstr "不能套用 '%s'" -#: builtin/add.c:351 +#: builtin/add.c:348 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n" -#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194 msgid "dry run" msgstr "測試執行" -#: builtin/add.c:374 +#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484 +#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313 +#: builtin/mv.c:123 builtin/read-tree.c:120 +msgid "be verbose" +msgstr "詳細輸出" + +#: builtin/add.c:371 msgid "interactive picking" msgstr "互動式揀選" -#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314 +#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409 msgid "select hunks interactively" msgstr "互動式挑選資料區塊" -#: builtin/add.c:376 +#: builtin/add.c:373 msgid "edit current diff and apply" msgstr "編輯目前差異並套用" -#: builtin/add.c:377 +#: builtin/add.c:374 msgid "allow adding otherwise ignored files" msgstr "允許新增忽略的檔案" -#: builtin/add.c:378 +#: builtin/add.c:375 msgid "update tracked files" msgstr "更新已追蹤的檔案" -#: builtin/add.c:379 +#: builtin/add.c:376 msgid "renormalize EOL of tracked files (implies -u)" msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號" -#: builtin/add.c:380 +#: builtin/add.c:377 msgid "record only the fact that the path will be added later" msgstr "只記錄，該路徑稍後再新增" -#: builtin/add.c:381 +#: builtin/add.c:378 msgid "add changes from all tracked and untracked files" msgstr "新增所有改變的已追蹤檔案和未追蹤檔案" -#: builtin/add.c:384 +#: builtin/add.c:381 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作區中移除的路徑（和 --no-all 相同）" -#: builtin/add.c:386 +#: builtin/add.c:383 msgid "don't add, only refresh the index" msgstr "不新增，只重新整理索引" -#: builtin/add.c:387 +#: builtin/add.c:384 msgid "just skip files which cannot be added because of errors" msgstr "略過因發生錯誤不能新增的檔案" -#: builtin/add.c:388 +#: builtin/add.c:385 msgid "check if - even missing - files are ignored in dry run" msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略" -#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251 +#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251 msgid "allow updating entries outside of the sparse-checkout cone" msgstr "允許更新稀疏簽出 cone 外的項目" -#: builtin/add.c:391 builtin/update-index.c:1004 +#: builtin/add.c:388 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "覆蓋列表裡檔案的可執行位" -#: builtin/add.c:393 +#: builtin/add.c:390 msgid "warn when adding an embedded repository" msgstr "建立一個嵌入式版本庫時給予警告" -#: builtin/add.c:395 +#: builtin/add.c:392 msgid "backend for `git stash -p`" msgstr "`git stash -p` 的後端" -#: builtin/add.c:413 +#: builtin/add.c:410 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10323,12 +10287,12 @@ msgstr "" "\n" "參見 \"git help submodule\" 取得更多訊息。" -#: builtin/add.c:442 +#: builtin/add.c:439 #, c-format msgid "adding embedded git repository: %s" msgstr "正在新增嵌入式 git 版本庫：%s" -#: builtin/add.c:462 +#: builtin/add.c:459 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10338,51 +10302,27 @@ msgstr "" "如要關閉此訊息，請執行\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:477 +#: builtin/add.c:474 msgid "adding files failed" msgstr "新增檔案失敗" -#: builtin/add.c:513 -msgid "--dry-run is incompatible with --interactive/--patch" -msgstr "--dry-run 和 --interactive/--patch 不相容" - -#: builtin/add.c:515 builtin/commit.c:358 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file 與 --interactive/--patch 不相容" - -#: builtin/add.c:532 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file 與 --edit 不相容" - -#: builtin/add.c:544 -msgid "-A and -u are mutually incompatible" -msgstr "-A 和 -u 選項互斥" - -#: builtin/add.c:547 -msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用" - -#: builtin/add.c:551 +#: builtin/add.c:548 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x" -#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364 -#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容" - -#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370 -#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul 需要 --pathspec-from-file" +#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364 +#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713 +#, c-format +msgid "'%s' and pathspec arguments cannot be used together" +msgstr "「%s」和路徑規格引數不得同時使用" -#: builtin/add.c:583 +#: builtin/add.c:580 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "沒有指定檔案，也沒有檔案被新增。\n" -#: builtin/add.c:585 +#: builtin/add.c:582 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10392,105 +10332,111 @@ msgstr "" "如要關閉此訊息，請執行\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:366 +#: builtin/am.c:202 +#, c-format +msgid "Invalid value for --empty: %s" +msgstr "傳入 --empty 的值無效：%s" + +#: builtin/am.c:392 msgid "could not parse author script" msgstr "不能解析作者腳本" -#: builtin/am.c:456 +#: builtin/am.c:482 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 掛鉤刪除" -#: builtin/am.c:498 +#: builtin/am.c:524 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的輸入行：'%s'。" -#: builtin/am.c:536 +#: builtin/am.c:562 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "從 '%s' 複製註解到 '%s' 時失敗" -#: builtin/am.c:562 +#: builtin/am.c:588 msgid "fseek failed" msgstr "fseek 失敗" -#: builtin/am.c:750 +#: builtin/am.c:776 #, c-format msgid "could not parse patch '%s'" msgstr "無法解析修補檔 '%s'" -#: builtin/am.c:815 +#: builtin/am.c:841 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一個 StGIT 修補檔佇列被套用" -#: builtin/am.c:863 +#: builtin/am.c:889 msgid "invalid timestamp" msgstr "無效的時間戳" -#: builtin/am.c:868 builtin/am.c:880 +#: builtin/am.c:894 builtin/am.c:906 msgid "invalid Date line" msgstr "無效的日期行" -#: builtin/am.c:875 +#: builtin/am.c:901 msgid "invalid timezone offset" msgstr "無效的時區位移值" -#: builtin/am.c:968 +#: builtin/am.c:994 msgid "Patch format detection failed." msgstr "修補檔格式偵測失敗。" -#: builtin/am.c:973 builtin/clone.c:300 +#: builtin/am.c:999 builtin/clone.c:300 #, c-format msgid "failed to create directory '%s'" msgstr "建立目錄 '%s' 失敗" -#: builtin/am.c:978 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "分割修補檔失敗。" -#: builtin/am.c:1127 +#: builtin/am.c:1153 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "當您解決這一問題，執行 \"%s --continue\"。" -#: builtin/am.c:1128 +#: builtin/am.c:1154 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。" -#: builtin/am.c:1129 +#: builtin/am.c:1159 +#, c-format +msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." +msgstr "若要將空白修補檔錄製為空白提交，請執行「%s --allow-empty」。" + +#: builtin/am.c:1161 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。" -#: builtin/am.c:1224 +#: builtin/am.c:1256 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。" -#: builtin/am.c:1252 -msgid "Patch is empty." -msgstr "修補檔為空。" - -#: builtin/am.c:1317 +#: builtin/am.c:1344 #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺少作者行" -#: builtin/am.c:1320 +#: builtin/am.c:1347 #, c-format msgid "invalid ident line: %.*s" msgstr "無效的身份標記：%.*s" -#: builtin/am.c:1539 +#: builtin/am.c:1566 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本庫缺乏必要的資料物件以進行三方合併。" -#: builtin/am.c:1541 +#: builtin/am.c:1568 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..." -#: builtin/am.c:1560 +#: builtin/am.c:1587 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10498,24 +10444,24 @@ msgstr "" "您是否曾手動編輯過您的修補檔？\n" "無法套用修補檔到索引中的資料物件上。" -#: builtin/am.c:1566 +#: builtin/am.c:1593 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基礎版本上修補及進行三方合併..." -#: builtin/am.c:1592 +#: builtin/am.c:1619 msgid "Failed to merge in the changes." msgstr "無法合併變更。" -#: builtin/am.c:1624 +#: builtin/am.c:1651 msgid "applying to an empty history" msgstr "正套用到一個空歷史上" -#: builtin/am.c:1676 builtin/am.c:1680 +#: builtin/am.c:1703 builtin/am.c:1707 #, c-format msgid "cannot resume: %s does not exist." msgstr "無法繼續：%s 不存在。" -#: builtin/am.c:1698 +#: builtin/am.c:1725 msgid "Commit Body is:" msgstr "提交內容為：" @@ -10524,39 +10470,57 @@ msgstr "提交內容為：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1708 +#: builtin/am.c:1735 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]： " -#: builtin/am.c:1754 builtin/commit.c:409 +#: builtin/am.c:1781 builtin/commit.c:409 msgid "unable to write index file" msgstr "無法寫入索引檔案" -#: builtin/am.c:1758 +#: builtin/am.c:1785 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "髒索引：不能套用修補檔（髒檔案：%s）" -#: builtin/am.c:1798 builtin/am.c:1865 +#: builtin/am.c:1827 +#, c-format +msgid "Skipping: %.*s" +msgstr "略過：%.*s" + +#: builtin/am.c:1832 +#, c-format +msgid "Creating an empty commit: %.*s" +msgstr "建立空白提交：%.*s" + +#: builtin/am.c:1836 +msgid "Patch is empty." +msgstr "修補檔為空。" + +#: builtin/am.c:1847 builtin/am.c:1916 #, c-format msgid "Applying: %.*s" msgstr "套用：%.*s" -#: builtin/am.c:1815 +#: builtin/am.c:1864 msgid "No changes -- Patch already applied." msgstr "沒有變更——修補檔已經套用過。" -#: builtin/am.c:1821 +#: builtin/am.c:1870 #, c-format msgid "Patch failed at %s %.*s" msgstr "打修補檔失敗於 %s %.*s" -#: builtin/am.c:1825 +#: builtin/am.c:1874 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔" -#: builtin/am.c:1868 +#: builtin/am.c:1920 +msgid "No changes - recorded it as an empty commit." +msgstr "沒有變更 － 將其錄製為空白提交。" + +#: builtin/am.c:1922 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10566,7 +10530,7 @@ msgstr "" "如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n" "您也許想要略過這個修補檔。" -#: builtin/am.c:1875 +#: builtin/am.c:1930 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10577,175 +10541,183 @@ msgstr "" "您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n" "你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。" -#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353 -#: builtin/reset.c:361 +#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448 +#: builtin/reset.c:456 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析物件 '%s'。" -#: builtin/am.c:2035 builtin/am.c:2111 +#: builtin/am.c:2090 builtin/am.c:2166 msgid "failed to clean index" msgstr "清空索引失敗" -#: builtin/am.c:2079 +#: builtin/am.c:2134 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD" -#: builtin/am.c:2187 +#: builtin/am.c:2242 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "無效的 --patch-format 值：%s" -#: builtin/am.c:2229 +#: builtin/am.c:2285 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "無效的 --show-current-patch 值：%s" -#: builtin/am.c:2233 +#: builtin/am.c:2289 #, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容" +msgid "options '%s=%s' and '%s=%s' cannot be used together" +msgstr "「%s=%s」和「%s=%s」選項不得同時使用" -#: builtin/am.c:2264 +#: builtin/am.c:2320 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2265 +#: builtin/am.c:2321 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<選項>] (--continue | --skip | --abort)" -#: builtin/am.c:2271 +#: builtin/am.c:2327 msgid "run interactively" msgstr "以互動式方式執行" -#: builtin/am.c:2273 +#: builtin/am.c:2329 msgid "historical option -- no-op" msgstr "老的參數 —— 無作用" -#: builtin/am.c:2275 +#: builtin/am.c:2331 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允許使用三方合併" -#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16 -#: builtin/repack.c:640 builtin/stash.c:961 +#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:642 builtin/stash.c:962 msgid "be quiet" msgstr "靜默模式" -#: builtin/am.c:2278 +#: builtin/am.c:2334 msgid "add a Signed-off-by trailer to the commit message" msgstr "在提交說明結尾加入 Signed-off-by" -#: builtin/am.c:2281 +#: builtin/am.c:2337 msgid "recode into utf8 (default)" msgstr "使用 utf8 字元集（預設）" -#: builtin/am.c:2283 +#: builtin/am.c:2339 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -k 參數" -#: builtin/am.c:2285 +#: builtin/am.c:2341 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -b 參數" -#: builtin/am.c:2287 +#: builtin/am.c:2343 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -m 參數" -#: builtin/am.c:2289 +#: builtin/am.c:2345 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數" -#: builtin/am.c:2292 +#: builtin/am.c:2348 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定" -#: builtin/am.c:2295 +#: builtin/am.c:2351 msgid "strip everything before a scissors line" msgstr "捨棄裁切線前的所有內容" -#: builtin/am.c:2297 +#: builtin/am.c:2353 msgid "pass it through git-mailinfo" msgstr "透過 git-mailinfo 傳遞" -#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309 -#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321 -#: builtin/am.c:2327 +#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 +#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 +#: builtin/am.c:2383 msgid "pass it through git-apply" msgstr "傳遞給 git-apply" -#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262 +#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221 -#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655 -#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172 +#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657 +#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175 -#: parse-options.h:315 +#: parse-options.h:317 msgid "n" msgstr "n" -#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109 -#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479 +#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109 +#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479 #: builtin/verify-tag.c:38 msgid "format" msgstr "格式" -#: builtin/am.c:2324 +#: builtin/am.c:2380 msgid "format the patch(es) are in" msgstr "修補檔的格式" -#: builtin/am.c:2330 +#: builtin/am.c:2386 msgid "override error message when patch failure occurs" msgstr "打修補檔失敗時顯示的錯誤訊息" -#: builtin/am.c:2332 +#: builtin/am.c:2388 msgid "continue applying patches after resolving a conflict" msgstr "衝突解決後繼續套用修補檔" -#: builtin/am.c:2335 +#: builtin/am.c:2391 msgid "synonyms for --continue" msgstr "和 --continue 同義" -#: builtin/am.c:2338 +#: builtin/am.c:2394 msgid "skip the current patch" msgstr "略過目前修補檔" -#: builtin/am.c:2341 +#: builtin/am.c:2397 msgid "restore the original branch and abort the patching operation" msgstr "還原原始分支並中止修補動作" -#: builtin/am.c:2344 +#: builtin/am.c:2400 msgid "abort the patching operation but keep HEAD where it is" msgstr "終止修補動作但保持 HEAD 不變" -#: builtin/am.c:2348 +#: builtin/am.c:2404 msgid "show the patch being applied" msgstr "顯示正在套用的修補檔" -#: builtin/am.c:2353 +#: builtin/am.c:2408 +msgid "record the empty patch as an empty commit" +msgstr "將空白修補檔錄製為空白提交" + +#: builtin/am.c:2412 msgid "lie about committer date" msgstr "將作者日期作為提交日期" -#: builtin/am.c:2355 +#: builtin/am.c:2414 msgid "use current timestamp for author date" msgstr "用目前時間作為作者日期" -#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642 -#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099 +#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643 +#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099 #: builtin/revert.c:117 builtin/tag.c:460 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2358 builtin/rebase.c:1100 +#: builtin/am.c:2417 builtin/rebase.c:1100 msgid "GPG-sign commits" msgstr "使用 GPG 簽名提交" -#: builtin/am.c:2361 +#: builtin/am.c:2420 +msgid "how to handle empty patches" +msgstr "空白修補檔的處理方式" + +#: builtin/am.c:2423 msgid "(internal use for git-rebase)" msgstr "（內部使用，用於 git-rebase）" -#: builtin/am.c:2379 +#: builtin/am.c:2441 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10753,16 +10725,16 @@ msgstr "" "參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n" "請不要再使用它了。" -#: builtin/am.c:2386 +#: builtin/am.c:2448 msgid "failed to read the index" msgstr "讀取索引失敗" -#: builtin/am.c:2401 +#: builtin/am.c:2463 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。" -#: builtin/am.c:2425 +#: builtin/am.c:2487 #, c-format msgid "" "Stray %s directory found.\n" @@ -10771,11 +10743,11 @@ msgstr "" "發現了錯誤的 %s 目錄。\n" "使用 \"git am --abort\" 刪除它。" -#: builtin/am.c:2431 +#: builtin/am.c:2493 msgid "Resolve operation not in progress, we are not resuming." msgstr "解決動作未進行，我們不會繼續。" -#: builtin/am.c:2441 +#: builtin/am.c:2503 msgid "interactive mode requires patches on the command line" msgstr "互動式模式需要指令列上提供修補檔" @@ -11228,11 +11200,11 @@ msgstr "不將根提交看作邊界（預設值：off）" msgid "show work cost statistics" msgstr "顯示工作量統計" -#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94 -#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179 -#: builtin/merge.c:298 builtin/multi-pack-index.c:103 -#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178 -#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566 +#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94 +#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180 +#: builtin/merge.c:301 builtin/multi-pack-index.c:103 +#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566 #: builtin/send-pack.c:202 msgid "force progress reporting" msgstr "強制顯示進度報告" @@ -11281,7 +11253,7 @@ msgstr "顯示作者信箱而非名稱（預設值：off）" msgid "ignore whitespace differences" msgstr "忽略空白差異" -#: builtin/blame.c:879 builtin/log.c:1823 +#: builtin/blame.c:879 builtin/log.c:1838 msgid "rev" msgstr "版本" @@ -11295,7 +11267,7 @@ msgstr "忽略 <檔案> 中的修訂版" #: builtin/blame.c:881 msgid "color redundant metadata from previous line differently" -msgstr "使用顏色間隔輸出與前一行不同的重複元訊息" +msgstr "使用顏色間隔輸出與前一行不同的重複中介資料" #: builtin/blame.c:882 msgid "color lines by age" @@ -11333,7 +11305,7 @@ msgstr "range" msgid "process only line range <start>,<end> or function :<funcname>" msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函數" -#: builtin/blame.c:944 +#: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用" @@ -11345,17 +11317,17 @@ msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:995 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "4 年 11 個月前" -#: builtin/blame.c:1111 +#: builtin/blame.c:1114 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "檔案 %s 只有 %lu 行" -#: builtin/blame.c:1156 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "追蹤程式碼行" @@ -11388,7 +11360,7 @@ msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<選項>] [-r | -a] [--format]" # 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長 -#: builtin/branch.c:154 +#: builtin/branch.c:153 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -11398,7 +11370,7 @@ msgstr "" " '%s'，但未合併到 HEAD。" # 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長 -#: builtin/branch.c:158 +#: builtin/branch.c:157 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -11407,12 +11379,12 @@ msgstr "" "並未刪除分支 '%s'， 雖然它已經合併到 HEAD，\n" " 然而卻尚未被合併到分支 '%s' 。" -#: builtin/branch.c:172 +#: builtin/branch.c:171 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "無法查詢 '%s' 指向的提交物件" -#: builtin/branch.c:176 +#: builtin/branch.c:175 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -11421,7 +11393,7 @@ msgstr "" "分支 '%s' 沒有完全合併。\n" "如果您確認要刪除它，執行 'git branch -D %s'。" -#: builtin/branch.c:189 +#: builtin/branch.c:188 msgid "Update of config-file failed" msgstr "更新設定檔案失敗" @@ -11433,99 +11405,99 @@ msgstr "不能將 -a 和 -d 同時使用" msgid "Couldn't look up commit object for HEAD" msgstr "無法查詢 HEAD 指向的提交物件" -#: builtin/branch.c:244 +#: builtin/branch.c:247 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "無法刪除在「%2$s」簽出的「%1$s」分支" -#: builtin/branch.c:259 +#: builtin/branch.c:262 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "未能找到遠端追蹤分支 '%s'。" -#: builtin/branch.c:260 +#: builtin/branch.c:263 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未發現。" -#: builtin/branch.c:291 +#: builtin/branch.c:294 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "已刪除遠端追蹤分支 %s（曾為 %s）。\n" -#: builtin/branch.c:292 +#: builtin/branch.c:295 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已刪除分支 %s（曾為 %s）。\n" -#: builtin/branch.c:441 builtin/tag.c:63 +#: builtin/branch.c:445 builtin/tag.c:63 msgid "unable to parse format string" msgstr "不能解析格式化字串" -#: builtin/branch.c:472 +#: builtin/branch.c:476 msgid "could not resolve HEAD" msgstr "不能解析 HEAD 提交" -#: builtin/branch.c:478 +#: builtin/branch.c:482 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) 指向 refs/heads/ 之外" -#: builtin/branch.c:493 +#: builtin/branch.c:497 #, c-format msgid "Branch %s is being rebased at %s" msgstr "分支 %s 正被重定基底到 %s" -#: builtin/branch.c:497 +#: builtin/branch.c:501 #, c-format msgid "Branch %s is being bisected at %s" msgstr "分支 %s 正被二分搜尋於 %s" -#: builtin/branch.c:514 +#: builtin/branch.c:518 msgid "cannot copy the current branch while not on any." msgstr "無法複製目前分支因為不處於任何分支上。" -#: builtin/branch.c:516 +#: builtin/branch.c:520 msgid "cannot rename the current branch while not on any." msgstr "無法重新命名目前分支因為不處於任何分支上。" -#: builtin/branch.c:527 +#: builtin/branch.c:531 #, c-format msgid "Invalid branch name: '%s'" msgstr "無效的分支名：'%s'" -#: builtin/branch.c:556 +#: builtin/branch.c:560 msgid "Branch rename failed" msgstr "分支重新命名失敗" -#: builtin/branch.c:558 +#: builtin/branch.c:562 msgid "Branch copy failed" msgstr "分支複製失敗" -#: builtin/branch.c:562 +#: builtin/branch.c:566 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "已為錯誤命名的分支 '%s' 建立了一個副本" -#: builtin/branch.c:565 +#: builtin/branch.c:569 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "已將錯誤命名的分支 '%s' 重新命名" -#: builtin/branch.c:571 +#: builtin/branch.c:575 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重新命名為 %s，但 HEAD 沒有更新！" -#: builtin/branch.c:580 +#: builtin/branch.c:584 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重新命名，但更新設定檔案失敗" -#: builtin/branch.c:582 +#: builtin/branch.c:586 msgid "Branch is copied, but update of config-file failed" msgstr "分支已複製，但更新設定檔案失敗" -#: builtin/branch.c:598 +#: builtin/branch.c:602 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11536,209 +11508,205 @@ msgstr "" " %s\n" "以 '%c' 開頭的行將被過濾。\n" -#: builtin/branch.c:632 +#: builtin/branch.c:637 msgid "Generic options" msgstr "通用選項" -#: builtin/branch.c:634 +#: builtin/branch.c:639 msgid "show hash and subject, give twice for upstream branch" msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支" -#: builtin/branch.c:635 +#: builtin/branch.c:640 msgid "suppress informational messages" msgstr "不顯示訊息" -#: builtin/branch.c:636 -msgid "set up tracking mode (see git-pull(1))" -msgstr "設定追蹤模式（參見 git-pull(1)）" +#: builtin/branch.c:642 +msgid "set branch tracking configuration" +msgstr "設定分支追蹤設定" -#: builtin/branch.c:638 +#: builtin/branch.c:645 msgid "do not use" msgstr "不要使用" -#: builtin/branch.c:640 +#: builtin/branch.c:647 msgid "upstream" msgstr "上游" -#: builtin/branch.c:640 +#: builtin/branch.c:647 msgid "change the upstream info" msgstr "改變上游訊息" -#: builtin/branch.c:641 +#: builtin/branch.c:648 msgid "unset the upstream info" msgstr "取消上游資訊設定" -#: builtin/branch.c:642 +#: builtin/branch.c:649 msgid "use colored output" msgstr "使用彩色輸出" -#: builtin/branch.c:643 +#: builtin/branch.c:650 msgid "act on remote-tracking branches" msgstr "作用於遠端追蹤分支" -#: builtin/branch.c:645 builtin/branch.c:647 +#: builtin/branch.c:652 builtin/branch.c:654 msgid "print only branches that contain the commit" msgstr "只列印包含該提交的分支" -#: builtin/branch.c:646 builtin/branch.c:648 +#: builtin/branch.c:653 builtin/branch.c:655 msgid "print only branches that don't contain the commit" msgstr "只列印不包含該提交的分支" -#: builtin/branch.c:651 +#: builtin/branch.c:658 msgid "Specific git-branch actions:" msgstr "具體的 git-branch 動作：" -#: builtin/branch.c:652 +#: builtin/branch.c:659 msgid "list both remote-tracking and local branches" msgstr "列出遠端追蹤及本機分支" -#: builtin/branch.c:654 +#: builtin/branch.c:661 msgid "delete fully merged branch" msgstr "刪除完全合併的分支" -#: builtin/branch.c:655 +#: builtin/branch.c:662 msgid "delete branch (even if not merged)" msgstr "刪除分支（即使沒有合併）" -#: builtin/branch.c:656 +#: builtin/branch.c:663 msgid "move/rename a branch and its reflog" msgstr "移動/重新命名一個分支，以及它的引用日誌" -#: builtin/branch.c:657 +#: builtin/branch.c:664 msgid "move/rename a branch, even if target exists" msgstr "移動/重新命名一個分支，即使目標已存在" -#: builtin/branch.c:658 +#: builtin/branch.c:665 msgid "copy a branch and its reflog" msgstr "複製一個分支和它的引用日誌" -#: builtin/branch.c:659 +#: builtin/branch.c:666 msgid "copy a branch, even if target exists" msgstr "複製一個分支，即使目標已存在" -#: builtin/branch.c:660 +#: builtin/branch.c:667 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:661 +#: builtin/branch.c:668 msgid "show current branch name" msgstr "顯示目前分支名" -#: builtin/branch.c:662 +#: builtin/branch.c:669 msgid "create the branch's reflog" msgstr "建立分支的引用日誌" -#: builtin/branch.c:664 +#: builtin/branch.c:671 msgid "edit the description for the branch" msgstr "標記分支的描述" -#: builtin/branch.c:665 +#: builtin/branch.c:672 msgid "force creation, move/rename, deletion" msgstr "強制建立、移動/重新命名、刪除" -#: builtin/branch.c:666 +#: builtin/branch.c:673 msgid "print only branches that are merged" msgstr "只列印已經合併的分支" -#: builtin/branch.c:667 +#: builtin/branch.c:674 msgid "print only branches that are not merged" msgstr "只列印尚未合併的分支" -#: builtin/branch.c:668 +#: builtin/branch.c:675 msgid "list branches in columns" msgstr "以列的方式顯示分支" -#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413 +#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582 #: builtin/tag.c:475 msgid "object" msgstr "物件" -#: builtin/branch.c:671 +#: builtin/branch.c:678 msgid "print only branches of the object" msgstr "只列印指向該物件的分支" -#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482 +#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482 msgid "sorting and filtering are case insensitive" msgstr "排序和過濾屬於大小寫不敏感" -#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480 +#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "輸出格式" -#: builtin/branch.c:696 builtin/clone.c:678 +#: builtin/branch.c:703 builtin/clone.c:678 msgid "HEAD not found below refs/heads!" msgstr "HEAD 沒有位於 /refs/heads 之下！" -#: builtin/branch.c:720 -msgid "--column and --verbose are incompatible" -msgstr "--column 和 --verbose 不相容" - -#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801 +#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807 msgid "branch name required" msgstr "必須提供分支名" -#: builtin/branch.c:768 +#: builtin/branch.c:774 msgid "Cannot give description to detached HEAD" msgstr "不能向分離開頭指標提供描述" -#: builtin/branch.c:773 +#: builtin/branch.c:779 msgid "cannot edit description of more than one branch" msgstr "不能為一個以上的分支編輯描述" -#: builtin/branch.c:780 +#: builtin/branch.c:786 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚無提交。" -#: builtin/branch.c:783 +#: builtin/branch.c:789 #, c-format msgid "No branch named '%s'." msgstr "沒有分支 '%s'。" -#: builtin/branch.c:798 +#: builtin/branch.c:804 msgid "too many branches for a copy operation" msgstr "為複製動作提供了太多的分支名" -#: builtin/branch.c:807 +#: builtin/branch.c:813 msgid "too many arguments for a rename operation" msgstr "為重新命名動作提供了太多的參數" -#: builtin/branch.c:812 +#: builtin/branch.c:818 msgid "too many arguments to set new upstream" msgstr "為設定新上游提供了太多的參數" -#: builtin/branch.c:816 +#: builtin/branch.c:822 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "無法設定 HEAD 的上游為 %s，因為 HEAD 沒有指向任何分支。" -#: builtin/branch.c:819 builtin/branch.c:842 +#: builtin/branch.c:825 builtin/branch.c:848 #, c-format msgid "no such branch '%s'" msgstr "沒有此分支 '%s'" -#: builtin/branch.c:823 +#: builtin/branch.c:829 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:836 +#: builtin/branch.c:842 msgid "too many arguments to unset upstream" msgstr "為取消上游設定動作提供了太多的參數" -#: builtin/branch.c:840 +#: builtin/branch.c:846 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。" -#: builtin/branch.c:846 +#: builtin/branch.c:852 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 沒有上游訊息" -#: builtin/branch.c:856 +#: builtin/branch.c:862 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11746,7 +11714,7 @@ msgstr "" "'git branch' 的 -a 和 -r 選項不帶一個分支名。\n" "您是否想要使用：-a|-r --list <模式>？" -#: builtin/branch.c:860 +#: builtin/branch.c:866 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -12013,8 +11981,8 @@ msgstr "從標準輸入讀出檔案名" msgid "terminate input and output records by a NUL character" msgstr "輸入和輸出的紀錄使用 NUL 字元終結" -#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549 -#: builtin/worktree.c:494 +#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "不顯示進度報告" @@ -12072,10 +12040,10 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<選項>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863 -#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874 -#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576 -#: builtin/worktree.c:492 builtin/worktree.c:729 +#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875 +#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577 +#: builtin/worktree.c:491 builtin/worktree.c:728 msgid "string" msgstr "字串" @@ -12139,95 +12107,90 @@ msgstr "git switch [<選項>] [<分支>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<選項>] [--source=<分支>] <檔案>..." -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:198 builtin/checkout.c:237 #, c-format msgid "path '%s' does not have our version" msgstr "路徑 '%s' 沒有我們的版本" -#: builtin/checkout.c:192 builtin/checkout.c:231 +#: builtin/checkout.c:200 builtin/checkout.c:239 #, c-format msgid "path '%s' does not have their version" msgstr "路徑 '%s' 沒有他們的版本" -#: builtin/checkout.c:208 +#: builtin/checkout.c:216 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路徑 '%s' 沒有全部必需的版本" -#: builtin/checkout.c:261 +#: builtin/checkout.c:269 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路徑 '%s' 沒有必需的版本" -#: builtin/checkout.c:278 +#: builtin/checkout.c:286 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：無法合併" -#: builtin/checkout.c:294 +#: builtin/checkout.c:302 #, c-format msgid "Unable to add merge result for '%s'" msgstr "無法為 '%s' 新增合併結果" -#: builtin/checkout.c:411 +#: builtin/checkout.c:419 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新建立了 %d 個合併衝突" -#: builtin/checkout.c:416 +#: builtin/checkout.c:424 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "從 %2$s 更新了 %1$d 個路徑" -#: builtin/checkout.c:423 +#: builtin/checkout.c:431 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "從索引區更新了 %d 個路徑" -#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 -#: builtin/checkout.c:456 +#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460 +#: builtin/checkout.c:464 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路徑時使用" -#: builtin/checkout.c:459 builtin/checkout.c:462 -#, c-format -msgid "'%s' cannot be used with %s" -msgstr "'%s' 不能和 %s 同時使用" - -#: builtin/checkout.c:466 +#: builtin/checkout.c:474 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同時更新路徑並切換到分支'%s'。" -#: builtin/checkout.c:470 +#: builtin/checkout.c:478 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都沒有指定" -#: builtin/checkout.c:474 +#: builtin/checkout.c:482 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 時，必須使用 '%1$s'" -#: builtin/checkout.c:479 builtin/checkout.c:484 +#: builtin/checkout.c:487 builtin/checkout.c:492 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c:558 builtin/checkout.c:565 +#: builtin/checkout.c:566 builtin/checkout.c:573 #, c-format msgid "path '%s' is unmerged" msgstr "路徑 '%s' 未合併" -#: builtin/checkout.c:736 +#: builtin/checkout.c:747 msgid "you need to resolve your current index first" msgstr "您需要先解決目前索引的衝突" -#: builtin/checkout.c:786 +#: builtin/checkout.c:797 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12236,51 +12199,51 @@ msgstr "" "不能繼續，下列檔案有暫存的修改：\n" "%s" -#: builtin/checkout.c:879 +#: builtin/checkout.c:890 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能對 '%s' 執行 reflog 動作：%s\n" -#: builtin/checkout.c:921 +#: builtin/checkout.c:934 msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:929 +#: builtin/checkout.c:942 #, c-format msgid "Reset branch '%s'\n" msgstr "重設分支 '%s'\n" -#: builtin/checkout.c:932 +#: builtin/checkout.c:945 #, c-format msgid "Already on '%s'\n" msgstr "已經位於 '%s'\n" -#: builtin/checkout.c:936 +#: builtin/checkout.c:949 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切換並重設分支 '%s'\n" -#: builtin/checkout.c:938 builtin/checkout.c:1369 +#: builtin/checkout.c:951 builtin/checkout.c:1388 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切換到一個新分支 '%s'\n" -#: builtin/checkout.c:940 +#: builtin/checkout.c:953 #, c-format msgid "Switched to branch '%s'\n" msgstr "切換到分支 '%s'\n" # 譯者：請維持前導空格 -#: builtin/checkout.c:991 +#: builtin/checkout.c:1004 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 個。\n" -#: builtin/checkout.c:997 +#: builtin/checkout.c:1010 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12297,7 +12260,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:1029 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12318,19 +12281,19 @@ msgstr[0] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1051 +#: builtin/checkout.c:1064 msgid "internal error in revision walk" msgstr "在版本遍歷時遇到內部錯誤" -#: builtin/checkout.c:1055 +#: builtin/checkout.c:1068 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1095 builtin/checkout.c:1364 +#: builtin/checkout.c:1114 builtin/checkout.c:1383 msgid "You are on a branch yet to be born" msgstr "您位於一個尚未初始化的分支" -#: builtin/checkout.c:1177 +#: builtin/checkout.c:1196 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12339,7 +12302,7 @@ msgstr "" "'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n" "請使用 --（和可選的 --no-guess）來消除歧義" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1203 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12358,51 +12321,51 @@ msgstr "" "如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n" "版本庫名，可以在設定中設定 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1213 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 符合多個 (%d) 遠端追蹤分支" -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1279 msgid "only one reference expected" msgstr "預期只有一個引用" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1296 #, c-format msgid "only one reference expected, %d given." msgstr "應只有一個引用，卻提供了 %d 個。" -#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437 +#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "無效引用：%s" -#: builtin/checkout.c:1336 builtin/checkout.c:1705 +#: builtin/checkout.c:1355 builtin/checkout.c:1725 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一個樹：%s" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1402 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一個分支，得到標籤 '%s'" -#: builtin/checkout.c:1385 +#: builtin/checkout.c:1404 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一個分支，得到遠端分支 '%s'" -#: builtin/checkout.c:1386 builtin/checkout.c:1394 +#: builtin/checkout.c:1405 builtin/checkout.c:1413 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一個分支，得到 '%s'" -#: builtin/checkout.c:1389 +#: builtin/checkout.c:1408 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一個分支，得到提交 '%s'" -#: builtin/checkout.c:1405 +#: builtin/checkout.c:1424 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12410,7 +12373,7 @@ msgstr "" "不能在合併時切換分支\n" "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1409 +#: builtin/checkout.c:1428 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12418,7 +12381,7 @@ msgstr "" "不能在 am 工作階段期間切換分支\n" "考慮使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1413 +#: builtin/checkout.c:1432 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12426,7 +12389,7 @@ msgstr "" "不能在重定基底時切換分支\n" "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1417 +#: builtin/checkout.c:1436 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12434,7 +12397,7 @@ msgstr "" "不能在揀選時切換分支\n" "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1421 +#: builtin/checkout.c:1440 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12442,208 +12405,196 @@ msgstr "" "不能在還原時切換分支\n" "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1425 +#: builtin/checkout.c:1444 msgid "you are switching branch while bisecting" msgstr "您在執行二分搜尋時切換分支" -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1451 msgid "paths cannot be used with switching branches" msgstr "路徑不能和切換分支同時使用" -#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443 +#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切換分支同時使用" -#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453 -#: builtin/checkout.c:1458 builtin/checkout.c:1463 +#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472 +#: builtin/checkout.c:1477 builtin/checkout.c:1482 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同時使用" -#: builtin/checkout.c:1460 +#: builtin/checkout.c:1479 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不帶 <起始點>" -#: builtin/checkout.c:1468 +#: builtin/checkout.c:1487 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切換分支到一個非提交 '%s'" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1494 msgid "missing branch or commit argument" msgstr "缺少分支或提交參數" -#: builtin/checkout.c:1518 +#: builtin/checkout.c:1537 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支執行三方合併" -#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321 +#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323 msgid "style" msgstr "風格" -#: builtin/checkout.c:1520 -msgid "conflict style (merge or diff3)" -msgstr "衝突輸出風格（merge 或 diff3）" +#: builtin/checkout.c:1539 +msgid "conflict style (merge, diff3, or zdiff3)" +msgstr "衝突輸出風格（merge、diff3 或 zdiff3）" -#: builtin/checkout.c:1532 builtin/worktree.c:489 +#: builtin/checkout.c:1551 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "HEAD 從指定的提交分離" -#: builtin/checkout.c:1533 -msgid "set upstream info for new branch" -msgstr "為新的分支設定上游訊息" +#: builtin/checkout.c:1553 +msgid "set up tracking mode (see git-pull(1))" +msgstr "設定追蹤模式（參見 git-pull(1)）" -#: builtin/checkout.c:1535 +#: builtin/checkout.c:1556 msgid "force checkout (throw away local modifications)" msgstr "強制簽出（捨棄本機修改）" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1558 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1558 msgid "new unparented branch" msgstr "新的沒有父提交的分支" -#: builtin/checkout.c:1539 builtin/merge.c:302 +#: builtin/checkout.c:1560 builtin/merge.c:305 msgid "update ignored files (default)" msgstr "更新忽略的檔案（預設）" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1563 msgid "do not check if another worktree is holding the given ref" msgstr "不檢查指定的引用是否被其他工作區所占用" -#: builtin/checkout.c:1555 +#: builtin/checkout.c:1576 msgid "checkout our version for unmerged files" msgstr "對尚未合併的檔案簽出我們的版本" -#: builtin/checkout.c:1558 +#: builtin/checkout.c:1579 msgid "checkout their version for unmerged files" msgstr "對尚未合併的檔案簽出他們的版本" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1583 msgid "do not limit pathspecs to sparse entries only" msgstr "對路徑不做稀疏簽出的限制" -#: builtin/checkout.c:1620 +#: builtin/checkout.c:1640 #, c-format -msgid "-%c, -%c and --orphan are mutually exclusive" -msgstr "-%c、-%c 和 --orphan 是互斥的" - -#: builtin/checkout.c:1624 -msgid "-p and --overlay are mutually exclusive" -msgstr "-p 和 --overlay 互斥" +msgid "options '-%c', '-%c', and '%s' cannot be used together" +msgstr "「-%c」、「-%c」和「%s」選項不得同時使用" -#: builtin/checkout.c:1661 +#: builtin/checkout.c:1681 msgid "--track needs a branch name" msgstr "--track 需要一個分支名" -#: builtin/checkout.c:1666 +#: builtin/checkout.c:1686 #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名稱，請嘗試 -%c" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1718 #, c-format msgid "could not resolve %s" msgstr "無法解析 %s" -#: builtin/checkout.c:1714 +#: builtin/checkout.c:1734 msgid "invalid path specification" msgstr "無效的路徑規格" -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1741 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1745 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路徑參數 '%s'" -#: builtin/checkout.c:1734 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file 與 --detach 不相容" - -#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file 與 --patch 不相容" - -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1770 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。" -#: builtin/checkout.c:1755 +#: builtin/checkout.c:1775 msgid "you must specify path(s) to restore" msgstr "您必須指定一個要復原的路徑" -#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832 -#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2958 -#: builtin/submodule--helper.c:3252 builtin/worktree.c:485 -#: builtin/worktree.c:487 +#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854 +#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2959 +#: builtin/submodule--helper.c:3253 builtin/worktree.c:484 +#: builtin/worktree.c:486 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1782 +#: builtin/checkout.c:1801 msgid "create and checkout a new branch" msgstr "建立並簽出一個新的分支" -#: builtin/checkout.c:1784 +#: builtin/checkout.c:1803 msgid "create/reset and checkout a branch" msgstr "建立/重設並簽出一個分支" -#: builtin/checkout.c:1785 +#: builtin/checkout.c:1804 msgid "create reflog for new branch" msgstr "為新的分支建立引用日誌" -#: builtin/checkout.c:1787 +#: builtin/checkout.c:1806 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜測 'git checkout <無此分支>'（預設）" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1807 msgid "use overlay mode (default)" msgstr "使用疊加模式（預設）" -#: builtin/checkout.c:1833 +#: builtin/checkout.c:1855 msgid "create and switch to a new branch" msgstr "建立並切換一個新分支" -#: builtin/checkout.c:1835 +#: builtin/checkout.c:1857 msgid "create/reset and switch to a branch" msgstr "建立/重設並切換一個分支" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1859 msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜測 'git switch <無此分支>'" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1861 msgid "throw away local modifications" msgstr "捨棄本機修改" -#: builtin/checkout.c:1873 +#: builtin/checkout.c:1897 msgid "which tree-ish to checkout from" msgstr "要簽出哪一個樹" -#: builtin/checkout.c:1875 +#: builtin/checkout.c:1899 msgid "restore the index" msgstr "復原索引" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1901 msgid "restore the working tree (default)" msgstr "復原工作區（預設）" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1903 msgid "ignore unmerged entries" msgstr "忽略未合併條目" -#: builtin/checkout.c:1880 +#: builtin/checkout.c:1904 msgid "use overlay mode" msgstr "使用疊加模式" @@ -12678,7 +12629,15 @@ msgstr "將忽略版本庫 %s\n" msgid "could not lstat %s\n" msgstr "不能對 %s 呼叫 lstat\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:39 +msgid "Refusing to remove current working directory\n" +msgstr "拒絕移除目前工作目錄\n" + +#: builtin/clean.c:40 +msgid "Would refuse to remove current working directory\n" +msgstr "會拒絕移除目前的工作目錄\n" + +#: builtin/clean.c:326 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12691,7 +12650,7 @@ msgstr "" "foo - 透過唯一前綴選擇一個選項\n" " - （空）什麼也不選擇\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:330 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12712,33 +12671,33 @@ msgstr "" "* - 選擇所有選項\n" " - （空）結束選擇\n" -#: builtin/clean.c:519 git-add--interactive.perl:568 +#: builtin/clean.c:545 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c:659 +#: builtin/clean.c:685 #, c-format msgid "Input ignore patterns>> " msgstr "輸入範本以排除條目>> " -#: builtin/clean.c:693 +#: builtin/clean.c:719 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：無法找到和 %s 符合的條目" -#: builtin/clean.c:714 +#: builtin/clean.c:740 msgid "Select items to delete" msgstr "選擇要刪除的條目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:755 +#: builtin/clean.c:781 #, c-format msgid "Remove %s [y/N]? " msgstr "移除 %s [y/N]？ " -#: builtin/clean.c:786 +#: builtin/clean.c:812 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12756,65 +12715,65 @@ msgstr "" "help - 顯示本協助\n" "? - 顯示如何在提示符下選擇的協助" -#: builtin/clean.c:822 +#: builtin/clean.c:848 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "將刪除如下條目：" -#: builtin/clean.c:838 +#: builtin/clean.c:864 msgid "No more files to clean, exiting." msgstr "沒有要清理的檔案，離開。" -#: builtin/clean.c:900 +#: builtin/clean.c:926 msgid "do not print names of files removed" msgstr "不列印刪除檔案的名稱" -#: builtin/clean.c:902 +#: builtin/clean.c:928 msgid "force" msgstr "強制" -#: builtin/clean.c:903 +#: builtin/clean.c:929 msgid "interactive cleaning" msgstr "互動式清除" -#: builtin/clean.c:905 +#: builtin/clean.c:931 msgid "remove whole directories" msgstr "刪除整個目錄" -#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537 #: builtin/show-ref.c:179 msgid "pattern" msgstr "模式" -#: builtin/clean.c:907 +#: builtin/clean.c:933 msgid "add <pattern> to ignore rules" msgstr "新增 <模式> 到忽略規則" -#: builtin/clean.c:908 +#: builtin/clean.c:934 msgid "remove ignored files, too" msgstr "也刪除忽略的檔案" -#: builtin/clean.c:910 +#: builtin/clean.c:936 msgid "remove only ignored files" msgstr "只刪除忽略的檔案" -#: builtin/clean.c:925 +#: builtin/clean.c:951 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" -#: builtin/clean.c:928 +#: builtin/clean.c:954 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" -#: builtin/clean.c:940 +#: builtin/clean.c:966 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同時使用" @@ -12870,19 +12829,20 @@ msgstr "範本目錄" msgid "directory from which templates will be used" msgstr "範本目錄將被使用" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870 -#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871 +#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260 msgid "reference repository" msgstr "引用版本庫" -#: builtin/clone.c:123 builtin/submodule--helper.c:1872 -#: builtin/submodule--helper.c:2515 +#: builtin/clone.c:123 builtin/submodule--helper.c:1873 +#: builtin/submodule--helper.c:2516 msgid "use --reference only while cloning" msgstr "僅在複製時參考 --reference 指向的本機版本庫" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663 -#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595 +#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27 +#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290 +#: builtin/pack-objects.c:3944 builtin/repack.c:665 +#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595 #: t/helper/test-simple-ipc.c:597 msgid "name" msgstr "名稱" @@ -12899,7 +12859,7 @@ msgstr "簽出 <分支> 而不是遠端 HEAD" msgid "path to git-upload-pack on the remote" msgstr "遠端 git-upload-pack 路徑" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876 +#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876 #: builtin/pull.c:212 msgid "depth" msgstr "深度" @@ -12908,7 +12868,7 @@ msgstr "深度" msgid "create a shallow clone of that depth" msgstr "建立一個指定深度的淺複製" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933 +#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933 #: builtin/pull.c:215 msgid "time" msgstr "時間" @@ -12917,17 +12877,17 @@ msgstr "時間" msgid "create a shallow clone since a specific time" msgstr "建立從指定時間到現在的淺複製" -#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022 msgid "revision" msgstr "修訂版" -#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219 +#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219 msgid "deepen history of shallow clone, excluding rev" msgstr "取得更多淺複製的過去歷史記錄，除了特定版本" -#: builtin/clone.c:137 builtin/submodule--helper.c:1882 -#: builtin/submodule--helper.c:2529 +#: builtin/clone.c:137 builtin/submodule--helper.c:1883 +#: builtin/submodule--helper.c:2530 msgid "clone only one branch, HEAD or --branch" msgstr "只複製一個分支、HEAD 或 --branch" @@ -12955,22 +12915,22 @@ msgstr "key=value" msgid "set config inside the new repository" msgstr "在新版本庫中設定設定訊息" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200 msgid "server-specific" msgstr "server-specific" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201 msgid "option to transmit" msgstr "傳輸選項" -#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238 +#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238 #: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 位址" -#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241 +#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241 #: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 位址" @@ -13062,29 +13022,25 @@ msgstr "無法執行 repack 來清理" msgid "cannot unlink temporary alternates file" msgstr "無法刪除暫時的 alternates 檔案" -#: builtin/clone.c:886 builtin/receive-pack.c:2493 +#: builtin/clone.c:886 msgid "Too many arguments." msgstr "太多參數。" -#: builtin/clone.c:890 +#: builtin/clone.c:890 contrib/scalar/scalar.c:414 msgid "You must specify a repository to clone." msgstr "您必須指定要複製的版本庫。" #: builtin/clone.c:903 #, c-format -msgid "--bare and --origin %s options are incompatible." -msgstr "--bare 和 --origin %s 選項不相容。" - -#: builtin/clone.c:906 -msgid "--bare and --separate-git-dir are incompatible." -msgstr "--bare 和 --separate-git-dir 選項不相容。" +msgid "options '%s' and '%s %s' cannot be used together" +msgstr "「%s」和「%s %s」選項不得同時使用" #: builtin/clone.c:920 #, c-format msgid "repository '%s' does not exist" msgstr "版本庫 '%s' 不存在" -#: builtin/clone.c:924 builtin/fetch.c:2029 +#: builtin/clone.c:924 builtin/fetch.c:2047 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一個正數" @@ -13104,8 +13060,8 @@ msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。" msgid "working tree '%s' already exists." msgstr "工作區 '%s' 已經存在。" -#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262 -#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313 +#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256 +#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能為 '%s' 建立先導目錄" @@ -13222,7 +13178,7 @@ msgstr "" "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" -#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779 +#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794 msgid "dir" msgstr "目錄" @@ -13302,7 +13258,7 @@ msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs" msgid "Collecting commits from input" msgstr "正在從輸入收集提交" -#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255 +#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259 #, c-format msgid "unrecognized subcommand: %s" msgstr "未識別的子指令：%s" @@ -13320,7 +13276,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重複的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577 #, c-format msgid "not a valid object name %s" msgstr "不是一個有效的物件名 %s" @@ -13343,13 +13299,13 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交物件 ID" -#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283 -#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618 +#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284 +#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677 #: builtin/tag.c:454 msgid "message" msgstr "訊息" -#: builtin/commit-tree.c:113 builtin/commit.c:1626 +#: builtin/commit-tree.c:113 builtin/commit.c:1627 msgid "commit message" msgstr "提交說明" @@ -13357,7 +13313,7 @@ msgstr "提交說明" msgid "read commit log message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300 +#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303 #: builtin/pull.c:180 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交簽名" @@ -13434,10 +13390,6 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "解包 HEAD 樹狀物件失敗" -#: builtin/commit.c:361 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "--pathspec-from-file 和 -a 同時使用沒有意義" - #: builtin/commit.c:375 msgid "No paths with --include/--only does not make sense." msgstr "參數 --include/--only 不跟路徑沒有意義。" @@ -13523,8 +13475,8 @@ msgstr "不能讀取日誌檔案 '%s'" #: builtin/commit.c:802 #, c-format -msgid "cannot combine -m with --fixup:%s" -msgstr "-m 和 --fixup:%s 不可結合使用" +msgid "options '%s' and '%s:%s' cannot be used together" +msgstr "「%s」和「%s:%s」選項不得同時使用" #: builtin/commit.c:814 builtin/commit.c:830 msgid "could not read SQUASH_MSG" @@ -13634,7 +13586,7 @@ msgstr "無法將尾部署名傳遞至 --trailers" msgid "Error building trees" msgstr "無法建立樹狀物件" -#: builtin/commit.c:1080 builtin/tag.c:317 +#: builtin/commit.c:1080 builtin/tag.c:316 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "請使用 -m 或 -F 選項提供提交說明。\n" @@ -13649,15 +13601,11 @@ msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者 msgid "Invalid ignored mode '%s'" msgstr "無效的忽略模式 '%s'" -#: builtin/commit.c:1156 builtin/commit.c:1450 +#: builtin/commit.c:1156 builtin/commit.c:1451 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "無效的未追蹤檔案參數 '%s'" -#: builtin/commit.c:1196 -msgid "--long and -z are incompatible" -msgstr "--long 和 -z 選項不相容" - #: builtin/commit.c:1227 msgid "You are in the middle of a merge -- cannot reword." msgstr "正在合併中——不能重新輸入。" @@ -13668,110 +13616,108 @@ msgstr "正在揀選中——不能重新輸入。" #: builtin/commit.c:1232 #, c-format -msgid "cannot combine reword option of --fixup with path '%s'" -msgstr "不能將「%s」路徑與 --fixup 的 reword 選項結合" +msgid "reword option of '%s' and path '%s' cannot be used together" +msgstr "「%s」的改寫選項和「%s」路徑不得同時使用" #: builtin/commit.c:1234 -msgid "" -"reword option of --fixup is mutually exclusive with --patch/--interactive/--" -"all/--include/--only" -msgstr "" -"--fixup 的 reword 選項與 --patch/--interactive/--all/--include/--only 互斥" +#, c-format +msgid "reword option of '%s' and '%s' cannot be used together" +msgstr "「%s」的改寫選項和「%s」不得同時使用" -#: builtin/commit.c:1253 +#: builtin/commit.c:1254 msgid "Using both --reset-author and --author does not make sense" msgstr "同時使用 --reset-author 和 --author 沒有意義" -#: builtin/commit.c:1260 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "您沒有可修補的提交。" -#: builtin/commit.c:1263 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正處於一個合併過程中 -- 無法修補提交。" -#: builtin/commit.c:1265 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正處於一個揀選過程中 -- 無法修補提交。" -#: builtin/commit.c:1267 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正處於重定基底的過程中 -- 無法修訂。" -#: builtin/commit.c:1270 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "選項 --squash 和 --fixup 不能同時使用" -#: builtin/commit.c:1280 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一個 -c/-C/-F/--fixup 選項。" -#: builtin/commit.c:1282 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "選項 -m 不能和 -c/-C/-F 同時使用。" -#: builtin/commit.c:1291 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。" -#: builtin/commit.c:1309 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。" -#: builtin/commit.c:1337 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "未知選項：--fixup=%s:%s" -#: builtin/commit.c:1354 +#: builtin/commit.c:1355 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: builtin/commit.c:1485 builtin/commit.c:1654 +#: builtin/commit.c:1486 builtin/commit.c:1655 msgid "show status concisely" msgstr "以簡潔的格式顯示狀態" -#: builtin/commit.c:1487 builtin/commit.c:1656 +#: builtin/commit.c:1488 builtin/commit.c:1657 msgid "show branch information" msgstr "顯示分支訊息" -#: builtin/commit.c:1489 +#: builtin/commit.c:1490 msgid "show stash information" msgstr "顯示儲藏區訊息" -#: builtin/commit.c:1491 builtin/commit.c:1658 +#: builtin/commit.c:1492 builtin/commit.c:1659 msgid "compute full ahead/behind values" msgstr "計算完整的領先/落後值" -#: builtin/commit.c:1493 +#: builtin/commit.c:1494 msgid "version" msgstr "版本" -#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551 -#: builtin/worktree.c:691 +#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "機器可讀的輸出" -#: builtin/commit.c:1496 builtin/commit.c:1662 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "show status in long format (default)" msgstr "以長格式顯示狀態（預設）" -#: builtin/commit.c:1499 builtin/commit.c:1665 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335 +#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669 +#: builtin/fast-export.c:1172 builtin/fast-export.c:1175 +#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337 msgid "mode" msgstr "模式" -#: builtin/commit.c:1502 builtin/commit.c:1668 +#: builtin/commit.c:1503 builtin/commit.c:1669 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）" -#: builtin/commit.c:1506 +#: builtin/commit.c:1507 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13779,201 +13725,201 @@ msgstr "" "顯示已忽略的檔案，可選模式：traditional、matching、no。（預設值：" "traditional）" -#: builtin/commit.c:1508 parse-options.h:192 +#: builtin/commit.c:1509 parse-options.h:192 msgid "when" msgstr "何時" -#: builtin/commit.c:1509 +#: builtin/commit.c:1510 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設值：all）" -#: builtin/commit.c:1511 +#: builtin/commit.c:1512 msgid "list untracked files in columns" msgstr "以列的方式顯示未追蹤的檔案" -#: builtin/commit.c:1512 +#: builtin/commit.c:1513 msgid "do not detect renames" msgstr "不檢測重新命名" -#: builtin/commit.c:1514 +#: builtin/commit.c:1515 msgid "detect renames, optionally set similarity index" msgstr "檢測重新命名，可以設定索引相似度" -#: builtin/commit.c:1537 +#: builtin/commit.c:1538 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支援已忽略和未追蹤檔案參數的組合" -#: builtin/commit.c:1619 +#: builtin/commit.c:1620 msgid "suppress summary after successful commit" msgstr "提交成功後不顯示概述訊息" -#: builtin/commit.c:1620 +#: builtin/commit.c:1621 msgid "show diff in commit message template" msgstr "在提交說明範本裡顯示差異" -#: builtin/commit.c:1622 +#: builtin/commit.c:1623 msgid "Commit message options" msgstr "提交說明選項" -#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456 +#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456 msgid "read message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit.c:1624 +#: builtin/commit.c:1625 msgid "author" msgstr "作者" -#: builtin/commit.c:1624 +#: builtin/commit.c:1625 msgid "override author for commit" msgstr "提交時覆蓋作者" -#: builtin/commit.c:1625 builtin/gc.c:550 +#: builtin/commit.c:1626 builtin/gc.c:551 msgid "date" msgstr "日期" -#: builtin/commit.c:1625 +#: builtin/commit.c:1626 msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634 -#: parse-options.h:327 ref-filter.h:92 +#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635 +#: parse-options.h:329 ref-filter.h:89 msgid "commit" msgstr "提交" -#: builtin/commit.c:1627 +#: builtin/commit.c:1628 msgid "reuse and edit message from specified commit" msgstr "重用並編輯指定提交的提交說明" -#: builtin/commit.c:1628 +#: builtin/commit.c:1629 msgid "reuse message from specified commit" msgstr "重用指定提交的提交說明" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1633 +#: builtin/commit.c:1634 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" -#: builtin/commit.c:1633 +#: builtin/commit.c:1634 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "使用 autosquash 格式化後的說明來 fixup 或是 amend/reword 指定提交" -#: builtin/commit.c:1634 +#: builtin/commit.c:1635 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" -#: builtin/commit.c:1635 +#: builtin/commit.c:1636 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" -#: builtin/commit.c:1636 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1637 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "尾部署名" -#: builtin/commit.c:1636 +#: builtin/commit.c:1637 msgid "add custom trailer(s)" msgstr "加入自訂尾部署名" -#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303 +#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306 #: builtin/pull.c:146 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "在結尾加入 Signed-off-by" -#: builtin/commit.c:1638 +#: builtin/commit.c:1639 msgid "use specified template file" msgstr "使用指定的範本檔案" -#: builtin/commit.c:1639 +#: builtin/commit.c:1640 msgid "force edit of commit" msgstr "強制編輯提交" -#: builtin/commit.c:1641 +#: builtin/commit.c:1642 msgid "include status in commit message template" msgstr "在提交說明範本裡包含狀態訊息" -#: builtin/commit.c:1646 +#: builtin/commit.c:1647 msgid "Commit contents options" msgstr "提交內容選項" -#: builtin/commit.c:1647 +#: builtin/commit.c:1648 msgid "commit all changed files" msgstr "提交所有改動的檔案" -#: builtin/commit.c:1648 +#: builtin/commit.c:1649 msgid "add specified files to index for commit" msgstr "新增指定的檔案到索引區等待提交" -#: builtin/commit.c:1649 +#: builtin/commit.c:1650 msgid "interactively add files" msgstr "互動式新增檔案" -#: builtin/commit.c:1650 +#: builtin/commit.c:1651 msgid "interactively add changes" msgstr "互動式新增變更" -#: builtin/commit.c:1651 +#: builtin/commit.c:1652 msgid "commit only specified files" msgstr "只提交指定的檔案" -#: builtin/commit.c:1652 +#: builtin/commit.c:1653 msgid "bypass pre-commit and commit-msg hooks" msgstr "繞過 pre-commit 和 commit-msg 掛鉤" -#: builtin/commit.c:1653 +#: builtin/commit.c:1654 msgid "show what would be committed" msgstr "顯示將要提交的內容" -#: builtin/commit.c:1666 +#: builtin/commit.c:1667 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1667 +#: builtin/commit.c:1668 msgid "bypass post-rewrite hook" msgstr "繞過 post-rewrite 掛鉤" -#: builtin/commit.c:1674 +#: builtin/commit.c:1675 msgid "ok to record an empty change" msgstr "允許一個空提交" -#: builtin/commit.c:1676 +#: builtin/commit.c:1677 msgid "ok to record a change with an empty message" msgstr "允許空的提交說明" -#: builtin/commit.c:1752 +#: builtin/commit.c:1753 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "損壞的 MERGE_HEAD 檔案（%s）" -#: builtin/commit.c:1759 +#: builtin/commit.c:1760 msgid "could not read MERGE_MODE" msgstr "不能讀取 MERGE_MODE" -#: builtin/commit.c:1780 +#: builtin/commit.c:1781 #, c-format msgid "could not read commit message: %s" msgstr "不能讀取提交說明：%s" -#: builtin/commit.c:1787 +#: builtin/commit.c:1788 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "終止提交因為提交說明為空。\n" -#: builtin/commit.c:1792 +#: builtin/commit.c:1793 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "終止提交；您未更改來自範本的提交說明。\n" -#: builtin/commit.c:1803 +#: builtin/commit.c:1804 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "提交說明內文空白，中止提交作業。\n" -#: builtin/commit.c:1839 +#: builtin/commit.c:1840 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14474,7 +14420,7 @@ msgstr "只考慮符合 <模式> 的標籤" msgid "do not consider tags matching <pattern>" msgstr "不考慮符合 <模式> 的標籤" -#: builtin/describe.c:570 builtin/name-rev.c:535 +#: builtin/describe.c:570 builtin/name-rev.c:544 msgid "show abbreviated commit object as fallback" msgstr "顯示簡寫的提交號作為後備" @@ -14490,25 +14436,14 @@ msgstr "對於髒工作區，追加 <標記>（預設值：”-dirty\"）" msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "對於損壞的工作區，追加 <標記>（預設值：”-broken\"）" -#: builtin/describe.c:593 -msgid "--long is incompatible with --abbrev=0" -msgstr "--long 與 --abbrev=0 不相容" - #: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "沒有發現名稱，無法描述任何東西。" -#: builtin/describe.c:673 -msgid "--dirty is incompatible with commit-ishes" -msgstr "--dirty 與提交號不相容" - -#: builtin/describe.c:675 -msgid "--broken is incompatible with commit-ishes" -msgstr "--broken 與提交號不相容" - -#: builtin/diff-tree.c:155 -msgid "--stdin and --merge-base are mutually exclusive" -msgstr "--stdin 和 --merge-base 互斥" +#: builtin/describe.c:673 builtin/describe.c:675 +#, c-format +msgid "option '%s' and commit-ishes cannot be used together" +msgstr "「%s」選項和提交號不得同時使用" #: builtin/diff-tree.c:157 msgid "--merge-base only works with two commits" @@ -14529,26 +14464,26 @@ msgstr "無效選項：%s" msgid "%s...%s: no merge base" msgstr "%s...%s: 無合併基底" -#: builtin/diff.c:486 +#: builtin/diff.c:491 msgid "Not a git repository" msgstr "不是一個 git 版本庫" -#: builtin/diff.c:532 builtin/grep.c:698 +#: builtin/diff.c:537 builtin/grep.c:698 #, c-format msgid "invalid object '%s' given." msgstr "提供了無效物件 '%s'。" -#: builtin/diff.c:543 +#: builtin/diff.c:548 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超過兩個資料物件：'%s'" -#: builtin/diff.c:548 +#: builtin/diff.c:553 #, c-format msgid "unhandled object '%s' given." msgstr "無法處理的物件 '%s'。" -#: builtin/diff.c:582 +#: builtin/diff.c:587 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s：多個合併基底，使用 %s" @@ -14557,22 +14492,22 @@ msgstr "%s...%s：多個合併基底，使用 %s" msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<選項>] [<提交> [<提交>]] [--] [<路徑>...]" -#: builtin/difftool.c:293 +#: builtin/difftool.c:287 #, c-format msgid "could not read symlink %s" msgstr "無法讀取符號連結 %s" -#: builtin/difftool.c:295 +#: builtin/difftool.c:289 #, c-format msgid "could not read symlink file %s" msgstr "無法讀取符號連結檔案 %s" -#: builtin/difftool.c:303 +#: builtin/difftool.c:297 #, c-format msgid "could not read object %s for symlink %s" msgstr "無法讀取符號連結 %2$s 指向的物件 %1$s" -#: builtin/difftool.c:427 +#: builtin/difftool.c:421 msgid "" "combined diff formats ('-c' and '--cc') are not supported in\n" "directory diff mode ('-d' and '--dir-diff')." @@ -14580,88 +14515,80 @@ msgstr "" "不支援在目錄比較模式（'-d' 和 '--dir-diff'）中\n" "採用組合差異格式（'-c' 和 '--cc'）。" -#: builtin/difftool.c:632 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "兩個檔案都被修改：'%s' 和 '%s'。" -#: builtin/difftool.c:634 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "工作區檔案被留了下來。" -#: builtin/difftool.c:645 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "暫存檔存在於 '%s'。" -#: builtin/difftool.c:646 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者復原它們。" -#: builtin/difftool.c:651 +#: builtin/difftool.c:645 #, c-format msgid "failed: %d" msgstr "失敗：%d" -#: builtin/difftool.c:696 +#: builtin/difftool.c:690 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:698 +#: builtin/difftool.c:692 msgid "perform a full-directory diff" msgstr "執行一個全目錄差異比較" -#: builtin/difftool.c:700 +#: builtin/difftool.c:694 msgid "do not prompt before launching a diff tool" msgstr "啟動差異比較工具之前不提示" -#: builtin/difftool.c:705 +#: builtin/difftool.c:699 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符號連結" -#: builtin/difftool.c:706 +#: builtin/difftool.c:700 msgid "tool" msgstr "工具" -#: builtin/difftool.c:707 +#: builtin/difftool.c:701 msgid "use the specified diff tool" msgstr "使用指定的差異比較工具" -#: builtin/difftool.c:709 +#: builtin/difftool.c:703 msgid "print a list of diff tools that may be used with `--tool`" msgstr "顯示可以用在 `--tool` 參數後的差異工具列表" -#: builtin/difftool.c:712 +#: builtin/difftool.c:706 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" msgstr "當執行 diff 工具返回非零離開碼時，使 'git-difftool' 離開" -#: builtin/difftool.c:715 +#: builtin/difftool.c:709 msgid "specify a custom command for viewing diffs" msgstr "指定一個用於檢視差異的自訂指令" -#: builtin/difftool.c:716 +#: builtin/difftool.c:710 msgid "passed to `diff`" msgstr "傳遞給 `diff`" -#: builtin/difftool.c:732 +#: builtin/difftool.c:726 msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作區或者 --no-index" -#: builtin/difftool.c:739 -msgid "--dir-diff is incompatible with --no-index" -msgstr "--dir-diff 和 --no-index 不相容" - -#: builtin/difftool.c:742 -msgid "--gui, --tool and --extcmd are mutually exclusive" -msgstr "--gui、--tool 和 --extcmd 互斥" - -#: builtin/difftool.c:750 +#: builtin/difftool.c:744 msgid "no <tool> given for --tool=<tool>" msgstr "沒有為 --tool=<工具> 參數提供 <工具>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:751 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>" @@ -14697,123 +14624,115 @@ msgstr "選項「--default」預期收到「--type=ulong」的無號 long 數值 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:869 +#: builtin/fast-export.c:843 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1152 msgid "--anonymize-map token cannot be empty" msgstr "--anonymize-map 的鍵不能空白" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1171 msgid "show progress after <n> objects" msgstr "在 <n> 個物件之後顯示進度" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1173 msgid "select handling of signed tags" msgstr "選擇如何處理簽名標籤" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1176 msgid "select handling of tags that tag filtered objects" msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式" -#: builtin/fast-export.c:1206 +#: builtin/fast-export.c:1179 msgid "select handling of commit messages in an alternate encoding" msgstr "選擇使用備用編碼處理提交說明" -#: builtin/fast-export.c:1209 +#: builtin/fast-export.c:1182 msgid "dump marks to this file" msgstr "把標記傾印到這個檔案" -#: builtin/fast-export.c:1211 +#: builtin/fast-export.c:1184 msgid "import marks from this file" msgstr "從這個檔案匯入標記" -#: builtin/fast-export.c:1215 +#: builtin/fast-export.c:1188 msgid "import marks from this file if it exists" msgstr "如果這個檔案存在，則從檔案匯入標記" -#: builtin/fast-export.c:1217 +#: builtin/fast-export.c:1190 msgid "fake a tagger when tags lack one" msgstr "當標籤缺少標記者欄位時假裝有一個" -#: builtin/fast-export.c:1219 +#: builtin/fast-export.c:1192 msgid "output full tree for each commit" msgstr "每次提交都輸出整棵樹" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1194 msgid "use the done feature to terminate the stream" msgstr "使用 done 功能終止串流" -#: builtin/fast-export.c:1222 +#: builtin/fast-export.c:1195 msgid "skip output of blob data" msgstr "略過資料物件資料的輸出" -#: builtin/fast-export.c:1223 builtin/log.c:1826 +#: builtin/fast-export.c:1196 builtin/log.c:1841 msgid "refspec" msgstr "引用規格" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1197 msgid "apply refspec to exported refs" msgstr "對匯出的引用套用引用規格" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1198 msgid "anonymize output" msgstr "匿名輸出" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1199 msgid "from:to" msgstr "from:to" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1200 msgid "convert <from> to <to> in anonymized output" msgstr "在匿名輸出中將 <from> 轉換為 <to>" -#: builtin/fast-export.c:1230 +#: builtin/fast-export.c:1203 msgid "reference parents which are not in fast-export stream by object id" msgstr "依物件 ID 引用不在 fast-export 串流中的父物件" -#: builtin/fast-export.c:1232 +#: builtin/fast-export.c:1205 msgid "show original object ids of blobs/commits" msgstr "顯示資料物件及提交的原始物件 ID" -#: builtin/fast-export.c:1234 +#: builtin/fast-export.c:1207 msgid "label tags with mark ids" msgstr "為包含標記 ID 的標籤打上標記" -#: builtin/fast-export.c:1257 -msgid "--anonymize-map without --anonymize does not make sense" -msgstr "缺少 --anonymize 的 --anonymize-map 沒有意義" - -#: builtin/fast-export.c:1272 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists" - -#: builtin/fast-import.c:3088 +#: builtin/fast-import.c:3090 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "「%s」子模組缺少 from 標記" -#: builtin/fast-import.c:3090 +#: builtin/fast-import.c:3092 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "「%s」子模組缺少 to 標記" -#: builtin/fast-import.c:3225 +#: builtin/fast-import.c:3227 #, c-format msgid "Expected 'mark' command, got %s" msgstr "預期 'mark' 指令，得到 %s" -#: builtin/fast-import.c:3230 +#: builtin/fast-import.c:3232 #, c-format msgid "Expected 'to' command, got %s" msgstr "預期 'to' 指令，得到 %s" -#: builtin/fast-import.c:3322 +#: builtin/fast-import.c:3324 msgid "Expected format name:filename for submodule rewrite option" msgstr "期望子模組 rewrite 選項的格式是 name:filename" -#: builtin/fast-import.c:3377 +#: builtin/fast-import.c:3379 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能" @@ -14823,163 +14742,163 @@ msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功 msgid "Lockfile created but not reported: %s" msgstr "已建立鎖定檔案，但尚未回報：%s" -#: builtin/fetch.c:35 +#: builtin/fetch.c:36 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<選項>] [<版本庫> [<引用規格>...]]" -#: builtin/fetch.c:36 +#: builtin/fetch.c:37 msgid "git fetch [<options>] <group>" msgstr "git fetch [<選項>] <組>" -#: builtin/fetch.c:37 +#: builtin/fetch.c:38 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<選項>] [(<版本庫> | <組>)...]" -#: builtin/fetch.c:38 +#: builtin/fetch.c:39 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<選項>]" -#: builtin/fetch.c:122 +#: builtin/fetch.c:123 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能為負數" -#: builtin/fetch.c:145 builtin/pull.c:189 +#: builtin/fetch.c:146 builtin/pull.c:189 msgid "fetch from all remotes" msgstr "從所有的遠端抓取" -#: builtin/fetch.c:147 builtin/pull.c:249 +#: builtin/fetch.c:148 builtin/pull.c:249 msgid "set upstream for git pull/fetch" msgstr "為 git pull/fetch 設定上游" -#: builtin/fetch.c:149 builtin/pull.c:192 +#: builtin/fetch.c:150 builtin/pull.c:192 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它" -#: builtin/fetch.c:151 +#: builtin/fetch.c:152 msgid "use atomic transaction to update references" msgstr "使用 atomic 事務更新引用" -#: builtin/fetch.c:153 builtin/pull.c:195 +#: builtin/fetch.c:154 builtin/pull.c:195 msgid "path to upload pack on remote end" msgstr "上傳包到遠端的路徑" -#: builtin/fetch.c:154 +#: builtin/fetch.c:155 msgid "force overwrite of local reference" msgstr "強制覆蓋本機引用" -#: builtin/fetch.c:156 +#: builtin/fetch.c:157 msgid "fetch from multiple remotes" msgstr "從多個遠端抓取" -#: builtin/fetch.c:158 builtin/pull.c:199 +#: builtin/fetch.c:159 builtin/pull.c:199 msgid "fetch all tags and associated objects" msgstr "抓取所有的標籤和關聯物件" -#: builtin/fetch.c:160 +#: builtin/fetch.c:161 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何標籤(--no-tags)" -#: builtin/fetch.c:162 +#: builtin/fetch.c:163 msgid "number of submodules fetched in parallel" msgstr "並行取得的子模組數量" -#: builtin/fetch.c:164 +#: builtin/fetch.c:165 msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中" -#: builtin/fetch.c:166 builtin/pull.c:202 +#: builtin/fetch.c:167 builtin/pull.c:202 msgid "prune remote-tracking branches no longer on remote" msgstr "清除遠端已經不存在的分支的追蹤分支" -#: builtin/fetch.c:168 +#: builtin/fetch.c:169 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除遠端不存在的本機標籤，並且取代變更標籤" # 譯者：可選值，不能翻譯 -#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123 +#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:170 +#: builtin/fetch.c:171 msgid "control recursive fetching of submodules" msgstr "控制子模組的遞迴抓取" -#: builtin/fetch.c:175 +#: builtin/fetch.c:176 msgid "write fetched references to the FETCH_HEAD file" msgstr "將取得的引用寫入 FETCH_HEAD 檔案" -#: builtin/fetch.c:176 builtin/pull.c:210 +#: builtin/fetch.c:177 builtin/pull.c:210 msgid "keep downloaded pack" msgstr "保持下載包" -#: builtin/fetch.c:178 +#: builtin/fetch.c:179 msgid "allow updating of HEAD ref" msgstr "允許更新 HEAD 引用" -#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213 +#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213 #: builtin/pull.c:222 msgid "deepen history of shallow clone" msgstr "取得淺複製的更多過去歷史記錄" -#: builtin/fetch.c:183 builtin/pull.c:216 +#: builtin/fetch.c:184 builtin/pull.c:216 msgid "deepen history of shallow repository based on time" msgstr "基於時間來深化淺複製的歷史" -#: builtin/fetch.c:189 builtin/pull.c:225 +#: builtin/fetch.c:190 builtin/pull.c:225 msgid "convert to a complete repository" msgstr "轉換為一個完整的版本庫" -#: builtin/fetch.c:192 +#: builtin/fetch.c:193 msgid "prepend this to submodule path output" msgstr "在子模組路徑輸出的前面加上此目錄" -#: builtin/fetch.c:195 +#: builtin/fetch.c:196 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）" -#: builtin/fetch.c:199 builtin/pull.c:228 +#: builtin/fetch.c:200 builtin/pull.c:228 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:200 builtin/pull.c:230 +#: builtin/fetch.c:201 builtin/pull.c:230 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:201 builtin/pull.c:231 +#: builtin/fetch.c:202 builtin/pull.c:231 msgid "specify fetch refmap" msgstr "指定取得動作的引用映射" -#: builtin/fetch.c:208 builtin/pull.c:244 +#: builtin/fetch.c:209 builtin/pull.c:244 msgid "report that we have only objects reachable from this object" msgstr "報告我們只擁有從該物件開始可以取得的物件" -#: builtin/fetch.c:210 +#: builtin/fetch.c:211 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "不取得包檔案，而是輸出交涉的祖先提交" -#: builtin/fetch.c:213 builtin/fetch.c:215 +#: builtin/fetch.c:214 builtin/fetch.c:216 msgid "run 'maintenance --auto' after fetching" msgstr "取得 (fetch) 後執行 'maintenance --auto'" -#: builtin/fetch.c:217 builtin/pull.c:247 +#: builtin/fetch.c:218 builtin/pull.c:247 msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上檢查強制更新" -#: builtin/fetch.c:219 +#: builtin/fetch.c:220 msgid "write the commit-graph after fetching" msgstr "抓取後寫入分支圖" -#: builtin/fetch.c:221 +#: builtin/fetch.c:222 msgid "accept refspecs from stdin" msgstr "從標準輸入中接受引用規格" -#: builtin/fetch.c:586 -msgid "Couldn't find remote ref HEAD" -msgstr "無法發現遠端 HEAD 引用" +#: builtin/fetch.c:587 +msgid "couldn't find remote ref HEAD" +msgstr "找不到遠端 HEAD 引用" -#: builtin/fetch.c:760 +#: builtin/fetch.c:761 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "設定變數 fetch.output 包含無效值 %s" @@ -14993,7 +14912,7 @@ msgstr "物件 %s 未發現" msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967 +#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968 msgid "[rejected]" msgstr "[已拒絕]" @@ -15001,76 +14920,80 @@ msgstr "[已拒絕]" msgid "can't fetch in current branch" msgstr "目前分支下不能執行取得動作" -#: builtin/fetch.c:890 +#: builtin/fetch.c:881 +msgid "checked out in another worktree" +msgstr "已在其他工作區簽出" + +#: builtin/fetch.c:891 msgid "[tag update]" msgstr "[標籤更新]" -#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950 -#: builtin/fetch.c:962 +#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951 +#: builtin/fetch.c:963 msgid "unable to update local ref" msgstr "不能更新本機引用" -#: builtin/fetch.c:895 +#: builtin/fetch.c:896 msgid "would clobber existing tag" msgstr "會破壞現有的標籤" -#: builtin/fetch.c:917 +#: builtin/fetch.c:918 msgid "[new tag]" msgstr "[新標籤]" -#: builtin/fetch.c:920 +#: builtin/fetch.c:921 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:923 +#: builtin/fetch.c:924 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:962 +#: builtin/fetch.c:963 msgid "forced update" msgstr "強制更新" -#: builtin/fetch.c:967 +#: builtin/fetch.c:968 msgid "non-fast-forward" msgstr "非快轉" -#: builtin/fetch.c:1070 +#: builtin/fetch.c:1071 msgid "" -"Fetch normally indicates which branches had a forced update,\n" -"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" -"flag or run 'git config fetch.showForcedUpdates true'." +"fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'" msgstr "" -"取得動作通常顯示哪些分支發生了強制更新，但該檢查已被停用。\n" -"要重新啟用，請使用 '--show-forced-updates' 選項或執行\n" -"'git config fetch.showForcedUpdates true'。" +"取得 (fetch) 動作通常會指示哪些分支發生了強制更新，但該檢查已被停用。\n" +"要重新啟用，請使用「--show-forced-updates」選項，或執行\n" +"「git config fetch.showForcedUpdates true」" -#: builtin/fetch.c:1074 +#: builtin/fetch.c:1075 #, c-format msgid "" -"It took %.2f seconds to check forced updates. You can use\n" +"it took %.2f seconds to check forced updates; you can use\n" "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " "false'\n" -" to avoid this check.\n" +"to avoid this check\n" msgstr "" -"花了 %.2f 秒來檢查強制更新。您可以使用 '--no-show-forced-updates'\n" -"或執行 'git config fetch.showForcedUpdates false' 以避免此項檢查。\n" +"花了 %.2f 秒檢查強制更新。您可以使用「--no-show-forced-updates」\n" +"或執行「git config fetch.showForcedUpdates false」避免此項檢查\n" -#: builtin/fetch.c:1105 +#: builtin/fetch.c:1107 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未傳送所有必需的物件\n" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1136 #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "已拒絕 %s，不允許更新淺複製" -#: builtin/fetch.c:1223 builtin/fetch.c:1371 +#: builtin/fetch.c:1226 builtin/fetch.c:1374 #, c-format msgid "From %.*s\n" msgstr "來自 %.*s\n" -#: builtin/fetch.c:1244 +#: builtin/fetch.c:1247 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -15080,150 +15003,151 @@ msgstr "" " 'git remote prune %s' 來刪除舊的、有衝突的分支" # 譯者：請維持前導空格 -#: builtin/fetch.c:1341 +#: builtin/fetch.c:1344 #, c-format msgid " (%s will become dangling)" msgstr " （%s 將成為懸空狀態）" # 譯者：請維持前導空格 -#: builtin/fetch.c:1342 +#: builtin/fetch.c:1345 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成為懸空狀態）" -#: builtin/fetch.c:1374 +#: builtin/fetch.c:1377 msgid "[deleted]" msgstr "[已刪除]" -#: builtin/fetch.c:1375 builtin/remote.c:1128 +#: builtin/fetch.c:1378 builtin/remote.c:1128 msgid "(none)" msgstr "（無）" -#: builtin/fetch.c:1398 +#: builtin/fetch.c:1400 #, c-format -msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "拒絕取得到非純版本庫的目前分支 %s" +msgid "refusing to fetch into branch '%s' checked out at '%s'" +msgstr "拒絕取得在「%2$s」簽出的「%1$s」分支" -#: builtin/fetch.c:1417 +#: builtin/fetch.c:1420 #, c-format -msgid "Option \"%s\" value \"%s\" is not valid for %s" -msgstr "選項 \"%s\" 的值 \"%s\" 對於 %s 是無效的" +msgid "option \"%s\" value \"%s\" is not valid for %s" +msgstr "選項「%s」的值「%s」對 %s 無效" -#: builtin/fetch.c:1420 +#: builtin/fetch.c:1423 #, c-format -msgid "Option \"%s\" is ignored for %s\n" -msgstr "選項 \"%s\" 為 %s 所忽略\n" +msgid "option \"%s\" is ignored for %s\n" +msgstr "選項「%s」被 %s 忽略\n" -#: builtin/fetch.c:1447 +#: builtin/fetch.c:1450 #, c-format msgid "the object %s does not exist" msgstr "%s 物件不存在" -#: builtin/fetch.c:1633 +#: builtin/fetch.c:1638 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "檢測到多分支，和 --set-upstream 不相容" -#: builtin/fetch.c:1648 +#: builtin/fetch.c:1650 +#, c-format +msgid "" +"could not set upstream of HEAD to '%s' from '%s' when it does not point to " +"any branch." +msgstr "無法將 HEAD 的上游從「%2$s」設定為「%1$s」，因為 HEAD 沒有指向任何分支。" + +#: builtin/fetch.c:1663 msgid "not setting upstream for a remote remote-tracking branch" msgstr "沒有為一個遠端追蹤分支設定上游" -#: builtin/fetch.c:1650 +#: builtin/fetch.c:1665 msgid "not setting upstream for a remote tag" msgstr "沒有為一個遠端標籤設定上游" -#: builtin/fetch.c:1652 +#: builtin/fetch.c:1667 msgid "unknown branch type" msgstr "未知的分支類型" -#: builtin/fetch.c:1654 +#: builtin/fetch.c:1669 msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." +"no source branch found;\n" +"you need to specify exactly one branch with the --set-upstream option" msgstr "" "找不到來源分支。\n" -"您需要使用 --set-upstream 選項指定一個分支。" +"您得使用 --set-upstream 選項明確指定一個分支" -#: builtin/fetch.c:1783 builtin/fetch.c:1846 +#: builtin/fetch.c:1799 builtin/fetch.c:1862 #, c-format msgid "Fetching %s\n" msgstr "正在取得 %s\n" -#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101 +#: builtin/fetch.c:1809 builtin/fetch.c:1864 #, c-format -msgid "Could not fetch %s" +msgid "could not fetch %s" msgstr "不能取得 %s" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1821 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "無法取得 '%s'（離開碼：%d）\n" -#: builtin/fetch.c:1909 +#: builtin/fetch.c:1925 msgid "" -"No remote repository specified. Please, specify either a URL or a\n" -"remote name from which new revisions should be fetched." -msgstr "未指定遠端版本庫。請透過一個 URL 或遠端版本庫名指定，用以取得新提交。" +"no remote repository specified; please specify either a URL or a\n" +"remote name from which new revisions should be fetched" +msgstr "" +"未指定遠端版本庫。請指定用以取得新修訂版本之\n" +"來源 URL 或者遠端版本庫名稱" -#: builtin/fetch.c:1945 -msgid "You need to specify a tag name." -msgstr "您需要指定一個標籤名稱。" +#: builtin/fetch.c:1961 +msgid "you need to specify a tag name" +msgstr "您需要指定標籤名稱" -#: builtin/fetch.c:2009 +#: builtin/fetch.c:2027 msgid "--negotiate-only needs one or more --negotiate-tip=*" msgstr "--negotiate-only 需要一或多個 --negotiate-tip=*" -#: builtin/fetch.c:2013 -msgid "Negative depth in --deepen is not supported" +#: builtin/fetch.c:2031 +msgid "negative depth in --deepen is not supported" msgstr "--deepen 不支援負數深度" -#: builtin/fetch.c:2015 -msgid "--deepen and --depth are mutually exclusive" -msgstr "--deepen 和 --depth 是互斥的" - -#: builtin/fetch.c:2020 -msgid "--depth and --unshallow cannot be used together" -msgstr "--depth 和 --unshallow 不能同時使用" - -#: builtin/fetch.c:2022 +#: builtin/fetch.c:2040 msgid "--unshallow on a complete repository does not make sense" msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:2057 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能帶一個版本庫參數" -#: builtin/fetch.c:2041 +#: builtin/fetch.c:2059 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 帶引用規格沒有任何意義" -#: builtin/fetch.c:2050 +#: builtin/fetch.c:2068 #, c-format -msgid "No such remote or remote group: %s" -msgstr "沒有這樣的遠端或遠端組：%s" +msgid "no such remote or remote group: %s" +msgstr "無此遠端或遠端群組：%s" -#: builtin/fetch.c:2057 -msgid "Fetching a group and specifying refspecs does not make sense" -msgstr "取得組並指定引用規格沒有意義" +#: builtin/fetch.c:2076 +msgid "fetching a group and specifying refspecs does not make sense" +msgstr "取得群組並指定引用規格無意義" -#: builtin/fetch.c:2073 +#: builtin/fetch.c:2092 msgid "must supply remote when using --negotiate-only" msgstr "使用 --negotiate-only 時必須提供遠端" -#: builtin/fetch.c:2078 -msgid "Protocol does not support --negotiate-only, exiting." -msgstr "通訊協定不支援 --negotiate-only，結束。" - #: builtin/fetch.c:2097 +msgid "protocol does not support --negotiate-only, exiting" +msgstr "通訊協定不支援 --negotiate-only。結束" + +#: builtin/fetch.c:2116 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "只可以將 --filter 用於在 extensions.partialclone 中設定的遠端版本庫" -#: builtin/fetch.c:2101 +#: builtin/fetch.c:2120 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic 只能在擷取 (fetch) 一個遠端時使用" -#: builtin/fetch.c:2105 +#: builtin/fetch.c:2124 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin 只能在取得一個遠端時使用" @@ -15232,23 +15156,27 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <說明>] [--log[=<n>] | --no-log] [--file <檔案>]" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:19 msgid "populate log with at most <n> entries from shortlog" msgstr "向提交說明中最多複製指定條目（合併而來的提交）的簡短說明" -#: builtin/fmt-merge-msg.c:21 +#: builtin/fmt-merge-msg.c:22 msgid "alias for --log (deprecated)" msgstr "參數 --log 的別名（已棄用）" -#: builtin/fmt-merge-msg.c:24 +#: builtin/fmt-merge-msg.c:25 msgid "text" msgstr "文字" -#: builtin/fmt-merge-msg.c:25 +#: builtin/fmt-merge-msg.c:26 msgid "use <text> as start of message" msgstr "使用 <文字> 作為提交說明的開始" -#: builtin/fmt-merge-msg.c:26 +#: builtin/fmt-merge-msg.c:28 +msgid "use <name> instead of the real target branch" +msgstr "使用 <名稱> 而非實際目的地分支" + +#: builtin/fmt-merge-msg.c:29 msgid "file to read from" msgstr "從檔案中讀取" @@ -15268,47 +15196,47 @@ msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]" msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for shells" msgstr "引用占位符適用於 shells" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:33 msgid "quote placeholders suitably for perl" msgstr "引用占位符適用於 perl" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:35 msgid "quote placeholders suitably for python" msgstr "引用占位符適用於 python" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "quote placeholders suitably for Tcl" msgstr "引用占位符適用於 Tcl" -#: builtin/for-each-ref.c:39 +#: builtin/for-each-ref.c:40 msgid "show only <n> matched refs" msgstr "只顯示 <n> 個符合的引用" -#: builtin/for-each-ref.c:41 builtin/tag.c:481 +#: builtin/for-each-ref.c:42 builtin/tag.c:481 msgid "respect format colors" msgstr "遵照格式中的顏色輸出" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs which points at the given object" msgstr "只列印指向提供物件的引用" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs that are merged" msgstr "只列印已經合併的引用" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:48 msgid "print only refs that are not merged" msgstr "只列印沒有合併的引用" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:49 msgid "print only refs which contain the commit" msgstr "只列印包含該提交的引用" -#: builtin/for-each-ref.c:49 +#: builtin/for-each-ref.c:50 msgid "print only refs which don't contain the commit" msgstr "只列印不包含該提交的引用" @@ -15459,124 +15387,124 @@ msgstr "%s：物件損壞或遺失：%s" msgid "%s: object is of unknown type '%s': %s" msgstr "%s：物件屬於「%s」未知類型：%s" -#: builtin/fsck.c:644 +#: builtin/fsck.c:645 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析物件：%s" -#: builtin/fsck.c:664 +#: builtin/fsck.c:665 #, c-format msgid "bad sha1 file: %s" msgstr "壞的 sha1 檔案：%s" -#: builtin/fsck.c:685 +#: builtin/fsck.c:686 msgid "Checking object directory" msgstr "正在檢查物件目錄" -#: builtin/fsck.c:688 +#: builtin/fsck.c:689 msgid "Checking object directories" msgstr "正在檢查物件目錄" -#: builtin/fsck.c:704 +#: builtin/fsck.c:705 #, c-format msgid "Checking %s link" msgstr "正在檢查 %s 連結" -#: builtin/fsck.c:709 builtin/index-pack.c:859 +#: builtin/fsck.c:710 builtin/index-pack.c:859 #, c-format msgid "invalid %s" msgstr "無效的 %s" -#: builtin/fsck.c:716 +#: builtin/fsck.c:717 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的東西（%s）" -#: builtin/fsck.c:722 +#: builtin/fsck.c:723 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分離開頭指標的指向不存在" -#: builtin/fsck.c:726 +#: builtin/fsck.c:727 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一個尚未誕生的分支（%s）" -#: builtin/fsck.c:738 +#: builtin/fsck.c:739 msgid "Checking cache tree" msgstr "正在檢查快取樹" -#: builtin/fsck.c:743 +#: builtin/fsck.c:744 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s：cache-tree 中無效的 sha1 指標" -#: builtin/fsck.c:752 +#: builtin/fsck.c:753 msgid "non-tree in cache-tree" msgstr "cache-tree 中非樹狀物件" -#: builtin/fsck.c:783 +#: builtin/fsck.c:784 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<選項>] [<物件>...]" -#: builtin/fsck.c:789 +#: builtin/fsck.c:790 msgid "show unreachable objects" msgstr "顯示無法取得的物件" -#: builtin/fsck.c:790 +#: builtin/fsck.c:791 msgid "show dangling objects" msgstr "顯示懸空的物件" -#: builtin/fsck.c:791 +#: builtin/fsck.c:792 msgid "report tags" msgstr "報告標籤" -#: builtin/fsck.c:792 +#: builtin/fsck.c:793 msgid "report root nodes" msgstr "報告根節點" -#: builtin/fsck.c:793 +#: builtin/fsck.c:794 msgid "make index objects head nodes" msgstr "將索引亦作為檢查的頭節點" -#: builtin/fsck.c:794 +#: builtin/fsck.c:795 msgid "make reflogs head nodes (default)" msgstr "將引用日誌作為檢查的頭節點（預設）" -#: builtin/fsck.c:795 +#: builtin/fsck.c:796 msgid "also consider packs and alternate objects" msgstr "也考慮包和備用物件" -#: builtin/fsck.c:796 +#: builtin/fsck.c:797 msgid "check only connectivity" msgstr "僅檢查連通性" -#: builtin/fsck.c:797 builtin/mktag.c:76 +#: builtin/fsck.c:798 builtin/mktag.c:76 msgid "enable more strict checking" msgstr "啟用更嚴格的檢查" -#: builtin/fsck.c:799 +#: builtin/fsck.c:800 msgid "write dangling objects in .git/lost-found" msgstr "將懸空物件寫入 .git/lost-found 中" -#: builtin/fsck.c:800 builtin/prune.c:134 +#: builtin/fsck.c:801 builtin/prune.c:146 msgid "show progress" msgstr "顯示進度" -#: builtin/fsck.c:801 +#: builtin/fsck.c:802 msgid "show verbose names for reachable objects" msgstr "顯示可以取得物件的詳細名稱" -#: builtin/fsck.c:861 builtin/index-pack.c:261 +#: builtin/fsck.c:862 builtin/index-pack.c:261 msgid "Checking objects" msgstr "正在檢查物件" -#: builtin/fsck.c:889 +#: builtin/fsck.c:890 #, c-format msgid "%s: object missing" msgstr "%s：物件缺少" -#: builtin/fsck.c:900 +#: builtin/fsck.c:901 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "無效的參數：期望 sha1，得到 '%s'" @@ -15595,17 +15523,12 @@ msgstr "對 %s 呼叫 fstat 失敗：%s" msgid "failed to parse '%s' value '%s'" msgstr "無法解析 '%s' 值 '%s'" -#: builtin/gc.c:487 builtin/init-db.c:57 +#: builtin/gc.c:488 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574 -#, c-format -msgid "cannot read '%s'" -msgstr "不能讀取 '%s'" - -#: builtin/gc.c:503 +#: builtin/gc.c:504 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -15619,258 +15542,258 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:551 +#: builtin/gc.c:552 msgid "prune unreferenced objects" msgstr "清除未引用的物件" -#: builtin/gc.c:553 +#: builtin/gc.c:554 msgid "be more thorough (increased runtime)" msgstr "更徹底（增加執行時間）" -#: builtin/gc.c:554 +#: builtin/gc.c:555 msgid "enable auto-gc mode" msgstr "啟用自動垃圾回收模式" -#: builtin/gc.c:557 +#: builtin/gc.c:558 msgid "force running gc even if there may be another gc running" msgstr "強制執行 gc 即使另外一個 gc 正在執行" -#: builtin/gc.c:560 +#: builtin/gc.c:561 msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外，對所有其它包檔案重新打包" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "解析 gc.logexpiry 的值 %s 失敗" -#: builtin/gc.c:587 +#: builtin/gc.c:588 #, c-format msgid "failed to parse prune expiry value %s" msgstr "解析清除期限值 %s 失敗" -#: builtin/gc.c:607 +#: builtin/gc.c:608 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自動在後台執行版本庫打包以求最佳性能。\n" -#: builtin/gc.c:609 +#: builtin/gc.c:610 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自動打包版本庫以求最佳性能。\n" -#: builtin/gc.c:610 +#: builtin/gc.c:611 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手動維護參見 \"git help gc\"。\n" -#: builtin/gc.c:650 +#: builtin/gc.c:652 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "gc 已在「%s」機器 pid %<PRIuMAX> 執行（如果不是，使用 --force）" -#: builtin/gc.c:705 +#: builtin/gc.c:707 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多無法取得的鬆散物件，執行 'git prune' 刪除它們。" -#: builtin/gc.c:715 +#: builtin/gc.c:717 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<作業>] [--schedule]" -#: builtin/gc.c:745 +#: builtin/gc.c:747 msgid "--no-schedule is not allowed" msgstr "不允許 --no-schedule" -#: builtin/gc.c:750 +#: builtin/gc.c:752 #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "無法識別的 --schedule 引數 '%s'" -#: builtin/gc.c:868 +#: builtin/gc.c:870 msgid "failed to write commit-graph" msgstr "無法寫入提交圖形" -#: builtin/gc.c:904 +#: builtin/gc.c:906 msgid "failed to prefetch remotes" msgstr "無法預先取得遠端" -#: builtin/gc.c:1020 +#: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" msgstr "無法啟動 ‘git pack-objects’ 處理程序" -#: builtin/gc.c:1037 +#: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" msgstr "無法完成 ‘git pack-objects’ 處理程序" -#: builtin/gc.c:1088 +#: builtin/gc.c:1090 msgid "failed to write multi-pack-index" msgstr "無法寫入多包索引" -#: builtin/gc.c:1104 +#: builtin/gc.c:1106 msgid "'git multi-pack-index expire' failed" msgstr "'git multi-pack-index expire' 失敗" -#: builtin/gc.c:1163 +#: builtin/gc.c:1165 msgid "'git multi-pack-index repack' failed" msgstr "'git multi-pack-index repack' 失敗" -#: builtin/gc.c:1172 +#: builtin/gc.c:1174 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "略過增量重新打包工作，因為 core.multiPackIndex 已被停用" -#: builtin/gc.c:1276 +#: builtin/gc.c:1278 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "已存在 '%s' 鎖定檔案，略過維護" -#: builtin/gc.c:1306 +#: builtin/gc.c:1308 #, c-format msgid "task '%s' failed" msgstr "作業 '%s' 失敗" -#: builtin/gc.c:1388 +#: builtin/gc.c:1390 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' 非有效作業" -#: builtin/gc.c:1393 +#: builtin/gc.c:1395 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "不能多次選取 '%s' 作業" -#: builtin/gc.c:1408 +#: builtin/gc.c:1410 msgid "run tasks based on the state of the repository" msgstr "基於版本庫狀態執行作業" -#: builtin/gc.c:1409 +#: builtin/gc.c:1411 msgid "frequency" msgstr "frequency" -#: builtin/gc.c:1410 +#: builtin/gc.c:1412 msgid "run tasks based on frequency" msgstr "依據頻率執行工作" -#: builtin/gc.c:1413 +#: builtin/gc.c:1415 msgid "do not report progress or other information over stderr" msgstr "不要在 stderr 輸出進度或其他資訊" -#: builtin/gc.c:1414 +#: builtin/gc.c:1416 msgid "task" msgstr "作業" -#: builtin/gc.c:1415 +#: builtin/gc.c:1417 msgid "run a specific task" msgstr "執行指定作業" -#: builtin/gc.c:1432 +#: builtin/gc.c:1434 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "--auto 和 --schedule=<頻率> 請任選一" -#: builtin/gc.c:1475 +#: builtin/gc.c:1477 msgid "failed to run 'git config'" msgstr "無法執行 ‘git config’" -#: builtin/gc.c:1627 +#: builtin/gc.c:1629 #, c-format msgid "failed to expand path '%s'" msgstr "無法展開「%s」路徑" -#: builtin/gc.c:1654 builtin/gc.c:1692 +#: builtin/gc.c:1656 builtin/gc.c:1694 msgid "failed to start launchctl" msgstr "無法啟動 launchctl" -#: builtin/gc.c:1767 builtin/gc.c:2220 +#: builtin/gc.c:1769 builtin/gc.c:2237 #, c-format msgid "failed to create directories for '%s'" msgstr "無法建立「%s」的目錄" -#: builtin/gc.c:1794 +#: builtin/gc.c:1796 #, c-format msgid "failed to bootstrap service %s" msgstr "無法啟動載入 %s 服務" -#: builtin/gc.c:1887 +#: builtin/gc.c:1889 msgid "failed to create temp xml file" msgstr "無法建立暫存 XML 檔案" -#: builtin/gc.c:1977 +#: builtin/gc.c:1979 msgid "failed to start schtasks" msgstr "無法啟動 schtasks" -#: builtin/gc.c:2046 +#: builtin/gc.c:2063 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "無法執行 “crontab -l”；您的系統可能不支援 “cron”" -#: builtin/gc.c:2063 +#: builtin/gc.c:2080 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”" -#: builtin/gc.c:2067 +#: builtin/gc.c:2084 msgid "failed to open stdin of 'crontab'" msgstr "無法開啟 ‘crontab’ 的標準輸入" -#: builtin/gc.c:2109 +#: builtin/gc.c:2126 msgid "'crontab' died" msgstr "“crontab” 結束運作" -#: builtin/gc.c:2174 +#: builtin/gc.c:2191 msgid "failed to start systemctl" msgstr "無法啟動 systemctl" -#: builtin/gc.c:2184 +#: builtin/gc.c:2201 msgid "failed to run systemctl" msgstr "無法執行 systemctl" -#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62 -#: builtin/worktree.c:945 +#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62 +#: builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "刪除 '%s' 失敗" -#: builtin/gc.c:2378 +#: builtin/gc.c:2395 #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "無法識別的 --scheduler 引數 '%s'" -#: builtin/gc.c:2403 +#: builtin/gc.c:2420 msgid "neither systemd timers nor crontab are available" msgstr "不支援 systemd 計時器或 crontab" -#: builtin/gc.c:2418 +#: builtin/gc.c:2435 #, c-format msgid "%s scheduler is not available" msgstr "無法使用 %s 排程器" -#: builtin/gc.c:2432 +#: builtin/gc.c:2449 msgid "another process is scheduling background maintenance" msgstr "其他處理程序正在排定背景維護工作" -#: builtin/gc.c:2454 +#: builtin/gc.c:2471 msgid "git maintenance start [--scheduler=<scheduler>]" msgstr "git maintenance start [--scheduler=<scheduler>]" -#: builtin/gc.c:2463 +#: builtin/gc.c:2480 msgid "scheduler" msgstr "scheduler" -#: builtin/gc.c:2464 +#: builtin/gc.c:2481 msgid "scheduler to trigger git maintenance run" msgstr "要觸發 git maintenance run 的排程器" -#: builtin/gc.c:2478 +#: builtin/gc.c:2495 msgid "failed to add repo to global config" msgstr "無法將版本庫加至全域設定" -#: builtin/gc.c:2487 +#: builtin/gc.c:2504 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <子命令> [<選項>]" -#: builtin/gc.c:2506 +#: builtin/gc.c:2523 #, c-format msgid "invalid subcommand: %s" msgstr "無效子命令：%s" @@ -16239,25 +16162,25 @@ msgstr "git help [-c|--config]" msgid "unrecognized help format '%s'" msgstr "無法識別的協助格式 '%s'" -#: builtin/help.c:223 +#: builtin/help.c:222 msgid "Failed to start emacsclient." msgstr "無法啟動 emacsclient。" -#: builtin/help.c:236 +#: builtin/help.c:235 msgid "Failed to parse emacsclient version." msgstr "無法解析 emacsclient 版本。" -#: builtin/help.c:244 +#: builtin/help.c:243 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302 +#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301 #, c-format msgid "failed to exec '%s'" msgstr "執行 '%s' 失敗" -#: builtin/help.c:340 +#: builtin/help.c:339 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -16266,7 +16189,7 @@ msgstr "" "'%s'：不支援的 man 手冊檢視器的路徑。\n" "請使用 'man.<工具>.cmd'。" -#: builtin/help.c:352 +#: builtin/help.c:351 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -16275,39 +16198,39 @@ msgstr "" "'%s': 支援的 man 手冊檢視器指令。\n" "請使用 'man.<工具>.path'。" -#: builtin/help.c:467 +#: builtin/help.c:466 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 檢視器。" -#: builtin/help.c:483 +#: builtin/help.c:482 msgid "no man viewer handled the request" msgstr "沒有 man 檢視器處理此請求" -#: builtin/help.c:490 +#: builtin/help.c:489 msgid "no info viewer handled the request" msgstr "沒有 info 檢視器處理此請求" -#: builtin/help.c:551 builtin/help.c:562 git.c:348 +#: builtin/help.c:550 builtin/help.c:561 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的別名" -#: builtin/help.c:565 git.c:380 +#: builtin/help.c:564 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "壞的 alias.%s 字串：%s" -#: builtin/help.c:581 +#: builtin/help.c:580 msgid "this option doesn't take any other arguments" msgstr "本選項不取其他引數" -#: builtin/help.c:602 builtin/help.c:629 +#: builtin/help.c:601 builtin/help.c:628 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:624 +#: builtin/help.c:623 msgid "'git help config' for more information" msgstr "'git help config' 取得更多訊息" @@ -16568,18 +16491,10 @@ msgstr "錯誤選項 %s" msgid "unknown hash algorithm '%s'" msgstr "未知的「%s」雜湊算法" -#: builtin/index-pack.c:1848 -msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin 不能和 --stdin 同時使用" - #: builtin/index-pack.c:1850 msgid "--stdin requires a git repository" msgstr "--stdin 需要一個 git 版本庫" -#: builtin/index-pack.c:1852 -msgid "--object-format cannot be used with --stdin" -msgstr "--object-format 不能和 --stdin 同時使用" - #: builtin/index-pack.c:1867 msgid "--verify with no packfile name given" msgstr "--verify 沒有提供 packfile 名稱參數" @@ -16705,10 +16620,6 @@ msgstr "雜湊" msgid "specify the hash algorithm to use" msgstr "指定要使用的雜湊算法" -#: builtin/init-db.c:560 -msgid "--separate-git-dir and --bare are mutually exclusive" -msgstr "--separate-git-dir 和 --bare 互斥" - #: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" @@ -16838,85 +16749,85 @@ msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱 msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用" -#: builtin/log.c:306 +#: builtin/log.c:321 #, c-format msgid "Final output: %d %s\n" msgstr "最終輸出：%d %s\n" -#: builtin/log.c:571 +#: builtin/log.c:586 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 損壞的檔案" -#: builtin/log.c:586 builtin/log.c:676 +#: builtin/log.c:601 builtin/log.c:691 #, c-format msgid "could not read object %s" msgstr "不能讀取物件 %s" -#: builtin/log.c:701 +#: builtin/log.c:716 #, c-format msgid "unknown type: %d" msgstr "未知類型：%d" -#: builtin/log.c:846 +#: builtin/log.c:861 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：從描述產生附函的模式無效" -#: builtin/log.c:853 +#: builtin/log.c:868 msgid "format.headers without value" msgstr "format.headers 沒有值" -#: builtin/log.c:982 +#: builtin/log.c:997 #, c-format msgid "cannot open patch file %s" msgstr "無法開啟修補檔案 %s" -#: builtin/log.c:999 +#: builtin/log.c:1014 msgid "need exactly one range" msgstr "只需要一個範圍" -#: builtin/log.c:1009 +#: builtin/log.c:1024 msgid "not a range" msgstr "不是一個範圍" -#: builtin/log.c:1173 +#: builtin/log.c:1188 msgid "cover letter needs email format" msgstr "附函需要信件位址格式" -#: builtin/log.c:1179 +#: builtin/log.c:1194 msgid "failed to create cover-letter file" msgstr "無法建立附函檔案" -#: builtin/log.c:1266 +#: builtin/log.c:1281 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1293 +#: builtin/log.c:1308 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<選項>] [<從> | <版本範圍>]" -#: builtin/log.c:1351 +#: builtin/log.c:1366 msgid "two output directories?" msgstr "兩個輸出目錄？" -#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 +#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "無法將 '%s' 解析為一個有效引用" -#: builtin/log.c:1522 +#: builtin/log.c:1537 msgid "could not find exact merge base" msgstr "不能找到準確的合併基礎" -#: builtin/log.c:1532 +#: builtin/log.c:1547 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16926,405 +16837,395 @@ msgstr "" "git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n" "參數 --base=<基礎提交> 手動指定一個基礎提交" -#: builtin/log.c:1555 +#: builtin/log.c:1570 msgid "failed to find exact merge base" msgstr "無法找到準確的合併基礎" -#: builtin/log.c:1572 +#: builtin/log.c:1587 msgid "base commit should be the ancestor of revision list" msgstr "基礎提交應該是版本列表的祖先" -#: builtin/log.c:1582 +#: builtin/log.c:1597 msgid "base commit shouldn't be in revision list" msgstr "基礎提交不應該出現在版本列表中" -#: builtin/log.c:1640 +#: builtin/log.c:1655 msgid "cannot get patch id" msgstr "無法得到修補檔 id" -#: builtin/log.c:1703 +#: builtin/log.c:1718 msgid "failed to infer range-diff origin of current series" msgstr "無法推斷目前系列的 range-diff 起點" -#: builtin/log.c:1705 +#: builtin/log.c:1720 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "將 '%s' 當作目前系列的 range-diff 起點" -#: builtin/log.c:1749 +#: builtin/log.c:1764 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一個修補檔" -#: builtin/log.c:1752 +#: builtin/log.c:1767 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多個修補檔" -#: builtin/log.c:1756 +#: builtin/log.c:1771 msgid "print patches to standard out" msgstr "列印修補檔到標準輸出" -#: builtin/log.c:1758 +#: builtin/log.c:1773 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1760 +#: builtin/log.c:1775 msgid "use simple number sequence for output file names" msgstr "使用簡單的數字序列作為輸出檔案名" -#: builtin/log.c:1761 +#: builtin/log.c:1776 msgid "sfx" msgstr "後綴" -#: builtin/log.c:1762 +#: builtin/log.c:1777 msgid "use <sfx> instead of '.patch'" msgstr "使用 <後綴> 代替 '.patch'" -#: builtin/log.c:1764 +#: builtin/log.c:1779 msgid "start numbering patches at <n> instead of 1" msgstr "修補檔以 <n> 開始編號，而不是1" -#: builtin/log.c:1765 +#: builtin/log.c:1780 msgid "reroll-count" msgstr "reroll-count" -#: builtin/log.c:1766 +#: builtin/log.c:1781 msgid "mark the series as Nth re-roll" msgstr "標記修補檔系列是第幾次重製" -#: builtin/log.c:1768 +#: builtin/log.c:1783 msgid "max length of output filename" msgstr "輸出檔名的最大長度" -#: builtin/log.c:1770 +#: builtin/log.c:1785 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1773 +#: builtin/log.c:1788 msgid "cover-from-description-mode" msgstr "從描述產生附函的模式" -#: builtin/log.c:1774 +#: builtin/log.c:1789 msgid "generate parts of a cover letter based on a branch's description" msgstr "基於分支描述產生部分附函" -#: builtin/log.c:1776 +#: builtin/log.c:1791 msgid "use [<prefix>] instead of [PATCH]" msgstr "使用 [<前綴>] 代替 [PATCH]" -#: builtin/log.c:1779 +#: builtin/log.c:1794 msgid "store resulting files in <dir>" msgstr "把結果檔案儲存在 <目錄>" -#: builtin/log.c:1782 +#: builtin/log.c:1797 msgid "don't strip/add [PATCH]" msgstr "不刪除/新增 [PATCH]" -#: builtin/log.c:1785 +#: builtin/log.c:1800 msgid "don't output binary diffs" msgstr "不輸出二進位差異" -#: builtin/log.c:1787 +#: builtin/log.c:1802 msgid "output all-zero hash in From header" msgstr "在 From 標頭訊息中輸出全為零的雜湊值" -#: builtin/log.c:1789 +#: builtin/log.c:1804 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的修補檔" -#: builtin/log.c:1791 +#: builtin/log.c:1806 msgid "show patch format instead of default (patch + stat)" msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）" -#: builtin/log.c:1793 +#: builtin/log.c:1808 msgid "Messaging" msgstr "信件傳送" -#: builtin/log.c:1794 +#: builtin/log.c:1809 msgid "header" msgstr "header" -#: builtin/log.c:1795 +#: builtin/log.c:1810 msgid "add email header" msgstr "新增信件頭" -#: builtin/log.c:1796 builtin/log.c:1797 +#: builtin/log.c:1811 builtin/log.c:1812 msgid "email" msgstr "信件位址" -#: builtin/log.c:1796 +#: builtin/log.c:1811 msgid "add To: header" msgstr "新增收件人" -#: builtin/log.c:1797 +#: builtin/log.c:1812 msgid "add Cc: header" msgstr "新增抄送" -#: builtin/log.c:1798 +#: builtin/log.c:1813 msgid "ident" msgstr "標記" -#: builtin/log.c:1799 +#: builtin/log.c:1814 msgid "set From address to <ident> (or committer ident if absent)" msgstr "將 From 位址設定為 <標記>（如若不提供，則用提交者 ID 做為位址）" -#: builtin/log.c:1801 +#: builtin/log.c:1816 msgid "message-id" msgstr "信件標記" -#: builtin/log.c:1802 +#: builtin/log.c:1817 msgid "make first mail a reply to <message-id>" msgstr "使第一封信件作為對 <信件標記> 的回覆" -#: builtin/log.c:1803 builtin/log.c:1806 +#: builtin/log.c:1818 builtin/log.c:1821 msgid "boundary" msgstr "邊界" -#: builtin/log.c:1804 +#: builtin/log.c:1819 msgid "attach the patch" msgstr "附件方式新增修補檔" -#: builtin/log.c:1807 +#: builtin/log.c:1822 msgid "inline the patch" msgstr "內聯顯示修補檔" -#: builtin/log.c:1811 +#: builtin/log.c:1826 msgid "enable message threading, styles: shallow, deep" msgstr "啟用信件線索，風格：淺，深" -#: builtin/log.c:1813 +#: builtin/log.c:1828 msgid "signature" msgstr "簽名" -#: builtin/log.c:1814 +#: builtin/log.c:1829 msgid "add a signature" msgstr "新增一個簽名" -#: builtin/log.c:1815 +#: builtin/log.c:1830 msgid "base-commit" msgstr "基礎提交" -#: builtin/log.c:1816 +#: builtin/log.c:1831 msgid "add prerequisite tree info to the patch series" msgstr "為修補檔列表新增前置樹訊息" -#: builtin/log.c:1819 +#: builtin/log.c:1834 msgid "add a signature from a file" msgstr "從檔案新增一個簽名" -#: builtin/log.c:1820 +#: builtin/log.c:1835 msgid "don't print the patch filenames" msgstr "不要列印修補檔檔案名" -#: builtin/log.c:1822 +#: builtin/log.c:1837 msgid "show progress while generating patches" msgstr "在生成修補檔時顯示進度" -#: builtin/log.c:1824 +#: builtin/log.c:1839 msgid "show changes against <rev> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <rev> 的差異" -#: builtin/log.c:1827 +#: builtin/log.c:1842 msgid "show changes against <refspec> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異" -#: builtin/log.c:1829 builtin/range-diff.c:28 +#: builtin/log.c:1844 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "建立權重的百分比" -#: builtin/log.c:1916 +#: builtin/log.c:1931 #, c-format msgid "invalid ident line: %s" msgstr "包含無效的身份標記：%s" -#: builtin/log.c:1931 -msgid "-n and -k are mutually exclusive" -msgstr "-n 和 -k 互斥" - -#: builtin/log.c:1933 -msgid "--subject-prefix/--rfc and -k are mutually exclusive" -msgstr "--subject-prefix/--rfc 和 -k 互斥" - -#: builtin/log.c:1941 +#: builtin/log.c:1956 msgid "--name-only does not make sense" msgstr "--name-only 無意義" -#: builtin/log.c:1943 +#: builtin/log.c:1958 msgid "--name-status does not make sense" msgstr "--name-status 無意義" -#: builtin/log.c:1945 +#: builtin/log.c:1960 msgid "--check does not make sense" msgstr "--check 無意義" -#: builtin/log.c:1967 -msgid "--stdout, --output, and --output-directory are mutually exclusive" -msgstr "--stdout、--output 和 --output-directory 互斥" - -#: builtin/log.c:2089 +#: builtin/log.c:2104 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:2093 +#: builtin/log.c:2108 msgid "Interdiff:" msgstr "版本間差異：" -#: builtin/log.c:2094 +#: builtin/log.c:2109 #, c-format msgid "Interdiff against v%d:" msgstr "對 v%d 的版本差異：" -#: builtin/log.c:2100 -msgid "--creation-factor requires --range-diff" -msgstr "--creation-factor 需要 --range-diff" - -#: builtin/log.c:2104 +#: builtin/log.c:2119 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:2112 +#: builtin/log.c:2127 msgid "Range-diff:" msgstr "範圍差異：" -#: builtin/log.c:2113 +#: builtin/log.c:2128 #, c-format msgid "Range-diff against v%d:" msgstr "對 v%d 的範圍差異：" -#: builtin/log.c:2124 +#: builtin/log.c:2139 #, c-format msgid "unable to read signature file '%s'" msgstr "無法讀取簽名檔案 '%s'" -#: builtin/log.c:2160 +#: builtin/log.c:2175 msgid "Generating patches" msgstr "生成修補檔" -#: builtin/log.c:2204 +#: builtin/log.c:2219 msgid "failed to create output files" msgstr "無法建立輸出檔案" -#: builtin/log.c:2263 +#: builtin/log.c:2279 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]" -#: builtin/log.c:2317 +#: builtin/log.c:2333 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:564 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<選項>] [<檔案>...]" -#: builtin/ls-files.c:615 +#: builtin/ls-files.c:618 msgid "separate paths with the NUL character" msgstr "用 NUL 字元分隔路徑" -#: builtin/ls-files.c:617 +#: builtin/ls-files.c:620 msgid "identify the file status with tags" msgstr "用標籤標記檔案的狀態" -#: builtin/ls-files.c:619 +#: builtin/ls-files.c:622 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小寫字母表示 '假設未改變的' 檔案" -#: builtin/ls-files.c:621 +#: builtin/ls-files.c:624 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "使用小寫字母表示 'fsmonitor clean' 檔案" -#: builtin/ls-files.c:623 +#: builtin/ls-files.c:626 msgid "show cached files in the output (default)" msgstr "顯示快取的檔案（預設）" -#: builtin/ls-files.c:625 +#: builtin/ls-files.c:628 msgid "show deleted files in the output" msgstr "顯示已刪除的檔案" -#: builtin/ls-files.c:627 +#: builtin/ls-files.c:630 msgid "show modified files in the output" msgstr "顯示已修改的檔案" -#: builtin/ls-files.c:629 +#: builtin/ls-files.c:632 msgid "show other files in the output" msgstr "顯示其它檔案" -#: builtin/ls-files.c:631 +#: builtin/ls-files.c:634 msgid "show ignored files in the output" msgstr "顯示忽略的檔案" -#: builtin/ls-files.c:634 +#: builtin/ls-files.c:637 msgid "show staged contents' object name in the output" msgstr "顯示暫存區內容的物件名稱" -#: builtin/ls-files.c:636 +#: builtin/ls-files.c:639 msgid "show files on the filesystem that need to be removed" msgstr "顯示檔案系統需要刪除的檔案" -#: builtin/ls-files.c:638 +#: builtin/ls-files.c:641 msgid "show 'other' directories' names only" msgstr "只顯示「其他」目錄的名稱" -#: builtin/ls-files.c:640 +#: builtin/ls-files.c:643 msgid "show line endings of files" msgstr "顯示檔案換行符號格式" -#: builtin/ls-files.c:642 +#: builtin/ls-files.c:645 msgid "don't show empty directories" msgstr "不顯示空目錄" -#: builtin/ls-files.c:645 +#: builtin/ls-files.c:648 msgid "show unmerged files in the output" msgstr "顯示未合併的檔案" -#: builtin/ls-files.c:647 +#: builtin/ls-files.c:650 msgid "show resolve-undo information" msgstr "顯示 resolve-undo 訊息" -#: builtin/ls-files.c:649 +#: builtin/ls-files.c:652 msgid "skip files matching pattern" msgstr "符合排除檔案的模式" -#: builtin/ls-files.c:652 +#: builtin/ls-files.c:655 msgid "read exclude patterns from <file>" msgstr "從 <檔案> 讀取排除模式 (pattern)" -#: builtin/ls-files.c:655 +#: builtin/ls-files.c:658 msgid "read additional per-directory exclude patterns in <file>" msgstr "從 <檔案> 讀取額外的每個目錄的排除模式" -#: builtin/ls-files.c:657 +#: builtin/ls-files.c:660 msgid "add the standard git exclusions" msgstr "新增標準的 git 排除" -#: builtin/ls-files.c:661 +#: builtin/ls-files.c:664 msgid "make the output relative to the project top directory" msgstr "顯示相對於頂級目錄的檔案名" -#: builtin/ls-files.c:664 +#: builtin/ls-files.c:667 msgid "recurse through submodules" msgstr "在子模組中遞迴" -#: builtin/ls-files.c:666 +#: builtin/ls-files.c:669 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <檔案> 都不在索引區，視為錯誤" -#: builtin/ls-files.c:667 +#: builtin/ls-files.c:670 msgid "tree-ish" msgstr "樹或提交" -#: builtin/ls-files.c:668 +#: builtin/ls-files.c:671 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "假裝自從 <樹或提交> 之後刪除的路徑仍然存在" -#: builtin/ls-files.c:670 +#: builtin/ls-files.c:673 msgid "show debugging data" msgstr "顯示除錯資料" -#: builtin/ls-files.c:672 +#: builtin/ls-files.c:675 msgid "suppress duplicate entries" msgstr "不顯示重複項目" +#: builtin/ls-files.c:677 +#, fuzzy +#| msgid "toggle the use of a sparse index" +msgid "show sparse directories in the presence of a sparse index" +msgstr "對稀疏索引顯示稀疏目錄" + #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -17426,11 +17327,11 @@ msgstr "複製 Message-ID 至提交說明末尾" #: builtin/mailinfo.c:64 msgid "re-code metadata to i18n.commitEncoding" -msgstr "重新將中繼資料編碼為 i18n.commitEncoding 的設定值" +msgstr "重新將中介資料編碼為 i18n.commitEncoding 的設定值" #: builtin/mailinfo.c:67 msgid "disable charset re-coding of metadata" -msgstr "停用中繼資料的字元重新編碼功能" +msgstr "停用中介資料的字元重新編碼功能" #: builtin/mailinfo.c:69 msgid "encoding" @@ -17438,7 +17339,7 @@ msgstr "編碼" #: builtin/mailinfo.c:70 msgid "re-code metadata to this encoding" -msgstr "重新將中繼資料編碼為這個編碼方式" +msgstr "重新將中介資料編碼為這個編碼方式" #: builtin/mailinfo.c:72 msgid "use scissors" @@ -17518,26 +17419,30 @@ msgid "use a diff3 based merge" msgstr "使用基於 diff3 的合併" #: builtin/merge-file.c:37 +msgid "use a zealous diff3 based merge" +msgstr "使用基於 zealous diff3 的合併" + +#: builtin/merge-file.c:39 msgid "for conflicts, use our version" msgstr "如果衝突，使用我們的版本" -#: builtin/merge-file.c:39 +#: builtin/merge-file.c:41 msgid "for conflicts, use their version" msgstr "如果衝突，使用他們的版本" -#: builtin/merge-file.c:41 +#: builtin/merge-file.c:43 msgid "for conflicts, use a union version" msgstr "如果衝突，使用聯合版本" -#: builtin/merge-file.c:44 +#: builtin/merge-file.c:46 msgid "for conflicts, use this marker size" msgstr "如果衝突，使用指定長度的標記" -#: builtin/merge-file.c:45 +#: builtin/merge-file.c:47 msgid "do not warn about conflicts" msgstr "不要警告衝突" -#: builtin/merge-file.c:47 +#: builtin/merge-file.c:49 msgid "set labels for file1/orig-file/file2" msgstr "為 檔案1/初始檔案/檔案2 設定標籤" @@ -17575,179 +17480,183 @@ msgstr "合併 %s 和 %s\n" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<選項>] [<提交>...]" -#: builtin/merge.c:124 +#: builtin/merge.c:125 msgid "switch `m' requires a value" msgstr "開關 `m' 需要一個值" -#: builtin/merge.c:147 +#: builtin/merge.c:148 #, c-format msgid "option `%s' requires a value" msgstr "選項 `%s' 需要一個值" -#: builtin/merge.c:200 +#: builtin/merge.c:201 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合併策略 '%s'。\n" -#: builtin/merge.c:201 +#: builtin/merge.c:202 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:206 +#: builtin/merge.c:207 #, c-format msgid "Available custom strategies are:" msgstr "可用的自訂策略有：" -#: builtin/merge.c:257 builtin/pull.c:134 +#: builtin/merge.c:258 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "在合併的最後不顯示差異統計" -#: builtin/merge.c:260 builtin/pull.c:137 +#: builtin/merge.c:261 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "在合併的最後顯示差異統計" -#: builtin/merge.c:261 builtin/pull.c:140 +#: builtin/merge.c:262 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "（和 --stat 同義）" -#: builtin/merge.c:263 builtin/pull.c:143 +#: builtin/merge.c:264 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合併提交說明中新增（最多 <n> 條）精簡提交記錄" -#: builtin/merge.c:266 builtin/pull.c:149 +#: builtin/merge.c:267 builtin/pull.c:149 msgid "create a single commit instead of doing a merge" msgstr "建立一個單獨的提交而不是做一次合併" -#: builtin/merge.c:268 builtin/pull.c:152 +#: builtin/merge.c:269 builtin/pull.c:152 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合併成功，執行一次提交（預設）" -#: builtin/merge.c:270 builtin/pull.c:155 +#: builtin/merge.c:271 builtin/pull.c:155 msgid "edit message before committing" msgstr "在提交前編輯提交說明" -#: builtin/merge.c:272 +#: builtin/merge.c:273 msgid "allow fast-forward (default)" msgstr "允許快轉（預設）" -#: builtin/merge.c:274 builtin/pull.c:162 +#: builtin/merge.c:275 builtin/pull.c:162 msgid "abort if fast-forward is not possible" msgstr "如果不能快轉就放棄合併" -#: builtin/merge.c:278 builtin/pull.c:168 +#: builtin/merge.c:279 builtin/pull.c:168 msgid "verify that the named commit has a valid GPG signature" msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名" -#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172 +#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172 #: builtin/rebase.c:1117 builtin/revert.c:114 msgid "strategy" msgstr "策略" -#: builtin/merge.c:280 builtin/pull.c:173 +#: builtin/merge.c:281 builtin/pull.c:173 msgid "merge strategy to use" msgstr "要使用的合併策略" -#: builtin/merge.c:281 builtin/pull.c:176 +#: builtin/merge.c:282 builtin/pull.c:176 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:282 builtin/pull.c:177 +#: builtin/merge.c:283 builtin/pull.c:177 msgid "option for selected merge strategy" msgstr "所選的合併策略的選項" -#: builtin/merge.c:284 +#: builtin/merge.c:285 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合併的提交說明（針對非快轉式合併）" #: builtin/merge.c:291 +msgid "use <name> instead of the real target" +msgstr "使用 <名稱> 而非實際目的地" + +#: builtin/merge.c:294 msgid "abort the current in-progress merge" msgstr "放棄目前正在進行的合併" # -#: builtin/merge.c:293 +#: builtin/merge.c:296 msgid "--abort but leave index and working tree alone" msgstr "--abort，但是保留索引和工作區" -#: builtin/merge.c:295 +#: builtin/merge.c:298 msgid "continue the current in-progress merge" msgstr "繼續目前正在進行的合併" -#: builtin/merge.c:297 builtin/pull.c:184 +#: builtin/merge.c:300 builtin/pull.c:184 msgid "allow merging unrelated histories" msgstr "允許合並不相關的歷史" -#: builtin/merge.c:304 +#: builtin/merge.c:307 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤" -#: builtin/merge.c:321 +#: builtin/merge.c:323 msgid "could not run stash." msgstr "不能執行儲藏。" -#: builtin/merge.c:326 +#: builtin/merge.c:328 msgid "stash failed" msgstr "儲藏失敗" -#: builtin/merge.c:331 +#: builtin/merge.c:333 #, c-format msgid "not a valid object: %s" msgstr "不是一個有效物件：%s" -#: builtin/merge.c:353 builtin/merge.c:370 +#: builtin/merge.c:355 builtin/merge.c:372 msgid "read-tree failed" msgstr "讀取樹失敗" # 譯者：請維持前導空格 -#: builtin/merge.c:401 +#: builtin/merge.c:403 msgid "Already up to date. (nothing to squash)" msgstr "已經是最新的。（無需壓縮 (squash)）" -#: builtin/merge.c:415 +#: builtin/merge.c:417 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "壓縮提交 -- 未更新 HEAD\n" -#: builtin/merge.c:465 +#: builtin/merge.c:467 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "無合併訊息 -- 未更新 HEAD\n" -#: builtin/merge.c:515 +#: builtin/merge.c:517 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 沒有指向一個提交" -#: builtin/merge.c:603 +#: builtin/merge.c:605 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c:730 +#: builtin/merge.c:732 msgid "Not handling anything other than two heads merge." msgstr "未處理兩個頭合併之外的任何動作。" -#: builtin/merge.c:743 +#: builtin/merge.c:745 #, c-format msgid "unknown strategy option: -X%s" msgstr "未知的策略選項：-X%s" -#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223 +#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "不能寫 %s" -#: builtin/merge.c:814 +#: builtin/merge.c:816 #, c-format msgid "Could not read from '%s'" msgstr "不能從 '%s' 讀取" -#: builtin/merge.c:823 +#: builtin/merge.c:825 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合並，使用 'git commit' 完成此次合併。\n" -#: builtin/merge.c:829 +#: builtin/merge.c:831 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -17757,83 +17666,83 @@ msgstr "" "合併到主題分支。\n" "\n" -#: builtin/merge.c:834 +#: builtin/merge.c:836 msgid "An empty message aborts the commit.\n" msgstr "空的提交說明會終止提交。\n" -#: builtin/merge.c:837 +#: builtin/merge.c:839 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交。\n" -#: builtin/merge.c:892 +#: builtin/merge.c:894 msgid "Empty commit message." msgstr "空提交說明。" -#: builtin/merge.c:907 +#: builtin/merge.c:909 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:968 +#: builtin/merge.c:970 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n" -#: builtin/merge.c:1007 +#: builtin/merge.c:1009 msgid "No current branch." msgstr "沒有目前分支。" -#: builtin/merge.c:1009 +#: builtin/merge.c:1011 msgid "No remote for the current branch." msgstr "目前分支沒有對應的遠端版本庫。" -#: builtin/merge.c:1011 +#: builtin/merge.c:1013 msgid "No default upstream defined for the current branch." msgstr "目前分支沒有定義預設的上游分支。" -#: builtin/merge.c:1016 +#: builtin/merge.c:1018 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支" -#: builtin/merge.c:1073 +#: builtin/merge.c:1075 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'" -#: builtin/merge.c:1174 +#: builtin/merge.c:1177 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合併：%s" -#: builtin/merge.c:1208 +#: builtin/merge.c:1211 msgid "not something we can merge" msgstr "不能合併" -#: builtin/merge.c:1321 +#: builtin/merge.c:1324 msgid "--abort expects no arguments" msgstr "--abort 不帶參數" -#: builtin/merge.c:1325 +#: builtin/merge.c:1328 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1343 +#: builtin/merge.c:1346 msgid "--quit expects no arguments" msgstr "--quit 不帶參數" -#: builtin/merge.c:1356 +#: builtin/merge.c:1359 msgid "--continue expects no arguments" msgstr "--continue 不帶參數" -#: builtin/merge.c:1360 +#: builtin/merge.c:1363 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1376 +#: builtin/merge.c:1379 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17841,7 +17750,7 @@ msgstr "" "您尚未結束您的合併（存在 MERGE_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1383 +#: builtin/merge.c:1386 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17849,84 +17758,76 @@ msgstr "" "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1386 +#: builtin/merge.c:1389 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1400 -msgid "You cannot combine --squash with --no-ff." -msgstr "您不能將 --squash 和 --no-ff 組合使用。" - -#: builtin/merge.c:1402 -msgid "You cannot combine --squash with --commit." -msgstr "您不能將 --squash 和 --commit 組合使用。" - -#: builtin/merge.c:1418 +#: builtin/merge.c:1421 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交並且 merge.defaultToUpstream 未設定。" -#: builtin/merge.c:1435 +#: builtin/merge.c:1438 msgid "Squash commit into empty head not supported yet" msgstr "尚不支援到空分支的壓縮提交" -#: builtin/merge.c:1437 +#: builtin/merge.c:1440 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快轉式提交沒有意義" -#: builtin/merge.c:1442 +#: builtin/merge.c:1445 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合併" -#: builtin/merge.c:1444 +#: builtin/merge.c:1447 msgid "Can merge only exactly one commit into empty head" msgstr "只能將一個提交合並到空分支上" -#: builtin/merge.c:1531 +#: builtin/merge.c:1534 msgid "refusing to merge unrelated histories" msgstr "拒絕合併無關的歷史" -#: builtin/merge.c:1550 +#: builtin/merge.c:1553 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1598 +#: builtin/merge.c:1601 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "嘗試非常小的索引內合併...\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1608 #, c-format msgid "Nope.\n" msgstr "無。\n" -#: builtin/merge.c:1664 builtin/merge.c:1730 +#: builtin/merge.c:1667 builtin/merge.c:1733 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "將樹回滾至原始狀態...\n" -#: builtin/merge.c:1668 +#: builtin/merge.c:1671 #, c-format msgid "Trying merge strategy %s...\n" msgstr "嘗試合併策略 %s...\n" -#: builtin/merge.c:1720 +#: builtin/merge.c:1723 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "沒有合併策略處理此合併。\n" -#: builtin/merge.c:1722 +#: builtin/merge.c:1725 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合併失敗。\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "使用 %s 策略，準備自行解決。\n" -#: builtin/merge.c:1746 +#: builtin/merge.c:1749 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自動合併進展順利，按要求在提交前停止\n" @@ -17968,7 +17869,7 @@ msgstr "stdin 上的標籤未通過我們的嚴格 fsck 檢查" msgid "tag on stdin did not refer to a valid object" msgstr "標準輸入上的標籤指向的不是有效物件" -#: builtin/mktag.c:104 builtin/tag.c:243 +#: builtin/mktag.c:104 builtin/tag.c:242 msgid "unable to write tag file" msgstr "無法寫標籤檔案" @@ -18032,7 +17933,7 @@ msgstr "寫入只包含指定索引的多包索引" msgid "refs snapshot for selecting bitmap commits" msgstr "用來選取位圖提交的引用快照" -#: builtin/multi-pack-index.c:202 +#: builtin/multi-pack-index.c:206 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -18129,52 +18030,52 @@ msgstr "%s，來源=%s，目的地=%s" msgid "Renaming %s to %s\n" msgstr "重新命名 %s 至 %s\n" -#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853 +#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857 #, c-format msgid "renaming '%s' failed" msgstr "重新命名 '%s' 失敗" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:474 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<選項>] <提交>..." -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:475 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<選項>] --all" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:476 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<選項>] --stdin" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:533 msgid "print only ref-based names (no object names)" msgstr "只輸出基於引用的名稱 (沒有物件名稱)" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:534 msgid "only use tags to name the commits" msgstr "只使用標籤來命名提交" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:536 msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相符合的引用" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:538 msgid "ignore refs matching <pattern>" msgstr "忽略和 <模式> 相符合的引用" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:540 msgid "list all commits reachable from all refs" msgstr "列出可以從所有引用存取的提交" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:541 msgid "read from stdin" msgstr "從標準輸入讀取" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:542 msgid "allow to print `undefined` names (default)" msgstr "允許列印 `未定義` 的名稱（預設）" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:548 msgid "dereference tags in the input (internal use)" msgstr "反向解析輸入中的標籤（內部使用）" @@ -18291,25 +18192,25 @@ msgstr "git notes get-ref" msgid "Write/edit the notes for the following object:" msgstr "為下面的物件寫/編輯說明：" -#: builtin/notes.c:150 +#: builtin/notes.c:149 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能為物件 '%s' 開始 'show'" -#: builtin/notes.c:154 +#: builtin/notes.c:153 msgid "could not read 'show' output" msgstr "不能讀取 'show' 的輸出" -#: builtin/notes.c:162 +#: builtin/notes.c:161 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "無法為物件 '%s' 完成 'show'" -#: builtin/notes.c:195 +#: builtin/notes.c:194 msgid "please supply the note contents using either -m or -F option" msgstr "請透過 -m 或 -F 選項為註解提供內容" -#: builtin/notes.c:204 +#: builtin/notes.c:203 msgid "unable to write note object" msgstr "不能寫註解物件" @@ -18318,7 +18219,7 @@ msgstr "不能寫註解物件" msgid "the note contents have been left in %s" msgstr "註解內容被留在 %s 中" -#: builtin/notes.c:240 builtin/tag.c:577 +#: builtin/notes.c:240 builtin/tag.c:581 #, c-format msgid "could not open or read '%s'" msgstr "不能開啟或讀取 '%s'" @@ -18360,8 +18261,8 @@ msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解" #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663 -#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983 -#: builtin/prune-packed.c:25 builtin/tag.c:587 +#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987 +#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591 msgid "too many arguments" msgstr "太多參數" @@ -18406,7 +18307,7 @@ msgstr "不能新增註解。發現物件 %s 已存在註解。使用 '-f' 覆 msgid "Overwriting existing notes for object %s\n" msgstr "覆蓋物件 %s 現存註解\n" -#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900 +#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904 #, c-format msgid "Removing note for object %s\n" msgstr "刪除物件 %s 的註解\n" @@ -18524,17 +18425,17 @@ msgstr "必須指定一個註解引用來合併" msgid "unknown -s/--strategy: %s" msgstr "未知的 -s/--strategy：%s" -#: builtin/notes.c:871 +#: builtin/notes.c:874 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "位於 %2$s 的一個到 %1$s 中的註解合併正在執行中" -#: builtin/notes.c:874 +#: builtin/notes.c:878 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "無法儲存連結到目前的註解引用（%s）" -#: builtin/notes.c:876 +#: builtin/notes.c:880 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -18544,41 +18445,41 @@ msgstr "" "自動合併說明失敗。修改 %s 中的衝突並且使用指令 'git notes merge --commit' 提" "交結果，或者使用指令 'git notes merge --abort' 終止合併。\n" -#: builtin/notes.c:895 builtin/tag.c:590 +#: builtin/notes.c:899 builtin/tag.c:594 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "無法解析 '%s' 為一個有效引用。" -#: builtin/notes.c:898 +#: builtin/notes.c:902 #, c-format msgid "Object %s has no note\n" msgstr "物件 %s 沒有註解\n" -#: builtin/notes.c:910 +#: builtin/notes.c:914 msgid "attempt to remove non-existent note is not an error" msgstr "嘗試刪除不存在的註解不是一個錯誤" -#: builtin/notes.c:913 +#: builtin/notes.c:917 msgid "read object names from the standard input" msgstr "從標準輸入讀取物件名稱" -#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147 +#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147 msgid "do not remove, show only" msgstr "不刪除，只顯示" -#: builtin/notes.c:953 +#: builtin/notes.c:957 msgid "report pruned notes" msgstr "報告清除的註解" -#: builtin/notes.c:996 +#: builtin/notes.c:1000 msgid "notes-ref" msgstr "註解引用" -#: builtin/notes.c:997 +#: builtin/notes.c:1001 msgid "use notes from <notes-ref>" msgstr "從 <註解引用> 使用註解" -#: builtin/notes.c:1032 builtin/stash.c:1752 +#: builtin/notes.c:1036 builtin/stash.c:1818 #, c-format msgid "unknown subcommand: %s" msgstr "未知子指令：%s" @@ -18967,10 +18868,6 @@ msgstr "最小的包檔案大小是 1 MiB" msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用於建立一個可索引包" -#: builtin/pack-objects.c:4073 -msgid "--keep-unreachable and --unpack-unreachable are incompatible" -msgstr "--keep-unreachable 和 --unpack-unreachable 不相容" - #: builtin/pack-objects.c:4079 msgid "cannot use --filter without --stdout" msgstr "不能在沒有 --stdout 的情況下使用 --filter" @@ -18987,7 +18884,7 @@ msgstr "無法將內部版本清單與 --stdin-packs 結合使用" msgid "Enumerating objects" msgstr "枚舉物件" -#: builtin/pack-objects.c:4181 +#: builtin/pack-objects.c:4180 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -19030,19 +18927,19 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <時間>] [--] [<head>...]" -#: builtin/prune.c:133 +#: builtin/prune.c:145 msgid "report pruned objects" msgstr "報告清除的物件" -#: builtin/prune.c:136 +#: builtin/prune.c:148 msgid "expire objects older than <time>" msgstr "使早於提供時間的物件過期" -#: builtin/prune.c:138 +#: builtin/prune.c:150 msgid "limit traversal to objects outside promisor packfiles" msgstr "限制遍歷 promisor packfile 以外的物件" -#: builtin/prune.c:151 +#: builtin/prune.c:163 msgid "cannot prune in a precious-objects repo" msgstr "不能在珍品版本庫中執行清理動作" @@ -19075,7 +18972,7 @@ msgstr "允許快轉式" msgid "control use of pre-merge-commit and commit-msg hooks" msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用" -#: builtin/pull.c:171 parse-options.h:338 +#: builtin/pull.c:171 parse-options.h:340 msgid "automatically stash/stash pop before and after" msgstr "在動作前後執行自動儲藏和彈出儲藏" @@ -19145,6 +19042,7 @@ msgid "<remote>" msgstr "<遠端>" #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487 +#: contrib/scalar/scalar.c:375 msgid "<branch>" msgstr "<分支>" @@ -19175,13 +19073,13 @@ msgstr "無法存取提交 %s" msgid "ignoring --verify-signatures for rebase" msgstr "為重定基底動作忽略 --verify-signatures" -#: builtin/pull.c:942 +#: builtin/pull.c:969 msgid "" "You have divergent branches and need to specify how to reconcile them.\n" "You can do so by running one of the following commands sometime before\n" "your next pull:\n" "\n" -" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase false # merge\n" " git config pull.rebase true # rebase\n" " git config pull.ff only # fast-forward only\n" "\n" @@ -19195,7 +19093,7 @@ msgstr "" "您可以在下次拉取前執行以下任一命令\n" "指定調和方式：\n" "\n" -" git config pull.rebase false # 合併（預設策略）\n" +" git config pull.rebase false # 合併\n" " git config pull.rebase true # 重定基底\n" " git config pull.ff only # 只進行快轉\n" "\n" @@ -19204,19 +19102,19 @@ msgstr "" "pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n" "設定的預設值。\n" -#: builtin/pull.c:1016 +#: builtin/pull.c:1046 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未誕生的分支，變更新增至索引。" -#: builtin/pull.c:1020 +#: builtin/pull.c:1050 msgid "pull with rebase" msgstr "重定基底式拉取" -#: builtin/pull.c:1021 +#: builtin/pull.c:1051 msgid "please commit or stash them." msgstr "請提交或儲藏它們。" -#: builtin/pull.c:1046 +#: builtin/pull.c:1076 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -19226,7 +19124,7 @@ msgstr "" "fetch 更新了目前的分支。快轉您的工作區\n" "至提交 %s。" -#: builtin/pull.c:1052 +#: builtin/pull.c:1082 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -19243,23 +19141,23 @@ msgstr "" "$ git reset --hard\n" "復原之前的狀態。" -#: builtin/pull.c:1067 +#: builtin/pull.c:1097 msgid "Cannot merge multiple branches into empty head." msgstr "無法將多個分支合併到空分支。" -#: builtin/pull.c:1072 +#: builtin/pull.c:1102 msgid "Cannot rebase onto multiple branches." msgstr "無法重定基底到多個分支。" -#: builtin/pull.c:1074 +#: builtin/pull.c:1104 msgid "Cannot fast-forward to multiple branches." msgstr "無法快轉至多個分支。" -#: builtin/pull.c:1088 +#: builtin/pull.c:1119 msgid "Need to specify how to reconcile divergent branches." msgstr "需要指定如何調和偏離的分支。" -#: builtin/pull.c:1102 +#: builtin/pull.c:1133 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本機子模組中有修改，無法重定基底" @@ -19423,7 +19321,7 @@ msgstr "推送到 %s\n" msgid "failed to push some refs to '%s'" msgstr "推送一些引用到 '%s' 失敗" -#: builtin/push.c:544 builtin/submodule--helper.c:3258 +#: builtin/push.c:544 builtin/submodule--helper.c:3259 msgid "repository" msgstr "版本庫" @@ -19496,10 +19394,6 @@ msgstr "用 GPG 為推送簽名" msgid "request atomic transaction on remote side" msgstr "需要遠端支援 atomic 事務" -#: builtin/push.c:592 -msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "--delete 與 --all、--mirror 及 --tags 不相容" - #: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用沒有意義" @@ -19530,26 +19424,14 @@ msgstr "" "\n" " git push <名稱>\n" -#: builtin/push.c:630 -msgid "--all and --tags are incompatible" -msgstr "--all 和 --tags 不相容" - #: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用規格同時使用" -#: builtin/push.c:636 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror 和 --tags 不相容" - #: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用規格同時使用" -#: builtin/push.c:641 -msgid "--all and --mirror are incompatible" -msgstr "--all 和 --mirror 不相容" - #: builtin/push.c:648 msgid "push options must not have new line characters" msgstr "推送選項不能有換行符號" @@ -19965,18 +19847,6 @@ msgstr "看起來 'git am' 正在執行中。無法重定基底。" msgid "--preserve-merges was replaced by --rebase-merges" msgstr "--preserve-merges 已經被 --rebase-merges 取代" -#: builtin/rebase.c:1193 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "不能將 '--keep-base' 和 '--onto' 組合使用" - -#: builtin/rebase.c:1195 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "不能將 '--keep-base' 和 '--root' 組合使用" - -#: builtin/rebase.c:1199 -msgid "cannot combine '--root' with '--fork-point'" -msgstr "不能將 '--root' 和 '--fork-point' 結合使用" - #: builtin/rebase.c:1202 msgid "No rebase in progress?" msgstr "沒有正在進行的重定基底？" @@ -20039,8 +19909,8 @@ msgid "--strategy requires --merge or --interactive" msgstr "--strategy 需要 --merge 或 --interactive" #: builtin/rebase.c:1463 -msgid "cannot combine apply options with merge options" -msgstr "不能將 apply 套用選項與 merge 合併選項一起使用" +msgid "apply options and merge options cannot be used together" +msgstr "套用選項與合併選項不得同時使用" #: builtin/rebase.c:1476 #, c-format @@ -20081,7 +19951,7 @@ msgid "no such branch/commit '%s'" msgstr "沒有此分支/提交 '%s'" #: builtin/rebase.c:1618 builtin/submodule--helper.c:39 -#: builtin/submodule--helper.c:2658 +#: builtin/submodule--helper.c:2659 #, c-format msgid "No such ref: %s" msgstr "沒有這樣的引用：%s" @@ -20149,7 +20019,7 @@ msgstr "快轉 %s 到 %s。\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <版本庫目錄>" -#: builtin/receive-pack.c:1280 +#: builtin/receive-pack.c:1275 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -20175,7 +20045,7 @@ msgstr "" "若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n" "設定變數為 'refuse'。" -#: builtin/receive-pack.c:1300 +#: builtin/receive-pack.c:1295 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -20194,13 +20064,13 @@ msgstr "" "\n" "若要封鎖此訊息，您可以設定它為 'refuse'。" -#: builtin/receive-pack.c:2480 +#: builtin/receive-pack.c:2474 msgid "quiet" msgstr "靜默模式" -#: builtin/receive-pack.c:2495 -msgid "You must specify a directory." -msgstr "您必須指定一個目錄。" +#: builtin/receive-pack.c:2489 +msgid "you must specify a directory" +msgstr "您必須指定目錄" #: builtin/reflog.c:17 msgid "" @@ -20224,41 +20094,41 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <引用>" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:585 builtin/reflog.c:590 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' 不是一個有效的時間戳" -#: builtin/reflog.c:609 +#: builtin/reflog.c:631 #, c-format msgid "Marking reachable objects..." msgstr "正在標記可以取得物件..." -#: builtin/reflog.c:647 +#: builtin/reflog.c:675 #, c-format msgid "%s points nowhere!" msgstr "%s 指向不存在！" -#: builtin/reflog.c:700 +#: builtin/reflog.c:731 msgid "no reflog specified to delete" msgstr "未指定要刪除的引用日誌" -#: builtin/reflog.c:708 +#: builtin/reflog.c:742 #, c-format msgid "not a reflog: %s" msgstr "不是一個引用日誌：%s" -#: builtin/reflog.c:713 +#: builtin/reflog.c:747 #, c-format msgid "no reflog for '%s'" msgstr "沒有 '%s' 的引用日誌" -#: builtin/reflog.c:759 +#: builtin/reflog.c:794 #, c-format msgid "invalid ref format: %s" msgstr "無效的引用格式：%s" -#: builtin/reflog.c:768 +#: builtin/reflog.c:803 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" @@ -20348,6 +20218,11 @@ msgstr "git remote update [<選項>] [<組> | <遠端>]..." msgid "Updating %s" msgstr "更新 %s 中" +#: builtin/remote.c:101 +#, c-format +msgid "Could not fetch %s" +msgstr "不能取得 %s" + #: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" @@ -20790,148 +20665,140 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "無法開始 pack-objects 來重新打包 promisor 物件" -#: builtin/repack.c:273 builtin/repack.c:816 +#: builtin/repack.c:275 builtin/repack.c:820 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。" -#: builtin/repack.c:297 +#: builtin/repack.c:299 msgid "could not finish pack-objects to repack promisor objects" msgstr "無法完成 pack-objects 來重新打包 promisor 物件" -#: builtin/repack.c:312 +#: builtin/repack.c:314 #, c-format msgid "cannot open index for %s" msgstr "無法開啟 %s 的索引" -#: builtin/repack.c:371 +#: builtin/repack.c:373 #, c-format msgid "pack %s too large to consider in geometric progression" msgstr "%s 包太大，以致不能在等比數列中考慮" -#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416 +#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418 #, c-format msgid "pack %s too large to roll up" msgstr "%s 包太大，以致不能縮合" -#: builtin/repack.c:496 +#: builtin/repack.c:498 #, c-format msgid "could not open tempfile %s for writing" msgstr "無法開啟 '%s' 暫存檔進行寫入" -#: builtin/repack.c:514 +#: builtin/repack.c:516 msgid "could not close refs snapshot tempfile" msgstr "無法關閉 refs 的快照暫存檔" -#: builtin/repack.c:628 +#: builtin/repack.c:630 msgid "pack everything in a single pack" msgstr "所有內容打包到一個包檔案中" -#: builtin/repack.c:630 +#: builtin/repack.c:632 msgid "same as -a, and turn unreachable objects loose" msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件" -#: builtin/repack.c:633 +#: builtin/repack.c:635 msgid "remove redundant packs, and run git-prune-packed" msgstr "刪除多餘的包，執行 git-prune-packed" -#: builtin/repack.c:635 +#: builtin/repack.c:637 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta" -#: builtin/repack.c:637 +#: builtin/repack.c:639 msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object" -#: builtin/repack.c:639 +#: builtin/repack.c:641 msgid "do not run git-update-server-info" msgstr "不執行 git-update-server-info" -#: builtin/repack.c:642 +#: builtin/repack.c:644 msgid "pass --local to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --local" -#: builtin/repack.c:644 +#: builtin/repack.c:646 msgid "write bitmap index" msgstr "寫 bitmap 索引" -#: builtin/repack.c:646 +#: builtin/repack.c:648 msgid "pass --delta-islands to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --delta-islands" -#: builtin/repack.c:647 +#: builtin/repack.c:649 msgid "approxidate" msgstr "近似日期" -#: builtin/repack.c:648 +#: builtin/repack.c:650 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，不要將早於提供時間的物件過期" -#: builtin/repack.c:650 +#: builtin/repack.c:652 msgid "with -a, repack unreachable objects" msgstr "使用 -a ，重新對無法取得物件打包" -#: builtin/repack.c:652 +#: builtin/repack.c:654 msgid "size of the window used for delta compression" msgstr "用於增量壓縮的視窗值" -#: builtin/repack.c:653 builtin/repack.c:659 +#: builtin/repack.c:655 builtin/repack.c:661 msgid "bytes" msgstr "位元組" -#: builtin/repack.c:654 +#: builtin/repack.c:656 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制記憶體大小而非條目數" -#: builtin/repack.c:656 +#: builtin/repack.c:658 msgid "limits the maximum delta depth" msgstr "限制最大增量深度" -#: builtin/repack.c:658 +#: builtin/repack.c:660 msgid "limits the maximum number of threads" msgstr "限制最大執行緒數" -#: builtin/repack.c:660 +#: builtin/repack.c:662 msgid "maximum size of each packfile" msgstr "每個 packfile 的最大尺寸" -#: builtin/repack.c:662 +#: builtin/repack.c:664 msgid "repack objects in packs marked with .keep" msgstr "對標記為 .keep 的包中的物件重新打包" -#: builtin/repack.c:664 +#: builtin/repack.c:666 msgid "do not repack this pack" msgstr "不要對該包檔案重新打包" -#: builtin/repack.c:666 +#: builtin/repack.c:668 msgid "find a geometric progression with factor <N>" msgstr "尋找因數是 <N> 的等比數列" -#: builtin/repack.c:668 +#: builtin/repack.c:670 msgid "write a multi-pack index of the resulting packs" msgstr "寫入結果包的多包索引" -#: builtin/repack.c:678 +#: builtin/repack.c:680 msgid "cannot delete packs in a precious-objects repo" msgstr "不能刪除珍品版本庫中的打包檔案" -#: builtin/repack.c:682 -msgid "--keep-unreachable and -A are incompatible" -msgstr "--keep-unreachable 和 -A 不相容" - -#: builtin/repack.c:713 -msgid "--geometric is incompatible with -A, -a" -msgstr "--geometric 與 -A, -a 不相容" - -#: builtin/repack.c:825 +#: builtin/repack.c:829 msgid "Nothing new to pack." msgstr "沒有新的要打包。" -#: builtin/repack.c:855 +#: builtin/repack.c:859 #, c-format msgid "missing required file: %s" msgstr "缺少必要檔案：%s" -#: builtin/repack.c:857 +#: builtin/repack.c:861 #, c-format msgid "could not unlink: %s" msgstr "無法取消連結：%s" @@ -21014,98 +20881,92 @@ msgstr "cat-file 報告失敗" msgid "unable to open %s for reading" msgstr "無法為讀取開啟 %s" -#: builtin/replace.c:272 +#: builtin/replace.c:271 msgid "unable to spawn mktree" msgstr "無法啟動 mktree" -#: builtin/replace.c:276 +#: builtin/replace.c:275 msgid "unable to read from mktree" msgstr "無法從 mktree 讀取" -#: builtin/replace.c:285 +#: builtin/replace.c:284 msgid "mktree reported failure" msgstr "mktree 報告失敗" -#: builtin/replace.c:289 +#: builtin/replace.c:288 msgid "mktree did not return an object name" msgstr "mktree 沒有返回一個物件名" -#: builtin/replace.c:298 +#: builtin/replace.c:297 #, c-format msgid "unable to fstat %s" msgstr "無法對 %s 執行 fstat" -#: builtin/replace.c:303 +#: builtin/replace.c:302 msgid "unable to write object to database" msgstr "無法向資料庫寫入物件" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 -#, c-format -msgid "not a valid object name: '%s'" -msgstr "不是一個有效的物件名：'%s'" - -#: builtin/replace.c:326 +#: builtin/replace.c:325 #, c-format msgid "unable to get object type for %s" msgstr "無法得到 %s 的物件類型" -#: builtin/replace.c:342 +#: builtin/replace.c:341 msgid "editing object file failed" msgstr "編輯物件檔案失敗" -#: builtin/replace.c:351 +#: builtin/replace.c:350 #, c-format msgid "new object is the same as the old one: '%s'" msgstr "新物件和舊物件相同：'%s'" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "無法將 %s 解析為一個提交" -#: builtin/replace.c:416 +#: builtin/replace.c:415 #, c-format msgid "bad mergetag in commit '%s'" msgstr "提交 '%s' 中含有損壞的合併標籤" -#: builtin/replace.c:418 +#: builtin/replace.c:417 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "提交 '%s' 中含有格式錯誤的合併標籤" -#: builtin/replace.c:430 +#: builtin/replace.c:429 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "原始提交 '%s' 包含已經捨棄的合併標籤 '%s'，使用 --edit 代替 --graft" -#: builtin/replace.c:469 +#: builtin/replace.c:468 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "原始提交 '%s' 中有一個 gpg 簽名" -#: builtin/replace.c:470 +#: builtin/replace.c:469 msgid "the signature will be removed in the replacement commit!" msgstr "在取代的提交中簽名將被移除！" -#: builtin/replace.c:480 +#: builtin/replace.c:479 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "不能為 '%s' 寫取代提交" -#: builtin/replace.c:488 +#: builtin/replace.c:487 #, c-format msgid "graft for '%s' unnecessary" msgstr "對 '%s' 移植沒有必要" -#: builtin/replace.c:492 +#: builtin/replace.c:491 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "新提交和舊的一樣：'%s'" -#: builtin/replace.c:527 +#: builtin/replace.c:526 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -21114,71 +20975,71 @@ msgstr "" "不能轉換下列移植：\n" "%s" -#: builtin/replace.c:548 +#: builtin/replace.c:547 msgid "list replace refs" msgstr "列出取代的引用" -#: builtin/replace.c:549 +#: builtin/replace.c:548 msgid "delete replace refs" msgstr "刪除取代的引用" -#: builtin/replace.c:550 +#: builtin/replace.c:549 msgid "edit existing object" msgstr "編輯現存的物件" -#: builtin/replace.c:551 +#: builtin/replace.c:550 msgid "change a commit's parents" msgstr "修改一個提交的父提交" -#: builtin/replace.c:552 +#: builtin/replace.c:551 msgid "convert existing graft file" msgstr "轉換現存的移植檔案" -#: builtin/replace.c:553 +#: builtin/replace.c:552 msgid "replace the ref if it exists" msgstr "如果存在則取代引用" -#: builtin/replace.c:555 +#: builtin/replace.c:554 msgid "do not pretty-print contents for --edit" msgstr "不要為 --edit 動作美觀顯示內容" -#: builtin/replace.c:556 +#: builtin/replace.c:555 msgid "use this format" msgstr "使用此格式" -#: builtin/replace.c:569 +#: builtin/replace.c:568 msgid "--format cannot be used when not listing" msgstr "不列出時不能使用 --format" -#: builtin/replace.c:577 +#: builtin/replace.c:576 msgid "-f only makes sense when writing a replacement" msgstr "只有寫一個取代時 -f 才有意義" -#: builtin/replace.c:581 +#: builtin/replace.c:580 msgid "--raw only makes sense with --edit" msgstr "--raw 只有和 --edit 共用才有意義" -#: builtin/replace.c:587 +#: builtin/replace.c:586 msgid "-d needs at least one argument" msgstr "-d 需要至少一個參數" -#: builtin/replace.c:593 +#: builtin/replace.c:592 msgid "bad number of arguments" msgstr "錯誤的參數個數" -#: builtin/replace.c:599 +#: builtin/replace.c:598 msgid "-e needs exactly one argument" msgstr "-e 需要且僅需要一個參數" -#: builtin/replace.c:605 +#: builtin/replace.c:604 msgid "-g needs at least one argument" msgstr "-g 需要至少一個參數" -#: builtin/replace.c:611 +#: builtin/replace.c:610 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file 不帶參數" -#: builtin/replace.c:617 +#: builtin/replace.c:616 msgid "only one pattern can be given with -l" msgstr "只能為 -l 提供一個模式" @@ -21199,133 +21060,125 @@ msgstr "沒有路徑的 'git rerere forget' 已經過時" msgid "unable to generate diff for '%s'" msgstr "無法為 '%s' 生成差異" -#: builtin/reset.c:32 +#: builtin/reset.c:33 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "git reset [-q] [<樹或提交>] [--] <路徑規格>..." -#: builtin/reset.c:34 +#: builtin/reset.c:35 msgid "" "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" msgstr "" "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<樹或提交>]" -#: builtin/reset.c:35 +#: builtin/reset.c:36 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" msgstr "git reset --patch [<樹或提交>] [--] [<路徑規格>...]" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "mixed" msgstr "混雜" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "soft" msgstr "軟性" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "hard" msgstr "硬性" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "merge" msgstr "合併" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "keep" msgstr "保持" -#: builtin/reset.c:89 +#: builtin/reset.c:90 msgid "You do not have a valid HEAD." msgstr "您沒有一個有效的 HEAD。" -#: builtin/reset.c:91 +#: builtin/reset.c:92 msgid "Failed to find tree of HEAD." msgstr "無法找到 HEAD 指向的樹。" -#: builtin/reset.c:97 +#: builtin/reset.c:98 #, c-format msgid "Failed to find tree of %s." msgstr "無法找到 %s 指向的樹。" -#: builtin/reset.c:122 +#: builtin/reset.c:123 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 現在位於 %s" # 譯者：漢字之間無空格，故刪除%s前後空格 -#: builtin/reset.c:201 +#: builtin/reset.c:299 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合併過程中不能做%s重設動作。" -#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679 -#: builtin/stash.c:703 +#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680 +#: builtin/stash.c:704 msgid "be quiet, only report errors" msgstr "安靜模式，只報告錯誤" -#: builtin/reset.c:303 +#: builtin/reset.c:398 msgid "reset HEAD and index" msgstr "重設 HEAD 和索引" -#: builtin/reset.c:304 +#: builtin/reset.c:399 msgid "reset only HEAD" msgstr "只重設 HEAD" -#: builtin/reset.c:306 builtin/reset.c:308 +#: builtin/reset.c:401 builtin/reset.c:403 msgid "reset HEAD, index and working tree" msgstr "重設 HEAD、索引和工作區" -#: builtin/reset.c:310 +#: builtin/reset.c:405 msgid "reset HEAD but keep local changes" msgstr "重設 HEAD 但儲存本機變更" -#: builtin/reset.c:316 +#: builtin/reset.c:411 msgid "record only the fact that removed paths will be added later" msgstr "將刪除的路徑標記為稍後新增" -#: builtin/reset.c:350 +#: builtin/reset.c:445 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "無法將 '%s' 解析為一個有效的版本。" -#: builtin/reset.c:358 +#: builtin/reset.c:453 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "無法將 '%s' 解析為一個有效的樹狀物件。" -#: builtin/reset.c:367 -msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "--patch 與 --{hard、mixed、soft} 選項不相容" - -#: builtin/reset.c:377 +#: builtin/reset.c:472 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。" # 譯者：漢字之間無空格，故刪除%s前後空格 -#: builtin/reset.c:379 +#: builtin/reset.c:474 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能帶路徑進行%s重設。" # 譯者：漢字之間無空格，故刪除%s前後空格 -#: builtin/reset.c:394 +#: builtin/reset.c:489 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能對純版本庫進行%s重設" -#: builtin/reset.c:398 -msgid "-N can only be used with --mixed" -msgstr "-N 只能和 --mixed 同時使用" - -#: builtin/reset.c:419 +#: builtin/reset.c:520 msgid "Unstaged changes after reset:" msgstr "重設後取消暫存的變更：" -#: builtin/reset.c:422 +#: builtin/reset.c:523 #, c-format msgid "" "\n" @@ -21337,19 +21190,15 @@ msgstr "" "重設後，枚舉未暫存變更花費了 %.2f 秒。 您可以使用 '--quiet' 避免此情況。\n" "將設定變數 reset.quiet 設定為 true 可使其成為預設值。\n" -#: builtin/reset.c:440 +#: builtin/reset.c:541 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重設索引檔案至版本 '%s'。" -#: builtin/reset.c:445 +#: builtin/reset.c:546 msgid "Could not write new index file." msgstr "不能寫入新的索引檔案。" -#: builtin/rev-list.c:541 -msgid "cannot combine --exclude-promisor-objects and --missing" -msgstr "不能同時使用 --exclude-promisor-objects 和 --missing 選項" - #: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "物件過濾需要 --objects" @@ -21359,8 +21208,9 @@ msgid "rev-list does not support display of notes" msgstr "rev-list 不支援顯示註解" #: builtin/rev-list.c:679 -msgid "marked counting is incompatible with --objects" -msgstr "--objects 不相容標記計數 (marked counting)" +#, c-format +msgid "marked counting and '%s' cannot be used together" +msgstr "標記計數 (marked counting) 與「%s」不得同時使用" #: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -21792,11 +21642,6 @@ msgstr "<n>[,<base>]" msgid "show <n> most recent ref-log entries starting at base" msgstr "顯示從起始點開始的 <n> 條最近的引用日誌記錄" -#: builtin/show-branch.c:710 -msgid "" -"--reflog is incompatible with --all, --remotes, --independent or --merge-base" -msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不相容" - #: builtin/show-branch.c:734 msgid "no branches given, and HEAD is not valid" msgstr "未提供分支，且 HEAD 無效" @@ -21816,18 +21661,18 @@ msgstr[0] "一次只能顯示 %d 個條目。" msgid "no such ref %s" msgstr "無此引用 %s" -#: builtin/show-branch.c:828 +#: builtin/show-branch.c:830 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "不能處理 %d 個以上的版本。" -#: builtin/show-branch.c:832 +#: builtin/show-branch.c:834 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' 不是一個有效的引用。" -#: builtin/show-branch.c:835 +#: builtin/show-branch.c:837 #, c-format msgid "cannot find commit %s (%s)" msgstr "不能找到提交 %s（%s）" @@ -21892,86 +21737,112 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <選項>" msgid "git sparse-checkout list" msgstr "git sparse-checkout list" -#: builtin/sparse-checkout.c:72 +#: builtin/sparse-checkout.c:60 +msgid "this worktree is not sparse" +msgstr "這不是稀疏工作區" + +#: builtin/sparse-checkout.c:75 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）" -#: builtin/sparse-checkout.c:173 +#: builtin/sparse-checkout.c:176 #, c-format msgid "" "directory '%s' contains untracked files, but is not in the sparse-checkout " "cone" msgstr "「%s」目錄有未追蹤的檔案，但不在稀疏提交的 cone 中" -#: builtin/sparse-checkout.c:181 +#: builtin/sparse-checkout.c:184 #, c-format msgid "failed to remove directory '%s'" msgstr "無法移除 '%s' 目錄" -#: builtin/sparse-checkout.c:321 +#: builtin/sparse-checkout.c:324 msgid "failed to create directory for sparse-checkout file" msgstr "無法建立稀疏簽出檔案的目錄" -#: builtin/sparse-checkout.c:362 +#: builtin/sparse-checkout.c:365 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "無法升級版本庫格式，以致無法啟用 worktreeConfig" -#: builtin/sparse-checkout.c:364 +#: builtin/sparse-checkout.c:367 msgid "failed to set extensions.worktreeConfig setting" msgstr "無法設定 extensions.worktreeConfig 設定" -#: builtin/sparse-checkout.c:384 +#: builtin/sparse-checkout.c:411 +msgid "failed to modify sparse-index config" +msgstr "無法修改稀疏索引設定" + +#: builtin/sparse-checkout.c:422 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:404 +#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729 +#: builtin/sparse-checkout.c:778 msgid "initialize the sparse-checkout in cone mode" msgstr "以 cone 模式初始化稀疏簽出" -#: builtin/sparse-checkout.c:406 +#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731 +#: builtin/sparse-checkout.c:780 msgid "toggle the use of a sparse index" msgstr "切換是否使用稀疏索引" -#: builtin/sparse-checkout.c:434 -msgid "failed to modify sparse-index config" -msgstr "無法修改稀疏索引設定" - -#: builtin/sparse-checkout.c:455 +#: builtin/sparse-checkout.c:476 #, c-format msgid "failed to open '%s'" msgstr "無法開啟「%s」" -#: builtin/sparse-checkout.c:507 +#: builtin/sparse-checkout.c:528 #, c-format msgid "could not normalize path %s" msgstr "無法標準化路徑 %s" -#: builtin/sparse-checkout.c:519 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)" - -#: builtin/sparse-checkout.c:544 +#: builtin/sparse-checkout.c:557 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "無法去掉 '%s' C 樣式字串的引號" -#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622 +#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640 msgid "unable to load existing sparse-checkout patterns" msgstr "無法載入現存的稀疏簽出樣式" -#: builtin/sparse-checkout.c:667 +#: builtin/sparse-checkout.c:616 +msgid "existing sparse-checkout patterns do not use cone mode" +msgstr "現有的稀疏簽出樣式不使用 cone 模式" + +#: builtin/sparse-checkout.c:682 +msgid "git sparse-checkout add (--stdin | <patterns>)" +msgstr "git sparse-checkout add (--stdin | <樣式>)" + +#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733 msgid "read patterns from standard in" msgstr "從標準輸入讀取樣式" -#: builtin/sparse-checkout.c:682 -msgid "git sparse-checkout reapply" -msgstr "git sparse-checkout reapply" +#: builtin/sparse-checkout.c:699 +msgid "no sparse-checkout to add to" +msgstr "沒有要加入之稀疏簽出" + +#: builtin/sparse-checkout.c:712 +msgid "" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | " +"<patterns>)" +msgstr "" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | " +"<patterns>)" + +#: builtin/sparse-checkout.c:765 +msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" +msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:701 +#: builtin/sparse-checkout.c:785 +msgid "must be in a sparse-checkout to reapply sparsity patterns" +msgstr "必須在稀疏提交才能重新套用稀疏樣式 (sparsity pattern)" + +#: builtin/sparse-checkout.c:803 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:732 +#: builtin/sparse-checkout.c:845 msgid "error while refreshing working directory" msgstr "重新整理工作目錄時發生錯誤" @@ -21997,23 +21868,27 @@ msgstr "git stash branch <分支名> [<stash>]" #: builtin/stash.c:30 msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] " +"[-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <訊息>]\n" " [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n" " [--] [<路徑規格>...]]" #: builtin/stash.c:34 msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<消息>]" +"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]" +"\n" +" [-u|--include-untracked] [-a|--all] [<訊息>]" #: builtin/stash.c:55 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" @@ -22105,140 +21980,156 @@ msgstr "正在合併 %s 和 %s" msgid "Index was not unstashed." msgstr "索引未從儲藏中復原。" -#: builtin/stash.c:575 +#: builtin/stash.c:576 msgid "could not restore untracked files from stash" msgstr "無法從儲藏條目中復原未追蹤檔案" -#: builtin/stash.c:607 builtin/stash.c:705 +#: builtin/stash.c:608 builtin/stash.c:706 msgid "attempt to recreate the index" msgstr "嘗試重建索引" -#: builtin/stash.c:651 +#: builtin/stash.c:652 #, c-format msgid "Dropped %s (%s)" msgstr "捨棄了 %s（%s）" -#: builtin/stash.c:654 +#: builtin/stash.c:655 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s：無法捨棄儲藏條目" -#: builtin/stash.c:667 +#: builtin/stash.c:668 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' 不是一個儲藏引用" -#: builtin/stash.c:717 +#: builtin/stash.c:718 msgid "The stash entry is kept in case you need it again." msgstr "儲藏條目被保留以備您再次需要。" -#: builtin/stash.c:740 +#: builtin/stash.c:741 msgid "No branch name specified" msgstr "未指定分支名" -#: builtin/stash.c:824 +#: builtin/stash.c:825 msgid "failed to parse tree" msgstr "無法解析樹" -#: builtin/stash.c:835 +#: builtin/stash.c:836 msgid "failed to unpack trees" msgstr "無法解包樹" -#: builtin/stash.c:855 +#: builtin/stash.c:856 msgid "include untracked files in the stash" msgstr "在儲藏區包含未追蹤檔案" -#: builtin/stash.c:858 +#: builtin/stash.c:859 msgid "only show untracked files in the stash" msgstr "只在儲藏區顯示未追蹤檔案" -#: builtin/stash.c:945 builtin/stash.c:982 +#: builtin/stash.c:946 builtin/stash.c:983 #, c-format msgid "Cannot update %s with %s" msgstr "無法用 %2$s 更新 %1$s" -#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684 +#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750 msgid "stash message" msgstr "儲藏說明" -#: builtin/stash.c:973 +#: builtin/stash.c:974 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一個 <提交> 參數" -#: builtin/stash.c:1187 +#: builtin/stash.c:1159 +msgid "No staged changes" +msgstr "無暫存變更" + +#: builtin/stash.c:1220 msgid "No changes selected" msgstr "沒有選擇變更" -#: builtin/stash.c:1287 +#: builtin/stash.c:1320 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: builtin/stash.c:1314 +#: builtin/stash.c:1347 msgid "Cannot save the current index state" msgstr "無法儲存目前索引狀態" -#: builtin/stash.c:1323 +#: builtin/stash.c:1356 msgid "Cannot save the untracked files" msgstr "無法儲存未追蹤檔案" -#: builtin/stash.c:1334 builtin/stash.c:1343 +#: builtin/stash.c:1367 builtin/stash.c:1386 msgid "Cannot save the current worktree state" msgstr "無法儲存目前工作區狀態" -#: builtin/stash.c:1371 +#: builtin/stash.c:1377 +msgid "Cannot save the current staged state" +msgstr "無法儲存目前暫存狀態" + +#: builtin/stash.c:1414 msgid "Cannot record working tree state" msgstr "不能記錄工作區狀態" -#: builtin/stash.c:1420 +#: builtin/stash.c:1463 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all" -#: builtin/stash.c:1438 +#: builtin/stash.c:1474 +msgid "Can't use --staged and --include-untracked or --all at the same time" +msgstr "--staged 和 --include-untracked 或 --all 不得同時使用" + +#: builtin/stash.c:1492 msgid "Did you forget to 'git add'?" msgstr "您是否忘了執行 'git add'？" -#: builtin/stash.c:1453 +#: builtin/stash.c:1507 msgid "No local changes to save" msgstr "沒有要儲存的本機修改" -#: builtin/stash.c:1460 +#: builtin/stash.c:1514 msgid "Cannot initialize stash" msgstr "無法初始化儲藏" -#: builtin/stash.c:1475 +#: builtin/stash.c:1529 msgid "Cannot save the current status" msgstr "無法儲存目前狀態" -#: builtin/stash.c:1480 +#: builtin/stash.c:1534 #, c-format msgid "Saved working directory and index state %s" msgstr "儲存工作目錄和索引狀態 %s" -#: builtin/stash.c:1571 +#: builtin/stash.c:1627 msgid "Cannot remove worktree changes" msgstr "無法刪除工作區變更" -#: builtin/stash.c:1610 builtin/stash.c:1675 +#: builtin/stash.c:1667 builtin/stash.c:1739 msgid "keep index" msgstr "保持索引" -#: builtin/stash.c:1612 builtin/stash.c:1677 +#: builtin/stash.c:1669 builtin/stash.c:1741 +msgid "stash staged changes only" +msgstr "只儲藏暫存變更" + +#: builtin/stash.c:1671 builtin/stash.c:1743 msgid "stash in patch mode" msgstr "以修補檔模式儲藏" -#: builtin/stash.c:1613 builtin/stash.c:1678 +#: builtin/stash.c:1672 builtin/stash.c:1744 msgid "quiet mode" msgstr "靜默模式" -#: builtin/stash.c:1615 builtin/stash.c:1680 +#: builtin/stash.c:1674 builtin/stash.c:1746 msgid "include untracked files in stash" msgstr "儲藏中包含未追蹤檔案" -#: builtin/stash.c:1617 builtin/stash.c:1682 +#: builtin/stash.c:1676 builtin/stash.c:1748 msgid "include ignore files" msgstr "包含忽略的檔案" -#: builtin/stash.c:1717 +#: builtin/stash.c:1783 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22262,7 +22153,7 @@ msgstr "略過和移除所有的備註行" msgid "prepend comment character and space to each line" msgstr "為每一行的行首新增備註符和空格" -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一個完整的引用名稱，卻得到 %s" @@ -22283,7 +22174,7 @@ msgid "" "authoritative upstream." msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。" -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859 msgid "alternative anchor for relative paths" msgstr "相對路徑的替代錨記（anchor）" @@ -22377,7 +22268,7 @@ msgstr "無法解析子模組 '%s' 的 HEAD 引用" msgid "failed to recurse into submodule '%s'" msgstr "遞迴子模組 '%s' 失敗" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590 msgid "suppress submodule status output" msgstr "隱藏子模組的狀態輸出" @@ -22444,10 +22335,6 @@ msgstr "git submodule--helper summary [<選項>] [<提交>] [--] [<路徑>]" msgid "could not fetch a revision for HEAD" msgstr "無法取得 HEAD 的版本" -#: builtin/submodule--helper.c:1316 -msgid "--cached and --files are mutually exclusive" -msgstr "--cached 和 --files 互斥" - #: builtin/submodule--helper.c:1373 #, c-format msgid "Synchronizing submodule url for '%s'\n" @@ -22476,61 +22363,59 @@ msgstr "隱藏子模組 URL 同步的輸出" msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1508 #, c-format msgid "" -"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " -"really want to remove it including all of its history)" -msgstr "" -"子模組工作區 '%s' 包含一個 .git 目錄（如果您確需刪除它及其全部歷史，使用 'rm " -"-rf' 指令）" +"Submodule work tree '%s' contains a .git directory. This will be replaced " +"with a .git file by using absorbgitdirs." +msgstr "子模組工作區「%s」內有 .git 目錄。使用 absorbgitdirs 會將其替換為 .git 檔案。" -#: builtin/submodule--helper.c:1524 +#: builtin/submodule--helper.c:1525 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "子模組工作區 '%s' 包含本機修改；使用 '-f' 捨棄它們" -#: builtin/submodule--helper.c:1532 +#: builtin/submodule--helper.c:1533 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目錄 '%s'\n" -#: builtin/submodule--helper.c:1534 +#: builtin/submodule--helper.c:1535 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "無法移除子模組工作區 '%s'\n" -#: builtin/submodule--helper.c:1545 +#: builtin/submodule--helper.c:1546 #, c-format msgid "could not create empty submodule directory %s" msgstr "不能建立空的子模組目錄 %s" -#: builtin/submodule--helper.c:1561 +#: builtin/submodule--helper.c:1562 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "子模組 '%s'（%s）未對路徑 '%s' 註冊\n" -#: builtin/submodule--helper.c:1590 +#: builtin/submodule--helper.c:1591 msgid "remove submodule working trees even if they contain local changes" msgstr "即使有本機變更仍移除子模組的工作區" -#: builtin/submodule--helper.c:1591 +#: builtin/submodule--helper.c:1592 msgid "unregister all submodules" msgstr "取消註冊所有子模組" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1597 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]" -#: builtin/submodule--helper.c:1610 +#: builtin/submodule--helper.c:1611 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您確定想要對所有子模組執行取消初始化，請使用 '--all'" -#: builtin/submodule--helper.c:1655 +#: builtin/submodule--helper.c:1656 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22542,67 +22427,67 @@ msgstr "" "以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n" "而非 '--reference' 複製。" -#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703 +#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模組 '%s' 不能新增版本庫備選：%s" -#: builtin/submodule--helper.c:1739 +#: builtin/submodule--helper.c:1740 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1746 +#: builtin/submodule--helper.c:1747 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能識別 submodule.alternateLocation 的取值 '%s'" -#: builtin/submodule--helper.c:1771 +#: builtin/submodule--helper.c:1772 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」" -#: builtin/submodule--helper.c:1812 +#: builtin/submodule--helper.c:1813 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "無法複製 '%s' 到子模組路徑 '%s'" -#: builtin/submodule--helper.c:1817 +#: builtin/submodule--helper.c:1818 #, c-format msgid "directory not empty: '%s'" msgstr "目錄不是空的：「%s」" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1830 #, c-format msgid "could not get submodule directory for '%s'" msgstr "無法得到 '%s' 的子模組目錄" -#: builtin/submodule--helper.c:1861 +#: builtin/submodule--helper.c:1862 msgid "where the new submodule will be cloned to" msgstr "新的子模組將要複製的路徑" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1865 msgid "name of the new submodule" msgstr "新子模組的名稱" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1868 msgid "url where to clone the submodule from" msgstr "複製子模組的 url 位址" -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264 +#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265 msgid "depth for shallow clones" msgstr "淺複製的深度" -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525 -#: builtin/submodule--helper.c:3257 +#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526 +#: builtin/submodule--helper.c:3258 msgid "force cloning progress" msgstr "強制顯示複製進度" -#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527 +#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528 msgid "disallow cloning into non-empty directory" msgstr "不允許複製至非空白目錄" -#: builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:1888 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22612,269 +22497,265 @@ msgstr "" ">] [--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路" "徑>" -#: builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1925 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:1928 +#: builtin/submodule--helper.c:1929 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:2043 +#: builtin/submodule--helper.c:2044 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模組 '%s' 尚未初始化" -#: builtin/submodule--helper.c:2047 +#: builtin/submodule--helper.c:2048 msgid "Maybe you want to use 'update --init'?" msgstr "也許您想要執行 'update --init'？" -#: builtin/submodule--helper.c:2077 +#: builtin/submodule--helper.c:2078 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略過未合併的子模組 %s" -#: builtin/submodule--helper.c:2106 +#: builtin/submodule--helper.c:2107 #, c-format msgid "Skipping submodule '%s'" msgstr "略過子模組 '%s'" -#: builtin/submodule--helper.c:2256 +#: builtin/submodule--helper.c:2257 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "複製 '%s' 失敗。已排程重試作業" -#: builtin/submodule--helper.c:2267 +#: builtin/submodule--helper.c:2268 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次嘗試複製 '%s' 失敗，中止作業" -#: builtin/submodule--helper.c:2372 +#: builtin/submodule--helper.c:2373 #, c-format msgid "Unable to checkout '%s' in submodule path '%s'" msgstr "無法在「%2$s」子模組路徑簽出「%1$s」" -#: builtin/submodule--helper.c:2376 +#: builtin/submodule--helper.c:2377 #, c-format msgid "Unable to rebase '%s' in submodule path '%s'" msgstr "無法在「%2$s」子模組路徑重定「%1$s」的基底" -#: builtin/submodule--helper.c:2380 +#: builtin/submodule--helper.c:2381 #, c-format msgid "Unable to merge '%s' in submodule path '%s'" msgstr "無法在「%2$s」子模組路徑合併「%1$s」" -#: builtin/submodule--helper.c:2384 +#: builtin/submodule--helper.c:2385 #, c-format msgid "Execution of '%s %s' failed in submodule path '%s'" msgstr "「%s %s」在「%s」子模組路徑執行失敗" -#: builtin/submodule--helper.c:2408 +#: builtin/submodule--helper.c:2409 #, c-format msgid "Submodule path '%s': checked out '%s'\n" msgstr "子模組路徑「%s」：已簽出「%s」\n" -#: builtin/submodule--helper.c:2412 +#: builtin/submodule--helper.c:2413 #, c-format msgid "Submodule path '%s': rebased into '%s'\n" msgstr "子模組路徑「%s」：已重定基底至「%s」\n" -#: builtin/submodule--helper.c:2416 +#: builtin/submodule--helper.c:2417 #, c-format msgid "Submodule path '%s': merged in '%s'\n" msgstr "子模組路徑「%s」：已在「%s」合併\n" -#: builtin/submodule--helper.c:2420 +#: builtin/submodule--helper.c:2421 #, c-format msgid "Submodule path '%s': '%s %s'\n" msgstr "子模組路徑「%s」：「%s %s」\n" -#: builtin/submodule--helper.c:2444 +#: builtin/submodule--helper.c:2445 #, c-format msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:" msgstr "無法在子模組路徑 「%s」中取得。嘗試直接取得 %s：" -#: builtin/submodule--helper.c:2453 +#: builtin/submodule--helper.c:2454 #, c-format msgid "" "Fetched in submodule path '%s', but it did not contain %s. Direct fetching " "of that commit failed." msgstr "已經取得「%s」子模組路徑，這個路徑卻未包含「%s」。直接取得該提交失敗。" -#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574 -#: builtin/submodule--helper.c:2812 +#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2813 msgid "path into the working tree" msgstr "到工作區的路徑" -#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579 +#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作區中的路徑，遞迴嵌套子模組" -#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577 +#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:2517 +#: builtin/submodule--helper.c:2518 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "建立一個縮減至指定版本數的淺複製" -#: builtin/submodule--helper.c:2520 +#: builtin/submodule--helper.c:2521 msgid "parallel jobs" msgstr "並行任務" -#: builtin/submodule--helper.c:2522 +#: builtin/submodule--helper.c:2523 msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始複製是否應該遵循建議的淺複製選項" -#: builtin/submodule--helper.c:2523 +#: builtin/submodule--helper.c:2524 msgid "don't print cloning progress" msgstr "不要輸出複製進度" -#: builtin/submodule--helper.c:2534 +#: builtin/submodule--helper.c:2535 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]" -#: builtin/submodule--helper.c:2547 +#: builtin/submodule--helper.c:2548 msgid "bad value for update parameter" msgstr "update 參數取值錯誤" -#: builtin/submodule--helper.c:2565 +#: builtin/submodule--helper.c:2566 msgid "suppress output for update by rebase or merge" msgstr "隱藏 rebase 或 merge 觸發之更新的輸出" -#: builtin/submodule--helper.c:2566 +#: builtin/submodule--helper.c:2567 msgid "force checkout updates" msgstr "強制簽出更新" -#: builtin/submodule--helper.c:2568 +#: builtin/submodule--helper.c:2569 msgid "don't fetch new objects from the remote site" msgstr "不從遠端站台取得新物件" -#: builtin/submodule--helper.c:2570 +#: builtin/submodule--helper.c:2571 msgid "overrides update mode in case the repository is a fresh clone" msgstr "如果版本庫是剛複製的，就覆蓋更新模式" -#: builtin/submodule--helper.c:2571 +#: builtin/submodule--helper.c:2572 msgid "depth for shallow fetch" msgstr "淺 fetch 的深度" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2582 msgid "sha1" msgstr "sha1" -#: builtin/submodule--helper.c:2582 +#: builtin/submodule--helper.c:2583 msgid "SHA1 expected by superproject" msgstr "上層專案預期應是 SHA1" -#: builtin/submodule--helper.c:2584 +#: builtin/submodule--helper.c:2585 msgid "subsha1" msgstr "subsha1" -#: builtin/submodule--helper.c:2585 +#: builtin/submodule--helper.c:2586 msgid "SHA1 of submodule's HEAD" msgstr "子模組 HEAD 的 SHA1" -#: builtin/submodule--helper.c:2591 +#: builtin/submodule--helper.c:2592 msgid "git submodule--helper run-update-procedure [<options>] <path>" msgstr "git submodule--helper run-update-procedure [<選項>] [<路徑>]" -#: builtin/submodule--helper.c:2662 +#: builtin/submodule--helper.c:2663 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "子模組（%s）的分支設定為繼承上級專案的分支，但是上級專案不在任何分支上" -#: builtin/submodule--helper.c:2780 +#: builtin/submodule--helper.c:2781 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "無法獲得子模組 '%s' 的版本庫句柄" -#: builtin/submodule--helper.c:2813 +#: builtin/submodule--helper.c:2814 msgid "recurse into submodules" msgstr "在子模組中遞迴" -#: builtin/submodule--helper.c:2819 +#: builtin/submodule--helper.c:2820 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]" -#: builtin/submodule--helper.c:2875 +#: builtin/submodule--helper.c:2876 msgid "check if it is safe to write to the .gitmodules file" msgstr "檢查寫入 .gitmodules 檔案是否安全" -#: builtin/submodule--helper.c:2878 +#: builtin/submodule--helper.c:2879 msgid "unset the config in the .gitmodules file" msgstr "取消 .gitmodules 檔案中的設定" -#: builtin/submodule--helper.c:2883 +#: builtin/submodule--helper.c:2884 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <名稱> [<值>]" -#: builtin/submodule--helper.c:2884 +#: builtin/submodule--helper.c:2885 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <名稱>" -#: builtin/submodule--helper.c:2885 +#: builtin/submodule--helper.c:2886 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120 -#: builtin/submodule--helper.c:3276 +#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121 +#: builtin/submodule--helper.c:3277 msgid "please make sure that the .gitmodules file is in the working tree" msgstr "請確認 .gitmodules 檔案在工作區裡" -#: builtin/submodule--helper.c:2920 +#: builtin/submodule--helper.c:2921 msgid "suppress output for setting url of a submodule" msgstr "隱藏子模組設定 URL 的輸出" -#: builtin/submodule--helper.c:2924 +#: builtin/submodule--helper.c:2925 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>" -#: builtin/submodule--helper.c:2957 +#: builtin/submodule--helper.c:2958 msgid "set the default tracking branch to master" msgstr "將預設的追蹤分支設為 master" -#: builtin/submodule--helper.c:2959 +#: builtin/submodule--helper.c:2960 msgid "set the default tracking branch" msgstr "設定預設追蹤分支" -#: builtin/submodule--helper.c:2963 +#: builtin/submodule--helper.c:2964 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -#: builtin/submodule--helper.c:2964 +#: builtin/submodule--helper.c:2965 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -#: builtin/submodule--helper.c:2971 +#: builtin/submodule--helper.c:2972 msgid "--branch or --default required" msgstr "需要 --branch 或 --default" -#: builtin/submodule--helper.c:2974 -msgid "--branch and --default are mutually exclusive" -msgstr "--branch 與 --default 互斥" - -#: builtin/submodule--helper.c:3037 +#: builtin/submodule--helper.c:3038 #, c-format msgid "Adding existing repo at '%s' to the index\n" msgstr "正在將位於 '%s' 的現有版本庫加入至索引\n" -#: builtin/submodule--helper.c:3040 +#: builtin/submodule--helper.c:3041 #, c-format msgid "'%s' already exists and is not a valid git repo" msgstr "「%s」已存在，且不是有效的 git 版本庫" -#: builtin/submodule--helper.c:3053 +#: builtin/submodule--helper.c:3054 #, c-format msgid "A git directory for '%s' is found locally with remote(s):\n" msgstr "在本機找到「%s」Git 目錄，與其對應的遠端版本庫：\n" -#: builtin/submodule--helper.c:3060 +#: builtin/submodule--helper.c:3061 #, c-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22889,83 +22770,83 @@ msgstr "" "請使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n" "假如您不太懂意思，請使用 '--name' 選項輸入其他名稱。" -#: builtin/submodule--helper.c:3072 +#: builtin/submodule--helper.c:3073 #, c-format msgid "Reactivating local git directory for submodule '%s'\n" msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n" -#: builtin/submodule--helper.c:3109 +#: builtin/submodule--helper.c:3110 #, c-format msgid "unable to checkout submodule '%s'" msgstr "無法簽出「%s」子模組" -#: builtin/submodule--helper.c:3148 +#: builtin/submodule--helper.c:3149 #, c-format msgid "Failed to add submodule '%s'" msgstr "無法加入子模組「%s」" -#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157 -#: builtin/submodule--helper.c:3165 +#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158 +#: builtin/submodule--helper.c:3166 #, c-format msgid "Failed to register submodule '%s'" msgstr "無法註冊子模組「%s」" -#: builtin/submodule--helper.c:3221 +#: builtin/submodule--helper.c:3222 #, c-format msgid "'%s' already exists in the index" msgstr "「%s」已在索引中" -#: builtin/submodule--helper.c:3224 +#: builtin/submodule--helper.c:3225 #, c-format msgid "'%s' already exists in the index and is not a submodule" msgstr "「%s」已在索引中，且不是子模組" -#: builtin/submodule--helper.c:3253 +#: builtin/submodule--helper.c:3254 msgid "branch of repository to add as submodule" msgstr "要加入為子模組的版本庫分支" -#: builtin/submodule--helper.c:3254 +#: builtin/submodule--helper.c:3255 msgid "allow adding an otherwise ignored submodule path" msgstr "允許加入忽略的子模組路徑" -#: builtin/submodule--helper.c:3256 +#: builtin/submodule--helper.c:3257 msgid "print only error messages" msgstr "只輸出錯誤訊息" -#: builtin/submodule--helper.c:3260 +#: builtin/submodule--helper.c:3261 msgid "borrow the objects from reference repositories" msgstr "從引用的版本庫借用物件" -#: builtin/submodule--helper.c:3262 +#: builtin/submodule--helper.c:3263 msgid "" "sets the submodule’s name to the given string instead of defaulting to its " "path" msgstr "將子模組名稱設定為指定字串，而非預設的路徑名稱" -#: builtin/submodule--helper.c:3269 +#: builtin/submodule--helper.c:3270 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" msgstr "git submodule--helper add [<選項>] [--] <版本庫> [<路徑>]" -#: builtin/submodule--helper.c:3297 +#: builtin/submodule--helper.c:3298 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作區的頂級目錄中使用相對路徑" -#: builtin/submodule--helper.c:3305 +#: builtin/submodule--helper.c:3306 #, c-format msgid "repo URL: '%s' must be absolute or begin with ./|../" msgstr "版本庫 URL：「%s」必須是絕對路徑，或開頭是 ./|../" -#: builtin/submodule--helper.c:3340 +#: builtin/submodule--helper.c:3341 #, c-format msgid "'%s' is not a valid submodule name" msgstr "「%s」不是有效的子模組名稱" -#: builtin/submodule--helper.c:3404 git.c:449 git.c:723 +#: builtin/submodule--helper.c:3405 git.c:452 git.c:726 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支援 --super-prefix" -#: builtin/submodule--helper.c:3410 +#: builtin/submodule--helper.c:3411 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一個有效的 submodule--helper 子指令" @@ -23062,11 +22943,11 @@ msgstr "" " %s\n" "以 '%c' 開頭的行將被保留，如果您願意也可以刪除它們。\n" -#: builtin/tag.c:241 +#: builtin/tag.c:240 msgid "unable to sign the tag" msgstr "無法簽署標籤" -#: builtin/tag.c:259 +#: builtin/tag.c:258 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -23079,15 +22960,15 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:275 +#: builtin/tag.c:274 msgid "bad object type." msgstr "壞的物件類型。" -#: builtin/tag.c:326 +#: builtin/tag.c:325 msgid "no tag message?" msgstr "無標籤說明？" -#: builtin/tag.c:333 +#: builtin/tag.c:332 #, c-format msgid "The tag message has been left in %s\n" msgstr "標籤說明被保留在 %s\n" @@ -23168,45 +23049,22 @@ msgstr "只列印尚未合併的標籤" msgid "print only tags of the object" msgstr "只列印指向該物件的標籤" -#: builtin/tag.c:525 -msgid "--column and -n are incompatible" -msgstr "--column 和 -n 不相容" - -#: builtin/tag.c:546 -msgid "-n option is only allowed in list mode" -msgstr "-n 選項只允許用在列表顯示模式" - -#: builtin/tag.c:548 -msgid "--contains option is only allowed in list mode" -msgstr "--contains 選項只允許用在列表顯示模式" - -#: builtin/tag.c:550 -msgid "--no-contains option is only allowed in list mode" -msgstr "--no-contains 選項只允許用在列表顯示模式" - -#: builtin/tag.c:552 -msgid "--points-at option is only allowed in list mode" -msgstr "--points-at 選項只允許用在列表顯示模式" - -#: builtin/tag.c:554 -msgid "--merged and --no-merged options are only allowed in list mode" -msgstr "--merged 和 --no-merged 選項只允許用在列表顯示模式" - -#: builtin/tag.c:568 -msgid "only one -F or -m option is allowed." -msgstr "只允許一個 -F 或 -m 選項。" +#: builtin/tag.c:558 +#, c-format +msgid "the '%s' option is only allowed in list mode" +msgstr "「%s」選項只能在列表顯示模式使用" -#: builtin/tag.c:593 +#: builtin/tag.c:597 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一個有效的標籤名稱。" -#: builtin/tag.c:598 +#: builtin/tag.c:602 #, c-format msgid "tag '%s' already exists" msgstr "標籤 '%s' 已存在" -#: builtin/tag.c:629 +#: builtin/tag.c:633 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新標籤 '%s'（曾為 %s）\n" @@ -23623,130 +23481,118 @@ msgstr "不能建立目錄 '%s'" msgid "initializing" msgstr "正在初始化" -#: builtin/worktree.c:421 builtin/worktree.c:427 +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "準備工作區（新分支 '%s'）" -#: builtin/worktree.c:423 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "準備工作區（重設分支 '%s'，之前為 %s）" -#: builtin/worktree.c:432 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "準備工作區（簽出 '%s'）" -#: builtin/worktree.c:438 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "準備工作區（分離開頭指標 %s）" -#: builtin/worktree.c:483 +#: builtin/worktree.c:482 msgid "checkout <branch> even if already checked out in other worktree" msgstr "簽出 <分支>，即使已經被簽出到其它工作區" -#: builtin/worktree.c:486 +#: builtin/worktree.c:485 msgid "create a new branch" msgstr "建立一個新分支" -#: builtin/worktree.c:488 +#: builtin/worktree.c:487 msgid "create or reset a branch" msgstr "建立或重設一個分支" -#: builtin/worktree.c:490 +#: builtin/worktree.c:489 msgid "populate the new working tree" msgstr "生成新的工作區" -#: builtin/worktree.c:491 +#: builtin/worktree.c:490 msgid "keep the new working tree locked" msgstr "鎖定新工作區" -#: builtin/worktree.c:493 builtin/worktree.c:730 +#: builtin/worktree.c:492 builtin/worktree.c:729 msgid "reason for locking" msgstr "鎖定原因" -#: builtin/worktree.c:496 +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "設定追蹤模式（參見 git-branch(1)）" -#: builtin/worktree.c:499 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "嘗試為新分支名符合一個遠端追蹤分支" -#: builtin/worktree.c:507 -msgid "-b, -B, and --detach are mutually exclusive" -msgstr "-b、-B 和 --detach 是互斥的" - -#: builtin/worktree.c:509 -msgid "--reason requires --lock" -msgstr "--reason 需要 --lock" - -#: builtin/worktree.c:513 +#: builtin/worktree.c:512 msgid "added with --lock" msgstr "已使用 --lock 加入" -#: builtin/worktree.c:575 +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在建立新分支時使用 --[no-]track 選項" -#: builtin/worktree.c:692 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "如果有則顯示延伸的註釋和原因" -#: builtin/worktree.c:694 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "對舊於 <時間> 的工作區加上 ‘prunable’ 標示" -#: builtin/worktree.c:703 -msgid "--verbose and --porcelain are mutually exclusive" -msgstr "--verbose 和 --porcelain 互斥" - -#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849 -#: builtin/worktree.c:973 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一個工作區" -#: builtin/worktree.c:744 builtin/worktree.c:777 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作區無法被加鎖或解鎖" -#: builtin/worktree.c:749 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被鎖定，原因：%s" -#: builtin/worktree.c:751 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被鎖定" -#: builtin/worktree.c:779 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被鎖定" -#: builtin/worktree.c:820 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移動或刪除包含子模組的工作區" -#: builtin/worktree.c:828 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "強制移動，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:851 builtin/worktree.c:975 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一個主工作區" -#: builtin/worktree.c:856 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "無法從 '%s' 算出目的地名稱" -#: builtin/worktree.c:869 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23755,7 +23601,7 @@ msgstr "" "無法移動一個鎖定的工作區，鎖定原因：%s\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:871 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23763,36 +23609,36 @@ msgstr "" "無法移動一個鎖定的工作區，\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:874 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "驗證失敗，無法移動工作區：%s" -#: builtin/worktree.c:879 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "移動 '%s' 到 '%s' 失敗" -#: builtin/worktree.c:925 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中執行 'git status' 失敗" -#: builtin/worktree.c:929 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除" -#: builtin/worktree.c:934 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d" -#: builtin/worktree.c:957 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "強制刪除，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:980 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23801,7 +23647,7 @@ msgstr "" "無法刪除一個鎖定的工作區，鎖定原因：%s\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:982 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23809,17 +23655,17 @@ msgstr "" "無法刪除一個鎖定的工作區，\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:985 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "驗證失敗，無法刪除工作區：%s" -#: builtin/worktree.c:1009 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "修復：%s：%s" -#: builtin/worktree.c:1012 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "錯誤：%s：%s" @@ -23870,21 +23716,16 @@ msgstr "" "說明。\n" "有關系統概述，檢視 'git help git'。" -#: git.c:188 +#: git.c:188 git.c:216 git.c:300 #, c-format -msgid "no directory given for --git-dir\n" -msgstr "沒有為 --git-dir 提供目錄\n" +msgid "no directory given for '%s' option\n" +msgstr "未傳入目錄至「%s」選項\n" #: git.c:202 #, c-format msgid "no namespace given for --namespace\n" msgstr "沒有為 --namespace 提供命名空間\n" -#: git.c:216 -#, c-format -msgid "no directory given for --work-tree\n" -msgstr "沒有為 --work-tree 提供目錄\n" - #: git.c:230 #, c-format msgid "no prefix given for --super-prefix\n" @@ -23900,11 +23741,6 @@ msgstr "應為 -c 提供一個設定字串\n" msgid "no config key given for --config-env\n" msgstr "未傳入設定鍵至 --config-env\n" -#: git.c:300 -#, c-format -msgid "no directory given for -C\n" -msgstr "沒有為 -C 提供目錄\n" - #: git.c:326 #, c-format msgid "unknown option: %s\n" @@ -23934,29 +23770,29 @@ msgstr "%s 的空別名" msgid "recursive alias: %s" msgstr "遞迴的別名：%s" -#: git.c:476 +#: git.c:479 msgid "write failure on standard output" msgstr "在標準輸出寫入失敗" -#: git.c:478 +#: git.c:481 msgid "unknown write failure on standard output" msgstr "到標準輸出的未知寫入錯誤" -#: git.c:480 +#: git.c:483 msgid "close failed on standard output" msgstr "標準輸出關閉失敗" -#: git.c:832 +#: git.c:835 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "偵測到別名循環：展開後的「%s」無窮無盡：%s" -#: git.c:882 +#: git.c:885 #, c-format msgid "cannot handle %s as a builtin" msgstr "不能作為內建指令處理 %s" -#: git.c:895 +#: git.c:898 #, c-format msgid "" "usage: %s\n" @@ -23965,33 +23801,25 @@ msgstr "" "用法：%s\n" "\n" -#: git.c:915 +#: git.c:918 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n" -#: git.c:927 +#: git.c:930 #, c-format msgid "failed to run command '%s': %s\n" msgstr "執行指令 '%s' 失敗：%s\n" -#: http-fetch.c:118 +#: http-fetch.c:128 #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "傳入 --packfile 的參數必須是有效的雜湊 (收到 '%s')" -#: http-fetch.c:128 +#: http-fetch.c:138 msgid "not a git repository" msgstr "不是一個 git 版本庫" -#: http-fetch.c:134 -msgid "--packfile requires --index-pack-args" -msgstr "--packfile 需要 --index-pack-args" - -#: http-fetch.c:143 -msgid "--index-pack-args can only be used with --packfile" -msgstr "--index-pack-args 只能與 --packfile 一起使用" - #: t/helper/test-fast-rebase.c:141 msgid "unhandled options" msgstr "未處理選項" @@ -24269,6 +24097,175 @@ msgstr "remote-curl：嘗試沒有本機版本庫下取得" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl：未知的來自 git 的指令 '%s'" +#: contrib/scalar/scalar.c:49 +msgid "need a working directory" +msgstr "需要工作目錄" + +#: contrib/scalar/scalar.c:86 +msgid "could not find enlistment root" +msgstr "找不到編列名單的根目錄" + +#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351 +#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579 +#, c-format +msgid "could not switch to '%s'" +msgstr "無法切換至「%s」" + +#: contrib/scalar/scalar.c:180 +#, c-format +msgid "could not configure %s=%s" +msgstr "無法設定 %s=%s" + +#: contrib/scalar/scalar.c:198 +msgid "could not configure log.excludeDecoration" +msgstr "無法設定 log.excludeDecoration" + +#: contrib/scalar/scalar.c:219 +msgid "Scalar enlistments require a worktree" +msgstr "純量編列名單需要工作目錄" + +#: contrib/scalar/scalar.c:311 +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "遠端 HEAD 不是分支：「%.*s」" + +#: contrib/scalar/scalar.c:317 +msgid "failed to get default branch name from remote; using local default" +msgstr "無法從遠端取得預設分支名稱。改用本機預設名稱" + +#: contrib/scalar/scalar.c:330 +msgid "failed to get default branch name" +msgstr "無法取得預設分支名稱" + +#: contrib/scalar/scalar.c:341 +msgid "failed to unregister repository" +msgstr "無法取消註冊版本庫" + +#: contrib/scalar/scalar.c:356 +msgid "failed to delete enlistment directory" +msgstr "無法刪除編列名單目錄" + +#: contrib/scalar/scalar.c:376 +msgid "branch to checkout after clone" +msgstr "複製後要簽出的分支" + +#: contrib/scalar/scalar.c:378 +msgid "when cloning, create full working directory" +msgstr "複製時建立完整的工作目錄" + +#: contrib/scalar/scalar.c:380 +msgid "only download metadata for the branch that will be checked out" +msgstr "只下載會簽出的分支中介資料" + +#: contrib/scalar/scalar.c:385 +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<options>] [--] <repo> [<dir>]" + +#: contrib/scalar/scalar.c:410 +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "無法從「%s」推論工作區名稱" + +#: contrib/scalar/scalar.c:419 +#, c-format +msgid "directory '%s' exists already" +msgstr "「%s」目錄已經存在" + +#: contrib/scalar/scalar.c:446 +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "無法取得「%s」的預設分支" + +#: contrib/scalar/scalar.c:457 +#, c-format +msgid "could not configure remote in '%s'" +msgstr "無法設定「%s」中的遠端" + +#: contrib/scalar/scalar.c:466 +#, c-format +msgid "could not configure '%s'" +msgstr "無法設定「%s」" + +#: contrib/scalar/scalar.c:469 +msgid "partial clone failed; attempting full clone" +msgstr "部分複製失敗。嘗試完整複製" + +#: contrib/scalar/scalar.c:473 +msgid "could not configure for full clone" +msgstr "無法設定完整複製" + +#: contrib/scalar/scalar.c:505 +msgid "`scalar list` does not take arguments" +msgstr "`scalar list` 未取引數" + +#: contrib/scalar/scalar.c:518 +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<enlistment>]" + +#: contrib/scalar/scalar.c:545 +msgid "reconfigure all registered enlistments" +msgstr "重新設定所有註冊的編列名單" + +#: contrib/scalar/scalar.c:549 +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <enlistment>]" + +#: contrib/scalar/scalar.c:567 +msgid "--all or <enlistment>, but not both" +msgstr "--all 或 <enlistment> 但不能傳入兩者" + +#: contrib/scalar/scalar.c:582 +#, c-format +msgid "git repository gone in '%s'" +msgstr "git 版本庫在「%s」遺失" + +#: contrib/scalar/scalar.c:622 +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <task> [<enlistment>]\n" +"作業：\n" + +#: contrib/scalar/scalar.c:640 +#, c-format +msgid "no such task: '%s'" +msgstr "無此作業：「%s」" + +#: contrib/scalar/scalar.c:690 +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<enlistment>]" + +#: contrib/scalar/scalar.c:737 +msgid "scalar delete <enlistment>" +msgstr "scalar delete <enlistment>" + +#: contrib/scalar/scalar.c:752 +msgid "refusing to delete current working directory" +msgstr "拒絕刪除目前工作目錄" + +#: contrib/scalar/scalar.c:767 +msgid "include Git version" +msgstr "包含 Git 版本" + +#: contrib/scalar/scalar.c:769 +msgid "include Git's build options" +msgstr "包含 Git 組建選項" + +#: contrib/scalar/scalar.c:773 +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +#: contrib/scalar/scalar.c:821 +msgid "" +"scalar <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar <command> [<options>]\n" +"\n" +"命令：\n" + #: compat/compiler.h:26 msgid "no compiler information available\n" msgstr "沒有可用的編譯器資訊\n" @@ -24293,36 +24290,36 @@ msgstr "到期時間" msgid "no-op (backward compatibility)" msgstr "空動作（向後相容）" -#: parse-options.h:308 +#: parse-options.h:310 msgid "be more verbose" msgstr "更加詳細" -#: parse-options.h:310 +#: parse-options.h:312 msgid "be more quiet" msgstr "更加安靜" -#: parse-options.h:316 +#: parse-options.h:318 msgid "use <n> digits to display object names" msgstr "用 <n> 位數字顯示物件名稱" -#: parse-options.h:335 +#: parse-options.h:337 msgid "how to strip spaces and #comments from message" msgstr "設定如何刪除提交說明裡的空格和 #備註" -#: parse-options.h:336 +#: parse-options.h:338 msgid "read pathspec from file" msgstr "從檔案讀取 <路徑規格>" -#: parse-options.h:337 +#: parse-options.h:339 msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔" -#: ref-filter.h:101 +#: ref-filter.h:98 msgid "key" msgstr "key" -#: ref-filter.h:101 +#: ref-filter.h:98 msgid "field name to sort on" msgstr "排序的欄位名" @@ -24391,17 +24388,17 @@ msgid "Show canonical names and email addresses of contacts" msgstr "顯示聯絡人的規範名稱和電子信件" #: command-list.h:65 +msgid "Ensures that a reference name is well formed" +msgstr "確保引用名稱格式正確" + +#: command-list.h:66 msgid "Switch branches or restore working tree files" msgstr "切換分支或復原工作區檔案" -#: command-list.h:66 +#: command-list.h:67 msgid "Copy files from the index to the working tree" msgstr "從索引複製檔案到工作區" -#: command-list.h:67 -msgid "Ensures that a reference name is well formed" -msgstr "確保引用名稱格式正確" - #: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "尋找尚未套用到上游的提交" @@ -24595,413 +24592,413 @@ msgid "Add or parse structured information in commit messages" msgstr "新增或解析提交說明中的結構化訊息" #: command-list.h:116 -msgid "The Git repository browser" -msgstr "Git 版本庫瀏覽器" - -#: command-list.h:117 msgid "Show commit logs" msgstr "顯示提交日誌" -#: command-list.h:118 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "顯示索引和工作區中檔案的訊息" -#: command-list.h:119 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "顯示一個遠端版本庫的引用" -#: command-list.h:120 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "顯示一個樹狀物件的內容" -#: command-list.h:121 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "從單個電子信件中擷取修補檔和作者身份" -#: command-list.h:122 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "簡單的 UNIX mbox 信箱切分程式" -#: command-list.h:123 +#: command-list.h:122 msgid "Run tasks to optimize Git repository data" msgstr "執行用來最佳化 Git 版本庫資料的作業" -#: command-list.h:124 +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "合併兩個或更多開發歷史" -#: command-list.h:125 +#: command-list.h:124 msgid "Find as good common ancestors as possible for a merge" msgstr "為了合併尋找儘可能好的公共祖先提交" -#: command-list.h:126 +#: command-list.h:125 msgid "Run a three-way file merge" msgstr "執行一個三路檔案合併" -#: command-list.h:127 +#: command-list.h:126 msgid "Run a merge for files needing merging" msgstr "對於需要合併的檔案執行合併" -#: command-list.h:128 +#: command-list.h:127 msgid "The standard helper program to use with git-merge-index" msgstr "與 git-merge-index 一起使用的標準嚮導程式" +#: command-list.h:128 +msgid "Show three-way merge without touching index" +msgstr "顯示三路合併而不動索引" + #: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "執行合併衝突解決工具以解決合併衝突" #: command-list.h:130 -msgid "Show three-way merge without touching index" -msgstr "顯示三路合併而不動索引" - -#: command-list.h:131 -msgid "Write and verify multi-pack-indexes" -msgstr "寫入和驗證多包索引" - -#: command-list.h:132 msgid "Creates a tag object with extra validation" msgstr "建立有額外驗證的標籤物件" -#: command-list.h:133 +#: command-list.h:131 msgid "Build a tree-object from ls-tree formatted text" msgstr "基於 ls-tree 的格式化文字建立一個樹狀物件" -#: command-list.h:134 +#: command-list.h:132 +msgid "Write and verify multi-pack-indexes" +msgstr "寫入和驗證多包索引" + +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "移動或重新命名一個檔案、目錄或符號連結" # 尋找提供版本的符號名稱 -#: command-list.h:135 +#: command-list.h:134 msgid "Find symbolic names for given revs" msgstr "尋找提供版本的符號名稱" -#: command-list.h:136 +#: command-list.h:135 msgid "Add or inspect object notes" msgstr "新增或檢查物件備註" -#: command-list.h:137 +#: command-list.h:136 msgid "Import from and submit to Perforce repositories" msgstr "匯入和提交到 Perforce 版本庫中" -#: command-list.h:138 +#: command-list.h:137 msgid "Create a packed archive of objects" msgstr "建立物件的存檔包" -#: command-list.h:139 +#: command-list.h:138 msgid "Find redundant pack files" msgstr "尋找冗餘的包檔案" -#: command-list.h:140 +#: command-list.h:139 msgid "Pack heads and tags for efficient repository access" msgstr "打包頭和標籤以實現高效的版本庫存取" -#: command-list.h:141 +#: command-list.h:140 msgid "Compute unique ID for a patch" msgstr "計算一個修補檔的唯一 ID" -#: command-list.h:142 +#: command-list.h:141 msgid "Prune all unreachable objects from the object database" msgstr "刪除物件庫中所有無法取得物件" -#: command-list.h:143 +#: command-list.h:142 msgid "Remove extra objects that are already in pack files" msgstr "刪除已經在包檔案中的多餘物件" -#: command-list.h:144 +#: command-list.h:143 msgid "Fetch from and integrate with another repository or a local branch" msgstr "取得並整合另外的版本庫或一個本機分支" -#: command-list.h:145 +#: command-list.h:144 msgid "Update remote refs along with associated objects" msgstr "更新遠端引用和相關的物件" -#: command-list.h:146 +#: command-list.h:145 msgid "Applies a quilt patchset onto the current branch" msgstr "將一個 quilt 修補檔集合套用到目前分支" -#: command-list.h:147 +#: command-list.h:146 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "比較兩個提交範圍（如一個分支的兩個版本）" -#: command-list.h:148 +#: command-list.h:147 msgid "Reads tree information into the index" msgstr "將樹訊息讀取到索引" -#: command-list.h:149 +#: command-list.h:148 msgid "Reapply commits on top of another base tip" msgstr "在另一個分支上重新套用提交" -#: command-list.h:150 +#: command-list.h:149 msgid "Receive what is pushed into the repository" msgstr "接收推送到版本庫中的物件" -#: command-list.h:151 +#: command-list.h:150 msgid "Manage reflog information" msgstr "管理 reflog 訊息" -#: command-list.h:152 +#: command-list.h:151 msgid "Manage set of tracked repositories" msgstr "管理已追蹤版本庫" -#: command-list.h:153 +#: command-list.h:152 msgid "Pack unpacked objects in a repository" msgstr "打包版本庫中未打包物件" -#: command-list.h:154 +#: command-list.h:153 msgid "Create, list, delete refs to replace objects" msgstr "建立、列出、刪除物件取代引用" -#: command-list.h:155 +#: command-list.h:154 msgid "Generates a summary of pending changes" msgstr "生成待定更改的摘要" -#: command-list.h:156 +#: command-list.h:155 msgid "Reuse recorded resolution of conflicted merges" msgstr "重用衝突合併的解決方案記錄" -#: command-list.h:157 +#: command-list.h:156 msgid "Reset current HEAD to the specified state" msgstr "重設目前 HEAD 到指定狀態" -#: command-list.h:158 +#: command-list.h:157 msgid "Restore working tree files" msgstr "復原工作區檔案" -#: command-list.h:159 -msgid "Revert some existing commits" -msgstr "還原一些現存提交" - -#: command-list.h:160 +#: command-list.h:158 msgid "Lists commit objects in reverse chronological order" msgstr "按時間順序列出提交物件" -#: command-list.h:161 +#: command-list.h:159 msgid "Pick out and massage parameters" msgstr "選出並處理參數" -#: command-list.h:162 +#: command-list.h:160 +msgid "Revert some existing commits" +msgstr "還原一些現存提交" + +#: command-list.h:161 msgid "Remove files from the working tree and from the index" msgstr "從工作區和索引中刪除檔案" -#: command-list.h:163 +#: command-list.h:162 msgid "Send a collection of patches as emails" msgstr "透過電子信件傳送一組修補檔" -#: command-list.h:164 +#: command-list.h:163 msgid "Push objects over Git protocol to another repository" msgstr "使用 Git 協定推送物件到另一個版本庫" +#: command-list.h:164 +msgid "Git's i18n setup code for shell scripts" +msgstr "為 shell 腳本準備的 Git 國際化設定程式碼" + #: command-list.h:165 +msgid "Common Git shell script setup code" +msgstr "常用的 Git shell 腳本設定程式碼" + +#: command-list.h:166 msgid "Restricted login shell for Git-only SSH access" msgstr "只允許 Git SSH 存取的受限登入shell" -#: command-list.h:166 +#: command-list.h:167 msgid "Summarize 'git log' output" msgstr "'git log' 輸出摘要" -#: command-list.h:167 +#: command-list.h:168 msgid "Show various types of objects" msgstr "顯示各種類型的物件" -#: command-list.h:168 +#: command-list.h:169 msgid "Show branches and their commits" msgstr "顯示分支和提交" -#: command-list.h:169 +#: command-list.h:170 msgid "Show packed archive index" msgstr "顯示打包歸檔索引" -#: command-list.h:170 +#: command-list.h:171 msgid "List references in a local repository" msgstr "顯示本機版本庫中的引用" -#: command-list.h:171 -msgid "Git's i18n setup code for shell scripts" -msgstr "為 shell 腳本準備的 Git 國際化設定程式碼" - #: command-list.h:172 -msgid "Common Git shell script setup code" -msgstr "常用的 Git shell 腳本設定程式碼" - -#: command-list.h:173 msgid "Initialize and modify the sparse-checkout" msgstr "初始化並修改稀疏簽出" +#: command-list.h:173 +msgid "Add file contents to the staging area" +msgstr "將檔案內容新增到索引" + #: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "儲藏髒工作區中的修改" #: command-list.h:175 -msgid "Add file contents to the staging area" -msgstr "將檔案內容新增到索引" - -#: command-list.h:176 msgid "Show the working tree status" msgstr "顯示工作區狀態" -#: command-list.h:177 +#: command-list.h:176 msgid "Remove unnecessary whitespace" msgstr "刪除不必要的空白字元" -#: command-list.h:178 +#: command-list.h:177 msgid "Initialize, update or inspect submodules" msgstr "初始化、更新或檢查子模組" -#: command-list.h:179 +#: command-list.h:178 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Subversion 版本庫和 Git 之間的雙向動作" -#: command-list.h:180 +#: command-list.h:179 msgid "Switch branches" msgstr "切換分支" -#: command-list.h:181 +#: command-list.h:180 msgid "Read, modify and delete symbolic refs" msgstr "讀取、修改和刪除符號引用" -#: command-list.h:182 +#: command-list.h:181 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "建立、列出、刪除或驗證一個 GPG 簽名的標籤物件" -#: command-list.h:183 +#: command-list.h:182 msgid "Creates a temporary file with a blob's contents" msgstr "用資料物件的內容建立暫存檔" -#: command-list.h:184 +#: command-list.h:183 msgid "Unpack objects from a packed archive" msgstr "從打包檔案中解壓縮物件" -#: command-list.h:185 +#: command-list.h:184 msgid "Register file contents in the working tree to the index" msgstr "將工作區的檔案內容註冊到索引" -#: command-list.h:186 +#: command-list.h:185 msgid "Update the object name stored in a ref safely" msgstr "安全地更新儲存於引用中的物件名稱" -#: command-list.h:187 +#: command-list.h:186 msgid "Update auxiliary info file to help dumb servers" msgstr "更新輔助訊息檔案以協助啞協定服務" -#: command-list.h:188 +#: command-list.h:187 msgid "Send archive back to git-archive" msgstr "將存檔傳送回 git-archive" -#: command-list.h:189 +#: command-list.h:188 msgid "Send objects packed back to git-fetch-pack" msgstr "將物件壓縮包傳送回 git-fetch-pack" -#: command-list.h:190 +#: command-list.h:189 msgid "Show a Git logical variable" msgstr "顯示 Git 邏輯變數" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of commits" msgstr "檢查 GPG 提交簽名" -#: command-list.h:192 +#: command-list.h:191 msgid "Validate packed Git archive files" msgstr "驗證打包的 Git 封存檔案" -#: command-list.h:193 +#: command-list.h:192 msgid "Check the GPG signature of tags" msgstr "檢查標籤的 GPG 簽名" -#: command-list.h:194 -msgid "Git web interface (web frontend to Git repositories)" -msgstr "Git web 介面（Git 版本庫的 web 前端）" - -#: command-list.h:195 +#: command-list.h:193 msgid "Show logs with difference each commit introduces" msgstr "顯示每一個提交引入的差異日誌" -#: command-list.h:196 +#: command-list.h:194 msgid "Manage multiple working trees" msgstr "管理多個工作區" -#: command-list.h:197 +#: command-list.h:195 msgid "Create a tree object from the current index" msgstr "從目前索引建立一個樹狀物件" -#: command-list.h:198 +#: command-list.h:196 msgid "Defining attributes per path" msgstr "定義路徑的屬性" -#: command-list.h:199 +#: command-list.h:197 msgid "Git command-line interface and conventions" msgstr "Git 指令列介面和約定" -#: command-list.h:200 +#: command-list.h:198 msgid "A Git core tutorial for developers" msgstr "面向開發人員的 Git 核心教學" -#: command-list.h:201 +#: command-list.h:199 msgid "Providing usernames and passwords to Git" msgstr "將使用者名稱及密碼提供給 Git" -#: command-list.h:202 +#: command-list.h:200 msgid "Git for CVS users" msgstr "適合 CVS 使用者的 Git 協助" -#: command-list.h:203 +#: command-list.h:201 msgid "Tweaking diff output" msgstr "調整差異輸出" -#: command-list.h:204 +#: command-list.h:202 msgid "A useful minimum set of commands for Everyday Git" msgstr "每一天 Git 的一組有用的最小指令集合" -#: command-list.h:205 +#: command-list.h:203 msgid "Frequently asked questions about using Git" msgstr "Git 使用的常見問題" -#: command-list.h:206 +#: command-list.h:204 msgid "A Git Glossary" msgstr "Git 詞彙表" -#: command-list.h:207 +#: command-list.h:205 msgid "Hooks used by Git" msgstr "Git 使用的掛鉤" -#: command-list.h:208 +#: command-list.h:206 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未追蹤檔案" -#: command-list.h:209 +#: command-list.h:207 +msgid "The Git repository browser" +msgstr "Git 版本庫瀏覽器" + +#: command-list.h:208 msgid "Map author/committer names and/or E-Mail addresses" msgstr "映射作者或提交者的名稱和（或）電子信箱地址" -#: command-list.h:210 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "定義子模組屬性" -#: command-list.h:211 +#: command-list.h:210 msgid "Git namespaces" msgstr "Git 名字空間" -#: command-list.h:212 +#: command-list.h:211 msgid "Helper programs to interact with remote repositories" msgstr "用來與遠端版本庫互動的協助工具" -#: command-list.h:213 +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Git 版本庫配置" -#: command-list.h:214 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本範圍" -#: command-list.h:215 +#: command-list.h:214 msgid "Mounting one repository inside another" msgstr "在某個版本庫掛載某個版本庫" +#: command-list.h:215 +msgid "A tutorial introduction to Git" +msgstr "一個 Git 教學" + #: command-list.h:216 msgid "A tutorial introduction to Git: part two" msgstr "一個 Git 教學：第二部分" #: command-list.h:217 -msgid "A tutorial introduction to Git" -msgstr "一個 Git 教學" +msgid "Git web interface (web frontend to Git repositories)" +msgstr "Git web 介面（Git 版本庫的 web 前端）" #: command-list.h:218 msgid "An overview of recommended workflows with Git" @@ -25072,39 +25069,39 @@ msgstr "無法遞迴進子模組路徑 '$displaypath'" msgid "usage: $dashless $USAGE" msgstr "用法：$dashless $USAGE" -#: git-sh-setup.sh:191 +#: git-sh-setup.sh:183 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "不能切換目錄到 $cdup，工作區的頂級目錄" -#: git-sh-setup.sh:200 git-sh-setup.sh:207 +#: git-sh-setup.sh:192 git-sh-setup.sh:199 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "致命錯誤：$program_name 不能在沒有工作區的情況下使用。" -#: git-sh-setup.sh:221 +#: git-sh-setup.sh:213 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "不能重寫分支：您有未暫存的變更。" -#: git-sh-setup.sh:224 +#: git-sh-setup.sh:216 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "不能 $action：您有未暫存的變更。" -#: git-sh-setup.sh:235 +#: git-sh-setup.sh:227 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "不能 $action：您的索引中包含未提交的變更。" -#: git-sh-setup.sh:237 +#: git-sh-setup.sh:229 msgid "Additionally, your index contains uncommitted changes." msgstr "而且您的索引中包含未提交的變更。" -#: git-sh-setup.sh:357 +#: git-sh-setup.sh:349 msgid "You need to run this command from the toplevel of the working tree." msgstr "您需要在工作區的頂級目錄中執行這個指令。" -#: git-sh-setup.sh:362 +#: git-sh-setup.sh:354 msgid "Unable to determine absolute path of git directory" msgstr "不能確定 git 目錄的絕對路徑" @@ -25175,7 +25172,7 @@ msgstr "" msgid "failed to open hunk edit file for reading: %s" msgstr "無法讀取區塊編輯檔案：%s" -#: git-add--interactive.perl:1251 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -25189,7 +25186,7 @@ msgstr "" "a - 暫存此區塊和本檔案中後面的全部區塊\n" "d - 不暫存此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1257 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -25203,7 +25200,7 @@ msgstr "" "a - 儲藏此區塊和本檔案中後面的全部區塊\n" "d - 不儲藏此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1263 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -25217,7 +25214,7 @@ msgstr "" "a - 不暫存此區塊和本檔案中後面的全部區塊\n" "d - 不要不暫存此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1269 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -25231,7 +25228,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -25245,7 +25242,7 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1281 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -25259,7 +25256,7 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -25273,7 +25270,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1299 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -25287,7 +25284,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1314 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -25309,88 +25306,88 @@ msgstr "" "e - 手動編輯目前區塊\n" "? - 顯示說明\n" -#: git-add--interactive.perl:1345 +#: git-add--interactive.perl:1347 msgid "The selected hunks do not apply to the index!\n" msgstr "選取區塊不能套用到索引！\n" -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "忽略未套用的：%s\n" -#: git-add--interactive.perl:1479 +#: git-add--interactive.perl:1481 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1480 +#: git-add--interactive.perl:1482 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "將刪除變更套用到工作區 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1483 #, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "將新增變更套用到工作區 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1482 +#: git-add--interactive.perl:1484 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1599 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "沒有其它可供跳轉的區塊\n" -#: git-add--interactive.perl:1617 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "無效數字：'%s'\n" -#: git-add--interactive.perl:1622 +#: git-add--interactive.perl:1624 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "對不起，只有 %d 個可用區塊。\n" -#: git-add--interactive.perl:1657 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "沒有其它可供尋找的區塊\n" -#: git-add--interactive.perl:1674 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "錯誤的常規表示式 %s：%s\n" -#: git-add--interactive.perl:1684 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "沒有和提供模式相符合的區塊\n" -#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "沒有上一個區塊\n" -#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "沒有下一個區塊\n" -#: git-add--interactive.perl:1730 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "對不起，不能分割這個區塊\n" -#: git-add--interactive.perl:1736 +#: git-add--interactive.perl:1738 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "分割為 %d 塊。\n" -#: git-add--interactive.perl:1746 +#: git-add--interactive.perl:1748 msgid "Sorry, cannot edit this hunk\n" msgstr "對不起，不能編輯這個區塊\n" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1811 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -25407,56 +25404,56 @@ msgstr "" "diff - 顯示 HEAD 和索引間差異\n" "add untracked - 新增未追蹤檔案的內容至暫存列表\n" -#: git-add--interactive.perl:1828 git-add--interactive.perl:1840 -#: git-add--interactive.perl:1843 git-add--interactive.perl:1850 -#: git-add--interactive.perl:1853 git-add--interactive.perl:1860 -#: git-add--interactive.perl:1864 git-add--interactive.perl:1870 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1842 +#: git-add--interactive.perl:1845 git-add--interactive.perl:1852 +#: git-add--interactive.perl:1855 git-add--interactive.perl:1862 +#: git-add--interactive.perl:1866 git-add--interactive.perl:1872 msgid "missing --" msgstr "缺少 --" -#: git-add--interactive.perl:1866 +#: git-add--interactive.perl:1868 #, perl-format msgid "unknown --patch mode: %s" msgstr "未知的 --patch 模式：%s" -#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 +#: git-add--interactive.perl:1874 git-add--interactive.perl:1880 #, perl-format msgid "invalid argument %s, expecting --" msgstr "無效的參數 %s，期望是 --" -#: git-send-email.perl:129 +#: git-send-email.perl:159 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本機時間和 GMT 有不到一分鐘間隔\n" -#: git-send-email.perl:136 git-send-email.perl:142 +#: git-send-email.perl:166 git-send-email.perl:172 msgid "local time offset greater than or equal to 24 hours\n" msgstr "本機時間位移量大於等於 24 小時\n" -#: git-send-email.perl:214 +#: git-send-email.perl:244 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "致命錯誤：命令「%s」中止，結束碼：%d" -#: git-send-email.perl:227 +#: git-send-email.perl:257 msgid "the editor exited uncleanly, aborting everything" msgstr "編輯器非正常離開，終止所有動作" -#: git-send-email.perl:316 +#: git-send-email.perl:346 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' 包含您正在編寫的一個中間版本的信件。\n" -#: git-send-email.perl:321 +#: git-send-email.perl:351 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包含編輯的信件。\n" -#: git-send-email.perl:450 +#: git-send-email.perl:484 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它選項不相容\n" -#: git-send-email.perl:525 +#: git-send-email.perl:561 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25466,47 +25463,47 @@ msgstr "" "git-send-email 已經以 sendemail.* 選項設定 - 注意裡面的 'e'。\n" "請將 sendemail.forbidSendmailVariables 設為 false 停用此檢查。\n" -#: git-send-email.perl:530 git-send-email.perl:746 +#: git-send-email.perl:566 git-send-email.perl:782 msgid "Cannot run git format-patch from outside a repository\n" msgstr "不能在版本庫之外執行 git format-patch\n" -#: git-send-email.perl:533 +#: git-send-email.perl:569 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "`batch-size` 和 `relogin` 必須同時定義（透過指令列或者設定選項）\n" -#: git-send-email.perl:546 +#: git-send-email.perl:582 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc 欄位：'%s'\n" -#: git-send-email.perl:577 +#: git-send-email.perl:613 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 設定：'%s'\n" -#: git-send-email.perl:617 +#: git-send-email.perl:653 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "警告：不支援帶引號的 sendmail 別名：%s\n" -#: git-send-email.perl:619 +#: git-send-email.perl:655 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "警告：不支援 `:include:`：%s\n" -#: git-send-email.perl:621 +#: git-send-email.perl:657 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "警告：不支援 `/file` 或 `|pipe` 重定向：%s\n" -#: git-send-email.perl:626 +#: git-send-email.perl:662 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "警告：不能識別的 sendmail 行：%s\n" -#: git-send-email.perl:711 +#: git-send-email.perl:747 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25521,12 +25518,12 @@ msgstr "" " * 如果含義為一個檔案，使用 \"./%s\"，或者\n" " * 如果含義為一個範圍，使用 --format-patch 選項。\n" -#: git-send-email.perl:732 +#: git-send-email.perl:768 #, perl-format msgid "Failed to opendir %s: %s" msgstr "無法開啟目錄 %s: %s" -#: git-send-email.perl:767 +#: git-send-email.perl:803 msgid "" "\n" "No patch files specified!\n" @@ -25536,17 +25533,17 @@ msgstr "" "未指定修補檔案！\n" "\n" -#: git-send-email.perl:780 +#: git-send-email.perl:816 #, perl-format msgid "No subject line in %s?" msgstr "在 %s 中沒有標題行？" -#: git-send-email.perl:791 +#: git-send-email.perl:827 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "為寫入開啟 %s 失敗: %s" -#: git-send-email.perl:802 +#: git-send-email.perl:838 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25559,37 +25556,37 @@ msgstr "" "\n" "如果您不想傳送摘要，清除內容。\n" -#: git-send-email.perl:826 +#: git-send-email.perl:862 #, perl-format msgid "Failed to open %s: %s" msgstr "無法開啟 %s: %s" -#: git-send-email.perl:843 +#: git-send-email.perl:879 #, perl-format msgid "Failed to open %s.final: %s" msgstr "無法開啟 %s.final: %s" -#: git-send-email.perl:886 +#: git-send-email.perl:922 msgid "Summary email is empty, skipping it\n" msgstr "摘要信件為空，略過\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:935 +#: git-send-email.perl:971 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您是否要使用 <%s> [y/N]？ " -#: git-send-email.perl:990 +#: git-send-email.perl:1026 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "如下檔案含 8bit 內容，但沒有聲明一個 Content-Transfer-Encoding。\n" -#: git-send-email.perl:995 +#: git-send-email.perl:1031 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "要宣告 8bit 為什麼樣的編碼格式 [UTF-8]？ " -#: git-send-email.perl:1003 +#: git-send-email.perl:1039 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25601,20 +25598,20 @@ msgstr "" "\t%s\n" "包含範本標題 '*** SUBJECT HERE ***'。如果確定想要傳送，使用參數 --force。\n" -#: git-send-email.perl:1022 +#: git-send-email.perl:1058 msgid "To whom should the emails be sent (if anyone)?" msgstr "信件將要傳送給誰？" -#: git-send-email.perl:1040 +#: git-send-email.perl:1076 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "致命錯誤：別名 '%s' 展開後還是自己\n" -#: git-send-email.perl:1052 +#: git-send-email.perl:1088 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "（如果有）Message-ID 是否要被用作第一封信件的 In-Reply-To ？ " -#: git-send-email.perl:1114 git-send-email.perl:1122 +#: git-send-email.perl:1150 git-send-email.perl:1158 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n" @@ -25622,16 +25619,16 @@ msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1126 +#: git-send-email.perl:1162 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何處理這個位址？([q]uit|[d]rop|[e]dit)： " -#: git-send-email.perl:1446 +#: git-send-email.perl:1482 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路徑 \"%s\" 不存在" -#: git-send-email.perl:1529 +#: git-send-email.perl:1565 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25656,112 +25653,112 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1544 +#: git-send-email.perl:1580 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "傳送這封信件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -#: git-send-email.perl:1547 +#: git-send-email.perl:1583 msgid "Send this email reply required" msgstr "傳送要求的信件回復" -#: git-send-email.perl:1581 +#: git-send-email.perl:1617 msgid "The required SMTP server is not properly defined." msgstr "要求的 SMTP 伺服器未被正確定義。" -#: git-send-email.perl:1628 +#: git-send-email.perl:1664 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "伺服器不支援 STARTTLS！%s" -#: git-send-email.perl:1633 git-send-email.perl:1637 +#: git-send-email.perl:1669 git-send-email.perl:1673 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失敗！%s" -#: git-send-email.perl:1646 +#: git-send-email.perl:1682 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "無法正確地初始化 SMTP。檢查設定並使用 --smtp-debug。" -#: git-send-email.perl:1664 +#: git-send-email.perl:1700 #, perl-format msgid "Failed to send %s\n" msgstr "無法傳送 %s\n" -#: git-send-email.perl:1667 +#: git-send-email.perl:1703 #, perl-format msgid "Dry-Sent %s\n" msgstr "測試執行傳送 %s\n" -#: git-send-email.perl:1667 +#: git-send-email.perl:1703 #, perl-format msgid "Sent %s\n" msgstr "正傳送 %s\n" -#: git-send-email.perl:1669 +#: git-send-email.perl:1705 msgid "Dry-OK. Log says:\n" msgstr "測試執行成功。日誌說：\n" -#: git-send-email.perl:1669 +#: git-send-email.perl:1705 msgid "OK. Log says:\n" msgstr "OK。日誌說：\n" -#: git-send-email.perl:1688 +#: git-send-email.perl:1724 msgid "Result: " msgstr "結果： " -#: git-send-email.perl:1691 +#: git-send-email.perl:1727 msgid "Result: OK\n" msgstr "結果：OK\n" -#: git-send-email.perl:1708 +#: git-send-email.perl:1744 #, perl-format msgid "can't open file %s" msgstr "無法開啟檔案 %s" -#: git-send-email.perl:1756 git-send-email.perl:1776 +#: git-send-email.perl:1792 git-send-email.perl:1812 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) 新增 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1762 +#: git-send-email.perl:1798 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) 新增 to：%s 自行 '%s'\n" -#: git-send-email.perl:1819 +#: git-send-email.perl:1855 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1854 +#: git-send-email.perl:1890 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) 新增 cc: %s 自行 '%s'\n" -#: git-send-email.perl:1973 +#: git-send-email.perl:2009 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) 不能執行 '%s'" -#: git-send-email.perl:1980 +#: git-send-email.perl:2016 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) 新增 %s: %s 自：'%s'\n" -#: git-send-email.perl:1984 +#: git-send-email.perl:2020 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 無法關閉管道至 '%s'" -#: git-send-email.perl:2014 +#: git-send-email.perl:2050 msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式傳送訊息" -#: git-send-email.perl:2022 +#: git-send-email.perl:2058 msgid "invalid transfer encoding" msgstr "無效的傳送編碼" -#: git-send-email.perl:2059 +#: git-send-email.perl:2095 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -25772,12 +25769,12 @@ msgstr "" "%s\n" "警告：修補檔未能傳送\n" -#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132 +#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168 #, perl-format msgid "unable to open %s: %s\n" msgstr "不能開啟 %s：%s\n" -#: git-send-email.perl:2072 +#: git-send-email.perl:2108 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -25786,17 +25783,369 @@ msgstr "" "致命錯誤：%s:%d 的字元數超過 998\n" "警告：修補檔未能傳送\n" -#: git-send-email.perl:2090 +#: git-send-email.perl:2126 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "略過 %s 含備份後綴 '%s'。\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2094 +#: git-send-email.perl:2130 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要傳送 %s？[y|N]： " +#~ msgid "--index outside a repository" +#~ msgstr "--index 在版本庫之外" + +#~ msgid "--cached outside a repository" +#~ msgstr "--cached 在版本庫之外" + +#~ msgid "unrecognized input" +#~ msgstr "無法識別的輸入" + +#, c-format +#~ msgid "cannot read %s" +#~ msgstr "不能讀取 %s" + +#~ msgid "Option --exec can only be used together with --remote" +#~ msgstr "選項 --exec 只能和 --remote 同時使用" + +#, c-format +#~ msgid "" +#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." +#~ msgstr "分支 '%1$s' 設定為使用重定基底來追蹤來自 '%3$s' 的遠端分支 '%2$s'。" + +#, c-format +#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'." +#~ msgstr "分支 '%1$s' 設定為追蹤來自 '%3$s' 的遠端分支 '%2$s'。" + +#, c-format +#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing." +#~ msgstr "分支 '%s' 設定為使用重定基底來追蹤本機分支 '%s'。" + +#, c-format +#~ msgid "Branch '%s' set up to track local branch '%s'." +#~ msgstr "分支 '%s' 設定為追蹤本機分支 '%s'。" + +#, c-format +#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing." +#~ msgstr "分支 '%s' 設定為使用重定基底來追蹤遠端引用 '%s'。" + +#, c-format +#~ msgid "Branch '%s' set up to track remote ref '%s'." +#~ msgstr "分支 '%s' 設定為追蹤遠端引用 '%s'。" + +#~ msgid "Cannot force update the current branch." +#~ msgstr "無法強制更新目前分支。" + +#, c-format +#~ msgid "Not a valid object name: '%s'." +#~ msgstr "不是一個有效的物件名：'%s'。" + +#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive" +#~ msgstr "--name-only、--name-status、--check 和 -s 是互斥的" + +#~ msgid "-G, -S and --find-object are mutually exclusive" +#~ msgstr "-G、-S 和 --find-object 是互斥的" + +#~ msgid "" +#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +#~ msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex 搭配 -S" + +#~ msgid "" +#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +#~ "with -G and -S" +#~ msgstr "" +#~ "--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all 搭配 -G 和 -S" + +#~ msgid "--stateless-rpc requires multi_ack_detailed" +#~ msgstr "--stateless-rpc 需要 multi_ack_detailed" + +#~ msgid "--left-only and --right-only are mutually exclusive" +#~ msgstr "--left-only 和 --right-only 互斥" + +#, c-format +#~ msgid "unrecognized %%(objectsize) argument: %s" +#~ msgstr "無法識別的 %%(objectsize) 參數：%s" + +#, c-format +#~ msgid "unrecognized %%(subject) argument: %s" +#~ msgstr "無法識別的 %%(subject) 引數：%s" + +#, c-format +#~ msgid "unrecognized %%(contents) argument: %s" +#~ msgstr "無法識別的 %%(contents) 參數：%s" + +#, c-format +#~ msgid "unrecognized %%(raw) argument: %s" +#~ msgstr "無法識別的 %%(raw) 引數：%s" + +#, c-format +#~ msgid "unrecognized argument '%s' in %%(%s)" +#~ msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數" + +#, c-format +#~ msgid "unrecognized %%(align) argument: %s" +#~ msgstr "無法識別的 %%(align) 參數：%s" + +#, c-format +#~ msgid "unrecognized %%(if) argument: %s" +#~ msgstr "無法識別的 %%(if) 參數：%s" + +#, c-format +#~ msgid "format: %%(if) atom used without a %%(then) atom" +#~ msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素" + +#, c-format +#~ msgid "format: %%(then) atom used without an %%(if) atom" +#~ msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素" + +#, c-format +#~ msgid "format: %%(else) atom used without a %%(then) atom" +#~ msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素" + +#~ msgid "--unsorted-input is incompatible with --no-walk" +#~ msgstr "--unsorted-input 與 --no-walk 不相容" + +#~ msgid "--no-walk is incompatible with --unsorted-input" +#~ msgstr "--no-walk 與 --unsorted-input 不相容" + +#~ msgid "--dry-run is incompatible with --interactive/--patch" +#~ msgstr "--dry-run 和 --interactive/--patch 不相容" + +#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch" +#~ msgstr "--pathspec-from-file 與 --interactive/--patch 不相容" + +#~ msgid "--pathspec-from-file is incompatible with --edit" +#~ msgstr "--pathspec-from-file 與 --edit 不相容" + +#~ msgid "-A and -u are mutually incompatible" +#~ msgstr "-A 和 -u 選項互斥" + +#~ msgid "Option --ignore-missing can only be used together with --dry-run" +#~ msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用" + +#~ msgid "--pathspec-from-file is incompatible with pathspec arguments" +#~ msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容" + +#~ msgid "--pathspec-file-nul requires --pathspec-from-file" +#~ msgstr "--pathspec-file-nul 需要 --pathspec-from-file" + +#, c-format +#~ msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +#~ msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容" + +#~ msgid "--column and --verbose are incompatible" +#~ msgstr "--column 和 --verbose 不相容" + +#, c-format +#~ msgid "'%s' cannot be used with %s" +#~ msgstr "'%s' 不能和 %s 同時使用" + +#~ msgid "set upstream info for new branch" +#~ msgstr "為新的分支設定上游訊息" + +#, c-format +#~ msgid "-%c, -%c and --orphan are mutually exclusive" +#~ msgstr "-%c、-%c 和 --orphan 是互斥的" + +#~ msgid "-p and --overlay are mutually exclusive" +#~ msgstr "-p 和 --overlay 互斥" + +#~ msgid "--pathspec-from-file is incompatible with --detach" +#~ msgstr "--pathspec-from-file 與 --detach 不相容" + +#~ msgid "--pathspec-from-file is incompatible with --patch" +#~ msgstr "--pathspec-from-file 與 --patch 不相容" + +#, c-format +#~ msgid "--bare and --origin %s options are incompatible." +#~ msgstr "--bare 和 --origin %s 選項不相容。" + +#~ msgid "--bare and --separate-git-dir are incompatible." +#~ msgstr "--bare 和 --separate-git-dir 選項不相容。" + +#~ msgid "--pathspec-from-file with -a does not make sense" +#~ msgstr "--pathspec-from-file 和 -a 同時使用沒有意義" + +#, c-format +#~ msgid "cannot combine -m with --fixup:%s" +#~ msgstr "-m 和 --fixup:%s 不可結合使用" + +#~ msgid "--long and -z are incompatible" +#~ msgstr "--long 和 -z 選項不相容" + +#, c-format +#~ msgid "cannot combine reword option of --fixup with path '%s'" +#~ msgstr "不能將「%s」路徑與 --fixup 的 reword 選項結合" + +#~ msgid "" +#~ "reword option of --fixup is mutually exclusive with --patch/--" +#~ "interactive/--all/--include/--only" +#~ msgstr "" +#~ "--fixup 的 reword 選項與 --patch/--interactive/--all/--include/--only 互斥" + +#~ msgid "--long is incompatible with --abbrev=0" +#~ msgstr "--long 與 --abbrev=0 不相容" + +#~ msgid "--dirty is incompatible with commit-ishes" +#~ msgstr "--dirty 與提交號不相容" + +#~ msgid "--broken is incompatible with commit-ishes" +#~ msgstr "--broken 與提交號不相容" + +#~ msgid "--stdin and --merge-base are mutually exclusive" +#~ msgstr "--stdin 和 --merge-base 互斥" + +#~ msgid "--dir-diff is incompatible with --no-index" +#~ msgstr "--dir-diff 和 --no-index 不相容" + +#~ msgid "--gui, --tool and --extcmd are mutually exclusive" +#~ msgstr "--gui、--tool 和 --extcmd 互斥" + +#~ msgid "--anonymize-map without --anonymize does not make sense" +#~ msgstr "缺少 --anonymize 的 --anonymize-map 沒有意義" + +#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists" +#~ msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists" + +#, c-format +#~ msgid "Refusing to fetch into current branch %s of non-bare repository" +#~ msgstr "拒絕取得到非純版本庫的目前分支 %s" + +#~ msgid "--deepen and --depth are mutually exclusive" +#~ msgstr "--deepen 和 --depth 是互斥的" + +#~ msgid "--depth and --unshallow cannot be used together" +#~ msgstr "--depth 和 --unshallow 不能同時使用" + +#~ msgid "--fix-thin cannot be used without --stdin" +#~ msgstr "--fix-thin 不能和 --stdin 同時使用" + +#~ msgid "--object-format cannot be used with --stdin" +#~ msgstr "--object-format 不能和 --stdin 同時使用" + +#~ msgid "--separate-git-dir and --bare are mutually exclusive" +#~ msgstr "--separate-git-dir 和 --bare 互斥" + +#~ msgid "-n and -k are mutually exclusive" +#~ msgstr "-n 和 -k 互斥" + +#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive" +#~ msgstr "--subject-prefix/--rfc 和 -k 互斥" + +#~ msgid "--stdout, --output, and --output-directory are mutually exclusive" +#~ msgstr "--stdout、--output 和 --output-directory 互斥" + +#~ msgid "--creation-factor requires --range-diff" +#~ msgstr "--creation-factor 需要 --range-diff" + +#~ msgid "You cannot combine --squash with --no-ff." +#~ msgstr "您不能將 --squash 和 --no-ff 組合使用。" + +#~ msgid "You cannot combine --squash with --commit." +#~ msgstr "您不能將 --squash 和 --commit 組合使用。" + +#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible" +#~ msgstr "--keep-unreachable 和 --unpack-unreachable 不相容" + +#~ msgid "--delete is incompatible with --all, --mirror and --tags" +#~ msgstr "--delete 與 --all、--mirror 及 --tags 不相容" + +#~ msgid "--all and --tags are incompatible" +#~ msgstr "--all 和 --tags 不相容" + +#~ msgid "--mirror and --tags are incompatible" +#~ msgstr "--mirror 和 --tags 不相容" + +#~ msgid "--all and --mirror are incompatible" +#~ msgstr "--all 和 --mirror 不相容" + +#~ msgid "cannot combine '--keep-base' with '--onto'" +#~ msgstr "不能將 '--keep-base' 和 '--onto' 組合使用" + +#~ msgid "cannot combine '--keep-base' with '--root'" +#~ msgstr "不能將 '--keep-base' 和 '--root' 組合使用" + +#~ msgid "cannot combine '--root' with '--fork-point'" +#~ msgstr "不能將 '--root' 和 '--fork-point' 結合使用" + +#~ msgid "cannot combine apply options with merge options" +#~ msgstr "不能將 apply 套用選項與 merge 合併選項一起使用" + +#~ msgid "--keep-unreachable and -A are incompatible" +#~ msgstr "--keep-unreachable 和 -A 不相容" + +#~ msgid "--geometric is incompatible with -A, -a" +#~ msgstr "--geometric 與 -A, -a 不相容" + +#~ msgid "--patch is incompatible with --{hard,mixed,soft}" +#~ msgstr "--patch 與 --{hard、mixed、soft} 選項不相容" + +#~ msgid "-N can only be used with --mixed" +#~ msgstr "-N 只能和 --mixed 同時使用" + +#~ msgid "cannot combine --exclude-promisor-objects and --missing" +#~ msgstr "不能同時使用 --exclude-promisor-objects 和 --missing 選項" + +#~ msgid "marked counting is incompatible with --objects" +#~ msgstr "--objects 不相容標記計數 (marked counting)" + +#~ msgid "" +#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-" +#~ "base" +#~ msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不相容" + +#~ msgid "git sparse-checkout reapply" +#~ msgstr "git sparse-checkout reapply" + +#~ msgid "--cached and --files are mutually exclusive" +#~ msgstr "--cached 和 --files 互斥" + +#~ msgid "--branch and --default are mutually exclusive" +#~ msgstr "--branch 與 --default 互斥" + +#~ msgid "--column and -n are incompatible" +#~ msgstr "--column 和 -n 不相容" + +#~ msgid "--contains option is only allowed in list mode" +#~ msgstr "--contains 選項只允許用在列表顯示模式" + +#~ msgid "--no-contains option is only allowed in list mode" +#~ msgstr "--no-contains 選項只允許用在列表顯示模式" + +#~ msgid "--points-at option is only allowed in list mode" +#~ msgstr "--points-at 選項只允許用在列表顯示模式" + +#~ msgid "--merged and --no-merged options are only allowed in list mode" +#~ msgstr "--merged 和 --no-merged 選項只允許用在列表顯示模式" + +#~ msgid "only one -F or -m option is allowed." +#~ msgstr "只允許一個 -F 或 -m 選項。" + +#~ msgid "-b, -B, and --detach are mutually exclusive" +#~ msgstr "-b、-B 和 --detach 是互斥的" + +#~ msgid "--reason requires --lock" +#~ msgstr "--reason 需要 --lock" + +#~ msgid "--verbose and --porcelain are mutually exclusive" +#~ msgstr "--verbose 和 --porcelain 互斥" + +#, c-format +#~ msgid "no directory given for --git-dir\n" +#~ msgstr "沒有為 --git-dir 提供目錄\n" + +#, c-format +#~ msgid "no directory given for --work-tree\n" +#~ msgstr "沒有為 --work-tree 提供目錄\n" + +#~ msgid "--packfile requires --index-pack-args" +#~ msgstr "--packfile 需要 --index-pack-args" + +#~ msgid "--index-pack-args can only be used with --packfile" +#~ msgstr "--index-pack-args 只能與 --packfile 一起使用" + #~ msgid "" #~ "The following pathspecs didn't match any eligible path, but they do match " #~ "index\n" @@ -25899,9 +26248,6 @@ msgstr "您真的要傳送 %s？[y|N]： " #~ msgid "edit the todo list" #~ msgstr "重定基底待辦列表" -#~ msgid "show the current patch" -#~ msgstr "顯示目前修補檔" - #~ msgid "shorten commit ids in the todo list" #~ msgstr "縮短待辦列表中的提交號" |