diff options
Diffstat (limited to 'po/zh_TW.po')
| -rw-r--r-- | po/zh_TW.po | 8293 |
1 files changed, 4309 insertions, 3984 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po index 9334b46faa..960f7164ab 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -292,8 +292,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-07-10 09:53+0800\n" -"PO-Revision-Date: 2020-07-20 18:34+0800\n" +"POT-Creation-Date: 2020-12-21 07:10+0800\n" +"PO-Revision-Date: 2020-12-23 22:30+0800\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" "Language-Team: Chinese (Traditional) <zh-l10n@lists.linux.org.tw>\n" "Language: zh_TW\n" @@ -301,233 +301,233 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.3.1\n" +"X-Generator: Poedit 2.4.2\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" -#: add-interactive.c:368 +#: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142 -#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 -#: builtin/rebase.c:1919 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 +#: builtin/rebase.c:1955 msgid "could not read index" msgstr "無法讀取索引" -#: add-interactive.c:576 git-add--interactive.perl:269 +#: add-interactive.c:584 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "二進位" -#: add-interactive.c:634 git-add--interactive.perl:278 +#: add-interactive.c:642 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "無" -#: add-interactive.c:635 git-add--interactive.perl:314 +#: add-interactive.c:643 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "未變更" -#: add-interactive.c:672 git-add--interactive.perl:643 +#: add-interactive.c:680 git-add--interactive.perl:641 msgid "Update" msgstr "更新" -#: add-interactive.c:689 add-interactive.c:877 +#: add-interactive.c:697 add-interactive.c:885 #, c-format msgid "could not stage '%s'" msgstr "無法暫存「%s」" -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 msgid "could not write index" msgstr "無法寫入索引" -#: add-interactive.c:698 git-add--interactive.perl:628 +#: add-interactive.c:706 git-add--interactive.perl:626 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "已更新 %d 個路徑\n" -#: add-interactive.c:716 git-add--interactive.perl:678 +#: add-interactive.c:724 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "註：%s 現已不再追蹤。\n" -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294 +#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "「%s」路徑執行 make_cache_entry 失敗" -#: add-interactive.c:751 git-add--interactive.perl:655 +#: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" msgstr "還原" -#: add-interactive.c:767 +#: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" msgstr "不能解析 HEAD^{樹}" -#: add-interactive.c:805 git-add--interactive.perl:631 +#: add-interactive.c:813 git-add--interactive.perl:629 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "還原了 %d 個路徑\n" -#: add-interactive.c:856 git-add--interactive.perl:695 +#: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "沒有未追蹤的檔案。\n" -#: add-interactive.c:860 git-add--interactive.perl:689 +#: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" msgstr "新增未追蹤的" -#: add-interactive.c:887 git-add--interactive.perl:625 +#: add-interactive.c:895 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "增加了 %d 個路徑\n" -#: add-interactive.c:917 +#: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" msgstr "忽略未合併：%s" -#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "只有二進位檔案被修改。\n" -#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "沒有修改。\n" -#: add-interactive.c:935 git-add--interactive.perl:1378 +#: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "修補檔更新" -#: add-interactive.c:974 git-add--interactive.perl:1771 +#: add-interactive.c:982 git-add--interactive.perl:1792 msgid "Review diff" msgstr "檢視 diff" -#: add-interactive.c:1002 +#: add-interactive.c:1010 msgid "show paths with changes" msgstr "顯示有變更的路徑" -#: add-interactive.c:1004 +#: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" msgstr "加入工作區狀態至暫存列表" -#: add-interactive.c:1006 +#: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" msgstr "還原修改的暫存集至 HEAD 版本" -#: add-interactive.c:1008 +#: add-interactive.c:1016 msgid "pick hunks and update selectively" msgstr "挑選區塊並選擇性更新" -#: add-interactive.c:1010 +#: add-interactive.c:1018 msgid "view diff between HEAD and index" msgstr "檢視 HEAD 及索引之間的差異" -#: add-interactive.c:1012 +#: add-interactive.c:1020 msgid "add contents of untracked files to the staged set of changes" msgstr "加入未追蹤檔案的內容至暫存列表" -#: add-interactive.c:1020 add-interactive.c:1069 +#: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" msgstr "提示說明：" -#: add-interactive.c:1022 +#: add-interactive.c:1030 msgid "select a single item" msgstr "選擇單一項目" -#: add-interactive.c:1024 +#: add-interactive.c:1032 msgid "select a range of items" msgstr "選擇項目範圍" -#: add-interactive.c:1026 +#: add-interactive.c:1034 msgid "select multiple ranges" msgstr "選擇多個範圍" -#: add-interactive.c:1028 add-interactive.c:1073 +#: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" msgstr "基於唯一前綴選擇項目" -#: add-interactive.c:1030 +#: add-interactive.c:1038 msgid "unselect specified items" msgstr "取消選擇指定項目" -#: add-interactive.c:1032 +#: add-interactive.c:1040 msgid "choose all items" msgstr "選擇所有項目" -#: add-interactive.c:1034 +#: add-interactive.c:1042 msgid "(empty) finish selecting" msgstr "（空）完成選取" -#: add-interactive.c:1071 +#: add-interactive.c:1079 msgid "select a numbered item" msgstr "選擇編號過的項目" -#: add-interactive.c:1075 +#: add-interactive.c:1083 msgid "(empty) select nothing" msgstr "（空）全不選取" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** 指令 ***" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 msgid "What now" msgstr "請選擇" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" msgstr "快取" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "unstaged" msgstr "未快取" -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250 -#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 -#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 bugreport.c:135 +#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 #: git-add--interactive.perl:213 msgid "path" msgstr "路徑" -#: add-interactive.c:1143 +#: add-interactive.c:1151 msgid "could not refresh index" msgstr "無法重新整理索引" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "再見。\n" -#: add-patch.c:34 git-add--interactive.perl:1430 +#: add-patch.c:34 git-add--interactive.perl:1431 #, 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:1431 +#: add-patch.c:35 git-add--interactive.perl:1432 #, 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:1432 +#: add-patch.c:36 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "暫存新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1433 +#: add-patch.c:37 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暫存此區塊 [y,n,q,a,d%s,?]? " @@ -552,22 +552,22 @@ msgstr "" "a - 暫存此區塊和本檔案中後面的全部區塊\n" "d - 不暫存此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:56 git-add--interactive.perl:1436 +#: add-patch.c:56 git-add--interactive.perl:1437 #, 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:1437 +#: add-patch.c:57 git-add--interactive.perl:1438 #, 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:1438 +#: add-patch.c:58 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "儲藏新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1439 +#: add-patch.c:59 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? " @@ -592,22 +592,22 @@ msgstr "" "a - 儲藏此區塊和本檔案中後面的全部區塊\n" "d - 不儲藏此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:80 git-add--interactive.perl:1442 +#: add-patch.c:80 git-add--interactive.perl:1443 #, 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:1443 +#: add-patch.c:81 git-add--interactive.perl:1444 #, 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:1444 +#: add-patch.c:82 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "取消暫存新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1445 +#: add-patch.c:83 git-add--interactive.perl:1446 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? " @@ -632,22 +632,22 @@ msgstr "" "a - 不暫存此區塊和本檔案中後面的全部區塊\n" "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:103 git-add--interactive.perl:1448 +#: add-patch.c:103 git-add--interactive.perl:1449 #, 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:1449 +#: add-patch.c:104 git-add--interactive.perl:1450 #, 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:1450 +#: add-patch.c:105 git-add--interactive.perl:1451 #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "套用新增變更至索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1451 +#: add-patch.c:106 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? " @@ -672,26 +672,26 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:126 git-add--interactive.perl:1454 -#: git-add--interactive.perl:1472 +#: add-patch.c:126 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, 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:1455 -#: git-add--interactive.perl:1473 +#: add-patch.c:127 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 #, 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:1456 -#: git-add--interactive.perl:1474 +#: add-patch.c:128 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, 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:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:129 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " @@ -716,22 +716,22 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, 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:1461 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, 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:1462 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "放棄索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, 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,?]? " @@ -750,22 +750,22 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, 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:1467 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, 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:1468 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 #, 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:1469 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, 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,?]? " @@ -798,40 +798,40 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:328 +#: add-patch.c:342 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "無法解析區塊標頭 '%.*s'" -#: add-patch.c:347 add-patch.c:351 +#: add-patch.c:361 add-patch.c:365 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "無法解析上色過的區塊標頭 '%.*s'" -#: add-patch.c:405 +#: add-patch.c:419 msgid "could not parse diff" msgstr "無法解析差異 (diff)" -#: add-patch.c:424 +#: add-patch.c:438 msgid "could not parse colored diff" msgstr "無法解析上色過的差異 (diff)" -#: add-patch.c:438 +#: add-patch.c:452 #, c-format msgid "failed to run '%s'" msgstr "無法執行 '%s'" -#: add-patch.c:602 +#: add-patch.c:611 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的輸出不符" -#: add-patch.c:603 +#: add-patch.c:612 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "您的過濾器必須在其輸入及輸出行維持一對一的對應關係。" -#: add-patch.c:776 +#: add-patch.c:790 #, c-format msgid "" "expected context line #%d in\n" @@ -840,7 +840,7 @@ msgstr "" "應有上下文行 #%d 於\n" "%.*s" -#: add-patch.c:791 +#: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" @@ -853,11 +853,11 @@ msgstr "" "\t不以下述結尾：\n" "%.*s" -#: add-patch.c:1067 git-add--interactive.perl:1114 +#: add-patch.c:1081 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n" -#: add-patch.c:1071 +#: add-patch.c:1085 #, c-format msgid "" "---\n" @@ -871,7 +871,7 @@ msgstr "" "以 %c 開始的行將被刪除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1085 git-add--interactive.perl:1128 +#: add-patch.c:1099 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -880,11 +880,11 @@ msgstr "" "如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n" "此次編輯被終止，此區塊不會被修改。\n" -#: add-patch.c:1118 +#: add-patch.c:1132 msgid "could not parse hunk header" msgstr "無法解析區塊標頭" -#: add-patch.c:1163 +#: add-patch.c:1177 msgid "'git apply --cached' failed" msgstr "「git apply --cached」失敗" @@ -900,24 +900,24 @@ msgstr "「git apply --cached」失敗" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1232 git-add--interactive.perl:1241 +#: add-patch.c:1246 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? " -#: add-patch.c:1275 +#: add-patch.c:1289 msgid "The selected hunks do not apply to the index!" msgstr "選取的區塊不會套用進索引！" -#: add-patch.c:1276 git-add--interactive.perl:1345 +#: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "無論如何都要套用到工作區嗎？" -#: add-patch.c:1283 git-add--interactive.perl:1348 +#: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "未套用。\n" -#: add-patch.c:1340 +#: add-patch.c:1354 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -939,72 +939,72 @@ msgstr "" "e - 手動編輯目前區塊\n" "? - 顯示說明\n" -#: add-patch.c:1463 add-patch.c:1473 +#: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "沒有上一個區塊" -#: add-patch.c:1468 add-patch.c:1478 +#: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "沒有下一個區塊" -#: add-patch.c:1484 +#: add-patch.c:1537 msgid "No other hunks to goto" msgstr "沒有其它可供跳轉的區塊" -#: add-patch.c:1495 git-add--interactive.perl:1594 +#: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ " -#: add-patch.c:1496 git-add--interactive.perl:1596 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "跳轉到哪個區塊？" -#: add-patch.c:1507 +#: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "無效數字：'%s'" -#: add-patch.c:1512 +#: add-patch.c:1565 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "對不起，只有 %d 個可用區塊。" -#: add-patch.c:1521 +#: add-patch.c:1574 msgid "No other hunks to search" msgstr "沒有其它可供尋找的區塊" -#: add-patch.c:1527 git-add--interactive.perl:1640 +#: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "使用正規表示式搜尋？" -#: add-patch.c:1542 +#: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" msgstr "錯誤的正規表示式 %s：%s" -#: add-patch.c:1559 +#: add-patch.c:1612 msgid "No hunk matches the given pattern" msgstr "沒有和提供模式相符合的區塊" -#: add-patch.c:1566 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "對不起，不能分割這個區塊" -#: add-patch.c:1570 +#: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "分割為 %d 塊。" -#: add-patch.c:1574 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "對不起，不能編輯這個區塊" -#: add-patch.c:1625 +#: add-patch.c:1679 msgid "'git apply' failed" msgstr "'git apply' 失敗" -#: advice.c:140 +#: advice.c:143 #, c-format msgid "" "\n" @@ -1013,37 +1013,37 @@ msgstr "" "\n" "請使用「git config advice.%s false」來停用此訊息" -#: advice.c:156 +#: advice.c:159 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" -#: advice.c:247 +#: advice.c:250 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "無法揀選，因為您有未合併的檔案。" -#: advice.c:249 +#: advice.c:252 msgid "Committing is not possible because you have unmerged files." msgstr "無法提交，因為您有未合併的檔案。" -#: advice.c:251 +#: advice.c:254 msgid "Merging is not possible because you have unmerged files." msgstr "無法合併，因為您有未合併的檔案。" -#: advice.c:253 +#: advice.c:256 msgid "Pulling is not possible because you have unmerged files." msgstr "無法拉取，因為您有未合併的檔案。" -#: advice.c:255 +#: advice.c:258 msgid "Reverting is not possible because you have unmerged files." msgstr "無法還原提交，因為您有未合併的檔案。" -#: advice.c:257 +#: advice.c:260 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "無法 %s，因為您有未合併的檔案。" -#: advice.c:265 +#: advice.c:268 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -1051,23 +1051,23 @@ msgstr "" "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n" "解決方案並提交。" -#: advice.c:273 +#: advice.c:276 msgid "Exiting because of an unresolved conflict." msgstr "因為存在未解決的衝突而離開。" -#: advice.c:278 builtin/merge.c:1353 +#: advice.c:281 builtin/merge.c:1369 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。" -#: advice.c:280 +#: advice.c:283 msgid "Please, commit your changes before merging." msgstr "請在合併前先提交您的修改。" -#: advice.c:281 +#: advice.c:284 msgid "Exiting because of unfinished merge." msgstr "因為存在未完成的合併而離開。" -#: advice.c:287 +#: advice.c:290 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1344,7 +1344,7 @@ msgstr "打修補檔失敗：%s:%ld" msgid "cannot checkout %s" msgstr "不能檢出 %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 #, c-format msgid "failed to read %s" msgstr "無法讀取 %s" @@ -1364,7 +1364,7 @@ msgstr "路徑 %s 已經被重新命名/刪除" msgid "%s: does not exist in index" msgstr "%s：不存在於索引中" -#: apply.c:3537 apply.c:3708 +#: apply.c:3537 apply.c:3708 apply.c:3952 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不符合" @@ -1412,356 +1412,351 @@ msgstr "%s：錯誤類型" msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，應為 %o" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "無效路徑 '%s'" -#: apply.c:3936 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s：已經存在於索引中" -#: apply.c:3939 +#: apply.c:3954 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已經存在於工作區中" -#: apply.c:3959 +#: apply.c:3974 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合" -#: apply.c:3964 +#: apply.c:3979 #, 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:3984 +#: apply.c:3999 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影響的檔案 '%s' 位於符號連結中" -#: apply.c:3988 +#: apply.c:4003 #, c-format msgid "%s: patch does not apply" msgstr "%s：修補檔未套用" -#: apply.c:4003 +#: apply.c:4018 #, c-format msgid "Checking patch %s..." msgstr "正在檢查修補檔 %s..." -#: apply.c:4095 +#: apply.c:4110 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模組 %s 的 sha1 訊息缺少或無效" -#: apply.c:4102 +#: apply.c:4117 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式變更，但它不在目前 HEAD 中" -#: apply.c:4105 +#: apply.c:4120 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 訊息缺少或無效（%s）。" -#: apply.c:4114 +#: apply.c:4129 #, c-format msgid "could not add %s to temporary index" msgstr "不能在暫時索引中新增 %s" -#: apply.c:4124 +#: apply.c:4139 #, c-format msgid "could not write temporary index to %s" msgstr "不能把暫時索引寫入到 %s" -#: apply.c:4262 +#: apply.c:4277 #, c-format msgid "unable to remove %s from index" msgstr "不能從索引中移除 %s" -#: apply.c:4296 +#: apply.c:4311 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模組 %s 損壞的修補檔" -#: apply.c:4302 +#: apply.c:4317 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能對建立檔案 '%s' 呼叫 stat" -#: apply.c:4310 +#: apply.c:4325 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能為建立檔案 %s 建立後端儲存" -#: apply.c:4316 apply.c:4461 +#: apply.c:4331 apply.c:4476 #, c-format msgid "unable to add cache entry for %s" msgstr "無法為 %s 新增快取條目" -#: apply.c:4359 +#: apply.c:4374 builtin/bisect--helper.c:524 #, c-format msgid "failed to write to '%s'" msgstr "寫入 '%s' 失敗" -#: apply.c:4363 +#: apply.c:4378 #, c-format msgid "closing file '%s'" msgstr "關閉檔案 '%s'" -#: apply.c:4433 +#: apply.c:4448 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能寫入檔案 '%s' 權限 %o" -#: apply.c:4531 +#: apply.c:4546 #, c-format msgid "Applied patch %s cleanly." msgstr "成功套用修補檔 %s。" -#: apply.c:4539 +#: apply.c:4554 msgid "internal error" msgstr "內部錯誤" -#: apply.c:4542 +#: apply.c:4557 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..." -#: apply.c:4553 +#: apply.c:4568 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 檔案名為 %.*s.rej" -#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 +#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "不能開啟 %s" -#: apply.c:4575 +#: apply.c:4590 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 個片段成功應用。" -#: apply.c:4579 +#: apply.c:4594 #, c-format msgid "Rejected hunk #%d." msgstr "拒絕第 #%d 個片段。" -#: apply.c:4698 +#: apply.c:4718 #, c-format msgid "Skipped patch '%s'." msgstr "略過修補檔 '%s'。" -#: apply.c:4706 +#: apply.c:4726 msgid "unrecognized input" msgstr "無法識別的輸入" -#: apply.c:4726 +#: apply.c:4746 msgid "unable to read index file" msgstr "無法讀取索引檔案" -#: apply.c:4883 +#: apply.c:4903 #, c-format msgid "can't open patch '%s': %s" msgstr "不能開啟修補檔 '%s'：%s" -#: apply.c:4910 +#: apply.c:4930 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 個空白字元誤用" -#: apply.c:4916 apply.c:4931 +#: apply.c:4936 apply.c:4951 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字元誤用。" -#: apply.c:4924 +#: apply.c:4944 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修復空白錯誤後，應用了 %d 行。" -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "無法寫入新索引檔案" -#: apply.c:4968 +#: apply.c:4988 msgid "don't apply changes matching the given path" msgstr "不要應用與給出路徑向符合的變更" -#: apply.c:4971 +#: apply.c:4991 msgid "apply changes matching the given path" msgstr "應用與給出路徑向符合的變更" -#: apply.c:4973 builtin/am.c:2259 +#: apply.c:4993 builtin/am.c:2266 msgid "num" msgstr "數字" -#: apply.c:4974 +#: apply.c:4994 msgid "remove <num> leading slashes from traditional diff paths" msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線" -#: apply.c:4977 +#: apply.c:4997 msgid "ignore additions made by the patch" msgstr "忽略修補檔中的新增的檔案" -#: apply.c:4979 +#: apply.c:4999 msgid "instead of applying the patch, output diffstat for the input" msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）" -#: apply.c:4983 +#: apply.c:5003 msgid "show number of added and deleted lines in decimal notation" msgstr "以十進位數顯示新增和刪除的行數" -#: apply.c:4985 +#: apply.c:5005 msgid "instead of applying the patch, output a summary for the input" msgstr "不套用修補檔，而是顯示輸入的概要" -#: apply.c:4987 +#: apply.c:5007 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不套用修補檔，而是檢視修補檔是否可應用" -#: apply.c:4989 +#: apply.c:5009 msgid "make sure the patch is applicable to the current index" msgstr "確認修補檔可以套用到目前索引" -#: apply.c:4991 +#: apply.c:5011 msgid "mark new files with `git add --intent-to-add`" msgstr "使用指令 `git add --intent-to-add` 標記新增檔案" -#: apply.c:4993 +#: apply.c:5013 msgid "apply a patch without touching the working tree" msgstr "套用修補檔而不修改工作區" -#: apply.c:4995 +#: apply.c:5015 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作區之外檔案的修補檔" -#: apply.c:4998 +#: apply.c:5018 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）" -#: apply.c:5000 +#: apply.c:5020 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一個修補檔不能應用則嘗試三方合併" -#: apply.c:5002 +#: apply.c:5022 msgid "build a temporary index based on embedded index information" msgstr "建立一個暫時索引基於嵌入的索引訊息" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "路徑以 NUL 字元分隔" -#: apply.c:5007 +#: apply.c:5027 msgid "ensure at least <n> lines of context match" msgstr "確保至少符合 <n> 行上下文" -#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 +#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3530 builtin/rebase.c:1332 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 msgid "action" msgstr "動作" -#: apply.c:5009 +#: apply.c:5029 msgid "detect new or modified lines that have whitespace errors" msgstr "檢查新增和修改的行中間的空白字元濫用" -#: apply.c:5012 apply.c:5015 +#: apply.c:5032 apply.c:5035 msgid "ignore changes in whitespace when finding context" msgstr "尋找上下文時忽略空白字元的變更" -#: apply.c:5018 +#: apply.c:5038 msgid "apply the patch in reverse" msgstr "反向套用修補檔" -#: apply.c:5020 +#: apply.c:5040 msgid "don't expect at least one line of context" msgstr "無需至少一行上下文" -#: apply.c:5022 +#: apply.c:5042 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "將拒絕的修補檔片段儲存在對應的 *.rej 檔案中" -#: apply.c:5024 +#: apply.c:5044 msgid "allow overlapping hunks" msgstr "允許重疊的修補檔片段" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "詳細輸出" -#: apply.c:5027 +#: apply.c:5047 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允許不正確的檔案末尾換行符號" -#: apply.c:5030 +#: apply.c:5050 msgid "do not trust the line counts in the hunk headers" msgstr "不信任修補檔片段的標頭訊息中的行號" -#: apply.c:5032 builtin/am.c:2247 +#: apply.c:5052 builtin/am.c:2254 msgid "root" msgstr "根目錄" -#: apply.c:5033 +#: apply.c:5053 msgid "prepend <root> to all filenames" msgstr "為所有檔案名前新增 <根目錄>" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "不能開啟資料物件 %s" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:265 archive-zip.c:358 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支援的檔案模式：0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 -#, c-format -msgid "cannot read %s" -msgstr "不能讀取 %s" - -#: archive-tar.c:465 +#: archive-tar.c:450 #, c-format msgid "unable to start '%s' filter" msgstr "無法啟動 '%s' 過濾器" -#: archive-tar.c:468 +#: archive-tar.c:453 msgid "unable to redirect descriptor" msgstr "無法重定向描述符" -#: archive-tar.c:475 +#: archive-tar.c:460 #, c-format msgid "'%s' filter reported error" msgstr "'%s' 過濾器報告了錯誤" -#: archive-zip.c:319 +#: archive-zip.c:318 #, c-format msgid "path is not valid UTF-8: %s" msgstr "路徑不是有效的 UTF-8：%s" -#: archive-zip.c:323 +#: archive-zip.c:322 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路徑太長（%d 字元，SHA1：%s）：%s" -#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246 +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 #, c-format msgid "deflate error (%d)" msgstr "壓縮錯誤 (%d)" -#: archive-zip.c:615 +#: archive-zip.c:603 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "對於本系統時間戳太大：%<PRIuMAX>" @@ -1784,134 +1779,156 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <版本庫> [--exec <指令>] --list" -#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "不能讀取 %s" + +#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 +#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1138 +#, c-format +msgid "could not read '%s'" +msgstr "不能讀取 '%s'" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路徑規格 '%s' 未符合任何檔案" -#: archive.c:401 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "無此引用：%.*s" -#: archive.c:407 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "不是一個有效的物件名：%s" -#: archive.c:420 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "不是一個樹狀物件：%s" -#: archive.c:432 +#: archive.c:485 msgid "current working directory is untracked" msgstr "目前工作目錄未被追蹤" -#: archive.c:464 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "找不到檔案：%s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "不是一般檔案：%s" + +#: archive.c:555 msgid "fmt" msgstr "格式" -#: archive.c:464 +#: archive.c:555 msgid "archive format" msgstr "歸檔格式" -#: archive.c:465 builtin/log.c:1674 +#: archive.c:556 builtin/log.c:1765 msgid "prefix" msgstr "前綴" -#: archive.c:466 +#: archive.c:557 msgid "prepend prefix to each pathname in the archive" msgstr "為歸檔中每個路徑名加上前綴" -#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208 -#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907 -#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 +#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 +#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "檔案" -#: archive.c:468 builtin/archive.c:90 +#: archive.c:559 +msgid "add untracked file to archive" +msgstr "將未追蹤檔案加入歸檔" + +#: archive.c:562 builtin/archive.c:90 msgid "write the archive to this file" msgstr "歸檔寫入此檔案" -#: archive.c:470 +#: archive.c:564 msgid "read .gitattributes in working directory" msgstr "讀取工作區中的 .gitattributes" -#: archive.c:471 +#: archive.c:565 msgid "report archived files on stderr" msgstr "在標準錯誤上報告歸檔檔案" -#: archive.c:472 -msgid "store only" -msgstr "只儲存" - -#: archive.c:473 -msgid "compress faster" -msgstr "壓縮速度更快" - -#: archive.c:481 -msgid "compress better" -msgstr "壓縮效果更好" +#: archive.c:567 +msgid "set compression level" +msgstr "設定壓縮級別" -#: archive.c:484 +#: archive.c:570 msgid "list supported archive formats" msgstr "列出支援的歸檔格式" -#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "版本庫" -#: archive.c:487 builtin/archive.c:92 +#: archive.c:573 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案" -#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 #: builtin/notes.c:498 msgid "command" msgstr "指令" -#: archive.c:489 builtin/archive.c:94 +#: archive.c:575 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "遠端 git-upload-archive 指令的路徑" -#: archive.c:496 +#: archive.c:582 msgid "Unexpected option --remote" msgstr "未知參數 --remote" -#: archive.c:498 +#: archive.c:584 msgid "Option --exec can only be used together with --remote" msgstr "選項 --exec 只能和 --remote 同時使用" -#: archive.c:500 +#: archive.c:586 msgid "Unexpected option --output" msgstr "未知參數 --output" -#: archive.c:522 +#: archive.c:588 +msgid "Options --add-file and --remote cannot be used together" +msgstr "--add-file 和 --remote 選項不能同時使用" + +#: archive.c:610 #, c-format msgid "Unknown archive format '%s'" msgstr "未知歸檔格式 '%s'" -#: archive.c:529 +#: archive.c:619 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "參數不支援此格式 '%s'：-%d" -#: attr.c:212 +#: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一個有效的屬性名" -#: attr.c:369 +#: attr.c:359 #, c-format msgid "%s not allowed: %s:%d" msgstr "不允許 %s：%s:%d" -#: attr.c:409 +#: attr.c:399 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1919,22 +1936,22 @@ msgstr "" "反向模式在 git attributes 中被忽略\n" "當字串確定要以驚嘆號開始時，使用 '\\!'。" -#: bisect.c:468 +#: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "檔案 '%s' 包含錯誤的引用格式：%s" -#: bisect.c:678 +#: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "我們無法進行更多的二分尋找！\n" -#: bisect.c:745 +#: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "不是一個有效的提交名 %s" -#: bisect.c:770 +#: bisect.c:791 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1943,7 +1960,7 @@ msgstr "" "合併基礎 %s 是壞的。\n" "這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n" -#: bisect.c:775 +#: bisect.c:796 #, c-format msgid "" "The merge base %s is new.\n" @@ -1952,7 +1969,7 @@ msgstr "" "合併基礎 %s 是新的。\n" "介於 %s 和 [%s] 之間的屬性已經被修改。\n" -#: bisect.c:780 +#: bisect.c:801 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1961,7 +1978,7 @@ msgstr "" "合併基礎 %s 是 %s。\n" "這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n" -#: bisect.c:788 +#: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1972,7 +1989,7 @@ msgstr "" "這種情況下 git 二分尋找無法正常工作。\n" "您可能弄錯了 %s 和 %s 版本？\n" -#: bisect.c:801 +#: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1983,36 +2000,36 @@ msgstr "" "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n" "我們仍舊繼續。" -#: bisect.c:840 +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分尋找中：合併基礎必須是經過測試的\n" -#: bisect.c:890 +#: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "需要一個 %s 版本" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "不能建立檔案 '%s'" -#: bisect.c:966 builtin/merge.c:151 +#: bisect.c:987 builtin/merge.c:152 #, c-format msgid "could not read file '%s'" msgstr "不能讀取檔案 '%s'" -#: bisect.c:997 +#: bisect.c:1027 msgid "reading bisect refs failed" msgstr "讀取二分尋找引用失敗" -#: bisect.c:1019 +#: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同時為 %s 和 %s\n" -#: bisect.c:1028 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" @@ -2021,7 +2038,7 @@ msgstr "" "沒有發現可測試的提交。\n" "可能您在執行時使用了錯誤的路徑參數？\n" -#: bisect.c:1057 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -2030,7 +2047,7 @@ msgstr[0] "（大概 %d 步）" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1101 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -2048,11 +2065,11 @@ msgstr "不能將 --contents 和最終的提交物件名共用" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 -#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 -#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 -#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363 -#: builtin/shortlog.c:192 +#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 +#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 +#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 +#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:267 msgid "revision walk setup failed" msgstr "版本遍歷設定失敗" @@ -2204,86 +2221,102 @@ msgstr "'%s' 已經檢出到 '%s'" msgid "HEAD of working tree %s is not updated" msgstr "工作區 %s 的 HEAD 指向沒有被更新" -#: bundle.c:47 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "無法識別的包雜湊演算法：%s" + +#: bundle.c:45 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' 不像是一個 v2 版本的包檔案" +msgid "unknown capability '%s'" +msgstr "未知功能 '%s'" -#: bundle.c:69 -msgid "unknown hash algorithm length" -msgstr "未知的雜湊算法長度" +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' 不像是一個 v2 或 v3 版本的包檔案" -#: bundle.c:84 +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "無法識別的包頭：%s%s (%d)" -#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "不能開啟 '%s'" -#: bundle.c:163 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "版本庫中缺少這些必備的提交：" -#: bundle.c:166 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "需要版本庫驗證一個包" -#: bundle.c:217 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "這個包中含有這 %d 個引用：" -#: bundle.c:224 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "這個包記錄一個完整歷史。" -#: bundle.c:226 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "這個包需要這 %d 個引用：" -#: bundle.c:293 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "無法複製 bundle 描述符" -#: bundle.c:300 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 進程" -#: bundle.c:311 +#: bundle.c:337 msgid "pack-objects died" msgstr "pack-objects 終止" -#: bundle.c:353 +#: bundle.c:379 msgid "rev-list died" msgstr "rev-list 終止" -#: bundle.c:402 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 選項排除" -#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "不支援的包版本 %d" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "無法寫入 %2$s 演算法的包版本 %1$d" + +#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 #, c-format msgid "unrecognized argument: %s" msgstr "無法識別的參數：%s" -#: bundle.c:489 +#: bundle.c:530 msgid "Refusing to create empty bundle." msgstr "不能建立空包。" -#: bundle.c:499 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "不能建立 '%s'" -#: bundle.c:524 +#: bundle.c:565 msgid "index-pack died" msgstr "index-pack 終止" @@ -2292,265 +2325,252 @@ msgstr "index-pack 終止" msgid "invalid color value: %.*s" msgstr "無效的顏色值：%.*s" -#: commit-graph.c:238 +#: commit-graph.c:188 midx.c:47 +msgid "invalid hash version" +msgstr "無效的雜湊版本" + +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "提交圖形檔案太小" -#: commit-graph.c:303 +#: commit-graph.c:311 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交圖形簽名 %X 和簽名 %X 不符合" -#: commit-graph.c:310 +#: commit-graph.c:318 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "提交圖形版本 %X 和版本 %X 不符合" -#: commit-graph.c:317 +#: commit-graph.c:325 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合" -#: commit-graph.c:339 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" -msgstr "提交圖形區塊尋找表條目遺失，檔案可能不完整" +#: commit-graph.c:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "commit-graph 檔案不夠放置 %u 個區塊" -#: commit-graph.c:349 +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "提交圖形不正確的區塊位移 %08x%08x" -#: commit-graph.c:417 +#: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "提交圖形區塊 id %08x 出現了多次" -#: commit-graph.c:491 +#: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" msgstr "提交圖形沒有基礎圖形區塊" -#: commit-graph.c:501 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "提交圖形鏈不符合" -#: commit-graph.c:549 +#: commit-graph.c:557 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值" -#: commit-graph.c:573 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "無法找到所有提交圖形檔案" -#: commit-graph.c:706 commit-graph.c:770 +#: commit-graph.c:721 commit-graph.c:785 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "無效的提交位置。提交圖形可能已損壞" -#: commit-graph.c:727 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "無法找到提交 %s" -#: commit-graph.c:1009 builtin/am.c:1292 +#: commit-graph.c:1036 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1157 -msgid "Writing changed paths Bloom filters index" -msgstr "正在寫入變更路徑的布隆過濾器索引" - -#: commit-graph.c:1182 -msgid "Writing changed paths Bloom filters data" -msgstr "正在寫入變更路徑的布隆過濾器索引" - -#: commit-graph.c:1221 builtin/pack-objects.c:2832 +#: commit-graph.c:1252 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "無法獲得物件 %s 類型" -#: commit-graph.c:1257 +#: commit-graph.c:1283 msgid "Loading known commits in commit graph" msgstr "正在載入提交圖中的已知提交" -#: commit-graph.c:1274 +#: commit-graph.c:1300 msgid "Expanding reachable commits in commit graph" msgstr "正在擴展提交圖中的可以取得提交" -#: commit-graph.c:1294 +#: commit-graph.c:1320 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交圖中的提交標記" -#: commit-graph.c:1313 +#: commit-graph.c:1339 msgid "Computing commit graph generation numbers" msgstr "正在計算提交圖世代數字" -#: commit-graph.c:1367 +#: commit-graph.c:1406 msgid "Computing commit changed paths Bloom filters" msgstr "正在計算提交變更路徑的布隆過濾器" -#: commit-graph.c:1423 +#: commit-graph.c:1483 msgid "Collecting referenced commits" msgstr "正在收集引用提交" -#: commit-graph.c:1447 +#: commit-graph.c:1508 #, 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:1460 +#: commit-graph.c:1521 #, c-format msgid "error adding pack %s" msgstr "新增包 %s 發生錯誤" -#: commit-graph.c:1464 +#: commit-graph.c:1525 #, c-format msgid "error opening index for %s" msgstr "為 %s 開啟索引發生錯誤" -#: commit-graph.c:1503 +#: commit-graph.c:1562 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包物件中尋找提交圖的提交" -#: commit-graph.c:1518 -msgid "Counting distinct commits in commit graph" -msgstr "正在計算提交圖中不同的提交" - -#: commit-graph.c:1550 +#: commit-graph.c:1580 msgid "Finding extra edges in commit graph" msgstr "正在尋找提交圖中額外的邊" -#: commit-graph.c:1599 +#: commit-graph.c:1628 msgid "failed to write correct number of base graph ids" msgstr "無法寫入正確數量的基礎圖形 ID" -#: commit-graph.c:1633 midx.c:812 +#: commit-graph.c:1670 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "不能為 %s 建立先導目錄" -#: commit-graph.c:1646 +#: commit-graph.c:1683 msgid "unable to create temporary graph layer" msgstr "無法建立暫時的圖形層" -#: commit-graph.c:1651 +#: commit-graph.c:1688 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "無法調整「%s」的共用權限" -#: commit-graph.c:1728 +#: commit-graph.c:1758 #, 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:1773 +#: commit-graph.c:1803 msgid "unable to open commit-graph chain file" msgstr "無法開啟提交圖形鏈檔案" -#: commit-graph.c:1789 +#: commit-graph.c:1819 msgid "failed to rename base commit-graph file" msgstr "無法重新命名基礎提交圖形檔案" -#: commit-graph.c:1809 +#: commit-graph.c:1839 msgid "failed to rename temporary commit-graph file" msgstr "無法重新命名暫時提交圖形檔案" -#: commit-graph.c:1935 +#: commit-graph.c:1965 msgid "Scanning merged commits" msgstr "正在掃描合併提交" -#: commit-graph.c:1946 -#, c-format -msgid "unexpected duplicate commit id %s" -msgstr "意外的重複提交 ID %s" - -#: commit-graph.c:1969 +#: commit-graph.c:2009 msgid "Merging commit-graph" msgstr "正在合併提交圖形" -#: commit-graph.c:2156 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "提交圖格式不能寫入 %d 個提交" +#: commit-graph.c:2115 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" +msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用。" -#: commit-graph.c:2167 +#: commit-graph.c:2214 msgid "too many commits to write graph" msgstr "提交太多不能畫圖" -#: commit-graph.c:2260 +#: commit-graph.c:2307 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞" -#: commit-graph.c:2270 +#: commit-graph.c:2317 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s" -#: commit-graph.c:2280 commit-graph.c:2295 +#: commit-graph.c:2327 commit-graph.c:2342 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:2287 +#: commit-graph.c:2334 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "無法從提交圖形中解析提交 %s" -#: commit-graph.c:2305 +#: commit-graph.c:2352 msgid "Verifying commits in commit graph" msgstr "正在驗證提交圖中的提交" -#: commit-graph.c:2320 +#: commit-graph.c:2367 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "無法從提交圖形的物件庫中解析提交 %s" -#: commit-graph.c:2327 +#: commit-graph.c:2374 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s" -#: commit-graph.c:2337 +#: commit-graph.c:2384 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交圖形父提交列表太長了" -#: commit-graph.c:2346 +#: commit-graph.c:2393 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交圖形父提交是 %s != %s" -#: commit-graph.c:2360 +#: commit-graph.c:2407 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交圖形父提交列表過早終止" -#: commit-graph.c:2365 +#: commit-graph.c:2412 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零" -#: commit-graph.c:2369 +#: commit-graph.c:2416 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零" -#: commit-graph.c:2385 +#: commit-graph.c:2432 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "提交圖形中的提交 %s 的世代號是 %u != %u" -#: commit-graph.c:2391 +#: commit-graph.c:2438 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457 +#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -2652,7 +2672,7 @@ msgstr "鍵名沒有包含一個小節名稱：%s" msgid "key does not contain variable name: %s" msgstr "鍵名沒有包含變數名：%s" -#: config.c:408 sequencer.c:2456 +#: config.c:408 sequencer.c:2580 #, c-format msgid "invalid key: %s" msgstr "無效鍵名：%s" @@ -2788,7 +2808,7 @@ msgstr "%s 的取值格式錯誤：%s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1533 builtin/pack-objects.c:3617 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "錯誤的打包壓縮級別 %d" @@ -2817,101 +2837,101 @@ msgstr "解析 %s 失敗" msgid "unable to parse command-line config" msgstr "無法解析指令列中的設定" -#: config.c:2113 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "在讀取設定檔案時遇到未知錯誤" -#: config.c:2283 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "無效 %s：'%s'" -#: config.c:2328 +#: config.c:2341 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間" -#: config.c:2374 +#: config.c:2387 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "無法解析指令列設定中的 '%s'" -#: config.c:2376 +#: config.c:2389 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'" -#: config.c:2457 +#: config.c:2473 #, c-format msgid "invalid section name '%s'" msgstr "無效的小節名稱 '%s'" -#: config.c:2489 +#: config.c:2505 #, c-format msgid "%s has multiple values" msgstr "%s 有多個取值" -#: config.c:2518 +#: config.c:2534 #, c-format msgid "failed to write new configuration file %s" msgstr "寫入新的設定檔案 %s 失敗" -#: config.c:2770 config.c:3094 +#: config.c:2786 config.c:3112 #, c-format msgid "could not lock config file %s" msgstr "不能鎖定設定檔案 %s" -#: config.c:2781 +#: config.c:2797 #, c-format msgid "opening %s" msgstr "開啟 %s" -#: config.c:2816 builtin/config.c:344 +#: config.c:2834 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "無效模式：%s" -#: config.c:2841 +#: config.c:2859 #, c-format msgid "invalid config file %s" msgstr "無效的設定檔案 %s" -#: config.c:2854 config.c:3107 +#: config.c:2872 config.c:3125 #, c-format msgid "fstat on %s failed" msgstr "對 %s 呼叫 fstat 失敗" -#: config.c:2865 +#: config.c:2883 #, c-format msgid "unable to mmap '%s'" msgstr "不能 mmap '%s'" -#: config.c:2874 config.c:3112 +#: config.c:2892 config.c:3130 #, c-format msgid "chmod on %s failed" msgstr "對 %s 呼叫 chmod 失敗" -#: config.c:2959 config.c:3209 +#: config.c:2977 config.c:3227 #, c-format msgid "could not write config file %s" msgstr "不能寫入設定檔案 %s" -#: config.c:2993 +#: config.c:3011 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能設定 '%s' 為 '%s'" -#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "不能取消設定 '%s'" -#: config.c:3085 +#: config.c:3103 #, c-format msgid "invalid section name: %s" msgstr "無效的小節名稱：%s" -#: config.c:3252 +#: config.c:3270 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺少" @@ -3079,23 +3099,23 @@ msgstr "ssh 變體 'simple' 不支援設定埠" msgid "strange pathname '%s' blocked" msgstr "已阻止奇怪的路徑名 '%s'" -#: connect.c:1407 +#: connect.c:1408 msgid "unable to fork" msgstr "無法 fork" -#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "正在檢查連通性" -#: connected.c:121 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "不能執行 'git rev-list'" -#: connected.c:141 +#: connected.c:144 msgid "failed write to rev-list" msgstr "寫入 rev-list 失敗" -#: connected.c:148 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "關閉 rev-list 的標準輸入失敗" @@ -3168,56 +3188,56 @@ msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼" msgid "encoding '%s' from %s to %s and back is not the same" msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致" -#: convert.c:668 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "不能 fork 以執行外部過濾器 '%s'" -#: convert.c:688 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "不能將輸入傳遞給外部過濾器 '%s'" -#: convert.c:695 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "外部過濾器 '%s' 失敗碼 %d" -#: convert.c:730 convert.c:733 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "從外部過濾器 '%s' 讀取失敗" -#: convert.c:736 convert.c:791 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "外部過濾器 '%s' 失敗" -#: convert.c:840 +#: convert.c:837 msgid "unexpected filter type" msgstr "意外的過濾類型" -#: convert.c:851 +#: convert.c:848 msgid "path name too long for external filter" msgstr "外部過濾器的路徑名太長" -#: convert.c:943 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾" -#: convert.c:1243 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作區編碼" -#: convert.c:1431 convert.c:1465 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 過濾器 '%s' 失敗" -#: convert.c:1511 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 過濾器 %s 失敗" @@ -3235,17 +3255,17 @@ msgstr "拒絕使用缺少主機欄位的憑證" msgid "refusing to work with credential missing protocol field" msgstr "拒絕使用缺少通訊協定欄位的憑證" -#: credential.c:396 +#: credential.c:394 #, c-format msgid "url contains a newline in its %s component: %s" msgstr "URL 的 %s 部分有換行：%s" -#: credential.c:440 +#: credential.c:438 #, c-format msgid "url has no scheme: %s" msgstr "URL 沒有 Scheme：%s" -#: credential.c:513 +#: credential.c:511 #, c-format msgid "credential url cannot be parsed: %s" msgstr "無法解析憑證 URL：%s" @@ -3333,6 +3353,26 @@ msgstr "來自 config 的資料島正規表示式有太多的捕獲組（最多 msgid "Marked %d islands, done.\n" msgstr "已標記 %d 個資料島，結束。\n" +#: diff-lib.c:534 +msgid "--merge-base does not work with ranges" +msgstr "—merge-base 跟範圍無法搭配運作" + +#: diff-lib.c:536 +msgid "--merge-base only works with commits" +msgstr "--merge-base 只能跟提交搭配才能運作" + +#: diff-lib.c:553 +msgid "unable to get HEAD" +msgstr "不能取得 HEAD" + +#: diff-lib.c:560 +msgid "no merge base found" +msgstr "找不到合併基底" + +#: diff-lib.c:562 +msgid "multiple merge bases found" +msgstr "找到多個合併基底" + #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<選項>] <路徑> <路徑>" @@ -3392,35 +3432,35 @@ msgstr "" "發現設定變數 'diff.dirstat' 中的錯誤：\n" "%s" -#: diff.c:4243 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 離開，停止在 %s" -#: diff.c:4589 +#: diff.c:4625 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4592 +#: diff.c:4628 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4670 +#: diff.c:4707 msgid "--follow requires exactly one pathspec" msgstr "--follow 明確要求只跟一個路徑規格" -#: diff.c:4718 +#: diff.c:4755 #, c-format msgid "invalid --stat value: %s" msgstr "無效的 --stat 值：%s" -#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一個數字值" -#: diff.c:4755 +#: diff.c:4792 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3429,195 +3469,200 @@ msgstr "" "無法解析 --dirstat/-X 選項的參數：\n" "%s" -#: diff.c:4840 +#: diff.c:4877 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'" -#: diff.c:4864 +#: diff.c:4901 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之後未知的值" -#: diff.c:4878 +#: diff.c:4915 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4928 diff.c:4934 +#: diff.c:4965 diff.c:4971 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s 期望 <n>/<m> 格式" -#: diff.c:4946 +#: diff.c:4983 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一個字元，得到 '%s'" -#: diff.c:4967 +#: diff.c:5004 #, c-format msgid "bad --color-moved argument: %s" msgstr "壞的 --color-moved 參數：%s" -#: diff.c:4986 +#: diff.c:5023 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的無效模式 '%s'" -#: diff.c:5026 +#: diff.c:5063 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5062 diff.c:5082 +#: diff.c:5099 diff.c:5119 #, c-format msgid "invalid argument to %s" msgstr "%s 的參數無效" -#: diff.c:5219 +#: diff.c:5223 +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "傳入 -I 的正規表示式無效：「%s」" + +#: diff.c:5272 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "無法解析 --submodule 選項的參數：'%s'" -#: diff.c:5275 +#: diff.c:5328 #, c-format msgid "bad --word-diff argument: %s" msgstr "壞的 --word-diff 參數：%s" -#: diff.c:5298 +#: diff.c:5351 msgid "Diff output format options" msgstr "差異輸出格式化選項" -#: diff.c:5300 diff.c:5306 +#: diff.c:5353 diff.c:5359 msgid "generate patch" msgstr "生成修補檔" -#: diff.c:5303 builtin/log.c:177 +#: diff.c:5356 builtin/log.c:178 msgid "suppress diff output" msgstr "不顯示差異輸出" -#: diff.c:5308 diff.c:5422 diff.c:5429 +#: diff.c:5361 diff.c:5475 diff.c:5482 msgid "<n>" msgstr "<n>" -#: diff.c:5309 diff.c:5312 +#: diff.c:5362 diff.c:5365 msgid "generate diffs with <n> lines context" msgstr "生成含 <n> 行上下文的差異" -#: diff.c:5314 +#: diff.c:5367 msgid "generate the diff in raw format" msgstr "生成原始格式的差異" -#: diff.c:5317 +#: diff.c:5370 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同義" -#: diff.c:5321 +#: diff.c:5374 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同義" -#: diff.c:5325 +#: diff.c:5378 msgid "machine friendly --stat" msgstr "機器友好的 --stat" -#: diff.c:5328 +#: diff.c:5381 msgid "output only the last line of --stat" msgstr "只輸出 --stat 的最後一行" -#: diff.c:5330 diff.c:5338 +#: diff.c:5383 diff.c:5391 msgid "<param1,param2>..." msgstr "<參數1,參數2>..." -#: diff.c:5331 +#: diff.c:5384 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "輸出每個子目錄相對變更的分布" -#: diff.c:5335 +#: diff.c:5388 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同義" -#: diff.c:5339 +#: diff.c:5392 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同義詞" -#: diff.c:5343 +#: diff.c:5396 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告" -#: diff.c:5346 +#: diff.c:5399 msgid "condensed summary such as creations, renames and mode changes" msgstr "精簡摘要，例如建立、重新命名和模式變更" -#: diff.c:5349 +#: diff.c:5402 msgid "show only names of changed files" msgstr "只顯示變更檔案的檔案名" -#: diff.c:5352 +#: diff.c:5405 msgid "show only names and status of changed files" msgstr "只顯示變更檔案的檔案名和狀態" -#: diff.c:5354 +#: diff.c:5407 msgid "<width>[,<name-width>[,<count>]]" msgstr "<寬度>[,<檔案名寬度>[,<次數>]]" -#: diff.c:5355 +#: diff.c:5408 msgid "generate diffstat" msgstr "生成差異統計（diffstat）" -#: diff.c:5357 diff.c:5360 diff.c:5363 +#: diff.c:5410 diff.c:5413 diff.c:5416 msgid "<width>" msgstr "<寬度>" -#: diff.c:5358 +#: diff.c:5411 msgid "generate diffstat with a given width" msgstr "使用提供的長度生成差異統計" -#: diff.c:5361 +#: diff.c:5414 msgid "generate diffstat with a given name width" msgstr "使用提供的檔案名長度生成差異統計" -#: diff.c:5364 +#: diff.c:5417 msgid "generate diffstat with a given graph width" msgstr "使用提供的圖形長度生成差異統計" -#: diff.c:5366 +#: diff.c:5419 msgid "<count>" msgstr "<次數>" -#: diff.c:5367 +#: diff.c:5420 msgid "generate diffstat with limited lines" msgstr "生成有限行數的差異統計" -#: diff.c:5370 +#: diff.c:5423 msgid "generate compact summary in diffstat" msgstr "生成差異統計的簡潔摘要" -#: diff.c:5373 +#: diff.c:5426 msgid "output a binary diff that can be applied" msgstr "輸出一個可以應用的二進位差異" -#: diff.c:5376 +#: diff.c:5429 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行顯示完整的前後物件名稱" -#: diff.c:5378 +#: diff.c:5431 msgid "show colored diff" msgstr "顯示帶顏色的差異" -#: diff.c:5379 +#: diff.c:5432 msgid "<kind>" msgstr "<類型>" -#: diff.c:5380 +#: diff.c:5433 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元" -#: diff.c:5383 +#: diff.c:5436 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3625,295 +3670,299 @@ msgstr "" "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔" "符" -#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498 +#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554 msgid "<prefix>" msgstr "<前綴>" -#: diff.c:5387 +#: diff.c:5440 msgid "show the given source prefix instead of \"a/\"" msgstr "顯示提供的源前綴取代 \"a/\"" -#: diff.c:5390 +#: diff.c:5443 msgid "show the given destination prefix instead of \"b/\"" msgstr "顯示提供的目標前綴取代 \"b/\"" -#: diff.c:5393 +#: diff.c:5446 msgid "prepend an additional prefix to every line of output" msgstr "輸出的每一行附加前綴" -#: diff.c:5396 +#: diff.c:5449 msgid "do not show any source or destination prefix" msgstr "不顯示任何源和目標前綴" -#: diff.c:5399 +#: diff.c:5452 msgid "show context between diff hunks up to the specified number of lines" msgstr "顯示指定行數的差異區塊間的上下文" -#: diff.c:5403 diff.c:5408 diff.c:5413 +#: diff.c:5456 diff.c:5461 diff.c:5466 msgid "<char>" msgstr "<字元>" -#: diff.c:5404 +#: diff.c:5457 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一個字元取代 '+' 來表示新的一行" -#: diff.c:5409 +#: diff.c:5462 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一個字元取代 '-' 來表示舊的一行" -#: diff.c:5414 +#: diff.c:5467 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一個字元取代 ' ' 來表示一行上下文" -#: diff.c:5417 +#: diff.c:5470 msgid "Diff rename options" msgstr "差異重新命名選項" -#: diff.c:5418 +#: diff.c:5471 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5419 +#: diff.c:5472 msgid "break complete rewrite changes into pairs of delete and create" msgstr "將完全重寫的變更打破為成對的刪除和建立" -#: diff.c:5423 +#: diff.c:5476 msgid "detect renames" msgstr "檢測重新命名" -#: diff.c:5427 +#: diff.c:5480 msgid "omit the preimage for deletes" msgstr "省略刪除變更的差異輸出" -#: diff.c:5430 +#: diff.c:5483 msgid "detect copies" msgstr "檢測複製" -#: diff.c:5434 +#: diff.c:5487 msgid "use unmodified files as source to find copies" msgstr "使用未修改的檔案做為發現複製的源" -#: diff.c:5436 +#: diff.c:5489 msgid "disable rename detection" msgstr "停用重新命名偵測" -#: diff.c:5439 +#: diff.c:5492 msgid "use empty blobs as rename source" msgstr "使用空的資料物件做為重新命名的源" -#: diff.c:5441 +#: diff.c:5494 msgid "continue listing the history of a file beyond renames" msgstr "繼續列出檔案重新命名以外的歷史記錄" -#: diff.c:5444 +#: diff.c:5497 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測" -#: diff.c:5446 +#: diff.c:5499 msgid "Diff algorithm options" msgstr "差異演算法選項" -#: diff.c:5448 +#: diff.c:5501 msgid "produce the smallest possible diff" msgstr "生成儘可能小的差異" -#: diff.c:5451 +#: diff.c:5504 msgid "ignore whitespace when comparing lines" msgstr "行比較時忽略空白字元" -#: diff.c:5454 +#: diff.c:5507 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字元的變更" -#: diff.c:5457 +#: diff.c:5510 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字元變更" -#: diff.c:5460 +#: diff.c:5513 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的Enter符（CR）" -#: diff.c:5463 +#: diff.c:5516 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的變更" -#: diff.c:5466 +#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588 +msgid "<regex>" +msgstr "<正則>" + +#: diff.c:5519 +msgid "ignore changes whose all lines match <regex>" +msgstr "忽略整行符合 <regex> 的變更" + +#: diff.c:5522 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "啟發式轉換差異邊界以便閱讀" -#: diff.c:5469 +#: diff.c:5525 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 演算法生成差異" -#: diff.c:5473 +#: diff.c:5529 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 演算法生成差異" -#: diff.c:5475 +#: diff.c:5531 msgid "<algorithm>" msgstr "<演算法>" -#: diff.c:5476 +#: diff.c:5532 msgid "choose a diff algorithm" msgstr "選擇一個差異演算法" -#: diff.c:5478 +#: diff.c:5534 msgid "<text>" msgstr "<文字>" -#: diff.c:5479 +#: diff.c:5535 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 演算法生成差異" -#: diff.c:5481 diff.c:5490 diff.c:5493 +#: diff.c:5537 diff.c:5546 diff.c:5549 msgid "<mode>" msgstr "<模式>" -#: diff.c:5482 +#: diff.c:5538 msgid "show word diff, using <mode> to delimit changed words" msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞" -#: diff.c:5484 diff.c:5487 diff.c:5532 -msgid "<regex>" -msgstr "<正則>" - -#: diff.c:5485 +#: diff.c:5541 msgid "use <regex> to decide what a word is" msgstr "使用 <正規表示式> 確定何為一個詞" -#: diff.c:5488 +#: diff.c:5544 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "相當於 --word-diff=color --word-diff-regex=<正則>" -#: diff.c:5491 +#: diff.c:5547 msgid "moved lines of code are colored differently" msgstr "移動的程式碼行用不同方式著色" -#: diff.c:5494 +#: diff.c:5550 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字元" -#: diff.c:5497 +#: diff.c:5553 msgid "Other diff options" msgstr "其它差異選項" -#: diff.c:5499 +#: diff.c:5555 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑" -#: diff.c:5503 +#: diff.c:5559 msgid "treat all files as text" msgstr "把所有檔案當做文字處理" -#: diff.c:5505 +#: diff.c:5561 msgid "swap two inputs, reverse the diff" msgstr "交換兩個輸入，反轉差異" -#: diff.c:5507 +#: diff.c:5563 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差異時離開碼為 1，否則為 0" -#: diff.c:5509 +#: diff.c:5565 msgid "disable all output of the program" msgstr "停用本程式的所有輸出" -#: diff.c:5511 +#: diff.c:5567 msgid "allow an external diff helper to be executed" -msgstr "允許執行一個外部的差異助手" +msgstr "允許執行一個外部的差異協助工具" -#: diff.c:5513 +#: diff.c:5569 msgid "run external text conversion filters when comparing binary files" msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器" -#: diff.c:5515 +#: diff.c:5571 msgid "<when>" msgstr "<何時>" -#: diff.c:5516 +#: diff.c:5572 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差異時，忽略子模組的更改" -#: diff.c:5519 +#: diff.c:5575 msgid "<format>" msgstr "<格式>" -#: diff.c:5520 +#: diff.c:5576 msgid "specify how differences in submodules are shown" msgstr "指定子模組的差異如何顯示" -#: diff.c:5524 +#: diff.c:5580 msgid "hide 'git add -N' entries from the index" msgstr "隱藏索引中 'git add -N' 條目" -#: diff.c:5527 +#: diff.c:5583 msgid "treat 'git add -N' entries as real in the index" msgstr "將索引中 'git add -N' 條目當做真實的" -#: diff.c:5529 +#: diff.c:5585 msgid "<string>" msgstr "<字串>" -#: diff.c:5530 +#: diff.c:5586 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "尋找改變了指定字串出現次數的差異" -#: diff.c:5533 +#: diff.c:5589 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "尋找改變指定正則符合出現次數的差異" -#: diff.c:5536 +#: diff.c:5592 msgid "show all changes in the changeset with -S or -G" msgstr "顯示使用 -S 或 -G 的變更集的所有變更" -#: diff.c:5539 +#: diff.c:5595 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式" -#: diff.c:5542 +#: diff.c:5598 msgid "control the order in which files appear in the output" msgstr "控制輸出中的檔案顯示順序" -#: diff.c:5543 +#: diff.c:5599 msgid "<object-id>" msgstr "<物件 ID>" -#: diff.c:5544 +#: diff.c:5600 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "尋找改變指定物件出現次數的差異" -#: diff.c:5546 +#: diff.c:5602 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5547 +#: diff.c:5603 msgid "select files by diff type" msgstr "透過差異類型選擇檔案" -#: diff.c:5549 +#: diff.c:5605 msgid "<file>" msgstr "<檔案>" -#: diff.c:5550 +#: diff.c:5606 msgid "Output to a specific file" msgstr "輸出到一個指定的檔案" -#: diff.c:6205 +#: diff.c:6263 msgid "inexact rename detection was skipped due to too many files." msgstr "因為檔案太多，略過不嚴格的重新命名檢查。" -#: diff.c:6208 +#: diff.c:6266 msgid "only found copies from modified paths due to too many files." msgstr "因為檔案太多，只在修改的路徑中尋找複製。" -#: diff.c:6211 +#: diff.c:6269 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3928,59 +3977,59 @@ msgstr "讀取排序檔案 '%s' 失敗" msgid "Performing inexact rename detection" msgstr "正在進行非精確的重新命名偵測" -#: dir.c:573 +#: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路徑規格 '%s' 未符合任何 git 已知檔案" -#: dir.c:713 dir.c:742 dir.c:755 +#: dir.c:718 dir.c:747 dir.c:760 #, c-format msgid "unrecognized pattern: '%s'" msgstr "無法識別樣式：「%s」" -#: dir.c:772 dir.c:786 +#: dir.c:777 dir.c:791 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "無法識別反向模式：「%s」" -#: dir.c:804 +#: dir.c:809 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "您的稀疏檢出檔案可能有問題：「%s」樣式重複" -#: dir.c:814 +#: dir.c:819 msgid "disabling cone pattern matching" msgstr "停用 cone 樣式符合模式" -#: dir.c:1191 +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能將 %s 用作排除檔案" -#: dir.c:2296 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "不能開啟目錄 '%s'" -#: dir.c:2596 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "無法獲得核心名稱和訊息" -#: dir.c:2720 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "快取未追蹤檔案在本系統或位置中被停用" -#: dir.c:3502 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "版本庫 %s 中的索引檔案損壞" -#: dir.c:3547 dir.c:3552 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "不能為 %s 建立目錄" -#: dir.c:3581 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" @@ -4014,245 +4063,245 @@ msgstr "不能設定 GIT_DIR 為 '%s'" msgid "too many args to run %s" msgstr "執行 %s 的參數太多" -#: fetch-pack.c:152 +#: fetch-pack.c:177 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：應為 shallow 列表" -#: fetch-pack.c:155 +#: fetch-pack.c:180 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包" -#: fetch-pack.c:166 +#: fetch-pack.c:191 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包" -#: fetch-pack.c:186 +#: fetch-pack.c:211 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'" -#: fetch-pack.c:197 +#: fetch-pack.c:222 msgid "unable to write to remote" msgstr "無法寫到遠端" -#: fetch-pack.c:259 +#: fetch-pack.c:283 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" -#: fetch-pack.c:358 fetch-pack.c:1408 +#: fetch-pack.c:378 fetch-pack.c:1406 #, c-format msgid "invalid shallow line: %s" msgstr "無效的 shallow 訊息：%s" -#: fetch-pack.c:364 fetch-pack.c:1414 +#: fetch-pack.c:384 fetch-pack.c:1412 #, c-format msgid "invalid unshallow line: %s" msgstr "無效的 unshallow 訊息：%s" -#: fetch-pack.c:366 fetch-pack.c:1416 +#: fetch-pack.c:386 fetch-pack.c:1414 #, c-format msgid "object not found: %s" msgstr "物件未找到：%s" -#: fetch-pack.c:369 fetch-pack.c:1419 +#: fetch-pack.c:389 fetch-pack.c:1417 #, c-format msgid "error in object: %s" msgstr "物件中發生錯誤：%s" -#: fetch-pack.c:371 fetch-pack.c:1421 +#: fetch-pack.c:391 fetch-pack.c:1419 #, c-format msgid "no shallow found: %s" msgstr "未發現 shallow：%s" -#: fetch-pack.c:374 fetch-pack.c:1425 +#: fetch-pack.c:394 fetch-pack.c:1423 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "應為 shallow/unshallow，卻得到 %s" -#: fetch-pack.c:416 +#: fetch-pack.c:434 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:433 +#: fetch-pack.c:451 #, c-format msgid "invalid commit %s" msgstr "無效提交 %s" -#: fetch-pack.c:464 +#: fetch-pack.c:482 msgid "giving up" msgstr "放棄" -#: fetch-pack.c:477 progress.c:336 +#: fetch-pack.c:495 progress.c:339 msgid "done" msgstr "完成" -#: fetch-pack.c:489 +#: fetch-pack.c:507 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:543 #, c-format msgid "Marking %s as complete" msgstr "標記 %s 為完成" -#: fetch-pack.c:756 +#: fetch-pack.c:758 #, c-format msgid "already have %s (%s)" msgstr "已經有 %s（%s）" -#: fetch-pack.c:821 +#: fetch-pack.c:827 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：無法衍生 sideband 多路輸出" -#: fetch-pack.c:829 +#: fetch-pack.c:835 msgid "protocol error: bad pack header" msgstr "協定錯誤：壞的包頭" -#: fetch-pack.c:910 +#: fetch-pack.c:919 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：無法衍生進程 %s" -#: fetch-pack.c:927 +#: fetch-pack.c:937 #, c-format msgid "%s failed" msgstr "%s 失敗" -#: fetch-pack.c:929 +#: fetch-pack.c:939 msgid "error in sideband demultiplexer" msgstr "sideband 多路輸出發生錯誤" -#: fetch-pack.c:976 +#: fetch-pack.c:982 #, c-format msgid "Server version is %.*s" msgstr "伺服器版本 %.*s" -#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996 -#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012 -#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028 -#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050 +#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 +#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 +#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 #, c-format msgid "Server supports %s" msgstr "伺服器支援 %s" -#: fetch-pack.c:983 +#: fetch-pack.c:992 msgid "Server does not support shallow clients" msgstr "伺服器不支援 shalllow 用戶端" -#: fetch-pack.c:1043 +#: fetch-pack.c:1052 msgid "Server does not support --shallow-since" msgstr "伺服器不支援 --shallow-since" -#: fetch-pack.c:1048 +#: fetch-pack.c:1057 msgid "Server does not support --shallow-exclude" msgstr "伺服器不支援 --shallow-exclude" -#: fetch-pack.c:1052 +#: fetch-pack.c:1061 msgid "Server does not support --deepen" msgstr "伺服器不支援 --deepen" -#: fetch-pack.c:1054 +#: fetch-pack.c:1063 msgid "Server does not support this repository's object format" msgstr "伺服器不支援此版本庫的物件格式" -#: fetch-pack.c:1071 +#: fetch-pack.c:1076 msgid "no common commits" msgstr "沒有共同的提交" -#: fetch-pack.c:1083 fetch-pack.c:1639 +#: fetch-pack.c:1088 fetch-pack.c:1628 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：取得失敗。" -#: fetch-pack.c:1211 +#: fetch-pack.c:1214 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "算法不一致：用戶端 %s；伺服器 %s" -#: fetch-pack.c:1215 +#: fetch-pack.c:1218 #, c-format msgid "the server does not support algorithm '%s'" msgstr "伺服器不支援「%s」算法" -#: fetch-pack.c:1235 +#: fetch-pack.c:1238 msgid "Server does not support shallow requests" msgstr "伺服器不支援 shalllow 請求" -#: fetch-pack.c:1242 +#: fetch-pack.c:1245 msgid "Server supports filter" msgstr "伺服器支援 filter" -#: fetch-pack.c:1286 +#: fetch-pack.c:1284 msgid "unable to write request to remote" msgstr "無法將請求寫到遠端" -#: fetch-pack.c:1304 +#: fetch-pack.c:1302 #, c-format msgid "error reading section header '%s'" msgstr "讀取節標題 '%s' 發生錯誤" -#: fetch-pack.c:1310 +#: fetch-pack.c:1308 #, c-format msgid "expected '%s', received '%s'" msgstr "預期 '%s'，得到 '%s'" -#: fetch-pack.c:1371 +#: fetch-pack.c:1369 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的確認行：'%s'" -#: fetch-pack.c:1376 +#: fetch-pack.c:1374 #, c-format msgid "error processing acks: %d" msgstr "處理 ack 發生錯誤：%d" -#: fetch-pack.c:1386 +#: fetch-pack.c:1384 msgid "expected packfile to be sent after 'ready'" msgstr "預期在 'ready' 之後傳送 packfile" -#: fetch-pack.c:1388 +#: fetch-pack.c:1386 msgid "expected no other sections to be sent after no 'ready'" msgstr "在沒有 'ready' 不應該傳送其它小節" -#: fetch-pack.c:1430 +#: fetch-pack.c:1428 #, c-format msgid "error processing shallow info: %d" msgstr "處理淺複製訊息發生錯誤：%d" -#: fetch-pack.c:1477 +#: fetch-pack.c:1475 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "預期 wanted-ref，得到 '%s'" -#: fetch-pack.c:1482 +#: fetch-pack.c:1480 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref：'%s'" -#: fetch-pack.c:1487 +#: fetch-pack.c:1485 #, c-format msgid "error processing wanted refs: %d" msgstr "處理要取得的引用發生錯誤：%d" -#: fetch-pack.c:1517 +#: fetch-pack.c:1515 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: 預期要有回應結束封包" -#: fetch-pack.c:1921 +#: fetch-pack.c:1897 msgid "no matching remote head" msgstr "沒有符合的遠端分支" -#: fetch-pack.c:1944 builtin/clone.c:692 +#: fetch-pack.c:1920 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "遠端沒有傳送所有必需的物件" -#: fetch-pack.c:1971 +#: fetch-pack.c:1947 #, c-format msgid "no such remote ref %s" msgstr "沒有這樣的遠端引用 %s" -#: fetch-pack.c:1974 +#: fetch-pack.c:1950 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "伺服器不允許請求未公開的物件 %s" @@ -4275,7 +4324,7 @@ msgstr "gpg 無法為資料簽名" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors 中無效的顏色 '%.*s'" -#: grep.c:668 +#: grep.c:640 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4283,18 +4332,18 @@ msgstr "" "提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此" "功能" -#: grep.c:2128 +#: grep.c:2100 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：無法讀取 %s" -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 +#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "對 '%s' 呼叫 stat 失敗" -#: grep.c:2156 +#: grep.c:2128 #, c-format msgid "'%s': short read" msgstr "'%s'：讀取不完整" @@ -4349,43 +4398,43 @@ msgstr "低級指令 / 同步版本庫" #: help.c:38 msgid "Low-level Commands / Internal Helpers" -msgstr "低級指令/內部助手" +msgstr "低級指令/內部協助工具" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 指令" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路徑中的其他地方可用的 git 指令" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "這些是各種場合常見的 Git 指令：" -#: help.c:363 git.c:99 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "不支援的指令列表類型 '%s'" -#: help.c:403 -msgid "The common Git guides are:" -msgstr "最常用的 Git 嚮導有：" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Git 概念嚮導有：" -#: help.c:427 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "執行 'git help <command>' 來檢視特定子指令" -#: help.c:432 +#: help.c:434 msgid "External commands" msgstr "外部指令" -#: help.c:447 +#: help.c:449 msgid "Command aliases" msgstr "指令別名" -#: help.c:511 +#: help.c:527 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4394,31 +4443,31 @@ msgstr "" "'%s' 像是一個 git 指令，但卻無法執行。\n" "可能是 git-%s 受損？" -#: help.c:570 +#: help.c:543 help.c:631 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。" + +#: help.c:591 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系統中未發現 Git 指令。" -#: help.c:592 +#: help.c:613 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。" -#: help.c:597 +#: help.c:618 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "假定你想要的是 '%s' 並繼續。" -#: help.c:602 +#: help.c:623 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。" -#: help.c:610 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。" - -#: help.c:614 +#: help.c:635 msgid "" "\n" "The most similar command is" @@ -4429,16 +4478,16 @@ msgstr[0] "" "\n" "最類似的指令有" -#: help.c:654 +#: help.c:675 msgid "git version [<options>]" msgstr "git version [<選項>]" -#: help.c:709 +#: help.c:730 #, c-format msgid "%s: %s - %s" msgstr "%s：%s - %s" -#: help.c:713 +#: help.c:734 msgid "" "\n" "Did you mean this?" @@ -4449,7 +4498,15 @@ msgstr[0] "" "\n" "您指的是這個嗎？" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "作者身分未知\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "提交者身分未知\n" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -4474,66 +4531,66 @@ msgstr "" "來設定您帳號的預設身份標記。\n" "如果僅在本版本庫設定身份標記，則省略 --global 參數。\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "未提供信件位址且自動偵測被停用" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "無法自動偵測信件位址（得到 '%s'）" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "未提供姓名且自動偵測被停用" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "無法自動偵測姓名（得到 '%s'）" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "不允許空的姓名（對於 <%s>）" -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "姓名中僅包含停用字元：%s" -#: ident.c:436 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "無效的日期格式：%s" -#: list-objects-filter-options.c:58 +#: list-objects-filter-options.c:81 msgid "expected 'tree:<depth>'" msgstr "期望 'tree:<深度>'" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:96 msgid "sparse:path filters support has been dropped" msgstr "sparse:path 過濾器支援已被刪除" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:109 #, c-format msgid "invalid filter-spec '%s'" msgstr "無效的過濾器表達式 '%s'" -#: list-objects-filter-options.c:102 +#: list-objects-filter-options.c:125 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'" -#: list-objects-filter-options.c:144 +#: list-objects-filter-options.c:167 msgid "expected something after combine:" msgstr "期望在組合後有一些東西：" -#: list-objects-filter-options.c:226 +#: list-objects-filter-options.c:249 msgid "multiple filter-specs cannot be combined" msgstr "不能混用多種過濾規格" -#: list-objects-filter-options.c:330 +#: list-objects-filter-options.c:361 msgid "unable to upgrade repository format to support partial clone" msgstr "無法升級版本庫格式，以致不支援部分複製" @@ -4589,6 +4646,20 @@ msgstr "不能建立 '%s.lock'：%s" msgid "expected flush after ls-refs arguments" msgstr "在 ls-refs 引數之後應該有一個 flush 包" +#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"您對下列檔案的本機修改將被合併動作覆蓋：\n" +" %s" + +#: merge-ort-wrappers.c:33 merge-recursive.c:3436 +#, c-format +msgid "Already up to date!" +msgstr "已經是最新的！" + #: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "（壞提交）\n" @@ -4891,7 +4962,7 @@ msgstr "新增/新增" msgid "Skipped %s (merged same as existing)" msgstr "略過 %s（已經做過相同合併）" -#: merge-recursive.c:3101 git-submodule.sh:959 +#: merge-recursive.c:3101 msgid "submodule" msgstr "子模組" @@ -4968,44 +5039,31 @@ msgstr "新增 %s" msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "衝突（add/add）：合併衝突於 %s" -#: merge-recursive.c:3436 -msgid "Already up to date!" -msgstr "已經是最新的！" - #: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "無法合併樹 %s 和 %s" -#: merge-recursive.c:3549 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "合併：" -#: merge-recursive.c:3562 +#: merge-recursive.c:3563 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "發現 %u 個共同祖先：" -#: merge-recursive.c:3612 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "合併未返回提交" -#: merge-recursive.c:3671 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"您對下列檔案的本機修改將被合併動作覆蓋：\n" -" %s" - -#: merge-recursive.c:3768 +#: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析物件 '%s'" -#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 msgid "Unable to write index." msgstr "不能寫入索引。" @@ -5013,170 +5071,170 @@ msgstr "不能寫入索引。" msgid "failed to read the cache" msgstr "讀取快取失敗" -#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 -#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816 +#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "無法寫新的索引檔案" -#: midx.c:68 +#: midx.c:80 #, c-format msgid "multi-pack-index file %s is too small" msgstr "多包索引檔案 %s 太小" -#: midx.c:84 +#: midx.c:96 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合" -#: midx.c:89 +#: midx.c:101 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index 版本 %d 不能被識別" -#: midx.c:94 +#: midx.c:106 #, c-format -msgid "hash version %u does not match" -msgstr "散列版本 %u 不符合" +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合" -#: midx.c:108 +#: midx.c:123 msgid "invalid chunk offset (too large)" msgstr "無效的區塊位移（太大）" -#: midx.c:132 +#: midx.c:147 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "終止多包索引區塊 id 出現時間早於預期" -#: midx.c:145 +#: midx.c:160 msgid "multi-pack-index missing required pack-name chunk" msgstr "多包索引缺少必需的包名塊" -#: midx.c:147 +#: midx.c:162 msgid "multi-pack-index missing required OID fanout chunk" msgstr "多包索引缺少必需的物件 ID 扇出塊" -#: midx.c:149 +#: midx.c:164 msgid "multi-pack-index missing required OID lookup chunk" msgstr "多包索引缺少必需的物件 ID 查詢塊" -#: midx.c:151 +#: midx.c:166 msgid "multi-pack-index missing required object offsets chunk" msgstr "多包索引缺少必需的物件位移塊" -#: midx.c:165 +#: midx.c:180 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名無序：'%s' 在 '%s' 之前" -#: midx.c:208 +#: midx.c:223 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "錯的 pack-int-id：%u（共有 %u 個包）" -#: midx.c:258 +#: midx.c:273 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引儲存一個64位位移，但是 off_t 太小" -#: midx.c:286 -msgid "error preparing packfile from multi-pack-index" -msgstr "從多包索引準備 packfile 時發生錯誤" - -#: midx.c:470 +#: midx.c:480 #, c-format msgid "failed to add packfile '%s'" msgstr "新增 packfile '%s' 失敗" -#: midx.c:476 +#: midx.c:486 #, c-format msgid "failed to open pack-index '%s'" msgstr "開啟包索引 '%s' 失敗" -#: midx.c:536 +#: midx.c:546 #, c-format msgid "failed to locate object %d in packfile" msgstr "在 packfile 中定位物件 %d 失敗" -#: midx.c:840 +#: midx.c:846 msgid "Adding packfiles to multi-pack-index" msgstr "正在新增 packfile 至多包索引" -#: midx.c:873 +#: midx.c:879 #, c-format msgid "did not see pack-file %s to drop" msgstr "沒有看到要捨棄的包檔案 %s" -#: midx.c:925 +#: midx.c:931 msgid "no pack files to index." msgstr "沒有要索引的 pack 檔案。" -#: midx.c:977 +#: midx.c:982 msgid "Writing chunks to multi-pack-index" msgstr "寫入區塊至多包索引" -#: midx.c:1056 +#: midx.c:1060 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位於 %s 的多包索引失敗" -#: midx.c:1112 +#: midx.c:1116 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "有 multi-pack-index 檔案，但無法解析" + +#: midx.c:1124 msgid "Looking for referenced packfiles" msgstr "正在尋找引用的 packfile" -#: midx.c:1127 +#: midx.c:1139 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1132 +#: midx.c:1144 msgid "the midx contains no oid" msgstr "midx 沒有 oid" -#: midx.c:1141 +#: midx.c:1153 msgid "Verifying OID order in multi-pack-index" msgstr "正在驗證多包索引中的物件 ID 順序" -#: midx.c:1150 +#: midx.c:1162 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1170 +#: midx.c:1182 msgid "Sorting objects by packfile" msgstr "透過 packfile 為物件排序" -#: midx.c:1177 +#: midx.c:1189 msgid "Verifying object offsets" msgstr "正在驗證物件位移" -#: midx.c:1193 +#: midx.c:1205 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "為 oid[%d] = %s 載入包條目失敗" -#: midx.c:1199 +#: midx.c:1211 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "為 packfile %s 載入包索引失敗" -#: midx.c:1208 +#: midx.c:1220 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>" -#: midx.c:1233 +#: midx.c:1245 msgid "Counting referenced objects" msgstr "正在計算引用物件" -#: midx.c:1243 +#: midx.c:1255 msgid "Finding and deleting unreferenced packfiles" msgstr "正在尋找並刪除沒有參考的 packfile" -#: midx.c:1433 +#: midx.c:1446 msgid "could not start pack-objects" msgstr "不能開始 pack-objects" -#: midx.c:1452 +#: midx.c:1466 msgid "could not finish pack-objects" msgstr "不能結束 pack-objects" @@ -5259,21 +5317,21 @@ msgstr "不能解析物件：%s" msgid "hash mismatch %s" msgstr "雜湊值與 %s 不符合" -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 #, c-format msgid "unable to get size of %s" msgstr "不能得到 %s 的大小" -#: packfile.c:630 +#: packfile.c:615 msgid "offset before end of packfile (broken .idx?)" msgstr "位移量在 packfile 結束之前（損壞的 .idx？）" -#: packfile.c:1900 +#: packfile.c:1907 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）" -#: packfile.c:1904 +#: packfile.c:1911 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）" @@ -5293,7 +5351,7 @@ msgstr "格式錯誤的到期時間：'%s'" msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" -#: parse-options-cb.c:130 parse-options-cb.c:147 +#: parse-options-cb.c:132 parse-options-cb.c:149 #, c-format msgid "malformed object name '%s'" msgstr "格式錯誤的物件名 '%s'" @@ -5338,31 +5396,31 @@ msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）" msgid "did you mean `--%s` (with two dashes)?" msgstr "你的意思是 `--%s`（有兩個短線）嗎？" -#: parse-options.c:663 parse-options.c:963 +#: parse-options.c:666 parse-options.c:971 #, c-format msgid "alias of --%s" msgstr "--%s 的別名" -#: parse-options.c:854 +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "未知選項 `%s'" -#: parse-options.c:856 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "未知開關 `%c'" -#: parse-options.c:858 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "字串中未知的非 ascii 字元選項：`%s'" -#: parse-options.c:882 +#: parse-options.c:890 msgid "..." msgstr "..." -#: parse-options.c:901 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "用法：%s" @@ -5370,18 +5428,18 @@ msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:907 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " 或：%s" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: parse-options.c:910 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:949 +#: parse-options.c:957 msgid "-NUM" msgstr "-數字" @@ -5516,7 +5574,7 @@ msgstr "協定錯誤：錯誤的行長度字串：%.4s" msgid "protocol error: bad line length %d" msgstr "協定錯誤：錯誤的行長度 %d" -#: pkt-line.c:373 +#: pkt-line.c:373 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "遠端錯誤：%s" @@ -5530,15 +5588,23 @@ msgstr "正在重新整理索引" msgid "unable to create threaded lstat: %s" msgstr "無法建立執行緒 lstat：%s" -#: pretty.c:982 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "遠端未設定 URL" +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "promisor-remote: 無法 fork fetch 子處理程序" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "promisor-remote: 無法寫入 fetch 子處理程序" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin" -#: promisor-remote.c:58 +#: promisor-remote.c:53 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 遠端名稱不能以 '/' 開始：%s" @@ -5555,7 +5621,7 @@ msgstr "不能啟動 `log`" msgid "could not read `log` output" msgstr "不能讀取 `log` 的輸出" -#: range-diff.c:98 sequencer.c:5143 +#: range-diff.c:98 sequencer.c:5310 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -5572,59 +5638,59 @@ msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s msgid "could not parse git header '%.*s'" msgstr "無法解析 git 頭 '%.*s'" -#: range-diff.c:301 +#: range-diff.c:299 msgid "failed to generate diff" msgstr "生成 diff 失敗" -#: range-diff.c:534 range-diff.c:536 +#: range-diff.c:532 range-diff.c:534 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日誌" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "不能在物件資料庫中建立空的資料物件" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s：只能新增一般檔案、符號連結或 git 目錄" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' 沒有檢出一個提交" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "無法索引檔案 '%s'" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "無法在索引中新增 '%s'" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "無法對 %s 執行 stat" -#: read-cache.c:1330 +#: read-cache.c:1318 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起來既是檔案又是目錄" -#: read-cache.c:1536 +#: read-cache.c:1524 msgid "Refresh index" msgstr "重新整理索引" -#: read-cache.c:1651 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5633,7 +5699,7 @@ msgstr "" "設定了 index.version，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1661 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5642,140 +5708,140 @@ msgstr "" "設定了 GIT_INDEX_VERSION，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1717 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "壞的簽名 0x%08x" -#: read-cache.c:1720 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "壞的索引版本 %d" -#: read-cache.c:1729 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "壞的索引檔案 sha1 簽名" -#: read-cache.c:1759 +#: read-cache.c:1747 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支援的 %.4s 擴展" # -#: read-cache.c:1761 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 擴展" -#: read-cache.c:1798 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引條目格式 0x%08x" -#: read-cache.c:1814 +#: read-cache.c:1802 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位" -#: read-cache.c:1871 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "索引中有未排序的暫存條目" -#: read-cache.c:1874 +#: read-cache.c:1862 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合併檔案 '%s' 有多個暫存條目" -#: read-cache.c:1877 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暫存條目" -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 -#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "索引檔案損壞" -#: read-cache.c:2124 +#: read-cache.c:2115 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "無法建立 load_cache_entries 執行緒：%s" -#: read-cache.c:2137 +#: read-cache.c:2128 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "無法加入 load_cache_entries 執行緒：%s" -#: read-cache.c:2170 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "%s：開啟索引檔案失敗" -#: read-cache.c:2174 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能對開啟的索引執行 stat 動作" -#: read-cache.c:2178 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引檔案比預期的小" -#: read-cache.c:2182 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "%s：無法對索引檔案執行 map 動作" -#: read-cache.c:2224 +#: read-cache.c:2215 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "無法建立 load_index_extensions 執行緒：%s" -#: read-cache.c:2251 +#: read-cache.c:2242 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "無法加入 load_index_extensions 執行緒：%s" -#: read-cache.c:2283 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "無法重新整理共享索引 '%s'" -#: read-cache.c:2330 +#: read-cache.c:2321 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 #, c-format msgid "could not close '%s'" msgstr "不能關閉 '%s'" -#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 #, c-format msgid "could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: read-cache.c:3142 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "不能開啟 git 目錄：%s" -#: read-cache.c:3154 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "無法刪除：%s" -#: read-cache.c:3179 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修復 '%s' 的權限位" -#: read-cache.c:3328 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暫存區 #0" @@ -5841,7 +5907,7 @@ msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "重定基底 %s 到 %s（%d 個提交）" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5849,7 +5915,7 @@ msgstr "" "\n" "不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5857,7 +5923,7 @@ msgstr "" "\n" "如果您在這裡刪除一行，對應的提交將會遺失。\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5871,7 +5937,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5881,14 +5947,14 @@ msgstr "" "然而，如果您刪除全部內容，重定基底動作將會終止。\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463 -#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607 +#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270 #, c-format msgid "could not write '%s'" msgstr "不能寫入 '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216 -#: builtin/rebase.c:240 +#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228 +#: builtin/rebase.c:252 #, c-format msgid "could not write '%s'." msgstr "不能寫入 '%s'。" @@ -5918,14 +5984,14 @@ msgstr "" "可選值有：ignore、warn、error。\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 -#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 -#: builtin/rebase.c:252 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394 +#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239 +#: builtin/rebase.c:264 #, c-format msgid "could not read '%s'." msgstr "不能讀取 '%s'。" -#: ref-filter.c:42 wt-status.c:1977 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "遺失" @@ -5944,237 +6010,232 @@ msgstr "落後 %d" msgid "ahead %d, behind %d" msgstr "領先 %d，落後 %d" -#: ref-filter.c:165 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "期望的格式：%%(color:<顏色>)" -#: ref-filter.c:167 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "無法識別的顏色：%%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "期望整數值 refname:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:197 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "期望整數值 refname:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "無法識別的 %%(%s) 參數：%s" -#: ref-filter.c:250 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) 不帶參數" -#: ref-filter.c:272 +#: ref-filter.c:276 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "無法識別的 %%(objectsize) 參數：%s" -#: ref-filter.c:280 +#: ref-filter.c:284 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) 不帶參數" -#: ref-filter.c:292 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) 不帶參數" -#: ref-filter.c:301 +#: ref-filter.c:309 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) 不帶參數" +msgid "unrecognized %%(subject) argument: %s" +msgstr "無法識別的 %%(subject) 引數：%s" -#: ref-filter.c:323 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "未知的 %%(trailers) 參數：%s" -#: ref-filter.c:352 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "期望一個正數 contents:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "無法識別的 %%(contents) 參數：%s" -#: ref-filter.c:369 +#: ref-filter.c:380 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "期望一個正數 objectname:short=%s" +msgid "positive value expected '%s' in %%(%s)" +msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值" -#: ref-filter.c:373 +#: ref-filter.c:384 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "無法識別的 %%(objectname) 參數：%s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數" -#: ref-filter.c:403 +#: ref-filter.c:398 +#, c-format +msgid "unrecognized email option: %s" +msgstr "無法識別的 email 選項：%s" + +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "期望的格式：%%(align:<寬度>,<位置>)" -#: ref-filter.c:415 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "無法識別的位置：%s" -#: ref-filter.c:422 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "無法識別的寬度：%s" -#: ref-filter.c:431 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "無法識別的 %%(align) 參數：%s" -#: ref-filter.c:439 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一個正數的寬度" -#: ref-filter.c:457 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "無法識別的 %%(if) 參數：%s" -#: ref-filter.c:559 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "格式錯誤的欄位名：%.*s" -#: ref-filter.c:586 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "未知的欄位名：%.*s" -#: ref-filter.c:590 +#: ref-filter.c:615 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料" -#: ref-filter.c:714 +#: ref-filter.c:739 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素" -#: ref-filter.c:777 +#: ref-filter.c:802 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素" -#: ref-filter.c:779 +#: ref-filter.c:804 #, c-format msgid "format: %%(then) atom used more than once" msgstr "格式：%%(then) 元素用了多次" -#: ref-filter.c:781 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "格式：%%(then) 元素用在了 %%(else) 之後" -#: ref-filter.c:809 +#: ref-filter.c:834 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素" -#: ref-filter.c:811 +#: ref-filter.c:836 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素" -#: ref-filter.c:813 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used more than once" msgstr "格式：%%(else) 元素用了多次" -#: ref-filter.c:828 +#: ref-filter.c:853 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素" -#: ref-filter.c:885 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "錯誤的格式化字串 %s" -#: ref-filter.c:1486 +#: ref-filter.c:1549 #, c-format msgid "no branch, rebasing %s" msgstr "非分支，正重定基底 %s" -#: ref-filter.c:1489 +#: ref-filter.c:1552 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "非分支，正重定基底分離開頭指標 %s" -#: ref-filter.c:1492 +#: ref-filter.c:1555 #, c-format msgid "no branch, bisect started on %s" msgstr "非分支，二分尋找開始於 %s" -#: ref-filter.c:1502 +#: ref-filter.c:1565 msgid "no branch" msgstr "非分支" -#: ref-filter.c:1538 ref-filter.c:1747 +#: ref-filter.c:1599 ref-filter.c:1808 #, c-format msgid "missing object %s for %s" msgstr "缺少 %2$s 的物件 %1$s" -#: ref-filter.c:1548 +#: ref-filter.c:1609 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s" -#: ref-filter.c:2001 +#: ref-filter.c:2062 #, c-format msgid "malformed object at '%s'" msgstr "格式錯誤的物件 '%s'" -#: ref-filter.c:2090 +#: ref-filter.c:2151 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略帶有錯誤名稱 %s 的引用" -#: ref-filter.c:2095 refs.c:657 +#: ref-filter.c:2156 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "忽略損壞的引用 %s" -#: ref-filter.c:2395 +#: ref-filter.c:2472 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:2495 -#, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "選項 `%s' 和 --merged 不相容" - -#: ref-filter.c:2498 -#, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "選項 `%s' 和 --no-merged 不相容" - -#: ref-filter.c:2508 +#: ref-filter.c:2571 #, c-format msgid "malformed object name %s" msgstr "格式錯誤的物件名 %s" -#: ref-filter.c:2513 +#: ref-filter.c:2576 #, c-format msgid "option `%s' must point to a commit" msgstr "選項 `%s' 必須指向一個提交" @@ -6184,172 +6245,159 @@ msgstr "選項 `%s' 必須指向一個提交" msgid "%s does not point to a valid object!" msgstr "%s 沒有指向一個有效的物件！" -#: refs.c:572 +#: refs.c:566 +#, c-format +msgid "" +"Using '%s' as the name for the initial branch. This default branch name\n" +"is subject to change. To configure the initial branch name to use in all\n" +"of your new repositories, which will suppress this warning, call:\n" +"\n" +"\tgit config --global init.defaultBranch <name>\n" +"\n" +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" +"'development'. The just-created branch can be renamed via this command:\n" +"\n" +"\tgit branch -m <name>\n" +msgstr "" +"將「%s」設定為初始分支的名稱。這個預設分支名稱可以變更。\n" +"如果要設定所有新版本庫要使用的初始分支名稱，\n" +"請呼叫（會隱藏這個警告）：\n" +"\n" +"\tgit config —global init.defaultBranch <name>\n" +"\n" +"除了 ‘master’ 外，常用的分支名稱有 ‘main’, ‘trunk’ 以及\n" +"‘development’。剛建立的分支可以用這個命令重新命名：\n" +"\n" +"\tgit branch -m <name>\n" + +#: refs.c:588 #, c-format msgid "could not retrieve `%s`" msgstr "無法擷取「%s」" -#: refs.c:579 +#: refs.c:598 #, c-format msgid "invalid branch name: %s = %s" msgstr "分支名稱無效：%s = %s" -#: refs.c:655 +#: refs.c:674 #, c-format msgid "ignoring dangling symref %s" msgstr "忽略懸空符號引用 %s" -#: refs.c:792 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "無法為寫入開啟 '%s'：%s" - -#: refs.c:802 refs.c:853 -#, c-format -msgid "could not read ref '%s'" -msgstr "無法讀取引用 '%s'" - -#: refs.c:808 -#, c-format -msgid "ref '%s' already exists" -msgstr "引用 '%s' 已經存在" - -#: refs.c:813 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "寫入 '%s' 時意外的物件 ID" - -#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168 -#: wrapper.c:628 -#, c-format -msgid "could not write to '%s'" -msgstr "不能寫入 '%s'" - -#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719 -#: builtin/rebase.c:852 -#, c-format -msgid "could not open '%s' for writing" -msgstr "無法開啟 '%s' 進行寫入" - -#: refs.c:855 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "刪除 '%s' 時意外的物件 ID" - -#: refs.c:986 +#: refs.c:911 #, c-format msgid "log for ref %s has gap after %s" msgstr "引用 %s 的日誌在 %s 之後有缺口" -#: refs.c:992 +#: refs.c:917 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "引用 %s 的日誌意外終止於 %s" -#: refs.c:1051 +#: refs.c:976 #, c-format msgid "log for %s is empty" msgstr "%s 的日誌為空" -#: refs.c:1143 +#: refs.c:1068 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "拒絕更新有錯誤名稱 '%s' 的引用" -#: refs.c:1219 +#: refs.c:1139 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "對引用 '%s' 執行 update_ref 失敗：%s" -#: refs.c:2011 +#: refs.c:1963 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "不允許對引用 '%s' 多次更新" -#: refs.c:2098 +#: refs.c:2043 msgid "ref updates forbidden inside quarantine environment" msgstr "在隔離環境中禁止更新引用" -#: refs.c:2109 +#: refs.c:2054 msgid "ref updates aborted by hook" msgstr "引用更新被掛鉤拒絕" -#: refs.c:2209 refs.c:2239 +#: refs.c:2154 refs.c:2184 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' 已存在，無法建立 '%s'" -#: refs.c:2215 refs.c:2250 +#: refs.c:2160 refs.c:2195 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "無法同時處理 '%s' 和 '%s'" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1228 #, c-format msgid "could not remove reference %s" msgstr "無法刪除引用 %s" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 #, c-format msgid "could not delete reference %s: %s" msgstr "無法刪除引用 %s：%s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 #, c-format msgid "could not delete references: %s" msgstr "無法刪除引用：%s" -#: refspec.c:137 +#: refspec.c:170 #, c-format msgid "invalid refspec '%s'" msgstr "無效的引用表達式：'%s'" -#: remote.c:355 +#: remote.c:351 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "設定的遠端短名稱不能以 '/' 開始：%s" -#: remote.c:403 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "提供了一個以上的 receivepack，使用第一個" -#: remote.c:411 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "提供了一個以上的 uploadpack，使用第一個" -#: remote.c:594 +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同時取得 %s 和 %s 至 %s" -#: remote.c:598 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常追蹤 %s，而非 %s" -#: remote.c:602 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同時追蹤 %s 和 %s" -#: remote.c:670 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "模式的鍵 '%s' 沒有 '*'" -#: remote.c:680 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "模式的值 '%s' 沒有 '*'" -#: remote.c:986 +#: remote.c:1073 #, c-format msgid "src refspec %s does not match any" msgstr "源引用表達式 %s 沒有符合" -#: remote.c:991 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "源引用表達式 %s 符合超過一個" @@ -6358,7 +6406,7 @@ msgstr "源引用表達式 %s 符合超過一個" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1006 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6380,7 +6428,7 @@ msgstr "" "\n" "都不行，所以我們已放棄。您必須給出完整的引用。" -#: remote.c:1026 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6390,7 +6438,7 @@ msgstr "" "引用表達式的 <src> 是一個提交物件。您是想建立一個新的分支而向\n" "'%s:refs/heads/%s' 推送嗎？" -#: remote.c:1031 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6400,7 +6448,7 @@ msgstr "" "引用表達式的 <src> 是一個標籤物件。您是想建立一個新的標籤而向\n" "'%s:refs/tags/%s' 推送嗎？" -#: remote.c:1036 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6410,7 +6458,7 @@ msgstr "" "引用表達式的 <src> 是一個樹狀物件。您是想為這個樹狀物件建立標籤而向\n" "'%s:refs/tags/%s' 推送嗎？" -#: remote.c:1041 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6420,113 +6468,113 @@ msgstr "" "引用表達式的 <src> 是一個資料物件。您是想為這個資料物件建立標籤而向\n" "'%s:refs/tags/%s' 推送嗎？" -#: remote.c:1077 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s 無法被解析為分支" -#: remote.c:1088 +#: remote.c:1175 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "無法刪除 '%s'：遠端引用不存在" -#: remote.c:1100 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "目標引用表達式 %s 符合超過一個" -#: remote.c:1107 +#: remote.c:1194 #, c-format msgid "dst ref %s receives from more than one src" msgstr "目標引用 %s 接收超過一個源" -#: remote.c:1610 remote.c:1711 +#: remote.c:1714 remote.c:1815 msgid "HEAD does not point to a branch" msgstr "HEAD 沒有指向一個分支" -#: remote.c:1619 +#: remote.c:1723 #, c-format msgid "no such branch: '%s'" msgstr "沒有此分支：'%s'" -#: remote.c:1622 +#: remote.c:1726 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未給分支 '%s' 設定上游" -#: remote.c:1628 +#: remote.c:1732 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支" -#: remote.c:1643 +#: remote.c:1747 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推送目標 '%s' 至遠端 '%s' 沒有本機追蹤分支" -#: remote.c:1655 +#: remote.c:1759 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 沒有設定要推送的遠端伺服器" -#: remote.c:1665 +#: remote.c:1769 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "向 '%s' 推送引用規格未包含 '%s'" -#: remote.c:1678 +#: remote.c:1782 msgid "push has no destination (push.default is 'nothing')" msgstr "推送無目標（push.default 是 'nothing'）" -#: remote.c:1700 +#: remote.c:1804 msgid "cannot resolve 'simple' push to a single destination" msgstr "無法解析 'simple' 推送至一個單獨的目標" -#: remote.c:1826 +#: remote.c:1933 #, c-format msgid "couldn't find remote ref %s" msgstr "無法找到遠端引用 %s" -#: remote.c:1839 +#: remote.c:1946 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* 在本機忽略可笑的引用 '%s'" -#: remote.c:2002 +#: remote.c:2109 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n" -#: remote.c:2006 +#: remote.c:2113 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n" -#: remote.c:2009 +#: remote.c:2116 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "您的分支與上游分支 '%s' 一致。\n" -#: remote.c:2013 +#: remote.c:2120 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "您的分支和 '%s' 指向不同的提交。\n" -#: remote.c:2016 +#: remote.c:2123 #, c-format msgid " (use \"%s\" for details)\n" msgstr " （使用 \"%s\" 檢視詳情）\n" -#: remote.c:2020 +#: remote.c:2127 #, 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:2026 +#: remote.c:2133 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 來發布您的本機提交）\n" -#: remote.c:2029 +#: remote.c:2136 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6534,11 +6582,11 @@ msgid_plural "" msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n" # 譯者：請維持前導空格 -#: remote.c:2037 +#: remote.c:2144 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 來更新您的本機分支）\n" -#: remote.c:2040 +#: remote.c:2147 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6551,11 +6599,11 @@ msgstr[0] "" "並且分別有 %d 和 %d 處不同的提交。\n" # 譯者：請維持前導空格 -#: remote.c:2050 +#: remote.c:2157 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 來合併遠端分支）\n" -#: remote.c:2241 +#: remote.c:2349 #, c-format msgid "cannot parse expected object name '%s'" msgstr "無法解析期望的物件名 '%s'" @@ -6575,11 +6623,6 @@ msgstr "重複的取代引用：%s" msgid "replace depth too high for object %s" msgstr "物件 %s 的取代層級太深" -#: repository.c:94 builtin/init-db.c:188 -#, c-format -msgid "The hash algorithm %s is not supported in this build." -msgstr "此組建不支援 %s 雜湊算法。" - #: rerere.c:217 rerere.c:226 rerere.c:229 msgid "corrupt MERGE_RR" msgstr "損壞的 MERGE_RR" @@ -6638,8 +6681,8 @@ msgstr "不能刪除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "為 '%s' 記錄 preimage" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1992 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "不能建立目錄 '%s'" @@ -6677,38 +6720,43 @@ msgstr "不能開啟 rr-cache 目錄" msgid "could not determine HEAD revision" msgstr "不能確定 HEAD 版本" -#: reset.c:70 reset.c:76 sequencer.c:3318 +#: reset.c:70 reset.c:76 sequencer.c:3460 #, c-format msgid "failed to find tree of %s" msgstr "無法找到 %s 指向的樹" -#: revision.c:2661 +#: revision.c:2336 +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<packfile> 已不受支援" + +#: revision.c:2356 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "--diff-merges 的值無效：%s" + +#: revision.c:2694 msgid "your current branch appears to be broken" msgstr "您的目前分支好像被損壞" -#: revision.c:2664 +#: revision.c:2697 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的目前分支 '%s' 尚無任何提交" -#: revision.c:2873 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent 與 --bisect 不相容" - -#: revision.c:2877 +#: revision.c:2907 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L 尚不支援 -p 和 -s 之外的差異格式" -#: run-command.c:763 +#: run-command.c:764 msgid "open /dev/null failed" msgstr "不能開啟 /dev/null" -#: run-command.c:1269 +#: run-command.c:1271 #, c-format msgid "cannot create async thread: %s" msgstr "不能建立 async 執行緒：%s" -#: run-command.c:1333 +#: run-command.c:1335 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6717,79 +6765,79 @@ msgstr "" "因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n" "設定 `git config advice.ignoredHook false` 來關閉這條警告。" -#: send-pack.c:145 +#: send-pack.c:146 msgid "unexpected flush packet while reading remote unpack status" msgstr "讀取遠端解包狀態時收到意外的 flush 包" -#: send-pack.c:147 +#: send-pack.c:148 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "不能解析遠端解包狀態：%s" -#: send-pack.c:149 +#: send-pack.c:150 #, c-format msgid "remote unpack failed: %s" msgstr "遠端解包失敗：%s" -#: send-pack.c:308 +#: send-pack.c:374 msgid "failed to sign the push certificate" msgstr "為推送證書籤名失敗" -#: send-pack.c:394 +#: send-pack.c:467 msgid "the receiving end does not support this repository's hash algorithm" msgstr "接收端不支援此版本庫的雜湊算法" -#: send-pack.c:403 +#: send-pack.c:476 msgid "the receiving end does not support --signed push" msgstr "接收端不支援簽名推送" -#: send-pack.c:405 +#: send-pack.c:478 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "未傳送推送證書，因為接收端不支援簽名推送" -#: send-pack.c:417 +#: send-pack.c:490 msgid "the receiving end does not support --atomic push" msgstr "接收端不支援原子推送" -#: send-pack.c:422 +#: send-pack.c:495 msgid "the receiving end does not support push options" msgstr "接收端不支援推送選項" -#: sequencer.c:192 +#: sequencer.c:195 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "無效的提交訊息清理模式 '%s'" -#: sequencer.c:297 +#: sequencer.c:323 #, c-format msgid "could not delete '%s'" msgstr "無法刪除 '%s'" -#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385 +#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "無法刪除 '%s'" -#: sequencer.c:326 +#: sequencer.c:353 msgid "revert" msgstr "復原" -#: sequencer.c:328 +#: sequencer.c:355 msgid "cherry-pick" msgstr "摘取" -#: sequencer.c:330 +#: sequencer.c:357 msgid "rebase" msgstr "rebase" -#: sequencer.c:332 +#: sequencer.c:359 #, c-format msgid "unknown action: %d" msgstr "未知動作：%d" -#: sequencer.c:390 +#: sequencer.c:418 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6797,7 +6845,7 @@ msgstr "" "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" "指令標記修正後的檔案" -#: sequencer.c:393 +#: sequencer.c:421 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6806,43 +6854,43 @@ msgstr "" "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" "對修正後的檔案做標記，然後用 'git commit' 提交" -#: sequencer.c:406 sequencer.c:2921 +#: sequencer.c:434 sequencer.c:3062 #, c-format msgid "could not lock '%s'" msgstr "不能鎖定 '%s'" -#: sequencer.c:413 +#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080 +#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "不能寫入 '%s'" + +#: sequencer.c:441 #, c-format msgid "could not write eol to '%s'" msgstr "不能將換行符號寫入 '%s'" -#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 -#: sequencer.c:3203 +#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082 +#: sequencer.c:3345 #, c-format msgid "failed to finalize '%s'" msgstr "無法完成 '%s'" -#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 -#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 -#, c-format -msgid "could not read '%s'" -msgstr "不能讀取 '%s'" - -#: sequencer.c:457 +#: sequencer.c:485 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本機修改將被%s覆蓋。" -#: sequencer.c:461 +#: sequencer.c:489 msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或儲藏後再繼續。" -#: sequencer.c:493 +#: sequencer.c:521 #, c-format msgid "%s: fast-forward" msgstr "%s：快轉" -#: sequencer.c:532 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "無效的清理模式 %s" @@ -6850,65 +6898,65 @@ msgstr "無效的清理模式 %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:626 +#: sequencer.c:670 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：無法寫入新索引檔案" -#: sequencer.c:643 +#: sequencer.c:687 msgid "unable to update cache tree" msgstr "不能更新快取樹" -#: sequencer.c:657 +#: sequencer.c:701 msgid "could not resolve HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:737 +#: sequencer.c:781 #, c-format msgid "no key present in '%.*s'" msgstr "在 '%.*s' 中沒有 key" -#: sequencer.c:748 +#: sequencer.c:792 #, c-format msgid "unable to dequote value of '%s'" msgstr "無法為 '%s' 的值去引號" -#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 +#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908 #, c-format msgid "could not open '%s' for reading" msgstr "無法開啟 '%s' 進行讀取" -#: sequencer.c:795 +#: sequencer.c:839 msgid "'GIT_AUTHOR_NAME' already given" msgstr "已經給出 'GIT_AUTHOR_NAME'" -#: sequencer.c:800 +#: sequencer.c:844 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "已經給出 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:805 +#: sequencer.c:849 msgid "'GIT_AUTHOR_DATE' already given" msgstr "已經給出 'GIT_AUTHOR_DATE'" -#: sequencer.c:809 +#: sequencer.c:853 #, c-format msgid "unknown variable '%s'" msgstr "未知變數 '%s'" -#: sequencer.c:814 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "缺少 'GIT_AUTHOR_NAME'" -#: sequencer.c:816 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "缺少 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:818 +#: sequencer.c:862 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "缺少 'GIT_AUTHOR_DATE'" -#: sequencer.c:867 +#: sequencer.c:927 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6937,11 +6985,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1141 +#: sequencer.c:1208 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 掛鉤失敗" -#: sequencer.c:1147 +#: sequencer.c:1214 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6965,7 +7013,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1160 +#: sequencer.c:1227 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6988,330 +7036,339 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1202 +#: sequencer.c:1269 msgid "couldn't look up newly created commit" msgstr "無法找到新建立的提交" -#: sequencer.c:1204 +#: sequencer.c:1271 msgid "could not parse newly created commit" msgstr "不能解析新建立的提交" -#: sequencer.c:1250 +#: sequencer.c:1317 msgid "unable to resolve HEAD after creating commit" msgstr "建立提交後，不能解析 HEAD" -#: sequencer.c:1252 +#: sequencer.c:1319 msgid "detached HEAD" msgstr "分離 HEAD" # 譯者：中文字串拼接，可刪除前導空格 -#: sequencer.c:1256 +#: sequencer.c:1323 msgid " (root-commit)" msgstr " (根提交)" -#: sequencer.c:1277 +#: sequencer.c:1344 msgid "could not parse HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1279 +#: sequencer.c:1346 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一個提交！" -#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:1335 sequencer.c:1980 +#: sequencer.c:1403 sequencer.c:2100 msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 msgid "git write-tree failed to write a tree" msgstr "git write-tree 無法寫入樹狀物件" -#: sequencer.c:1379 sequencer.c:1450 +#: sequencer.c:1447 sequencer.c:1565 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能從 '%s' 讀取提交說明" -#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 -#: builtin/merge.c:919 +#: sequencer.c:1476 sequencer.c:1508 +#, c-format +msgid "invalid author identity '%s'" +msgstr "無效的作者身分 '%s'" + +#: sequencer.c:1482 +msgid "corrupt author: missing date information" +msgstr "作者資訊損壞：缺少日期資訊" + +#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904 +#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "寫提交物件失敗" -#: sequencer.c:1433 sequencer.c:4118 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:1481 +#: sequencer.c:1597 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" -#: sequencer.c:1486 +#: sequencer.c:1602 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" -#: sequencer.c:1569 sequencer.c:1680 +#: sequencer.c:1685 sequencer.c:1796 #, c-format msgid "unknown command: %d" msgstr "未知指令：%d" -#: sequencer.c:1627 sequencer.c:1652 +#: sequencer.c:1743 sequencer.c:1768 #, c-format msgid "This is a combination of %d commits." msgstr "這是一個 %d 個提交的組合。" -#: sequencer.c:1637 +#: sequencer.c:1753 msgid "need a HEAD to fixup" msgstr "需要一個 HEAD 來修復" -#: sequencer.c:1639 sequencer.c:3230 +#: sequencer.c:1755 sequencer.c:3372 msgid "could not read HEAD" msgstr "不能讀取 HEAD" -#: sequencer.c:1641 +#: sequencer.c:1757 msgid "could not read HEAD's commit message" msgstr "不能讀取 HEAD 的提交說明" -#: sequencer.c:1647 +#: sequencer.c:1763 #, c-format msgid "cannot write '%s'" msgstr "不能寫 '%s'" -#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "這是第一個提交說明：" -#: sequencer.c:1662 +#: sequencer.c:1778 #, c-format msgid "could not read commit message of %s" msgstr "不能讀取 %s 的提交說明" -#: sequencer.c:1669 +#: sequencer.c:1785 #, c-format msgid "This is the commit message #%d:" msgstr "這是提交說明 #%d：" -#: sequencer.c:1675 +#: sequencer.c:1791 #, c-format msgid "The commit message #%d will be skipped:" msgstr "提交說明 #%d 將被跳過：" -#: sequencer.c:1763 +#: sequencer.c:1879 msgid "your index file is unmerged." msgstr "您的索引檔案未完成合併。" -#: sequencer.c:1770 +#: sequencer.c:1886 msgid "cannot fixup root commit" msgstr "不能修復根提交" -#: sequencer.c:1789 +#: sequencer.c:1905 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一個合併提交但未提供 -m 選項。" -#: sequencer.c:1797 sequencer.c:1805 +#: sequencer.c:1913 sequencer.c:1921 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 沒有第 %d 個父提交" -#: sequencer.c:1811 +#: sequencer.c:1927 #, 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:1830 +#: sequencer.c:1946 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:1895 +#: sequencer.c:2011 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能將 '%s' 重新命名為 '%s'" -#: sequencer.c:1952 +#: sequencer.c:2071 #, c-format msgid "could not revert %s... %s" msgstr "不能還原 %s... %s" -#: sequencer.c:1953 +#: sequencer.c:2072 #, c-format msgid "could not apply %s... %s" msgstr "不能應用 %s... %s" -#: sequencer.c:1972 +#: sequencer.c:2092 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n" -#: sequencer.c:2030 +#: sequencer.c:2150 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：無法讀取索引" -#: sequencer.c:2037 +#: sequencer.c:2157 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：無法重新整理索引" -#: sequencer.c:2114 +#: sequencer.c:2234 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受參數：'%s'" -#: sequencer.c:2123 +#: sequencer.c:2243 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的參數" -#: sequencer.c:2154 +#: sequencer.c:2274 #, c-format msgid "could not parse '%s'" msgstr "無法解析 '%s'" -#: sequencer.c:2215 +#: sequencer.c:2335 #, c-format msgid "invalid line %d: %.*s" msgstr "無效行 %d：%.*s" -#: sequencer.c:2226 +#: sequencer.c:2346 #, c-format msgid "cannot '%s' without a previous commit" msgstr "沒有父提交的情況下不能 '%s'" -#: sequencer.c:2310 +#: sequencer.c:2432 msgid "cancelling a cherry picking in progress" msgstr "正在取消一個進行中的揀選" -#: sequencer.c:2317 +#: sequencer.c:2441 msgid "cancelling a revert in progress" msgstr "正在取消一個進行中的還原" -#: sequencer.c:2361 +#: sequencer.c:2485 msgid "please fix this using 'git rebase --edit-todo'." msgstr "請用 'git rebase --edit-todo' 來修改。" -#: sequencer.c:2363 +#: sequencer.c:2487 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清單：'%s'" -#: sequencer.c:2368 +#: sequencer.c:2492 msgid "no commits parsed." msgstr "沒有解析提交。" -#: sequencer.c:2379 +#: sequencer.c:2503 msgid "cannot cherry-pick during a revert." msgstr "不能在還原提交中執行揀選。" -#: sequencer.c:2381 +#: sequencer.c:2505 msgid "cannot revert during a cherry-pick." msgstr "不能在揀選中執行還原提交。" -#: sequencer.c:2459 +#: sequencer.c:2583 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值無效：%s" -#: sequencer.c:2556 +#: sequencer.c:2690 msgid "unusable squash-onto" msgstr "不可用的 squash-onto" -#: sequencer.c:2576 +#: sequencer.c:2710 #, c-format msgid "malformed options sheet: '%s'" msgstr "格式錯誤的選項清單：'%s'" -#: sequencer.c:2664 sequencer.c:4469 +#: sequencer.c:2803 sequencer.c:4636 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:2680 +#: sequencer.c:2820 msgid "revert is already in progress" msgstr "一個還原動作已在進行" -#: sequencer.c:2682 +#: sequencer.c:2822 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2685 +#: sequencer.c:2825 msgid "cherry-pick is already in progress" msgstr "揀選動作已在進行" -#: sequencer.c:2687 +#: sequencer.c:2827 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2701 +#: sequencer.c:2841 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能建立序列目錄 '%s'" -#: sequencer.c:2716 +#: sequencer.c:2856 msgid "could not lock HEAD" msgstr "不能鎖定 HEAD" -#: sequencer.c:2776 sequencer.c:4206 +#: sequencer.c:2916 sequencer.c:4371 msgid "no cherry-pick or revert in progress" msgstr "揀選或還原動作並未進行" -#: sequencer.c:2778 sequencer.c:2789 +#: sequencer.c:2918 sequencer.c:2929 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:2780 sequencer.c:2824 +#: sequencer.c:2920 sequencer.c:2964 msgid "cannot abort from a branch yet to be born" msgstr "不能從尚未建立的分支終止" -#: sequencer.c:2810 builtin/grep.c:744 +#: sequencer.c:2950 builtin/grep.c:756 #, c-format msgid "cannot open '%s'" msgstr "不能開啟 '%s'" -#: sequencer.c:2812 +#: sequencer.c:2952 #, c-format msgid "cannot read '%s': %s" msgstr "不能讀取 '%s'：%s" -#: sequencer.c:2813 +#: sequencer.c:2953 msgid "unexpected end of file" msgstr "意外的檔案結束" -#: sequencer.c:2819 +#: sequencer.c:2959 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞" -#: sequencer.c:2830 +#: sequencer.c:2970 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！" -#: sequencer.c:2871 +#: sequencer.c:3011 msgid "no revert in progress" msgstr "沒有正在進行的還原" -#: sequencer.c:2879 +#: sequencer.c:3020 msgid "no cherry-pick in progress" msgstr "沒有正在進行的揀選" -#: sequencer.c:2889 +#: sequencer.c:3030 msgid "failed to skip the commit" msgstr "無法跳過這個提交" -#: sequencer.c:2896 +#: sequencer.c:3037 msgid "there is nothing to skip" msgstr "沒有要跳過的" -#: sequencer.c:2899 +#: sequencer.c:3040 #, c-format msgid "" "have you committed already?\n" @@ -7320,16 +7377,16 @@ msgstr "" "您已經提交了嗎？\n" "試試 \"git %s --continue\"" -#: sequencer.c:3060 sequencer.c:4098 +#: sequencer.c:3202 sequencer.c:4263 msgid "cannot read HEAD" msgstr "不能讀取 HEAD" -#: sequencer.c:3077 +#: sequencer.c:3219 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "無法複製 '%s' 至 '%s'" -#: sequencer.c:3085 +#: sequencer.c:3227 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7348,28 +7405,28 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3095 +#: sequencer.c:3237 #, c-format msgid "Could not apply %s... %.*s" msgstr "不能應用 %s... %.*s" -#: sequencer.c:3102 +#: sequencer.c:3244 #, c-format msgid "Could not merge %.*s" msgstr "不能合併 %.*s" -#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641 +#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能複製 '%s' 至 '%s'" -#: sequencer.c:3132 +#: sequencer.c:3274 #, c-format msgid "Executing: %s\n" msgstr "執行：%s\n" # 譯者：請維持前導空格 -#: sequencer.c:3147 +#: sequencer.c:3289 #, c-format msgid "" "execution failed: %s\n" @@ -7384,11 +7441,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3153 +#: sequencer.c:3295 msgid "and made changes to the index and/or the working tree\n" msgstr "並且修改索引和/或工作區\n" -#: sequencer.c:3159 +#: sequencer.c:3301 #, c-format msgid "" "execution succeeded: %s\n" @@ -7405,90 +7462,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3220 +#: sequencer.c:3362 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的標籤名稱：'%.*s'" -#: sequencer.c:3274 +#: sequencer.c:3416 msgid "writing fake root commit" msgstr "寫偽根提交" -#: sequencer.c:3279 +#: sequencer.c:3421 msgid "writing squash-onto" msgstr "寫入 squash-onto" -#: sequencer.c:3363 +#: sequencer.c:3505 #, c-format msgid "could not resolve '%s'" msgstr "無法解析 '%s'" -#: sequencer.c:3394 +#: sequencer.c:3538 msgid "cannot merge without a current revision" msgstr "沒有目前版本不能合併" -#: sequencer.c:3416 +#: sequencer.c:3560 #, c-format msgid "unable to parse '%.*s'" msgstr "無法解析 '%.*s'" -#: sequencer.c:3425 +#: sequencer.c:3569 #, c-format msgid "nothing to merge: '%.*s'" msgstr "無可用合併：'%.*s'" -#: sequencer.c:3437 +#: sequencer.c:3581 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章魚合並不能在一個新的根提交上執行" -#: sequencer.c:3453 +#: sequencer.c:3597 #, c-format msgid "could not get commit message of '%s'" msgstr "不能取得 '%s' 的提交說明" -#: sequencer.c:3613 +#: sequencer.c:3780 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能嘗試合併 '%.*s'" -#: sequencer.c:3629 +#: sequencer.c:3796 msgid "merge: Unable to write new index file" msgstr "合併：無法寫入新索引檔案" -#: sequencer.c:3703 +#: sequencer.c:3870 msgid "Cannot autostash" msgstr "無法 autostash" -#: sequencer.c:3706 +#: sequencer.c:3873 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的 stash 回應：'%s'" -#: sequencer.c:3712 +#: sequencer.c:3879 #, c-format msgid "Could not create directory for '%s'" msgstr "不能為 '%s' 建立目錄" -#: sequencer.c:3715 +#: sequencer.c:3882 #, c-format msgid "Created autostash: %s\n" msgstr "建立了 autostash：%s\n" -#: sequencer.c:3719 +#: sequencer.c:3886 msgid "could not reset --hard" msgstr "無法 reset --hard" -#: sequencer.c:3744 +#: sequencer.c:3911 #, c-format msgid "Applied autostash.\n" msgstr "已應用 autostash。\n" -#: sequencer.c:3756 +#: sequencer.c:3923 #, c-format msgid "cannot store %s" msgstr "不能儲存 %s" -#: sequencer.c:3759 +#: sequencer.c:3926 #, c-format msgid "" "%s\n" @@ -7499,34 +7556,29 @@ msgstr "" "您的修改安全地儲存在儲藏區中。\n" "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:3764 +#: sequencer.c:3931 msgid "Applying autostash resulted in conflicts." msgstr "因套用自動儲藏而導致衝突。" -#: sequencer.c:3765 +#: sequencer.c:3932 msgid "Autostash exists; creating a new stash entry." msgstr "已有自動儲藏；建立新儲藏項目。" -#: sequencer.c:3857 -#, c-format -msgid "%s: not a valid OID" -msgstr "%s：不是一個有效的物件 ID" - -#: sequencer.c:3862 git-rebase--preserve-merges.sh:779 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "不能分離開頭指標" -#: sequencer.c:3877 +#: sequencer.c:4040 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:3879 +#: sequencer.c:4042 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:3887 +#: sequencer.c:4050 #, c-format msgid "" "Could not execute the todo command\n" @@ -7546,58 +7598,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3931 +#: sequencer.c:4096 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "正在重定基底 (%d/%d)%s" -#: sequencer.c:3976 +#: sequencer.c:4141 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:4047 +#: sequencer.c:4212 #, c-format msgid "unknown command %d" msgstr "未知指令 %d" -#: sequencer.c:4106 +#: sequencer.c:4271 msgid "could not read orig-head" msgstr "不能讀取 orig-head" -#: sequencer.c:4111 +#: sequencer.c:4276 msgid "could not read 'onto'" msgstr "不能讀取 'onto'" -#: sequencer.c:4125 +#: sequencer.c:4290 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 為 %s" -#: sequencer.c:4185 +#: sequencer.c:4350 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "成功重定基底並更新 %s。\n" -#: sequencer.c:4218 +#: sequencer.c:4383 msgid "cannot rebase: You have unstaged changes." msgstr "不能重定基底：您有未暫存的變更。" -#: sequencer.c:4227 +#: sequencer.c:4392 msgid "cannot amend non-existing commit" msgstr "不能修補不存在的提交" -#: sequencer.c:4229 +#: sequencer.c:4394 #, c-format msgid "invalid file: '%s'" msgstr "無效檔案：'%s'" -#: sequencer.c:4231 +#: sequencer.c:4396 #, c-format msgid "invalid contents: '%s'" msgstr "無效內容：'%s'" -#: sequencer.c:4234 +#: sequencer.c:4399 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7606,50 +7658,50 @@ msgstr "" "\n" "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" -#: sequencer.c:4270 sequencer.c:4309 +#: sequencer.c:4435 sequencer.c:4474 #, c-format msgid "could not write file: '%s'" msgstr "不能寫入檔案：'%s'" -#: sequencer.c:4324 +#: sequencer.c:4490 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能刪除 CHERRY_PICK_HEAD" -#: sequencer.c:4331 +#: sequencer.c:4497 msgid "could not commit staged changes." msgstr "不能提交暫存的修改。" -#: sequencer.c:4446 +#: sequencer.c:4613 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能揀選一個%s" -#: sequencer.c:4450 +#: sequencer.c:4617 #, c-format msgid "%s: bad revision" msgstr "%s：錯誤的版本" -#: sequencer.c:4485 +#: sequencer.c:4652 msgid "can't revert as initial commit" msgstr "不能作為初始提交還原提交" -#: sequencer.c:4962 +#: sequencer.c:5129 msgid "make_script: unhandled options" msgstr "make_script：有未能處理的選項" -#: sequencer.c:4965 +#: sequencer.c:5132 msgid "make_script: error preparing revisions" msgstr "make_script：準備版本時錯誤" -#: sequencer.c:5206 sequencer.c:5223 +#: sequencer.c:5374 sequencer.c:5391 msgid "nothing to do" msgstr "無事可做" -#: sequencer.c:5242 +#: sequencer.c:5410 msgid "could not skip unnecessary pick commands" msgstr "無法跳過不必要的揀選" -#: sequencer.c:5336 +#: sequencer.c:5504 msgid "the script was already rearranged." msgstr "腳本已經重新編排。" @@ -7702,84 +7754,88 @@ msgstr "無法使用無效設定來建立工作區" msgid "this operation must be run in a work tree" msgstr "該動作必須在一個工作區中執行" -#: setup.c:604 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 版本庫版本 <= %d，卻得到 %d" -#: setup.c:612 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "發現未知的版本庫擴展：" -#: setup.c:631 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "repo 的版本是 0，但找到只支援 v1 的擴充元件：" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "開啟 '%s' 發生錯誤" -#: setup.c:633 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "檔案太大，無法作為 .git 檔案：'%s'" -#: setup.c:635 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "讀取 %s 發生錯誤" -#: setup.c:637 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "無效的 gitfile 格式：%s" -#: setup.c:639 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中沒有路徑：%s" -#: setup.c:641 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "不是一個 git 版本庫：%s" -#: setup.c:743 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:757 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "不是一個 git 版本庫：'%s'" -#: setup.c:786 setup.c:788 setup.c:819 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切換目錄到 '%s'" -#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "無法返回目前工作目錄" -#: setup.c:918 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "取得 '%*s%s%s' 狀態（stat）失敗" -#: setup.c:1156 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "不能讀取目前工作目錄" -#: setup.c:1165 setup.c:1171 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "不能切換到 '%s'" -#: setup.c:1176 +#: setup.c:1245 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "不是一個 git 版本庫（或者任何父目錄）：%s" -#: setup.c:1182 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7788,7 +7844,7 @@ msgstr "" "不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n" "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1293 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7797,268 +7853,268 @@ msgstr "" "參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n" "檔案所有者必須始終擁有讀寫權限。" -#: setup.c:1340 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "不能開啟或者複製 /dev/null" -#: setup.c:1355 +#: setup.c:1424 msgid "fork failed" msgstr "fork 失敗" -#: setup.c:1360 +#: setup.c:1429 msgid "setsid failed" msgstr "setsid 失敗" -#: sha1-file.c:470 +#: sha1-file.c:480 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates" -#: sha1-file.c:521 +#: sha1-file.c:531 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "無法規範化備用物件路徑：%s" -#: sha1-file.c:593 +#: sha1-file.c:603 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略備用物件庫，嵌套太深" -#: sha1-file.c:600 +#: sha1-file.c:610 #, c-format msgid "unable to normalize object directory: %s" msgstr "無法規範化物件目錄: %s" -#: sha1-file.c:643 +#: sha1-file.c:653 msgid "unable to fdopen alternates lockfile" msgstr "無法 fdopen 取代鎖檔案" -#: sha1-file.c:661 +#: sha1-file.c:671 msgid "unable to read alternates file" msgstr "無法讀取替代檔案" -#: sha1-file.c:668 +#: sha1-file.c:678 msgid "unable to move new alternates file into place" msgstr "無法將新的替代檔案移動到位" -#: sha1-file.c:703 +#: sha1-file.c:713 #, c-format msgid "path '%s' does not exist" msgstr "路徑 '%s' 不存在" -#: sha1-file.c:724 +#: sha1-file.c:734 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支援將參考版本庫 '%s' 作為一個連結檢出。" -#: sha1-file.c:730 +#: sha1-file.c:740 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "參考版本庫 '%s' 不是一個本機版本庫。" -#: sha1-file.c:736 +#: sha1-file.c:746 #, c-format msgid "reference repository '%s' is shallow" msgstr "參考版本庫 '%s' 是一個淺複製" -#: sha1-file.c:744 +#: sha1-file.c:754 #, c-format msgid "reference repository '%s' is grafted" msgstr "參考版本庫 '%s' 已被移植" -#: sha1-file.c:804 +#: sha1-file.c:814 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析備用引用時無效的行：%s" -#: sha1-file.c:954 +#: sha1-file.c:964 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>" -#: sha1-file.c:975 +#: sha1-file.c:985 msgid "mmap failed" msgstr "mmap 失敗" -#: sha1-file.c:1139 +#: sha1-file.c:1149 #, c-format msgid "object file %s is empty" msgstr "物件檔案 %s 為空" -#: sha1-file.c:1274 sha1-file.c:2454 +#: sha1-file.c:1284 sha1-file.c:2477 #, c-format msgid "corrupt loose object '%s'" msgstr "損壞的鬆散物件 '%s'" -#: sha1-file.c:1276 sha1-file.c:2458 +#: sha1-file.c:1286 sha1-file.c:2481 #, c-format msgid "garbage at end of loose object '%s'" msgstr "鬆散物件 '%s' 後面有垃圾資料" -#: sha1-file.c:1318 +#: sha1-file.c:1328 msgid "invalid object type" msgstr "無效的物件類型" -#: sha1-file.c:1402 +#: sha1-file.c:1412 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息" -#: sha1-file.c:1405 +#: sha1-file.c:1415 #, c-format msgid "unable to unpack %s header" msgstr "無法解開 %s 頭部" -#: sha1-file.c:1411 +#: sha1-file.c:1421 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息" -#: sha1-file.c:1414 +#: sha1-file.c:1424 #, c-format msgid "unable to parse %s header" msgstr "無法解析 %s 頭部" -#: sha1-file.c:1640 +#: sha1-file.c:1651 #, c-format msgid "failed to read object %s" msgstr "讀取物件 %s 失敗" -#: sha1-file.c:1644 +#: sha1-file.c:1655 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: sha1-file.c:1648 +#: sha1-file.c:1659 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "鬆散物件 %s（儲存在 %s）已損壞" -#: sha1-file.c:1652 +#: sha1-file.c:1663 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包物件 %s（儲存在 %s）已損壞" -#: sha1-file.c:1757 +#: sha1-file.c:1768 #, c-format msgid "unable to write file %s" msgstr "無法寫檔案 %s" -#: sha1-file.c:1764 +#: sha1-file.c:1775 #, c-format msgid "unable to set permission to '%s'" msgstr "無法為 '%s' 設定權限" -#: sha1-file.c:1771 +#: sha1-file.c:1782 msgid "file write error" msgstr "檔案寫錯誤" -#: sha1-file.c:1791 +#: sha1-file.c:1802 msgid "error when closing loose object file" msgstr "關閉鬆散物件檔案時發生錯誤" -#: sha1-file.c:1856 +#: sha1-file.c:1867 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件" -#: sha1-file.c:1858 +#: sha1-file.c:1869 msgid "unable to create temporary file" msgstr "無法建立暫存檔" -#: sha1-file.c:1882 +#: sha1-file.c:1893 msgid "unable to write loose object file" msgstr "不能寫鬆散物件檔案" -#: sha1-file.c:1888 +#: sha1-file.c:1899 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能壓縮新物件 %s（%d）" -#: sha1-file.c:1892 +#: sha1-file.c:1903 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）" -#: sha1-file.c:1896 +#: sha1-file.c:1907 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不穩定物件源資料搞糊塗了" -#: sha1-file.c:1906 builtin/pack-objects.c:1085 +#: sha1-file.c:1917 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上呼叫 utime() 失敗" -#: sha1-file.c:1983 +#: sha1-file.c:1994 #, c-format msgid "cannot read object for %s" msgstr "不能讀取物件 %s" -#: sha1-file.c:2022 +#: sha1-file.c:2045 msgid "corrupt commit" msgstr "損壞的提交" -#: sha1-file.c:2030 +#: sha1-file.c:2053 msgid "corrupt tag" msgstr "損壞的標籤" -#: sha1-file.c:2130 +#: sha1-file.c:2153 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 時讀取錯誤" -#: sha1-file.c:2133 +#: sha1-file.c:2156 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 時讀入不完整" -#: sha1-file.c:2206 sha1-file.c:2216 +#: sha1-file.c:2229 sha1-file.c:2239 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入資料庫失敗" -#: sha1-file.c:2222 +#: sha1-file.c:2245 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支援的檔案類型" -#: sha1-file.c:2246 +#: sha1-file.c:2269 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一個有效的物件" -#: sha1-file.c:2248 +#: sha1-file.c:2271 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一個有效的 '%s' 物件" -#: sha1-file.c:2275 builtin/index-pack.c:155 +#: sha1-file.c:2298 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "不能開啟 %s" -#: sha1-file.c:2465 sha1-file.c:2518 +#: sha1-file.c:2488 sha1-file.c:2541 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的雜湊值不符合（預期 %s）" -#: sha1-file.c:2489 +#: sha1-file.c:2512 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: sha1-file.c:2494 +#: sha1-file.c:2517 #, c-format msgid "unable to unpack header of %s" msgstr "無法解壓縮 %s 的頭部" -#: sha1-file.c:2500 +#: sha1-file.c:2523 #, c-format msgid "unable to parse header of %s" msgstr "無法解析 %s 的頭部" -#: sha1-file.c:2511 +#: sha1-file.c:2534 #, c-format msgid "unable to unpack contents of %s" msgstr "無法解壓縮 %s 的內容" @@ -8104,12 +8160,12 @@ msgstr "'%.*s' 的日誌只能回到 %s" msgid "log for '%.*s' only has %d entries" msgstr "'%.*s' 的日誌只有 %d 個項目" -#: sha1-name.c:1689 +#: sha1-name.c:1702 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'" -#: sha1-name.c:1695 +#: sha1-name.c:1708 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -8118,12 +8174,12 @@ msgstr "" "'%s' 路徑存在，但不是 '%s'\n" "提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？" -#: sha1-name.c:1704 +#: sha1-name.c:1717 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "'%s' 路徑不存在於 '%.*s'" -#: sha1-name.c:1732 +#: sha1-name.c:1745 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -8132,7 +8188,7 @@ msgstr "" "'%s' 路徑在索引，但不在 %d 暫存區\n" "提示：你在說 ':%d:%s' 嗎？" -#: sha1-name.c:1748 +#: sha1-name.c:1761 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -8141,21 +8197,21 @@ msgstr "" "'%s' 路徑在索引，但不是 '%s'\n" "提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？" -#: sha1-name.c:1756 +#: sha1-name.c:1769 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "磁碟上存在 '%s' 路徑，但不在索引中" -#: sha1-name.c:1758 +#: sha1-name.c:1771 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)" -#: sha1-name.c:1771 +#: sha1-name.c:1784 msgid "relative path syntax can't be used outside working tree" msgstr "相對路徑與法不能用在工作區外" -#: sha1-name.c:1909 +#: sha1-name.c:1922 #, c-format msgid "invalid object name '%.*s'." msgstr "'%.*s' 物件名稱無效。" @@ -8210,6 +8266,12 @@ msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u 位元組/秒" +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: builtin/rebase.c:864 +#, c-format +msgid "could not open '%s' for writing" +msgstr "無法開啟 '%s' 進行寫入" + #: strbuf.c:1175 #, c-format msgid "could not edit '%s'" @@ -8272,55 +8334,55 @@ msgstr "路徑規格 '%s' 在子模組 '%.*s' 中" msgid "bad --ignore-submodules argument: %s" msgstr "無效 --ignore-submodules 參數：%s" -#: submodule.c:815 +#: submodule.c:816 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " "same. Skipping it." msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。跳過。" -#: submodule.c:910 +#: submodule.c:919 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交" -#: submodule.c:995 +#: submodule.c:1004 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " "submodule %s" msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1' 命令" -#: submodule.c:1118 +#: submodule.c:1127 #, c-format msgid "process for submodule '%s' failed" msgstr "處理 '%s' 子模組失敗" -#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 +#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "無法將 HEAD 解析為有效引用。" -#: submodule.c:1158 +#: submodule.c:1167 #, c-format msgid "Pushing submodule '%s'\n" msgstr "正在推送 '%s' 子模組\n" -#: submodule.c:1161 +#: submodule.c:1170 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "無法推送 '%s' 子模組\n" -#: submodule.c:1453 +#: submodule.c:1462 #, c-format msgid "Fetching submodule %s%s\n" msgstr "正在抓取 %s%s 子模組\n" -#: submodule.c:1483 +#: submodule.c:1492 #, c-format msgid "Could not access submodule '%s'\n" msgstr "無法存取子模組 '%s'\n" -#: submodule.c:1637 +#: submodule.c:1646 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8329,77 +8391,77 @@ msgstr "" "抓取子模組時發生錯誤：\n" "%s" -#: submodule.c:1662 +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" msgstr "無法將 '%s' 識別為一個 git 版本庫" -#: submodule.c:1679 +#: submodule.c:1688 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "無法在 %s 子模組執行 'git status --porcelain=2'" -#: submodule.c:1720 +#: submodule.c:1729 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "%s 子模組執行 'git status --porcelain=2' 失敗" -#: submodule.c:1800 +#: submodule.c:1804 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "無法在子模組 '%s' 中啟動 'git status'" -#: submodule.c:1813 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "無法在子模組 '%s' 中執行 'git status'" -#: submodule.c:1828 +#: submodule.c:1832 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定" -#: submodule.c:1855 submodule.c:2165 +#: submodule.c:1859 submodule.c:2169 #, c-format msgid "could not recurse into submodule '%s'" msgstr "無法遞迴子模組路徑 '%s'" -#: submodule.c:1876 +#: submodule.c:1880 msgid "could not reset submodule index" msgstr "無法重設子模組的索引" -#: submodule.c:1918 +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "子模組 '%s' 中有髒索引" -#: submodule.c:1970 +#: submodule.c:1974 #, c-format msgid "Submodule '%s' could not be updated." msgstr "子模組 '%s' 無法被更新。" -#: submodule.c:2038 +#: submodule.c:2042 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中" -#: submodule.c:2059 +#: submodule.c:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查詢子模組 '%s' 的名稱" -#: submodule.c:2075 +#: submodule.c:2079 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "拒絕移動「%s」至現存 git 目錄" -#: submodule.c:2082 +#: submodule.c:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8410,92 +8472,92 @@ msgstr "" "'%s' 遷移至\n" "'%s'\n" -#: submodule.c:2210 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "無法在 .. 中啟動 ls-files" -#: submodule.c:2250 +#: submodule.c:2254 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "執行 trailer 指令 '%s' 失敗" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "鍵 '%2$s' 的未知取值 '%1$s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "多於一個 %s" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "簽名 '%.*s' 的鍵為空" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "不能讀取輸入檔案 '%s'" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "不能自標準輸入讀取" -#: trailer.c:1011 wrapper.c:673 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "不能對 %s 呼叫 stat" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "檔案 %s 不是一個正規檔案" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "檔案 %s 使用者不可寫" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "不能開啟暫存檔" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "不能重新命名暫存檔為 %s" #: transport-helper.c:62 transport-helper.c:91 msgid "full write to remote helper failed" -msgstr "完整寫入遠端助手失敗" +msgstr "完整寫入遠端協助工具失敗" #: transport-helper.c:145 #, c-format msgid "unable to find remote helper for '%s'" -msgstr "無法為 '%s' 找到遠端助手" +msgstr "無法為 '%s' 找到遠端協助工具" #: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" -msgstr "無法複製助手輸出檔案句柄" +msgstr "無法複製協助工具輸出檔案句柄" #: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" -msgstr "未知的強制能力 %s，該遠端助手可能需要新版本的Git" +msgstr "未知的強制能力 %s，該遠端協助工具可能需要新版本的Git" #: transport-helper.c:220 msgid "this remote helper should implement refspec capability" -msgstr "遠端助手需要實現 refspec 能力" +msgstr "遠端協助工具需要實現 refspec 能力" #: transport-helper.c:287 transport-helper.c:429 #, c-format @@ -8515,7 +8577,7 @@ msgstr "不能執行 fast-import" msgid "error while running fast-import" msgstr "執行 fast-import 發生錯誤" -#: transport-helper.c:549 transport-helper.c:1156 +#: transport-helper.c:549 transport-helper.c:1236 #, c-format msgid "could not read ref %s" msgstr "無法讀取引用 %s" @@ -8533,7 +8595,7 @@ msgstr "協定不支援設定遠端服務路徑" msgid "invalid remote service path" msgstr "無效的遠端服務路徑" -#: transport-helper.c:661 transport.c:1347 +#: transport-helper.c:661 transport.c:1446 msgid "operation not supported by protocol" msgstr "協定不支援該動作" @@ -8542,59 +8604,68 @@ msgstr "協定不支援該動作" msgid "can't connect to subservice %s" msgstr "不能連線到子服務 %s" -#: transport-helper.c:740 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "'option' 缺少對應的 'ok/error' 指令" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" -msgstr "預期 ok/error，助手說 '%s'" +msgstr "預期 ok/error，協助工具說 '%s'" -#: transport-helper.c:793 +#: transport-helper.c:845 #, c-format msgid "helper reported unexpected status of %s" -msgstr "助手報告 %s 的意外狀態" +msgstr "協助工具報告 %s 的意外狀態" -#: transport-helper.c:854 +#: transport-helper.c:928 #, c-format msgid "helper %s does not support dry-run" -msgstr "助手 %s 不支援 dry-run" +msgstr "協助工具 %s 不支援 dry-run" -#: transport-helper.c:857 +#: transport-helper.c:931 #, c-format msgid "helper %s does not support --signed" -msgstr "助手 %s 不支援 --signed" +msgstr "協助工具 %s 不支援 --signed" -#: transport-helper.c:860 +#: transport-helper.c:934 #, c-format msgid "helper %s does not support --signed=if-asked" -msgstr "助手 %s 不支援 --signed=if-asked" +msgstr "協助工具 %s 不支援 --signed=if-asked" -#: transport-helper.c:865 +#: transport-helper.c:939 #, c-format msgid "helper %s does not support --atomic" -msgstr "助手 %s 不支援 --atomic" +msgstr "協助工具 %s 不支援 --atomic" -#: transport-helper.c:871 +#: transport-helper.c:943 +#, c-format +msgid "helper %s does not support --%s" +msgstr "協助工具 %s 不支援 --%s" + +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'push-option'" -msgstr "助手 %s 不支援 'push-option'" +msgstr "協助工具 %s 不支援 'push-option'" -#: transport-helper.c:970 +#: transport-helper.c:1050 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-heper 不支援 push，需要引用表達式" -#: transport-helper.c:975 +#: transport-helper.c:1055 #, c-format msgid "helper %s does not support 'force'" -msgstr "助手 %s 不支援 'force'" +msgstr "協助工具 %s 不支援 'force'" -#: transport-helper.c:1022 +#: transport-helper.c:1102 msgid "couldn't run fast-export" msgstr "無法執行 fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1107 msgid "error while running fast-export" msgstr "執行 fast-export 時發生錯誤" -#: transport-helper.c:1052 +#: transport-helper.c:1132 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8603,52 +8674,52 @@ msgstr "" "沒有共同的引用並且也沒有指定，什麼也不會做。\n" "您或許得指定一個分支。\n" -#: transport-helper.c:1133 +#: transport-helper.c:1213 #, c-format msgid "unsupported object format '%s'" msgstr "不支援的物件格式「%s」" -#: transport-helper.c:1142 +#: transport-helper.c:1222 #, c-format msgid "malformed response in ref list: %s" msgstr "引用列表中格式錯誤的回應：%s" -#: transport-helper.c:1294 +#: transport-helper.c:1374 #, c-format msgid "read(%s) failed" msgstr "讀取（%s）失敗" -#: transport-helper.c:1321 +#: transport-helper.c:1401 #, c-format msgid "write(%s) failed" msgstr "寫（%s）失敗" -#: transport-helper.c:1370 +#: transport-helper.c:1450 #, c-format msgid "%s thread failed" msgstr "%s 執行緒失敗" -#: transport-helper.c:1374 +#: transport-helper.c:1454 #, c-format msgid "%s thread failed to join: %s" msgstr "%s 執行緒等待失敗：%s" -#: transport-helper.c:1393 transport-helper.c:1397 +#: transport-helper.c:1473 transport-helper.c:1477 #, c-format msgid "can't start thread for copying data: %s" msgstr "不能啟動執行緒來複製資料：%s" -#: transport-helper.c:1434 +#: transport-helper.c:1514 #, c-format msgid "%s process failed to wait" msgstr "%s 進程等待失敗" -#: transport-helper.c:1438 +#: transport-helper.c:1518 #, c-format msgid "%s process failed" msgstr "%s 進程失敗" -#: transport-helper.c:1456 transport-helper.c:1465 +#: transport-helper.c:1536 transport-helper.c:1545 msgid "can't start thread for copying data" msgstr "不能啟動執行緒來複製資料" @@ -8667,44 +8738,44 @@ msgstr "無法讀取 bundle '%s'" msgid "transport: invalid depth option '%s'" msgstr "傳輸：無效的深度選項 '%s'" -#: transport.c:272 +#: transport.c:269 msgid "see protocol.version in 'git help config' for more details" msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息" -#: transport.c:273 +#: transport.c:270 msgid "server options require protocol version 2 or later" msgstr "服務端選項需要版本 2 協定或更高" -#: transport.c:631 +#: transport.c:727 msgid "could not parse transport.color.* config" msgstr "不能解析 transport.color.* 設定" -#: transport.c:704 +#: transport.c:802 msgid "support for protocol v2 not implemented yet" msgstr "協定 v2 的支援尚未實現" -#: transport.c:838 +#: transport.c:936 #, c-format msgid "unknown value for config '%s': %s" msgstr "設定 '%s' 的取值未知：%s" -#: transport.c:904 +#: transport.c:1002 #, c-format msgid "transport '%s' not allowed" msgstr "傳輸 '%s' 不允許" -#: transport.c:957 +#: transport.c:1055 msgid "git-over-rsync is no longer supported" msgstr "不再支援 git-over-rsync" -#: transport.c:1059 +#: transport.c:1157 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到：\n" -#: transport.c:1063 +#: transport.c:1161 #, c-format msgid "" "\n" @@ -8731,11 +8802,11 @@ msgstr "" "以推送至遠端。\n" "\n" -#: transport.c:1071 +#: transport.c:1169 msgid "Aborting." msgstr "正在終止。" -#: transport.c:1216 +#: transport.c:1315 msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模組" @@ -9000,7 +9071,7 @@ msgstr "" msgid "Updating index flags" msgstr "正在更新索引旗標" -#: upload-pack.c:1415 +#: upload-pack.c:1550 msgid "expected flush after fetch arguments" msgstr "在 fetch 引數應為一個 flush 包" @@ -9037,47 +9108,83 @@ msgstr "無效的 '..' 路徑片段" msgid "Fetching objects" msgstr "正在抓取物件" -#: worktree.c:248 builtin/am.c:2098 +#: worktree.c:236 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "讀取 '%s' 失敗" -#: worktree.c:295 +#: worktree.c:283 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作區的 '%s' 不是版本庫目錄" -#: worktree.c:306 +#: worktree.c:294 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "檔案 '%s' 不包含工作區的絕對路徑" -#: worktree.c:318 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:324 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d" -#: worktree.c:333 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 沒有指回到 '%s'" -#: wrapper.c:194 wrapper.c:364 +#: worktree.c:587 +msgid "not a directory" +msgstr "不是目錄" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr ".git 不是檔案" + +#: worktree.c:598 +msgid ".git file broken" +msgstr ".git 檔案損毀" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr ".git 檔案不正確" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "非有效路徑" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "無法定位版本庫；.git 不是檔案" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "無法定位版本庫；.git 檔案損壞" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "無法讀取 gitdir" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "不正確的 gitdir" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "無法開啟 '%s' 進行讀寫" -#: wrapper.c:395 wrapper.c:596 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "不能存取 '%s'" -#: wrapper.c:604 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "不能取得目前工作目錄" @@ -9116,11 +9223,11 @@ msgstr " （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " （使用 \"git rm <檔案>...\" 標記解決方案）" -#: wt-status.c:211 wt-status.c:1072 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "要提交的變更：" -#: wt-status.c:234 wt-status.c:1081 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "尚未暫存以備提交的變更：" @@ -9151,96 +9258,96 @@ msgstr " （提交或捨棄子模組中未追蹤或修改的內容）" msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " （使用 \"git %s <檔案>...\" 以包含要提交的內容）" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "雙方刪除：" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "由我們新增：" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "由他們刪除：" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "由他們新增：" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "由我們刪除：" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "雙方新增：" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "雙方修改：" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "新檔案：" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "複製：" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "刪除：" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "修改：" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "重新命名：" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "類型變更：" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "未知：" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "未合併：" # 譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字 -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "新提交, " # 譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字 -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "修改的內容, " # 譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字 -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "未追蹤的內容, " -#: wt-status.c:904 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "您的儲藏區目前有 %d 條紀錄" -#: wt-status.c:936 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "子模組已修改但尚未更新：" -#: wt-status.c:938 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "要提交的子模組變更：" -#: wt-status.c:1020 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9248,7 +9355,7 @@ msgstr "" "不要改動或刪除上面的一行。\n" "其下所有內容都將被忽略。" -#: wt-status.c:1112 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -9259,270 +9366,270 @@ msgstr "" "花了 %.2f 秒才計算出分支的領先/落後範圍。\n" "為避免，您可以使用 '--no-ahead-behind'。\n" -#: wt-status.c:1142 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "您有尚未合併的路徑。" # 譯者：請維持前導空格 -#: wt-status.c:1145 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr " （解決衝突並執行 \"git commit\"）" # 譯者：請維持前導空格 -#: wt-status.c:1147 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " （使用 \"git merge --abort\" 終止合併）" -#: wt-status.c:1151 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "所有衝突已解決但您仍處於合併中。" # 譯者：請維持前導空格 -#: wt-status.c:1154 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 結束合併）" -#: wt-status.c:1163 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "您正處於 am 動作過程中。" -#: wt-status.c:1166 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "目前的修補檔為空。" # 譯者：請維持前導空格 -#: wt-status.c:1170 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " （解決衝突，然後執行 \"git am --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1172 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1174 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 復原原有分支）" -#: wt-status.c:1307 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 遺失。" -#: wt-status.c:1309 +#: wt-status.c:1307 msgid "No commands done." msgstr "沒有指令被執行。" -#: wt-status.c:1312 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最後一條指令已完成（%d 條指令被執行）：" -#: wt-status.c:1323 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " （更多參見檔案 %s）" -#: wt-status.c:1328 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "未剩下任何指令。" -#: wt-status.c:1331 +#: wt-status.c:1329 #, 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:1339 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " （使用 \"git rebase --edit-todo\" 來檢視和編輯）" -#: wt-status.c:1351 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。" -#: wt-status.c:1356 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "您在執行重定基底動作。" # 譯者：請維持前導空格 -#: wt-status.c:1369 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解決衝突，然後執行 \"git rebase --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1371 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1373 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以檢出原有分支）" # 譯者：請維持前導空格 -#: wt-status.c:1380 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有衝突已解決：執行 \"git rebase --continue\"）" -#: wt-status.c:1384 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。" -#: wt-status.c:1389 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "您在執行重定基底動作時分割提交。" # 譯者：請維持前導空格 -#: wt-status.c:1392 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目錄提交乾淨後，執行 \"git rebase --continue\"）" -#: wt-status.c:1396 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。" -#: wt-status.c:1401 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "您在執行重定基底動作時編輯提交。" # 譯者：請維持前導空格 -#: wt-status.c:1404 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修補目前提交）" # 譯者：請維持前導空格 -#: wt-status.c:1406 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （當您對您的修改滿意後執行 \"git rebase --continue\"）" -#: wt-status.c:1417 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "揀選動作正在進行中。" -#: wt-status.c:1420 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在執行揀選提交 %s 的動作。" # 譯者：請維持前導空格 -#: wt-status.c:1427 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " （解決衝突並執行 \"git cherry-pick --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1430 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " （執行 \"git cherry-pick --continue\" 以繼續）" # 譯者：請維持前導空格 -#: wt-status.c:1433 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " （所有衝突已解決：執行 \"git cherry-pick --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1435 +#: wt-status.c:1433 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " （使用 \"git cherry-pick --skip\" 跳過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1437 +#: wt-status.c:1435 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消揀選動作）" -#: wt-status.c:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "還原動作正在行中。" -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "您在執行反轉提交 %s 的動作。" # 譯者：請維持前導空格 -#: wt-status.c:1456 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解決衝突並執行 \"git revert --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr " （執行 \"git revert --continue\" 以繼續）" # 譯者：請維持前導空格 -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有衝突已解決：執行 \"git revert --continue\"）" # 譯者：請維持前導空格 -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " （使用 \"git revert --skip\" 跳過此修補檔）" # 譯者：請維持前導空格 -#: wt-status.c:1466 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反轉提交動作）" -#: wt-status.c:1476 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在執行從分支 '%s' 開始的二分尋找動作。" -#: wt-status.c:1480 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "您在執行二分尋找動作。" # 譯者：請維持前導空格 -#: wt-status.c:1483 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 檢出原有分支）" -#: wt-status.c:1494 +#: wt-status.c:1492 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "您處於稀疏簽出狀態，包含 %d%% 的追蹤檔案。" -#: wt-status.c:1733 +#: wt-status.c:1731 msgid "On branch " msgstr "位於分支 " -#: wt-status.c:1740 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "互動式重定基底動作正在進行中；至 " -#: wt-status.c:1742 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "重定基底動作正在進行中；至 " -#: wt-status.c:1752 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "目前不在任何分支上。" -#: wt-status.c:1769 +#: wt-status.c:1767 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1770 +#: wt-status.c:1768 msgid "No commits yet" msgstr "尚無提交" -#: wt-status.c:1784 +#: wt-status.c:1782 msgid "Untracked files" msgstr "未追蹤的檔案" -#: wt-status.c:1786 +#: wt-status.c:1784 msgid "Ignored files" msgstr "忽略的檔案" -#: wt-status.c:1790 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9532,26 +9639,26 @@ msgstr "" "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n" "但您需要小心不要忘了新增新檔案（參見 'git help status'）。" -#: wt-status.c:1796 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "未追蹤的檔案沒有列出%s" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1798 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr " （使用 -u 參數顯示未追蹤的檔案）" -#: wt-status.c:1804 +#: wt-status.c:1802 msgid "No changes" msgstr "沒有修改" -#: wt-status.c:1809 +#: wt-status.c:1807 #, 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:1812 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" @@ -9563,71 +9670,71 @@ msgid "" "track)\n" msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n" -#: wt-status.c:1818 +#: wt-status.c:1819 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交為空，但是存在尚未追蹤的檔案\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1821 +#: wt-status.c:1823 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n" -#: wt-status.c:1824 wt-status.c:1829 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "無檔案要提交\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1827 +#: wt-status.c:1830 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n" # 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1831 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "沒有要提交的檔案，工作區為乾淨狀態\n" -#: wt-status.c:1944 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "尚無提交在 " -#: wt-status.c:1948 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1979 +#: wt-status.c:1975 msgid "different" msgstr "不同" # 譯者：請維持句尾空格 -#: wt-status.c:1981 wt-status.c:1989 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "落後 " -#: wt-status.c:1984 wt-status.c:1987 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "領先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2509 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暫存的變更。" -#: wt-status.c:2515 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的變更。" -#: wt-status.c:2517 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的變更。" -#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#: compat/precompose_utf8.c:58 builtin/clone.c:457 #, c-format msgid "failed to unlink '%s'" msgstr "刪除 '%s' 失敗" @@ -9654,108 +9761,108 @@ msgstr "刪除 '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "重新整理索引之後尚未被暫存的變更：" -#: builtin/add.c:266 builtin/rev-parse.c:904 +#: builtin/add.c:272 builtin/rev-parse.c:908 msgid "Could not read the index" msgstr "不能讀取索引" -#: builtin/add.c:277 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "無法為寫入開啟 '%s'。" -#: builtin/add.c:281 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "不能生成修補檔" -#: builtin/add.c:284 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "編輯修補檔失敗" -#: builtin/add.c:287 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: builtin/add.c:289 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "空修補檔。異常終止。" -#: builtin/add.c:294 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "不能應用 '%s'" -#: builtin/add.c:302 +#: builtin/add.c:308 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n" -#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "測試執行" -#: builtin/add.c:325 +#: builtin/add.c:331 msgid "interactive picking" msgstr "互動式揀選" -#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308 +#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 msgid "select hunks interactively" msgstr "互動式挑選資料區塊" -#: builtin/add.c:327 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "編輯目前差異並應用" -#: builtin/add.c:328 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "允許新增忽略的檔案" -#: builtin/add.c:329 +#: builtin/add.c:335 msgid "update tracked files" msgstr "更新已追蹤的檔案" -#: builtin/add.c:330 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號" -#: builtin/add.c:331 +#: builtin/add.c:337 msgid "record only the fact that the path will be added later" msgstr "只記錄，該路徑稍後再新增" -#: builtin/add.c:332 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "新增所有改變的已追蹤檔案和未追蹤檔案" -#: builtin/add.c:335 +#: builtin/add.c:341 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作區中移除的路徑（和 --no-all 相同）" -#: builtin/add.c:337 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "不新增，只重新整理索引" -#: builtin/add.c:338 +#: builtin/add.c:344 msgid "just skip files which cannot be added because of errors" msgstr "跳過因發生錯誤不能新增的檔案" -#: builtin/add.c:339 +#: builtin/add.c:345 msgid "check if - even missing - files are ignored in dry run" msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "覆蓋列表裡檔案的可執行位" -#: builtin/add.c:343 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "建立一個嵌入式版本庫時給予警告" -#: builtin/add.c:345 +#: builtin/add.c:351 msgid "backend for `git stash -p`" msgstr "`git stash -p` 的後端" -#: builtin/add.c:363 +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9784,12 +9891,12 @@ msgstr "" "\n" "參見 \"git help submodule\" 取得更多訊息。" -#: builtin/add.c:391 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "正在新增嵌入式 git 版本庫：%s" -#: builtin/add.c:410 +#: builtin/add.c:416 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -9799,47 +9906,47 @@ msgstr "" "如要關閉此訊息，請執行\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:419 +#: builtin/add.c:425 msgid "adding files failed" msgstr "新增檔案失敗" -#: builtin/add.c:447 builtin/commit.c:345 +#: builtin/add.c:453 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file 與 --interactive/--patch 不相容" -#: builtin/add.c:464 +#: builtin/add.c:470 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file 與 --edit 不相容" -#: builtin/add.c:476 +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 選項互斥" -#: builtin/add.c:479 +#: builtin/add.c:485 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用" -#: builtin/add.c:483 +#: builtin/add.c:489 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x" -#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506 +#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容" -#: builtin/add.c:508 builtin/checkout.c:1713 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512 +#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul 需要 --pathspec-from-file" -#: builtin/add.c:512 +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "沒有指定檔案，也沒有檔案被新增。\n" -#: builtin/add.c:514 +#: builtin/add.c:520 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -9897,7 +10004,7 @@ msgstr "無效的時區位移值" msgid "Patch format detection failed." msgstr "修補檔格式偵測失敗。" -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:410 #, c-format msgid "failed to create directory '%s'" msgstr "建立目錄 '%s' 失敗" @@ -9967,12 +10074,12 @@ msgstr "無法合併變更。" msgid "applying to an empty history" msgstr "正套用到一個空歷史上" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1626 builtin/am.c:1630 #, c-format msgid "cannot resume: %s does not exist." msgstr "無法繼續：%s 不存在。" -#: builtin/am.c:1643 +#: builtin/am.c:1648 msgid "Commit Body is:" msgstr "提交內容為：" @@ -9981,39 +10088,39 @@ msgstr "提交內容為：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1658 #, 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:1699 builtin/commit.c:395 +#: builtin/am.c:1704 builtin/commit.c:395 msgid "unable to write index file" msgstr "無法寫入索引檔案" -#: builtin/am.c:1703 +#: builtin/am.c:1708 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "髒索引：不能套用修補檔（髒檔案：%s）" -#: builtin/am.c:1743 builtin/am.c:1811 +#: builtin/am.c:1748 builtin/am.c:1816 #, c-format msgid "Applying: %.*s" msgstr "應用：%.*s" -#: builtin/am.c:1760 +#: builtin/am.c:1765 msgid "No changes -- Patch already applied." msgstr "沒有變更 —— 修補檔已經應用過。" -#: builtin/am.c:1766 +#: builtin/am.c:1771 #, c-format msgid "Patch failed at %s %.*s" msgstr "打修補檔失敗於 %s %.*s" -#: builtin/am.c:1770 +#: builtin/am.c:1775 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔" -#: builtin/am.c:1814 +#: builtin/am.c:1819 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10023,7 +10130,7 @@ msgstr "" "如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n" "您也許想要跳過這個修補檔。" -#: builtin/am.c:1821 +#: builtin/am.c:1826 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10034,171 +10141,171 @@ msgstr "" "您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n" "你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。" -#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347 +#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析物件 '%s'。" -#: builtin/am.c:1980 +#: builtin/am.c:1985 msgid "failed to clean index" msgstr "清空索引失敗" -#: builtin/am.c:2024 +#: builtin/am.c:2029 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:2131 +#: builtin/am.c:2136 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "無效的 --patch-format 值：%s" -#: builtin/am.c:2171 +#: builtin/am.c:2178 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "無效的 --show-current-patch 值：%s" -#: builtin/am.c:2175 +#: builtin/am.c:2182 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容" -#: builtin/am.c:2206 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2207 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<選項>] (--continue | --skip | --abort)" -#: builtin/am.c:2213 +#: builtin/am.c:2220 msgid "run interactively" msgstr "以互動式方式執行" -#: builtin/am.c:2215 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "老的參數 —— 無作用" -#: builtin/am.c:2217 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允許使用三方合併" -#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16 -#: builtin/repack.c:306 builtin/stash.c:816 +#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 +#: builtin/repack.c:335 builtin/stash.c:815 msgid "be quiet" msgstr "靜默模式" -#: builtin/am.c:2220 -msgid "add a Signed-off-by line to the commit message" -msgstr "在提交說明中新增一個 Signed-off-by 簽名" +#: builtin/am.c:2227 +msgid "add a Signed-off-by trailer to the commit message" +msgstr "在提交訊息結尾加入 Signed-off-by" -#: builtin/am.c:2223 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "使用 utf8 字元集（預設）" -#: builtin/am.c:2225 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -k 參數" -#: builtin/am.c:2227 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -b 參數" -#: builtin/am.c:2229 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -m 參數" -#: builtin/am.c:2231 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數" -#: builtin/am.c:2234 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定" -#: builtin/am.c:2237 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "捨棄裁切線前的所有內容" -#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 -#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/am.c:2266 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "傳遞給 git-apply" -#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321 -#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350 +#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172 #: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 -#: bugreport.c:137 +#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "格式" -#: builtin/am.c:2263 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "修補檔的格式" -#: builtin/am.c:2269 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "打修補檔失敗時顯示的錯誤訊息" -#: builtin/am.c:2271 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "衝突解決後繼續套用修補檔" -#: builtin/am.c:2274 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "和 --continue 同義" -#: builtin/am.c:2277 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "跳過目前修補檔" -#: builtin/am.c:2280 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "復原原始分支並終止打修補檔動作。" -#: builtin/am.c:2283 +#: builtin/am.c:2290 msgid "abort the patching operation but keep HEAD where it is." msgstr "終止修補檔動作但保持 HEAD 不變。" -#: builtin/am.c:2287 +#: builtin/am.c:2294 msgid "show the patch being applied" msgstr "顯示正在套用的修補檔" -#: builtin/am.c:2292 +#: builtin/am.c:2299 msgid "lie about committer date" msgstr "將作者日期作為提交日期" -#: builtin/am.c:2294 +#: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "用目前時間作為作者日期" -#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 -#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 -#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536 +#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381 +#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 msgid "GPG-sign commits" msgstr "使用 GPG 簽名提交" -#: builtin/am.c:2300 +#: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "（內部使用，用於 git-rebase）" -#: builtin/am.c:2318 +#: builtin/am.c:2325 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." @@ -10206,16 +10313,16 @@ msgstr "" "參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n" "請不要再使用它了。" -#: builtin/am.c:2325 +#: builtin/am.c:2332 msgid "failed to read the index" msgstr "讀取索引失敗" -#: builtin/am.c:2340 +#: builtin/am.c:2347 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。" -#: builtin/am.c:2364 +#: builtin/am.c:2371 #, c-format msgid "" "Stray %s directory found.\n" @@ -10224,11 +10331,11 @@ msgstr "" "發現了錯誤的 %s 目錄。\n" "使用 \"git am --abort\" 刪除它。" -#: builtin/am.c:2370 +#: builtin/am.c:2377 msgid "Resolve operation not in progress, we are not resuming." msgstr "解決動作未進行，我們不會繼續。" -#: builtin/am.c:2380 +#: builtin/am.c:2387 msgid "interactive mode requires patches on the command line" msgstr "互動式模式需要指令列上提供修補檔" @@ -10266,23 +10373,11 @@ msgstr "git archive：協定錯誤" msgid "git archive: expected a flush" msgstr "git archive：應有一個 flush 包" -#: builtin/bisect--helper.c:22 -msgid "git bisect--helper --next-all [--no-checkout]" -msgstr "git bisect--helper --next-all [--no-checkout]" - #: builtin/bisect--helper.c:23 -msgid "git bisect--helper --write-terms <bad_term> <good_term>" -msgstr "git bisect--helper --write-terms <壞-術語> <好-術語>" - -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --bisect-clean-state" -msgstr "git bisect--helper --bisect-clean-state" - -#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<提交>]" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:24 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" @@ -10290,18 +10385,18 @@ msgstr "" "git bisect--helper --bisect-write [--no-log] <狀態> <版本> <好-術語> <壞-術語" ">" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" msgstr "" "git bisect--helper --bisect-check-and-set-terms <指令> <好-術語> <壞-術語>" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "git bisect--helper --bisect-next-check <好-術語> <壞-術語> [<術語>]" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -10309,74 +10404,99 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:28 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<術語> --term-{new,bad}" -"=<術語>][--no-checkout] [<壞> [<好>...]] [--] [<路徑>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<術語> --term-{old,good}" +"=<術語>] [--no-checkout] [--first-parent] [<壞> [<好>...]] [--] [<路徑>...]" + +#: builtin/bisect--helper.c:30 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:31 +msgid "git bisect--helper --bisect-auto-next" +msgstr "git bisect--helper --bisect-auto-next" + +#: builtin/bisect--helper.c:32 +#| msgid "git bisect--helper --bisect-reset [<commit>]" +msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" +msgstr "git bisect--helper --bisect-state (bad|new) [<修訂版>]" + +#: builtin/bisect--helper.c:33 +#| msgid "git bisect--helper --bisect-reset [<commit>]" +msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" +msgstr "git bisect--helper --bisect-state (good|old) [<修訂版>...]" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:108 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "無法以 '%2$s' 模式開啟 '%1$s' 檔案" + +#: builtin/bisect--helper.c:115 +#, c-format +msgid "could not write to file '%s'" +msgstr "無法寫入 '%s' 檔案" + +#: builtin/bisect--helper.c:154 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' 不是一個有效的術語" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:158 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能使用內建指令 '%s' 作為術語" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:168 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能修改術語 '%s' 的含義" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:178 msgid "please use two different terms" msgstr "請使用兩個不同的術語" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "不能開啟檔案 BISECT_TERMS" - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:194 #, c-format msgid "We are not bisecting.\n" msgstr "我們沒有在二分尋找。\n" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:202 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' 不是一個有效的提交" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:211 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "不能檢出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。" -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:255 #, c-format msgid "Bad bisect_write argument: %s" msgstr "壞的 bisect_write 參數：%s" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:260 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "無法取得版本 '%s' 的物件 ID" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:272 #, c-format msgid "couldn't open the file '%s'" msgstr "無法開啟檔案 '%s'" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:298 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "無效的指令：您目前正處於一個 %s/%s 二分尋找中" -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:325 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10385,7 +10505,7 @@ msgstr "" "您需要給我至少一個 %s 和一個 %s 版本。\n" "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:329 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10396,7 +10516,7 @@ msgstr "" "然後需要提供我至少一個 %s 和一個 %s 版本。\n" "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。" -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:349 #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一個 %s 提交的情況下二分尋找" @@ -10406,22 +10526,22 @@ msgstr "在只有一個 %s 提交的情況下二分尋找" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:357 msgid "Are you sure [Y/n]? " msgstr "您確認嗎[Y/n]？ " -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:418 msgid "no terms defined" msgstr "未定義術語" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:421 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "您目前針對舊狀態的術語是 %s，對新狀態的術語是 %s。\n" -#: builtin/bisect--helper.c:392 +#: builtin/bisect--helper.c:431 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10430,266 +10550,294 @@ msgstr "" "指令 'git bisect terms' 的參數 %s 無效。\n" "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473 +#: builtin/bisect--helper.c:498 +msgid "revision walk setup failed\n" +msgstr "版本遍歷設定失敗\n" + +#: builtin/bisect--helper.c:520 +#, c-format +msgid "could not open '%s' for appending" +msgstr "無法開啟 '%s' 進行附加" + +#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 msgid "'' is not a valid term" msgstr "'' 不是一個有效的術語" -#: builtin/bisect--helper.c:483 +#: builtin/bisect--helper.c:662 #, c-format msgid "unrecognized option: '%s'" msgstr "未識別的選項：'%s'" -#: builtin/bisect--helper.c:487 +#: builtin/bisect--helper.c:666 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起來不是一個有效的版本" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:697 msgid "bad HEAD - I need a HEAD" msgstr "壞的 HEAD - 我需要一個 HEAD" -#: builtin/bisect--helper.c:534 +#: builtin/bisect--helper.c:712 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "檢出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。" -#: builtin/bisect--helper.c:555 +#: builtin/bisect--helper.c:733 msgid "won't bisect on cg-seek'ed tree" msgstr "不會在做了 cg-seek 的樹上做二分尋找" -#: builtin/bisect--helper.c:558 +#: builtin/bisect--helper.c:736 msgid "bad HEAD - strange symbolic ref" msgstr "壞的 HEAD - 奇怪的符號引用" -#: builtin/bisect--helper.c:582 +#: builtin/bisect--helper.c:756 #, c-format msgid "invalid ref: '%s'" msgstr "無效的引用：'%s'" -#: builtin/bisect--helper.c:638 -msgid "perform 'git bisect next'" -msgstr "執行 'git bisect next'" +#: builtin/bisect--helper.c:814 +msgid "You need to start by \"git bisect start\"\n" +msgstr "您需要執行 \"git bisect start\" 來開始\n" -#: builtin/bisect--helper.c:640 -msgid "write the terms to .git/BISECT_TERMS" -msgstr "將術語寫入 .git/BISECT_TERMS" +# 譯者：請維持句尾空格 +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. +#: builtin/bisect--helper.c:825 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "您想讓我為您這樣做嗎[Y/n]？ " -#: builtin/bisect--helper.c:642 -msgid "cleanup the bisection state" -msgstr "清除二分尋找狀態" +#: builtin/bisect--helper.c:843 +msgid "Please call `--bisect-state` with at least one argument" +msgstr "要呼叫 `—bisect-state`，請傳入一個以上的引數" -#: builtin/bisect--helper.c:644 -msgid "check for expected revs" -msgstr "檢查預期的版本" +#: builtin/bisect--helper.c:856 +#, c-format +msgid "'git bisect %s' can take only one argument." +msgstr "'git bisect %s' 只能有一個參數。" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#, c-format +msgid "Bad rev input: %s" +msgstr "<修訂版> 輸入格式錯誤：%s" + +#: builtin/bisect--helper.c:924 msgid "reset the bisection state" msgstr "清除二分尋找狀態" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:926 msgid "write out the bisection state in BISECT_LOG" msgstr "將二分尋找的狀態寫入 BISECT_LOG" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:928 msgid "check and set terms in a bisection state" msgstr "在一個二分尋找狀態中檢查和設定術語" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:930 msgid "check whether bad or good terms exist" msgstr "檢查壞的或好的術語是否存在" -#: builtin/bisect--helper.c:654 +#: builtin/bisect--helper.c:932 msgid "print out the bisect terms" msgstr "列印二分尋找術語" -#: builtin/bisect--helper.c:656 +#: builtin/bisect--helper.c:934 msgid "start the bisect session" msgstr "啟動二分尋找過程" -#: builtin/bisect--helper.c:658 -msgid "update BISECT_HEAD instead of checking out the current commit" -msgstr "更新 BISECT_HEAD 而非檢出目前提交" +#: builtin/bisect--helper.c:936 +msgid "find the next bisection commit" +msgstr "尋找下一個二分尋找提交" -#: builtin/bisect--helper.c:660 -msgid "no log for BISECT_WRITE" -msgstr "BISECT_WRITE 無日誌" +#: builtin/bisect--helper.c:938 +msgid "verify the next bisection state then checkout the next bisection commit" +msgstr "驗證下一個二分尋找狀態後，檢出下一個二分尋找提交" -#: builtin/bisect--helper.c:678 -msgid "--write-terms requires two arguments" -msgstr "--write-terms 需要兩個參數" +#: builtin/bisect--helper.c:940 +msgid "mark the state of ref (or refs)" +msgstr "標記 ref (或 refs) 的狀態" -#: builtin/bisect--helper.c:682 -msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state 不帶參數" +#: builtin/bisect--helper.c:942 +msgid "no log for BISECT_WRITE" +msgstr "BISECT_WRITE 無日誌" -#: builtin/bisect--helper.c:689 +#: builtin/bisect--helper.c:957 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 無需參數或者需要一個提交" -#: builtin/bisect--helper.c:693 +#: builtin/bisect--helper.c:961 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write 需要 4 或 5 個參數" -#: builtin/bisect--helper.c:699 +#: builtin/bisect--helper.c:967 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms 需要 3 個參數" -#: builtin/bisect--helper.c:705 +#: builtin/bisect--helper.c:973 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check 需要 2 或 3 個參數" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:979 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 個參數" -#: builtin/blame.c:31 +#: builtin/bisect--helper.c:988 +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next 需要 0 個引數" + +#: builtin/bisect--helper.c:994 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "--bisect-auto-next 需要 0 個引數" + +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<選項>] [<版本選項>] [<版本>] [--] <檔案>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "期望一個顏色：%s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "必須以一個顏色結尾" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "設定 color.blame.repeatedLines 中的無效顏色 '%s'" -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "設定 blame.coloring 中的無效取值" -#: builtin/blame.c:822 +#: builtin/blame.c:847 #, c-format msgid "cannot find revision %s to ignore" msgstr "不能找到要忽略的版本 %s" -#: builtin/blame.c:844 +#: builtin/blame.c:869 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地顯示發現的 blame 條目" -#: builtin/blame.c:845 -msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "邊界提交顯示空的 SHA-1（預設：關閉）" +#: builtin/blame.c:870 +msgid "Do not show object names of boundary commits (Default: off)" +msgstr "不要顯示邊界提交的物件名稱 (預設值: off)" -#: builtin/blame.c:846 +#: builtin/blame.c:871 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作為邊界（預設：關閉）" -#: builtin/blame.c:847 +#: builtin/blame.c:872 msgid "Show work cost statistics" msgstr "顯示指令消耗統計" -#: builtin/blame.c:848 +#: builtin/blame.c:873 msgid "Force progress reporting" msgstr "強制進度顯示" -#: builtin/blame.c:849 +#: builtin/blame.c:874 msgid "Show output score for blame entries" msgstr "顯示判斷 blame 條目位移的得分診斷訊息" -#: builtin/blame.c:850 +#: builtin/blame.c:875 msgid "Show original filename (Default: auto)" msgstr "顯示原始檔案名（預設：自動）" -#: builtin/blame.c:851 +#: builtin/blame.c:876 msgid "Show original linenumber (Default: off)" msgstr "顯示原始的行號（預設：關閉）" -#: builtin/blame.c:852 +#: builtin/blame.c:877 msgid "Show in a format designed for machine consumption" msgstr "顯示為一個適合機器讀取的格式" -#: builtin/blame.c:853 +#: builtin/blame.c:878 msgid "Show porcelain format with per-line commit information" msgstr "為每一行顯示機器適用的提交訊息" -#: builtin/blame.c:854 +#: builtin/blame.c:879 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的輸出模式（預設：關閉）" -#: builtin/blame.c:855 +#: builtin/blame.c:880 msgid "Show raw timestamp (Default: off)" msgstr "顯示原始時間戳（預設：關閉）" -#: builtin/blame.c:856 +#: builtin/blame.c:881 msgid "Show long commit SHA1 (Default: off)" msgstr "顯示長的 SHA1 提交號（預設：關閉）" -#: builtin/blame.c:857 +#: builtin/blame.c:882 msgid "Suppress author name and timestamp (Default: off)" msgstr "隱藏作者名字和時間戳（預設：關閉）" -#: builtin/blame.c:858 +#: builtin/blame.c:883 msgid "Show author email instead of name (Default: off)" msgstr "顯示作者的信箱而不是名字（預設：關閉）" -#: builtin/blame.c:859 +#: builtin/blame.c:884 msgid "Ignore whitespace differences" msgstr "忽略空白差異" -#: builtin/blame.c:860 builtin/log.c:1721 +#: builtin/blame.c:885 builtin/log.c:1813 msgid "rev" msgstr "版本" -#: builtin/blame.c:860 +#: builtin/blame.c:885 msgid "Ignore <rev> when blaming" msgstr "在執行 blame 動作時忽略 <版本>" -#: builtin/blame.c:861 +#: builtin/blame.c:886 msgid "Ignore revisions from <file>" msgstr "忽略來自 <檔案> 中的版本" -#: builtin/blame.c:862 +#: builtin/blame.c:887 msgid "color redundant metadata from previous line differently" msgstr "使用顏色間隔輸出與前一行不同的重複元訊息" -#: builtin/blame.c:863 +#: builtin/blame.c:888 msgid "color lines by age" msgstr "依據時間著色" -#: builtin/blame.c:864 +#: builtin/blame.c:889 msgid "Spend extra cycles to find better match" msgstr "花費額外的循環來找到更好的符合" -#: builtin/blame.c:865 +#: builtin/blame.c:890 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list" -#: builtin/blame.c:866 +#: builtin/blame.c:891 msgid "Use <file>'s contents as the final image" msgstr "使用 <檔案> 的內容作為最終的圖片" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:892 builtin/blame.c:893 msgid "score" msgstr "得分" -#: builtin/blame.c:867 +#: builtin/blame.c:892 msgid "Find line copies within and across files" msgstr "找到檔案內及跨檔案的行複製" -#: builtin/blame.c:868 +#: builtin/blame.c:893 msgid "Find line movements within and across files" msgstr "找到檔案內及跨檔案的行移動" -#: builtin/blame.c:869 -msgid "n,m" -msgstr "n,m" +#: builtin/blame.c:894 +msgid "range" +msgstr "range" -#: builtin/blame.c:869 -msgid "Process only line range n,m, counting from 1" -msgstr "只處理行範圍在 n 和 m 之間的，從 1 開始" +#: builtin/blame.c:895 +msgid "Process only line range <start>,<end> or function :<funcname>" +msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函數" -#: builtin/blame.c:921 +#: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能和 --incremental 或 --porcelain 同時使用" @@ -10701,23 +10849,23 @@ msgstr "--progress 不能和 --incremental 或 --porcelain 同時使用" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "4 年 11 個月前" -#: builtin/blame.c:1087 +#: 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:1133 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "追蹤程式碼行" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [<選項>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" +msgstr "git branch [<選項>] [-r | -a] [--merged] [--no-merged]" #: builtin/branch.c:30 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" @@ -10860,38 +11008,38 @@ msgstr "無法重新命名目前分支因為不處於任何分支上。" msgid "Invalid branch name: '%s'" msgstr "無效的分支名：'%s'" -#: builtin/branch.c:542 +#: builtin/branch.c:544 msgid "Branch rename failed" msgstr "分支重新命名失敗" -#: builtin/branch.c:544 +#: builtin/branch.c:546 msgid "Branch copy failed" msgstr "分支複製失敗" -#: builtin/branch.c:548 +#: builtin/branch.c:550 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "已為錯誤命名的分支 '%s' 建立了一個副本" -#: builtin/branch.c:551 +#: builtin/branch.c:553 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "已將錯誤命名的分支 '%s' 重新命名" -#: builtin/branch.c:557 +#: builtin/branch.c:559 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重新命名為 %s，但 HEAD 沒有更新！" -#: builtin/branch.c:566 +#: builtin/branch.c:568 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重新命名，但更新設定檔案失敗" -#: builtin/branch.c:568 +#: builtin/branch.c:570 msgid "Branch is copied, but update of config-file failed" msgstr "分支已複製，但更新設定檔案失敗" -#: builtin/branch.c:584 +#: builtin/branch.c:586 #, c-format msgid "" "Please edit the description for the branch\n" @@ -10902,209 +11050,209 @@ msgstr "" " %s\n" "以 '%c' 開頭的行將被過濾。\n" -#: builtin/branch.c:618 +#: builtin/branch.c:620 msgid "Generic options" msgstr "通用選項" -#: builtin/branch.c:620 +#: builtin/branch.c:622 msgid "show hash and subject, give twice for upstream branch" msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支" -#: builtin/branch.c:621 +#: builtin/branch.c:623 msgid "suppress informational messages" msgstr "不顯示訊息" -#: builtin/branch.c:622 +#: builtin/branch.c:624 msgid "set up tracking mode (see git-pull(1))" msgstr "設定追蹤模式（參見 git-pull(1)）" -#: builtin/branch.c:624 +#: builtin/branch.c:626 msgid "do not use" msgstr "不要使用" -#: builtin/branch.c:626 builtin/rebase.c:520 +#: builtin/branch.c:628 builtin/rebase.c:532 msgid "upstream" msgstr "上游" -#: builtin/branch.c:626 +#: builtin/branch.c:628 msgid "change the upstream info" msgstr "改變上游訊息" -#: builtin/branch.c:627 +#: builtin/branch.c:629 msgid "unset the upstream info" msgstr "取消上游資訊設定" -#: builtin/branch.c:628 +#: builtin/branch.c:630 msgid "use colored output" msgstr "使用彩色輸出" -#: builtin/branch.c:629 +#: builtin/branch.c:631 msgid "act on remote-tracking branches" msgstr "作用於遠端追蹤分支" -#: builtin/branch.c:631 builtin/branch.c:633 +#: builtin/branch.c:633 builtin/branch.c:635 msgid "print only branches that contain the commit" msgstr "只列印包含該提交的分支" -#: builtin/branch.c:632 builtin/branch.c:634 +#: builtin/branch.c:634 builtin/branch.c:636 msgid "print only branches that don't contain the commit" msgstr "只列印不包含該提交的分支" -#: builtin/branch.c:637 +#: builtin/branch.c:639 msgid "Specific git-branch actions:" msgstr "具體的 git-branch 動作：" -#: builtin/branch.c:638 +#: builtin/branch.c:640 msgid "list both remote-tracking and local branches" msgstr "列出遠端追蹤及本機分支" -#: builtin/branch.c:640 +#: builtin/branch.c:642 msgid "delete fully merged branch" msgstr "刪除完全合併的分支" -#: builtin/branch.c:641 +#: builtin/branch.c:643 msgid "delete branch (even if not merged)" msgstr "刪除分支（即使沒有合併）" -#: builtin/branch.c:642 +#: builtin/branch.c:644 msgid "move/rename a branch and its reflog" msgstr "移動/重新命名一個分支，以及它的引用日誌" -#: builtin/branch.c:643 +#: builtin/branch.c:645 msgid "move/rename a branch, even if target exists" msgstr "移動/重新命名一個分支，即使目標已存在" -#: builtin/branch.c:644 +#: builtin/branch.c:646 msgid "copy a branch and its reflog" msgstr "複製一個分支和它的引用日誌" -#: builtin/branch.c:645 +#: builtin/branch.c:647 msgid "copy a branch, even if target exists" msgstr "複製一個分支，即使目標已存在" -#: builtin/branch.c:646 +#: builtin/branch.c:648 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:647 +#: builtin/branch.c:649 msgid "show current branch name" msgstr "顯示目前分支名" -#: builtin/branch.c:648 +#: builtin/branch.c:650 msgid "create the branch's reflog" msgstr "建立分支的引用日誌" -#: builtin/branch.c:650 +#: builtin/branch.c:652 msgid "edit the description for the branch" msgstr "標記分支的描述" -#: builtin/branch.c:651 +#: builtin/branch.c:653 msgid "force creation, move/rename, deletion" msgstr "強制建立、移動/重新命名、刪除" -#: builtin/branch.c:652 +#: builtin/branch.c:654 msgid "print only branches that are merged" msgstr "只列印已經合併的分支" -#: builtin/branch.c:653 +#: builtin/branch.c:655 msgid "print only branches that are not merged" msgstr "只列印尚未合併的分支" -#: builtin/branch.c:654 +#: builtin/branch.c:656 msgid "list branches in columns" msgstr "以列的方式顯示分支" -#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:658 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 #: builtin/tag.c:434 msgid "object" msgstr "物件" -#: builtin/branch.c:657 +#: builtin/branch.c:659 msgid "print only branches of the object" msgstr "只列印指向該物件的分支" -#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 +#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "排序和過濾屬於大小寫不敏感" -#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "輸出格式" -#: builtin/branch.c:682 builtin/clone.c:789 +#: builtin/branch.c:684 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "HEAD 沒有位於 /refs/heads 之下！" -#: builtin/branch.c:706 +#: builtin/branch.c:708 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不相容" -#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 +#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 msgid "branch name required" msgstr "必須提供分支名" -#: builtin/branch.c:751 +#: builtin/branch.c:753 msgid "Cannot give description to detached HEAD" msgstr "不能向分離開頭指標提供描述" -#: builtin/branch.c:756 +#: builtin/branch.c:758 msgid "cannot edit description of more than one branch" msgstr "不能為一個以上的分支編輯描述" -#: builtin/branch.c:763 +#: builtin/branch.c:765 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚無提交。" -#: builtin/branch.c:766 +#: builtin/branch.c:768 #, c-format msgid "No branch named '%s'." msgstr "沒有分支 '%s'。" -#: builtin/branch.c:781 +#: builtin/branch.c:783 msgid "too many branches for a copy operation" msgstr "為複製動作提供了太多的分支名" -#: builtin/branch.c:790 +#: builtin/branch.c:792 msgid "too many arguments for a rename operation" msgstr "為重新命名動作提供了太多的參數" -#: builtin/branch.c:795 +#: builtin/branch.c:797 msgid "too many arguments to set new upstream" msgstr "為設定新上游提供了太多的參數" -#: builtin/branch.c:799 +#: builtin/branch.c:801 #, 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:802 builtin/branch.c:825 +#: builtin/branch.c:804 builtin/branch.c:827 #, c-format msgid "no such branch '%s'" msgstr "沒有此分支 '%s'" -#: builtin/branch.c:806 +#: builtin/branch.c:808 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:819 +#: builtin/branch.c:821 msgid "too many arguments to unset upstream" msgstr "為取消上游設定動作提供了太多的參數" -#: builtin/branch.c:823 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。" -#: builtin/branch.c:829 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 沒有上游訊息" -#: builtin/branch.c:839 +#: builtin/branch.c:841 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>?" @@ -11112,13 +11260,108 @@ msgstr "" "'git branch' 的 -a 和 -r 選項不帶一個分支名。\n" "您是否想要使用：-a|-r --list <模式>？" -#: builtin/branch.c:843 +#: builtin/branch.c:845 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" "不再支援選項 '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。" +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "git 版本：\n" + +#: builtin/bugreport.c:21 +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() 失敗，錯誤：「%s」(%d)\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "編譯器資訊： " + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "libc 資訊： " + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格式>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"感謝您填寫 Git 臭蟲報告！\n" +"請回答下列問題，以讓我們能夠了解您的問題。\n" +"\n" +"臭蟲發生前，您做了什麼？（重現問題的步驟）\n" +"\n" +"你原本期望發生什麼？（期望行為）\n" +"\n" +"那實際上發生了什麼？（實際行為）\n" +"\n" +"期望行為跟實際發生的行為有什麼不同？\n" +"\n" +"其他您想加入的：\n" +"\n" +"請檢閱臭蟲報告下方的剩餘部分。\n" +"您可刪除任何您不想分享的地方。\n" + +#: builtin/bugreport.c:135 +msgid "specify a destination for the bugreport file" +msgstr "請指定 bugreport 檔案的目的地" + +#: builtin/bugreport.c:137 +msgid "specify a strftime format suffix for the filename" +msgstr "請指定檔案名稱的 strftime 格式後綴" + +#: builtin/bugreport.c:159 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "無法建立 '%s' 的前置目錄" + +#: builtin/bugreport.c:166 +msgid "System Info" +msgstr "系統資訊" + +#: builtin/bugreport.c:169 +msgid "Enabled Hooks" +msgstr "啟用的掛鉤" + +#: builtin/bugreport.c:176 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "不要在「%s」建立新檔案" + +#: builtin/bugreport.c:179 +#, c-format +msgid "unable to write to %s" +msgstr "無法寫入 %s" + +#: builtin/bugreport.c:189 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "已在「%s」建立新報告。\n" + #: builtin/bundle.c:15 builtin/bundle.c:23 msgid "git bundle create [<options>] <file> <git-rev-list args>" msgstr "git bundle create [<選項>] <檔案> <git-rev-list 參數>" @@ -11135,44 +11378,48 @@ msgstr "git bundle list-heads <檔案> [<參考名稱>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <檔案> [<參考名稱>...]" -#: builtin/bundle.c:66 builtin/pack-objects.c:3448 +#: builtin/bundle.c:67 builtin/pack-objects.c:3480 msgid "do not show progress meter" msgstr "不顯示進度表" -#: builtin/bundle.c:68 builtin/pack-objects.c:3450 +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 msgid "show progress meter" msgstr "顯示進度表" -#: builtin/bundle.c:70 builtin/pack-objects.c:3452 +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 msgid "show progress meter during object writing phase" msgstr "在物件寫入階段顯示進度表" -#: builtin/bundle.c:73 builtin/pack-objects.c:3455 +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 msgid "similar to --all-progress when progress meter is shown" msgstr "當進度表顯示時類似於 --all-progress" -#: builtin/bundle.c:93 +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "指定包格式版本" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "需要一個版本庫來建立包。" -#: builtin/bundle.c:104 +#: builtin/bundle.c:107 msgid "do not show bundle details" msgstr "不顯示包 (bundle) 詳細資訊" -#: builtin/bundle.c:119 +#: builtin/bundle.c:122 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "需要一個版本庫來解包。" -#: builtin/bundle.c:168 builtin/remote.c:1686 +#: builtin/bundle.c:171 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "詳細輸出；必須置於子指令之前" -#: builtin/bundle.c:190 builtin/remote.c:1717 +#: builtin/bundle.c:193 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子指令：%s" @@ -11186,9 +11433,6 @@ msgstr "" "p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>" #: builtin/cat-file.c:599 -#| msgid "" -#| "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | " -#| "--filters]" msgid "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" @@ -11228,7 +11472,7 @@ msgstr "對於資料物件，對其內容做文字轉換" msgid "for blob objects, run filters on object's content" msgstr "對於資料物件，對其內容做過濾" -#: builtin/cat-file.c:648 git-submodule.sh:958 +#: builtin/cat-file.c:648 msgid "blob" msgstr "blob" @@ -11288,7 +11532,7 @@ msgstr "從標準輸入讀出檔案名" msgid "terminate input and output records by a NUL character" msgstr "輸入和輸出的紀錄使用 NUL 字元終結" -#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537 +#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 #: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "不顯示進度報告" @@ -11342,54 +11586,54 @@ msgstr "不能解析聯繫位址：%s" msgid "no contacts specified" msgstr "未指定聯繫位址" -#: builtin/checkout-index.c:131 +#: builtin/checkout-index.c:139 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<選項>] [--] [<檔案>...]" -#: builtin/checkout-index.c:148 +#: builtin/checkout-index.c:156 msgid "stage should be between 1 and 3 or all" msgstr "索引值應該取值 1 到 3 或者 all" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:173 msgid "check out all files in the index" msgstr "檢出索引區的所有檔案" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:174 msgid "force overwrite of existing files" msgstr "強制覆蓋現有的檔案" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:176 msgid "no warning for existing files and files not in index" msgstr "存在或不在索引中的檔案都沒有警告" -#: builtin/checkout-index.c:169 +#: builtin/checkout-index.c:178 msgid "don't checkout new files" msgstr "不檢出新檔案" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:180 msgid "update stat information in the index file" msgstr "更新索引中檔案的狀態訊息" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:184 msgid "read list of paths from the standard input" msgstr "從標準輸入讀取路徑列表" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:186 msgid "write the content to temporary files" msgstr "將內容寫入暫存檔" -#: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:754 +#: builtin/checkout-index.c:187 builtin/column.c:31 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:757 msgid "string" msgstr "字串" -#: builtin/checkout-index.c:179 +#: builtin/checkout-index.c:188 msgid "when creating files, prepend <string>" msgstr "在建立檔案時，在前面加上 <字串>" -#: builtin/checkout-index.c:181 +#: builtin/checkout-index.c:190 msgid "copy out the files from named stage" msgstr "從指定暫存區中拷出檔案" @@ -11424,80 +11668,80 @@ msgstr "路徑 '%s' 沒有他們的版本" msgid "path '%s' does not have all necessary versions" msgstr "路徑 '%s' 沒有全部必需的版本" -#: builtin/checkout.c:256 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路徑 '%s' 沒有必需的版本" -#: builtin/checkout.c:274 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：無法合併" -#: builtin/checkout.c:290 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "無法為 '%s' 新增合併結果" -#: builtin/checkout.c:395 +#: builtin/checkout.c:396 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新建立了 %d 個合併衝突" -#: builtin/checkout.c:400 +#: builtin/checkout.c:401 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "從 %2$s 更新了 %1$d 個路徑" -#: builtin/checkout.c:407 +#: builtin/checkout.c:408 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "從索引區更新了 %d 個路徑" -#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 -#: builtin/checkout.c:440 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路徑時使用" -#: builtin/checkout.c:443 builtin/checkout.c:446 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同時使用" -#: builtin/checkout.c:450 +#: builtin/checkout.c:451 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同時更新路徑並切換到分支'%s'。" -#: builtin/checkout.c:454 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都沒有指定" -#: builtin/checkout.c:458 +#: builtin/checkout.c:459 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 時，必須使用 '%1$s'" -#: builtin/checkout.c:463 builtin/checkout.c:468 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c:527 builtin/checkout.c:534 +#: builtin/checkout.c:541 builtin/checkout.c:548 #, c-format msgid "path '%s' is unmerged" msgstr "路徑 '%s' 未合併" -#: builtin/checkout.c:702 +#: builtin/checkout.c:716 msgid "you need to resolve your current index first" msgstr "您需要先解決目前索引的衝突" -#: builtin/checkout.c:756 +#: builtin/checkout.c:770 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11506,51 +11750,51 @@ msgstr "" "不能繼續，下列檔案有暫存的修改：\n" "%s" -#: builtin/checkout.c:859 +#: builtin/checkout.c:866 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能對 '%s' 執行 reflog 動作：%s\n" -#: builtin/checkout.c:901 +#: builtin/checkout.c:908 msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c:905 builtin/clone.c:720 +#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:909 +#: builtin/checkout.c:916 #, c-format msgid "Reset branch '%s'\n" msgstr "重設分支 '%s'\n" -#: builtin/checkout.c:912 +#: builtin/checkout.c:919 #, c-format msgid "Already on '%s'\n" msgstr "已經位於 '%s'\n" -#: builtin/checkout.c:916 +#: builtin/checkout.c:923 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切換並重設分支 '%s'\n" -#: builtin/checkout.c:918 builtin/checkout.c:1342 +#: builtin/checkout.c:925 builtin/checkout.c:1356 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切換到一個新分支 '%s'\n" -#: builtin/checkout.c:920 +#: builtin/checkout.c:927 #, c-format msgid "Switched to branch '%s'\n" msgstr "切換到分支 '%s'\n" # 譯者：請維持前導空格 -#: builtin/checkout.c:971 +#: builtin/checkout.c:978 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 個。\n" -#: builtin/checkout.c:977 +#: builtin/checkout.c:984 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11567,7 +11811,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1003 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11588,19 +11832,19 @@ msgstr[0] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1031 +#: builtin/checkout.c:1038 msgid "internal error in revision walk" msgstr "在版本遍歷時遇到內部錯誤" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1042 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1075 builtin/checkout.c:1337 +#: builtin/checkout.c:1082 builtin/checkout.c:1351 msgid "You are on a branch yet to be born" msgstr "您位於一個尚未初始化的分支" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1164 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11609,7 +11853,7 @@ msgstr "" "'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n" "請使用 --（和可選的 --no-guess）來消除歧義" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1171 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" @@ -11628,51 +11872,51 @@ msgstr "" "如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n" "版本庫名，可以在設定中設定 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1181 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 符合多個 (%d) 遠端追蹤分支" -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1247 msgid "only one reference expected" msgstr "預期只有一個引用" -#: builtin/checkout.c:1250 +#: builtin/checkout.c:1264 #, c-format msgid "only one reference expected, %d given." msgstr "應只有一個引用，卻提供了 %d 個。" -#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "無效引用：%s" -#: builtin/checkout.c:1309 builtin/checkout.c:1675 +#: builtin/checkout.c:1323 builtin/checkout.c:1689 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一個樹：%s" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1370 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一個分支，得到標籤 '%s'" -#: builtin/checkout.c:1358 +#: builtin/checkout.c:1372 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一個分支，得到遠端分支 '%s'" -#: builtin/checkout.c:1359 builtin/checkout.c:1367 +#: builtin/checkout.c:1373 builtin/checkout.c:1381 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一個分支，得到 '%s'" -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1376 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一個分支，得到提交 '%s'" -#: builtin/checkout.c:1378 +#: builtin/checkout.c:1392 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11680,7 +11924,7 @@ msgstr "" "不能在合併時切換分支\n" "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1396 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11688,7 +11932,7 @@ msgstr "" "不能在 am 工作階段期間切換分支\n" "考慮使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1386 +#: builtin/checkout.c:1400 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11696,7 +11940,7 @@ msgstr "" "不能在重定基底時切換分支\n" "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1404 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11704,7 +11948,7 @@ msgstr "" "不能在揀選時切換分支\n" "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1394 +#: builtin/checkout.c:1408 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11712,214 +11956,214 @@ msgstr "" "不能在還原時切換分支\n" "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1398 +#: builtin/checkout.c:1412 msgid "you are switching branch while bisecting" msgstr "您在執行二分尋找時切換分支" -#: builtin/checkout.c:1405 +#: builtin/checkout.c:1419 msgid "paths cannot be used with switching branches" msgstr "路徑不能和切換分支同時使用" -#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416 +#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切換分支同時使用" -#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426 -#: builtin/checkout.c:1431 builtin/checkout.c:1436 +#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440 +#: builtin/checkout.c:1445 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同時使用" -#: builtin/checkout.c:1433 +#: builtin/checkout.c:1447 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不帶 <起始點>" -#: builtin/checkout.c:1441 +#: builtin/checkout.c:1455 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切換分支到一個非提交 '%s'" -#: builtin/checkout.c:1448 +#: builtin/checkout.c:1462 msgid "missing branch or commit argument" msgstr "缺少分支或提交參數" -#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82 -#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 -#: builtin/send-pack.c:173 +#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575 +#: builtin/send-pack.c:198 msgid "force progress reporting" msgstr "強制顯示進度報告" -#: builtin/checkout.c:1491 +#: builtin/checkout.c:1505 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支執行三方合併" -#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322 +#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 msgid "style" msgstr "風格" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1507 msgid "conflict style (merge or diff3)" msgstr "衝突輸出風格（merge 或 diff3）" -#: builtin/checkout.c:1505 builtin/worktree.c:558 +#: builtin/checkout.c:1519 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "HEAD 從指定的提交分離" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1520 msgid "set upstream info for new branch" msgstr "為新的分支設定上游訊息" -#: builtin/checkout.c:1508 +#: builtin/checkout.c:1522 msgid "force checkout (throw away local modifications)" msgstr "強制檢出（捨棄本機修改）" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1524 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1524 msgid "new unparented branch" msgstr "新的沒有父提交的分支" -#: builtin/checkout.c:1512 builtin/merge.c:292 +#: builtin/checkout.c:1526 builtin/merge.c:300 msgid "update ignored files (default)" msgstr "更新忽略的檔案（預設）" -#: builtin/checkout.c:1515 +#: builtin/checkout.c:1529 msgid "do not check if another worktree is holding the given ref" msgstr "不檢查指定的引用是否被其他工作區所占用" -#: builtin/checkout.c:1528 +#: builtin/checkout.c:1542 msgid "checkout our version for unmerged files" msgstr "對尚未合併的檔案檢出我們的版本" -#: builtin/checkout.c:1531 +#: builtin/checkout.c:1545 msgid "checkout their version for unmerged files" msgstr "對尚未合併的檔案檢出他們的版本" -#: builtin/checkout.c:1535 +#: builtin/checkout.c:1549 msgid "do not limit pathspecs to sparse entries only" msgstr "對路徑不做稀疏檢出的限制" -#: builtin/checkout.c:1590 +#: builtin/checkout.c:1604 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c、-%c 和 --orphan 是互斥的" -#: builtin/checkout.c:1594 +#: builtin/checkout.c:1608 msgid "-p and --overlay are mutually exclusive" msgstr "-p 和 --overlay 互斥" -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1645 msgid "--track needs a branch name" msgstr "--track 需要一個分支名" -#: builtin/checkout.c:1636 +#: builtin/checkout.c:1650 #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名稱，請嘗試 -%c" -#: builtin/checkout.c:1668 +#: builtin/checkout.c:1682 #, c-format msgid "could not resolve %s" msgstr "無法解析 %s" -#: builtin/checkout.c:1684 +#: builtin/checkout.c:1698 msgid "invalid path specification" msgstr "無效的路徑規格" -#: builtin/checkout.c:1691 +#: builtin/checkout.c:1705 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1709 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路徑參數 '%s'" -#: builtin/checkout.c:1704 +#: builtin/checkout.c:1718 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file 與 --detach 不相容" -#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503 +#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file 與 --patch 不相容" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1734 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:1723 +#: builtin/checkout.c:1739 msgid "you must specify path(s) to restore" msgstr "您必須指定一個要復原的路徑" -#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800 -#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554 +#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816 +#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 #: builtin/worktree.c:556 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1766 msgid "create and checkout a new branch" msgstr "建立並檢出一個新的分支" -#: builtin/checkout.c:1752 +#: builtin/checkout.c:1768 msgid "create/reset and checkout a branch" msgstr "建立/重設並檢出一個分支" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1769 msgid "create reflog for new branch" msgstr "為新的分支建立引用日誌" -#: builtin/checkout.c:1755 +#: builtin/checkout.c:1771 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜測 'git checkout <無此分支>'（預設）" -#: builtin/checkout.c:1756 +#: builtin/checkout.c:1772 msgid "use overlay mode (default)" msgstr "使用疊加模式（預設）" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1817 msgid "create and switch to a new branch" msgstr "建立並切換一個新分支" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1819 msgid "create/reset and switch to a branch" msgstr "建立/重設並切換一個分支" -#: builtin/checkout.c:1805 +#: builtin/checkout.c:1821 msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜測 'git switch <無此分支>'" -#: builtin/checkout.c:1807 +#: builtin/checkout.c:1823 msgid "throw away local modifications" msgstr "捨棄本機修改" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1857 msgid "which tree-ish to checkout from" msgstr "要檢出哪一個樹" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1859 msgid "restore the index" msgstr "復原索引" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1861 msgid "restore the working tree (default)" msgstr "復原工作區（預設）" -#: builtin/checkout.c:1847 +#: builtin/checkout.c:1863 msgid "ignore unmerged entries" msgstr "忽略未合併條目" -#: builtin/checkout.c:1848 +#: builtin/checkout.c:1864 msgid "use overlay mode" msgstr "使用疊加模式" @@ -11959,7 +12203,7 @@ msgstr "刪除 %s 失敗" msgid "could not lstat %s\n" msgstr "不能對 %s 呼叫 lstat\n" -#: builtin/clean.c:302 git-add--interactive.perl:595 +#: builtin/clean.c:302 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -11972,7 +12216,7 @@ msgstr "" "foo - 透過唯一前綴選擇一個選項\n" " - （空）什麼也不選擇\n" -#: builtin/clean.c:306 git-add--interactive.perl:604 +#: builtin/clean.c:306 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -11993,8 +12237,8 @@ msgstr "" "* - 選擇所有選項\n" " - （空）結束選擇\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:521 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" @@ -12063,7 +12307,7 @@ msgid "remove whole directories" msgstr "刪除整個目錄" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 +#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185 #: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" @@ -12103,162 +12347,162 @@ msgstr "-x 和 -X 不能同時使用" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "don't create a checkout" msgstr "不建立一個檢出" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 msgid "create a bare repository" msgstr "建立一個純版本庫" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "create a mirror repository (implies bare)" msgstr "建立一個鏡像版本庫（也是純版本庫）" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "to clone from a local repository" msgstr "從本機版本庫複製" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "don't use local hardlinks, always copy" msgstr "不使用本機硬連結，始終複製" -#: builtin/clone.c:104 +#: builtin/clone.c:105 msgid "setup as shared repository" msgstr "設定為共享版本庫" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "路徑規格" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "在複製時初始化子模組" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "number of submodules cloned in parallel" msgstr "並發複製的子模組的數量" -#: builtin/clone.c:111 builtin/init-db.c:551 +#: builtin/clone.c:112 builtin/init-db.c:552 msgid "template-directory" msgstr "範本目錄" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:113 builtin/init-db.c:553 msgid "directory from which templates will be used" msgstr "範本目錄將被使用" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "參考版本庫" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:119 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "僅在複製時參考 --reference 指向的本機版本庫" -#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 msgid "name" msgstr "名稱" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游" -#: builtin/clone.c:122 +#: builtin/clone.c:123 msgid "checkout <branch> instead of the remote's HEAD" msgstr "檢出 <分支> 而不是遠端 HEAD" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "path to git-upload-pack on the remote" msgstr "遠端 git-upload-pack 路徑" -#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848 +#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860 #: builtin/pull.c:208 msgid "depth" msgstr "深度" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "create a shallow clone of that depth" msgstr "建立一個指定深度的淺複製" -#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503 +#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535 #: builtin/pull.c:211 msgid "time" msgstr "時間" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "create a shallow clone since a specific time" msgstr "從一個特定時間建立一個淺複製" -#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 +#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317 msgid "revision" msgstr "修訂版" -#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "深化淺複製的歷史，除了特定版本" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:133 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "只複製一個分支、HEAD 或 --branch" -#: builtin/clone.c:134 +#: builtin/clone.c:135 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "不要複製任何標籤，並且後續取得動作也不下載它們" -#: builtin/clone.c:136 +#: builtin/clone.c:137 msgid "any cloned submodules will be shallow" msgstr "子模組將以淺下載模式複製" -#: builtin/clone.c:137 builtin/init-db.c:560 +#: builtin/clone.c:138 builtin/init-db.c:561 msgid "gitdir" msgstr "git目錄" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:139 builtin/init-db.c:562 msgid "separate git dir from working tree" msgstr "git目錄和工作區分離" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:140 +#: builtin/clone.c:141 msgid "set config inside the new repository" msgstr "在新版本庫中設定設定訊息" -#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 -#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "server-specific" -#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 -#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "傳輸選項" -#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234 -#: builtin/push.c:571 +#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 位址" -#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237 -#: builtin/push.c:573 +#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 位址" -#: builtin/clone.c:149 +#: builtin/clone.c:150 msgid "any cloned submodules will use their remote-tracking branch" msgstr "任何複製的子模組將使用它們的遠端追蹤分支" -#: builtin/clone.c:151 +#: builtin/clone.c:152 msgid "initialize sparse-checkout file to include only files at root" msgstr "初始化稀疏檢出檔案，只包含根目錄中的檔案" -#: builtin/clone.c:287 +#: builtin/clone.c:288 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12266,42 +12510,42 @@ msgstr "" "無法猜到目錄名。\n" "請在指令列指定一個目錄" -#: builtin/clone.c:340 +#: builtin/clone.c:341 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能為 '%s' 新增一個備用：%s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:414 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一個目錄" -#: builtin/clone.c:431 +#: builtin/clone.c:432 #, c-format msgid "failed to start iterator over '%s'" msgstr "無法在 '%s' 上啟動疊代器" -#: builtin/clone.c:462 +#: builtin/clone.c:463 #, c-format msgid "failed to create link '%s'" msgstr "建立連結 '%s' 失敗" -#: builtin/clone.c:466 +#: builtin/clone.c:467 #, c-format msgid "failed to copy file to '%s'" msgstr "複製檔案至 '%s' 失敗" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "failed to iterate over '%s'" msgstr "無法在 '%s' 上疊代" -#: builtin/clone.c:498 +#: builtin/clone.c:499 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:512 +#: builtin/clone.c:513 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12311,134 +12555,144 @@ msgstr "" "您可以透過 'git status' 檢查哪些已被檢出，然後使用指令\n" "'git restore --source=HEAD :/' 重試\n" -#: builtin/clone.c:589 +#: builtin/clone.c:590 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能發現要複製的遠端分支 %s。" -#: builtin/clone.c:708 +#: builtin/clone.c:709 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c:756 +#: builtin/clone.c:757 msgid "failed to initialize sparse-checkout" msgstr "無法初始化稀疏檢出" -#: builtin/clone.c:779 +#: builtin/clone.c:780 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "遠端 HEAD 指向一個不存在的引用，無法檢出。\n" -#: builtin/clone.c:811 +#: builtin/clone.c:812 msgid "unable to checkout working tree" msgstr "不能檢出工作區" -#: builtin/clone.c:868 +#: builtin/clone.c:887 msgid "unable to write parameters to config file" msgstr "無法將參數寫入設定檔案" -#: builtin/clone.c:931 +#: builtin/clone.c:950 msgid "cannot repack to clean up" msgstr "無法執行 repack 來清理" -#: builtin/clone.c:933 +#: builtin/clone.c:952 msgid "cannot unlink temporary alternates file" msgstr "無法刪除暫時的 alternates 檔案" -#: builtin/clone.c:971 builtin/receive-pack.c:1982 +#: builtin/clone.c:992 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "太多參數。" -#: builtin/clone.c:975 +#: builtin/clone.c:996 msgid "You must specify a repository to clone." msgstr "您必須指定一個版本庫來複製。" -#: builtin/clone.c:988 +#: builtin/clone.c:1009 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 選項不相容。" -#: builtin/clone.c:991 +#: builtin/clone.c:1012 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 選項不相容。" -#: builtin/clone.c:1007 +#: builtin/clone.c:1025 #, c-format msgid "repository '%s' does not exist" msgstr "版本庫 '%s' 不存在" -#: builtin/clone.c:1011 builtin/fetch.c:1794 +#: builtin/clone.c:1029 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一個正數" -#: builtin/clone.c:1021 +#: builtin/clone.c:1039 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目標路徑 '%s' 已經存在，並且不是一個空目錄。" -#: builtin/clone.c:1033 +#: builtin/clone.c:1045 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。" + +#: builtin/clone.c:1059 #, c-format msgid "working tree '%s' already exists." msgstr "工作區 '%s' 已經存在。" -#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271 -#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271 +#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能為 '%s' 建立先導目錄" -#: builtin/clone.c:1053 +#: builtin/clone.c:1079 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能建立工作區目錄 '%s'" -#: builtin/clone.c:1073 +#: builtin/clone.c:1099 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "複製到純版本庫 '%s'...\n" -#: builtin/clone.c:1075 +#: builtin/clone.c:1101 #, c-format msgid "Cloning into '%s'...\n" msgstr "正複製到 '%s'...\n" -#: builtin/clone.c:1099 +#: builtin/clone.c:1125 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不相容" -#: builtin/clone.c:1164 +#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' 不是一個有效的遠端名稱" + +#: builtin/clone.c:1210 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本機複製時被忽略，請改用 file:// 協定。" -#: builtin/clone.c:1166 +#: builtin/clone.c:1212 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本機複製時被忽略，請改用 file:// 協定。" -#: builtin/clone.c:1168 +#: builtin/clone.c:1214 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本機複製時被忽略，請改用 file:// 協定。" -#: builtin/clone.c:1170 +#: builtin/clone.c:1216 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter 在本機複製時被忽略，請改用 file:// 協定。" -#: builtin/clone.c:1173 +#: builtin/clone.c:1219 msgid "source repository is shallow, ignoring --local" msgstr "源版本庫是淺複製，忽略 --local" -#: builtin/clone.c:1178 +#: builtin/clone.c:1224 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1262 builtin/clone.c:1270 +#: builtin/clone.c:1311 builtin/clone.c:1319 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "遠端分支 %s 在上游 %s 未發現" -#: builtin/clone.c:1273 +#: builtin/clone.c:1322 msgid "You appear to have cloned an empty repository." msgstr "您似乎複製了一個空版本庫。" @@ -12474,103 +12728,107 @@ msgstr "兩列之間的填充空間" msgid "--command must be the first argument" msgstr "--command 必須是第一個參數" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:21 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 msgid "" "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--" "[no-]progress]" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:26 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 msgid "" "git commit-graph write [--object-dir <objdir>] [--append] [--" "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]progress] <split options>" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" msgstr "" "git commit-graph write [--object-dir <objdir>] [--append] [--" "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]progress] <split options>" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" -#: builtin/commit-graph.c:62 +#: builtin/commit-graph.c:64 #, c-format msgid "could not find object directory matching %s" msgstr "找不到符合 %s 的物件目錄" -#: builtin/commit-graph.c:78 builtin/commit-graph.c:177 -#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 msgid "dir" msgstr "目錄" -#: builtin/commit-graph.c:79 builtin/commit-graph.c:178 -#: builtin/commit-graph.c:277 +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 msgid "The object directory to store the graph" msgstr "儲存圖形的物件目錄" -#: builtin/commit-graph.c:81 +#: builtin/commit-graph.c:83 msgid "if the commit-graph is split, only verify the tip file" msgstr "如果提交圖形被分割，只驗證頭一個檔案" -#: builtin/commit-graph.c:104 +#: builtin/commit-graph.c:106 #, c-format msgid "Could not open commit-graph '%s'" msgstr "無法開啟提交圖形 '%s'" -#: builtin/commit-graph.c:138 +#: builtin/commit-graph.c:142 #, c-format msgid "unrecognized --split argument, %s" msgstr "無法識別的 --split 參數，%s" -#: builtin/commit-graph.c:151 +#: builtin/commit-graph.c:155 #, c-format msgid "unexpected non-hex object ID: %s" msgstr "非期望的非十六進位物件 ID：%s" -#: builtin/commit-graph.c:156 +#: builtin/commit-graph.c:160 #, c-format msgid "invalid object: %s" msgstr "物件無效：%s" -#: builtin/commit-graph.c:180 +#: builtin/commit-graph.c:213 msgid "start walk at all refs" msgstr "開始遍歷所有引用" -#: builtin/commit-graph.c:182 +#: builtin/commit-graph.c:215 msgid "scan pack-indexes listed by stdin for commits" msgstr "從標準輸入中的包索引檔案列表中掃描提交" -#: builtin/commit-graph.c:184 +#: builtin/commit-graph.c:217 msgid "start walk at commits listed by stdin" msgstr "從標準輸入中的提交開始掃描" -#: builtin/commit-graph.c:186 +#: builtin/commit-graph.c:219 msgid "include all commits already in the commit-graph file" msgstr "包含 commit-graph 檔案中已有所有提交" -#: builtin/commit-graph.c:188 +#: builtin/commit-graph.c:221 msgid "enable computation for changed paths" msgstr "啟用已變更路徑的計算" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:224 msgid "allow writing an incremental commit-graph file" msgstr "允許寫一個增量提交圖形檔案" -#: builtin/commit-graph.c:195 +#: builtin/commit-graph.c:228 msgid "maximum number of commits in a non-base split commit-graph" msgstr "在非基本分割提交圖形中的最大提交數" -#: builtin/commit-graph.c:197 +#: builtin/commit-graph.c:230 msgid "maximum ratio between two levels of a split commit-graph" msgstr "一個分割提交圖形的兩個級別之間的最大比率" -#: builtin/commit-graph.c:199 +#: builtin/commit-graph.c:232 msgid "only expire files older than a given date-time" msgstr "只將舊於指定日期與時間的檔案設為過期" -#: builtin/commit-graph.c:215 +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "變更路徑的布隆過濾器要計算的最大量" + +#: builtin/commit-graph.c:255 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs" -#: builtin/commit-graph.c:245 +#: builtin/commit-graph.c:287 msgid "Collecting commits from input" msgstr "正在從輸入收集提交" @@ -12587,7 +12845,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重複的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555 #, c-format msgid "not a valid object name %s" msgstr "不是一個有效的物件名 %s" @@ -12615,13 +12873,13 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交物件 ID" -#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470 #: builtin/tag.c:413 msgid "message" msgstr "訊息" -#: builtin/commit-tree.c:115 builtin/commit.c:1506 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "提交訊息" @@ -12629,7 +12887,7 @@ msgstr "提交訊息" msgid "read commit log message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交簽名" @@ -12774,12 +13032,12 @@ msgid "" "in the current commit message" msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "不能查詢提交 %s" -#: builtin/commit.c:729 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:425 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正從標準輸入中讀取日誌訊息）\n" @@ -12805,35 +13063,35 @@ msgstr "不能讀取 MERGE_MSG" msgid "could not write commit template" msgstr "不能寫提交範本" -#: builtin/commit.c:852 -#, c-format +#: builtin/commit.c:853 msgid "" "\n" "It looks like you may be committing a merge.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" -"似乎您正在做一個合併提交。如果不對，請刪除檔案\n" -"\t%s\n" -"然後重試。\n" +"您似乎正在提交一個合併提交。\n" +"如果錯誤，請執行\n" +"\tgit update-ref -d MERGE_HEAD\n" +"後重試。\n" -#: builtin/commit.c:857 -#, c-format +#: builtin/commit.c:858 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" -"似乎您正在做一個揀選提交。如果不對，請刪除檔案\n" -"\t%s\n" -"然後重試。\n" +"您似乎正在提交一個揀選提交。\n" +"如果錯誤，請執行\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"後重試。\n" -#: builtin/commit.c:870 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12842,7 +13100,7 @@ msgstr "" "請為您的變更輸入提交說明。以 '%c' 開始的行將被忽略，而一個空的提交\n" "說明將會終止提交。\n" -#: builtin/commit.c:878 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12853,324 +13111,324 @@ msgstr "" "也可以刪除它們。一個空的提交說明將會終止提交。\n" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:895 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:903 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:910 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:928 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "無法讀取索引" -#: builtin/commit.c:999 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "無法建立樹狀物件" -#: builtin/commit.c:1013 builtin/tag.c:276 +#: builtin/commit.c:1011 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "請使用 -m 或 -F 選項提供提交說明。\n" -#: builtin/commit.c:1057 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合" -#: builtin/commit.c:1071 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "無效的忽略模式 '%s'" -#: builtin/commit.c:1089 builtin/commit.c:1333 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "無效的未追蹤檔案參數 '%s'" -#: builtin/commit.c:1129 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long 和 -z 選項不相容" -#: builtin/commit.c:1173 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "同時使用 --reset-author 和 --author 沒有意義" -#: builtin/commit.c:1182 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "您沒有可修補的提交。" -#: builtin/commit.c:1185 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正處於一個合併過程中 -- 無法修補提交。" -#: builtin/commit.c:1187 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正處於一個揀選過程中 -- 無法修補提交。" -#: builtin/commit.c:1189 +#: builtin/commit.c:1187 msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正處於重定基底的過程中 -- 無法修訂。" -#: builtin/commit.c:1192 +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "選項 --squash 和 --fixup 不能同時使用" -#: builtin/commit.c:1202 +#: builtin/commit.c:1200 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一個 -c/-C/-F/--fixup 選項。" -#: builtin/commit.c:1204 +#: builtin/commit.c:1202 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "選項 -m 不能和 -c/-C/-F 同時使用。" -#: builtin/commit.c:1213 +#: builtin/commit.c:1211 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。" -#: builtin/commit.c:1231 +#: builtin/commit.c:1229 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。" -#: builtin/commit.c:1237 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "以簡潔的格式顯示狀態" -#: builtin/commit.c:1370 builtin/commit.c:1531 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "顯示分支訊息" -#: builtin/commit.c:1372 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "顯示儲藏區訊息" -#: builtin/commit.c:1374 builtin/commit.c:1533 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "計算完整的領先/落後值" -#: builtin/commit.c:1376 +#: builtin/commit.c:1374 msgid "version" msgstr "版本" -#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 -#: builtin/worktree.c:722 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 +#: builtin/worktree.c:725 msgid "machine-readable output" msgstr "機器可讀的輸出" -#: builtin/commit.c:1379 builtin/commit.c:1537 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "以長格式顯示狀態（預設）" -#: builtin/commit.c:1382 builtin/commit.c:1540 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 +#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336 msgid "mode" msgstr "模式" -#: builtin/commit.c:1385 builtin/commit.c:1543 +#: builtin/commit.c:1383 builtin/commit.c:1541 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設：all）" -#: builtin/commit.c:1389 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "顯示已忽略的檔案，可選模式：traditional、matching、no。（預設：traditional）" -#: builtin/commit.c:1391 parse-options.h:192 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "何時" -#: builtin/commit.c:1392 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設：all）" -#: builtin/commit.c:1394 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "以列的方式顯示未追蹤的檔案" -#: builtin/commit.c:1395 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "不檢測重新命名" -#: builtin/commit.c:1397 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "檢測重新命名，可以設定索引相似度" -#: builtin/commit.c:1417 +#: builtin/commit.c:1415 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支援已忽略和未追蹤檔案參數的組合" -#: builtin/commit.c:1499 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "提交成功後不顯示概述訊息" -#: builtin/commit.c:1500 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "在提交說明範本裡顯示差異" -#: builtin/commit.c:1502 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "提交說明選項" -#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415 msgid "read message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit.c:1504 +#: builtin/commit.c:1502 msgid "author" msgstr "作者" -#: builtin/commit.c:1504 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "提交時覆蓋作者" -#: builtin/commit.c:1505 builtin/gc.c:538 +#: builtin/commit.c:1503 builtin/gc.c:542 msgid "date" msgstr "日期" -#: builtin/commit.c:1505 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 -#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "提交" -#: builtin/commit.c:1507 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "重用並編輯指定提交的提交說明" -#: builtin/commit.c:1508 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "重用指定提交的提交說明" -#: builtin/commit.c:1509 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交說明用以修正指定的提交" -#: builtin/commit.c:1510 +#: builtin/commit.c:1508 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" -#: builtin/commit.c:1511 +#: builtin/commit.c:1509 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" -#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293 +#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301 #: builtin/pull.c:145 builtin/revert.c:110 -msgid "add Signed-off-by:" -msgstr "新增 Signed-off-by: 簽名" +msgid "add a Signed-off-by trailer" +msgstr "在結尾加入 Signed-off-by" -#: builtin/commit.c:1513 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "使用指定的範本檔案" -#: builtin/commit.c:1514 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "強制編輯提交" -#: builtin/commit.c:1516 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "在提交說明範本裡包含狀態訊息" -#: builtin/commit.c:1521 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "提交內容選項" -#: builtin/commit.c:1522 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "提交所有改動的檔案" -#: builtin/commit.c:1523 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "新增指定的檔案到索引區等待提交" -#: builtin/commit.c:1524 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "互動式新增檔案" -#: builtin/commit.c:1525 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "互動式新增變更" -#: builtin/commit.c:1526 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "只提交指定的檔案" -#: builtin/commit.c:1527 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "繞過 pre-commit 和 commit-msg 掛鉤" -#: builtin/commit.c:1528 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "顯示將要提交的內容" -#: builtin/commit.c:1541 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1542 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "繞過 post-rewrite 掛鉤" -#: builtin/commit.c:1549 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "允許一個空提交" -#: builtin/commit.c:1551 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "允許空的提交說明" -#: builtin/commit.c:1624 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "損壞的 MERGE_HEAD 檔案（%s）" -#: builtin/commit.c:1631 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "不能讀取 MERGE_MODE" -#: builtin/commit.c:1652 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "不能讀取提交說明：%s" -#: builtin/commit.c:1659 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "終止提交因為提交說明為空。\n" -#: builtin/commit.c:1664 +#: builtin/commit.c:1662 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "終止提交；您未更改來自範本的提交說明。\n" -#: builtin/commit.c:1698 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13183,211 +13441,223 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<選項>]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:109 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "無法識別的 --type 參數，%s" -#: builtin/config.c:116 +#: builtin/config.c:121 msgid "only one type at a time" msgstr "一次只能一個類型" -#: builtin/config.c:125 +#: builtin/config.c:130 msgid "Config file location" msgstr "設定檔案位置" -#: builtin/config.c:126 +#: builtin/config.c:131 msgid "use global config file" msgstr "使用全域設定檔案" -#: builtin/config.c:127 +#: builtin/config.c:132 msgid "use system config file" msgstr "使用系統級設定檔案" -#: builtin/config.c:128 +#: builtin/config.c:133 msgid "use repository config file" msgstr "使用版本庫級設定檔案" -#: builtin/config.c:129 +#: builtin/config.c:134 msgid "use per-worktree config file" msgstr "使用工作區級別的設定檔案" -#: builtin/config.c:130 +#: builtin/config.c:135 msgid "use given config file" msgstr "使用指定的設定檔案" -#: builtin/config.c:131 +#: builtin/config.c:136 msgid "blob-id" msgstr "資料物件 ID" -#: builtin/config.c:131 +#: builtin/config.c:136 msgid "read config from given blob object" msgstr "從提供的資料物件讀取設定" -#: builtin/config.c:132 +#: builtin/config.c:137 msgid "Action" msgstr "動作" -#: builtin/config.c:133 -msgid "get value: name [value-regex]" -msgstr "取得值：name [value-regex]" +#: builtin/config.c:138 +msgid "get value: name [value-pattern]" +msgstr "取得值：name [value-pattern]" -#: builtin/config.c:134 -msgid "get all values: key [value-regex]" -msgstr "獲得所有的值：key [value-regex]" +#: builtin/config.c:139 +#| msgid "get all values: key [value-regex]" +msgid "get all values: key [value-pattern]" +msgstr "取得所有值：key [value-pattern]" -#: builtin/config.c:135 -msgid "get values for regexp: name-regex [value-regex]" -msgstr "根據正規表示式獲得值：name-regex [value-regex]" +#: builtin/config.c:140 +#| msgid "get values for regexp: name-regex [value-regex]" +msgid "get values for regexp: name-regex [value-pattern]" +msgstr "根據正規表示式取得值：name-regex [value-pattern]" -#: builtin/config.c:136 +#: builtin/config.c:141 msgid "get value specific for the URL: section[.var] URL" msgstr "獲得 URL 取值：section[.var] URL" -#: builtin/config.c:137 -msgid "replace all matching variables: name value [value_regex]" -msgstr "取代所有符合的變數：name value [value_regex]" +#: builtin/config.c:142 +#| msgid "replace all matching variables: name value [value_regex]" +msgid "replace all matching variables: name value [value-pattern]" +msgstr "取代所有符合的變數：name value [value-pattern]" -#: builtin/config.c:138 +#: builtin/config.c:143 msgid "add a new variable: name value" msgstr "新增一個新的變數：name value" -#: builtin/config.c:139 -msgid "remove a variable: name [value-regex]" -msgstr "刪除一個變數：name [value-regex]" +#: builtin/config.c:144 +msgid "remove a variable: name [value-pattern]" +msgstr "移除一個變數：name [value-pattern]" -#: builtin/config.c:140 -msgid "remove all matches: name [value-regex]" -msgstr "刪除所有符合項：name [value-regex]" +#: builtin/config.c:145 +#| msgid "remove all matches: name [value-regex]" +msgid "remove all matches: name [value-pattern]" +msgstr "移除所有符合項目：name [value-pattern]" -#: builtin/config.c:141 +#: builtin/config.c:146 msgid "rename section: old-name new-name" msgstr "重新命名小節：old-name new-name" -#: builtin/config.c:142 +#: builtin/config.c:147 msgid "remove a section: name" msgstr "刪除一個小節：name" -#: builtin/config.c:143 +#: builtin/config.c:148 msgid "list all" msgstr "全部列出" -#: builtin/config.c:144 +#: builtin/config.c:149 +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "比較「value-pattern」的值時，使用字串相等比較" + +#: builtin/config.c:150 msgid "open an editor" msgstr "開啟一個編輯器" -#: builtin/config.c:145 +#: builtin/config.c:151 msgid "find the color configured: slot [default]" msgstr "獲得設定的顏色：設定 [預設]" -#: builtin/config.c:146 +#: builtin/config.c:152 msgid "find the color setting: slot [stdout-is-tty]" msgstr "獲得顏色設定：設定 [stdout-is-tty]" -#: builtin/config.c:147 +#: builtin/config.c:153 msgid "Type" msgstr "類型" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" msgstr "取值為該類型" -#: builtin/config.c:149 +#: builtin/config.c:155 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c:150 +#: builtin/config.c:156 msgid "value is decimal number" msgstr "值是十進位數" -#: builtin/config.c:151 +#: builtin/config.c:157 msgid "value is --bool or --int" msgstr "值是 --bool or --int" -#: builtin/config.c:152 +#: builtin/config.c:158 +msgid "value is --bool or string" +msgstr "值是 --bool 或 string" + +#: builtin/config.c:159 msgid "value is a path (file or directory name)" msgstr "值是一個路徑（檔案或目錄名）" -#: builtin/config.c:153 +#: builtin/config.c:160 msgid "value is an expiry date" msgstr "值是一個到期日期" -#: builtin/config.c:154 +#: builtin/config.c:161 msgid "Other" msgstr "其它" -#: builtin/config.c:155 +#: builtin/config.c:162 msgid "terminate values with NUL byte" msgstr "終止值是 NUL 位元組" -#: builtin/config.c:156 +#: builtin/config.c:163 msgid "show variable names only" msgstr "只顯示變數名" -#: builtin/config.c:157 +#: builtin/config.c:164 msgid "respect include directives on lookup" msgstr "查詢時參照 include 指令遞迴尋找" -#: builtin/config.c:158 +#: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或指令列）" -#: builtin/config.c:159 +#: builtin/config.c:166 msgid "show scope of config (worktree, local, global, system, command)" msgstr "" "顯示設定檔的作用域 (工作區 worktree、本機 local、全域 global、系統 system、指" "令 command)" -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" msgstr "取值" -#: builtin/config.c:160 +#: builtin/config.c:167 msgid "with --get, use default value when missing entry" msgstr "使用 --get 但未指定參數時所使用的預設值" -#: builtin/config.c:174 +#: builtin/config.c:181 #, c-format msgid "wrong number of arguments, should be %d" msgstr "錯誤的參數個數，應該為 %d 個" -#: builtin/config.c:176 +#: builtin/config.c:183 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "錯誤的參數個數，應該為從 %d 個到 %d 個" -#: builtin/config.c:324 +#: builtin/config.c:339 #, c-format msgid "invalid key pattern: %s" msgstr "無效鍵名模式：%s" -#: builtin/config.c:360 +#: builtin/config.c:377 #, c-format msgid "failed to format default config value: %s" msgstr "格式化預設設定值失敗：%s" -#: builtin/config.c:417 +#: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" msgstr "無法解析顏色 '%s'" -#: builtin/config.c:459 +#: builtin/config.c:483 msgid "unable to parse default color value" msgstr "無法解析預設顏色值" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:536 builtin/config.c:833 msgid "not in a git directory" msgstr "不在 git 版本庫中" -#: builtin/config.c:515 +#: builtin/config.c:539 msgid "writing to stdin is not supported" msgstr "不支援寫到標準輸入" -#: builtin/config.c:518 +#: builtin/config.c:542 msgid "writing config blobs is not supported" msgstr "不支援寫到設定資料物件" -#: builtin/config.c:603 +#: builtin/config.c:627 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13402,23 +13672,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:652 msgid "only one config file at a time" msgstr "一次只能有一個設定檔案" -#: builtin/config.c:632 +#: builtin/config.c:658 msgid "--local can only be used inside a git repository" msgstr "--local 只能在一個版本庫內使用" -#: builtin/config.c:635 +#: builtin/config.c:660 msgid "--blob can only be used inside a git repository" msgstr "--blob 只能在一個版本庫內使用" -#: builtin/config.c:655 +#: builtin/config.c:662 +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree 只能在 git 版本庫中使用" + +#: builtin/config.c:684 msgid "$HOME not set" msgstr "$HOME 未設定" -#: builtin/config.c:679 +#: builtin/config.c:708 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13427,51 +13701,55 @@ msgstr "" "不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴展。\n" "詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節" -#: builtin/config.c:714 +#: builtin/config.c:743 msgid "--get-color and variable type are incoherent" msgstr "--get-color 和變數類型不相容" -#: builtin/config.c:719 +#: builtin/config.c:748 msgid "only one action at a time" msgstr "一次只能有一個動作" -#: builtin/config.c:732 +#: builtin/config.c:761 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only 僅適用於 --list 或 --get-regexp" -#: builtin/config.c:738 +#: builtin/config.c:767 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "--show-origin 僅適用於 --get、--get-all、--get-regexp 和 --list" -#: builtin/config.c:744 +#: builtin/config.c:773 msgid "--default is only applicable to --get" msgstr "--default 僅適用於 --get" -#: builtin/config.c:757 +#: builtin/config.c:806 +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "--fixed-value 僅套用至 'value-pattern'" + +#: builtin/config.c:822 #, c-format msgid "unable to read config file '%s'" msgstr "無法讀取設定檔案 '%s'" -#: builtin/config.c:760 +#: builtin/config.c:825 msgid "error processing config file(s)" msgstr "處理設定檔案發生錯誤" -#: builtin/config.c:770 +#: builtin/config.c:835 msgid "editing stdin is not supported" msgstr "不支援編輯標準輸入" -#: builtin/config.c:772 +#: builtin/config.c:837 msgid "editing blobs is not supported" msgstr "不支援編輯資料物件" -#: builtin/config.c:786 +#: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" msgstr "不能建立設定檔案 %s" -#: builtin/config.c:799 +#: builtin/config.c:864 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13480,7 +13758,7 @@ msgstr "" "無法用一個值覆蓋多個值\n" " 使用一個正規表示式、--add 或 --replace-all 來修改 %s。" -#: builtin/config.c:873 builtin/config.c:884 +#: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" msgstr "無此小節：%s" @@ -13493,6 +13771,36 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "以使用者可讀的格式顯示大小" +#: builtin/credential-cache--daemon.c:226 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" +"您的 socket 目錄權限過於寬鬆，其他使用者可能會讀取您快取的認證訊息。考慮執" +"行：\n" +"\n" +"\tchmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "除錯訊息輸出到標準錯誤" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache 無法使用；缺少 unix socket 支援" + +#: builtin/credential-store.c:66 +#, c-format +msgid "unable to get credential storage lock in %d ms" +msgstr "無法在 %d 毫秒內取得憑證儲存空間的鎖" + #: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<選項>] [<提交號>...]" @@ -13657,41 +13965,50 @@ msgstr "--dirty 與提交號不相容" msgid "--broken is incompatible with commit-ishes" msgstr "--broken 與提交號不相容" +#: builtin/diff-tree.c:155 +#| msgid "-p and --overlay are mutually exclusive" +msgid "--stdin and --merge-base are mutually exclusive" +msgstr "--stdin 和 --merge-base 互斥" + +#: builtin/diff-tree.c:157 +msgid "--merge-base only works with two commits" +msgstr "--merge-base 只對 2 個以上的提交有用" + #: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一個正規檔案或符號連結" -#: builtin/diff.c:242 +#: builtin/diff.c:258 #, c-format msgid "invalid option: %s" msgstr "無效選項：%s" -#: builtin/diff.c:359 +#: builtin/diff.c:375 #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s: 無合併基底" -#: builtin/diff.c:469 +#: builtin/diff.c:485 msgid "Not a git repository" msgstr "不是一個 git 版本庫" -#: builtin/diff.c:514 +#: builtin/diff.c:530 builtin/grep.c:681 #, c-format msgid "invalid object '%s' given." msgstr "提供了無效物件 '%s'。" -#: builtin/diff.c:525 +#: builtin/diff.c:541 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超過兩個資料物件：'%s'" -#: builtin/diff.c:530 +#: builtin/diff.c:546 #, c-format msgid "unhandled object '%s' given." msgstr "無法處理的物件 '%s'。" -#: builtin/diff.c:564 +#: builtin/diff.c:580 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s：多個合併基底，使用 %s" @@ -13720,7 +14037,7 @@ msgstr "無法讀取符號連結檔案 %s" msgid "could not read object %s for symlink %s" msgstr "無法讀取符號連結 %2$s 指向的物件 %1$s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13728,83 +14045,83 @@ msgstr "" "不支援在目錄比較模式（'-d' 和 '--dir-diff'）中採用組合差異格式（'-c' 和 '--" "cc'）。" -#: builtin/difftool.c:634 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "兩個檔案都被修改：'%s' 和 '%s'。" -#: builtin/difftool.c:636 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "工作區檔案被留了下來。" -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "暫存檔存在於 '%s'。" -#: builtin/difftool.c:648 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者復原它們。" -#: builtin/difftool.c:697 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:699 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "執行一個全目錄差異比較" -#: builtin/difftool.c:701 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "啟動差異比較工具之前不提示" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符號連結" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "tool" msgstr "工具" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "使用指定的差異比較工具" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "顯示可以用在 `--tool` 參數後的差異工具列表" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "當執行 diff 工具返回非零離開碼時，使 'git-difftool' 離開" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "指定一個用於檢視差異的自訂指令" -#: builtin/difftool.c:717 +#: builtin/difftool.c:716 msgid "passed to `diff`" msgstr "傳遞給 `diff`" -#: builtin/difftool.c:732 +#: builtin/difftool.c:731 msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作區或者 --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:738 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff 和 --no-index 不相容" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui、--tool 和 --extcmd 互斥" -#: builtin/difftool.c:750 +#: builtin/difftool.c:749 msgid "no <tool> given for --tool=<tool>" msgstr "沒有為 --tool=<工具> 參數提供 <工具>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:756 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "沒有為 --extcmd=<指令> 參數提供 <指令>" @@ -13812,24 +14129,24 @@ msgstr "沒有為 --extcmd=<指令> 參數提供 <指令>" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "類型" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "git_env_*(...) 的預設值" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "安靜模式，只使用 git_env_*() 的值作為離開碼" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "選項 `--default' 和 `type=bool` 期望一個布林值，不是 `%s`" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -13844,95 +14161,124 @@ msgstr "git fast-export [rev-list-opts]" msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1177 msgid "--anonymize-map token cannot be empty" msgstr "--anonymize-map 的鍵不能空白" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1197 msgid "show progress after <n> objects" msgstr "在 <n> 個物件之後顯示進度" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1199 msgid "select handling of signed tags" msgstr "選擇如何處理簽名標籤" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1202 msgid "select handling of tags that tag filtered objects" msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式" -#: builtin/fast-export.c:1206 +#: builtin/fast-export.c:1205 msgid "select handling of commit messages in an alternate encoding" msgstr "選擇使用備用編碼處理提交說明" -#: builtin/fast-export.c:1209 +#: builtin/fast-export.c:1208 msgid "Dump marks to this file" msgstr "把標記儲存到這個檔案" -#: builtin/fast-export.c:1211 +#: builtin/fast-export.c:1210 msgid "Import marks from this file" msgstr "從這個檔案匯入標記" -#: builtin/fast-export.c:1215 +#: builtin/fast-export.c:1214 msgid "Import marks from this file if it exists" msgstr "從該檔案匯入標記（如果存在的話）" -#: builtin/fast-export.c:1217 +#: builtin/fast-export.c:1216 msgid "Fake a tagger when tags lack one" msgstr "當標籤缺少標記者欄位時，假裝提供一個" -#: builtin/fast-export.c:1219 +#: builtin/fast-export.c:1218 msgid "Output full tree for each commit" msgstr "每次提交都輸出整個樹" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1220 msgid "Use the done feature to terminate the stream" msgstr "使用 done 功能來終止流" -#: builtin/fast-export.c:1222 +#: builtin/fast-export.c:1221 msgid "Skip output of blob data" msgstr "跳過資料物件的輸出" -#: builtin/fast-export.c:1223 builtin/log.c:1724 +#: builtin/fast-export.c:1222 builtin/log.c:1816 msgid "refspec" msgstr "參照規格" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1223 msgid "Apply refspec to exported refs" msgstr "對匯出的引用應用引用規格" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1224 msgid "anonymize output" msgstr "匿名輸出" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1225 msgid "from:to" msgstr "from:to" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1226 msgid "convert <from> to <to> in anonymized output" msgstr "在匿名輸出中將 <from> 轉換為 <to>" -#: builtin/fast-export.c:1230 +#: builtin/fast-export.c:1229 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:1231 msgid "Show original object ids of blobs/commits" msgstr "顯示資料物件/提交的原始物件 ID" -#: builtin/fast-export.c:1234 +#: builtin/fast-export.c:1233 msgid "Label tags with mark ids" msgstr "對帶有標記 ID 的標籤做標記" -#: builtin/fast-export.c:1257 +#: builtin/fast-export.c:1256 msgid "--anonymize-map without --anonymize does not make sense" msgstr "缺少 --anonymize 的 --anonymize-map 沒有意義" -#: builtin/fast-export.c:1272 +#: builtin/fast-export.c:1271 msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists" -#: builtin/fetch-pack.c:245 +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "「%s」子模組缺少 from 標記" + +#: builtin/fast-import.c:3090 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "「%s」子模組缺少 to 標記" + +#: builtin/fast-import.c:3225 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "預期 'mark' 指令，得到 %s" + +#: builtin/fast-import.c:3230 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "預期 'to' 指令，得到 %s" + +#: builtin/fast-import.c:3322 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "期望子模組 rewrite 選項的格式是 name:filename" + +#: builtin/fast-import.c:3377 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能" + +#: builtin/fetch-pack.c:241 #, c-format msgid "Lockfile created but not reported: %s" msgstr "已建立鎖定檔案，但尚未回報：%s" @@ -13953,182 +14299,190 @@ msgstr "git fetch --multiple [<選項>] [(<版本庫> | <組>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<選項>]" -#: builtin/fetch.c:117 +#: builtin/fetch.c:119 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能為負數" -#: builtin/fetch.c:140 builtin/pull.c:185 +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "從所有的遠端抓取" -#: builtin/fetch.c:142 builtin/pull.c:245 +#: builtin/fetch.c:144 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "為 git pull/fetch 設定上游" -#: builtin/fetch.c:144 builtin/pull.c:188 +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它" -#: builtin/fetch.c:146 builtin/pull.c:191 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "上傳包到遠端的路徑" -#: builtin/fetch.c:147 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "強制覆蓋本機引用" -#: builtin/fetch.c:149 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "從多個遠端抓取" -#: builtin/fetch.c:151 builtin/pull.c:195 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "抓取所有的標籤和關聯物件" -#: builtin/fetch.c:153 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何標籤(--no-tags)" -#: builtin/fetch.c:155 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "子模組取得的並發數" -#: builtin/fetch.c:157 builtin/pull.c:198 +#: builtin/fetch.c:159 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "清除遠端已經不存在的分支的追蹤分支" -#: builtin/fetch.c:159 +#: builtin/fetch.c:161 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除遠端不存在的本機標籤，並且取代變更標籤" # 譯者：可選值，不能翻譯 -#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:161 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "控制子模組的遞迴抓取" -#: builtin/fetch.c:165 builtin/pull.c:206 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "將取得的參考寫入 FETCH_HEAD 檔案" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "保持下載包" -#: builtin/fetch.c:167 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "允許更新 HEAD 引用" -#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "深化淺複製的歷史" -#: builtin/fetch.c:172 builtin/pull.c:212 +#: builtin/fetch.c:176 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "基於時間來深化淺複製的歷史" -#: builtin/fetch.c:178 builtin/pull.c:221 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "轉換為一個完整的版本庫" -#: builtin/fetch.c:181 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "在子模組路徑輸出的前面加上此目錄" -#: builtin/fetch.c:184 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）" -#: builtin/fetch.c:188 builtin/pull.c:224 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:189 builtin/pull.c:226 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:190 builtin/pull.c:227 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "指定取得動作的引用映射" -#: builtin/fetch.c:197 builtin/pull.c:240 +#: builtin/fetch.c:201 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "報告我們只擁有從該物件開始可以取得的物件" -#: builtin/fetch.c:200 -msgid "run 'gc --auto' after fetching" -msgstr "取得後執行 'gc --auto'" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "取得 (fetch) 後執行 'maintenance --auto'" -#: builtin/fetch.c:202 builtin/pull.c:243 +#: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上檢查強制更新" -#: builtin/fetch.c:204 +#: builtin/fetch.c:210 msgid "write the commit-graph after fetching" msgstr "抓取後寫入分支圖" -#: builtin/fetch.c:514 +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "從標準輸入中接受引用表達式" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "無法發現遠端 HEAD 引用" -#: builtin/fetch.c:654 +#: builtin/fetch.c:677 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "設定變數 fetch.output 包含無效值 %s" -#: builtin/fetch.c:752 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "物件 %s 未發現" -#: builtin/fetch.c:756 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[已拒絕]" -#: builtin/fetch.c:770 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "目前分支下不能執行取得動作" -#: builtin/fetch.c:780 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[標籤更新]" -#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 -#: builtin/fetch.c:852 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "不能更新本機引用" -#: builtin/fetch.c:785 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "會破壞現有的標籤" -#: builtin/fetch.c:807 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[新標籤]" -#: builtin/fetch.c:810 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:813 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:852 +#: builtin/fetch.c:875 msgid "forced update" msgstr "強制更新" -#: builtin/fetch.c:857 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "非快轉" -#: builtin/fetch.c:878 +#: builtin/fetch.c:901 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" @@ -14138,7 +14492,7 @@ msgstr "" "要重新啟用，請使用 '--show-forced-updates' 選項或執行\n" "'git config fetch.showForcedUpdates true'。" -#: builtin/fetch.c:882 +#: builtin/fetch.c:905 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14149,22 +14503,22 @@ msgstr "" "花了 %.2f 秒來檢查強制更新。您可以使用 '--no-show-forced-updates'\n" "或執行 'git config fetch.showForcedUpdates false' 以避免此項檢查。\n" -#: builtin/fetch.c:914 +#: builtin/fetch.c:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未傳送所有必需的物件\n" -#: builtin/fetch.c:935 +#: builtin/fetch.c:960 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒絕 %s 因為淺複製不允許被更新" -#: builtin/fetch.c:1020 builtin/fetch.c:1158 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "來自 %.*s\n" -#: builtin/fetch.c:1031 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14174,57 +14528,57 @@ msgstr "" " 'git remote prune %s' 來刪除舊的、有衝突的分支" # 譯者：請維持前導空格 -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr " （%s 將成為懸空狀態）" # 譯者：請維持前導空格 -#: builtin/fetch.c:1129 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成為懸空狀態）" -#: builtin/fetch.c:1161 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[已刪除]" -#: builtin/fetch.c:1162 builtin/remote.c:1112 +#: builtin/fetch.c:1195 builtin/remote.c:1118 msgid "(none)" msgstr "（無）" -#: builtin/fetch.c:1185 +#: builtin/fetch.c:1218 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒絕取得到非純版本庫的目前分支 %s" -#: builtin/fetch.c:1204 +#: builtin/fetch.c:1237 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "選項 \"%s\" 的值 \"%s\" 對於 %s 是無效的" -#: builtin/fetch.c:1207 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "選項 \"%s\" 為 %s 所忽略\n" -#: builtin/fetch.c:1415 +#: builtin/fetch.c:1448 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "檢測到多分支，和 --set-upstream 不相容" -#: builtin/fetch.c:1430 +#: builtin/fetch.c:1463 msgid "not setting upstream for a remote remote-tracking branch" msgstr "沒有為一個遠端追蹤分支設定上游" -#: builtin/fetch.c:1432 +#: builtin/fetch.c:1465 msgid "not setting upstream for a remote tag" msgstr "沒有為一個遠端標籤設定上游" -#: builtin/fetch.c:1434 +#: builtin/fetch.c:1467 msgid "unknown branch type" msgstr "未知的分支類型" -#: builtin/fetch.c:1436 +#: builtin/fetch.c:1469 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14232,70 +14586,74 @@ msgstr "" "未發現源分支。\n" "您需要使用 --set-upstream 選項指定一個分支。" -#: builtin/fetch.c:1562 builtin/fetch.c:1625 +#: builtin/fetch.c:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "正在取得 %s\n" -#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "不能取得 %s" -#: builtin/fetch.c:1584 +#: builtin/fetch.c:1620 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "無法取得 '%s'（離開碼：%d）\n" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1724 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定遠端版本庫。請透過一個 URL 或遠端版本庫名指定，用以取得新提交。" -#: builtin/fetch.c:1724 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "您需要指定一個標籤名稱。" -#: builtin/fetch.c:1778 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支援負數深度" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:1785 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同時使用" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義" -#: builtin/fetch.c:1800 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能帶一個版本庫參數" -#: builtin/fetch.c:1802 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 帶引用規格沒有任何意義" -#: builtin/fetch.c:1811 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "沒有這樣的遠端或遠端組：%s" -#: builtin/fetch.c:1818 +#: builtin/fetch.c:1869 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "取得組並指定引用規格沒有意義" -#: builtin/fetch.c:1836 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "只可以將 --filter 用於在 extensions.partialClone 中設定的遠端版本庫" +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "--stdin 只能在取得一個遠端時使用" + #: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" @@ -14330,8 +14688,8 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <物件>]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" @@ -14381,6 +14739,23 @@ msgstr "只列印包含該提交的引用" msgid "print only refs which don't contain the commit" msgstr "只列印不包含該提交的引用" +#: builtin/for-each-repo.c:9 +msgid "git for-each-repo --config=<config> <command-args>" +msgstr "git for-each-repo --config=<設定> <命令引數>" + +#: builtin/for-each-repo.c:37 +#| msgid "conflicted" +msgid "config" +msgstr "config" + +#: builtin/for-each-repo.c:38 +msgid "config key storing a list of repository paths" +msgstr "儲存版本庫路徑清單的設定鍵" + +#: builtin/for-each-repo.c:46 +msgid "missing --config=<config>" +msgstr "缺少 --config=<設定>" + #: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "未知" @@ -14525,7 +14900,7 @@ msgstr "正在檢查物件目錄" msgid "Checking %s link" msgstr "正在檢查 %s 連結" -#: builtin/fsck.c:696 builtin/index-pack.c:843 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "無效的 %s" @@ -14610,7 +14985,7 @@ msgstr "顯示進度" msgid "show verbose names for reachable objects" msgstr "顯示可以取得物件的詳細名稱" -#: builtin/fsck.c:847 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "正在檢查物件" @@ -14624,31 +14999,31 @@ msgstr "%s：物件缺少" msgid "invalid parameter: expected sha1, got '%s'" msgstr "無效的參數：期望 sha1，得到 '%s'" -#: builtin/gc.c:35 +#: builtin/gc.c:39 msgid "git gc [<options>]" msgstr "git gc [<選項>]" -#: builtin/gc.c:90 +#: builtin/gc.c:94 #, c-format msgid "Failed to fstat %s: %s" msgstr "對 %s 呼叫 fstat 失敗：%s" -#: builtin/gc.c:126 +#: builtin/gc.c:130 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "無法解析 '%s' 值 '%s'" -#: builtin/gc.c:475 builtin/init-db.c:57 +#: builtin/gc.c:479 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "不能讀取 '%s'" -#: builtin/gc.c:491 +#: builtin/gc.c:495 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14662,62 +15037,201 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:543 msgid "prune unreferenced objects" msgstr "清除未引用的物件" -#: builtin/gc.c:541 +#: builtin/gc.c:545 msgid "be more thorough (increased runtime)" msgstr "更徹底（增加執行時間）" -#: builtin/gc.c:542 +#: builtin/gc.c:546 msgid "enable auto-gc mode" msgstr "啟用自動垃圾回收模式" -#: builtin/gc.c:545 +#: builtin/gc.c:549 msgid "force running gc even if there may be another gc running" msgstr "強制執行 gc 即使另外一個 gc 正在執行" -#: builtin/gc.c:548 +#: builtin/gc.c:552 msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外，對所有其它包檔案重新打包" -#: builtin/gc.c:565 +#: builtin/gc.c:569 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "解析 gc.logexpiry 的值 %s 失敗" -#: builtin/gc.c:576 +#: builtin/gc.c:580 #, c-format msgid "failed to parse prune expiry value %s" msgstr "解析清除期限值 %s 失敗" -#: builtin/gc.c:596 +#: builtin/gc.c:600 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自動在後台執行版本庫打包以求最佳性能。\n" -#: builtin/gc.c:598 +#: builtin/gc.c:602 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自動打包版本庫以求最佳性能。\n" -#: builtin/gc.c:599 +#: builtin/gc.c:603 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手動維護參見 \"git help gc\"。\n" -#: builtin/gc.c:639 +#: builtin/gc.c:643 #, 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:694 +#: builtin/gc.c:698 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多無法取得的鬆散物件，執行 'git prune' 刪除它們。" +#: builtin/gc.c:708 +#| msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" +msgstr "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<作業>] [--schedule]" + +#: builtin/gc.c:738 +msgid "--no-schedule is not allowed" +msgstr "不允許 --no-schedule" + +#: builtin/gc.c:743 +#, c-format +#| msgid "unrecognized --split argument, %s" +msgid "unrecognized --schedule argument '%s'" +msgstr "無法識別的 --schedule 引數 '%s'" + +#: builtin/gc.c:862 +msgid "failed to write commit-graph" +msgstr "無法寫入提交圖形" + +#: builtin/gc.c:901 +msgid "failed to fill remotes" +msgstr "無法填充遠端位置" + +#: builtin/gc.c:1024 +msgid "failed to start 'git pack-objects' process" +msgstr "無法啟動 ‘git pack-objects’ 處理程序" + +#: builtin/gc.c:1041 +#| msgid "could not finish pack-objects" +msgid "failed to finish 'git pack-objects' process" +msgstr "無法完成 ‘git pack-objects’ 處理程序" + +#: builtin/gc.c:1093 +msgid "failed to write multi-pack-index" +msgstr "無法寫入多包索引" + +#: builtin/gc.c:1111 +#| msgid "multi-pack-index file exists, but failed to parse" +msgid "'git multi-pack-index expire' failed" +msgstr "'git multi-pack-index expire' 失敗" + +#: builtin/gc.c:1172 +#| msgid "failed to load pack-index for packfile %s" +msgid "'git multi-pack-index repack' failed" +msgstr "'git multi-pack-index repack' 失敗" + +#: builtin/gc.c:1181 +msgid "" +"skipping incremental-repack task because core.multiPackIndex is disabled" +msgstr "略過增量重新打包工作，因為 core.multiPackIndex 已被停用" + +#: builtin/gc.c:1279 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "已存在 '%s' 鎖定檔案，略過維護" + +#: builtin/gc.c:1309 +#, c-format +msgid "task '%s' failed" +msgstr "作業 '%s' 失敗" + +#: builtin/gc.c:1389 +#, c-format +msgid "'%s' is not a valid task" +msgstr "'%s' 非有效作業" + +#: builtin/gc.c:1394 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "不能多次選取 '%s' 作業" + +#: builtin/gc.c:1409 +msgid "run tasks based on the state of the repository" +msgstr "基於版本庫狀態執行作業" + +#: builtin/gc.c:1410 +msgid "frequency" +msgstr "frequency" + +#: builtin/gc.c:1411 +msgid "run tasks based on frequency" +msgstr "依據頻率執行工作" + +#: builtin/gc.c:1414 +msgid "do not report progress or other information over stderr" +msgstr "不要在 stderr 輸出進度或其他資訊" + +#: builtin/gc.c:1415 +msgid "task" +msgstr "作業" + +#: builtin/gc.c:1416 +msgid "run a specific task" +msgstr "執行指定作業" + +#: builtin/gc.c:1433 +msgid "use at most one of --auto and --schedule=<frequency>" +msgstr "--auto 和 --schedule=<頻率> 請任選一" + +#: builtin/gc.c:1467 +msgid "failed to run 'git config'" +msgstr "無法執行 ‘git config’" + +#: builtin/gc.c:1512 +msgid "another process is scheduling background maintenance" +msgstr "其他處理程序正在排定背景維護工作" + +#: builtin/gc.c:1525 +msgid "failed to run 'crontab -l'; your system might not support 'cron'" +msgstr "無法執行 “crontab -l”；您的系統可能不支援 “cron”" + +#: builtin/gc.c:1544 +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”" + +#: builtin/gc.c:1550 +msgid "failed to open stdin of 'crontab'" +msgstr "無法開啟 ‘crontab’ 的標準輸入" + +#: builtin/gc.c:1592 +msgid "'crontab' died" +msgstr "“crontab” 結束運作" + +#: builtin/gc.c:1605 +msgid "failed to add repo to global config" +msgstr "無法將版本庫加至全域設定" + +#: builtin/gc.c:1615 +#| msgid "git maintenance run [<options>]" +msgid "git maintenance <subcommand> [<options>]" +msgstr "git maintenance <子命令> [<選項>]" + +#: builtin/gc.c:1634 +#, c-format +msgid "invalid subcommand: %s" +msgstr "無效子命令：%s" + #: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<選項>] [-e] <模式> [<版本>...] [[--] <路徑>...]" @@ -14736,8 +15250,8 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2904 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "沒有執行緒支援，忽略 %s" @@ -14752,243 +15266,243 @@ msgstr "無法讀取樹（%s）" msgid "unable to grep from object of type %s" msgstr "無法抓取來自於 %s 類型的物件" -#: builtin/grep.c:724 +#: builtin/grep.c:736 #, c-format msgid "switch `%c' expects a numerical value" msgstr "開關 `%c' 期望一個數字值" -#: builtin/grep.c:823 +#: builtin/grep.c:835 msgid "search in index instead of in the work tree" msgstr "在索引區搜尋而不是在工作區" -#: builtin/grep.c:825 +#: builtin/grep.c:837 msgid "find in contents not managed by git" msgstr "在未被 git 管理的內容中尋找" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/grep.c:827 +#: builtin/grep.c:839 msgid "search in both tracked and untracked files" msgstr "在追蹤和未追蹤的檔案中搜尋" -#: builtin/grep.c:829 +#: builtin/grep.c:841 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的檔案" -#: builtin/grep.c:831 +#: builtin/grep.c:843 msgid "recursively search in each submodule" msgstr "在每一個子模組中遞迴搜尋" -#: builtin/grep.c:834 +#: builtin/grep.c:846 msgid "show non-matching lines" msgstr "顯示未符合的行" -#: builtin/grep.c:836 +#: builtin/grep.c:848 msgid "case insensitive matching" msgstr "不區分大小寫符合" -#: builtin/grep.c:838 +#: builtin/grep.c:850 msgid "match patterns only at word boundaries" msgstr "只在單詞邊界符合模式" -#: builtin/grep.c:840 +#: builtin/grep.c:852 msgid "process binary files as text" msgstr "把二進位檔案當做文字處理" -#: builtin/grep.c:842 +#: builtin/grep.c:854 msgid "don't match patterns in binary files" msgstr "不在二進位檔案中符合模式" -#: builtin/grep.c:845 +#: builtin/grep.c:857 msgid "process binary files with textconv filters" msgstr "用 textconv 過濾器處理二進位檔案" -#: builtin/grep.c:847 +#: builtin/grep.c:859 msgid "search in subdirectories (default)" msgstr "在子目錄中尋找（預設）" -#: builtin/grep.c:849 +#: builtin/grep.c:861 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下尋找" -#: builtin/grep.c:853 +#: builtin/grep.c:865 msgid "use extended POSIX regular expressions" msgstr "使用擴展的 POSIX 正規表示式" -#: builtin/grep.c:856 +#: builtin/grep.c:868 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正規表示式（預設）" -#: builtin/grep.c:859 +#: builtin/grep.c:871 msgid "interpret patterns as fixed strings" msgstr "把模式解析為固定的字串" -#: builtin/grep.c:862 +#: builtin/grep.c:874 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 相容的正規表示式" -#: builtin/grep.c:865 +#: builtin/grep.c:877 msgid "show line numbers" msgstr "顯示行號" -#: builtin/grep.c:866 +#: builtin/grep.c:878 msgid "show column number of first match" msgstr "顯示第一個符合的列號" -#: builtin/grep.c:867 +#: builtin/grep.c:879 msgid "don't show filenames" msgstr "不顯示檔案名" -#: builtin/grep.c:868 +#: builtin/grep.c:880 msgid "show filenames" msgstr "顯示檔案名" -#: builtin/grep.c:870 +#: builtin/grep.c:882 msgid "show filenames relative to top directory" msgstr "顯示相對於頂級目錄的檔案名" -#: builtin/grep.c:872 +#: builtin/grep.c:884 msgid "show only filenames instead of matching lines" msgstr "只顯示檔案名而不顯示符合的行" -#: builtin/grep.c:874 +#: builtin/grep.c:886 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同義" -#: builtin/grep.c:877 +#: builtin/grep.c:889 msgid "show only the names of files without match" msgstr "只顯示未符合的檔案名" -#: builtin/grep.c:879 +#: builtin/grep.c:891 msgid "print NUL after filenames" msgstr "在檔案名後輸出 NUL 字元" -#: builtin/grep.c:882 +#: builtin/grep.c:894 msgid "show only matching parts of a line" msgstr "只顯示行中的符合的部分" -#: builtin/grep.c:884 +#: builtin/grep.c:896 msgid "show the number of matches instead of matching lines" msgstr "顯示總符合行數，而不顯示符合的行" -#: builtin/grep.c:885 +#: builtin/grep.c:897 msgid "highlight matches" msgstr "高亮顯示符合項" -#: builtin/grep.c:887 +#: builtin/grep.c:899 msgid "print empty line between matches from different files" msgstr "在不同檔案的符合項之間列印空行" -#: builtin/grep.c:889 +#: builtin/grep.c:901 msgid "show filename only once above matches from same file" msgstr "只在同一檔案的符合項的上面顯示一次檔案名" -#: builtin/grep.c:892 +#: builtin/grep.c:904 msgid "show <n> context lines before and after matches" msgstr "顯示符合項前後的 <n> 行上下文" -#: builtin/grep.c:895 +#: builtin/grep.c:907 msgid "show <n> context lines before matches" msgstr "顯示符合項前 <n> 行上下文" -#: builtin/grep.c:897 +#: builtin/grep.c:909 msgid "show <n> context lines after matches" msgstr "顯示符合項後 <n> 行上下文" -#: builtin/grep.c:899 +#: builtin/grep.c:911 msgid "use <n> worker threads" msgstr "使用 <n> 個工作執行緒" -#: builtin/grep.c:900 +#: builtin/grep.c:912 msgid "shortcut for -C NUM" msgstr "快捷鍵 -C 數字" -#: builtin/grep.c:903 +#: builtin/grep.c:915 msgid "show a line with the function name before matches" msgstr "在符合的前面顯示一行函數名" -#: builtin/grep.c:905 +#: builtin/grep.c:917 msgid "show the surrounding function" msgstr "顯示所在函數的前後內容" -#: builtin/grep.c:908 +#: builtin/grep.c:920 msgid "read patterns from file" msgstr "從檔案讀取模式" -#: builtin/grep.c:910 +#: builtin/grep.c:922 msgid "match <pattern>" msgstr "符合 <模式>" -#: builtin/grep.c:912 +#: builtin/grep.c:924 msgid "combine patterns specified with -e" msgstr "組合用 -e 參數設定的模式" -#: builtin/grep.c:924 +#: builtin/grep.c:936 msgid "indicate hit with exit status without output" msgstr "不輸出，而用離開碼標記命中狀態" -#: builtin/grep.c:926 +#: builtin/grep.c:938 msgid "show only matches from files that match all patterns" msgstr "只顯示符合所有模式的檔案中的符合" -#: builtin/grep.c:928 +#: builtin/grep.c:940 msgid "show parse tree for grep expression" msgstr "顯示 grep 表達式的解析樹" -#: builtin/grep.c:932 +#: builtin/grep.c:944 msgid "pager" msgstr "分頁" -#: builtin/grep.c:932 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "分頁顯示符合的檔案" -#: builtin/grep.c:936 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允許呼叫 grep(1)（本次組建忽略）" -#: builtin/grep.c:1003 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "未提供符合模式" -#: builtin/grep.c:1039 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同時使用" -#: builtin/grep.c:1047 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c:1077 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked 不支援與 --recurse-submodules 一起使用" -#: builtin/grep.c:1081 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "無效的選項組合，忽略 --threads" -#: builtin/grep.c:1084 builtin/pack-objects.c:3623 +#: builtin/grep.c:1095 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "沒有執行緒支援，忽略 --threads" -#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901 +#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的執行緒數無效（%d）" -#: builtin/grep.c:1121 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 僅用於工作區" -#: builtin/grep.c:1147 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached 或 --untracked 不能與 --no-index 同時使用" -#: builtin/grep.c:1153 +#: builtin/grep.c:1164 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用於已追蹤內容" -#: builtin/grep.c:1161 +#: builtin/grep.c:1172 msgid "both --cached and trees are given" msgstr "同時給出了 --cached 和樹狀物件" @@ -15124,7 +15638,7 @@ msgstr "沒有 info 檢視器處理此請求" msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的別名" -#: builtin/help.c:534 git.c:367 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "壞的 alias.%s 字串：%s" @@ -15138,347 +15652,347 @@ msgstr "用法：%s%s" msgid "'git help config' for more information" msgstr "'git help config' 取得更多訊息" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "%s 的物件類型不符合" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "未能取得預期的物件 %s" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "物件 %s：應為類型 %s，卻是 %s" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "無法填充 %d 位元組" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "過早的檔案結束符（EOF）" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "輸入上的讀錯誤" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "用掉了超過可用的位元組" -#: builtin/index-pack.c:288 builtin/pack-objects.c:618 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 msgid "pack too large for current definition of off_t" msgstr "包太大超過了目前 off_t 的定義" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "包超過了最大允許值" -#: builtin/index-pack.c:306 builtin/repack.c:250 +#: builtin/index-pack.c:342 builtin/repack.c:286 #, c-format msgid "unable to create '%s'" msgstr "不能建立 '%s'" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "無法開啟 packfile '%s'" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "包簽名不符合" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "不支援包版本 %<PRIu32>" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包中有錯誤的物件位於位移量 %<PRIuMAX>：%s" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "解壓縮返回 %d" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "位移值覆蓋了 delta 基準物件" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "delta 基準位移越界" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "未知物件類型 %d" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "無法讀取包檔案" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "包檔案過早結束，缺少 %<PRIuMAX> 位元組" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "解壓縮嚴重的不一致" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "發現 %s 出現 SHA1 衝突！" -#: builtin/index-pack.c:738 builtin/pack-objects.c:170 -#: builtin/pack-objects.c:230 builtin/pack-objects.c:325 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "不能讀 %s" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "不能讀取現存物件訊息 %s" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "不能讀取現存物件 %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "無效的資料物件 %s" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "對打包物件 fsck 檢查發生錯誤" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:870 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子物件並非都可以取得" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "應用 delta 失敗" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "接收物件中" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "索引物件中" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包衝突（SHA1 不符合）" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "不能對 packfile 呼叫 fstat" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "包的結尾有垃圾資料" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的問題" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "處理 delta 中" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "不能建立執行緒：%s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1288 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 個本機物件" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1304 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 個未解決的 delta" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能壓縮附加物件（%d）" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "本機物件 %s 已損壞" -#: builtin/index-pack.c:1405 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "packfile 名稱 '%s' 沒有以 '.pack' 結尾" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "無法寫入 %s 檔案 '%s'" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "無法關閉已寫入的 %s 檔案 '%s'" -#: builtin/index-pack.c:1462 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "關閉包檔案時發生錯誤" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "無法儲存包檔案" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "無法儲存索引檔案" -#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "壞的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1592 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "無法開啟現存包檔案 '%s'" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1633 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "無法為 %s 開啟包索引檔案" -#: builtin/index-pack.c:1642 +#: builtin/index-pack.c:1681 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 個物件" -#: builtin/index-pack.c:1649 +#: builtin/index-pack.c:1688 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "鏈長 = %d: %lu 物件" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "無法返回目前工作目錄" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "錯誤選項 %s" -#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621 +#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625 #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的「%s」雜湊算法" -#: builtin/index-pack.c:1782 +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同時使用" -#: builtin/index-pack.c:1784 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "--stdin 需要一個 git 版本庫" -#: builtin/index-pack.c:1786 +#: builtin/index-pack.c:1825 msgid "--object-format cannot be used with --stdin" msgstr "--object-format 不能和 --stdin 同時使用" -#: builtin/index-pack.c:1792 +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "--verify 沒有提供 packfile 名稱參數" -#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "在打包物件中 fsck 檢查發生錯誤" -#: builtin/init-db.c:63 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "不能對範本 '%s' 呼叫 stat" -#: builtin/init-db.c:68 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "不能開啟目錄 '%s'" -#: builtin/init-db.c:80 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "不能讀取連結 '%s'" -#: builtin/init-db.c:82 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "不能自 '%s' 到 '%s' 建立符號連結" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "不能複製 '%s' 至 '%s'" -#: builtin/init-db.c:92 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "忽略範本 %s" -#: builtin/init-db.c:123 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "沒有在 %s 中找到範本" -#: builtin/init-db.c:138 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "沒有從 '%s' 複製範本：%s" -#: builtin/init-db.c:276 +#: builtin/init-db.c:275 #, c-format msgid "invalid initial branch name: '%s'" msgstr "無效的初始分支名稱：'%s'" -#: builtin/init-db.c:368 +#: builtin/init-db.c:367 #, c-format msgid "unable to handle file type %d" msgstr "不能處理 %d 類型的檔案" -#: builtin/init-db.c:371 +#: builtin/init-db.c:370 #, c-format msgid "unable to move %s to %s" msgstr "不能移動 %s 至 %s" @@ -15492,32 +16006,32 @@ msgstr "嘗試以不同的雜湊值重新初始化版本庫" msgid "%s already exists" msgstr "%s 已經存在" -#: builtin/init-db.c:444 +#: builtin/init-db.c:445 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: 忽略 --initial-branch=%s" -#: builtin/init-db.c:475 +#: builtin/init-db.c:476 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:476 +#: builtin/init-db.c:477 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:480 +#: builtin/init-db.c:481 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:530 +#: builtin/init-db.c:531 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -15525,48 +16039,56 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] " "[<目錄>]" -#: builtin/init-db.c:556 +#: builtin/init-db.c:557 msgid "permissions" msgstr "權限" -#: builtin/init-db.c:557 +#: builtin/init-db.c:558 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 版本庫是多個使用者之間共享的" -#: builtin/init-db.c:563 +#: builtin/init-db.c:564 msgid "override the name of the initial branch" msgstr "覆蓋初始分支的名稱" -#: builtin/init-db.c:564 +#: builtin/init-db.c:565 builtin/verify-pack.c:74 msgid "hash" msgstr "雜湊" -#: builtin/init-db.c:565 builtin/show-index.c:22 +#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "指定要使用的雜湊算法" -#: builtin/init-db.c:598 builtin/init-db.c:603 +#: builtin/init-db.c:573 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--separate-git-dir 和 --bare 互斥" + +#: builtin/init-db.c:602 builtin/init-db.c:607 #, c-format msgid "cannot mkdir %s" msgstr "不能建立目錄 %s" -#: builtin/init-db.c:607 +#: builtin/init-db.c:611 builtin/init-db.c:666 #, c-format msgid "cannot chdir to %s" msgstr "不能切換目錄到 %s" -#: builtin/init-db.c:634 +#: builtin/init-db.c:638 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "不允許 %s（或 --work-tree=<目錄>）而沒有指定 %s（或 --git-dir=<目錄>）" -#: builtin/init-db.c:662 +#: builtin/init-db.c:690 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能存取工作區 '%s'" +#: builtin/init-db.c:695 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separate-git-dir 與純版本庫不相容" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -15631,126 +16153,129 @@ msgstr "--trailer 和 --only-input 同時使用沒有意義" msgid "no input file given for in-place editing" msgstr "沒有給出要原位編輯的檔案" -#: builtin/log.c:57 +#: builtin/log.c:58 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]" -#: builtin/log.c:58 +#: builtin/log.c:59 msgid "git show [<options>] <object>..." msgstr "git show [<選項>] <物件>..." -#: builtin/log.c:111 +#: builtin/log.c:112 #, c-format msgid "invalid --decorate option: %s" msgstr "無效的 --decorate 選項：%s" -#: builtin/log.c:178 +#: builtin/log.c:179 msgid "show source" msgstr "顯示源" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "Use mail map file" msgstr "使用信件映射檔案" -#: builtin/log.c:182 +#: builtin/log.c:183 msgid "only decorate refs that match <pattern>" msgstr "只修飾與 <模式> 符合的引用" -#: builtin/log.c:184 +#: builtin/log.c:185 msgid "do not decorate refs that match <pattern>" msgstr "不修飾和 <模式> 符合的引用" -#: builtin/log.c:185 +#: builtin/log.c:186 msgid "decorate options" msgstr "修飾選項" -#: builtin/log.c:188 -msgid "Process line range n,m in file, counting from 1" -msgstr "處理檔案中第 n 到 m 之間的行，從 1 開始" +#: builtin/log.c:189 +msgid "" +"Trace the evolution of line range <start>,<end> or function :<funcname> in " +"<file>" +msgstr "" + +#: builtin/log.c:212 +#| msgid "%s: %s cannot be used with %s" +msgid "-L<range>:<file> cannot be used with pathspec" +msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用" -#: builtin/log.c:298 +#: builtin/log.c:302 #, c-format msgid "Final output: %d %s\n" msgstr "最終輸出：%d %s\n" -#: builtin/log.c:556 +#: builtin/log.c:564 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 損壞的檔案" -#: builtin/log.c:571 builtin/log.c:666 +#: builtin/log.c:579 builtin/log.c:674 #, c-format msgid "could not read object %s" msgstr "不能讀取物件 %s" -#: builtin/log.c:691 +#: builtin/log.c:699 #, c-format msgid "unknown type: %d" msgstr "未知類型：%d" -#: builtin/log.c:835 +#: builtin/log.c:848 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：從描述產生附函的模式無效" -#: builtin/log.c:842 +#: builtin/log.c:855 msgid "format.headers without value" msgstr "format.headers 沒有值" -#: builtin/log.c:957 -msgid "name of output directory is too long" -msgstr "輸出目錄名太長" - -#: builtin/log.c:973 +#: builtin/log.c:984 #, c-format msgid "cannot open patch file %s" msgstr "無法開啟修補檔案 %s" -#: builtin/log.c:990 +#: builtin/log.c:1001 msgid "need exactly one range" msgstr "只需要一個範圍" -#: builtin/log.c:1000 +#: builtin/log.c:1011 msgid "not a range" msgstr "不是一個範圍" -#: builtin/log.c:1164 +#: builtin/log.c:1175 msgid "cover letter needs email format" msgstr "附函需要信件位址格式" -#: builtin/log.c:1170 +#: builtin/log.c:1181 msgid "failed to create cover-letter file" msgstr "無法建立附函檔案" -#: builtin/log.c:1249 +#: builtin/log.c:1262 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1276 +#: builtin/log.c:1289 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<選項>] [<從> | <版本範圍>]" -#: builtin/log.c:1334 +#: builtin/log.c:1347 msgid "two output directories?" msgstr "兩個輸出目錄？" -#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231 +#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1455 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1509 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:1460 +#: builtin/log.c:1518 msgid "could not find exact merge base" msgstr "不能找到準確的合併基礎" -#: builtin/log.c:1464 +#: builtin/log.c:1528 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" @@ -15760,275 +16285,285 @@ msgstr "" "git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n" "參數 --base=<基礎提交> 手動指定一個基礎提交" -#: builtin/log.c:1484 +#: builtin/log.c:1551 msgid "failed to find exact merge base" msgstr "無法找到準確的合併基礎" -#: builtin/log.c:1495 +#: builtin/log.c:1568 msgid "base commit should be the ancestor of revision list" msgstr "基礎提交應該是版本列表的祖先" -#: builtin/log.c:1499 +#: builtin/log.c:1578 msgid "base commit shouldn't be in revision list" msgstr "基礎提交不應該出現在版本列表中" -#: builtin/log.c:1552 +#: builtin/log.c:1636 msgid "cannot get patch id" msgstr "無法得到修補檔 id" -#: builtin/log.c:1604 -msgid "failed to infer range-diff ranges" -msgstr "無法推斷 range-diff 範圍" +#: builtin/log.c:1693 +msgid "failed to infer range-diff origin of current series" +msgstr "無法推斷目前系列的 range-diff 起點" + +#: builtin/log.c:1695 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "將 '%s' 當作目前系列的 range-diff 起點" -#: builtin/log.c:1650 +#: builtin/log.c:1739 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一個修補檔" -#: builtin/log.c:1653 +#: builtin/log.c:1742 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多個修補檔" -#: builtin/log.c:1657 +#: builtin/log.c:1746 msgid "print patches to standard out" msgstr "列印修補檔到標準輸出" -#: builtin/log.c:1659 +#: builtin/log.c:1748 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1661 +#: builtin/log.c:1750 msgid "use simple number sequence for output file names" msgstr "使用簡單的數字序列作為輸出檔案名" -#: builtin/log.c:1662 +#: builtin/log.c:1751 msgid "sfx" msgstr "後綴" -#: builtin/log.c:1663 +#: builtin/log.c:1752 msgid "use <sfx> instead of '.patch'" msgstr "使用 <後綴> 代替 '.patch'" -#: builtin/log.c:1665 +#: builtin/log.c:1754 msgid "start numbering patches at <n> instead of 1" msgstr "修補檔以 <n> 開始編號，而不是1" -#: builtin/log.c:1667 +#: builtin/log.c:1756 msgid "mark the series as Nth re-roll" msgstr "標記修補檔系列是第幾次重製" -#: builtin/log.c:1669 +#: builtin/log.c:1758 +msgid "max length of output filename" +msgstr "輸出檔名的最大長度" + +#: builtin/log.c:1760 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1672 +#: builtin/log.c:1763 msgid "cover-from-description-mode" msgstr "從描述產生附函的模式" -#: builtin/log.c:1673 +#: builtin/log.c:1764 msgid "generate parts of a cover letter based on a branch's description" msgstr "基於分支描述產生部分附函" -#: builtin/log.c:1675 +#: builtin/log.c:1766 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<前綴>] 代替 [PATCH]" -#: builtin/log.c:1678 +#: builtin/log.c:1769 msgid "store resulting files in <dir>" msgstr "把結果檔案儲存在 <目錄>" -#: builtin/log.c:1681 +#: builtin/log.c:1772 msgid "don't strip/add [PATCH]" msgstr "不刪除/新增 [PATCH]" -#: builtin/log.c:1684 +#: builtin/log.c:1775 msgid "don't output binary diffs" msgstr "不輸出二進位差異" -#: builtin/log.c:1686 +#: builtin/log.c:1777 msgid "output all-zero hash in From header" msgstr "在 From 標頭訊息中輸出全為零的雜湊值" -#: builtin/log.c:1688 +#: builtin/log.c:1779 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的修補檔" -#: builtin/log.c:1690 +#: builtin/log.c:1781 msgid "show patch format instead of default (patch + stat)" msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）" -#: builtin/log.c:1692 +#: builtin/log.c:1783 msgid "Messaging" msgstr "信件傳送" -#: builtin/log.c:1693 +#: builtin/log.c:1784 msgid "header" msgstr "header" -#: builtin/log.c:1694 +#: builtin/log.c:1785 msgid "add email header" msgstr "新增信件頭" -#: builtin/log.c:1695 builtin/log.c:1696 +#: builtin/log.c:1786 builtin/log.c:1787 msgid "email" msgstr "信件位址" -#: builtin/log.c:1695 +#: builtin/log.c:1786 msgid "add To: header" msgstr "新增收件人" -#: builtin/log.c:1696 +#: builtin/log.c:1787 msgid "add Cc: header" msgstr "新增抄送" -#: builtin/log.c:1697 +#: builtin/log.c:1788 msgid "ident" msgstr "標記" -#: builtin/log.c:1698 +#: builtin/log.c:1789 msgid "set From address to <ident> (or committer ident if absent)" msgstr "將 From 位址設定為 <標記>（如若不提供，則用提交者 ID 做為位址）" -#: builtin/log.c:1700 +#: builtin/log.c:1791 msgid "message-id" msgstr "信件標記" -#: builtin/log.c:1701 +#: builtin/log.c:1792 msgid "make first mail a reply to <message-id>" msgstr "使第一封信件作為對 <信件標記> 的回覆" -#: builtin/log.c:1702 builtin/log.c:1705 +#: builtin/log.c:1793 builtin/log.c:1796 msgid "boundary" msgstr "邊界" -#: builtin/log.c:1703 +#: builtin/log.c:1794 msgid "attach the patch" msgstr "附件方式新增修補檔" -#: builtin/log.c:1706 +#: builtin/log.c:1797 msgid "inline the patch" msgstr "內聯顯示修補檔" -#: builtin/log.c:1710 +#: builtin/log.c:1801 msgid "enable message threading, styles: shallow, deep" msgstr "啟用信件線索，風格：淺，深" -#: builtin/log.c:1712 +#: builtin/log.c:1803 msgid "signature" msgstr "簽名" -#: builtin/log.c:1713 +#: builtin/log.c:1804 msgid "add a signature" msgstr "新增一個簽名" -#: builtin/log.c:1714 +#: builtin/log.c:1805 msgid "base-commit" msgstr "基礎提交" -#: builtin/log.c:1715 +#: builtin/log.c:1806 msgid "add prerequisite tree info to the patch series" msgstr "為修補檔列表新增前置樹訊息" -#: builtin/log.c:1717 +#: builtin/log.c:1809 msgid "add a signature from a file" msgstr "從檔案新增一個簽名" -#: builtin/log.c:1718 +#: builtin/log.c:1810 msgid "don't print the patch filenames" msgstr "不要列印修補檔檔案名" -#: builtin/log.c:1720 +#: builtin/log.c:1812 msgid "show progress while generating patches" msgstr "在生成修補檔時顯示進度" -#: builtin/log.c:1722 +#: builtin/log.c:1814 msgid "show changes against <rev> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <rev> 的差異" -#: builtin/log.c:1725 +#: builtin/log.c:1817 msgid "show changes against <refspec> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異" -#: builtin/log.c:1727 +#: builtin/log.c:1819 msgid "percentage by which creation is weighted" msgstr "建立權重的百分比" -#: builtin/log.c:1812 +#: builtin/log.c:1905 #, c-format msgid "invalid ident line: %s" msgstr "包含無效的身份標記：%s" -#: builtin/log.c:1827 +#: builtin/log.c:1920 msgid "-n and -k are mutually exclusive" msgstr "-n 和 -k 互斥" -#: builtin/log.c:1829 +#: builtin/log.c:1922 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc 和 -k 互斥" -#: builtin/log.c:1837 +#: builtin/log.c:1930 msgid "--name-only does not make sense" msgstr "--name-only 無意義" -#: builtin/log.c:1839 +#: builtin/log.c:1932 msgid "--name-status does not make sense" msgstr "--name-status 無意義" -#: builtin/log.c:1841 +#: builtin/log.c:1934 msgid "--check does not make sense" msgstr "--check 無意義" -#: builtin/log.c:1874 -msgid "standard output, or directory, which one?" -msgstr "標準輸出或目錄，哪一個？" +#: builtin/log.c:1956 +#| msgid "-b, -B, and --detach are mutually exclusive" +msgid "--stdout, --output, and --output-directory are mutually exclusive" +msgstr "--stdout、--output 和 --output-directory 互斥" -#: builtin/log.c:1978 +#: builtin/log.c:2079 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:1982 +#: builtin/log.c:2083 msgid "Interdiff:" msgstr "版本間差異：" -#: builtin/log.c:1983 +#: builtin/log.c:2084 #, c-format msgid "Interdiff against v%d:" msgstr "對 v%d 的版本差異：" -#: builtin/log.c:1989 +#: builtin/log.c:2090 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor 需要 --range-diff" -#: builtin/log.c:1993 +#: builtin/log.c:2094 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:2001 +#: builtin/log.c:2102 msgid "Range-diff:" msgstr "範圍差異：" -#: builtin/log.c:2002 +#: builtin/log.c:2103 #, c-format msgid "Range-diff against v%d:" msgstr "對 v%d 的範圍差異：" -#: builtin/log.c:2013 +#: builtin/log.c:2114 #, c-format msgid "unable to read signature file '%s'" msgstr "無法讀取簽名檔案 '%s'" -#: builtin/log.c:2049 +#: builtin/log.c:2150 msgid "Generating patches" msgstr "生成修補檔" -#: builtin/log.c:2093 +#: builtin/log.c:2194 msgid "failed to create output files" msgstr "無法建立輸出檔案" -#: builtin/log.c:2152 +#: builtin/log.c:2253 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]" -#: builtin/log.c:2206 +#: builtin/log.c:2307 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16152,7 +16687,7 @@ msgstr "" msgid "do not print remote URL" msgstr "不列印遠端 URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 msgid "exec" msgstr "exec" @@ -16335,191 +16870,191 @@ msgstr "無法解析引用 '%s'" msgid "Merging %s with %s\n" msgstr "合併 %s 和 %s\n" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<選項>] [<提交>...]" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:121 +#: builtin/merge.c:122 msgid "switch `m' requires a value" msgstr "開關 `m' 需要一個值" -#: builtin/merge.c:144 +#: builtin/merge.c:145 #, c-format msgid "option `%s' requires a value" msgstr "選項 `%s' 需要一個值" -#: builtin/merge.c:190 +#: builtin/merge.c:198 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合併策略 '%s'。\n" -#: builtin/merge.c:191 +#: builtin/merge.c:199 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:196 +#: builtin/merge.c:204 #, c-format msgid "Available custom strategies are:" msgstr "可用的自訂策略有：" -#: builtin/merge.c:247 builtin/pull.c:133 +#: builtin/merge.c:255 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "在合併的最後不顯示差異統計" -#: builtin/merge.c:250 builtin/pull.c:136 +#: builtin/merge.c:258 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "在合併的最後顯示差異統計" -#: builtin/merge.c:251 builtin/pull.c:139 +#: builtin/merge.c:259 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "（和 --stat 同義）" -#: builtin/merge.c:253 builtin/pull.c:142 +#: builtin/merge.c:261 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合併提交訊息中新增（最多 <n> 條）精簡提交記錄" -#: builtin/merge.c:256 builtin/pull.c:148 +#: builtin/merge.c:264 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "建立一個單獨的提交而不是做一次合併" -#: builtin/merge.c:258 builtin/pull.c:151 +#: builtin/merge.c:266 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合併成功，執行一次提交（預設）" -#: builtin/merge.c:260 builtin/pull.c:154 +#: builtin/merge.c:268 builtin/pull.c:154 msgid "edit message before committing" msgstr "在提交前編輯提交說明" -#: builtin/merge.c:262 +#: builtin/merge.c:270 msgid "allow fast-forward (default)" msgstr "允許快轉（預設）" -#: builtin/merge.c:264 builtin/pull.c:161 +#: builtin/merge.c:272 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "如果不能快轉就放棄合併" -#: builtin/merge.c:268 builtin/pull.c:164 +#: builtin/merge.c:276 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名" -#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114 +#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114 msgid "strategy" msgstr "策略" -#: builtin/merge.c:270 builtin/pull.c:169 +#: builtin/merge.c:278 builtin/pull.c:169 msgid "merge strategy to use" msgstr "要使用的合併策略" -#: builtin/merge.c:271 builtin/pull.c:172 +#: builtin/merge.c:279 builtin/pull.c:172 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:272 builtin/pull.c:173 +#: builtin/merge.c:280 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "所選的合併策略的選項" -#: builtin/merge.c:274 +#: builtin/merge.c:282 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合併的提交說明（針對非快轉式合併）" -#: builtin/merge.c:281 +#: builtin/merge.c:289 msgid "abort the current in-progress merge" msgstr "放棄目前正在進行的合併" # -#: builtin/merge.c:283 +#: builtin/merge.c:291 msgid "--abort but leave index and working tree alone" msgstr "--abort，但是保留索引和工作區" -#: builtin/merge.c:285 +#: builtin/merge.c:293 msgid "continue the current in-progress merge" msgstr "繼續目前正在進行的合併" -#: builtin/merge.c:287 builtin/pull.c:180 +#: builtin/merge.c:295 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "允許合並不相關的歷史" -#: builtin/merge.c:294 +#: builtin/merge.c:302 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤" -#: builtin/merge.c:311 +#: builtin/merge.c:319 msgid "could not run stash." msgstr "不能執行儲藏。" -#: builtin/merge.c:316 +#: builtin/merge.c:324 msgid "stash failed" msgstr "儲藏失敗" -#: builtin/merge.c:321 +#: builtin/merge.c:329 #, c-format msgid "not a valid object: %s" msgstr "不是一個有效物件：%s" -#: builtin/merge.c:343 builtin/merge.c:360 +#: builtin/merge.c:351 builtin/merge.c:368 msgid "read-tree failed" msgstr "讀取樹失敗" # 譯者：請維持前導空格 -#: builtin/merge.c:390 +#: builtin/merge.c:398 msgid " (nothing to squash)" msgstr " （無可壓縮）" -#: builtin/merge.c:401 +#: builtin/merge.c:409 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "壓縮提交 -- 未更新 HEAD\n" -#: builtin/merge.c:451 +#: builtin/merge.c:459 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "無合併訊息 -- 未更新 HEAD\n" -#: builtin/merge.c:502 +#: builtin/merge.c:510 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 沒有指向一個提交" -#: builtin/merge.c:589 +#: builtin/merge.c:597 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c:716 +#: builtin/merge.c:723 msgid "Not handling anything other than two heads merge." msgstr "未處理兩個頭合併之外的任何動作。" -#: builtin/merge.c:730 +#: builtin/merge.c:736 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知選項：-X%s" -#: builtin/merge.c:745 +#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "不能寫 %s" -#: builtin/merge.c:797 +#: builtin/merge.c:807 #, c-format msgid "Could not read from '%s'" msgstr "不能從 '%s' 讀取" -#: builtin/merge.c:806 +#: builtin/merge.c:816 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合並，使用 'git commit' 完成此次合併。\n" -#: builtin/merge.c:812 +#: builtin/merge.c:822 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" @@ -16529,83 +17064,83 @@ msgstr "" "合併到主題分支。\n" "\n" -#: builtin/merge.c:817 +#: builtin/merge.c:827 msgid "An empty message aborts the commit.\n" msgstr "空的提交說明會終止提交。\n" -#: builtin/merge.c:820 +#: builtin/merge.c:830 #, 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:873 +#: builtin/merge.c:883 msgid "Empty commit message." msgstr "空提交訊息。" -#: builtin/merge.c:888 +#: builtin/merge.c:898 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:949 +#: builtin/merge.c:959 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n" -#: builtin/merge.c:988 +#: builtin/merge.c:998 msgid "No current branch." msgstr "沒有目前分支。" -#: builtin/merge.c:990 +#: builtin/merge.c:1000 msgid "No remote for the current branch." msgstr "目前分支沒有對應的遠端版本庫。" -#: builtin/merge.c:992 +#: builtin/merge.c:1002 msgid "No default upstream defined for the current branch." msgstr "目前分支沒有定義預設的上游分支。" -#: builtin/merge.c:997 +#: builtin/merge.c:1007 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支" -#: builtin/merge.c:1054 +#: builtin/merge.c:1064 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'" -#: builtin/merge.c:1157 +#: builtin/merge.c:1167 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合併：%s" -#: builtin/merge.c:1191 +#: builtin/merge.c:1201 msgid "not something we can merge" msgstr "不能合併" -#: builtin/merge.c:1295 +#: builtin/merge.c:1311 msgid "--abort expects no arguments" msgstr "--abort 不帶參數" -#: builtin/merge.c:1299 +#: builtin/merge.c:1315 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1317 +#: builtin/merge.c:1333 msgid "--quit expects no arguments" msgstr "--quit 不帶參數" -#: builtin/merge.c:1330 +#: builtin/merge.c:1346 msgid "--continue expects no arguments" msgstr "--continue 不帶參數" -#: builtin/merge.c:1334 +#: builtin/merge.c:1350 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1350 +#: builtin/merge.c:1366 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16613,7 +17148,7 @@ msgstr "" "您尚未結束您的合併（存在 MERGE_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1357 +#: builtin/merge.c:1373 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16621,96 +17156,96 @@ msgstr "" "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1360 +#: builtin/merge.c:1376 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1374 +#: builtin/merge.c:1390 msgid "You cannot combine --squash with --no-ff." msgstr "您不能將 --squash 和 --no-ff 組合使用。" -#: builtin/merge.c:1376 +#: builtin/merge.c:1392 msgid "You cannot combine --squash with --commit." msgstr "您不能將 --squash 和 --commit 組合使用。" -#: builtin/merge.c:1392 +#: builtin/merge.c:1408 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交並且 merge.defaultToUpstream 未設定。" -#: builtin/merge.c:1409 +#: builtin/merge.c:1425 msgid "Squash commit into empty head not supported yet" msgstr "尚不支援到空分支的壓縮提交" -#: builtin/merge.c:1411 +#: builtin/merge.c:1427 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快轉式提交沒有意義" -#: builtin/merge.c:1416 +#: builtin/merge.c:1432 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合併" -#: builtin/merge.c:1418 +#: builtin/merge.c:1434 msgid "Can merge only exactly one commit into empty head" msgstr "只能將一個提交合並到空分支上" -#: builtin/merge.c:1499 +#: builtin/merge.c:1515 msgid "refusing to merge unrelated histories" msgstr "拒絕合併無關的歷史" -#: builtin/merge.c:1508 +#: builtin/merge.c:1524 msgid "Already up to date." msgstr "已經是最新的。" -#: builtin/merge.c:1518 +#: builtin/merge.c:1534 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1580 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "嘗試非常小的索引內合併...\n" -#: builtin/merge.c:1571 +#: builtin/merge.c:1587 #, c-format msgid "Nope.\n" msgstr "無。\n" -#: builtin/merge.c:1596 +#: builtin/merge.c:1612 msgid "Already up to date. Yeeah!" msgstr "已經是最新的。耶！" -#: builtin/merge.c:1602 +#: builtin/merge.c:1618 msgid "Not possible to fast-forward, aborting." msgstr "無法快轉，終止。" -#: builtin/merge.c:1630 builtin/merge.c:1695 +#: builtin/merge.c:1646 builtin/merge.c:1711 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "將樹回滾至原始狀態...\n" -#: builtin/merge.c:1634 +#: builtin/merge.c:1650 #, c-format msgid "Trying merge strategy %s...\n" msgstr "嘗試合併策略 %s...\n" -#: builtin/merge.c:1686 +#: builtin/merge.c:1702 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "沒有合併策略處理此合併。\n" -#: builtin/merge.c:1688 +#: builtin/merge.c:1704 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合併失敗。\n" -#: builtin/merge.c:1697 +#: builtin/merge.c:1713 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以準備手動解決。\n" -#: builtin/merge.c:1711 +#: builtin/merge.c:1727 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自動合併進展順利，按要求在提交前停止\n" @@ -16788,68 +17323,72 @@ msgstr "強制移動/重指令，即使目標存在" msgid "skip move/rename errors" msgstr "跳過移動/重新命名錯誤" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "目標 '%s' 不是一個目錄" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "檢查 '%s' 到 '%s' 的重新命名\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "壞的源" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "不能將目錄移動到自身" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "不能將目錄移動到檔案" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "源目錄為空" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "不在版本控制之下" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "衝突" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "目標已存在" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "覆蓋 '%s'" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "不能覆蓋" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "同一目標具有多個源" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "目標目錄不存在" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目標=%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "重新命名 %s 至 %s\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 #, c-format msgid "renaming '%s' failed" msgstr "重新命名 '%s' 失敗" @@ -16867,8 +17406,8 @@ msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<選項>] --stdin" #: builtin/name-rev.c:524 -msgid "print only names (no SHA-1)" -msgstr "只列印名稱（無 SHA-1）" +msgid "print only ref-based names (no object names)" +msgstr "只輸出基於參考的名稱 (沒有物件名稱)" #: builtin/name-rev.c:525 msgid "only use tags to name the commits" @@ -17297,116 +17836,116 @@ msgstr "註解引用" msgid "use notes from <notes-ref>" msgstr "從 <註解引用> 使用註解" -#: builtin/notes.c:1034 builtin/stash.c:1608 +#: builtin/notes.c:1034 builtin/stash.c:1604 #, c-format msgid "unknown subcommand: %s" msgstr "未知子指令：%s" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<選項>...] [< <引用列表> | < <物件列表>]" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]" -#: builtin/pack-objects.c:442 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 錯的包物件 CRC" -#: builtin/pack-objects.c:453 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "%s 損壞的包物件" -#: builtin/pack-objects.c:584 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "發現物件 %s 遞迴 delta" -#: builtin/pack-objects.c:795 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "排序了 %u 個物件，預期 %<PRIu32> 個" -#: builtin/pack-objects.c:1003 +#: builtin/pack-objects.c:1004 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "停用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個" -#: builtin/pack-objects.c:1016 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "寫入物件中" -#: builtin/pack-objects.c:1077 builtin/update-index.c:90 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "對 %s 呼叫 stat 失敗" -#: builtin/pack-objects.c:1130 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個" -#: builtin/pack-objects.c:1347 +#: builtin/pack-objects.c:1348 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "停用 bitmap 寫入，因為一些物件將不會被打包" -#: builtin/pack-objects.c:1774 +#: builtin/pack-objects.c:1796 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 壓縮中 delta 基準位移越界" -#: builtin/pack-objects.c:1783 +#: builtin/pack-objects.c:1805 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基準位移越界" -#: builtin/pack-objects.c:2054 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "物件計數中" -#: builtin/pack-objects.c:2199 +#: builtin/pack-objects.c:2231 #, c-format msgid "unable to parse object header of %s" msgstr "無法解析物件 %s 標頭訊息" -#: builtin/pack-objects.c:2269 builtin/pack-objects.c:2285 -#: builtin/pack-objects.c:2295 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "物件 %s 無法讀取" -#: builtin/pack-objects.c:2272 builtin/pack-objects.c:2299 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）" -#: builtin/pack-objects.c:2309 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "次優（suboptimal）打包 - 記憶體不足" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2656 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 個執行緒進行壓縮" -#: builtin/pack-objects.c:2763 +#: builtin/pack-objects.c:2795 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "無法為標籤 %s 壓縮物件" -#: builtin/pack-objects.c:2851 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "壓縮物件中" -#: builtin/pack-objects.c:2857 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "不一致的差異計數" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2961 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -17415,13 +17954,13 @@ msgstr "" "uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> " "<uri>' (收到 '%s')" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:2964 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')" -#: builtin/pack-objects.c:2961 +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17430,7 +17969,7 @@ msgstr "" "預期邊界物件（edge object）ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c:2967 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17439,234 +17978,234 @@ msgstr "" "預期物件 ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c:3065 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "選項 --missing 的值無效" -#: builtin/pack-objects.c:3124 builtin/pack-objects.c:3232 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "無法開啟包檔案索引" -#: builtin/pack-objects.c:3155 +#: builtin/pack-objects.c:3187 #, c-format msgid "loose object at %s could not be examined" msgstr "無法檢查 %s 處的鬆散物件" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "無法強制鬆散物件" -#: builtin/pack-objects.c:3333 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "不是一個版本 '%s'" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "壞的版本 '%s'" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "無法新增最近的物件" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "不支援的索引版本 %s" -#: builtin/pack-objects.c:3418 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "壞的索引版本 '%s'" -#: builtin/pack-objects.c:3456 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "<版本>[,<位移>]" -#: builtin/pack-objects.c:3457 +#: builtin/pack-objects.c:3489 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本來寫包索引檔案" -#: builtin/pack-objects.c:3460 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "每個輸出包的最大尺寸" -#: builtin/pack-objects.c:3462 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "忽略從備用物件儲存裡借用物件" -#: builtin/pack-objects.c:3464 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "忽略包物件" -#: builtin/pack-objects.c:3466 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "限制打包視窗的物件數" -#: builtin/pack-objects.c:3468 +#: builtin/pack-objects.c:3500 msgid "limit pack window by memory in addition to object limit" msgstr "除物件數量限制外設定打包視窗的記憶體限制" -#: builtin/pack-objects.c:3470 +#: builtin/pack-objects.c:3502 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允許的 delta 鏈的最大長度" -#: builtin/pack-objects.c:3472 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3474 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "重用已存在的物件" -#: builtin/pack-objects.c:3476 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 物件" -#: builtin/pack-objects.c:3478 +#: builtin/pack-objects.c:3510 msgid "use threads when searching for best delta matches" msgstr "使用執行緒查詢最佳 delta 符合" -#: builtin/pack-objects.c:3480 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "不建立空的包輸出" -#: builtin/pack-objects.c:3482 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "從標準輸入讀取版本號參數" -#: builtin/pack-objects.c:3484 +#: builtin/pack-objects.c:3516 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的物件" -#: builtin/pack-objects.c:3487 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "包括可以從任何引用存取到的物件" -#: builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "包括被引用日誌引用到的物件" -#: builtin/pack-objects.c:3493 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "包括被索引引用到的物件" -#: builtin/pack-objects.c:3496 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "輸出包到標準輸出" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3530 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包物件的標籤物件" -#: builtin/pack-objects.c:3500 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "維持無法取得的物件" -#: builtin/pack-objects.c:3502 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "打包鬆散的無法取得物件" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "將比提供 <時間> 新的無法存取的物件解包" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" msgstr "使用稀疏可以取得性演算法" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "建立精簡包" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "建立適合淺複製版本庫取得的包" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 檔案的包" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "忽略該 pack" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "打包壓縮級別" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "顯示被移植隱藏的提交" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3553 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度" -#: builtin/pack-objects.c:3523 +#: builtin/pack-objects.c:3555 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同時建立 bitmap 索引" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3559 msgid "write a bitmap index if possible" msgstr "如果可能，寫 bitmap 索引" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "處理遺失的物件" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3566 msgid "do not pack objects in promisor packfiles" msgstr "不要打包 promisor packfile 中的物件" -#: builtin/pack-objects.c:3536 +#: builtin/pack-objects.c:3568 msgid "respect islands during delta compression" msgstr "在增量壓縮時參考資料島" -#: builtin/pack-objects.c:3538 +#: builtin/pack-objects.c:3570 msgid "protocol" msgstr "通訊協定" -#: builtin/pack-objects.c:3539 +#: builtin/pack-objects.c:3571 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "排除任何設定過，使用此通訊協定的 uploadpack.blobpackfileuri" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3600 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增量鏈深度 %d 太深了，強制為 %d" -#: builtin/pack-objects.c:3573 +#: builtin/pack-objects.c:3605 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3659 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "不能使用 --max-pack-size 來組建傳輸用的包檔案" -#: builtin/pack-objects.c:3629 +#: builtin/pack-objects.c:3661 msgid "minimum pack size limit is 1 MiB" msgstr "最小的包檔案大小是 1 MiB" -#: builtin/pack-objects.c:3634 +#: builtin/pack-objects.c:3666 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用於建立一個可索引包" -#: builtin/pack-objects.c:3637 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable 和 --unpack-unreachable 不相容" -#: builtin/pack-objects.c:3643 +#: builtin/pack-objects.c:3675 msgid "cannot use --filter without --stdout" msgstr "不能在沒有 --stdout 的情況下使用 --filter" -#: builtin/pack-objects.c:3703 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "枚舉物件" -#: builtin/pack-objects.c:3734 +#: builtin/pack-objects.c:3766 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -17732,7 +18271,7 @@ msgstr "和合併相關的選項" msgid "incorporate changes by rebasing rather than merging" msgstr "使用重定基底動作取代合併動作以套用修改" -#: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 msgid "allow fast-forward" msgstr "允許快轉式" @@ -17757,7 +18296,7 @@ msgstr "並發拉取的子模組的數量" msgid "Invalid value for pull.ff: %s" msgstr "pull.ff 的取值無效：%s" -#: builtin/pull.c:349 +#: builtin/pull.c:348 msgid "" "Pulling without specifying how to reconcile divergent branches is\n" "discouraged. You can squelch this message by running one of the following\n" @@ -17786,24 +18325,24 @@ msgstr "" "pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n" "設定的預設值。\n" -#: builtin/pull.c:459 +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您剛剛取得到的引用中沒有重定基底動作的候選。" -#: builtin/pull.c:461 +#: builtin/pull.c:460 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您剛剛取得到的引用中沒有合併動作的候選。" -#: builtin/pull.c:462 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "通常這意味著您提供了一萬用字元引用規格但未能和遠端符合。" -#: builtin/pull.c:465 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17813,42 +18352,41 @@ msgstr "" "您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n" "分支預設的遠端版本庫，您必須在指令列中指定一個分支名。" -#: builtin/pull.c:470 builtin/rebase.c:1234 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1246 msgid "You are not currently on a branch." msgstr "您目前不在一個分支上。" -#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 msgid "Please specify which branch you want to rebase against." msgstr "請指定您要重定基底到哪一個分支。" -#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 msgid "Please specify which branch you want to merge with." msgstr "請指定您要合併哪一個分支。" -#: builtin/pull.c:475 builtin/pull.c:490 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "詳見 git-pull(1)。" -#: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492 -#: builtin/rebase.c:1240 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1252 msgid "<remote>" msgstr "<遠端>" -#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497 -#: git-parse-remote.sh:65 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1244 msgid "There is no tracking information for the current branch." msgstr "目前分支沒有追蹤訊息。" -#: builtin/pull.c:494 git-parse-remote.sh:95 +#: builtin/pull.c:493 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "如果您想要為此分支建立追蹤訊息，您可以執行：" -#: builtin/pull.c:499 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17857,28 +18395,28 @@ msgstr "" "您的設定中指定要合併遠端的引用 '%s'，\n" "但是沒有取得到這個引用。" -#: builtin/pull.c:610 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "無法存取提交 %s" -#: builtin/pull.c:895 +#: builtin/pull.c:915 msgid "ignoring --verify-signatures for rebase" msgstr "為重定基底動作忽略 --verify-signatures" -#: builtin/pull.c:955 +#: builtin/pull.c:972 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未誕生的分支，變更新增至索引。" -#: builtin/pull.c:959 +#: builtin/pull.c:976 msgid "pull with rebase" msgstr "重定基底式拉取" -#: builtin/pull.c:960 +#: builtin/pull.c:977 msgid "please commit or stash them." msgstr "請提交或儲藏它們。" -#: builtin/pull.c:985 +#: builtin/pull.c:1002 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17888,7 +18426,7 @@ msgstr "" "fetch 更新了目前的分支。快轉您的工作區\n" "至提交 %s。" -#: builtin/pull.c:991 +#: builtin/pull.c:1008 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17905,15 +18443,15 @@ msgstr "" "$ git reset --hard\n" "復原之前的狀態。" -#: builtin/pull.c:1006 +#: builtin/pull.c:1023 msgid "Cannot merge multiple branches into empty head." msgstr "無法將多個分支合併到空分支。" -#: builtin/pull.c:1010 +#: builtin/pull.c:1027 msgid "Cannot rebase onto multiple branches." msgstr "無法重定基底到多個分支。" -#: builtin/pull.c:1018 +#: builtin/pull.c:1041 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本機子模組中有修改，無法重定基底" @@ -17921,15 +18459,15 @@ msgstr "本機子模組中有修改，無法重定基底" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<選項>] [<版本庫> [<引用規格>...]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "標籤後面未提供 <標籤> 參數" -#: builtin/push.c:122 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "--delete 只接受簡單的目標引用名" -#: builtin/push.c:168 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -17937,7 +18475,7 @@ msgstr "" "\n" "為了永久地選擇任一選項，參見 'git help config' 中的 push.default。" -#: builtin/push.c:171 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -17961,7 +18499,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -17975,7 +18513,7 @@ msgstr "" "\n" " git push %s HEAD:<遠端分支名字>\n" -#: builtin/push.c:200 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -17988,12 +18526,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:202 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "目前分支 %s 有多個上游分支，拒絕推送。" -#: builtin/push.c:211 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -18003,12 +18541,12 @@ msgstr "" "您正推送至遠端 '%s'（其並非目前分支 '%s' 的上游），\n" "而沒有告訴我要推送什麼、更新哪個遠端分支。" -#: builtin/push.c:270 +#: builtin/push.c:260 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您沒有為推送指定任何引用規格，並且 push.default 為 \"nothing\"。" -#: builtin/push.c:277 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -18019,7 +18557,7 @@ msgstr "" "再次推送前，先與遠端變更合併（如 'git pull ...'）。詳見\n" "'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:283 +#: builtin/push.c:273 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -18030,7 +18568,7 @@ msgstr "" "檢出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n" "'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:289 +#: builtin/push.c:279 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -18043,11 +18581,11 @@ msgstr "" "（如 'git pull ...'）。\n" "詳見 'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:296 +#: builtin/push.c:286 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒絕，因為該標籤在遠端已經存在。" -#: builtin/push.c:299 +#: builtin/push.c:289 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -18056,99 +18594,114 @@ msgstr "" "如果不使用 '--force' 參數，您不能更新一個指向非提交物件的遠端引用，\n" "也不能更新遠端引用讓其指向一個非提交物件。\n" -#: builtin/push.c:361 +#: builtin/push.c:294 +msgid "" +"Updates were rejected because the tip of the remote-tracking\n" +"branch has been updated since the last checkout. You may want\n" +"to integrate those changes locally (e.g., 'git pull ...')\n" +"before forcing an update.\n" +msgstr "" +"更新被拒，因為遠端追蹤分支的最新指針繼上次簽出後有更新。\n" +"您可能會希望先將這些變更整合至本地（例如：‘git pull …’)\n" +"最後才強制更新。\n" + +#: builtin/push.c:364 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:368 +#: builtin/push.c:371 #, c-format msgid "failed to push some refs to '%s'" msgstr "推送一些引用到 '%s' 失敗" -#: builtin/push.c:542 +#: builtin/push.c:553 msgid "repository" msgstr "版本庫" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:554 builtin/send-pack.c:189 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:555 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "鏡像所有引用" -#: builtin/push.c:546 +#: builtin/push.c:557 msgid "delete refs" msgstr "刪除引用" -#: builtin/push.c:547 +#: builtin/push.c:558 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送標籤（不能使用 --all or --mirror）" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:561 builtin/send-pack.c:192 msgid "force updates" msgstr "強制更新" -#: builtin/push.c:551 builtin/send-pack.c:179 +#: builtin/push.c:562 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<引用名>:<期望值>" -#: builtin/push.c:552 builtin/send-pack.c:180 +#: builtin/push.c:563 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "要求引用舊的取值為設定值" -#: builtin/push.c:555 +#: builtin/push.c:566 builtin/send-pack.c:208 +msgid "require remote updates to be integrated locally" +msgstr "需要將遠端更新整合進本地" + +#: builtin/push.c:569 msgid "control recursive pushing of submodules" msgstr "控制子模組的遞迴推送" -#: builtin/push.c:556 builtin/send-pack.c:174 +#: builtin/push.c:570 builtin/send-pack.c:199 msgid "use thin pack" msgstr "使用精簡打包" -#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/send-pack.c:187 msgid "receive pack program" msgstr "接收包程式" -#: builtin/push.c:559 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "設定 git pull/status 的上游" -#: builtin/push.c:562 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "清除本機刪除的引用" -#: builtin/push.c:564 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "繞過 pre-push 掛鉤" -#: builtin/push.c:565 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "推送缺少但有關的標籤" -#: builtin/push.c:567 builtin/send-pack.c:168 +#: builtin/push.c:581 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "用 GPG 為推送簽名" -#: builtin/push.c:569 builtin/send-pack.c:175 +#: builtin/push.c:583 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "需要遠端支援原子事務" -#: builtin/push.c:587 +#: builtin/push.c:601 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 與 --all、--mirror 及 --tags 不相容" -#: builtin/push.c:589 +#: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用沒有意義" -#: builtin/push.c:609 +#: builtin/push.c:623 #, c-format msgid "bad repository '%s'" msgstr "壞的版本庫 '%s'" -#: builtin/push.c:610 +#: builtin/push.c:624 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -18169,27 +18722,27 @@ msgstr "" "\n" " git push <名稱>\n" -#: builtin/push.c:625 +#: builtin/push.c:639 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不相容" -#: builtin/push.c:627 +#: builtin/push.c:641 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用規格同時使用" -#: builtin/push.c:631 +#: builtin/push.c:645 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不相容" -#: builtin/push.c:633 +#: builtin/push.c:647 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用規格同時使用" -#: builtin/push.c:636 +#: builtin/push.c:650 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不相容" -#: builtin/push.c:640 +#: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "推送選項不能有換行符號" @@ -18334,193 +18887,193 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 +#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244 #, c-format msgid "unusable todo list: '%s'" msgstr "不可用的待辦列表：'%s'" -#: builtin/rebase.c:298 +#: builtin/rebase.c:310 #, c-format msgid "could not create temporary %s" msgstr "無法建立暫時的 %s" -#: builtin/rebase.c:304 +#: builtin/rebase.c:316 msgid "could not mark as interactive" msgstr "無法標記為互動式" -#: builtin/rebase.c:358 +#: builtin/rebase.c:369 msgid "could not generate todo list" msgstr "無法生成待辦列表" -#: builtin/rebase.c:399 +#: builtin/rebase.c:411 msgid "a base commit must be provided with --upstream or --onto" msgstr "使用 --upstream 或 --onto 必須提供一個基礎提交" -#: builtin/rebase.c:468 +#: builtin/rebase.c:480 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<選項>]" -#: builtin/rebase.c:481 builtin/rebase.c:1374 +#: builtin/rebase.c:493 builtin/rebase.c:1388 msgid "keep commits which start empty" msgstr "保留開頭是空白的提交" -#: builtin/rebase.c:485 builtin/revert.c:128 +#: builtin/rebase.c:497 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "允許提交說明為空" -#: builtin/rebase.c:487 +#: builtin/rebase.c:499 msgid "rebase merge commits" msgstr "對合併提交重定基底" -#: builtin/rebase.c:489 +#: builtin/rebase.c:501 msgid "keep original branch points of cousins" msgstr "保持兄弟提交的原始分支點" -#: builtin/rebase.c:491 +#: builtin/rebase.c:503 msgid "move commits that begin with squash!/fixup!" msgstr "移動以 squash!/fixup! 開頭的提交" -#: builtin/rebase.c:492 +#: builtin/rebase.c:504 msgid "sign commits" msgstr "簽名提交" -#: builtin/rebase.c:494 builtin/rebase.c:1314 +#: builtin/rebase.c:506 builtin/rebase.c:1327 msgid "display a diffstat of what changed upstream" msgstr "顯示上游變化的差異統計" -#: builtin/rebase.c:496 +#: builtin/rebase.c:508 msgid "continue rebase" msgstr "繼續重定基底" -#: builtin/rebase.c:498 +#: builtin/rebase.c:510 msgid "skip commit" msgstr "跳過提交" -#: builtin/rebase.c:499 +#: builtin/rebase.c:511 msgid "edit the todo list" msgstr "重定基底待辦列表" -#: builtin/rebase.c:501 +#: builtin/rebase.c:513 msgid "show the current patch" msgstr "顯示目前修補檔" -#: builtin/rebase.c:504 +#: builtin/rebase.c:516 msgid "shorten commit ids in the todo list" msgstr "縮短待辦列表中的提交號" -#: builtin/rebase.c:506 +#: builtin/rebase.c:518 msgid "expand commit ids in the todo list" msgstr "擴展待辦列表中的提交號" -#: builtin/rebase.c:508 +#: builtin/rebase.c:520 msgid "check the todo list" msgstr "檢查待辦列表" -#: builtin/rebase.c:510 +#: builtin/rebase.c:522 msgid "rearrange fixup/squash lines" msgstr "重新排列 fixup/squash 行" -#: builtin/rebase.c:512 +#: builtin/rebase.c:524 msgid "insert exec commands in todo list" msgstr "在待辦列表中插入 exec 執行指令" -#: builtin/rebase.c:513 +#: builtin/rebase.c:525 msgid "onto" msgstr "onto" -#: builtin/rebase.c:516 +#: builtin/rebase.c:528 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:516 +#: builtin/rebase.c:528 msgid "restrict revision" msgstr "限制版本" -#: builtin/rebase.c:518 +#: builtin/rebase.c:530 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:519 +#: builtin/rebase.c:531 msgid "squash onto" msgstr "squash onto" -#: builtin/rebase.c:521 +#: builtin/rebase.c:533 msgid "the upstream commit" msgstr "上游提交" -#: builtin/rebase.c:523 +#: builtin/rebase.c:535 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:523 +#: builtin/rebase.c:535 msgid "head name" msgstr "head 名稱" -#: builtin/rebase.c:528 +#: builtin/rebase.c:540 msgid "rebase strategy" msgstr "重定基底策略" -#: builtin/rebase.c:529 +#: builtin/rebase.c:541 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:530 +#: builtin/rebase.c:542 msgid "strategy options" msgstr "策略選項" -#: builtin/rebase.c:531 +#: builtin/rebase.c:543 msgid "switch-to" msgstr "切換到" -#: builtin/rebase.c:532 +#: builtin/rebase.c:544 msgid "the branch or commit to checkout" msgstr "要檢出的分支或提交" -#: builtin/rebase.c:533 +#: builtin/rebase.c:545 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:533 +#: builtin/rebase.c:545 msgid "onto name" msgstr "onto name" -#: builtin/rebase.c:534 +#: builtin/rebase.c:546 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:534 +#: builtin/rebase.c:546 msgid "the command to run" msgstr "要執行的指令" -#: builtin/rebase.c:537 builtin/rebase.c:1407 +#: builtin/rebase.c:549 builtin/rebase.c:1421 msgid "automatically re-schedule any `exec` that fails" msgstr "自動重新安排任何失敗的 `exec`" -#: builtin/rebase.c:553 +#: builtin/rebase.c:565 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "不使用 --rebase-merges，則 --[no-]rebase-cousins 沒有效果" -#: builtin/rebase.c:569 +#: builtin/rebase.c:581 #, c-format msgid "%s requires the merge backend" msgstr "%s 需要合併後端" -#: builtin/rebase.c:612 +#: builtin/rebase.c:624 #, c-format msgid "could not get 'onto': '%s'" msgstr "無法取得 'onto'：'%s'" -#: builtin/rebase.c:629 +#: builtin/rebase.c:641 #, c-format msgid "invalid orig-head: '%s'" msgstr "無效的原始 head：'%s'" -#: builtin/rebase.c:654 +#: builtin/rebase.c:666 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "忽略無效的 allow_rerere_autoupdate：'%s'" -#: builtin/rebase.c:799 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18533,7 +19086,7 @@ msgstr "" "\"git rebase --skip\" 指令跳過這個提交。如果想要終止執行並回到\n" "\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。" -#: builtin/rebase.c:882 +#: builtin/rebase.c:894 #, c-format msgid "" "\n" @@ -18551,14 +19104,14 @@ msgstr "" "\n" "因此 git 無法對其重定基底。" -#: builtin/rebase.c:1208 +#: builtin/rebase.c:1220 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" "\"." msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。" -#: builtin/rebase.c:1226 +#: builtin/rebase.c:1238 #, c-format msgid "" "%s\n" @@ -18575,7 +19128,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:1242 +#: builtin/rebase.c:1254 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18588,136 +19141,148 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1272 +#: builtin/rebase.c:1284 msgid "exec commands cannot contain newlines" msgstr "exec 指令不能包含換行符號" -#: builtin/rebase.c:1276 +#: builtin/rebase.c:1288 msgid "empty exec command" msgstr "空的 exec 指令" -#: builtin/rebase.c:1305 +#: builtin/rebase.c:1318 msgid "rebase onto given branch instead of upstream" msgstr "重定基底到提供的分支而非上游" -#: builtin/rebase.c:1307 +#: builtin/rebase.c:1320 msgid "use the merge-base of upstream and branch as the current base" msgstr "使用上游和分支的合併基礎做為目前基礎" -#: builtin/rebase.c:1309 +#: builtin/rebase.c:1322 msgid "allow pre-rebase hook to run" msgstr "允許執行 pre-rebase 掛鉤" -#: builtin/rebase.c:1311 +#: builtin/rebase.c:1324 msgid "be quiet. implies --no-stat" msgstr "安靜。暗示 --no-stat" -#: builtin/rebase.c:1317 +#: builtin/rebase.c:1330 msgid "do not show diffstat of what changed upstream" msgstr "不顯示上游變化的差異統計" -#: builtin/rebase.c:1320 -msgid "add a Signed-off-by: line to each commit" -msgstr "為每一個提交新增一個 Signed-off-by: 簽名" +#: builtin/rebase.c:1333 +msgid "add a Signed-off-by trailer to each commit" +msgstr "在每個提交結尾加入 Signed-off-by" -#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328 -msgid "passed to 'git am'" -msgstr "傳遞給 'git am'" +#: builtin/rebase.c:1336 +msgid "make committer date match author date" +msgstr "使提交日期與製作日期相符合" -#: builtin/rebase.c:1330 builtin/rebase.c:1332 +#: builtin/rebase.c:1338 +msgid "ignore author date and use current date" +msgstr "忽略製作日期而使用日前日期" + +#: builtin/rebase.c:1340 +msgid "synonym of --reset-author-date" +msgstr "和 --reset-author-date 同義" + +#: builtin/rebase.c:1342 builtin/rebase.c:1346 msgid "passed to 'git apply'" msgstr "傳遞給 'git apply'" -#: builtin/rebase.c:1334 builtin/rebase.c:1337 +#: builtin/rebase.c:1344 +msgid "ignore changes in whitespace" +msgstr "忽略空白字元中的變更" + +#: builtin/rebase.c:1348 builtin/rebase.c:1351 msgid "cherry-pick all commits, even if unchanged" msgstr "揀選所有提交，即使未修改" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1353 msgid "continue" msgstr "繼續" -#: builtin/rebase.c:1342 +#: builtin/rebase.c:1356 msgid "skip current patch and continue" msgstr "跳過目前修補檔並繼續" # 譯者：請維持前導空格 -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1358 msgid "abort and check out the original branch" msgstr "終止並檢出原有分支" -#: builtin/rebase.c:1347 +#: builtin/rebase.c:1361 msgid "abort but keep HEAD where it is" msgstr "終止但保持 HEAD 不變" -#: builtin/rebase.c:1348 +#: builtin/rebase.c:1362 msgid "edit the todo list during an interactive rebase" msgstr "在互動式重定基底中編輯待辦列表" -#: builtin/rebase.c:1351 +#: builtin/rebase.c:1365 msgid "show the patch file being applied or merged" msgstr "顯示正在套用或合併的修補檔案" -#: builtin/rebase.c:1354 +#: builtin/rebase.c:1368 msgid "use apply strategies to rebase" msgstr "使用套用策略進行重定基底" -#: builtin/rebase.c:1358 +#: builtin/rebase.c:1372 msgid "use merging strategies to rebase" msgstr "使用合併策略進行重定基底" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1376 msgid "let the user edit the list of commits to rebase" msgstr "讓使用者編輯要重定基底的提交列表" -#: builtin/rebase.c:1366 +#: builtin/rebase.c:1380 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "（已棄用）嘗試重建合併提交而非忽略它們" -#: builtin/rebase.c:1371 +#: builtin/rebase.c:1385 msgid "how to handle commits that become empty" msgstr "處理空白提交的方式" -#: builtin/rebase.c:1378 +#: builtin/rebase.c:1392 msgid "move commits that begin with squash!/fixup! under -i" msgstr "在 -i 互動模式下，移動以 squash!/fixup! 開頭的提交" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1399 msgid "add exec lines after each commit of the editable list" msgstr "可編輯列表的每一個提交下面增加一行 exec" -#: builtin/rebase.c:1389 +#: builtin/rebase.c:1403 msgid "allow rebasing commits with empty messages" msgstr "允許針對空提交說明的提交重定基底" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1407 msgid "try to rebase merges instead of skipping them" msgstr "嘗試對合併提交重定基底而不是忽略它們" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1410 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "使用 'merge-base --fork-point' 來最佳化上游" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1412 msgid "use the given merge strategy" msgstr "使用提供的合併策略" -#: builtin/rebase.c:1400 builtin/revert.c:115 +#: builtin/rebase.c:1414 builtin/revert.c:115 msgid "option" msgstr "選項" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1415 msgid "pass the argument through to the merge strategy" msgstr "將參數傳遞給合併策略" -#: builtin/rebase.c:1404 +#: builtin/rebase.c:1418 msgid "rebase all reachable commits up to the root(s)" msgstr "將所有可以取得的提交重定基底到根提交" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1423 msgid "apply all changes, even those already present upstream" msgstr "即使已提供上游，仍套用所有變更" -#: builtin/rebase.c:1426 +#: builtin/rebase.c:1440 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18725,40 +19290,40 @@ msgstr "" "對 rebase.useBuiltin 的支援已被刪除！\n" "詳見 'git help config' 中的條目。" -#: builtin/rebase.c:1432 +#: builtin/rebase.c:1446 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "看起來 'git-am' 正在執行中。無法重定基底。" -#: builtin/rebase.c:1473 +#: builtin/rebase.c:1487 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "git rebase --preserve-merges 被棄用。用 --rebase-merges 代替。" -#: builtin/rebase.c:1478 +#: builtin/rebase.c:1492 msgid "cannot combine '--keep-base' with '--onto'" msgstr "不能將 '--keep-base' 和 '--onto' 組合使用" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1494 msgid "cannot combine '--keep-base' with '--root'" msgstr "不能將 '--keep-base' 和 '--root' 組合使用" -#: builtin/rebase.c:1484 +#: builtin/rebase.c:1498 msgid "cannot combine '--root' with '--fork-point'" msgstr "不能將 '--root' 和 '--fork-point' 結合使用" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1501 msgid "No rebase in progress?" msgstr "沒有正在進行的重定基底？" -#: builtin/rebase.c:1491 +#: builtin/rebase.c:1505 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。" -#: builtin/rebase.c:1514 +#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "不能讀取 HEAD" -#: builtin/rebase.c:1526 +#: builtin/rebase.c:1540 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18766,16 +19331,16 @@ msgstr "" "您必須編輯所有的合併衝突，然後透過 git add\n" "指令將它們標記為已解決" -#: builtin/rebase.c:1545 +#: builtin/rebase.c:1559 msgid "could not discard worktree changes" msgstr "無法捨棄工作區變更" -#: builtin/rebase.c:1564 +#: builtin/rebase.c:1578 #, c-format msgid "could not move back to %s" msgstr "無法移回 %s" -#: builtin/rebase.c:1610 +#: builtin/rebase.c:1624 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18794,132 +19359,132 @@ msgstr "" "\t%s\n" "然後再重新執行。 為避免遺失重要資料，我已經停止目前動作。\n" -#: builtin/rebase.c:1638 +#: builtin/rebase.c:1652 msgid "switch `C' expects a numerical value" msgstr "開關 `C' 期望一個數字值" -#: builtin/rebase.c:1680 +#: builtin/rebase.c:1694 #, c-format msgid "Unknown mode: %s" msgstr "未知模式：%s" -#: builtin/rebase.c:1702 +#: builtin/rebase.c:1733 msgid "--strategy requires --merge or --interactive" msgstr "--strategy 需要 --merge 或 --interactive" -#: builtin/rebase.c:1732 +#: builtin/rebase.c:1763 msgid "cannot combine apply options with merge options" msgstr "不能將 apply 套用選項與 merge 合併選項一起使用" -#: builtin/rebase.c:1745 +#: builtin/rebase.c:1776 #, c-format msgid "Unknown rebase backend: %s" msgstr "未知 rebase 後端：%s" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1806 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" -#: builtin/rebase.c:1790 +#: builtin/rebase.c:1826 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "不能將 '--preserve-merges' 和 '--rebase-merges' 同時使用" -#: builtin/rebase.c:1794 +#: builtin/rebase.c:1830 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "錯誤：不能將 '--preserve-merges' 和 '--reschedule-failed-exec' 同時使用" -#: builtin/rebase.c:1818 +#: builtin/rebase.c:1854 #, c-format msgid "invalid upstream '%s'" msgstr "無效的上游 '%s'" -#: builtin/rebase.c:1824 +#: builtin/rebase.c:1860 msgid "Could not create new root commit" msgstr "不能建立新的根提交" -#: builtin/rebase.c:1850 +#: builtin/rebase.c:1886 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s'：只需要與分支的一個合併基礎" -#: builtin/rebase.c:1853 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s'：只需要一個合併基礎" -#: builtin/rebase.c:1861 +#: builtin/rebase.c:1897 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "沒有指向一個有效的提交 '%s'" -#: builtin/rebase.c:1887 +#: builtin/rebase.c:1923 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "致命錯誤：無此分支/提交 '%s'" -#: builtin/rebase.c:1895 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: builtin/rebase.c:1931 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "沒有這樣的引用：%s" -#: builtin/rebase.c:1906 +#: builtin/rebase.c:1942 msgid "Could not resolve HEAD to a revision" msgstr "無法將 HEAD 解析為一個版本" -#: builtin/rebase.c:1927 +#: builtin/rebase.c:1963 msgid "Please commit or stash them." msgstr "請提交或儲藏修改。" -#: builtin/rebase.c:1963 +#: builtin/rebase.c:1999 #, c-format msgid "could not switch to %s" msgstr "無法切換到 %s" -#: builtin/rebase.c:1974 +#: builtin/rebase.c:2010 msgid "HEAD is up to date." msgstr "HEAD 是最新的。" -#: builtin/rebase.c:1976 +#: builtin/rebase.c:2012 #, c-format msgid "Current branch %s is up to date.\n" msgstr "目前分支 %s 是最新的。\n" -#: builtin/rebase.c:1984 +#: builtin/rebase.c:2020 msgid "HEAD is up to date, rebase forced." msgstr "HEAD 是最新的，強制重定基底。" -#: builtin/rebase.c:1986 +#: builtin/rebase.c:2022 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "目前分支 %s 是最新的，強制重定基底。\n" -#: builtin/rebase.c:1994 +#: builtin/rebase.c:2030 msgid "The pre-rebase hook refused to rebase." msgstr "pre-rebase 掛鉤拒絕了重定基底動作。" -#: builtin/rebase.c:2001 +#: builtin/rebase.c:2037 #, c-format msgid "Changes to %s:\n" msgstr "到 %s 的變更：\n" -#: builtin/rebase.c:2004 +#: builtin/rebase.c:2040 #, c-format msgid "Changes from %s to %s:\n" msgstr "從 %s 到 %s 的變更：\n" -#: builtin/rebase.c:2029 +#: builtin/rebase.c:2065 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "首先，還原開頭指標以便在其上重放您的工作...\n" -#: builtin/rebase.c:2038 +#: builtin/rebase.c:2074 msgid "Could not detach HEAD" msgstr "無法分離開頭指標" -#: builtin/rebase.c:2047 +#: builtin/rebase.c:2083 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "快轉 %s 到 %s。\n" @@ -18928,7 +19493,7 @@ msgstr "快轉 %s 到 %s。\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <版本庫目錄>" -#: builtin/receive-pack.c:844 +#: builtin/receive-pack.c:1276 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" @@ -18954,7 +19519,7 @@ msgstr "" "若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n" "設定變數為 'refuse'。" -#: builtin/receive-pack.c:864 +#: builtin/receive-pack.c:1296 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" @@ -18973,11 +19538,11 @@ msgstr "" "\n" "若要封鎖此訊息，您可以設定它為 'refuse'。" -#: builtin/receive-pack.c:1970 +#: builtin/receive-pack.c:2481 msgid "quiet" msgstr "靜默模式" -#: builtin/receive-pack.c:1984 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "您必須指定一個目錄。" @@ -19172,40 +19737,35 @@ msgstr "指定一個 master 分支並使用 --mirror 選項沒有意義" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義" -#: builtin/remote.c:195 builtin/remote.c:696 +#: builtin/remote.c:195 builtin/remote.c:700 #, c-format msgid "remote %s already exists." msgstr "遠端 %s 已經存在。" -#: builtin/remote.c:199 builtin/remote.c:700 -#, c-format -msgid "'%s' is not a valid remote name" -msgstr "'%s' 不是一個有效的遠端名稱" - -#: builtin/remote.c:239 +#: builtin/remote.c:240 #, c-format msgid "Could not setup master '%s'" msgstr "無法設定 master '%s'" -#: builtin/remote.c:354 +#: builtin/remote.c:355 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "無法得到引用規格 %s 的取得列表" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:454 builtin/remote.c:462 msgid "(matching)" msgstr "（符合）" -#: builtin/remote.c:465 +#: builtin/remote.c:466 msgid "(delete)" msgstr "（刪除）" -#: builtin/remote.c:653 +#: builtin/remote.c:655 #, c-format msgid "could not set '%s'" msgstr "無法設定 '%s'" -#: builtin/remote.c:658 +#: builtin/remote.c:660 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -19216,17 +19776,17 @@ msgstr "" "\t%s:%d\n" "現命名成不存在的遠端分支 '%s'" -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 #, c-format msgid "No such remote: '%s'" msgstr "沒有此遠端版本庫：'%s'" -#: builtin/remote.c:706 +#: builtin/remote.c:710 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "不能重新命名設定小節 '%s' 到 '%s'" -#: builtin/remote.c:726 +#: builtin/remote.c:730 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -19237,17 +19797,17 @@ msgstr "" "\t%s\n" "\t如果必要請手動更新設定。" -#: builtin/remote.c:766 +#: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" msgstr "刪除 '%s' 失敗" -#: builtin/remote.c:800 +#: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" msgstr "建立 '%s' 失敗" -#: builtin/remote.c:876 +#: builtin/remote.c:882 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -19256,118 +19816,118 @@ msgid_plural "" "to delete them, use:" msgstr[0] "注意：ref/remotes 層級之外的一個分支未被移除。要刪除它，使用：" -#: builtin/remote.c:890 +#: builtin/remote.c:896 #, c-format msgid "Could not remove config section '%s'" msgstr "不能移除設定小節 '%s'" -#: builtin/remote.c:993 +#: builtin/remote.c:999 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的（下一次取得將儲存於 remotes/%s）" -#: builtin/remote.c:996 +#: builtin/remote.c:1002 msgid " tracked" msgstr " 已追蹤" -#: builtin/remote.c:998 +#: builtin/remote.c:1004 msgid " stale (use 'git remote prune' to remove)" msgstr " 過時（使用 'git remote prune' 來移除）" -#: builtin/remote.c:1000 +#: builtin/remote.c:1006 msgid " ???" msgstr " ???" -#: builtin/remote.c:1041 +#: builtin/remote.c:1047 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "無效的 branch.%s.merge，不能重定基底到一個以上的分支" -#: builtin/remote.c:1050 +#: builtin/remote.c:1056 #, c-format msgid "rebases interactively onto remote %s" msgstr "互動式重定基底到遠端 %s" -#: builtin/remote.c:1052 +#: builtin/remote.c:1058 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "互動式重定基底（含合併提交）到遠端 %s" -#: builtin/remote.c:1055 +#: builtin/remote.c:1061 #, c-format msgid "rebases onto remote %s" msgstr "重定基底到遠端 %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:1065 #, c-format msgid " merges with remote %s" msgstr " 與遠端 %s 合併" -#: builtin/remote.c:1062 +#: builtin/remote.c:1068 #, c-format msgid "merges with remote %s" msgstr "與遠端 %s 合併" -#: builtin/remote.c:1065 +#: builtin/remote.c:1071 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s 以及和遠端 %s\n" -#: builtin/remote.c:1108 +#: builtin/remote.c:1114 msgid "create" msgstr "建立" -#: builtin/remote.c:1111 +#: builtin/remote.c:1117 msgid "delete" msgstr "刪除" -#: builtin/remote.c:1115 +#: builtin/remote.c:1121 msgid "up to date" msgstr "最新" -#: builtin/remote.c:1118 +#: builtin/remote.c:1124 msgid "fast-forwardable" msgstr "可快轉" -#: builtin/remote.c:1121 +#: builtin/remote.c:1127 msgid "local out of date" msgstr "本機已過時" -#: builtin/remote.c:1128 +#: builtin/remote.c:1134 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 強制推送至 %-*s (%s)" -#: builtin/remote.c:1131 +#: builtin/remote.c:1137 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推送至 %-*s (%s)" -#: builtin/remote.c:1135 +#: builtin/remote.c:1141 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 強制推送至 %s" -#: builtin/remote.c:1138 +#: builtin/remote.c:1144 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" -#: builtin/remote.c:1206 +#: builtin/remote.c:1212 msgid "do not query remotes" msgstr "不查詢遠端" -#: builtin/remote.c:1233 +#: builtin/remote.c:1239 #, c-format msgid "* remote %s" msgstr "* 遠端 %s" -#: builtin/remote.c:1234 +#: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" msgstr " 取得位址：%s" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" msgstr "(無 URL)" @@ -19375,177 +19935,177 @@ msgstr "(無 URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" msgstr " 推送位址：%s" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c:1253 +#: builtin/remote.c:1259 msgid "(not queried)" msgstr "（未查詢）" -#: builtin/remote.c:1255 +#: builtin/remote.c:1261 msgid "(unknown)" msgstr "（未知）" -#: builtin/remote.c:1259 +#: builtin/remote.c:1265 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（遠端 HEAD 模糊，可能是下列中的一個）：\n" -#: builtin/remote.c:1271 +#: builtin/remote.c:1277 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " 遠端分支：%s" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" msgstr "（狀態未查詢）" -#: builtin/remote.c:1283 +#: builtin/remote.c:1289 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 為 'git pull' 設定的本機分支：" -#: builtin/remote.c:1291 +#: builtin/remote.c:1297 msgid " Local refs will be mirrored by 'git push'" msgstr " 本機引用將在 'git push' 時被鏡像" -#: builtin/remote.c:1297 +#: builtin/remote.c:1303 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 為 'git push' 設定的本機引用%s：" -#: builtin/remote.c:1318 +#: builtin/remote.c:1324 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根據遠端設定 refs/remotes/<名稱>/HEAD" -#: builtin/remote.c:1320 +#: builtin/remote.c:1326 msgid "delete refs/remotes/<name>/HEAD" msgstr "刪除 refs/remotes/<名稱>/HEAD" -#: builtin/remote.c:1335 +#: builtin/remote.c:1341 msgid "Cannot determine remote HEAD" msgstr "無法確定遠端 HEAD" -#: builtin/remote.c:1337 +#: builtin/remote.c:1343 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多個遠端 HEAD 分支。請明確地選擇一個用指令：" -#: builtin/remote.c:1347 +#: builtin/remote.c:1353 #, c-format msgid "Could not delete %s" msgstr "無法刪除 %s" -#: builtin/remote.c:1355 +#: builtin/remote.c:1361 #, c-format msgid "Not a valid ref: %s" msgstr "不是一個有效引用：%s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1363 #, c-format msgid "Could not setup %s" msgstr "不能設定 %s" # 譯者：請維持前導空格 -#: builtin/remote.c:1375 +#: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" msgstr " %s 將成為懸空狀態！" # 譯者：請維持前導空格 -#: builtin/remote.c:1376 +#: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" msgstr " %s 已成為懸空狀態！" -#: builtin/remote.c:1386 +#: builtin/remote.c:1392 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1387 +#: builtin/remote.c:1393 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1403 +#: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" msgstr " * [將刪除] %s" -#: builtin/remote.c:1406 +#: builtin/remote.c:1412 #, c-format msgid " * [pruned] %s" msgstr " * [已刪除] %s" -#: builtin/remote.c:1451 +#: builtin/remote.c:1457 msgid "prune remotes after fetching" msgstr "抓取後清除遠端" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format msgid "No such remote '%s'" msgstr "沒有此遠端 '%s'" -#: builtin/remote.c:1530 +#: builtin/remote.c:1539 msgid "add branch" msgstr "新增分支" -#: builtin/remote.c:1537 +#: builtin/remote.c:1546 msgid "no remote specified" msgstr "未指定遠端" -#: builtin/remote.c:1554 +#: builtin/remote.c:1563 msgid "query push URLs rather than fetch URLs" msgstr "查詢推送 URL 位址，而非取得 URL 位址" -#: builtin/remote.c:1556 +#: builtin/remote.c:1565 msgid "return all URLs" msgstr "返回所有 URL 位址" -#: builtin/remote.c:1584 +#: builtin/remote.c:1595 #, c-format msgid "no URLs configured for remote '%s'" msgstr "沒有給遠端版本庫 '%s' 設定 URL" -#: builtin/remote.c:1610 +#: builtin/remote.c:1621 msgid "manipulate push URLs" msgstr "動作推送 URLS" -#: builtin/remote.c:1612 +#: builtin/remote.c:1623 msgid "add URL" msgstr "新增 URL" -#: builtin/remote.c:1614 +#: builtin/remote.c:1625 msgid "delete URLs" msgstr "刪除 URL" -#: builtin/remote.c:1621 +#: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" msgstr "--add --delete 無意義" -#: builtin/remote.c:1660 +#: builtin/remote.c:1673 #, c-format msgid "Invalid old URL pattern: %s" msgstr "無效的舊 URL 符合範本：%s" -#: builtin/remote.c:1668 +#: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" msgstr "未找到此 URL：%s" -#: builtin/remote.c:1670 +#: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" msgstr "將不會刪除所有非推送 URL 位址" @@ -19561,130 +20121,119 @@ msgstr "" "增量 repack 和 bitmap 索引不相容。 使用 --no-write-bitmap-index\n" "或停用 pack.writebitmaps 設定。" -#: builtin/repack.c:193 +#: builtin/repack.c:197 msgid "could not start pack-objects to repack promisor objects" msgstr "無法開始 pack-objects 來重新打包 promisor 物件" -#: builtin/repack.c:232 builtin/repack.c:418 +#: builtin/repack.c:268 builtin/repack.c:447 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。" -#: builtin/repack.c:256 +#: builtin/repack.c:295 msgid "could not finish pack-objects to repack promisor objects" msgstr "無法完成 pack-objects 來重新打包 promisor 物件" -#: builtin/repack.c:294 +#: builtin/repack.c:323 msgid "pack everything in a single pack" msgstr "所有內容打包到一個包檔案中" -#: builtin/repack.c:296 +#: builtin/repack.c:325 msgid "same as -a, and turn unreachable objects loose" msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件" -#: builtin/repack.c:299 +#: builtin/repack.c:328 msgid "remove redundant packs, and run git-prune-packed" msgstr "刪除多餘的包，執行 git-prune-packed" -#: builtin/repack.c:301 +#: builtin/repack.c:330 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta" -#: builtin/repack.c:303 +#: builtin/repack.c:332 msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object" -#: builtin/repack.c:305 +#: builtin/repack.c:334 msgid "do not run git-update-server-info" msgstr "不執行 git-update-server-info" -#: builtin/repack.c:308 +#: builtin/repack.c:337 msgid "pass --local to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --local" -#: builtin/repack.c:310 +#: builtin/repack.c:339 msgid "write bitmap index" msgstr "寫 bitmap 索引" -#: builtin/repack.c:312 +#: builtin/repack.c:341 msgid "pass --delta-islands to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --delta-islands" -#: builtin/repack.c:313 +#: builtin/repack.c:342 msgid "approxidate" msgstr "近似日期" -#: builtin/repack.c:314 +#: builtin/repack.c:343 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，不要將早於提供時間的物件過期" -#: builtin/repack.c:316 +#: builtin/repack.c:345 msgid "with -a, repack unreachable objects" msgstr "使用 -a ，重新對無法取得物件打包" -#: builtin/repack.c:318 +#: builtin/repack.c:347 msgid "size of the window used for delta compression" msgstr "用於增量壓縮的視窗值" -#: builtin/repack.c:319 builtin/repack.c:325 +#: builtin/repack.c:348 builtin/repack.c:354 msgid "bytes" msgstr "位元組" -#: builtin/repack.c:320 +#: builtin/repack.c:349 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制記憶體大小而非條目數" -#: builtin/repack.c:322 +#: builtin/repack.c:351 msgid "limits the maximum delta depth" msgstr "限制最大增量深度" -#: builtin/repack.c:324 +#: builtin/repack.c:353 msgid "limits the maximum number of threads" msgstr "限制最大執行緒數" -#: builtin/repack.c:326 +#: builtin/repack.c:355 msgid "maximum size of each packfile" msgstr "每個 packfile 的最大尺寸" -#: builtin/repack.c:328 +#: builtin/repack.c:357 msgid "repack objects in packs marked with .keep" msgstr "對標記為 .keep 的包中的物件重新打包" -#: builtin/repack.c:330 +#: builtin/repack.c:359 msgid "do not repack this pack" msgstr "不要對該包檔案重新打包" -#: builtin/repack.c:340 +#: builtin/repack.c:369 msgid "cannot delete packs in a precious-objects repo" msgstr "不能刪除珍品版本庫中的打包檔案" -#: builtin/repack.c:344 +#: builtin/repack.c:373 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable 和 -A 不相容" -#: builtin/repack.c:427 +#: builtin/repack.c:456 msgid "Nothing new to pack." msgstr "沒有新的要打包。" -#: builtin/repack.c:488 +#: builtin/repack.c:486 #, c-format -msgid "" -"WARNING: Some packs in use have been renamed by\n" -"WARNING: prefixing old- to their name, in order to\n" -"WARNING: replace them with the new version of the\n" -"WARNING: file. But the operation failed, and the\n" -"WARNING: attempt to rename them back to their\n" -"WARNING: original names also failed.\n" -"WARNING: Please rename them in %s manually:\n" -msgstr "" -"警告：為了將包檔案取代為新版本，一些使用中的包已經\n" -"警告：透過新增 old- 前綴的方式重新命名。但是動作失敗，\n" -"警告：並且嘗試重新命名改回原有檔案名的動作也失敗。\n" -"警告：請手動將 %s 下的這些檔案重新命名：\n" +msgid "missing required file: %s" +msgstr "缺少必要檔案：%s" -#: builtin/repack.c:536 +#: builtin/repack.c:488 #, c-format -msgid "failed to remove '%s'" -msgstr "刪除 '%s' 失敗" +msgid "could not unlink: %s" +msgstr "無法取消連結：%s" #: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" @@ -20012,8 +20561,8 @@ msgstr "HEAD 現在位於 %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合併過程中不能做%s重設動作。" -#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594 +#: builtin/stash.c:618 msgid "be quiet, only report errors" msgstr "安靜模式，只報告錯誤" @@ -20220,11 +20769,11 @@ msgstr "保留初始化的空提交" msgid "keep redundant, empty commits" msgstr "保持多餘的、空的提交" -#: builtin/revert.c:232 +#: builtin/revert.c:239 msgid "revert failed" msgstr "還原失敗" -#: builtin/revert.c:245 +#: builtin/revert.c:252 msgid "cherry-pick failed" msgstr "揀選失敗" @@ -20316,55 +20865,76 @@ msgstr "" "receive-pack>] [--verbose] [--thin] [--atomic] [<主機>:]<目錄> [<引用>...]\n" " --all 和明確的 <引用> 互斥。" -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:188 msgid "remote name" msgstr "遠端名稱" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:201 msgid "use stateless RPC protocol" msgstr "使用無狀態的 RPC 協定" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:202 msgid "read refs from stdin" msgstr "從標準輸入讀取引用" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:203 msgid "print status from remote helper" msgstr "列印來自遠端 helper 的狀態" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:16 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<選項>] [<版本範圍>] [[--] <路徑>...]" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:17 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<選項>]" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:135 +msgid "using multiple --group options with stdin is not supported" +msgstr "不支援在標準輸入使用多個 --group 選項" + +#: builtin/shortlog.c:145 +msgid "using --group=trailer with stdin is not supported" +msgstr "不支援在標準輸入使用 --group=trailer" + +#: builtin/shortlog.c:335 +#, c-format +msgid "unknown group type: %s" +msgstr "未知群組類型：%s" + +#: builtin/shortlog.c:363 msgid "Group by committer rather than author" msgstr "按照提交者分組而不是作者" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:366 msgid "sort output according to the number of commits per author" msgstr "根據每個作者的提交數量排序" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:368 msgid "Suppress commit descriptions, only provides commit count" msgstr "隱藏提交說明，只提供提交數量" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:370 msgid "Show the email address of each author" msgstr "顯示每個作者的電子信件位址" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:371 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:372 msgid "Linewrap output" msgstr "折行輸出" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:374 +msgid "field" +msgstr "欄位" + +#: builtin/shortlog.c:375 +msgid "Group by field" +msgstr "依欄位分組" + +#: builtin/shortlog.c:403 msgid "too many arguments given outside repository" msgstr "版本庫外執行提供了太多的參數" @@ -20555,58 +21125,70 @@ msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用" msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <選項>" -#: builtin/sparse-checkout.c:64 +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:76 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）" -#: builtin/sparse-checkout.c:216 +#: builtin/sparse-checkout.c:228 msgid "failed to create directory for sparse-checkout file" msgstr "無法建立稀疏檢出檔案的目錄" -#: builtin/sparse-checkout.c:257 +#: builtin/sparse-checkout.c:269 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "無法升級版本庫格式，以致無法啟用 worktreeConfig" -#: builtin/sparse-checkout.c:259 +#: builtin/sparse-checkout.c:271 msgid "failed to set extensions.worktreeConfig setting" msgstr "無法設定 extensions.worktreeConfig 設定" -#: builtin/sparse-checkout.c:276 +#: builtin/sparse-checkout.c:288 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:295 +#: builtin/sparse-checkout.c:307 msgid "initialize the sparse-checkout in cone mode" msgstr "以 cone 模式初始化稀疏檢出" -#: builtin/sparse-checkout.c:332 +#: builtin/sparse-checkout.c:344 #, c-format msgid "failed to open '%s'" msgstr "無法開啟「%s」" -#: builtin/sparse-checkout.c:389 +#: builtin/sparse-checkout.c:401 #, c-format msgid "could not normalize path %s" msgstr "無法標準化路徑 %s" -#: builtin/sparse-checkout.c:401 +#: builtin/sparse-checkout.c:413 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)" -#: builtin/sparse-checkout.c:426 +#: builtin/sparse-checkout.c:438 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "無法去掉 '%s' C 樣式字串的引號" -#: builtin/sparse-checkout.c:480 builtin/sparse-checkout.c:504 +#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 msgid "unable to load existing sparse-checkout patterns" msgstr "無法載入現存的稀疏檢出樣式" -#: builtin/sparse-checkout.c:549 +#: builtin/sparse-checkout.c:561 msgid "read patterns from standard in" msgstr "從標準輸入讀取樣式" -#: builtin/sparse-checkout.c:586 +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:623 msgid "error while refreshing working directory" msgstr "重新整理工作目錄時發生錯誤" @@ -20709,8 +21291,8 @@ msgid "could not generate diff %s^!." msgstr "無法生成差異 %s^!." #: builtin/stash.c:422 -msgid "conflicts in index.Try without --index." -msgstr "索引中有衝突。嘗試不用 --index。" +msgid "conflicts in index. Try without --index." +msgstr "索引中有衝突。請試試看不用 --index。" #: builtin/stash.c:428 msgid "could not save index tree" @@ -20729,120 +21311,120 @@ msgstr "正在合併 %s 和 %s" msgid "Index was not unstashed." msgstr "索引未從儲藏中復原。" -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:522 builtin/stash.c:620 msgid "attempt to recreate the index" msgstr "嘗試重建索引" -#: builtin/stash.c:555 +#: builtin/stash.c:566 #, c-format msgid "Dropped %s (%s)" msgstr "捨棄了 %s（%s）" -#: builtin/stash.c:558 +#: builtin/stash.c:569 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s：無法捨棄儲藏條目" -#: builtin/stash.c:583 +#: builtin/stash.c:582 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' 不是一個儲藏引用" -#: builtin/stash.c:633 +#: builtin/stash.c:632 msgid "The stash entry is kept in case you need it again." msgstr "儲藏條目被保留以備您再次需要。" -#: builtin/stash.c:656 +#: builtin/stash.c:655 msgid "No branch name specified" msgstr "未指定分支名" -#: builtin/stash.c:800 builtin/stash.c:837 +#: builtin/stash.c:799 builtin/stash.c:836 #, c-format msgid "Cannot update %s with %s" msgstr "無法用 %2$s 更新 %1$s" -#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540 +#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536 msgid "stash message" msgstr "儲藏說明" -#: builtin/stash.c:828 +#: builtin/stash.c:827 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一個 <提交> 參數" -#: builtin/stash.c:1046 +#: builtin/stash.c:1042 msgid "No changes selected" msgstr "沒有選擇變更" -#: builtin/stash.c:1146 +#: builtin/stash.c:1142 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: builtin/stash.c:1173 +#: builtin/stash.c:1169 msgid "Cannot save the current index state" msgstr "無法儲存目前索引狀態" -#: builtin/stash.c:1182 +#: builtin/stash.c:1178 msgid "Cannot save the untracked files" msgstr "無法儲存未追蹤檔案" -#: builtin/stash.c:1193 builtin/stash.c:1202 +#: builtin/stash.c:1189 builtin/stash.c:1198 msgid "Cannot save the current worktree state" msgstr "無法儲存目前工作區狀態" -#: builtin/stash.c:1230 +#: builtin/stash.c:1226 msgid "Cannot record working tree state" msgstr "不能記錄工作區狀態" -#: builtin/stash.c:1279 +#: builtin/stash.c:1275 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all" -#: builtin/stash.c:1295 +#: builtin/stash.c:1291 msgid "Did you forget to 'git add'?" msgstr "您是否忘了執行 'git add'？" -#: builtin/stash.c:1310 +#: builtin/stash.c:1306 msgid "No local changes to save" msgstr "沒有要儲存的本機修改" -#: builtin/stash.c:1317 +#: builtin/stash.c:1313 msgid "Cannot initialize stash" msgstr "無法初始化儲藏" -#: builtin/stash.c:1332 +#: builtin/stash.c:1328 msgid "Cannot save the current status" msgstr "無法儲存目前狀態" -#: builtin/stash.c:1337 +#: builtin/stash.c:1333 #, c-format msgid "Saved working directory and index state %s" msgstr "儲存工作目錄和索引狀態 %s" -#: builtin/stash.c:1427 +#: builtin/stash.c:1423 msgid "Cannot remove worktree changes" msgstr "無法刪除工作區變更" -#: builtin/stash.c:1466 builtin/stash.c:1531 +#: builtin/stash.c:1462 builtin/stash.c:1527 msgid "keep index" msgstr "保持索引" -#: builtin/stash.c:1468 builtin/stash.c:1533 +#: builtin/stash.c:1464 builtin/stash.c:1529 msgid "stash in patch mode" msgstr "以修補檔模式儲藏" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "quiet mode" msgstr "靜默模式" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1467 builtin/stash.c:1532 msgid "include untracked files in stash" msgstr "儲藏中包含未追蹤檔案" -#: builtin/stash.c:1473 builtin/stash.c:1538 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "include ignore files" msgstr "包含忽略的檔案" -#: builtin/stash.c:1573 +#: builtin/stash.c:1569 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -20866,7 +21448,7 @@ msgstr "跳過和移除所有的備註行" msgid "prepend comment character and space to each line" msgstr "為每一行的行首新增備註符和空格" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一個完整的引用名稱，卻得到 %s" @@ -20880,7 +21462,7 @@ msgstr "submodule--helper print-default-remote 不帶參數" msgid "cannot strip one component off url '%s'" msgstr "無法從 url '%s' 剝離一個元件" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "相對路徑的替代錨記（anchor）" @@ -20888,8 +21470,8 @@ msgstr "相對路徑的替代錨記（anchor）" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模組 '%s' 的 url" @@ -20922,7 +21504,7 @@ msgstr "" msgid "Suppress output of entering each submodule command" msgstr "阻止進入每一個子模組指令的輸出" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" msgstr "遞迴進入嵌套子模組中" @@ -20937,100 +21519,153 @@ msgid "" "authoritative upstream." msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。" -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "無法為子模組 '%s' 註冊 url" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "子模組 '%s'（%s）已對路徑 '%s' 註冊\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "警告：建議子模組 '%s' 使用指令更新模式\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "無法為子模組 '%s' 註冊更新模式" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "阻止子模組初始化的輸出" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<選項>] [<路徑>]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:835 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "無法解析子模組 '%s' 的 HEAD 引用" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "遞迴子模組 '%s' 失敗" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "阻止子模組狀態輸出" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:887 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "使用儲存在索引中的提交，而非儲存在子模組 HEAD 中的提交" -#: builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" msgstr "遞迴進入嵌套子模組中" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路徑>" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "* %s %s(blob)->%s(submodule)" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "* %s %s(submodule)->%s(blob)" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "無法雜湊來自 '%s' 的物件" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "非預期的模式 %o\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "使用儲存在索引中的提交而非子模組 HEAD" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "比較索引中的，和子模組 HEAD 中的提交" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "'ignore_config' 值設為 'all' 時略過子模組" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "限制摘要大小" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule--helper summary [<選項>] [<提交>] [--] [<路徑>]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "無法取得 HEAD 的版本" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "--cached 和 --files 互斥" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "為 '%s' 同步子模組 url\n" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "無法為子模組路徑 '%s' 註冊 url" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "無法得到子模組 '%s' 的預設遠端關聯" -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "無法為子模組 '%s' 更新遠端關聯" -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1485 msgid "Suppress output of synchronizing submodule url" msgstr "阻止子模組 url 同步的輸出" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -21039,52 +21674,52 @@ msgstr "" "子模組工作區 '%s' 包含一個 .git 目錄（如果您確需刪除它及其全部歷史，使用 'rm " "-rf' 指令）" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "子模組工作區 '%s' 包含本機修改；使用 '-f' 捨棄它們" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目錄 '%s'\n" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "無法移除子模組工作區 '%s'\n" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "不能建立空的子模組目錄 %s" -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "子模組 '%s'（%s）未對路徑 '%s' 註冊\n" -#: builtin/submodule--helper.c:1200 +#: builtin/submodule--helper.c:1624 msgid "Remove submodule working trees even if they contain local changes" msgstr "刪除子模組工作區，即使包含本機修改" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "將所有子模組取消註冊" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您確定想要對所有子模組執行取消初始化，請使用 '--all'" -#: builtin/submodule--helper.c:1289 +#: builtin/submodule--helper.c:1713 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" @@ -21096,46 +21731,46 @@ msgstr "" "以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n" "而非 '--reference' 複製。" -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模組 '%s' 不能新增版本庫備選：%s" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能識別 submodule.alternateLocaion 的取值 '%s'" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "新的子模組將要複製的路徑" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "新子模組的名稱" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "複製子模組的 url 位址" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "淺複製的深度" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "強制顯示複製進度" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 msgid "disallow cloning into non-empty directory" msgstr "不允許複製至非空白目錄" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -21145,188 +21780,186 @@ msgstr "" ">] [--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路" "徑>" -#: builtin/submodule--helper.c:1449 +#: builtin/submodule--helper.c:1873 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」" -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "無法複製 '%s' 到子模組路徑 '%s'" -#: builtin/submodule--helper.c:1464 +#: builtin/submodule--helper.c:1888 #, c-format msgid "directory not empty: '%s'" msgstr "目錄不是空的：「%s」" -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "無法得到 '%s' 的子模組目錄" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模組 '%s' 尚未初始化" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "也許您想要執行 'update --init'？" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略過未合併的子模組 %s" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "略過子模組 '%s'" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "複製 '%s' 失敗。按計劃重試" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次嘗試複製 '%s' 失敗，離開" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "到工作區的路徑" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作區中的路徑，遞迴嵌套子模組" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:2340 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "建立一個指定深度的淺複製" -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "並發任務" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始複製是否應該遵守推薦的淺複製選項" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "不要輸出複製進度" -#: builtin/submodule--helper.c:1933 +#: builtin/submodule--helper.c:2357 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "update 參數取值錯誤" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:2418 #, 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:2117 +#: builtin/submodule--helper.c:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "無法獲得子模組 '%s' 的版本庫句柄" -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "在子模組中遞迴" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "檢查寫入 .gitmodules 檔案是否安全" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "取消 .gitmodules 檔案中的設定" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <名稱> [<值>]" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <名稱>" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:176 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "請確認 .gitmodules 檔案在工作區裡" -#: builtin/submodule--helper.c:2257 +#: builtin/submodule--helper.c:2681 msgid "Suppress output for setting url of a submodule" msgstr "阻止子模組設定 URL 的輸出" -#: builtin/submodule--helper.c:2261 +#: builtin/submodule--helper.c:2685 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>" -#: builtin/submodule--helper.c:2294 +#: builtin/submodule--helper.c:2718 msgid "set the default tracking branch to master" msgstr "將預設的追蹤分支設為 master" -#: builtin/submodule--helper.c:2296 +#: builtin/submodule--helper.c:2720 msgid "set the default tracking branch" msgstr "設定預設追蹤分支" -#: builtin/submodule--helper.c:2300 -#| msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" +#: builtin/submodule--helper.c:2724 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -#: builtin/submodule--helper.c:2301 -#| msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" +#: builtin/submodule--helper.c:2725 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -#: builtin/submodule--helper.c:2308 +#: builtin/submodule--helper.c:2732 msgid "--branch or --default required" msgstr "需要 --branch 或 --default" -#: builtin/submodule--helper.c:2311 +#: builtin/submodule--helper.c:2735 msgid "--branch and --default are mutually exclusive" msgstr "--branch 與 --default 互斥" -#: builtin/submodule--helper.c:2367 git.c:436 git.c:683 +#: builtin/submodule--helper.c:2792 git.c:438 git.c:711 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支援 --super-prefix" -#: builtin/submodule--helper.c:2373 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一個有效的 submodule--helper 子指令" @@ -21351,11 +21984,11 @@ msgstr "刪除符號引用" msgid "shorten ref output" msgstr "縮短引用輸出" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason" msgstr "原因" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason of the update" msgstr "更新的原因" @@ -21375,11 +22008,12 @@ msgstr "git tag -d <標籤名>..." msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" "git tag -l [-n[<數字>]] [--contains <提交>] [--no-contains <提交>] [--points-" "at <物件>]\n" -"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" +"\t\t[--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -21500,7 +22134,7 @@ msgstr "使用另外的私鑰簽名該標籤" msgid "replace the tag if exists" msgstr "如果存在，取代現有的標籤" -#: builtin/tag.c:422 builtin/update-ref.c:492 +#: builtin/tag.c:422 builtin/update-ref.c:505 msgid "create a reflog" msgstr "建立引用日誌" @@ -21842,19 +22476,19 @@ msgstr "git update-ref [<選項>] <引用名> <新值> [<舊值>]" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<選項>] --stdin [-z]" -#: builtin/update-ref.c:487 +#: builtin/update-ref.c:500 msgid "delete the reference" msgstr "刪除引用" -#: builtin/update-ref.c:489 +#: builtin/update-ref.c:502 msgid "update <refname> not the one it points to" msgstr "更新 <引用名> 本身而不是它指向的引用" -#: builtin/update-ref.c:490 +#: builtin/update-ref.c:503 msgid "stdin has NUL-terminated arguments" msgstr "標準輸入有以 NUL 字元終止的參數" -#: builtin/update-ref.c:491 +#: builtin/update-ref.c:504 msgid "read updates from stdin" msgstr "從標準輸入讀取更新" @@ -21898,15 +22532,15 @@ msgstr "列印提交內容" msgid "print raw gpg status output" msgstr "列印原始 gpg 狀態輸出" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "詳細輸出" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "只顯示統計" @@ -21946,7 +22580,7 @@ msgstr "git worktree remove [<選項>] <工作區>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <路徑>" -#: builtin/worktree.c:60 builtin/worktree.c:972 +#: builtin/worktree.c:60 builtin/worktree.c:973 #, c-format msgid "failed to delete '%s'" msgstr "刪除 '%s' 失敗" @@ -22079,54 +22713,54 @@ msgstr "-b、-B 和 --detach 是互斥的" msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在建立新分支時使用 --[no-]track 選項" -#: builtin/worktree.c:755 +#: builtin/worktree.c:758 msgid "reason for locking" msgstr "鎖定原因" -#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 -#: builtin/worktree.c:1000 +#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877 +#: builtin/worktree.c:1001 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一個工作區" -#: builtin/worktree.c:769 builtin/worktree.c:802 +#: builtin/worktree.c:772 builtin/worktree.c:805 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作區無法被加鎖或解鎖" -#: builtin/worktree.c:774 +#: builtin/worktree.c:777 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被鎖定，原因：%s" -#: builtin/worktree.c:776 +#: builtin/worktree.c:779 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被鎖定" -#: builtin/worktree.c:804 +#: builtin/worktree.c:807 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被鎖定" -#: builtin/worktree.c:845 +#: builtin/worktree.c:848 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移動或刪除包含子模組的工作區" -#: builtin/worktree.c:853 +#: builtin/worktree.c:856 msgid "force move even if worktree is dirty or locked" msgstr "強制移動，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:876 builtin/worktree.c:1002 +#: builtin/worktree.c:879 builtin/worktree.c:1003 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一個主工作區" -#: builtin/worktree.c:881 +#: builtin/worktree.c:884 #, c-format msgid "could not figure out destination name from '%s'" msgstr "無法從 '%s' 算出目標名稱" -#: builtin/worktree.c:894 +#: builtin/worktree.c:897 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22135,7 +22769,7 @@ msgstr "" "無法移動一個鎖定的工作區，鎖定原因：%s\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:896 +#: builtin/worktree.c:899 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22143,36 +22777,36 @@ msgstr "" "無法移動一個鎖定的工作區，\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:899 +#: builtin/worktree.c:902 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "驗證失敗，無法移動工作區：%s" -#: builtin/worktree.c:904 +#: builtin/worktree.c:907 #, c-format msgid "failed to move '%s' to '%s'" msgstr "移動 '%s' 到 '%s' 失敗" -#: builtin/worktree.c:952 +#: builtin/worktree.c:953 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中執行 'git status' 失敗" -#: builtin/worktree.c:956 +#: builtin/worktree.c:957 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除" -#: builtin/worktree.c:961 +#: builtin/worktree.c:962 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d" -#: builtin/worktree.c:984 +#: builtin/worktree.c:985 msgid "force removal even if worktree is dirty or locked" msgstr "強制刪除，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:1007 +#: builtin/worktree.c:1008 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22181,7 +22815,7 @@ msgstr "" "無法刪除一個鎖定的工作區，鎖定原因：%s\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:1009 +#: builtin/worktree.c:1010 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22189,11 +22823,21 @@ msgstr "" "無法刪除一個鎖定的工作區，\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:1012 +#: builtin/worktree.c:1013 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "驗證失敗，無法刪除工作區：%s" +#: builtin/worktree.c:1037 +#, c-format +msgid "repair: %s: %s" +msgstr "修復：%s：%s" + +#: builtin/worktree.c:1040 +#, c-format +msgid "error: %s: %s" +msgstr "錯誤：%s：%s" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<前綴>/]" @@ -22210,158 +22854,29 @@ msgstr "將 <前綴> 子目錄內容寫到一個樹狀物件" msgid "only useful for debugging" msgstr "只對除錯有用" -#: bugreport.c:15 -msgid "git version:\n" -msgstr "git 版本：\n" - -#: bugreport.c:21 -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() 失敗，錯誤：「%s」(%d)\n" - -#: bugreport.c:31 -msgid "compiler info: " -msgstr "編譯器資訊： " - -#: bugreport.c:34 -msgid "libc info: " -msgstr "libc 資訊： " - -#: bugreport.c:80 -msgid "not run from a git repository - no hooks to show\n" -msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n" - -#: bugreport.c:90 -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格式>]" - -#: bugreport.c:97 -msgid "" -"Thank you for filling out a Git bug report!\n" -"Please answer the following questions to help us understand your issue.\n" -"\n" -"What did you do before the bug happened? (Steps to reproduce your issue)\n" -"\n" -"What did you expect to happen? (Expected behavior)\n" -"\n" -"What happened instead? (Actual behavior)\n" -"\n" -"What's different between what you expected and what actually happened?\n" -"\n" -"Anything else you want to add:\n" -"\n" -"Please review the rest of the bug report below.\n" -"You can delete any lines you don't wish to share.\n" -msgstr "" -"感謝您填寫 Git 臭蟲報告！\n" -"請回答下列問題，以讓我們能夠了解您的問題。\n" -"\n" -"臭蟲發生前，您做了什麼？（重現問題的步驟）\n" -"\n" -"你原本期望發生什麼？（期望行為）\n" -"\n" -"那實際上發生了什麼？（實際行為）\n" -"\n" -"期望行為跟實際發生的行為有什麼不同？\n" -"\n" -"其他您想加入的：\n" -"\n" -"請檢閱臭蟲報告下方的剩餘部分。\n" -"您可刪除任何您不想分享的地方。\n" - -#: bugreport.c:136 -msgid "specify a destination for the bugreport file" -msgstr "請指定 bugreport 檔案的目的地" - -#: bugreport.c:138 -msgid "specify a strftime format suffix for the filename" -msgstr "請指定檔案名稱的 strftime 格式後綴" - -#: bugreport.c:162 -#, c-format -msgid "could not create leading directories for '%s'" -msgstr "無法建立 '%s' 的前置目錄" - -#: bugreport.c:169 -msgid "System Info" -msgstr "系統資訊" - -#: bugreport.c:172 -msgid "Enabled Hooks" -msgstr "啟用的掛鉤" - -#: bugreport.c:180 -#, c-format -msgid "couldn't create a new file at '%s'" -msgstr "不要在「%s」建立新檔案" - -#: bugreport.c:184 -#, c-format -msgid "unable to write to %s" -msgstr "無法寫入 %s" - -#: bugreport.c:194 -#, c-format -msgid "Created new report at '%s'.\n" -msgstr "已在「%s」建立新報告。\n" - -#: fast-import.c:3100 -#, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "「%s」子模組缺少 from 標記" - -#: fast-import.c:3102 -#, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "「%s」子模組缺少 to 標記" - -#: fast-import.c:3237 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "預期 'mark' 指令，得到 %s" - -#: fast-import.c:3242 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "預期 'to' 指令，得到 %s" - -#: fast-import.c:3334 -msgid "Expected format name:filename for submodule rewrite option" -msgstr "期望子模組 rewrite 選項的格式是 name:filename" - -#: fast-import.c:3388 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能" - -#: http-fetch.c:111 +#: http-fetch.c:114 #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "傳入 --packfile 的參數必須是有效的雜湊 (收到 '%s')" -#: credential-cache--daemon.c:223 -#, c-format -msgid "" -"The permissions on your socket directory are too loose; other\n" -"users may be able to read your cached credentials. Consider running:\n" -"\n" -"\tchmod 0700 %s" -msgstr "" -"您的 socket 目錄權限過於寬鬆，其他使用者可能會讀取您快取的認證訊息。考慮執" -"行：\n" -"\n" -"\tchmod 0700 %s" +#: http-fetch.c:122 +msgid "not a git repository" +msgstr "不是一個 git 版本庫" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "除錯訊息輸出到標準錯誤" +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "未處理選項" + +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "準備修訂版本時發生錯誤" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "提交 %s 沒有標記為可以取得" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "太多提交標記為可以取得" @@ -22436,12 +22951,12 @@ msgstr "沒有為 -C 提供目錄\n" msgid "unknown option: %s\n" msgstr "未知選項：%s\n" -#: git.c:362 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "在擴展別名 '%s' 時：'%s'" -#: git.c:371 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -22450,39 +22965,39 @@ msgstr "" "別名 '%s' 修改環境變數。您可以使用在別名中\n" "使用 '!git'" -#: git.c:378 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "%s 的空別名" -#: git.c:381 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "遞迴的別名：%s" -#: git.c:463 +#: git.c:465 msgid "write failure on standard output" msgstr "在標準輸出寫入失敗" -#: git.c:465 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "到標準輸出的未知寫入錯誤" -#: git.c:467 +#: git.c:469 msgid "close failed on standard output" msgstr "標準輸出關閉失敗" -#: git.c:792 +#: git.c:820 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "檢測到別名循環：'%s'的擴展未終止：%s" -#: git.c:842 +#: git.c:870 #, c-format msgid "cannot handle %s as a builtin" msgstr "不能作為內建指令處理 %s" -#: git.c:855 +#: git.c:883 #, c-format msgid "" "usage: %s\n" @@ -22491,12 +23006,12 @@ msgstr "" "用法：%s\n" "\n" -#: git.c:875 +#: git.c:903 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n" -#: git.c:887 +#: git.c:915 #, c-format msgid "failed to run command '%s': %s\n" msgstr "執行指令 '%s' 失敗：%s\n" @@ -22548,134 +23063,134 @@ msgstr "" " 請求：%s\n" " 重定向：%s" -#: remote-curl.c:168 +#: remote-curl.c:183 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "在 push-option 取值中無效的引號：'%s'" -#: remote-curl.c:295 +#: remote-curl.c:307 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？" -#: remote-curl.c:396 +#: remote-curl.c:408 msgid "invalid server response; expected service, got flush packet" msgstr "無效的服務端回應。預期服務，得到 flush 包" -#: remote-curl.c:427 +#: remote-curl.c:439 #, c-format msgid "invalid server response; got '%s'" msgstr "無效的服務端回應，得到 '%s'" -#: remote-curl.c:487 +#: remote-curl.c:499 #, c-format msgid "repository '%s' not found" msgstr "版本庫 '%s' 未找到" -#: remote-curl.c:491 +#: remote-curl.c:503 #, c-format msgid "Authentication failed for '%s'" msgstr "'%s' 身份驗證失敗" -#: remote-curl.c:495 +#: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" msgstr "無法存取 '%s'：%s" -#: remote-curl.c:501 +#: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "重定向到 %s" -#: remote-curl.c:630 +#: remote-curl.c:642 msgid "shouldn't have EOF when not gentle on EOF" msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符" -#: remote-curl.c:642 +#: remote-curl.c:654 msgid "remote server sent stateless separator" msgstr "遠端伺服器傳送了無狀態的分隔符號" -#: remote-curl.c:712 +#: remote-curl.c:724 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer" -#: remote-curl.c:742 +#: remote-curl.c:754 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: 錯誤的行長度字串：%.4s" -#: remote-curl.c:744 +#: remote-curl.c:756 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: 非預期的回應結束封包" -#: remote-curl.c:820 +#: remote-curl.c:832 #, c-format msgid "RPC failed; %s" msgstr "RPC 失敗。%s" -#: remote-curl.c:860 +#: remote-curl.c:872 msgid "cannot handle pushes this big" msgstr "不能處理這麼大的推送" -#: remote-curl.c:975 +#: remote-curl.c:987 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "不能壓縮請求，zlib 壓縮錯誤 %d" -#: remote-curl.c:979 +#: remote-curl.c:991 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "不能壓縮請求，zlib 結束錯誤 %d" -#: remote-curl.c:1029 +#: remote-curl.c:1041 #, c-format msgid "%d bytes of length header were received" msgstr "收到了 %d 位元組長度的標頭" -#: remote-curl.c:1031 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of body are still expected" msgstr "預期仍要有 %d 位元組的本文 (body)" -#: remote-curl.c:1120 +#: remote-curl.c:1132 msgid "dumb http transport does not support shallow capabilities" msgstr "啞 http 傳輸不支援 shalllow 能力" -#: remote-curl.c:1135 +#: remote-curl.c:1147 msgid "fetch failed." msgstr "取得失敗。" -#: remote-curl.c:1183 +#: remote-curl.c:1193 msgid "cannot fetch by sha1 over smart http" msgstr "無法透過智慧 HTTP 取得 sha1" -#: remote-curl.c:1227 remote-curl.c:1233 +#: remote-curl.c:1237 remote-curl.c:1243 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'" -#: remote-curl.c:1245 remote-curl.c:1360 +#: remote-curl.c:1255 remote-curl.c:1373 #, c-format msgid "http transport does not support %s" msgstr "http 傳輸協定不支援 %s" -#: remote-curl.c:1281 +#: remote-curl.c:1291 msgid "git-http-push failed" msgstr "git-http-push 失敗" -#: remote-curl.c:1466 +#: remote-curl.c:1479 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]" -#: remote-curl.c:1498 +#: remote-curl.c:1511 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl：錯誤讀取來自 git 的指令流" -#: remote-curl.c:1505 +#: remote-curl.c:1518 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl：嘗試沒有本機版本庫下取得" -#: remote-curl.c:1546 +#: remote-curl.c:1559 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl：未知的來自 git 的指令 '%s'" @@ -22688,11 +23203,11 @@ msgstr "沒有可用的編譯器資訊\n" msgid "no libc information available\n" msgstr "沒有可用的 libc 資訊\n" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:91 msgid "args" msgstr "參數" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "物件過濾" @@ -22713,8 +23228,8 @@ msgid "be more quiet" msgstr "更加安靜" #: parse-options.h:317 -msgid "use <n> digits to display SHA-1s" -msgstr "用 <n> 位數字顯示 SHA-1 雜湊值" +msgid "use <n> digits to display object names" +msgstr "用 <n> 位數字顯示物件名稱" #: parse-options.h:336 msgid "how to strip spaces and #comments from message" @@ -22729,11 +23244,11 @@ msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "key" msgstr "key" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "排序的欄位名" @@ -22871,11 +23386,11 @@ msgstr "檢索和儲存使用者密碼" #: command-list.h:80 msgid "Helper to temporarily store passwords in memory" -msgstr "在記憶體中暫時儲存密碼的助手" +msgstr "在記憶體中暫時儲存密碼的協助工具" #: command-list.h:81 msgid "Helper to store credentials on disk" -msgstr "在磁碟儲存密碼的助手" +msgstr "在磁碟儲存密碼的協助工具" #: command-list.h:82 msgid "Export a single commit to a CVS checkout" @@ -22946,525 +23461,510 @@ msgid "Output information on each ref" msgstr "對每一個引用輸出訊息" #: command-list.h:99 +msgid "Run a Git command on a list of repositories" +msgstr "在列表中的版本庫中執行 Git 命令" + +#: command-list.h:100 msgid "Prepare patches for e-mail submission" msgstr "準備電子信件提交的修補檔" -#: command-list.h:100 +#: command-list.h:101 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "驗證版本庫中物件的連通性和有效性" -#: command-list.h:101 +#: command-list.h:102 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "清除不必要的檔案和最佳化本機版本庫" -#: command-list.h:102 +#: command-list.h:103 msgid "Extract commit ID from an archive created using git-archive" msgstr "從 git-archive 建立的歸檔檔案中擷取提交 ID" -#: command-list.h:103 +#: command-list.h:104 msgid "Print lines matching a pattern" msgstr "輸出和模式符合的行" -#: command-list.h:104 +#: command-list.h:105 msgid "A portable graphical interface to Git" msgstr "一個便攜的 Git 圖形用戶端" -#: command-list.h:105 +#: command-list.h:106 msgid "Compute object ID and optionally creates a blob from a file" msgstr "從一個檔案計算物件 ID，並可以建立 blob 資料物件" -#: command-list.h:106 +#: command-list.h:107 msgid "Display help information about Git" msgstr "顯示 Git 的說明訊息" -#: command-list.h:107 +#: command-list.h:108 msgid "Server side implementation of Git over HTTP" msgstr "Git HTTP 協定的服務端實現" -#: command-list.h:108 +#: command-list.h:109 msgid "Download from a remote Git repository via HTTP" msgstr "通過 HTTP 從遠端 Git 版本庫下載" -#: command-list.h:109 +#: command-list.h:110 msgid "Push objects over HTTP/DAV to another repository" msgstr "通過 HTTP/DAV 推送物件另一個版本庫" -#: command-list.h:110 +#: command-list.h:111 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "從標準輸入將一組修補檔傳送到IMAP資料夾" -#: command-list.h:111 +#: command-list.h:112 msgid "Build pack index file for an existing packed archive" msgstr "從一個現存的包存檔檔案建立包索引" -#: command-list.h:112 +#: command-list.h:113 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "建立一個空的 Git 版本庫或重新初始化一個已存在的版本庫" -#: command-list.h:113 +#: command-list.h:114 msgid "Instantly browse your working repository in gitweb" msgstr "在 gitweb 中即時瀏覽您的工作版本庫" -#: command-list.h:114 +#: command-list.h:115 msgid "Add or parse structured information in commit messages" msgstr "新增或解析提交說明中的結構化訊息" -#: command-list.h:115 +#: command-list.h:116 msgid "The Git repository browser" msgstr "Git 版本庫瀏覽器" -#: command-list.h:116 +#: command-list.h:117 msgid "Show commit logs" msgstr "顯示提交日誌" -#: command-list.h:117 +#: command-list.h:118 msgid "Show information about files in the index and the working tree" msgstr "顯示索引和工作區中檔案的訊息" -#: command-list.h:118 +#: command-list.h:119 msgid "List references in a remote repository" msgstr "顯示一個遠端版本庫的引用" -#: command-list.h:119 +#: command-list.h:120 msgid "List the contents of a tree object" msgstr "顯示一個樹狀物件的內容" -#: command-list.h:120 +#: command-list.h:121 msgid "Extracts patch and authorship from a single e-mail message" msgstr "從單個電子信件中擷取修補檔和作者身份" -#: command-list.h:121 +#: command-list.h:122 msgid "Simple UNIX mbox splitter program" msgstr "簡單的 UNIX mbox 信箱切分程式" -#: command-list.h:122 +#: command-list.h:123 +msgid "Run tasks to optimize Git repository data" +msgstr "執行用來最佳化 Git 版本庫資料的作業" + +#: command-list.h:124 msgid "Join two or more development histories together" msgstr "合併兩個或更多開發歷史" -#: command-list.h:123 +#: command-list.h:125 msgid "Find as good common ancestors as possible for a merge" msgstr "為了合併尋找儘可能好的公共祖先提交" -#: command-list.h:124 +#: command-list.h:126 msgid "Run a three-way file merge" msgstr "執行一個三路檔案合併" -#: command-list.h:125 +#: command-list.h:127 msgid "Run a merge for files needing merging" msgstr "對於需要合併的檔案執行合併" -#: command-list.h:126 +#: command-list.h:128 msgid "The standard helper program to use with git-merge-index" msgstr "與 git-merge-index 一起使用的標準嚮導程式" -#: command-list.h:127 +#: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "執行合併衝突解決工具以解決合併衝突" -#: command-list.h:128 +#: command-list.h:130 msgid "Show three-way merge without touching index" msgstr "顯示三路合併而不動索引" -#: command-list.h:129 +#: command-list.h:131 msgid "Write and verify multi-pack-indexes" msgstr "寫入和驗證多包索引" -#: command-list.h:130 +#: command-list.h:132 msgid "Creates a tag object" msgstr "建立一個標籤物件" -#: command-list.h:131 +#: command-list.h:133 msgid "Build a tree-object from ls-tree formatted text" msgstr "基於 ls-tree 的格式化文字建立一個樹狀物件" -#: command-list.h:132 +#: command-list.h:134 msgid "Move or rename a file, a directory, or a symlink" msgstr "移動或重新命名一個檔案、目錄或符號連結" # 尋找提供版本的符號名稱 -#: command-list.h:133 +#: command-list.h:135 msgid "Find symbolic names for given revs" msgstr "尋找提供版本的符號名稱" -#: command-list.h:134 +#: command-list.h:136 msgid "Add or inspect object notes" msgstr "新增或檢查物件備註" -#: command-list.h:135 +#: command-list.h:137 msgid "Import from and submit to Perforce repositories" msgstr "匯入和提交到 Perforce 版本庫中" -#: command-list.h:136 +#: command-list.h:138 msgid "Create a packed archive of objects" msgstr "建立物件的存檔包" -#: command-list.h:137 +#: command-list.h:139 msgid "Find redundant pack files" msgstr "尋找冗餘的包檔案" -#: command-list.h:138 +#: command-list.h:140 msgid "Pack heads and tags for efficient repository access" msgstr "打包頭和標籤以實現高效的版本庫存取" -#: command-list.h:139 -msgid "Routines to help parsing remote repository access parameters" -msgstr "協助解析遠端版本庫存取參數的例程" - -#: command-list.h:140 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "計算一個修補檔的唯一 ID" -#: command-list.h:141 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "刪除物件庫中所有無法取得物件" -#: command-list.h:142 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "刪除已經在包檔案中的多餘物件" -#: command-list.h:143 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "取得並整合另外的版本庫或一個本機分支" -#: command-list.h:144 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "更新遠端引用和相關的物件" -#: command-list.h:145 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "將一個 quilt 修補檔集合套用到目前分支" -#: command-list.h:146 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "比較兩個提交範圍（如一個分支的兩個版本）" -#: command-list.h:147 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "將樹訊息讀取到索引" -#: command-list.h:148 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "在另一個分支上重新應用提交" -#: command-list.h:149 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "接收推送到版本庫中的物件" -#: command-list.h:150 +#: command-list.h:151 msgid "Manage reflog information" msgstr "管理 reflog 訊息" -#: command-list.h:151 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "管理已追蹤版本庫" -#: command-list.h:152 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "打包版本庫中未打包物件" -#: command-list.h:153 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "建立、列出、刪除物件取代引用" -#: command-list.h:154 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "生成待定更改的摘要" -#: command-list.h:155 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "重用衝突合併的解決方案記錄" -#: command-list.h:156 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "重設目前 HEAD 到指定狀態" -#: command-list.h:157 +#: command-list.h:158 msgid "Restore working tree files" msgstr "復原工作區檔案" -#: command-list.h:158 +#: command-list.h:159 msgid "Revert some existing commits" msgstr "還原一些現存提交" -#: command-list.h:159 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "按時間順序列出提交物件" -#: command-list.h:160 +#: command-list.h:161 msgid "Pick out and massage parameters" msgstr "選出並處理參數" -#: command-list.h:161 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "從工作區和索引中刪除檔案" -#: command-list.h:162 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "透過電子信件傳送一組修補檔" -#: command-list.h:163 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "使用 Git 協定推送物件到另一個版本庫" -#: command-list.h:164 +#: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" msgstr "只允許 Git SSH 存取的受限登入shell" -#: command-list.h:165 +#: command-list.h:166 msgid "Summarize 'git log' output" msgstr "'git log' 輸出摘要" -#: command-list.h:166 +#: command-list.h:167 msgid "Show various types of objects" msgstr "顯示各種類型的物件" -#: command-list.h:167 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "顯示分支和提交" -#: command-list.h:168 +#: command-list.h:169 msgid "Show packed archive index" msgstr "顯示打包歸檔索引" -#: command-list.h:169 +#: command-list.h:170 msgid "List references in a local repository" msgstr "顯示本機版本庫中的引用" -#: command-list.h:170 +#: command-list.h:171 msgid "Git's i18n setup code for shell scripts" msgstr "為 shell 腳本準備的 Git 國際化設定程式碼" -#: command-list.h:171 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "常用的 Git shell 腳本設定程式碼" -#: command-list.h:172 +#: command-list.h:173 msgid "Initialize and modify the sparse-checkout" msgstr "初始化並修改稀疏檢出" -#: command-list.h:173 +#: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "儲藏髒工作區中的修改" -#: command-list.h:174 +#: command-list.h:175 msgid "Add file contents to the staging area" msgstr "將檔案內容新增到索引" -#: command-list.h:175 +#: command-list.h:176 msgid "Show the working tree status" msgstr "顯示工作區狀態" -#: command-list.h:176 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "刪除不必要的空白字元" -#: command-list.h:177 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "初始化、更新或檢查子模組" -#: command-list.h:178 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Subversion 版本庫和 Git 之間的雙向動作" -#: command-list.h:179 +#: command-list.h:180 msgid "Switch branches" msgstr "切換分支" -#: command-list.h:180 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "讀取、修改和刪除符號引用" -#: command-list.h:181 +#: command-list.h:182 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "建立、列出、刪除或驗證一個 GPG 簽名的標籤物件" -#: command-list.h:182 +#: command-list.h:183 msgid "Creates a temporary file with a blob's contents" msgstr "用 blob 資料物件的內容建立一個暫存檔" -#: command-list.h:183 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "從打包檔案中解壓縮物件" -#: command-list.h:184 +#: command-list.h:185 msgid "Register file contents in the working tree to the index" msgstr "將工作區的檔案內容註冊到索引" -#: command-list.h:185 +#: command-list.h:186 msgid "Update the object name stored in a ref safely" msgstr "安全地更新儲存於引用中的物件名稱" -#: command-list.h:186 +#: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" msgstr "更新輔助訊息檔案以協助啞協定服務" -#: command-list.h:187 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "將存檔傳送回 git-archive" -#: command-list.h:188 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "將物件壓縮包傳送回 git-fetch-pack" -#: command-list.h:189 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "顯示 Git 邏輯變數" -#: command-list.h:190 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "檢查 GPG 提交簽名" -#: command-list.h:191 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "驗證打包的 Git 封存檔案" -#: command-list.h:192 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "檢查標籤的 GPG 簽名" -#: command-list.h:193 +#: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git web 介面（Git 版本庫的 web 前端）" -#: command-list.h:194 +#: command-list.h:195 msgid "Show logs with difference each commit introduces" msgstr "顯示每一個提交引入的差異日誌" -#: command-list.h:195 +#: command-list.h:196 msgid "Manage multiple working trees" msgstr "管理多個工作區" -#: command-list.h:196 +#: command-list.h:197 msgid "Create a tree object from the current index" msgstr "從目前索引建立一個樹狀物件" -#: command-list.h:197 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "定義路徑的屬性" -#: command-list.h:198 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "Git 指令列介面和約定" -#: command-list.h:199 +#: command-list.h:200 msgid "A Git core tutorial for developers" msgstr "面向開發人員的 Git 核心教學" -#: command-list.h:200 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "將使用者名稱及密碼提供給 Git" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "適合 CVS 使用者的 Git 協助" -#: command-list.h:201 +#: command-list.h:203 msgid "Tweaking diff output" msgstr "調整差異輸出" -#: command-list.h:202 +#: command-list.h:204 msgid "A useful minimum set of commands for Everyday Git" msgstr "每一天 Git 的一組有用的最小指令集合" -#: command-list.h:203 +#: command-list.h:205 msgid "Frequently asked questions about using Git" msgstr "Git 使用的常見問題" -#: command-list.h:204 +#: command-list.h:206 msgid "A Git Glossary" msgstr "Git 詞彙表" -#: command-list.h:205 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "Git 使用的掛鉤" -#: command-list.h:206 +#: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未追蹤檔案" -#: command-list.h:207 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "定義子模組屬性" -#: command-list.h:208 +#: command-list.h:210 msgid "Git namespaces" msgstr "Git 名字空間" -#: command-list.h:209 +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "用來與遠端版本庫互動的協助工具" + +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Git 版本庫配置" -#: command-list.h:210 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本範圍" -#: command-list.h:211 +#: command-list.h:214 msgid "Mounting one repository inside another" msgstr "在某個版本庫掛載某個版本庫" -#: command-list.h:212 +#: command-list.h:215 msgid "A tutorial introduction to Git: part two" msgstr "一個 Git 教學：第二部分" -#: command-list.h:213 +#: command-list.h:216 msgid "A tutorial introduction to Git" msgstr "一個 Git 教學" -#: command-list.h:214 +#: command-list.h:217 msgid "An overview of recommended workflows with Git" msgstr "Git 推薦的工作流概覽" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "您需要執行 \"git bisect start\" 來開始" - -# 譯者：請維持句尾空格 -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:60 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "您想讓我為您這樣做嗎[Y/n]？ " - -#: git-bisect.sh:101 +#: git-bisect.sh:48 #, sh-format msgid "Bad rev input: $arg" msgstr "壞的輸入版本：$arg" -#: git-bisect.sh:121 -#, sh-format -msgid "Bad rev input: $bisected_head" -msgstr "壞的輸入版本：$bisected_head" - -#: git-bisect.sh:130 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "壞的輸入版本：$rev" - -#: git-bisect.sh:139 -#, sh-format -msgid "'git bisect $TERM_BAD' can take only one argument." -msgstr "'git bisect $TERM_BAD' 只能帶一個參數。" - -#: git-bisect.sh:209 +#: git-bisect.sh:82 msgid "No logfile given" msgstr "未提供日誌檔案" -#: git-bisect.sh:210 +#: git-bisect.sh:83 #, sh-format msgid "cannot read $file for replaying" msgstr "不能讀取 $file 來重放" -#: git-bisect.sh:233 +#: git-bisect.sh:105 msgid "?? what are you talking about?" msgstr "?? 您在說什麼?" -#: git-bisect.sh:243 +#: git-bisect.sh:115 msgid "bisect run failed: no command provided." msgstr "二分尋找執行失敗：沒有提供指令。" -#: git-bisect.sh:248 +#: git-bisect.sh:120 #, sh-format msgid "running $command" msgstr "執行 $command" -#: git-bisect.sh:255 +#: git-bisect.sh:127 #, sh-format msgid "" "bisect run failed:\n" @@ -23473,24 +23973,24 @@ msgstr "" "二分尋找執行失敗：\n" "指令 '$command' 的離開碼 $res 小於 0 或大於等於 128" -#: git-bisect.sh:281 +#: git-bisect.sh:152 msgid "bisect run cannot continue any more" msgstr "二分尋找不能繼續執行" -#: git-bisect.sh:287 +#: git-bisect.sh:158 #, sh-format msgid "" "bisect run failed:\n" -"'bisect_state $state' exited with error code $res" +"'bisect-state $state' exited with error code $res" msgstr "" "二分尋找執行失敗：\n" -"'bisect_state $state' 離開碼為 $res" +"‘bisect-state $state’ 結束，錯誤碼 $res" -#: git-bisect.sh:294 +#: git-bisect.sh:165 msgid "bisect run success" msgstr "二分尋找執行成功" -#: git-bisect.sh:302 +#: git-bisect.sh:173 msgid "We are not bisecting." msgstr "我們沒有在二分尋找。" @@ -23532,46 +24032,46 @@ msgstr "嘗試和 $pretty_name 的簡單合併" msgid "Simple merge did not work, trying automatic merge." msgstr "簡單合併未生效，嘗試自動合併。" -#: git-submodule.sh:205 +#: git-submodule.sh:179 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作區的頂級目錄中使用相對路徑" -#: git-submodule.sh:215 +#: git-submodule.sh:189 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本庫 URL：'$repo' 必須是絕對路徑或以 ./|../ 起始" -#: git-submodule.sh:234 +#: git-submodule.sh:208 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已經存在於索引中" -#: git-submodule.sh:237 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' 已經存在於索引中且不是一個子模組" -#: git-submodule.sh:244 +#: git-submodule.sh:218 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' 沒有檢出的提交" -#: git-submodule.sh:275 +#: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "新增位於 '$sm_path' 的現存版本庫到索引" -#: git-submodule.sh:277 +#: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一個有效的 git 版本庫" -#: git-submodule.sh:285 +#: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本機發現 '$sm_name' 的一個 git 目錄，與其對應的遠端版本庫：" -#: git-submodule.sh:287 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23586,51 +24086,51 @@ msgstr "" "使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n" "或者您不確定這裡的含義，使用 '--name' 選項選擇另外的名稱。" -#: git-submodule.sh:293 +#: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "啟動本機 git 目錄到子模組 '$sm_name'。" -#: git-submodule.sh:305 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能檢出子模組 '$sm_path'" -#: git-submodule.sh:310 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "無法新增子模組 '$sm_path'" -#: git-submodule.sh:319 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "無法註冊子模組 '$sm_path'" -#: git-submodule.sh:592 +#: git-submodule.sh:568 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中找到目前版本" -#: git-submodule.sh:602 +#: git-submodule.sh:578 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "無法在子模組路徑 '$sm_path' 中取得" -#: git-submodule.sh:607 +#: git-submodule.sh:583 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}" -#: git-submodule.sh:625 +#: git-submodule.sh:601 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "無法在子模組路徑 '$displaypath' 中取得，嘗試直接取得 $sha1：" -#: git-submodule.sh:631 +#: git-submodule.sh:607 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23638,83 +24138,51 @@ msgid "" msgstr "" "取得了子模組路徑 '$displaypath'，但是它沒有包含 $sha1。直接取得該提交失敗。" -#: git-submodule.sh:638 +#: git-submodule.sh:614 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中檢出 '$sha1'" -#: git-submodule.sh:639 +#: git-submodule.sh:615 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模組路徑 '$displaypath'：檢出 '$sha1'" -#: git-submodule.sh:643 +#: git-submodule.sh:619 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中重定基底 '$sha1'" -#: git-submodule.sh:644 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模組路徑 '$displaypath'：重定基底至 '$sha1'" -#: git-submodule.sh:649 +#: git-submodule.sh:625 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "無法合併 '$sha1' 到子模組路徑 '$displaypath' 中" -#: git-submodule.sh:650 +#: git-submodule.sh:626 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模組路徑 '$displaypath'：已合併入 '$sha1'" -#: git-submodule.sh:655 +#: git-submodule.sh:631 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模組 '$displaypath' 中執行 '$command $sha1' 失敗" -#: git-submodule.sh:656 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模組 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:687 +#: git-submodule.sh:663 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "無法遞迴進子模組路徑 '$displaypath'" -#: git-submodule.sh:852 -msgid "The --cached option cannot be used with the --files option" -msgstr "選項 --cached 不能和選項 --files 同時使用" - -#: git-submodule.sh:904 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "意外的模式 $mod_dst" - -# 譯者：請維持前導空格 -#: git-submodule.sh:924 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr " 警告：$display_name 未包含提交 $sha1_src" - -# 譯者：請維持前導空格 -#: git-submodule.sh:927 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr " 警告：$display_name 未包含提交 $sha1_dst" - -# 譯者：請維持前導空格 -#: git-submodule.sh:930 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" - -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "詳見 git-${cmd}(1)。" - #: git-rebase--preserve-merges.sh:109 msgid "Applied autostash." msgstr "已應用 autostash。" @@ -23739,7 +24207,7 @@ msgstr "" msgid "Rebasing ($new_count/$total)" msgstr "重定基底中（$new_count/$total）" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -23777,7 +24245,7 @@ msgstr "" "\n" "可以對這些行重新排序，將從上至下執行。\n" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -23796,82 +24264,82 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1：不是一個可以被揀選的提交" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "無效的提交名：$sha1" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "不能寫入目前提交的替代 sha1" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "快轉到 $sha1" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "不能快轉到 $sha1" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "不能移動 HEAD 到 $first_parent" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "拒絕壓縮一個合併：$sha1" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "無法重做合併 $sha1" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "不能揀選 $sha1" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "這是提交說明 #${n}：" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "提交說明 #${n} 將被跳過：" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "這是一個 $count 個提交的組合。" -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "不能寫入 $fixup_msg" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "這是一個 2 個提交的組合。" -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "不能應用 $sha1... $rest" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -23884,32 +24352,32 @@ msgstr "" "這通常是因為空的提交說明，或者 pre-commit 掛鉤執行失敗。如果是 pre-commit\n" "掛鉤執行失敗，你可能需要在重寫提交說明前解決這個問題。" -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "停止在 $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "沒有父提交的情況下不能 '$squash_style'" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "執行：$rest" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "執行失敗：$rest" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "並且修改索引和/或工作區" # 譯者：請維持前導空格 -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -23920,7 +24388,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -23934,25 +24402,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "未知指令：$command $sha1 $rest" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "要修改請使用指令 'git rebase --edit-todo'。" -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "成功重定基底並更新 $head_name。" -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "不能刪除 CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -23981,54 +24449,54 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "在修補提交中尋找作者訊息時遇到錯誤" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "不能提交暫存的修改。" -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "無法執行編輯器" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "不能檢出 $switch_to" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "沒有 HEAD？" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "不能建立暫時 $state_dir" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "不能標記為互動式" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "重定基底 $shortrevisions 到 $shortonto（$todocount 個提交）" -#: git-rebase--preserve-merges.sh:955 +#: git-rebase--preserve-merges.sh:945 msgid "Note that empty commits are commented out" msgstr "注意空提交已被備註掉" -#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "不能對重寫提交進行初始化" @@ -24095,50 +24563,50 @@ msgstr "不能確定 git 目錄的絕對路徑" msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "建立了 %d 個路徑\n" -#: git-add--interactive.perl:1055 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為暫存。" -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為儲藏。" -#: git-add--interactive.perl:1061 +#: git-add--interactive.perl:1062 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為未暫存。" -#: git-add--interactive.perl:1064 git-add--interactive.perl:1073 -#: git-add--interactive.perl:1079 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 +#: git-add--interactive.perl:1080 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為應用。" -#: git-add--interactive.perl:1067 git-add--interactive.perl:1070 -#: git-add--interactive.perl:1076 +#: git-add--interactive.perl:1068 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為捨棄。" -#: git-add--interactive.perl:1113 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "為寫入開啟區塊編輯檔案失敗：%s" -#: git-add--interactive.perl:1120 +#: git-add--interactive.perl:1121 #, perl-format msgid "" "---\n" @@ -24151,12 +24619,12 @@ msgstr "" "要刪除 '%s' 開始的行，刪除它們。\n" "以 %s 開始的行將被刪除。\n" -#: git-add--interactive.perl:1142 +#: git-add--interactive.perl:1143 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "無法讀取區塊編輯檔案：%s" -#: git-add--interactive.perl:1250 +#: git-add--interactive.perl:1251 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -24170,7 +24638,7 @@ msgstr "" "a - 暫存此區塊和本檔案中後面的全部區塊\n" "d - 不暫存此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1256 +#: git-add--interactive.perl:1257 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -24184,7 +24652,7 @@ msgstr "" "a - 儲藏此區塊和本檔案中後面的全部區塊\n" "d - 不儲藏此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1262 +#: git-add--interactive.perl:1263 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -24198,7 +24666,7 @@ msgstr "" "a - 不暫存此區塊和本檔案中後面的全部區塊\n" "d - 不要不暫存此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1268 +#: git-add--interactive.perl:1269 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -24212,7 +24680,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1274 git-add--interactive.perl:1292 +#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -24226,7 +24694,7 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1280 +#: git-add--interactive.perl:1281 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -24240,7 +24708,7 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1286 +#: git-add--interactive.perl:1287 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -24254,7 +24722,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1298 +#: git-add--interactive.perl:1299 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -24268,7 +24736,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1313 +#: git-add--interactive.perl:1314 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -24290,88 +24758,88 @@ msgstr "" "e - 手動編輯目前區塊\n" "? - 顯示說明\n" -#: git-add--interactive.perl:1344 +#: git-add--interactive.perl:1345 msgid "The selected hunks do not apply to the index!\n" msgstr "選中的區塊不能套用到索引！\n" -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1360 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "忽略未套用的：%s\n" -#: git-add--interactive.perl:1478 +#: git-add--interactive.perl:1479 #, 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:1479 +#: git-add--interactive.perl:1480 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "將刪除變更套用到工作區 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1480 +#: git-add--interactive.perl:1481 #, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "將新增變更套用到工作區 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1482 #, 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:1587 +#: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" msgstr "沒有其它可供跳轉的區塊\n" -#: git-add--interactive.perl:1605 +#: git-add--interactive.perl:1617 #, perl-format msgid "Invalid number: '%s'\n" msgstr "無效數字：'%s'\n" -#: git-add--interactive.perl:1610 +#: git-add--interactive.perl:1622 #, 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:1636 +#: git-add--interactive.perl:1657 msgid "No other hunks to search\n" msgstr "沒有其它可供尋找的區塊\n" -#: git-add--interactive.perl:1653 +#: git-add--interactive.perl:1674 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "錯誤的正規表示式 %s：%s\n" -#: git-add--interactive.perl:1663 +#: git-add--interactive.perl:1684 msgid "No hunk matches the given pattern\n" msgstr "沒有和提供模式相符合的區塊\n" -#: git-add--interactive.perl:1675 git-add--interactive.perl:1697 +#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" msgstr "沒有前一個區塊\n" -#: git-add--interactive.perl:1684 git-add--interactive.perl:1703 +#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" msgstr "沒有下一個區塊\n" -#: git-add--interactive.perl:1709 +#: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" msgstr "對不起，不能分割這個區塊\n" -#: git-add--interactive.perl:1715 +#: git-add--interactive.perl:1736 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "分割為 %d 塊。\n" -#: git-add--interactive.perl:1725 +#: git-add--interactive.perl:1746 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:1790 +#: git-add--interactive.perl:1811 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24388,19 +24856,19 @@ msgstr "" "diff - 顯示 HEAD 和索引間差異\n" "add untracked - 新增未追蹤檔案的內容至暫存列表\n" -#: git-add--interactive.perl:1807 git-add--interactive.perl:1812 -#: git-add--interactive.perl:1815 git-add--interactive.perl:1822 -#: git-add--interactive.perl:1825 git-add--interactive.perl:1832 -#: git-add--interactive.perl:1836 git-add--interactive.perl:1842 +#: 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 msgid "missing --" msgstr "缺少 --" -#: git-add--interactive.perl:1838 +#: git-add--interactive.perl:1866 #, perl-format msgid "unknown --patch mode: %s" msgstr "未知的 --patch 模式：%s" -#: git-add--interactive.perl:1844 git-add--interactive.perl:1850 +#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 #, perl-format msgid "invalid argument %s, expecting --" msgstr "無效的參數 %s，期望是 --" @@ -24417,62 +24885,72 @@ msgstr "本機時間位移量大於等於 24 小時\n" msgid "the editor exited uncleanly, aborting everything" msgstr "編輯器非正常離開，終止所有動作" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' 包含您正在編寫的一個中間版本的信件。\n" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包含編輯的信件。\n" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它選項不相容\n" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"致命錯誤：找到 'sendmail' 的設定選項\n" +"git-send-email 已經以 sendemail.* 選項設定 - 注意裡面的 'e'。\n" +"請將 sendemail.forbidSendmailVariables 設為 false 停用此檢查。\n" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "不能在版本庫之外執行 git format-patch\n" -#: git-send-email.perl:484 +#: git-send-email.perl:492 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:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc 欄位：'%s'\n" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 設定：'%s'\n" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "警告：不支援帶引號的 sendmail 別名：%s\n" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "警告：不支援 `:include:`：%s\n" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "警告：不支援 `/file` 或 `|pipe` 重定向：%s\n" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "警告：不能識別的 sendmail 行：%s\n" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -24487,12 +24965,12 @@ msgstr "" " * 如果含義為一個檔案，使用 \"./%s\"，或者\n" " * 如果含義為一個範圍，使用 --format-patch 選項。\n" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "無法開啟目錄 %s: %s" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -24501,7 +24979,7 @@ msgstr "" "致命錯誤：%s：%s\n" "警告：修補檔未能傳送\n" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -24511,17 +24989,17 @@ msgstr "" "未指定修補檔案！\n" "\n" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "在 %s 中沒有標題行？" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "為寫入開啟 %s 失敗: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -24534,37 +25012,37 @@ msgstr "" "\n" "如果您不想傳送摘要，清除內容。\n" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "無法開啟 %s: %s" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "無法開啟 %s.final: %s" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "摘要信件為空，跳過\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您是否要使用 <%s> [y/N]？ " -#: git-send-email.perl:913 +#: git-send-email.perl:921 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:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "要宣告 8bit 為什麼樣的編碼格式 [UTF-8]？ " -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -24576,20 +25054,20 @@ msgstr "" "\t%s\n" "包含範本標題 '*** SUBJECT HERE ***'。如果確定想要傳送，使用參數 --force。\n" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "信件將要傳送給誰？" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "致命錯誤：別名 '%s' 擴展為它自己\n" -#: git-send-email.perl:975 +#: git-send-email.perl:983 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:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n" @@ -24597,16 +25075,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:1045 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何處理這個位址？([q]uit|[d]rop|[e]dit)：" -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路徑 \"%s\" 不存在" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -24631,281 +25109,128 @@ 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:1460 +#: git-send-email.perl:1468 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:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "傳送要求的信件回復" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "要求的 SMTP 伺服器未被正確定義。" -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "伺服器不支援 STARTTLS！%s" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失敗！%s" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "無法正確地初始化 SMTP。檢查設定並使用 --smtp-debug。" -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "無法傳送 %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "測試執行傳送 %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "正傳送 %s\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "測試執行成功。日誌說：\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "OK。日誌說：\n" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "結果：" -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "結果：OK\n" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "無法開啟檔案 %s" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) 新增 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) 新增 to：%s 自行 '%s'\n" -#: git-send-email.perl:1722 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1757 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) 新增 cc: %s 自行 '%s'\n" -#: git-send-email.perl:1868 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) 不能執行 '%s'" -#: git-send-email.perl:1875 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) 新增 %s: %s 自：'%s'\n" -#: git-send-email.perl:1879 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 無法關閉管道至 '%s'" -#: git-send-email.perl:1909 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式傳送訊息" -#: git-send-email.perl:1917 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "無效的傳送編碼" -#: git-send-email.perl:1958 git-send-email.perl:2010 git-send-email.perl:2020 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "不能開啟 %s：%s\n" -#: git-send-email.perl:1961 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s：修補檔包含一個超過 998 字元的行" -#: git-send-email.perl:1978 +#: git-send-email.perl:1986 #, 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:1982 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要傳送 %s？[y|N]：" - -#, c-format -#~ msgid "Finding commits for commit graph from %d ref" -#~ msgid_plural "Finding commits for commit graph from %d refs" -#~ msgstr[0] "正在從 %d 個引用中尋找提交圖的提交" - -#, c-format -#~ msgid "invalid commit object id: %s" -#~ msgstr "無效的提交物件 ID：%s" - -#, c-format -#~ msgid "Removing worktrees/%s: not a valid directory" -#~ msgstr "刪除工作區/%s：不是一個有效的目錄" - -#, c-format -#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -#~ msgstr "刪除 worktrees/%s：無法讀取 gitdir 檔案 (%s)" - -#, c-format -#~ msgid "Removing worktrees/%s: invalid gitdir file" -#~ msgstr "刪除 worktrees/%s：無效的 gitdir 檔案" - -#, c-format -#~ msgid "unable to re-add worktree '%s'" -#~ msgstr "無法再次新增工作區 '%s'" - -#, c-format -#~ msgid "target '%s' already exists" -#~ msgstr "目標 '%s' 已存在" - -#, c-format -#~ msgid "" -#~ "Cannot update sparse checkout: the following entries are not up to date:\n" -#~ "%s" -#~ msgstr "" -#~ "無法更新稀疏簽出：如下條目不是最新：\n" -#~ "%s" - -#, c-format -#~ msgid "" -#~ "The following working tree files would be overwritten by sparse checkout " -#~ "update:\n" -#~ "%s" -#~ msgstr "" -#~ "工作區中下列檔案將被稀疏簽出更新所覆蓋：\n" -#~ "%s" - -#, c-format -#~ msgid "" -#~ "The following working tree files would be removed by sparse checkout " -#~ "update:\n" -#~ "%s" -#~ msgstr "" -#~ "工作區中下列檔案將被稀疏簽出更新所刪除：\n" -#~ "%s" - -#, c-format -#~ msgid "annotated tag %s has no embedded name" -#~ msgstr "附註標籤 %s 沒有嵌入名稱" - -#~ msgid "automatically stash/stash pop before and after rebase" -#~ msgstr "重定基底動作前後執行自動儲藏和彈出儲藏" - -#~ msgid "--[no-]autostash option is only valid with --rebase." -#~ msgstr "--[no-]autostash 選項只在使用 --rebase 時有效。" - -#~ msgid "(DEPRECATED) keep empty commits" -#~ msgstr "(棄用) 保持空提交" - -#, c-format -#~ msgid "Could not read '%s'" -#~ msgstr "不能讀取 '%s'" - -#, c-format -#~ msgid "Cannot store %s" -#~ msgstr "不能儲存 %s" - -#~ msgid "initialize sparse-checkout" -#~ msgstr "初始化稀疏簽出" - -#~ msgid "set sparse-checkout patterns" -#~ msgstr "設定稀疏簽出樣式" - -#~ msgid "disable sparse-checkout" -#~ msgstr "停用稀疏簽出" - -#, c-format -#~ msgid "could not exec %s" -#~ msgstr "不能執行 %s" - -#~ msgid "Cannot remove temporary index (can't happen)" -#~ msgstr "無法刪除暫時索引（不應發生）" - -#, sh-format -#~ msgid "Cannot update $ref_stash with $w_commit" -#~ msgstr "無法用 $w_commit 更新 $ref_stash" - -#, sh-format -#~ msgid "error: unknown option for 'stash push': $option" -#~ msgstr "錯誤：'stash push' 的未知選項：$option" - -#, sh-format -#~ msgid "Saved working directory and index state $stash_msg" -#~ msgstr "儲存工作目錄和索引狀態 $stash_msg" - -#, sh-format -#~ msgid "unknown option: $opt" -#~ msgstr "未知選項: $opt" - -#, sh-format -#~ msgid "Too many revisions specified: $REV" -#~ msgstr "指定了太多的版本：$REV" - -#, sh-format -#~ msgid "$reference is not a valid reference" -#~ msgstr "$reference 不是一個有效的引用" - -#, sh-format -#~ msgid "'$args' is not a stash-like commit" -#~ msgstr "'$args' 不是儲藏式提交" - -#, sh-format -#~ msgid "'$args' is not a stash reference" -#~ msgstr "'$args' 不是一個儲藏引用" - -#~ msgid "unable to refresh index" -#~ msgstr "無法重新整理索引" - -#~ msgid "Cannot apply a stash in the middle of a merge" -#~ msgstr "無法在合併過程套用儲藏" - -#~ msgid "Conflicts in index. Try without --index." -#~ msgstr "索引中有衝突。嘗試不使用 --index。" - -#~ msgid "Could not save index tree" -#~ msgstr "不能儲存索引樹" - -#~ msgid "Could not restore untracked files from stash entry" -#~ msgstr "無法從儲藏條目中復原未追蹤檔案" - -#~ msgid "Cannot unstage modified files" -#~ msgstr "無法將修改的檔案取消暫存" - -#, sh-format -#~ msgid "Dropped ${REV} ($s)" -#~ msgstr "捨棄了 ${REV} ($s)" - -#, sh-format -#~ msgid "${REV}: Could not drop stash entry" -#~ msgstr "${REV}：無法捨棄儲藏條目" - -#~ msgid "(To restore them type \"git stash apply\")" -#~ msgstr "（為復原資料輸入 \"git stash apply\"）" |