From c9d5deafe2447e240d995ca1dd904b8b2124c507 Mon Sep 17 00:00:00 2001 From: Yi-Jyun Pan Date: Thu, 23 Jun 2022 21:08:28 +0800 Subject: l10n: zh_TW: v2.37.0 round 1 Signed-off-by: Yi-Jyun Pan --- po/zh_TW.po | 38987 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 19014 insertions(+), 19973 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index caf60573321..2f7d01c3031 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2022-04-13 14:52+0800\n" -"PO-Revision-Date: 2022-04-14 08:04+0800\n" +"POT-Creation-Date: 2022-06-23 21:13+0800\n" +"PO-Revision-Date: 2022-06-23 23:02+0800\n" "Last-Translator: Yi-Jyun Pan \n" "Language-Team: Chinese (Traditional) \n" @@ -32,244 +32,234 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.1\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" -#: add-interactive.c:382 +#: add-interactive.c #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505 -#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261 -#: builtin/rebase.c:1671 +#: add-interactive.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" msgstr "無法讀取索引" -#: add-interactive.c:590 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 +#: add-interactive.c git-add--interactive.perl msgid "binary" msgstr "二進位" -#: add-interactive.c:648 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 +#: add-interactive.c git-add--interactive.perl msgid "nothing" msgstr "無" -#: add-interactive.c:649 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 +#: add-interactive.c git-add--interactive.perl msgid "unchanged" msgstr "未變更" -#: add-interactive.c:686 git-add--interactive.perl:641 +#: add-interactive.c git-add--interactive.perl msgid "Update" msgstr "更新" -#: add-interactive.c:703 add-interactive.c:891 +#: add-interactive.c #, c-format msgid "could not stage '%s'" msgstr "無法暫存「%s」" -#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709 +#: add-interactive.c builtin/stash.c reset.c sequencer.c msgid "could not write index" msgstr "無法寫入索引" -#: add-interactive.c:712 git-add--interactive.perl:626 +#: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "已更新 %d 個路徑\n" -#: add-interactive.c:730 git-add--interactive.perl:676 +#: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "注意：%s 現已不再追蹤。\n" -#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311 -#: builtin/reset.c:167 +#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "「%s」路徑執行 make_cache_entry 失敗" -#: add-interactive.c:765 git-add--interactive.perl:653 +#: add-interactive.c git-add--interactive.perl msgid "Revert" msgstr "還原" -#: add-interactive.c:781 +#: add-interactive.c msgid "Could not parse HEAD^{tree}" msgstr "不能解析 HEAD^{樹}" -#: add-interactive.c:819 git-add--interactive.perl:629 +#: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "還原了 %d 個路徑\n" -#: add-interactive.c:870 git-add--interactive.perl:693 +#: add-interactive.c git-add--interactive.perl #, c-format msgid "No untracked files.\n" msgstr "沒有未追蹤的檔案。\n" -#: add-interactive.c:874 git-add--interactive.perl:687 +#: add-interactive.c git-add--interactive.perl msgid "Add untracked" msgstr "新增未追蹤的" -#: add-interactive.c:901 git-add--interactive.perl:623 +#: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "增加了 %d 個路徑\n" -#: add-interactive.c:931 +#: add-interactive.c #, c-format msgid "ignoring unmerged: %s" msgstr "忽略未合併：%s" -#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371 +#: add-interactive.c add-patch.c git-add--interactive.perl #, c-format msgid "Only binary files changed.\n" msgstr "只有二進位檔案被修改。\n" -#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373 +#: add-interactive.c add-patch.c git-add--interactive.perl #, c-format msgid "No changes.\n" msgstr "沒有修改。\n" -#: add-interactive.c:949 git-add--interactive.perl:1381 +#: add-interactive.c git-add--interactive.perl msgid "Patch update" msgstr "修補檔更新" -#: add-interactive.c:988 git-add--interactive.perl:1794 +#: add-interactive.c git-add--interactive.perl msgid "Review diff" msgstr "檢視 diff" -#: add-interactive.c:1016 +#: add-interactive.c msgid "show paths with changes" msgstr "顯示有變更的路徑" -#: add-interactive.c:1018 +#: add-interactive.c msgid "add working tree state to the staged set of changes" msgstr "加入工作區狀態至暫存列表" -#: add-interactive.c:1020 +#: add-interactive.c msgid "revert staged set of changes back to the HEAD version" msgstr "還原修改的暫存集至 HEAD 版本" -#: add-interactive.c:1022 +#: add-interactive.c msgid "pick hunks and update selectively" msgstr "挑選區塊並選擇性更新" -#: add-interactive.c:1024 +#: add-interactive.c msgid "view diff between HEAD and index" msgstr "檢視 HEAD 及索引之間的差異" -#: add-interactive.c:1026 +#: add-interactive.c msgid "add contents of untracked files to the staged set of changes" msgstr "加入未追蹤檔案的內容至暫存列表" -#: add-interactive.c:1034 add-interactive.c:1083 +#: add-interactive.c msgid "Prompt help:" msgstr "提示說明：" -#: add-interactive.c:1036 +#: add-interactive.c msgid "select a single item" msgstr "選擇單一項目" -#: add-interactive.c:1038 +#: add-interactive.c msgid "select a range of items" msgstr "選擇項目範圍" -#: add-interactive.c:1040 +#: add-interactive.c msgid "select multiple ranges" msgstr "選擇多個範圍" -#: add-interactive.c:1042 add-interactive.c:1087 +#: add-interactive.c msgid "select item based on unique prefix" msgstr "基於唯一前綴選擇項目" -#: add-interactive.c:1044 +#: add-interactive.c msgid "unselect specified items" msgstr "取消選擇指定項目" -#: add-interactive.c:1046 +#: add-interactive.c msgid "choose all items" msgstr "選擇所有項目" -#: add-interactive.c:1048 +#: add-interactive.c msgid "(empty) finish selecting" msgstr "（空）完成選取" -#: add-interactive.c:1085 +#: add-interactive.c msgid "select a numbered item" msgstr "選擇編號過的項目" -#: add-interactive.c:1089 +#: add-interactive.c msgid "(empty) select nothing" msgstr "（空）全不選取" -#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898 +#: add-interactive.c builtin/clean.c git-add--interactive.perl msgid "*** Commands ***" msgstr "*** 指令 ***" -#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895 +#: add-interactive.c builtin/clean.c git-add--interactive.perl msgid "What now" msgstr "請選擇" -#: add-interactive.c:1150 git-add--interactive.perl:213 +#: add-interactive.c git-add--interactive.perl msgid "staged" msgstr "快取" -#: add-interactive.c:1150 git-add--interactive.perl:213 +#: add-interactive.c git-add--interactive.perl msgid "unstaged" msgstr "未快取" -#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370 -#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132 -#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194 -#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709 -#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891 -#: git-add--interactive.perl:213 +#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c +#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c +#: git-add--interactive.perl msgid "path" msgstr "路徑" -#: add-interactive.c:1157 +#: add-interactive.c msgid "could not refresh index" msgstr "無法重新整理索引" -#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805 +#: add-interactive.c builtin/clean.c git-add--interactive.perl #, c-format msgid "Bye.\n" msgstr "再見。\n" -#: add-patch.c:34 git-add--interactive.perl:1433 +#: add-patch.c git-add--interactive.perl #, 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:1434 +#: add-patch.c git-add--interactive.perl #, 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:1435 +#: add-patch.c git-add--interactive.perl #, 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:1436 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暫存此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c:39 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。" -#: add-patch.c:42 +#: add-patch.c msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -283,33 +273,33 @@ msgstr "" "a - 暫存此區塊和本檔案中後面的全部區塊\n" "d - 不暫存此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:56 git-add--interactive.perl:1439 +#: add-patch.c git-add--interactive.perl #, 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:1440 +#: add-patch.c git-add--interactive.perl #, 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:1441 +#: add-patch.c git-add--interactive.perl #, 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:1442 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c:61 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。" -#: add-patch.c:64 +#: add-patch.c msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -323,33 +313,33 @@ msgstr "" "a - 儲藏此區塊和本檔案中後面的全部區塊\n" "d - 不儲藏此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:80 git-add--interactive.perl:1445 +#: add-patch.c git-add--interactive.perl #, 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:1446 +#: add-patch.c git-add--interactive.perl #, 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:1447 +#: add-patch.c git-add--interactive.perl #, 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:1448 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c:85 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。" -#: add-patch.c:88 +#: add-patch.c msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -363,33 +353,33 @@ msgstr "" "a - 不暫存此區塊和本檔案中後面的全部區塊\n" "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:103 git-add--interactive.perl:1451 +#: add-patch.c git-add--interactive.perl #, 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:1452 +#: add-patch.c git-add--interactive.perl #, 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:1453 +#: add-patch.c git-add--interactive.perl #, 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:1454 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:108 add-patch.c:176 add-patch.c:221 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。" -#: add-patch.c:111 +#: add-patch.c msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -403,37 +393,33 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:126 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c git-add--interactive.perl #, 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:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c git-add--interactive.perl #, 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:1459 -#: git-add--interactive.perl:1477 +#: add-patch.c git-add--interactive.perl #, 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:1460 -#: git-add--interactive.perl:1478 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c:131 add-patch.c:154 add-patch.c:199 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。" -#: add-patch.c:134 add-patch.c:202 +#: add-patch.c msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -447,27 +433,27 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 +#: add-patch.c git-add--interactive.perl #, 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:1464 +#: add-patch.c git-add--interactive.perl #, 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:1465 +#: add-patch.c git-add--interactive.perl #, 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:1466 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c:157 +#: add-patch.c msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -481,27 +467,27 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 +#: add-patch.c git-add--interactive.perl #, 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:1470 +#: add-patch.c git-add--interactive.perl #, 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:1471 +#: add-patch.c git-add--interactive.perl #, 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:1472 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? " -#: add-patch.c:179 +#: add-patch.c msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -515,7 +501,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:224 +#: add-patch.c msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -529,34 +515,34 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:343 +#: add-patch.c #, c-format msgid "could not parse hunk header '%.*s'" msgstr "無法解析區塊標頭 '%.*s'" -#: add-patch.c:362 add-patch.c:366 +#: add-patch.c #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "無法解析上色過的區塊標頭 '%.*s'" -#: add-patch.c:431 +#: add-patch.c msgid "could not parse diff" msgstr "無法解析差異 (diff)" -#: add-patch.c:450 +#: add-patch.c msgid "could not parse colored diff" msgstr "無法解析上色過的差異 (diff)" -#: add-patch.c:464 +#: add-patch.c #, c-format msgid "failed to run '%s'" msgstr "無法執行 '%s'" -#: add-patch.c:618 +#: add-patch.c msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的輸出不符" -#: add-patch.c:619 +#: add-patch.c msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -564,7 +550,7 @@ msgstr "" "您的過濾器必須在其輸入及輸出行\n" "維持一對一的對應關係。" -#: add-patch.c:797 +#: add-patch.c #, c-format msgid "" "expected context line #%d in\n" @@ -573,7 +559,7 @@ msgstr "" "應有上下文行 #%d 於\n" "%.*s" -#: add-patch.c:812 +#: add-patch.c #, c-format msgid "" "hunks do not overlap:\n" @@ -586,11 +572,11 @@ msgstr "" "\t不以下述結尾：\n" "%.*s" -#: add-patch.c:1088 git-add--interactive.perl:1115 +#: add-patch.c git-add--interactive.perl msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n" -#: add-patch.c:1092 +#: add-patch.c #, c-format msgid "" "---\n" @@ -604,7 +590,7 @@ msgstr "" "以 %c 開始的行將被刪除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1106 git-add--interactive.perl:1129 +#: add-patch.c git-add--interactive.perl 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" @@ -614,11 +600,11 @@ msgstr "" "若刪掉此區塊的全部內容，則會中止\n" "本次編輯，區塊則不會被修改。\n" -#: add-patch.c:1139 +#: add-patch.c msgid "could not parse hunk header" msgstr "無法解析區塊標頭" -#: add-patch.c:1184 +#: add-patch.c msgid "'git apply --cached' failed" msgstr "「git apply --cached」失敗" @@ -634,24 +620,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:1253 git-add--interactive.perl:1244 +#: add-patch.c git-add--interactive.perl msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? " -#: add-patch.c:1296 +#: add-patch.c msgid "The selected hunks do not apply to the index!" msgstr "選取的區塊不會套用進索引！" -#: add-patch.c:1297 git-add--interactive.perl:1348 +#: add-patch.c git-add--interactive.perl msgid "Apply them to the worktree anyway? " msgstr "無論如何都要套用到工作區嗎？ " -#: add-patch.c:1304 git-add--interactive.perl:1351 +#: add-patch.c git-add--interactive.perl msgid "Nothing was applied.\n" msgstr "未套用。\n" -#: add-patch.c:1361 +#: add-patch.c msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -673,72 +659,72 @@ msgstr "" "e - 手動編輯目前區塊\n" "? - 顯示說明\n" -#: add-patch.c:1523 add-patch.c:1533 +#: add-patch.c msgid "No previous hunk" msgstr "沒有上一個區塊" -#: add-patch.c:1528 add-patch.c:1538 +#: add-patch.c msgid "No next hunk" msgstr "沒有下一個區塊" -#: add-patch.c:1544 +#: add-patch.c msgid "No other hunks to goto" msgstr "沒有其它可供跳轉的區塊" -#: add-patch.c:1555 git-add--interactive.perl:1608 +#: add-patch.c git-add--interactive.perl msgid "go to which hunk ( to see more)? " msgstr "要跳轉到哪個區塊（ 檢視更多）？ " -#: add-patch.c:1556 git-add--interactive.perl:1610 +#: add-patch.c git-add--interactive.perl msgid "go to which hunk? " msgstr "跳轉到哪個區塊？ " -#: add-patch.c:1567 +#: add-patch.c #, c-format msgid "Invalid number: '%s'" msgstr "無效數字：'%s'" -#: add-patch.c:1572 +#: add-patch.c #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "對不起，只有 %d 個可用區塊。" -#: add-patch.c:1581 +#: add-patch.c msgid "No other hunks to search" msgstr "沒有其它可供尋找的區塊" -#: add-patch.c:1587 git-add--interactive.perl:1663 +#: add-patch.c git-add--interactive.perl msgid "search for regex? " msgstr "使用常規表示式搜尋？ " -#: add-patch.c:1602 +#: add-patch.c #, c-format msgid "Malformed search regexp %s: %s" msgstr "錯誤的常規表示式 %s：%s" -#: add-patch.c:1619 +#: add-patch.c msgid "No hunk matches the given pattern" msgstr "沒有和提供模式相符合的區塊" -#: add-patch.c:1626 +#: add-patch.c msgid "Sorry, cannot split this hunk" msgstr "對不起，不能分割這個區塊" -#: add-patch.c:1630 +#: add-patch.c #, c-format msgid "Split into %d hunks." msgstr "分割為 %d 個區塊。" -#: add-patch.c:1634 +#: add-patch.c msgid "Sorry, cannot edit this hunk" msgstr "對不起，不能編輯這個區塊" -#: add-patch.c:1686 +#: add-patch.c msgid "'git apply' failed" msgstr "'git apply' 失敗" -#: advice.c:81 +#: advice.c #, c-format msgid "" "\n" @@ -747,37 +733,37 @@ msgstr "" "\n" "請使用「git config advice.%s false」來停用此訊息" -#: advice.c:97 +#: advice.c #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" -#: advice.c:181 +#: advice.c msgid "Cherry-picking is not possible because you have unmerged files." msgstr "無法揀選，因為您有未合併的檔案。" -#: advice.c:183 +#: advice.c msgid "Committing is not possible because you have unmerged files." msgstr "無法提交，因為您有未合併的檔案。" -#: advice.c:185 +#: advice.c msgid "Merging is not possible because you have unmerged files." msgstr "無法合併，因為您有未合併的檔案。" -#: advice.c:187 +#: advice.c msgid "Pulling is not possible because you have unmerged files." msgstr "無法拉取，因為您有未合併的檔案。" -#: advice.c:189 +#: advice.c msgid "Reverting is not possible because you have unmerged files." msgstr "無法還原提交，因為您有未合併的檔案。" -#: advice.c:191 +#: advice.c #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "無法 %s，因為您有未合併的檔案。" -#: advice.c:199 +#: advice.c msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -785,27 +771,27 @@ msgstr "" "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n" "解決方案並提交。" -#: advice.c:207 +#: advice.c msgid "Exiting because of an unresolved conflict." msgstr "因為存在未解決的衝突而離開。" -#: advice.c:212 builtin/merge.c:1388 +#: advice.c builtin/merge.c msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。" -#: advice.c:214 +#: advice.c msgid "Please, commit your changes before merging." msgstr "請在合併前先提交您的修改。" -#: advice.c:215 +#: advice.c msgid "Exiting because of unfinished merge." msgstr "因為存在未完成的合併而離開。" -#: advice.c:220 +#: advice.c msgid "Not possible to fast-forward, aborting." msgstr "無法快轉，終止。" -#: advice.c:230 +#: advice.c #, c-format msgid "" "The following paths and/or pathspecs matched paths that exist\n" @@ -816,7 +802,7 @@ msgstr "" "符合稀疏簽出定義外且存在的路徑，\n" "所以不會在索引中更新：\n" -#: advice.c:237 +#: advice.c msgid "" "If you intend to update such entries, try one of the following:\n" "* Use the --sparse option.\n" @@ -826,7 +812,7 @@ msgstr "" "* 使用 --sparse 選項。\n" "* 停用或修改稀疏規則。" -#: advice.c:245 +#: advice.c #, c-format msgid "" "Note: switching to '%s'.\n" @@ -866,101 +852,87 @@ msgstr "" "將組態變數 advice.detachedHead 設定為 false，即可關閉本建議\n" "\n" -#: alias.c:50 +#: alias.c msgid "cmdline ends with \\" msgstr "指令列以 \\ 結尾" -#: alias.c:51 +#: alias.c msgid "unclosed quote" msgstr "未閉合的引號" -#: apply.c:70 +#: apply.c #, c-format msgid "unrecognized whitespace option '%s'" msgstr "無法識別的空白字元選項 '%s'" -#: apply.c:86 +#: apply.c #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "無法識別的空白字元忽略選項 '%s'" -#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555 -#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332 -#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907 -#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509 -#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755 -#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663 -#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921 -#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200 -#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593 -#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245 -#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167 -#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560 -#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778 -#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409 -#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592 -#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 -#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227 -#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433 -#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711 -#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328 -#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573 -#: builtin/worktree.c:779 +#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c +#: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c +#: builtin/difftool.c builtin/fast-export.c builtin/fetch.c builtin/help.c +#: builtin/index-pack.c builtin/init-db.c builtin/log.c builtin/ls-files.c +#: builtin/merge-base.c builtin/merge.c builtin/pack-objects.c builtin/push.c +#: builtin/rebase.c builtin/repack.c builtin/reset.c builtin/rev-list.c +#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c +#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "不能同時使用 '%s' 和 '%s' 選項" -#: apply.c:141 apply.c:152 apply.c:155 +#: apply.c #, c-format msgid "'%s' outside a repository" msgstr "'%s' 在版本庫之外" -#: apply.c:807 +#: apply.c #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "無法準備時間戳常規表示式 %s" -#: apply.c:816 +#: apply.c #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，輸入為：%s" -#: apply.c:890 +#: apply.c #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在修補檔的第 %d 行找到檔案名" -#: apply.c:928 +#: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s" -#: apply.c:934 +#: apply.c #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案名不一致" -#: apply.c:935 +#: apply.c #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案名不一致" -#: apply.c:940 +#: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null" -#: apply.c:969 +#: apply.c #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包含無效檔案模式：%s" -#: apply.c:1288 +#: apply.c #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的檔案頭，%d 行和 %d 行" -#: apply.c:1378 +#: apply.c #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -970,91 +942,91 @@ msgid_plural "" "components (line %d)" msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）" -#: apply.c:1391 +#: apply.c #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的標頭訊息中缺乏檔案名訊息（第 %d 行）" -#: apply.c:1487 +#: apply.c #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: apply.c:1556 +#: apply.c #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的修補檔區塊沒有標頭訊息：%.*s" -#: apply.c:1759 +#: apply.c msgid "new file depends on old contents" msgstr "新檔案依賴舊內容" -#: apply.c:1761 +#: apply.c msgid "deleted file still has contents" msgstr "刪除的檔案仍有內容" -#: apply.c:1795 +#: apply.c #, c-format msgid "corrupt patch at line %d" msgstr "修補檔在第 %d 行發現損壞" -#: apply.c:1832 +#: apply.c #, c-format msgid "new file %s depends on old contents" msgstr "新檔案 %s 依賴舊內容" -#: apply.c:1834 +#: apply.c #, c-format msgid "deleted file %s still has contents" msgstr "刪除的檔案 %s 仍有內容" -#: apply.c:1837 +#: apply.c #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：檔案 %s 成為空檔案但並未刪除" -#: apply.c:1985 +#: apply.c #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二進位修補檔在第 %d 行損壞：%.*s" -#: apply.c:2022 +#: apply.c #, c-format msgid "unrecognized binary patch at line %d" msgstr "無法識別的二進位修補檔位於第 %d 行" -#: apply.c:2184 +#: apply.c #, c-format msgid "patch with only garbage at line %d" msgstr "修補檔案的第 %d 行只有垃圾資料" -#: apply.c:2270 +#: apply.c #, c-format msgid "unable to read symlink %s" msgstr "無法讀取符號連結 %s" -#: apply.c:2274 +#: apply.c #, c-format msgid "unable to open or read %s" msgstr "不能開啟或讀取 %s" -#: apply.c:2943 +#: apply.c #, c-format msgid "invalid start of line: '%c'" msgstr "無效的行首字元：'%c'" -#: apply.c:3064 +#: apply.c #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）。" -#: apply.c:3076 +#: apply.c #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊" -#: apply.c:3082 +#: apply.c #, c-format msgid "" "while searching for:\n" @@ -1063,641 +1035,646 @@ msgstr "" "當查詢：\n" "%.*s" -#: apply.c:3104 +#: apply.c #, c-format msgid "missing binary patch data for '%s'" msgstr "缺少 '%s' 的二進位修補檔資料" -#: apply.c:3112 +#: apply.c #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔" -#: apply.c:3159 +#: apply.c #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔" -#: apply.c:3170 +#: apply.c #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。" -#: apply.c:3178 +#: apply.c #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案" -#: apply.c:3196 +#: apply.c #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s" -#: apply.c:3209 +#: apply.c #, c-format msgid "binary patch does not apply to '%s'" msgstr "二進位修補檔未套用到 '%s'" -#: apply.c:3216 +#: apply.c #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）" -#: apply.c:3237 +#: apply.c #, c-format msgid "patch failed: %s:%ld" msgstr "打修補檔失敗：%s:%ld" -#: apply.c:3360 +#: apply.c #, c-format msgid "cannot checkout %s" msgstr "不能簽出 %s" -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214 -#: setup.c:310 +#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c #, c-format msgid "failed to read %s" msgstr "無法讀取 %s" -#: apply.c:3420 +#: apply.c #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "讀取位於符號連結中的 '%s'" -#: apply.c:3449 apply.c:3721 +#: apply.c #, c-format msgid "path %s has been renamed/deleted" msgstr "路徑 %s 已經被重新命名/刪除" -#: apply.c:3559 apply.c:3736 +#: apply.c #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在於索引中" -#: apply.c:3568 apply.c:3744 apply.c:3960 +#: apply.c #, c-format msgid "%s: does not match index" msgstr "%s：和索引不符合" -#: apply.c:3605 +#: apply.c msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "版本庫缺少用來進行三方合併所需要的資料物件。" -#: apply.c:3608 +#: apply.c #, c-format msgid "Performing three-way merge...\n" msgstr "正在進行三方合併⋯⋯\n" -#: apply.c:3624 apply.c:3628 +#: apply.c #, c-format msgid "cannot read the current contents of '%s'" msgstr "無法讀取 '%s' 的目前內容" -#: apply.c:3640 +#: apply.c #, c-format msgid "Failed to perform three-way merge...\n" msgstr "無法進行三方合併⋯⋯\n" -#: apply.c:3654 +#: apply.c #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "套用修補檔到 '%s' 存在衝突。\n" -#: apply.c:3659 +#: apply.c #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功套用修補檔到 '%s'。\n" -#: apply.c:3676 +#: apply.c #, c-format msgid "Falling back to direct application...\n" msgstr "回復至直接套用模式⋯⋯\n" -#: apply.c:3688 +#: apply.c msgid "removal patch leaves file contents" msgstr "移除修補檔仍留下了檔案內容" -#: apply.c:3761 +#: apply.c #, c-format msgid "%s: wrong type" msgstr "%s：錯誤類型" -#: apply.c:3763 +#: apply.c #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，應為 %o" -#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932 -#: read-cache.c:1399 +#: apply.c read-cache.c #, c-format msgid "invalid path '%s'" msgstr "無效路徑 '%s'" -#: apply.c:3958 +#: apply.c #, c-format msgid "%s: already exists in index" msgstr "%s：已經存在於索引中" -#: apply.c:3962 +#: apply.c #, c-format msgid "%s: already exists in working directory" msgstr "%s：已經存在於工作區中" -#: apply.c:3982 +#: apply.c #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合" -#: apply.c:3987 +#: apply.c #, 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:4007 +#: apply.c #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影響的檔案 '%s' 位於符號連結中" -#: apply.c:4011 +#: apply.c #, c-format msgid "%s: patch does not apply" msgstr "%s：修補檔未套用" -#: apply.c:4026 +#: apply.c #, c-format msgid "Checking patch %s..." msgstr "正在檢查修補檔 %s..." -#: apply.c:4118 +#: apply.c #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模組 %s 的 sha1 訊息缺少或無效" -#: apply.c:4125 +#: apply.c #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式變更，但它不在目前 HEAD 中" -#: apply.c:4128 +#: apply.c #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 訊息缺少或無效（%s）。" -#: apply.c:4137 +#: apply.c #, c-format msgid "could not add %s to temporary index" msgstr "不能在暫時索引中新增 %s" -#: apply.c:4147 +#: apply.c #, c-format msgid "could not write temporary index to %s" msgstr "不能把暫時索引寫入到 %s" -#: apply.c:4285 +#: apply.c #, c-format msgid "unable to remove %s from index" msgstr "不能從索引中移除 %s" -#: apply.c:4319 +#: apply.c #, c-format msgid "corrupt patch for submodule %s" msgstr "子模組 %s 損壞的修補檔" -#: apply.c:4325 +#: apply.c #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能對建立檔案 '%s' 呼叫 stat" -#: apply.c:4333 +#: apply.c #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能為建立檔案 %s 建立後端儲存" -#: apply.c:4339 apply.c:4484 +#: apply.c #, c-format msgid "unable to add cache entry for %s" msgstr "無法為 %s 新增快取條目" -#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258 -#: builtin/gc.c:2293 +#: apply.c builtin/bisect--helper.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "寫入 '%s' 失敗" -#: apply.c:4386 +#: apply.c #, c-format msgid "closing file '%s'" msgstr "關閉檔案 '%s'" -#: apply.c:4456 +#: apply.c #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能寫入檔案 '%s' 權限 %o" -#: apply.c:4554 +#: apply.c #, c-format msgid "Applied patch %s cleanly." msgstr "成功套用修補檔 %s。" -#: apply.c:4562 +#: apply.c msgid "internal error" msgstr "內部錯誤" -#: apply.c:4565 +#: apply.c #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..." -#: apply.c:4576 +#: apply.c #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 檔案名為 %.*s.rej" -#: apply.c:4584 +#: apply.c #, c-format msgid "cannot open %s" msgstr "不能開啟 %s" -#: apply.c:4598 +#: apply.c #, c-format msgid "Hunk #%d applied cleanly." msgstr "成功套用第 #%d 個區塊。" -#: apply.c:4602 +#: apply.c #, c-format msgid "Rejected hunk #%d." msgstr "拒絕第 #%d 個區塊。" -#: apply.c:4731 +#: apply.c #, c-format msgid "Skipped patch '%s'." msgstr "略過修補檔 '%s'。" -#: apply.c:4740 +#: apply.c msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "輸入中沒有有效的修補檔內容（傳入「--allow-empty」允許）" -#: apply.c:4761 +#: apply.c msgid "unable to read index file" msgstr "無法讀取索引檔案" -#: apply.c:4918 +#: apply.c #, c-format msgid "can't open patch '%s': %s" msgstr "不能開啟修補檔 '%s'：%s" -#: apply.c:4945 +#: apply.c #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 個空白字元誤用" -#: apply.c:4951 apply.c:4966 +#: apply.c #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字元誤用。" -#: apply.c:4959 +#: apply.c #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修復空白錯誤後，套用了 %d 行。" -#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430 +#: apply.c builtin/add.c builtin/mv.c builtin/rm.c msgid "Unable to write new index file" msgstr "無法寫入新索引檔案" -#: apply.c:5003 +#: apply.c msgid "don't apply changes matching the given path" msgstr "不要套用符合提供路徑的變更" -#: apply.c:5006 +#: apply.c msgid "apply changes matching the given path" msgstr "套用符合提供路徑的變更" -#: apply.c:5008 builtin/am.c:2379 +#: apply.c builtin/am.c msgid "num" msgstr "數字" -#: apply.c:5009 +#: apply.c msgid "remove leading slashes from traditional diff paths" msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線" -#: apply.c:5012 +#: apply.c msgid "ignore additions made by the patch" msgstr "忽略修補檔中的新增的檔案" -#: apply.c:5014 +#: apply.c msgid "instead of applying the patch, output diffstat for the input" msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）" -#: apply.c:5018 +#: apply.c msgid "show number of added and deleted lines in decimal notation" msgstr "以十進位數顯示新增和刪除的行數" -#: apply.c:5020 +#: apply.c msgid "instead of applying the patch, output a summary for the input" msgstr "不套用修補檔，而是顯示輸入的概要" -#: apply.c:5022 +#: apply.c msgid "instead of applying the patch, see if the patch is applicable" msgstr "不套用修補檔，而是檢視修補檔是否可套用" -#: apply.c:5024 +#: apply.c msgid "make sure the patch is applicable to the current index" msgstr "確認修補檔可以套用到目前索引" -#: apply.c:5026 +#: apply.c msgid "mark new files with `git add --intent-to-add`" msgstr "使用指令 `git add --intent-to-add` 標記新增檔案" -#: apply.c:5028 +#: apply.c msgid "apply a patch without touching the working tree" msgstr "套用修補檔而不修改工作區" -#: apply.c:5030 +#: apply.c msgid "accept a patch that touches outside the working area" msgstr "接受修改工作區之外檔案的修補檔" -#: apply.c:5033 +#: apply.c msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）" -#: apply.c:5035 +#: apply.c msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式" -#: apply.c:5037 +#: apply.c msgid "build a temporary index based on embedded index information" msgstr "建立一個暫時索引基於嵌入的索引訊息" -#: apply.c:5040 builtin/checkout-index.c:230 +#: apply.c builtin/checkout-index.c msgid "paths are separated with NUL character" msgstr "路徑以 NUL 字元分隔" -#: apply.c:5042 +#: apply.c msgid "ensure at least lines of context match" msgstr "確保至少符合 行上下文" -#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358 -#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983 -#: builtin/rebase.c:1079 +#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c +#: builtin/rebase.c msgid "action" msgstr "動作" -#: apply.c:5044 +#: apply.c msgid "detect new or modified lines that have whitespace errors" msgstr "檢查新增和修改的行中間的空白字元濫用" -#: apply.c:5047 apply.c:5050 +#: apply.c msgid "ignore changes in whitespace when finding context" msgstr "尋找上下文時忽略空白字元的變更" -#: apply.c:5053 +#: apply.c msgid "apply the patch in reverse" msgstr "反向套用修補檔" -#: apply.c:5055 +#: apply.c msgid "don't expect at least one line of context" msgstr "無需至少一行上下文" -#: apply.c:5057 +#: apply.c msgid "leave the rejected hunks in corresponding *.rej files" msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中" -#: apply.c:5059 +#: apply.c msgid "allow overlapping hunks" msgstr "允許重疊的修補檔區塊" -#: apply.c:5062 +#: apply.c msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允許不正確的檔案末尾換行符號" -#: apply.c:5065 +#: apply.c msgid "do not trust the line counts in the hunk headers" msgstr "不信任修補檔區塊的標頭訊息中的行號" -#: apply.c:5067 builtin/am.c:2367 +#: apply.c builtin/am.c msgid "root" msgstr "根目錄" -#: apply.c:5068 +#: apply.c msgid "prepend to all filenames" msgstr "為所有檔案名前新增 <根目錄>" -#: apply.c:5071 +#: apply.c msgid "don't return error for empty patches" msgstr "遇到空白修補檔時不回傳錯誤" -#: archive-tar.c:125 archive-zip.c:346 +#: archive-tar.c archive-zip.c #, c-format msgid "cannot stream blob %s" msgstr "不能開啟資料物件 %s" -#: archive-tar.c:265 archive-zip.c:359 +#: archive-tar.c archive-zip.c #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支援的檔案模式：0%o (SHA1: %s)" -#: archive-tar.c:447 +#: archive-tar.c #, c-format msgid "unable to start '%s' filter" msgstr "無法啟動 '%s' 過濾器" -#: archive-tar.c:450 +#: archive-tar.c msgid "unable to redirect descriptor" msgstr "無法重定向描述符" -#: archive-tar.c:457 +#: archive-tar.c #, c-format msgid "'%s' filter reported error" msgstr "'%s' 過濾器報告了錯誤" -#: archive-zip.c:319 +#: archive-zip.c #, c-format msgid "path is not valid UTF-8: %s" msgstr "路徑不是有效的 UTF-8：%s" -#: archive-zip.c:323 +#: archive-zip.c #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路徑太長（%d 字元，SHA1：%s）：%s" -#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366 +#: archive-zip.c builtin/pack-objects.c #, c-format msgid "deflate error (%d)" msgstr "壓縮錯誤 (%d)" -#: archive-zip.c:604 +#: archive-zip.c #, c-format msgid "timestamp too large for this system: %" msgstr "對於本系統時間戳太大：%" -#: archive.c:14 +#: archive.c msgid "git archive [] [...]" msgstr "git archive [<選項>] <樹或提交> [<路徑>...]" -#: archive.c:16 +#: archive.c msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" "git archive --remote <版本庫> [--exec <命令>] [<選項>] <樹或提交> [<路徑>...]" -#: archive.c:17 +#: archive.c msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote <版本庫> [--exec <命令>] --list" -#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238 -#: builtin/tag.c:579 +#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" msgstr "不能讀取 '%s'" -#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334 +#: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" msgstr "路徑規格 '%s' 未符合任何檔案" -#: archive.c:450 +#: archive.c #, c-format msgid "no such ref: %.*s" msgstr "無此引用：%.*s" -#: archive.c:456 +#: archive.c #, c-format msgid "not a valid object name: %s" msgstr "不是一個有效的物件名：%s" -#: archive.c:469 +#: archive.c #, c-format msgid "not a tree object: %s" msgstr "不是一個樹狀物件：%s" -#: archive.c:481 +#: archive.c msgid "current working directory is untracked" msgstr "目前工作目錄未被追蹤" -#: archive.c:522 +#: archive.c #, c-format msgid "File not found: %s" msgstr "找不到檔案：%s" -#: archive.c:524 +#: archive.c #, c-format msgid "Not a regular file: %s" msgstr "不是一般檔案：%s" -#: archive.c:551 +#: archive.c +#, c-format +msgid "unclosed quote: '%s'" +msgstr "未閉合的引號：「%s」" + +#: archive.c +#, c-format +msgid "missing colon: '%s'" +msgstr "缺少冒號：「%s」" + +#: archive.c +#, c-format +msgid "empty file name: '%s'" +msgstr "檔案名稱空白：「%s」" + +#: archive.c msgid "fmt" msgstr "格式" -#: archive.c:551 +#: archive.c msgid "archive format" msgstr "歸檔格式" -#: archive.c:552 builtin/log.c:1809 +#: archive.c builtin/log.c msgid "prefix" msgstr "前綴" -#: archive.c:553 +#: archive.c msgid "prepend prefix to each pathname in the archive" msgstr "為歸檔中每個路徑名加上前綴" -#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885 -#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135 -#: builtin/fast-export.c:1181 builtin/fast-export.c:1183 -#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104 -#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410 -#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195 +#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c +#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c +#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h msgid "file" msgstr "檔案" -#: archive.c:555 +#: archive.c msgid "add untracked file to archive" msgstr "將未追蹤檔案加入歸檔" -#: archive.c:558 builtin/archive.c:88 +#: archive.c +msgid "path:content" +msgstr "路徑:內容" + +#: archive.c builtin/archive.c msgid "write the archive to this file" msgstr "歸檔寫入此檔案" -#: archive.c:560 +#: archive.c msgid "read .gitattributes in working directory" msgstr "讀取工作區中的 .gitattributes" -#: archive.c:561 +#: archive.c msgid "report archived files on stderr" msgstr "在標準錯誤上報告歸檔檔案" -#: archive.c:563 +#: archive.c msgid "set compression level" msgstr "設定壓縮級別" -#: archive.c:566 +#: archive.c msgid "list supported archive formats" msgstr "列出支援的歸檔格式" -#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125 -#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718 +#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c msgid "repo" msgstr "版本庫" -#: archive.c:569 builtin/archive.c:90 +#: archive.c builtin/archive.c msgid "retrieve the archive from remote repository " msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案" -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708 -#: builtin/notes.c:496 +#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c msgid "command" msgstr "指令" -#: archive.c:571 builtin/archive.c:92 +#: archive.c builtin/archive.c msgid "path to the remote git-upload-archive command" msgstr "遠端 git-upload-archive 指令的路徑" -#: archive.c:578 +#: archive.c msgid "Unexpected option --remote" msgstr "未知參數 --remote" -#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530 -#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099 -#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230 -#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442 -#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708 -#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144 -#: http-fetch.c:153 +#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c +#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c +#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c +#: revision.c #, c-format msgid "the option '%s' requires '%s'" msgstr "「%s」選項需要「%s」" -#: archive.c:582 +#: archive.c msgid "Unexpected option --output" msgstr "未知參數 --output" -#: archive.c:606 +#: archive.c #, c-format msgid "Unknown archive format '%s'" msgstr "未知歸檔格式 '%s'" -#: archive.c:615 +#: archive.c #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "參數不支援此格式 '%s'：-%d" -#: attr.c:202 +#: attr.c #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一個有效的屬性名" -#: attr.c:363 +#: attr.c #, c-format msgid "%s not allowed: %s:%d" msgstr "不允許 %s：%s:%d" -#: attr.c:403 +#: attr.c msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1705,22 +1682,22 @@ msgstr "" "反向模式在 git attributes 中被忽略\n" "當字串確定要以驚嘆號開始時，使用 '\\!'。" -#: bisect.c:488 +#: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "檔案 '%s' 包含錯誤的引用格式：%s" -#: bisect.c:698 +#: bisect.c #, c-format msgid "We cannot bisect more!\n" msgstr "我們無法進行更多的二分搜尋！\n" -#: bisect.c:765 +#: bisect.c #, c-format msgid "Not a valid commit name %s" msgstr "不是一個有效的提交名 %s" -#: bisect.c:790 +#: bisect.c #, c-format msgid "" "The merge base %s is bad.\n" @@ -1729,7 +1706,7 @@ msgstr "" "合併基礎 %s 是壞的。\n" "這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n" -#: bisect.c:795 +#: bisect.c #, c-format msgid "" "The merge base %s is new.\n" @@ -1738,7 +1715,7 @@ msgstr "" "合併基礎 %s 是新的。\n" "介於 %s 和 [%s] 之間的屬性已經被修改。\n" -#: bisect.c:800 +#: bisect.c #, c-format msgid "" "The merge base %s is %s.\n" @@ -1747,7 +1724,7 @@ msgstr "" "合併基礎 %s 是 %s。\n" "這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n" -#: bisect.c:808 +#: bisect.c #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1758,7 +1735,7 @@ msgstr "" "這種情況下 git 二分搜尋無法正常工作。\n" "您可能弄錯了 %s 和 %s 版本？\n" -#: bisect.c:821 +#: bisect.c #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1769,36 +1746,36 @@ msgstr "" "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n" "我們仍舊繼續。" -#: bisect.c:860 +#: bisect.c #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分搜尋中：合併基礎必須是經過測試的\n" -#: bisect.c:910 +#: bisect.c #, c-format msgid "a %s revision is needed" msgstr "需要一個 %s 版本" -#: bisect.c:940 +#: bisect.c #, c-format msgid "could not create file '%s'" msgstr "不能建立檔案 '%s'" -#: bisect.c:986 builtin/merge.c:155 +#: bisect.c builtin/merge.c #, c-format msgid "could not read file '%s'" msgstr "不能讀取檔案 '%s'" -#: bisect.c:1026 +#: bisect.c msgid "reading bisect refs failed" msgstr "讀取二分搜尋引用失敗" -#: bisect.c:1056 +#: bisect.c #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同時為 %s 和 %s\n" -#: bisect.c:1065 +#: bisect.c #, c-format msgid "" "No testable commit found.\n" @@ -1807,7 +1784,7 @@ msgstr "" "沒找到能夠測試的提交。\n" "可能是執行傳入的路徑引數是錯誤的？\n" -#: bisect.c:1094 +#: bisect.c #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1816,79 +1793,76 @@ msgstr[0] "（大概 %d 步）" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1100 +#: bisect.c #, 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" msgstr[0] "二分搜尋中：在此之後，還剩 %d 個版本待測試 %s\n" -#: blame.c:2773 +#: blame.c msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" -#: blame.c:2787 +#: blame.c msgid "cannot use --contents with final commit object name" msgstr "不能將 --contents 和最終的提交物件名共用" -#: blame.c:2808 +#: blame.c msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157 -#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118 -#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096 -#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381 -#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796 -#: builtin/shortlog.c:255 +#: blame.c builtin/commit.c builtin/log.c builtin/merge.c +#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c +#: remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "版本遍歷設定失敗" -#: blame.c:2835 +#: blame.c msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍" -#: blame.c:2846 +#: blame.c #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中無此路徑 %1$s" -#: blame.c:2857 +#: blame.c #, c-format msgid "cannot read blob %s for path %s" msgstr "不能為路徑 %2$s 讀取資料物件 %1$s" -#: branch.c:93 +#: branch.c msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" msgstr "請求重定基底時，無法繼承多個參照的上游追蹤設定" -#: branch.c:104 +#: branch.c #, c-format msgid "not setting branch '%s' as its own upstream" msgstr "未將「%s」分支設定為其自己的上游" -#: branch.c:160 +#: branch.c #, c-format msgid "branch '%s' set up to track '%s' by rebasing." msgstr "已將「%s」分支設定為透過重定基底追蹤「%s」。" -#: branch.c:161 +#: branch.c #, c-format msgid "branch '%s' set up to track '%s'." msgstr "已將「%s」分支設定為追蹤「%s」。" -#: branch.c:164 +#: branch.c #, c-format msgid "branch '%s' set up to track:" msgstr "「%s」分支已設定追蹤：" -#: branch.c:176 +#: branch.c msgid "unable to write upstream branch configuration" msgstr "無法寫入上游分支設定" -#: branch.c:178 +#: branch.c msgid "" "\n" "After fixing the error cause you may try to fix up\n" @@ -1898,17 +1872,17 @@ msgstr "" "修正錯誤後，您可以執行下述命令\n" "命令修正遠端追蹤資訊：" -#: branch.c:219 +#: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "請求繼承「%s」的追蹤設定，但未設定遠端" -#: branch.c:225 +#: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "請求繼承「%s」的追蹤設定，但未設定合併設定" -#: branch.c:277 +#: branch.c #, c-format msgid "not tracking: ambiguous information for ref '%s'" msgstr "未追蹤：「%s」引用有歧義" @@ -1923,7 +1897,7 @@ msgstr "未追蹤：「%s」引用有歧義" #. you'll probably want to swap the "%s" and leading " " space #. around. #. -#: branch.c:289 object-name.c:464 +#: branch.c object-name.c #, c-format msgid " %s\n" msgstr " %s\n" @@ -1931,7 +1905,7 @@ msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. #. -#: branch.c:295 +#: branch.c #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" @@ -1950,32 +1924,32 @@ msgstr "" "若要支援設定追蹤分支，請確定不同遠端的抓取引用規格\n" "映射到不同的追蹤命名空間。" -#: branch.c:344 +#: branch.c #, c-format msgid "'%s' is not a valid branch name" msgstr "「%s」不是一個有效的分支名稱" -#: branch.c:364 +#: branch.c #, c-format msgid "a branch named '%s' already exists" msgstr "已有同名「%s」分支" -#: branch.c:370 +#: branch.c #, c-format msgid "cannot force update the branch '%s' checked out at '%s'" msgstr "無法強制更新在「%2$s」簽出的「%1$s」分支" -#: branch.c:393 +#: branch.c #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" msgstr "無法設定追蹤資訊：起始點「%s」不是分支" -#: branch.c:395 +#: branch.c #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "請求的上游分支 '%s' 不存在" -#: branch.c:397 +#: branch.c msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1994,28 +1968,27 @@ msgstr "" "且建立兩個分支間的追蹤關係，\n" "您可能需要使用「git push -u」推送分支並設定和上游的關聯。" -#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377 -#: builtin/replace.c:423 builtin/replace.c:453 +#: branch.c builtin/replace.c #, c-format msgid "not a valid object name: '%s'" msgstr "不是一個有效的物件名：'%s'" -#: branch.c:465 +#: branch.c #, c-format msgid "ambiguous object name: '%s'" msgstr "物件名稱有歧義：「%s」" -#: branch.c:470 +#: branch.c #, c-format msgid "not a valid branch point: '%s'" msgstr "無效的分支點：「%s」" -#: branch.c:658 +#: branch.c #, c-format msgid "submodule '%s': unable to find submodule" msgstr "「%s」子模組：找不到子模組" -#: branch.c:661 +#: branch.c #, c-format msgid "" "You may try updating the submodules using 'git checkout %s && git submodule " @@ -2024,25518 +1997,24586 @@ msgstr "" "您可以嘗試使用「git checkout %s && git submodule update --init」命令更新子模" "組" -#: branch.c:672 branch.c:698 +#: branch.c #, c-format msgid "submodule '%s': cannot create branch '%s'" msgstr "「%s」子模組：無法建立「%s」分支" -#: branch.c:730 +#: branch.c #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已經簽出到 '%s'" -#: branch.c:755 +#: branch.c #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作區 %s 的 HEAD 指向沒有被更新" -#: bundle.c:45 -#, c-format -msgid "unrecognized bundle hash algorithm: %s" -msgstr "無法識別的套件雜湊演算法：%s" +#: builtin/add.c +msgid "git add [] [--] ..." +msgstr "git add [<選項>] [--] <路徑規格>..." -#: bundle.c:53 +#: builtin/add.c #, c-format -msgid "unknown capability '%s'" -msgstr "未知功能 '%s'" +msgid "cannot chmod %cx '%s'" +msgstr "無法 chmod %cx ‘%s’" -#: bundle.c:79 +#: builtin/add.c #, c-format -msgid "'%s' does not look like a v2 or v3 bundle file" -msgstr "'%s' 不像是一個 v2 或 v3 版本的套件檔案" +msgid "unexpected diff status %c" +msgstr "意外的差異狀態 %c" -#: bundle.c:118 -#, c-format -msgid "unrecognized header: %s%s (%d)" -msgstr "無法識別的包頭：%s%s (%d)" +#: builtin/add.c builtin/commit.c +msgid "updating files failed" +msgstr "更新檔案失敗" -#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402 -#: builtin/commit.c:865 +#: builtin/add.c #, c-format -msgid "could not open '%s'" -msgstr "不能開啟 '%s'" +msgid "remove '%s'\n" +msgstr "刪除 '%s'\n" -#: bundle.c:203 -msgid "Repository lacks these prerequisite commits:" -msgstr "版本庫中缺少這些必備的提交：" +#: builtin/add.c +msgid "Unstaged changes after refreshing the index:" +msgstr "重新整理索引之後尚未被暫存的變更：" -#: bundle.c:206 -msgid "need a repository to verify a bundle" -msgstr "需要版本庫驗證套件" +#: builtin/add.c builtin/rev-parse.c +msgid "Could not read the index" +msgstr "不能讀取索引" + +#: builtin/add.c +msgid "Could not write patch" +msgstr "不能生成修補檔" -#: bundle.c:264 +#: builtin/add.c +msgid "editing patch failed" +msgstr "編輯修補檔失敗" + +#: builtin/add.c #, c-format -msgid "The bundle contains this ref:" -msgid_plural "The bundle contains these % refs:" -msgstr[0] "這個套件含有這 % 個引用：" +msgid "Could not stat '%s'" +msgstr "不能對 '%s' 呼叫 stat" -#: bundle.c:272 -msgid "The bundle records a complete history." -msgstr "這個套件記錄完整歷史紀錄。" +#: builtin/add.c +msgid "Empty patch. Aborted." +msgstr "空修補檔。異常終止。" -#: bundle.c:274 +#: builtin/add.c #, c-format -msgid "The bundle requires this ref:" -msgid_plural "The bundle requires these % refs:" -msgstr[0] "這個套件需要這 % 個引用：" +msgid "Could not apply '%s'" +msgstr "不能套用 '%s'" -#: bundle.c:350 -msgid "unable to dup bundle descriptor" -msgstr "無法複製套件描述符" +#: builtin/add.c +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n" -#: bundle.c:357 -msgid "Could not spawn pack-objects" -msgstr "不能生成 pack-objects 進程" +#: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c +#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c +#: builtin/rm.c builtin/send-pack.c +msgid "dry run" +msgstr "測試執行" -#: bundle.c:368 -msgid "pack-objects died" -msgstr "pack-objects 終止" +#: builtin/add.c builtin/check-ignore.c builtin/commit.c +#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c +#: builtin/read-tree.c +msgid "be verbose" +msgstr "詳細輸出" -#: bundle.c:417 -#, c-format -msgid "ref '%s' is excluded by the rev-list options" -msgstr "引用 '%s' 被 rev-list 選項排除" +#: builtin/add.c +msgid "interactive picking" +msgstr "互動式揀選" -#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400 -#, c-format -msgid "unrecognized argument: %s" -msgstr "無法識別的參數：%s" +#: builtin/add.c builtin/checkout.c builtin/reset.c +msgid "select hunks interactively" +msgstr "互動式挑選資料區塊" -#: bundle.c:548 -#, c-format -msgid "unsupported bundle version %d" -msgstr "不支援的套件版本 %d" +#: builtin/add.c +msgid "edit current diff and apply" +msgstr "編輯目前差異並套用" -#: bundle.c:550 -#, c-format -msgid "cannot write bundle version %d with algorithm %s" -msgstr "無法寫入 %2$s 演算法的套件版本 %1$d" +#: builtin/add.c +msgid "allow adding otherwise ignored files" +msgstr "允許新增忽略的檔案" -#: bundle.c:600 -msgid "Refusing to create empty bundle." -msgstr "不能建立空套件。" +#: builtin/add.c +msgid "update tracked files" +msgstr "更新已追蹤的檔案" -#: bundle.c:610 -#, c-format -msgid "cannot create '%s'" -msgstr "不能建立 '%s'" +#: builtin/add.c +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號" -#: bundle.c:639 -msgid "index-pack died" -msgstr "index-pack 終止" +#: builtin/add.c +msgid "record only the fact that the path will be added later" +msgstr "只記錄，該路徑稍後再新增" -#: chunk-format.c:117 -msgid "terminating chunk id appears earlier than expected" -msgstr "終止區塊 id 出現的時間早於預期" +#: builtin/add.c +msgid "add changes from all tracked and untracked files" +msgstr "新增所有改變的已追蹤檔案和未追蹤檔案" -#: chunk-format.c:126 -#, c-format -msgid "improper chunk offset(s) % and %" -msgstr "不正確的區塊偏移 % 及 %" +#: builtin/add.c +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "忽略工作區中移除的路徑（和 --no-all 相同）" -#: chunk-format.c:133 -#, c-format -msgid "duplicate chunk ID % found" -msgstr "找到重複的區塊 ID %" +#: builtin/add.c +msgid "don't add, only refresh the index" +msgstr "不新增，只重新整理索引" + +#: builtin/add.c +msgid "just skip files which cannot be added because of errors" +msgstr "略過因發生錯誤不能新增的檔案" + +#: builtin/add.c +msgid "check if - even missing - files are ignored in dry run" +msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略" + +#: builtin/add.c builtin/mv.c builtin/rm.c +msgid "allow updating entries outside of the sparse-checkout cone" +msgstr "允許更新稀疏簽出 cone 外的項目" + +#: builtin/add.c builtin/update-index.c +msgid "override the executable bit of the listed files" +msgstr "覆蓋列表裡檔案的可執行位" -#: chunk-format.c:147 +#: builtin/add.c +msgid "warn when adding an embedded repository" +msgstr "建立一個嵌入式版本庫時給予警告" + +#: builtin/add.c #, c-format -msgid "final chunk has non-zero id %" -msgstr "最終區塊有非零 ID %" +msgid "" +"You've added another git repository inside your current repository.\n" +"Clones of the outer repository will not contain the contents of\n" +"the embedded repository and will not know how to obtain it.\n" +"If you meant to add a submodule, use:\n" +"\n" +"\tgit submodule add %s\n" +"\n" +"If you added this path by mistake, you can remove it from the\n" +"index with:\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"See \"git help submodule\" for more information." +msgstr "" +"您在目前版本庫中新增了另外一個 Git 版本庫。複製外層的版本庫將不包含嵌入版本庫" +"的內容，並且不知道該如何取得它。\n" +"如果您要新增一個子模組，使用：\n" +"\n" +"\tgit submodule add %s\n" +"\n" +"如果您不小心新增了這個路徑，可以用下面的指令將其從索引中刪除：\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"參見 \"git help submodule\" 取得更多訊息。" -#: color.c:354 +#: builtin/add.c #, c-format -msgid "invalid color value: %.*s" -msgstr "無效的顏色值：%.*s" +msgid "adding embedded git repository: %s" +msgstr "正在新增嵌入式 git 版本庫：%s" -#: commit-graph.c:204 midx.c:52 -msgid "invalid hash version" -msgstr "無效的雜湊版本" +#: builtin/add.c +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" +msgstr "" +"如果您真的想加入，請使用 -f。\n" +"如要關閉此訊息，請執行\n" +"\"git config advice.addIgnoredFile false\"" -#: commit-graph.c:262 -msgid "commit-graph file is too small" -msgstr "提交圖形檔案太小" +#: builtin/add.c +msgid "adding files failed" +msgstr "新增檔案失敗" -#: commit-graph.c:355 +#: builtin/add.c #, c-format -msgid "commit-graph signature %X does not match signature %X" -msgstr "提交圖形簽名 %X 和簽名 %X 不符合" +msgid "--chmod param '%s' must be either -x or +x" +msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x" -#: commit-graph.c:362 +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c +#: builtin/rm.c builtin/stash.c #, c-format -msgid "commit-graph version %X does not match version %X" -msgstr "提交圖形版本 %X 和版本 %X 不符合" +msgid "'%s' and pathspec arguments cannot be used together" +msgstr "「%s」和路徑規格引數不得同時使用" -#: commit-graph.c:369 +#: builtin/add.c #, c-format -msgid "commit-graph hash version %X does not match version %X" -msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合" +msgid "Nothing specified, nothing added.\n" +msgstr "沒有指定檔案，也沒有檔案被新增。\n" -#: commit-graph.c:386 -#, c-format -msgid "commit-graph file is too small to hold %u chunks" -msgstr "commit-graph 檔案不夠放置 %u 個區塊" +#: builtin/add.c +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" +"可能你要做的是 'git add .'？\n" +"如要關閉此訊息，請執行\n" +"\"git config advice.addEmptyPathspec false\"" -#: commit-graph.c:485 -msgid "commit-graph has no base graphs chunk" -msgstr "提交圖形沒有基礎圖形區塊" +#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c +#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c +#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c +#: rerere.c submodule.c +msgid "index file corrupt" +msgstr "索引檔案損壞" -#: commit-graph.c:495 -msgid "commit-graph chain does not match" -msgstr "提交圖形鏈不符合" +#: builtin/am.c builtin/mailinfo.c mailinfo.c +#, c-format +msgid "bad action '%s' for '%s'" +msgstr "「%s」動作對「%s」無效" -#: commit-graph.c:543 +#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c +#: sequencer.c setup.c #, c-format -msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值" +msgid "invalid value for '%s': '%s'" +msgstr "「%s」的值無效：「%s」" -#: commit-graph.c:567 -msgid "unable to find all commit-graph files" -msgstr "無法找到所有提交圖形檔案" +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c +#, c-format +msgid "could not read '%s'" +msgstr "不能讀取 '%s'" -#: commit-graph.c:752 commit-graph.c:789 -msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "無效的提交位置。提交圖形可能已損壞" +#: builtin/am.c +msgid "could not parse author script" +msgstr "不能解析作者腳本" -#: commit-graph.c:773 +#: builtin/am.c builtin/replace.c commit.c sequencer.c #, c-format -msgid "could not find commit %s" -msgstr "無法找到提交 %s" - -#: commit-graph.c:806 -msgid "commit-graph requires overflow generation data but has none" -msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料" +msgid "could not parse %s" +msgstr "不能解析 %s" -#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775 -#: builtin/clone.c:705 +#: builtin/am.c #, c-format -msgid "unable to parse commit %s" -msgstr "不能解析提交 %s" +msgid "'%s' was deleted by the applypatch-msg hook" +msgstr "'%s' 被 applypatch-msg 掛鉤刪除" -#: commit-graph.c:1373 builtin/pack-objects.c:3078 +#: builtin/am.c #, c-format -msgid "unable to get type of object %s" -msgstr "無法獲得物件 %s 類型" +msgid "Malformed input line: '%s'." +msgstr "非法的輸入行：'%s'。" -#: commit-graph.c:1404 -msgid "Loading known commits in commit graph" -msgstr "正在載入提交圖中的已知提交" +#: builtin/am.c +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "從 '%s' 複製註解到 '%s' 時失敗" -#: commit-graph.c:1421 -msgid "Expanding reachable commits in commit graph" -msgstr "正在展開提交圖中的可以取得的提交" +#: builtin/am.c +msgid "fseek failed" +msgstr "fseek 失敗" -#: commit-graph.c:1441 -msgid "Clearing commit marks in commit graph" -msgstr "正在清除提交圖中的提交標記" +#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c +#, c-format +msgid "could not open '%s' for reading" +msgstr "無法開啟 '%s' 進行讀取" -#: commit-graph.c:1460 -msgid "Computing commit graph topological levels" -msgstr "正在計算提交圖拓樸級別" +#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c +#, c-format +msgid "could not open '%s' for writing" +msgstr "無法開啟 '%s' 進行寫入" -#: commit-graph.c:1513 -msgid "Computing commit graph generation numbers" -msgstr "正在計算提交圖世代數字" +#: builtin/am.c +#, c-format +msgid "could not parse patch '%s'" +msgstr "無法解析修補檔 '%s'" -#: commit-graph.c:1598 -msgid "Computing commit changed paths Bloom filters" -msgstr "正在計算提交變更路徑的布隆過濾器" +#: builtin/am.c +msgid "Only one StGIT patch series can be applied at once" +msgstr "一次只能有一個 StGIT 修補檔佇列被套用" -#: commit-graph.c:1675 -msgid "Collecting referenced commits" -msgstr "正在收集引用提交" +#: builtin/am.c +msgid "invalid timestamp" +msgstr "無效的時間戳" + +#: builtin/am.c +msgid "invalid Date line" +msgstr "無效的日期行" -#: commit-graph.c:1701 +#: builtin/am.c +msgid "invalid timezone offset" +msgstr "無效的時區位移值" + +#: builtin/am.c +msgid "Patch format detection failed." +msgstr "修補檔格式偵測失敗。" + +#: builtin/am.c builtin/clone.c #, c-format -msgid "Finding commits for commit graph in % pack" -msgid_plural "Finding commits for commit graph in % packs" -msgstr[0] "正在從 % 個包中尋找提交圖的提交" +msgid "failed to create directory '%s'" +msgstr "建立目錄 '%s' 失敗" + +#: builtin/am.c +msgid "Failed to split patches." +msgstr "分割修補檔失敗。" -#: commit-graph.c:1714 +#: builtin/am.c #, c-format -msgid "error adding pack %s" -msgstr "新增包 %s 發生錯誤" +msgid "When you have resolved this problem, run \"%s --continue\"." +msgstr "當您解決這一問題，執行 \"%s --continue\"。" -#: commit-graph.c:1718 +#: builtin/am.c #, c-format -msgid "error opening index for %s" -msgstr "為 %s 開啟索引發生錯誤" +msgid "If you prefer to skip this patch, run \"%s --skip\" instead." +msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。" -#: commit-graph.c:1756 -msgid "Finding commits for commit graph among packed objects" -msgstr "正在打包物件中尋找提交圖的提交" +#: builtin/am.c +#, c-format +msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." +msgstr "若要將空白修補檔錄製為空白提交，請執行「%s --allow-empty」。" -#: commit-graph.c:1774 -msgid "Finding extra edges in commit graph" -msgstr "正在尋找提交圖中額外的邊" +#: builtin/am.c +#, c-format +msgid "To restore the original branch and stop patching, run \"%s --abort\"." +msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。" -#: commit-graph.c:1823 -msgid "failed to write correct number of base graph ids" -msgstr "無法寫入正確數量的基礎圖形 ID" +#: builtin/am.c +msgid "Patch sent with format=flowed; space at the end of lines might be lost." +msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。" -#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475 +#: builtin/am.c #, c-format -msgid "unable to create leading directories of %s" -msgstr "不能為 %s 建立先導目錄" - -#: commit-graph.c:1868 -msgid "unable to create temporary graph layer" -msgstr "無法建立暫時的圖形層" +msgid "missing author line in commit %s" +msgstr "在提交 %s 中缺少作者行" -#: commit-graph.c:1873 +#: builtin/am.c #, c-format -msgid "unable to adjust shared permissions for '%s'" -msgstr "無法調整「%s」的共用權限" +msgid "invalid ident line: %.*s" +msgstr "無效的身份標記：%.*s" -#: commit-graph.c:1930 +#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c #, c-format -msgid "Writing out commit graph in %d pass" -msgid_plural "Writing out commit graph in %d passes" -msgstr[0] "正在用 %d 步寫出提交圖" +msgid "unable to parse commit %s" +msgstr "不能解析提交 %s" -#: commit-graph.c:1967 -msgid "unable to open commit-graph chain file" -msgstr "無法開啟提交圖形鏈檔案" +#: builtin/am.c +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "版本庫缺乏必要的資料物件以進行三方合併。" -#: commit-graph.c:1983 -msgid "failed to rename base commit-graph file" -msgstr "無法重新命名基礎提交圖形檔案" +#: builtin/am.c +msgid "Using index info to reconstruct a base tree..." +msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..." -#: commit-graph.c:2004 -msgid "failed to rename temporary commit-graph file" -msgstr "無法重新命名暫時提交圖形檔案" +#: builtin/am.c +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"您是否曾手動編輯過您的修補檔？\n" +"無法套用修補檔到索引中的資料物件上。" -#: commit-graph.c:2137 -msgid "Scanning merged commits" -msgstr "正在掃描合併提交" +#: builtin/am.c +msgid "Falling back to patching base and 3-way merge..." +msgstr "回落到基礎版本上修補及進行三方合併..." -#: commit-graph.c:2181 -msgid "Merging commit-graph" -msgstr "正在合併提交圖形" +#: builtin/am.c +msgid "Failed to merge in the changes." +msgstr "無法合併變更。" -#: commit-graph.c:2289 -msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" -msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用" +#: builtin/am.c builtin/merge.c sequencer.c +msgid "git write-tree failed to write a tree" +msgstr "git write-tree 無法寫入樹狀物件" -#: commit-graph.c:2396 -msgid "too many commits to write graph" -msgstr "提交太多不能畫圖" +#: builtin/am.c +msgid "applying to an empty history" +msgstr "正套用到一個空歷史上" -#: commit-graph.c:2494 -msgid "the commit-graph file has incorrect checksum and is likely corrupt" -msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞" +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c +#: t/helper/test-fast-rebase.c +msgid "failed to write commit object" +msgstr "寫提交物件失敗" -#: commit-graph.c:2504 +#: builtin/am.c #, c-format -msgid "commit-graph has incorrect OID order: %s then %s" -msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s" +msgid "cannot resume: %s does not exist." +msgstr "無法繼續：%s 不存在。" -#: commit-graph.c:2514 commit-graph.c:2529 -#, c-format -msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" -msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u" +#: builtin/am.c +msgid "Commit Body is:" +msgstr "提交內容為：" -#: commit-graph.c:2521 +# 譯者：請維持句尾空格 +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#. +#: builtin/am.c #, c-format -msgid "failed to parse commit %s from commit-graph" -msgstr "無法從提交圖形中解析提交 %s" +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " +msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]： " -#: commit-graph.c:2539 -msgid "Verifying commits in commit graph" -msgstr "正在驗證提交圖中的提交" +#: builtin/am.c builtin/commit.c +msgid "unable to write index file" +msgstr "無法寫入索引檔案" -#: commit-graph.c:2554 +#: builtin/am.c #, c-format -msgid "failed to parse commit %s from object database for commit-graph" -msgstr "無法從提交圖形的物件庫中解析提交 %s" +msgid "Dirty index: cannot apply patches (dirty: %s)" +msgstr "髒索引：不能套用修補檔（髒檔案：%s）" -#: commit-graph.c:2561 +#: builtin/am.c #, c-format -msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s" +msgid "Skipping: %.*s" +msgstr "略過：%.*s" -#: commit-graph.c:2571 +#: builtin/am.c #, c-format -msgid "commit-graph parent list for commit %s is too long" -msgstr "提交 %s 的提交圖形父提交列表太長了" +msgid "Creating an empty commit: %.*s" +msgstr "建立空白提交：%.*s" -#: commit-graph.c:2580 -#, c-format -msgid "commit-graph parent for %s is %s != %s" -msgstr "%s 的提交圖形父提交是 %s != %s" +#: builtin/am.c +msgid "Patch is empty." +msgstr "修補檔為空。" -#: commit-graph.c:2594 +#: builtin/am.c #, c-format -msgid "commit-graph parent list for commit %s terminates early" -msgstr "提交 %s 的提交圖形父提交列表過早終止" +msgid "Applying: %.*s" +msgstr "套用：%.*s" -#: commit-graph.c:2599 -#, c-format -msgid "" -"commit-graph has generation number zero for commit %s, but non-zero elsewhere" -msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零" +#: builtin/am.c +msgid "No changes -- Patch already applied." +msgstr "沒有變更——修補檔已經套用過。" -#: commit-graph.c:2603 +#: builtin/am.c #, c-format +msgid "Patch failed at %s %.*s" +msgstr "打修補檔失敗於 %s %.*s" + +#: builtin/am.c +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔" + +#: builtin/am.c +msgid "No changes - recorded it as an empty commit." +msgstr "沒有變更 － 將其錄製為空白提交。" + +#: builtin/am.c msgid "" -"commit-graph has non-zero generation number for commit %s, but zero elsewhere" -msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" +"沒有變更 —— 您是不是忘了執行 'git add'？\n" +"如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n" +"您也許想要略過這個修補檔。" -#: commit-graph.c:2620 -#, c-format -msgid "commit-graph generation for commit %s is % < %" -msgstr "提交 %s 的提交圖形處於 % < % 世代" +#: builtin/am.c +msgid "" +"You still have unmerged paths in your index.\n" +"You should 'git add' each file with resolved conflicts to mark them as " +"such.\n" +"You might run `git rm` on a file to accept \"deleted by them\" for it." +msgstr "" +"在您的索引中仍存在未合併的路徑。\n" +"您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n" +"你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。" -#: commit-graph.c:2626 -#, c-format -msgid "commit date for commit %s in commit-graph is % != %" -msgstr "提交圖形中提交 %s 的提交日期是 % != %" +#: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c +#: rerere.c +msgid "unable to write new index file" +msgstr "無法寫新的索引檔案" -#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445 -#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456 +#: builtin/am.c builtin/reset.c #, c-format -msgid "could not parse %s" -msgstr "不能解析 %s" +msgid "Could not parse object '%s'." +msgstr "不能解析物件 '%s'。" -#: commit.c:56 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s 不是一個提交！" +#: builtin/am.c +msgid "failed to clean index" +msgstr "清空索引失敗" -#: commit.c:197 +#: builtin/am.c msgid "" -"Support for /info/grafts is deprecated\n" -"and will be removed in a future Git version.\n" -"\n" -"Please use \"git replace --convert-graft-file\"\n" -"to convert the grafts into replace refs.\n" -"\n" -"Turn this message off by running\n" -"\"git config advice.graftFileDeprecated false\"" -msgstr "" -"對 /info/grafts 的支援已被棄用，並將在\n" -"未來的Git版本中被移除。\n" -"\n" -"請使用 \"git replace --convert-graft-file\" 將\n" -"grafts 轉換為取代引用。\n" -"\n" -"設定 \"git config advice.graftFileDeprecated false\"\n" -"可關閉本消息" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD" -#: commit.c:1252 +#: builtin/am.c builtin/bisect--helper.c worktree.c #, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。" +msgid "failed to read '%s'" +msgstr "讀取 '%s' 失敗" -#: commit.c:1256 +#: builtin/am.c #, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。" +msgid "options '%s=%s' and '%s=%s' cannot be used together" +msgstr "「%s=%s」和「%s=%s」選項不得同時使用" -#: commit.c:1259 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "提交 %s 沒有 GPG 簽名。" +#: builtin/am.c +msgid "git am [] [( | )...]" +msgstr "git am [<選項>] [( | )...]" -#: commit.c:1262 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n" +#: builtin/am.c +msgid "git am [] (--continue | --skip | --abort)" +msgstr "git am [<選項>] (--continue | --skip | --abort)" -#: commit.c:1516 -msgid "" -"Warning: commit message did not conform to UTF-8.\n" -"You may want to amend it after fixing the message, or set the config\n" -"variable i18n.commitencoding to the encoding your project uses.\n" -msgstr "" -"警告：提交說明不符合 UTF-8 字元編碼。\n" -"您可以透過修補提交來改正提交說明，或者將設定變數 i18n.commitencoding\n" -"設定為您項目所用的字元編碼。\n" +#: builtin/am.c +msgid "run interactively" +msgstr "以互動式方式執行" -#: compat/obstack.c:406 compat/obstack.c:408 -msgid "memory exhausted" -msgstr "記憶體耗盡" +#: builtin/am.c +msgid "historical option -- no-op" +msgstr "老的參數 —— 無作用" -#: compat/terminal.c:167 -msgid "cannot resume in the background, please use 'fg' to resume" -msgstr "無法在背景繼續；請使用 “fg” 繼續" +#: builtin/am.c +msgid "allow fall back on 3way merging if needed" +msgstr "如果必要，允許使用三方合併" -#: compat/terminal.c:168 -msgid "cannot restore terminal settings" -msgstr "無法復原終端機設定" +#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c +#: builtin/stash.c +msgid "be quiet" +msgstr "靜默模式" -#: config.c:143 -#, c-format -msgid "" -"exceeded maximum include depth (%d) while including\n" -"\t%s\n" -"from\n" -"\t%s\n" -"This might be due to circular includes." -msgstr "" -"超過了最大包含深度（%1$d），當從\n" -"\t%3$s\n" -"包含\n" -"\t%2$s\n" -"這可能是因為循環包含。" - -#: config.c:159 -#, c-format -msgid "could not expand include path '%s'" -msgstr "無法展開包含路徑 '%s'" +#: builtin/am.c +msgid "add a Signed-off-by trailer to the commit message" +msgstr "在提交說明結尾加入 Signed-off-by" -#: config.c:170 -msgid "relative config includes must come from files" -msgstr "相對路徑的設定檔案引用必須來自於檔案" +#: builtin/am.c +msgid "recode into utf8 (default)" +msgstr "使用 utf8 字元集（預設）" -#: config.c:219 -msgid "relative config include conditionals must come from files" -msgstr "相對路徑的設定檔案條件引用必須來自於檔案" +#: builtin/am.c +msgid "pass -k flag to git-mailinfo" +msgstr "向 git-mailinfo 傳遞 -k 參數" -#: config.c:364 -msgid "" -"remote URLs cannot be configured in file directly or indirectly included by " -"includeIf.hasconfig:remote.*.url" -msgstr "" -"無法在檔案設定遠端 URL，無論是直接或間接透過 includeIf.hasconfig:remote.*." -"url 引入" +#: builtin/am.c +msgid "pass -b flag to git-mailinfo" +msgstr "向 git-mailinfo 傳遞 -b 參數" -#: config.c:508 -#, c-format -msgid "invalid config format: %s" -msgstr "無效的設定檔格式：%s" +#: builtin/am.c +msgid "pass -m flag to git-mailinfo" +msgstr "向 git-mailinfo 傳遞 -m 參數" -#: config.c:512 -#, c-format -msgid "missing environment variable name for configuration '%.*s'" -msgstr "缺少「%.*s」組態設定的環境變數名稱" +#: builtin/am.c +msgid "pass --keep-cr flag to git-mailsplit for mbox format" +msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數" -#: config.c:517 -#, c-format -msgid "missing environment variable '%s' for configuration '%.*s'" -msgstr "缺少環境變數「%s」（於「%.*s」組態設定）" +#: builtin/am.c +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" +msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定" -#: config.c:553 -#, c-format -msgid "key does not contain a section: %s" -msgstr "鍵名沒有包含一個小節名稱：%s" +#: builtin/am.c +msgid "strip everything before a scissors line" +msgstr "捨棄裁切線前的所有內容" -#: config.c:558 -#, c-format -msgid "key does not contain variable name: %s" -msgstr "鍵名沒有包含變數名：%s" +#: builtin/am.c +msgid "pass it through git-mailinfo" +msgstr "透過 git-mailinfo 傳遞" -#: config.c:580 sequencer.c:2802 -#, c-format -msgid "invalid key: %s" -msgstr "無效鍵名：%s" +#: builtin/am.c +msgid "pass it through git-apply" +msgstr "傳遞給 git-apply" -#: config.c:585 -#, c-format -msgid "invalid key (newline): %s" -msgstr "無效鍵名（有換行符號）：%s" +#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c +#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c +#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h +msgid "n" +msgstr "n" -#: config.c:605 -msgid "empty config key" -msgstr "空白設定鍵" +#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c +#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c +#: builtin/verify-tag.c +msgid "format" +msgstr "格式" -#: config.c:623 config.c:635 -#, c-format -msgid "bogus config parameter: %s" -msgstr "偽設定參數：%s" +#: builtin/am.c +msgid "format the patch(es) are in" +msgstr "修補檔的格式" -#: config.c:649 config.c:666 config.c:673 config.c:682 -#, c-format -msgid "bogus format in %s" -msgstr "%s 中格式錯誤" +#: builtin/am.c +msgid "override error message when patch failure occurs" +msgstr "打修補檔失敗時顯示的錯誤訊息" -#: config.c:716 -#, c-format -msgid "bogus count in %s" -msgstr "%s 中有偽計數" +#: builtin/am.c +msgid "continue applying patches after resolving a conflict" +msgstr "衝突解決後繼續套用修補檔" -#: config.c:720 -#, c-format -msgid "too many entries in %s" -msgstr "%s 中的項目過多" +#: builtin/am.c +msgid "synonyms for --continue" +msgstr "和 --continue 同義" -#: config.c:730 -#, c-format -msgid "missing config key %s" -msgstr "缺少 %s 設定鍵" +#: builtin/am.c +msgid "skip the current patch" +msgstr "略過目前修補檔" -#: config.c:738 -#, c-format -msgid "missing config value %s" -msgstr "缺少 %s 設定值" +#: builtin/am.c +msgid "restore the original branch and abort the patching operation" +msgstr "還原原始分支並中止修補動作" -#: config.c:1089 -#, c-format -msgid "bad config line %d in blob %s" -msgstr "資料物件 %2$s 中錯誤的設定行 %1$d" +#: builtin/am.c +msgid "abort the patching operation but keep HEAD where it is" +msgstr "終止修補動作但保持 HEAD 不變" -#: config.c:1093 -#, c-format -msgid "bad config line %d in file %s" -msgstr "檔案 %2$s 中錯誤的設定行 %1$d" +#: builtin/am.c +msgid "show the patch being applied" +msgstr "顯示正在套用的修補檔" -#: config.c:1097 -#, c-format -msgid "bad config line %d in standard input" -msgstr "標準輸入中錯誤的設定行 %d" +#: builtin/am.c +msgid "record the empty patch as an empty commit" +msgstr "將空白修補檔錄製為空白提交" -#: config.c:1101 -#, c-format -msgid "bad config line %d in submodule-blob %s" -msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d" +#: builtin/am.c +msgid "lie about committer date" +msgstr "將作者日期作為提交日期" -#: config.c:1105 -#, c-format -msgid "bad config line %d in command line %s" -msgstr "指令列 %2$s 中錯誤的設定行 %1$d" +#: builtin/am.c +msgid "use current timestamp for author date" +msgstr "用目前時間作為作者日期" -#: config.c:1109 -#, c-format -msgid "bad config line %d in %s" -msgstr "在 %2$s 中錯誤的設定行 %1$d" +#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c +#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c +msgid "key-id" +msgstr "key-id" -#: config.c:1246 -msgid "out of range" -msgstr "超出範圍" +#: builtin/am.c builtin/rebase.c +msgid "GPG-sign commits" +msgstr "使用 GPG 簽名提交" -#: config.c:1246 -msgid "invalid unit" -msgstr "無效的單位" +#: builtin/am.c +msgid "how to handle empty patches" +msgstr "空白修補檔的處理方式" -#: config.c:1247 -#, c-format -msgid "bad numeric config value '%s' for '%s': %s" -msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s" +#: builtin/am.c +msgid "(internal use for git-rebase)" +msgstr "（內部使用，用於 git-rebase）" -#: config.c:1257 -#, c-format -msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" +#: builtin/am.c +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." +msgstr "" +"參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n" +"請不要再使用它了。" -#: config.c:1260 -#, c-format -msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" +#: builtin/am.c +msgid "failed to read the index" +msgstr "讀取索引失敗" -#: config.c:1263 +#: builtin/am.c #, c-format -msgid "bad numeric config value '%s' for '%s' in standard input: %s" -msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s'：%3$s" +msgid "previous rebase directory %s still exists but mbox given." +msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。" -#: config.c:1266 +#: builtin/am.c #, c-format -msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" -msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" +msgid "" +"Stray %s directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" +"發現了錯誤的 %s 目錄。\n" +"使用 \"git am --abort\" 刪除它。" -#: config.c:1269 -#, c-format -msgid "bad numeric config value '%s' for '%s' in command line %s: %s" -msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" +#: builtin/am.c +msgid "Resolve operation not in progress, we are not resuming." +msgstr "解決動作未進行，我們不會繼續。" -#: config.c:1272 -#, c-format -msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" +#: builtin/am.c +msgid "interactive mode requires patches on the command line" +msgstr "互動式模式需要指令列上提供修補檔" -#: config.c:1368 -#, c-format -msgid "invalid value for variable %s" -msgstr "%s 變數的值無效" +#: builtin/apply.c +msgid "git apply [] [...]" +msgstr "git apply [<選項>] [<修補檔>...]" -#: config.c:1389 -#, c-format -msgid "ignoring unknown core.fsync component '%s'" -msgstr "忽略未知的 core.fsync 組件「%s」" +#: builtin/archive.c contrib/scalar/scalar.c +msgid "could not redirect output" +msgstr "不能重定向輸出" -#: config.c:1425 -#, c-format -msgid "bad boolean config value '%s' for '%s'" -msgstr "「%2$s」的「%1$s」布林設定值無效" +#: builtin/archive.c +msgid "git archive: Remote with no URL" +msgstr "git archive：未提供遠端 URL" -#: config.c:1443 -#, c-format -msgid "failed to expand user dir in: '%s'" -msgstr "無法展開使用者目錄於：’%s’" +#: builtin/archive.c +msgid "git archive: expected ACK/NAK, got a flush packet" +msgstr "git archive：期望是 ACK/NAK，卻得到 flush 包" -#: config.c:1452 +#: builtin/archive.c #, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳" +msgid "git archive: NACK %s" +msgstr "git archive：NACK %s" -#: config.c:1545 -#, c-format -msgid "abbrev length out of range: %d" -msgstr "縮寫長度超出範圍：%d" +#: builtin/archive.c +msgid "git archive: protocol error" +msgstr "git archive：協定錯誤" -#: config.c:1559 config.c:1570 -#, c-format -msgid "bad zlib compression level %d" -msgstr "錯誤的 zlib 壓縮級別 %d" +#: builtin/archive.c +msgid "git archive: expected a flush" +msgstr "git archive：應有一個 flush 包" -#: config.c:1660 -msgid "core.commentChar should only be one character" -msgstr "core.commentChar 應該是一個字元" +#: builtin/bisect--helper.c +msgid "git bisect--helper --bisect-reset []" +msgstr "git bisect--helper --bisect-reset [<提交>]" -#: config.c:1692 -#, c-format -msgid "ignoring unknown core.fsyncMethod value '%s'" -msgstr "忽略未知的 core.fsyncMethod 值「%s」" +#: builtin/bisect--helper.c +msgid "" +"git bisect--helper --bisect-start [--term-{new,bad}= --term-{old,good}" +"=] [--no-checkout] [--first-parent] [ [...]] [--] " +"[...]" +msgstr "" +"git bisect--helper --bisect-start [--term-{new,bad}=<術語> --term-{old,good}" +"=<術語>] [--no-checkout] [--first-parent] [<壞> [<好>...]] [--] [<路徑>...]" -#: config.c:1698 -msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" -msgstr "core.fsyncObjectFiles 已被取代。請改用 core.fsync" +#: builtin/bisect--helper.c +msgid "git bisect--helper --bisect-state (bad|new) []" +msgstr "git bisect--helper --bisect-state (bad|new) [<修訂版>]" -#: config.c:1714 -#, c-format -msgid "invalid mode for object creation: %s" -msgstr "無效的物件建立模式：%s" +#: builtin/bisect--helper.c +msgid "git bisect--helper --bisect-state (good|old) [...]" +msgstr "git bisect--helper --bisect-state (good|old) [<修訂版>...]" -#: config.c:1800 -#, c-format -msgid "malformed value for %s" -msgstr "%s 的取值格式錯誤" +#: builtin/bisect--helper.c +msgid "git bisect--helper --bisect-replay " +msgstr "git bisect--helper --bisect-replay <檔名>" -#: config.c:1826 -#, c-format -msgid "malformed value for %s: %s" -msgstr "%s 的取值格式錯誤：%s" +#: builtin/bisect--helper.c +msgid "git bisect--helper --bisect-skip [(|)...]" +msgstr "git bisect--helper --bisect-skip [(<修訂版>|<範圍>)...]" -#: config.c:1827 -msgid "must be one of nothing, matching, simple, upstream or current" -msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current" +#: builtin/bisect--helper.c +msgid "git bisect--helper --bisect-run ..." +msgstr "git bisect--helper --bisect-run ..." -#: config.c:1888 builtin/pack-objects.c:4078 +#: builtin/bisect--helper.c #, c-format -msgid "bad pack compression level %d" -msgstr "錯誤的打包壓縮級別 %d" +msgid "cannot open file '%s' in mode '%s'" +msgstr "無法以 '%2$s' 模式開啟 '%1$s' 檔案" -#: config.c:2014 +#: builtin/bisect--helper.c #, c-format -msgid "unable to load config blob object '%s'" -msgstr "無法從資料物件 '%s' 載入設定" +msgid "could not write to file '%s'" +msgstr "無法寫入 '%s' 檔案" -#: config.c:2017 +#: builtin/bisect--helper.c #, c-format -msgid "reference '%s' does not point to a blob" -msgstr "引用 '%s' 沒有指向一個資料物件" +msgid "cannot open file '%s' for reading" +msgstr "無法開啟「%s」檔案進行讀取" -#: config.c:2035 +#: builtin/bisect--helper.c #, c-format -msgid "unable to resolve config blob '%s'" -msgstr "不能解析設定物件 '%s'" +msgid "'%s' is not a valid term" +msgstr "'%s' 不是一個有效的術語" -#: config.c:2080 +#: builtin/bisect--helper.c #, c-format -msgid "failed to parse %s" -msgstr "解析 %s 失敗" +msgid "can't use the builtin command '%s' as a term" +msgstr "不能使用內建指令 '%s' 作為術語" -#: config.c:2136 -msgid "unable to parse command-line config" -msgstr "無法解析指令列中的設定" +#: builtin/bisect--helper.c +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "不能修改術語 '%s' 的含義" -#: config.c:2512 -msgid "unknown error occurred while reading the configuration files" -msgstr "在讀取設定檔案時遇到未知錯誤" +#: builtin/bisect--helper.c +msgid "please use two different terms" +msgstr "請使用兩個不同的術語" -#: config.c:2686 +#: builtin/bisect--helper.c #, c-format -msgid "Invalid %s: '%s'" -msgstr "無效 %s：'%s'" +msgid "We are not bisecting.\n" +msgstr "我們沒有在二分搜尋。\n" -#: config.c:2731 +#: builtin/bisect--helper.c #, c-format -msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間" +msgid "'%s' is not a valid commit" +msgstr "'%s' 不是一個有效的提交" -#: config.c:2763 +#: builtin/bisect--helper.c #, c-format -msgid "unable to parse '%s' from command-line config" -msgstr "無法解析指令列設定中的 '%s'" +msgid "" +"could not check out original HEAD '%s'. Try 'git bisect reset '." +msgstr "不能簽出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。" -#: config.c:2765 +#: builtin/bisect--helper.c #, c-format -msgid "bad config variable '%s' in file '%s' at line %d" -msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'" +msgid "Bad bisect_write argument: %s" +msgstr "壞的 bisect_write 參數：%s" -#: config.c:2850 +#: builtin/bisect--helper.c #, c-format -msgid "invalid section name '%s'" -msgstr "無效的小節名稱 '%s'" +msgid "couldn't get the oid of the rev '%s'" +msgstr "無法取得版本 '%s' 的物件 ID" -#: config.c:2882 +#: builtin/bisect--helper.c #, c-format -msgid "%s has multiple values" -msgstr "%s 有多個取值" +msgid "couldn't open the file '%s'" +msgstr "無法開啟檔案 '%s'" -#: config.c:2911 +#: builtin/bisect--helper.c #, c-format -msgid "failed to write new configuration file %s" -msgstr "寫入新的設定檔案 %s 失敗" +msgid "Invalid command: you're currently in a %s/%s bisect" +msgstr "無效的指令：您目前正處於一個 %s/%s 二分搜尋中" -#: config.c:3177 config.c:3518 +#: builtin/bisect--helper.c #, c-format -msgid "could not lock config file %s" -msgstr "不能鎖定設定檔案 %s" +msgid "" +"You need to give me at least one %s and %s revision.\n" +"You can use \"git bisect %s\" and \"git bisect %s\" for that." +msgstr "" +"您需要給我至少一個 %s 和一個 %s 版本。\n" +"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: config.c:3188 +#: builtin/bisect--helper.c #, c-format -msgid "opening %s" -msgstr "開啟 %s" +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one %s and %s revision.\n" +"You can use \"git bisect %s\" and \"git bisect %s\" for that." +msgstr "" +"您需要執行 \"git bisect start\" 來開始。\n" +"然後需要提供我至少一個 %s 和一個 %s 版本。\n" +"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。" -#: config.c:3225 builtin/config.c:361 +#: builtin/bisect--helper.c #, c-format -msgid "invalid pattern: %s" -msgstr "無效模式：%s" +msgid "bisecting only with a %s commit" +msgstr "在只有一個 %s 提交的情況下二分搜尋" -#: config.c:3250 -#, c-format -msgid "invalid config file %s" -msgstr "無效的設定檔案 %s" +# 譯者：請維持句尾空格 +#. 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 +msgid "Are you sure [Y/n]? " +msgstr "您確認嗎[Y/n]？ " -#: config.c:3263 config.c:3531 -#, c-format -msgid "fstat on %s failed" -msgstr "對 %s 呼叫 fstat 失敗" +#: builtin/bisect--helper.c +msgid "status: waiting for both good and bad commits\n" +msgstr "狀態：正在等待好和壞的提交\n" -#: config.c:3274 +#: builtin/bisect--helper.c #, c-format -msgid "unable to mmap '%s'%s" -msgstr "無法 mmap '%s'%s" +msgid "status: waiting for bad commit, %d good commit known\n" +msgid_plural "status: waiting for bad commit, %d good commits known\n" +msgstr[0] "狀態：正在等待壞的提交，已知有 %d 個好的提交\n" -#: config.c:3284 config.c:3536 -#, c-format -msgid "chmod on %s failed" -msgstr "對 %s 呼叫 chmod 失敗" +#: builtin/bisect--helper.c +msgid "status: waiting for good commit(s), bad commit known\n" +msgstr "狀態：正在等待好的提交，已知有壞的提交\n" -#: config.c:3369 config.c:3633 -#, c-format -msgid "could not write config file %s" -msgstr "不能寫入設定檔案 %s" +#: builtin/bisect--helper.c +msgid "no terms defined" +msgstr "未定義術語" -#: config.c:3403 +#: builtin/bisect--helper.c #, c-format -msgid "could not set '%s' to '%s'" -msgstr "不能設定 '%s' 為 '%s'" +msgid "" +"Your current terms are %s for the old state\n" +"and %s for the new state.\n" +msgstr "您目前針對舊狀態的術語是 %s，對新狀態的術語是 %s。\n" -#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893 +#: builtin/bisect--helper.c #, c-format -msgid "could not unset '%s'" -msgstr "不能取消設定 '%s'" +msgid "" +"invalid argument %s for 'git bisect terms'.\n" +"Supported options are: --term-good|--term-old and --term-bad|--term-new." +msgstr "" +"指令 'git bisect terms' 的參數 %s 無效。\n" +"支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。" -#: config.c:3509 -#, c-format -msgid "invalid section name: %s" -msgstr "無效的小節名稱：%s" +#: builtin/bisect--helper.c +msgid "revision walk setup failed\n" +msgstr "版本遍歷設定失敗\n" -#: config.c:3676 +#: builtin/bisect--helper.c #, c-format -msgid "missing value for '%s'" -msgstr "%s 的取值缺少" - -#: connect.c:61 -msgid "the remote end hung up upon initial contact" -msgstr "遠端在初始連線時即掛斷" +msgid "could not open '%s' for appending" +msgstr "無法開啟 '%s' 進行附加" -#: connect.c:63 -msgid "" -"Could not read from remote repository.\n" -"\n" -"Please make sure you have the correct access rights\n" -"and the repository exists." -msgstr "" -"無法讀取遠端版本庫。\n" -"\n" -"請確認您有正確的存取權限並且版本庫存在。" +#: builtin/bisect--helper.c +msgid "'' is not a valid term" +msgstr "'' 不是一個有效的術語" -#: connect.c:81 +#: builtin/bisect--helper.c #, c-format -msgid "server doesn't support '%s'" -msgstr "伺服器不支援 '%s'" +msgid "unrecognized option: '%s'" +msgstr "未識別的選項：'%s'" -#: connect.c:118 +#: builtin/bisect--helper.c #, c-format -msgid "server doesn't support feature '%s'" -msgstr "伺服器不支援特性 '%s'" +msgid "'%s' does not appear to be a valid revision" +msgstr "'%s' 看起來不是一個有效的版本" -#: connect.c:129 -msgid "expected flush after capabilities" -msgstr "在能力之後應為一個 flush 包" +#: builtin/bisect--helper.c +msgid "bad HEAD - I need a HEAD" +msgstr "壞的 HEAD - 我需要一個 HEAD" -#: connect.c:265 +#: builtin/bisect--helper.c #, c-format -msgid "ignoring capabilities after first line '%s'" -msgstr "忽略第一行 '%s' 之後的能力欄位" +msgid "checking out '%s' failed. Try 'git bisect start '." +msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。" -#: connect.c:286 -msgid "protocol error: unexpected capabilities^{}" -msgstr "協定錯誤：意外的 capabilities^{}" +#: builtin/bisect--helper.c +msgid "won't bisect on cg-seek'ed tree" +msgstr "不會在做了 cg-seek 的樹上做二分搜尋" + +#: builtin/bisect--helper.c +msgid "bad HEAD - strange symbolic ref" +msgstr "壞的 HEAD - 奇怪的符號引用" -#: connect.c:308 +#: builtin/bisect--helper.c #, c-format -msgid "protocol error: expected shallow sha-1, got '%s'" -msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'" +msgid "invalid ref: '%s'" +msgstr "無效的引用：'%s'" -#: connect.c:310 -msgid "repository on the other end cannot be shallow" -msgstr "另一端的版本庫不能是淺複製版本庫" +#: builtin/bisect--helper.c +msgid "You need to start by \"git bisect start\"\n" +msgstr "您需要執行 \"git bisect start\" 來開始\n" -#: connect.c:349 -msgid "invalid packet" -msgstr "無效封包" +# 譯者：請維持句尾空格 +#. 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 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "您想讓我為您這樣做嗎[Y/n]？ " -#: connect.c:369 -#, c-format -msgid "protocol error: unexpected '%s'" -msgstr "協定錯誤：意外的 '%s'" +#: builtin/bisect--helper.c +msgid "Please call `--bisect-state` with at least one argument" +msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數" -#: connect.c:499 +#: builtin/bisect--helper.c #, c-format -msgid "unknown object format '%s' specified by server" -msgstr "伺服器指定的「%s」物件格式無效" +msgid "'git bisect %s' can take only one argument." +msgstr "'git bisect %s' 只能有一個參數。" -#: connect.c:528 +#: builtin/bisect--helper.c #, c-format -msgid "invalid ls-refs response: %s" -msgstr "無效的 ls-refs 回應：%s" - -#: connect.c:532 -msgid "expected flush after ref listing" -msgstr "在引用列表之後應該有一個 flush 包" - -#: connect.c:535 -msgid "expected response end packet after ref listing" -msgstr "在引用列表後預期要有回應結束封包" +msgid "Bad rev input: %s" +msgstr "<修訂版> 輸入格式錯誤：%s" -#: connect.c:670 +#: builtin/bisect--helper.c #, c-format -msgid "protocol '%s' is not supported" -msgstr "不支援 '%s' 協定" +msgid "Bad rev input (not a commit): %s" +msgstr "修訂版輸入有誤（不是提交）：%s" -#: connect.c:721 -msgid "unable to set SO_KEEPALIVE on socket" -msgstr "無法為 socket 設定 SO_KEEPALIVE" +#: builtin/bisect--helper.c +msgid "We are not bisecting." +msgstr "我們沒有在二分搜尋。" -#: connect.c:761 connect.c:824 +#: builtin/bisect--helper.c #, c-format -msgid "Looking up %s ... " -msgstr "尋找 %s ... " +msgid "'%s'?? what are you talking about?" +msgstr "「%s」？？您在說什麼？" -#: connect.c:765 +#: builtin/bisect--helper.c #, c-format -msgid "unable to look up %s (port %s) (%s)" -msgstr "無法尋找 %s（埠 %s）（%s）" +msgid "cannot read file '%s' for replaying" +msgstr "無法讀取「%s」檔案來重放" -#. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:769 connect.c:840 +#: builtin/bisect--helper.c #, c-format -msgid "" -"done.\n" -"Connecting to %s (port %s) ... " -msgstr "" -"完成。\n" -"連線到 %s（埠 %s）... " +msgid "running %s\n" +msgstr "正在執行 %s\n" + +#: builtin/bisect--helper.c +msgid "bisect run failed: no command provided." +msgstr "二分搜尋執行失敗：沒有提供指令。" -#: connect.c:791 connect.c:868 +#: builtin/bisect--helper.c #, c-format -msgid "" -"unable to connect to %s:\n" -"%s" -msgstr "" -"無法連線到 %s：\n" -"%s" +msgid "unable to verify '%s' on good revision" +msgstr "無法在正確修訂版上驗證「%s」" -#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:797 connect.c:874 -msgid "done." -msgstr "完成。" +#: builtin/bisect--helper.c +#, c-format +msgid "bogus exit code %d for good revision" +msgstr "正確修訂版回傳偽造的錯誤代碼 %d" -#: connect.c:828 +#: builtin/bisect--helper.c #, c-format -msgid "unable to look up %s (%s)" -msgstr "無法尋找 %s（%s）" +msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" +msgstr "二分搜尋執行失敗：「%2$s」返回的離開碼 %1$d 小於 0 或 >= 128" -#: connect.c:834 +#: builtin/bisect--helper.c #, c-format -msgid "unknown port %s" -msgstr "未知埠 %s" +msgid "cannot open file '%s' for writing" +msgstr "無法開啟「%s」檔案進行寫入" -#: connect.c:971 connect.c:1303 +#: builtin/bisect--helper.c +msgid "bisect run cannot continue any more" +msgstr "二分搜尋不能繼續執行" + +#: builtin/bisect--helper.c #, c-format -msgid "strange hostname '%s' blocked" -msgstr "已阻止奇怪的主機名稱 '%s'" +msgid "bisect run success" +msgstr "二分搜尋執行成功" -#: connect.c:973 +#: builtin/bisect--helper.c #, c-format -msgid "strange port '%s' blocked" -msgstr "已阻止奇怪的埠號 '%s'" +msgid "bisect found first bad commit" +msgstr "二分搜尋發現到第一個有問題的提交" -#: connect.c:983 +#: builtin/bisect--helper.c #, c-format -msgid "cannot start proxy %s" -msgstr "不能啟動代理 %s" +msgid "" +"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " +"code %d" +msgstr "" +"二分搜尋執行失敗：'git bisect--helper --bisect-state %s' 以錯誤代碼 %d 離開" -#: connect.c:1054 -msgid "no path specified; see 'git help pull' for valid url syntax" -msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法" +#: builtin/bisect--helper.c +msgid "reset the bisection state" +msgstr "清除二分搜尋狀態" -#: connect.c:1194 -msgid "newline is forbidden in git:// hosts and repo paths" -msgstr "git:// 主機名稱和版本庫路徑中不能有換行" +#: builtin/bisect--helper.c +msgid "check whether bad or good terms exist" +msgstr "檢查壞的或好的術語是否存在" -#: connect.c:1251 -msgid "ssh variant 'simple' does not support -4" -msgstr "ssh 變體 'simple' 不支援 -4" +#: builtin/bisect--helper.c +msgid "print out the bisect terms" +msgstr "列印二分搜尋術語" -#: connect.c:1263 -msgid "ssh variant 'simple' does not support -6" -msgstr "ssh 變體 'simple' 不支援 -6" +#: builtin/bisect--helper.c +msgid "start the bisect session" +msgstr "啟動二分搜尋過程" -#: connect.c:1280 -msgid "ssh variant 'simple' does not support setting port" -msgstr "ssh 變體 'simple' 不支援設定埠" +#: builtin/bisect--helper.c +msgid "find the next bisection commit" +msgstr "尋找下一個二分搜尋提交" -#: connect.c:1392 -#, c-format -msgid "strange pathname '%s' blocked" -msgstr "已阻止奇怪的路徑名 '%s'" +#: builtin/bisect--helper.c +msgid "mark the state of ref (or refs)" +msgstr "標記 ref (或 refs) 的狀態" -#: connect.c:1440 -msgid "unable to fork" -msgstr "無法 fork" +#: builtin/bisect--helper.c +msgid "list the bisection steps so far" +msgstr "列出迄今的二分搜尋步驟" -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57 -msgid "Checking connectivity" -msgstr "正在檢查連通性" +#: builtin/bisect--helper.c +msgid "replay the bisection process from the given file" +msgstr "從指定檔案重放二分搜尋過程" -#: connected.c:122 -msgid "Could not run 'git rev-list'" -msgstr "不能執行 'git rev-list'" +#: builtin/bisect--helper.c +msgid "skip some commits for checkout" +msgstr "略過要簽出的部分提交" -#: connected.c:146 -msgid "failed write to rev-list" -msgstr "寫入 rev-list 失敗" +#: builtin/bisect--helper.c +msgid "visualize the bisection" +msgstr "視覺化二分搜尋過程" -#: connected.c:151 -msgid "failed to close rev-list's stdin" -msgstr "關閉 rev-list 的標準輸入失敗" +#: builtin/bisect--helper.c +msgid "use ... to automatically bisect" +msgstr "使用 ... 自動進行二分搜尋" -#: convert.c:183 -#, c-format -msgid "illegal crlf_action %d" -msgstr "非法的 crlf_action %d" +#: builtin/bisect--helper.c +msgid "no log for BISECT_WRITE" +msgstr "BISECT_WRITE 無日誌" -#: convert.c:196 -#, c-format -msgid "CRLF would be replaced by LF in %s" -msgstr "%s 中的 CRLF 將被 LF 取代" +#: builtin/bisect--helper.c +msgid "--bisect-reset requires either no argument or a commit" +msgstr "--bisect-reset 無需參數或者需要一個提交" -#: convert.c:198 -#, c-format -msgid "" -"CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory" -msgstr "" -"%s 中的 CRLF 將被 LF 取代。\n" -"在工作區中該檔案仍保持原有的換行符號" +#: builtin/bisect--helper.c +msgid "--bisect-terms requires 0 or 1 argument" +msgstr "--bisect-terms 需要 0 或 1 個參數" -#: convert.c:206 -#, c-format -msgid "LF would be replaced by CRLF in %s" -msgstr "檔案 %s 中的 LF 將被 CRLF 取代" +#: builtin/bisect--helper.c +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next 需要 0 個引數" -#: convert.c:208 -#, c-format -msgid "" -"LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory" -msgstr "" -"%s 中的 LF 將被 CRLF 取代。\n" -"在工作區中該檔案仍保持原有的換行符號" +#: builtin/bisect--helper.c +msgid "--bisect-log requires 0 arguments" +msgstr "--bisect-log 需要 0 個引數" -#: convert.c:273 -#, c-format -msgid "BOM is prohibited in '%s' if encoded as %s" -msgstr "如果使用 %2$s 編碼，禁止在 '%1$s' 中使用 BOM" +#: builtin/bisect--helper.c +msgid "no logfile given" +msgstr "未提供日誌檔案" -#: convert.c:280 -#, c-format -msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." -msgstr "檔案 '%s' 包含位元組順序標記（BOM）。請使用 UTF-%.*s 作為工作區編碼。" +#: builtin/blame.c +msgid "git blame [] [] [] [--] " +msgstr "git blame [<選項>] [<版本選項>] [<版本>] [--] <檔案>" -#: convert.c:293 -#, c-format -msgid "BOM is required in '%s' if encoded as %s" -msgstr "如果編碼為 %2$s，需要在 '%1$s' 中使用 BOM" +#: builtin/blame.c +msgid " are documented in git-rev-list(1)" +msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中" -#: convert.c:295 +#: builtin/blame.c #, c-format -msgid "" -"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" -"%sLE (depending on the byte order) as working-tree-encoding." -msgstr "" -"檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於" -"字節序）作為工作區編碼。" +msgid "expecting a color: %s" +msgstr "期望一個顏色：%s" -#: convert.c:408 convert.c:479 -#, c-format -msgid "failed to encode '%s' from %s to %s" -msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼" +#: builtin/blame.c +msgid "must end with a color" +msgstr "必須以一個顏色結尾" -#: convert.c:451 +#: builtin/blame.c #, c-format -msgid "encoding '%s' from %s to %s and back is not the same" -msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致" +msgid "cannot find revision %s to ignore" +msgstr "不能找到要忽略的版本 %s" -#: convert.c:654 -#, c-format -msgid "cannot fork to run external filter '%s'" -msgstr "不能 fork 以執行外部過濾器 '%s'" +#: builtin/blame.c +msgid "show blame entries as we find them, incrementally" +msgstr "增量式顯示發現的 blame 條目" -#: convert.c:674 -#, c-format -msgid "cannot feed the input to external filter '%s'" -msgstr "不能將輸入傳遞給外部過濾器 '%s'" +#: builtin/blame.c +msgid "do not show object names of boundary commits (Default: off)" +msgstr "不要顯示邊界提交的物件名稱（預設值: off）" -#: convert.c:681 -#, c-format -msgid "external filter '%s' failed %d" -msgstr "外部過濾器 '%s' 失敗碼 %d" +#: builtin/blame.c +msgid "do not treat root commits as boundaries (Default: off)" +msgstr "不將根提交看作邊界（預設值：off）" -#: convert.c:716 convert.c:719 -#, c-format -msgid "read from external filter '%s' failed" -msgstr "從外部過濾器 '%s' 讀取失敗" +#: builtin/blame.c +msgid "show work cost statistics" +msgstr "顯示工作量統計" -#: convert.c:722 convert.c:777 -#, c-format -msgid "external filter '%s' failed" -msgstr "外部過濾器 '%s' 失敗" +#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c +#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c +#: builtin/push.c builtin/remote.c builtin/send-pack.c +msgid "force progress reporting" +msgstr "強制顯示進度報告" -#: convert.c:826 -msgid "unexpected filter type" -msgstr "意外的過濾類型" +#: builtin/blame.c +msgid "show output score for blame entries" +msgstr "顯示判斷 blame 條目位移的得分診斷訊息" -#: convert.c:837 -msgid "path name too long for external filter" -msgstr "外部過濾器的路徑名太長" +#: builtin/blame.c +msgid "show original filename (Default: auto)" +msgstr "顯示原始檔案名稱（預設值：auto）" -#: convert.c:935 -#, c-format -msgid "" -"external filter '%s' is not available anymore although not all paths have " -"been filtered" -msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾" +#: builtin/blame.c +msgid "show original linenumber (Default: off)" +msgstr "顯示原始檔案名稱（預設值：off）" -#: convert.c:1236 -msgid "true/false are no valid working-tree-encodings" -msgstr "true/false 不是有效的工作區編碼" +#: builtin/blame.c +msgid "show in a format designed for machine consumption" +msgstr "顯示成適合機器讀取的格式" -#: convert.c:1416 convert.c:1449 -#, c-format -msgid "%s: clean filter '%s' failed" -msgstr "%s：clean 過濾器 '%s' 失敗" +#: builtin/blame.c +msgid "show porcelain format with per-line commit information" +msgstr "顯示每一列適合機器的提交說明" -#: convert.c:1492 -#, c-format -msgid "%s: smudge filter %s failed" -msgstr "%s：smudge 過濾器 %s 失敗" +#: builtin/blame.c +msgid "use the same output mode as git-annotate (Default: off)" +msgstr "使用和 git-annotate 相同的輸出模式（預設值：off）" -#: credential.c:96 -#, c-format -msgid "skipping credential lookup for key: credential.%s" -msgstr "略過鍵的憑證查詢：credential.%s" +#: builtin/blame.c +msgid "show raw timestamp (Default: off)" +msgstr "顯示原始時間戳（預設值：off）" -#: credential.c:112 -msgid "refusing to work with credential missing host field" -msgstr "拒絕使用缺少主機欄位的憑證" +#: builtin/blame.c +msgid "show long commit SHA1 (Default: off)" +msgstr "顯示較長的 SHA1 提交編號（預設值：off）" -#: credential.c:114 -msgid "refusing to work with credential missing protocol field" -msgstr "拒絕使用缺少通訊協定欄位的憑證" +#: builtin/blame.c +msgid "suppress author name and timestamp (Default: off)" +msgstr "隱藏作者名字及時間戳（預設值：off）" -#: credential.c:396 -#, c-format -msgid "url contains a newline in its %s component: %s" -msgstr "URL 的 %s 部分有換行：%s" +#: builtin/blame.c +msgid "show author email instead of name (Default: off)" +msgstr "顯示作者信箱而非名稱（預設值：off）" -#: credential.c:440 -#, c-format -msgid "url has no scheme: %s" -msgstr "URL 沒有 Scheme：%s" +#: builtin/blame.c +msgid "ignore whitespace differences" +msgstr "忽略空白差異" -#: credential.c:513 -#, c-format -msgid "credential url cannot be parsed: %s" -msgstr "無法解析憑證 URL：%s" +#: builtin/blame.c builtin/log.c +msgid "rev" +msgstr "版本" -#: date.c:139 -msgid "in the future" -msgstr "在將來" +#: builtin/blame.c +msgid "ignore when blaming" +msgstr "在執行 blame 動作時忽略 <修訂版>" -#: date.c:145 -#, c-format -msgid "% second ago" -msgid_plural "% seconds ago" -msgstr[0] "% 秒鐘前" +#: builtin/blame.c +msgid "ignore revisions from " +msgstr "忽略 <檔案> 中的修訂版" -#: date.c:152 -#, c-format -msgid "% minute ago" -msgid_plural "% minutes ago" -msgstr[0] "% 分鐘前" +#: builtin/blame.c +msgid "color redundant metadata from previous line differently" +msgstr "使用顏色間隔輸出與前一行不同的重複中介資料" -#: date.c:159 -#, c-format -msgid "% hour ago" -msgid_plural "% hours ago" -msgstr[0] "% 小時前" +#: builtin/blame.c +msgid "color lines by age" +msgstr "依據時間著色" -#: date.c:166 -#, c-format -msgid "% day ago" -msgid_plural "% days ago" -msgstr[0] "% 天前" +#: builtin/blame.c +msgid "spend extra cycles to find better match" +msgstr "循環更多次以找到更佳符合" -#: date.c:172 -#, c-format -msgid "% week ago" -msgid_plural "% weeks ago" -msgstr[0] "% 周前" +#: builtin/blame.c +msgid "use revisions from instead of calling git-rev-list" +msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list" -#: date.c:179 -#, c-format -msgid "% month ago" -msgid_plural "% months ago" -msgstr[0] "% 個月前" +#: builtin/blame.c +msgid "use 's contents as the final image" +msgstr "將 <檔案> 的內容當成是最終 image" -#: date.c:190 -#, c-format -msgid "% year" -msgid_plural "% years" -msgstr[0] "% 年" +#: builtin/blame.c +msgid "score" +msgstr "得分" -#. TRANSLATORS: "%s" is " years" -#: date.c:193 -#, c-format -msgid "%s, % month ago" -msgid_plural "%s, % months ago" -msgstr[0] "%s % 個月前" +#: builtin/blame.c +msgid "find line copies within and across files" +msgstr "找到檔案內及跨檔案的複製列" -#: date.c:198 date.c:203 -#, c-format -msgid "% year ago" -msgid_plural "% years ago" -msgstr[0] "% 年前" +#: builtin/blame.c +msgid "find line movements within and across files" +msgstr "找到檔案內及跨檔案的移動列" -#: delta-islands.c:272 -msgid "Propagating island marks" -msgstr "正在傳播資料島標記" +#: builtin/blame.c +msgid "range" +msgstr "range" -#: delta-islands.c:290 -#, c-format -msgid "bad tree object %s" -msgstr "壞的樹狀物件 %s" +#: builtin/blame.c +msgid "process only line range , or function :" +msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函數" -#: delta-islands.c:334 -#, c-format -msgid "failed to load island regex for '%s': %s" -msgstr "未能載入 '%s' 的資料島常規表示式：%s" +#: builtin/blame.c +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用" -#: delta-islands.c:390 -#, c-format -msgid "island regex from config has too many capture groups (max=%d)" -msgstr "來自 config 的資料島常規表示式有太多的擷取群組（最多 %d 個）" +#. TRANSLATORS: This string is used to tell us the +#. maximum display width for a relative timestamp in +#. "git blame" output. For C locale, "4 years, 11 +#. months ago", which takes 22 places, is the longest +#. among various forms of relative timestamps, but +#. your language may need more or fewer display +#. columns. +#. +#: builtin/blame.c +msgid "4 years, 11 months ago" +msgstr "4 年 11 個月前" -#: delta-islands.c:467 +#: builtin/blame.c #, c-format -msgid "Marked %d islands, done.\n" -msgstr "已標記 %d 個資料島，結束。\n" +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "檔案 %s 只有 %lu 行" -#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37 -#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203 -#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742 -#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45 -#: builtin/pull.c:47 builtin/pull.c:321 -#, c-format -msgid "invalid value for '%s': '%s'" -msgstr "「%s」的值無效：「%s」" +#: builtin/blame.c +msgid "Blaming lines" +msgstr "追蹤程式碼行" -#: diff-lib.c:561 -msgid "--merge-base does not work with ranges" -msgstr "--merge-base 跟範圍無法搭配運作" +#: builtin/branch.c +msgid "git branch [] [-r | -a] [--merged] [--no-merged]" +msgstr "git branch [<選項>] [-r | -a] [--merged] [--no-merged]" -#: diff-lib.c:563 -msgid "--merge-base only works with commits" -msgstr "--merge-base 只能跟提交搭配才能運作" +#: builtin/branch.c +msgid "" +"git branch [] [-f] [--recurse-submodules] []" +msgstr "git branch [<選項>] [-f] [--recurse-submodules] <分支名> [<起始點>]" -#: diff-lib.c:580 -msgid "unable to get HEAD" -msgstr "不能取得 HEAD" +#: builtin/branch.c +msgid "git branch [] [-l] [...]" +msgstr "git branch [<選項>] [-l] [<模式>...]" -#: diff-lib.c:587 -msgid "no merge base found" -msgstr "找不到合併基底" +#: builtin/branch.c +msgid "git branch [] [-r] (-d | -D) ..." +msgstr "git branch [<選項>] [-r] (-d | -D) <分支名>..." -#: diff-lib.c:589 -msgid "multiple merge bases found" -msgstr "找到多個合併基底" +#: builtin/branch.c +msgid "git branch [] (-m | -M) [] " +msgstr "git branch [<選項>] (-m | -M) [<舊分支>] <新分支>" -#: diff-no-index.c:237 -msgid "git diff --no-index [] " -msgstr "git diff --no-index [<選項>] <路徑> <路徑>" +#: builtin/branch.c +msgid "git branch [] (-c | -C) [] " +msgstr "git branch [<選項>] (-c | -C) [<老分支>] <新分支>" -#: diff-no-index.c:262 -msgid "" -"Not a git repository. Use --no-index to compare two paths outside a working " -"tree" -msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑" +#: builtin/branch.c +msgid "git branch [] [-r | -a] [--points-at]" +msgstr "git branch [<選項>] [-r | -a] [--points-at]" -# 譯者：請維持前導空格 -#: diff.c:159 -#, c-format -msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " 無法解析 dirstat 截止（cut-off）百分比 '%s'\n" +#: builtin/branch.c +msgid "git branch [] [-r | -a] [--format]" +msgstr "git branch [<選項>] [-r | -a] [--format]" -# 譯者：請維持前導空格 -#: diff.c:164 +# 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長 +#: builtin/branch.c #, c-format -msgid " Unknown dirstat parameter '%s'\n" -msgstr " 未知的 dirstat 參數 '%s'\n" - -#: diff.c:300 msgid "" -"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " -"'dimmed-zebra', 'plain'" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." msgstr "" -"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-" -"zebra'、'plain'" +"將要刪除的分支 '%s' 已經被合併到\n" +" '%s'，但未合併到 HEAD。" -#: diff.c:328 +# 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長 +#: builtin/branch.c #, c-format msgid "" -"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " -"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." msgstr "" -"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-" -"space-at-eol'、'ignore-all-space'、'allow-indentation-change'" - -#: diff.c:336 -msgid "" -"color-moved-ws: allow-indentation-change cannot be combined with other " -"whitespace modes" -msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用" +"並未刪除分支 '%s'， 雖然它已經合併到 HEAD，\n" +" 然而卻尚未被合併到分支 '%s' 。" -#: diff.c:413 +#: builtin/branch.c #, c-format -msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "設定變數 'diff.submodule' 未知的取值：'%s'" +msgid "Couldn't look up commit object for '%s'" +msgstr "無法查詢 '%s' 指向的提交物件" -#: diff.c:473 +#: builtin/branch.c #, c-format msgid "" -"Found errors in 'diff.dirstat' config variable:\n" -"%s" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -"發現設定變數 'diff.dirstat' 中的錯誤：\n" -"%s" +"分支 '%s' 沒有完全合併。\n" +"如果您確認要刪除它，執行 'git branch -D %s'。" -#: diff.c:4282 -#, c-format -msgid "external diff died, stopping at %s" -msgstr "外部 diff 離開，停止在 %s" +#: builtin/branch.c +msgid "Update of config-file failed" +msgstr "更新設定檔案失敗" -#: diff.c:4677 parse-options.c:1114 -#, c-format -msgid "options '%s', '%s', '%s', and '%s' cannot be used together" -msgstr "「%s」、「%s」、「%s」和「%s」選項不得同時使用" +#: builtin/branch.c +msgid "cannot use -a with -d" +msgstr "不能將 -a 和 -d 同時使用" -#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578 -#, c-format -msgid "options '%s', '%s', and '%s' cannot be used together" -msgstr "「%s」、「%s」和「%s」選項不得同時使用" +#: builtin/branch.c +msgid "Couldn't look up commit object for HEAD" +msgstr "無法查詢 HEAD 指向的提交物件" -#: diff.c:4685 +#: builtin/branch.c #, c-format -msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" -msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」" +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "無法刪除在「%2$s」簽出的「%1$s」分支" -#: diff.c:4689 +#: builtin/branch.c #, c-format -msgid "" -"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" -msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%s」" - -#: diff.c:4769 -msgid "--follow requires exactly one pathspec" -msgstr "--follow 明確要求只跟一個路徑規格" +msgid "remote-tracking branch '%s' not found." +msgstr "未能找到遠端追蹤分支 '%s'。" -#: diff.c:4823 +#: builtin/branch.c #, c-format -msgid "invalid --stat value: %s" -msgstr "無效的 --stat 值：%s" +msgid "branch '%s' not found." +msgstr "分支 '%s' 未發現。" -#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319 -#: parse-options.c:217 parse-options.c:221 +#: builtin/branch.c #, c-format -msgid "%s expects a numerical value" -msgstr "%s 期望一個數字值" +msgid "Deleted remote-tracking branch %s (was %s).\n" +msgstr "已刪除遠端追蹤分支 %s（曾為 %s）。\n" -#: diff.c:4860 +#: builtin/branch.c #, c-format -msgid "" -"Failed to parse --dirstat/-X option parameter:\n" -"%s" -msgstr "" -"無法解析 --dirstat/-X 選項的參數：\n" -"%s" +msgid "Deleted branch %s (was %s).\n" +msgstr "已刪除分支 %s（曾為 %s）。\n" -#: diff.c:4893 -#, c-format -msgid "unknown change class '%c' in --diff-filter=%s" -msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'" +#: builtin/branch.c builtin/tag.c +msgid "unable to parse format string" +msgstr "不能解析格式化字串" -#: diff.c:4917 -#, c-format -msgid "unknown value after ws-error-highlight=%.*s" -msgstr "ws-error-highlight=%.*s 之後未知的值" +#: builtin/branch.c +msgid "could not resolve HEAD" +msgstr "不能解析 HEAD 提交" -#: diff.c:4931 +#: builtin/branch.c #, c-format -msgid "unable to resolve '%s'" -msgstr "不能解析 '%s'" +msgid "HEAD (%s) points outside of refs/heads/" +msgstr "HEAD (%s) 指向 refs/heads/ 之外" -#: diff.c:4981 diff.c:4987 +#: builtin/branch.c #, c-format -msgid "%s expects / form" -msgstr "%s 期望 / 格式" +msgid "Branch %s is being rebased at %s" +msgstr "分支 %s 正被重定基底到 %s" -#: diff.c:4999 +#: builtin/branch.c #, c-format -msgid "%s expects a character, got '%s'" -msgstr "%s 期望一個字元，得到 '%s'" +msgid "Branch %s is being bisected at %s" +msgstr "分支 %s 正被二分搜尋於 %s" -#: diff.c:5020 -#, c-format -msgid "bad --color-moved argument: %s" -msgstr "壞的 --color-moved 參數：%s" +#: builtin/branch.c +msgid "cannot copy the current branch while not on any." +msgstr "無法複製目前分支因為不處於任何分支上。" + +#: builtin/branch.c +msgid "cannot rename the current branch while not on any." +msgstr "無法重新命名目前分支因為不處於任何分支上。" -#: diff.c:5039 +#: builtin/branch.c #, c-format -msgid "invalid mode '%s' in --color-moved-ws" -msgstr "--color-moved-ws 中的無效模式 '%s'" +msgid "Invalid branch name: '%s'" +msgstr "無效的分支名：'%s'" -#: diff.c:5079 -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" +#: builtin/branch.c +msgid "Branch rename failed" +msgstr "分支重新命名失敗" -#: diff.c:5115 diff.c:5135 -#, c-format -msgid "invalid argument to %s" -msgstr "%s 的參數無效" +#: builtin/branch.c +msgid "Branch copy failed" +msgstr "分支複製失敗" -#: diff.c:5239 +#: builtin/branch.c #, c-format -msgid "invalid regex given to -I: '%s'" -msgstr "傳入 -I 的常規表示式無效：「%s」" +msgid "Created a copy of a misnamed branch '%s'" +msgstr "已為錯誤命名的分支 '%s' 建立了一個副本" -#: diff.c:5288 +#: builtin/branch.c #, c-format -msgid "failed to parse --submodule option parameter: '%s'" -msgstr "無法解析 --submodule 選項的參數：'%s'" +msgid "Renamed a misnamed branch '%s' away" +msgstr "已將錯誤命名的分支 '%s' 重新命名" -#: diff.c:5344 +#: builtin/branch.c #, c-format -msgid "bad --word-diff argument: %s" -msgstr "壞的 --word-diff 參數：%s" - -#: diff.c:5380 -msgid "Diff output format options" -msgstr "差異輸出格式化選項" +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "分支重新命名為 %s，但 HEAD 沒有更新！" -#: diff.c:5382 diff.c:5388 -msgid "generate patch" -msgstr "生成修補檔" +#: builtin/branch.c +msgid "Branch is renamed, but update of config-file failed" +msgstr "分支被重新命名，但更新設定檔案失敗" -#: diff.c:5385 builtin/log.c:180 -msgid "suppress diff output" -msgstr "不顯示差異輸出" +#: builtin/branch.c +msgid "Branch is copied, but update of config-file failed" +msgstr "分支已複製，但更新設定檔案失敗" -#: diff.c:5390 diff.c:5504 diff.c:5511 -msgid "" -msgstr "" +#: builtin/branch.c +#, c-format +msgid "" +"Please edit the description for the branch\n" +" %s\n" +"Lines starting with '%c' will be stripped.\n" +msgstr "" +"請編輯分支的描述\n" +" %s\n" +"以 '%c' 開頭的行將被過濾。\n" -#: diff.c:5391 diff.c:5394 -msgid "generate diffs with lines context" -msgstr "生成含 行上下文的差異" +#: builtin/branch.c +msgid "Generic options" +msgstr "通用選項" -#: diff.c:5396 -msgid "generate the diff in raw format" -msgstr "生成原始格式的差異" +#: builtin/branch.c +msgid "show hash and subject, give twice for upstream branch" +msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支" -#: diff.c:5399 -msgid "synonym for '-p --raw'" -msgstr "和 '-p --raw' 同義" +#: builtin/branch.c +msgid "suppress informational messages" +msgstr "不顯示訊息" -#: diff.c:5403 -msgid "synonym for '-p --stat'" -msgstr "和 '-p --stat' 同義" +#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c +msgid "set branch tracking configuration" +msgstr "設定分支追蹤設定" -#: diff.c:5407 -msgid "machine friendly --stat" -msgstr "機器友好的 --stat" +#: builtin/branch.c +msgid "do not use" +msgstr "不要使用" -#: diff.c:5410 -msgid "output only the last line of --stat" -msgstr "只輸出 --stat 的最後一行" +#: builtin/branch.c +msgid "upstream" +msgstr "上游" -#: diff.c:5412 diff.c:5420 -msgid "..." -msgstr "<參數1,參數2>..." - -#: diff.c:5413 -msgid "" -"output the distribution of relative amount of changes for each sub-directory" -msgstr "輸出每個子目錄相對變更的分布" - -#: diff.c:5417 -msgid "synonym for --dirstat=cumulative" -msgstr "和 --dirstat=cumulative 同義" - -#: diff.c:5421 -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "是 --dirstat=files,param1,param2... 的同義詞" - -#: diff.c:5425 -msgid "warn if changes introduce conflict markers or whitespace errors" -msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告" +#: builtin/branch.c +msgid "change the upstream info" +msgstr "改變上游訊息" -#: diff.c:5428 -msgid "condensed summary such as creations, renames and mode changes" -msgstr "精簡摘要，例如建立、重新命名和模式變更" +#: builtin/branch.c +msgid "unset the upstream info" +msgstr "取消上游資訊設定" -#: diff.c:5431 -msgid "show only names of changed files" -msgstr "只顯示變更檔案的檔案名" +#: builtin/branch.c +msgid "use colored output" +msgstr "使用彩色輸出" -#: diff.c:5434 -msgid "show only names and status of changed files" -msgstr "只顯示變更檔案的檔案名和狀態" +#: builtin/branch.c +msgid "act on remote-tracking branches" +msgstr "作用於遠端追蹤分支" -#: diff.c:5436 -msgid "[,[,]]" -msgstr "<寬度>[,<檔案名寬度>[,<次數>]]" +#: builtin/branch.c +msgid "print only branches that contain the commit" +msgstr "只列印包含該提交的分支" -#: diff.c:5437 -msgid "generate diffstat" -msgstr "生成差異統計（diffstat）" +#: builtin/branch.c +msgid "print only branches that don't contain the commit" +msgstr "只列印不包含該提交的分支" -#: diff.c:5439 diff.c:5442 diff.c:5445 -msgid "" -msgstr "<寬度>" +#: builtin/branch.c +msgid "Specific git-branch actions:" +msgstr "具體的 git-branch 動作：" -#: diff.c:5440 -msgid "generate diffstat with a given width" -msgstr "使用提供的長度生成差異統計" +#: builtin/branch.c +msgid "list both remote-tracking and local branches" +msgstr "列出遠端追蹤及本機分支" -#: diff.c:5443 -msgid "generate diffstat with a given name width" -msgstr "使用提供的檔案名長度生成差異統計" +#: builtin/branch.c +msgid "delete fully merged branch" +msgstr "刪除完全合併的分支" -#: diff.c:5446 -msgid "generate diffstat with a given graph width" -msgstr "使用提供的圖形長度生成差異統計" +#: builtin/branch.c +msgid "delete branch (even if not merged)" +msgstr "刪除分支（即使沒有合併）" -#: diff.c:5448 -msgid "" -msgstr "<次數>" +#: builtin/branch.c +msgid "move/rename a branch and its reflog" +msgstr "移動/重新命名一個分支，以及它的引用日誌" -#: diff.c:5449 -msgid "generate diffstat with limited lines" -msgstr "生成有限行數的差異統計" +#: builtin/branch.c +msgid "move/rename a branch, even if target exists" +msgstr "移動/重新命名一個分支，即使目標已存在" -#: diff.c:5452 -msgid "generate compact summary in diffstat" -msgstr "生成差異統計的簡潔摘要" +#: builtin/branch.c +msgid "copy a branch and its reflog" +msgstr "複製分支及其引用日誌" -#: diff.c:5455 -msgid "output a binary diff that can be applied" -msgstr "輸出一個可以套用的二進位差異" +#: builtin/branch.c +msgid "copy a branch, even if target exists" +msgstr "複製一個分支，即使目標已存在" -#: diff.c:5458 -msgid "show full pre- and post-image object names on the \"index\" lines" -msgstr "在 \"index\" 行顯示完整的前後物件名稱" +#: builtin/branch.c +msgid "list branch names" +msgstr "列出分支名" -#: diff.c:5460 -msgid "show colored diff" -msgstr "顯示帶顏色的差異" +#: builtin/branch.c +msgid "show current branch name" +msgstr "顯示目前分支名" -#: diff.c:5461 -msgid "" -msgstr "<類型>" +#: builtin/branch.c builtin/submodule--helper.c +msgid "create the branch's reflog" +msgstr "建立分支的引用日誌" -#: diff.c:5462 -msgid "" -"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " -"diff" -msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元" +#: builtin/branch.c +msgid "edit the description for the branch" +msgstr "標記分支的描述" -#: diff.c:5465 -msgid "" -"do not munge pathnames and use NULs as output field terminators in --raw or " -"--numstat" -msgstr "" -"在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔" -"符" +#: builtin/branch.c +msgid "force creation, move/rename, deletion" +msgstr "強制建立、移動/重新命名、刪除" -#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583 -msgid "" -msgstr "<前綴>" +#: builtin/branch.c +msgid "print only branches that are merged" +msgstr "只列印已經合併的分支" -#: diff.c:5469 -msgid "show the given source prefix instead of \"a/\"" -msgstr "顯示提供的來源前綴，而非 \"a/\"" +#: builtin/branch.c +msgid "print only branches that are not merged" +msgstr "只列印尚未合併的分支" -#: diff.c:5472 -msgid "show the given destination prefix instead of \"b/\"" -msgstr "顯示提供的目的地前綴取代 \"b/\"" +#: builtin/branch.c +msgid "list branches in columns" +msgstr "以列的方式顯示分支" -#: diff.c:5475 -msgid "prepend an additional prefix to every line of output" -msgstr "輸出的每一行附加前綴" +#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c +msgid "object" +msgstr "物件" -#: diff.c:5478 -msgid "do not show any source or destination prefix" -msgstr "不顯示任何來源和目的地前綴" +#: builtin/branch.c +msgid "print only branches of the object" +msgstr "只列印指向該物件的分支" -#: diff.c:5481 -msgid "show context between diff hunks up to the specified number of lines" -msgstr "顯示指定行數的差異區塊間的上下文" +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c +msgid "sorting and filtering are case insensitive" +msgstr "排序和過濾屬於大小寫不敏感" -#: diff.c:5485 diff.c:5490 diff.c:5495 -msgid "" -msgstr "<字元>" +#: builtin/branch.c builtin/ls-files.c +msgid "recurse through submodules" +msgstr "在子模組中遞迴" -#: diff.c:5486 -msgid "specify the character to indicate a new line instead of '+'" -msgstr "指定一個字元取代 '+' 來表示新的一行" +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c +#: builtin/verify-tag.c +msgid "format to use for the output" +msgstr "輸出格式" -#: diff.c:5491 -msgid "specify the character to indicate an old line instead of '-'" -msgstr "指定一個字元取代 '-' 來表示舊的一行" +#: builtin/branch.c builtin/submodule--helper.c submodule.c +msgid "Failed to resolve HEAD as a valid ref." +msgstr "無法將 HEAD 解析為有效引用。" -#: diff.c:5496 -msgid "specify the character to indicate a context instead of ' '" -msgstr "指定一個字元取代 ' ' 來表示一行上下文" +#: builtin/branch.c builtin/clone.c +msgid "HEAD not found below refs/heads!" +msgstr "HEAD 沒有位於 /refs/heads 之下！" -#: diff.c:5499 -msgid "Diff rename options" -msgstr "差異重新命名選項" +#: builtin/branch.c +msgid "" +"branch with --recurse-submodules can only be used if submodule." +"propagateBranches is enabled" +msgstr "" +"有 --recurse-submodules 的分支只能在啟用 submodule.propagateBranches 時使用" -#: diff.c:5500 -msgid "[/]" -msgstr "[/]" +#: builtin/branch.c +msgid "--recurse-submodules can only be used to create branches" +msgstr "--recurse-submodules 只能用來建立分支" -#: diff.c:5501 -msgid "break complete rewrite changes into pairs of delete and create" -msgstr "將完全重寫的變更打破為成對的刪除和建立" +#: builtin/branch.c +msgid "branch name required" +msgstr "必須提供分支名" -#: diff.c:5505 -msgid "detect renames" -msgstr "檢測重新命名" +#: builtin/branch.c +msgid "Cannot give description to detached HEAD" +msgstr "不能向分離開頭指標提供描述" -#: diff.c:5509 -msgid "omit the preimage for deletes" -msgstr "省略刪除變更的差異輸出" +#: builtin/branch.c +msgid "cannot edit description of more than one branch" +msgstr "不能為一個以上的分支編輯描述" -#: diff.c:5512 -msgid "detect copies" -msgstr "檢測複製" +#: builtin/branch.c +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "分支 '%s' 尚無提交。" -#: diff.c:5516 -msgid "use unmodified files as source to find copies" -msgstr "使用未修改的檔案做為發現拷貝的來源" +#: builtin/branch.c +#, c-format +msgid "No branch named '%s'." +msgstr "沒有分支 '%s'。" -#: diff.c:5518 -msgid "disable rename detection" -msgstr "停用重新命名偵測" +#: builtin/branch.c +msgid "too many branches for a copy operation" +msgstr "為複製動作提供了太多的分支名" -#: diff.c:5521 -msgid "use empty blobs as rename source" -msgstr "使用空的資料物件做為重新命名的來源" +#: builtin/branch.c +msgid "too many arguments for a rename operation" +msgstr "為重新命名動作提供了太多的參數" -#: diff.c:5523 -msgid "continue listing the history of a file beyond renames" -msgstr "繼續列出檔案重新命名以外的歷史記錄" +#: builtin/branch.c +msgid "too many arguments to set new upstream" +msgstr "為設定新上游提供了太多的參數" -#: diff.c:5526 +#: builtin/branch.c +#, c-format msgid "" -"prevent rename/copy detection if the number of rename/copy targets exceeds " -"given limit" -msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測" - -#: diff.c:5528 -msgid "Diff algorithm options" -msgstr "差異演算法選項" - -#: diff.c:5530 -msgid "produce the smallest possible diff" -msgstr "生成儘可能小的差異" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "無法設定 HEAD 的上游為 %s，因為 HEAD 沒有指向任何分支。" -#: diff.c:5533 -msgid "ignore whitespace when comparing lines" -msgstr "行比較時忽略空白字元" +#: builtin/branch.c +#, c-format +msgid "no such branch '%s'" +msgstr "沒有此分支 '%s'" -#: diff.c:5536 -msgid "ignore changes in amount of whitespace" -msgstr "忽略空白字元的變更" +#: builtin/branch.c +#, c-format +msgid "branch '%s' does not exist" +msgstr "分支 '%s' 不存在" -#: diff.c:5539 -msgid "ignore changes in whitespace at EOL" -msgstr "忽略行尾的空白字元變更" +#: builtin/branch.c +msgid "too many arguments to unset upstream" +msgstr "為取消上游設定動作提供了太多的參數" -#: diff.c:5542 -msgid "ignore carrier-return at the end of line" -msgstr "忽略行尾的Enter符（CR）" +#: builtin/branch.c +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。" -#: diff.c:5545 -msgid "ignore changes whose lines are all blank" -msgstr "忽略整行都是空白的變更" +#: builtin/branch.c +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "分支 '%s' 沒有上游訊息" -#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617 -msgid "" -msgstr "<正則>" +#: builtin/branch.c +msgid "" +"The -a, and -r, options to 'git branch' do not take a branch name.\n" +"Did you mean to use: -a|-r --list ?" +msgstr "" +"'git branch' 的 -a 和 -r 選項不帶一個分支名。\n" +"您是否想要使用：-a|-r --list <模式>？" -#: diff.c:5548 -msgid "ignore changes whose all lines match " -msgstr "忽略整行符合 的變更" +#: builtin/branch.c +msgid "" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." +msgstr "" +"不再支援選項 '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。" -#: diff.c:5551 -msgid "heuristic to shift diff hunk boundaries for easy reading" -msgstr "啟發式轉換差異邊界以便閱讀" +#: builtin/bugreport.c +msgid "git version:\n" +msgstr "git 版本：\n" -#: diff.c:5554 -msgid "generate diff using the \"patience diff\" algorithm" -msgstr "使用 \"patience diff\" 演算法生成差異" +#: builtin/bugreport.c +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() 失敗，錯誤：「%s」(%d)\n" -#: diff.c:5558 -msgid "generate diff using the \"histogram diff\" algorithm" -msgstr "使用 \"histogram diff\" 演算法生成差異" +#: builtin/bugreport.c +msgid "compiler info: " +msgstr "編譯器資訊： " -#: diff.c:5560 -msgid "" -msgstr "<演算法>" +#: builtin/bugreport.c +msgid "libc info: " +msgstr "libc 資訊： " -#: diff.c:5561 -msgid "choose a diff algorithm" -msgstr "選擇一個差異演算法" +#: builtin/bugreport.c +msgid "not run from a git repository - no hooks to show\n" +msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n" -#: diff.c:5563 -msgid "" -msgstr "<文字>" +#: builtin/bugreport.c +msgid "git bugreport [-o|--output-directory ] [-s|--suffix ]" +msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格式>]" -#: diff.c:5564 -msgid "generate diff using the \"anchored diff\" algorithm" -msgstr "使用 \"anchored diff\" 演算法生成差異" +#: builtin/bugreport.c +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" -#: diff.c:5566 diff.c:5575 diff.c:5578 -msgid "" -msgstr "<模式>" +#: builtin/bugreport.c +msgid "specify a destination for the bugreport file" +msgstr "請指定 bugreport 檔案的目的地" -#: diff.c:5567 -msgid "show word diff, using to delimit changed words" -msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞" +#: builtin/bugreport.c +msgid "specify a strftime format suffix for the filename" +msgstr "請指定檔案名稱的 strftime 格式後綴" -#: diff.c:5570 -msgid "use to decide what a word is" -msgstr "使用 <常規表示式> 確定何為一個詞" +#: builtin/bugreport.c +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "無法建立 '%s' 的前置目錄" -#: diff.c:5573 -msgid "equivalent to --word-diff=color --word-diff-regex=" -msgstr "相當於 --word-diff=color --word-diff-regex=<正則>" +#: builtin/bugreport.c +msgid "System Info" +msgstr "系統資訊" -#: diff.c:5576 -msgid "moved lines of code are colored differently" -msgstr "移動的程式碼行用不同方式著色" +#: builtin/bugreport.c +msgid "Enabled Hooks" +msgstr "啟用的掛鉤" -#: diff.c:5579 -msgid "how white spaces are ignored in --color-moved" -msgstr "在 --color-moved 下如何忽略空白字元" +#: builtin/bugreport.c +#, c-format +msgid "unable to write to %s" +msgstr "無法寫入 %s" -#: diff.c:5582 -msgid "Other diff options" -msgstr "其它差異選項" +#: builtin/bugreport.c +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "已在「%s」建立新報告。\n" -#: diff.c:5584 -msgid "when run from subdir, exclude changes outside and show relative paths" -msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑" +#: builtin/bundle.c +msgid "git bundle create [] " +msgstr "git bundle create [<選項>] <檔案> " -#: diff.c:5588 -msgid "treat all files as text" -msgstr "把所有檔案當做文字處理" +#: builtin/bundle.c +msgid "git bundle verify [] " +msgstr "git bundle verify [<選項>] <檔案>" -#: diff.c:5590 -msgid "swap two inputs, reverse the diff" -msgstr "交換兩個輸入，反轉差異" +#: builtin/bundle.c +msgid "git bundle list-heads [...]" +msgstr "git bundle list-heads <檔案> [<引用名稱>...]" -#: diff.c:5592 -msgid "exit with 1 if there were differences, 0 otherwise" -msgstr "有差異時離開碼為 1，否則為 0" +#: builtin/bundle.c +msgid "git bundle unbundle [...]" +msgstr "git bundle unbundle <檔案> [<引用名稱>...]" -#: diff.c:5594 -msgid "disable all output of the program" -msgstr "停用本程式的所有輸出" +#: builtin/bundle.c builtin/pack-objects.c +msgid "do not show progress meter" +msgstr "不顯示進度表" -#: diff.c:5596 -msgid "allow an external diff helper to be executed" -msgstr "允許執行一個外部的差異協助工具" +#: builtin/bundle.c builtin/pack-objects.c +msgid "show progress meter" +msgstr "顯示進度表" -#: diff.c:5598 -msgid "run external text conversion filters when comparing binary files" -msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器" +#: builtin/bundle.c builtin/pack-objects.c +msgid "show progress meter during object writing phase" +msgstr "在物件寫入階段顯示進度表" -#: diff.c:5600 -msgid "" -msgstr "<何時>" +#: builtin/bundle.c builtin/pack-objects.c +msgid "similar to --all-progress when progress meter is shown" +msgstr "當進度表顯示時類似於 --all-progress" -#: diff.c:5601 -msgid "ignore changes to submodules in the diff generation" -msgstr "在生成差異時，忽略子模組的更改" +#: builtin/bundle.c +msgid "specify bundle format version" +msgstr "指定套件的格式版本" -#: diff.c:5604 -msgid "" -msgstr "<格式>" +#: builtin/bundle.c +msgid "Need a repository to create a bundle." +msgstr "需要版本庫來建立套件。" -#: diff.c:5605 -msgid "specify how differences in submodules are shown" -msgstr "指定子模組的差異如何顯示" +#: builtin/bundle.c +msgid "do not show bundle details" +msgstr "不顯示套件詳細資訊" -#: diff.c:5609 -msgid "hide 'git add -N' entries from the index" -msgstr "隱藏索引中 'git add -N' 條目" +#: builtin/bundle.c +#, c-format +msgid "%s is okay\n" +msgstr "%s 可以\n" -#: diff.c:5612 -msgid "treat 'git add -N' entries as real in the index" -msgstr "將索引中 'git add -N' 條目當做真實的" +#: builtin/bundle.c +msgid "Need a repository to unbundle." +msgstr "需要版本庫才能拆分套件。" -#: diff.c:5614 -msgid "" -msgstr "<字串>" +#: builtin/bundle.c +msgid "Unbundling objects" +msgstr "正在解包物件" -#: diff.c:5615 -msgid "" -"look for differences that change the number of occurrences of the specified " -"string" -msgstr "尋找改變了指定字串出現次數的差異" +#: builtin/bundle.c builtin/remote.c +#, c-format +msgid "Unknown subcommand: %s" +msgstr "未知子指令：%s" -#: diff.c:5618 -msgid "" -"look for differences that change the number of occurrences of the specified " -"regex" -msgstr "尋找改變指定正則符合出現次數的差異" +#: builtin/cat-file.c merge-recursive.c +#, c-format +msgid "cannot read object %s '%s'" +msgstr "不能讀取物件 %s '%s'" -#: diff.c:5621 -msgid "show all changes in the changeset with -S or -G" -msgstr "顯示使用 -S 或 -G 的變更集的所有變更" +#: builtin/cat-file.c +msgid "flush is only for --buffer mode" +msgstr "排清功能只能用於 --buffer 模式" -#: diff.c:5624 -msgid "treat in -S as extended POSIX regular expression" -msgstr "將 -S 的 當做延伸 POSIX 常規表示式" +#: builtin/cat-file.c +msgid "empty command in input" +msgstr "輸入中沒有命令" -#: diff.c:5627 -msgid "control the order in which files appear in the output" -msgstr "控制輸出中的檔案顯示順序" +#: builtin/cat-file.c +#, c-format +msgid "whitespace before command: '%s'" +msgstr "命令前空格：「%s」" -#: diff.c:5628 diff.c:5631 -msgid "" -msgstr "<路徑>" +#: builtin/cat-file.c +#, c-format +msgid "%s requires arguments" +msgstr "%s 需要引數" -#: diff.c:5629 -msgid "show the change in the specified path first" -msgstr "先顯示指定路徑的變更" +#: builtin/cat-file.c +#, c-format +msgid "%s takes no arguments" +msgstr "%s 不取引數" -#: diff.c:5632 -msgid "skip the output to the specified path" -msgstr "略過輸出至指定路徑" +#: builtin/cat-file.c +#, c-format +msgid "unknown command: '%s'" +msgstr "未知命令：「%s」" -#: diff.c:5634 -msgid "" -msgstr "<物件 ID>" +#: builtin/cat-file.c +msgid "only one batch option may be specified" +msgstr "只能指定一個批次處理選項" -#: diff.c:5635 -msgid "" -"look for differences that change the number of occurrences of the specified " -"object" -msgstr "尋找改變指定物件出現次數的差異" +#: builtin/cat-file.c +msgid "git cat-file " +msgstr "git cat-file " -#: diff.c:5637 -msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" -msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" +#: builtin/cat-file.c +msgid "git cat-file (-e | -p) " +msgstr "git cat-file (-e | -p) " -#: diff.c:5638 -msgid "select files by diff type" -msgstr "透過差異類型選擇檔案" +#: builtin/cat-file.c +msgid "git cat-file (-t | -s) [--allow-unknown-type] " +msgstr "git cat-file (-t | -s) [--allow-unknown-type] " -#: diff.c:5640 -msgid "" -msgstr "<檔案>" +#: builtin/cat-file.c +msgid "" +"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" +"objects]\n" +" [--buffer] [--follow-symlinks] [--unordered]\n" +" [--textconv | --filters]" +msgstr "" +"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" +"objects]\n" +" [--buffer] [--follow-symlinks] [--unordered]\n" +" [--textconv | --filters]" -#: diff.c:5641 -msgid "output to a specific file" -msgstr "輸出至指定檔案" +#: builtin/cat-file.c +msgid "" +"git cat-file (--textconv | --filters)\n" +" [: | --path= ]" +msgstr "" +"git cat-file (--textconv | --filters)\n" +" [: | --path= ]" -#: diff.c:6321 -msgid "exhaustive rename detection was skipped due to too many files." -msgstr "因為檔案太多，已略過詳細重新命名偵測。" +#: builtin/cat-file.c +msgid "Check object existence or emit object contents" +msgstr "檢查物件的存在狀態，或輸出物件內容" -#: diff.c:6324 -msgid "only found copies from modified paths due to too many files." -msgstr "因為檔案太多，只在修改的路徑中尋找複製。" +#: builtin/cat-file.c +msgid "check if exists" +msgstr "檢查 是否存在" -#: diff.c:6327 -#, c-format -msgid "" -"you may want to set your %s variable to at least %d and retry the command." -msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。" +#: builtin/cat-file.c +msgid "pretty-print content" +msgstr "美化輸出 的內容" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "讀取排序檔案 '%s' 失敗" +#: builtin/cat-file.c +msgid "Emit [broken] object attributes" +msgstr "輸出 [損壞的] 物件屬性" -#: diffcore-rename.c:1564 -msgid "Performing inexact rename detection" -msgstr "正在進行非精確的重新命名偵測" +#: builtin/cat-file.c +msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" +msgstr "顯示物件類型（可以是 “blob”、“tree”、“commit”、“tag” 等其中一個）" -#: diffcore-rotate.c:29 -#, c-format -msgid "No such path '%s' in the diff" -msgstr "diff 中沒有「%s」路徑" +#: builtin/cat-file.c +msgid "show object size" +msgstr "顯示物件大小" -#: dir.c:593 -#, c-format -msgid "pathspec '%s' did not match any file(s) known to git" -msgstr "路徑規格 '%s' 未符合任何 git 已知檔案" +#: builtin/cat-file.c +msgid "allow -s and -t to work with broken/corrupt objects" +msgstr "允許 -s 和 -t 對損壞的物件生效" -#: dir.c:733 dir.c:762 dir.c:775 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "無法識別樣式：「%s」" +#: builtin/cat-file.c +msgid "Batch objects requested on stdin (or --batch-all-objects)" +msgstr "批次處理 stdin 上請求的物件（或 --batch-all-objects）" -#: dir.c:790 dir.c:804 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "無法識別反向模式：「%s」" +#: builtin/cat-file.c +msgid "show full or contents" +msgstr "顯示完整的 或 內容" -#: dir.c:820 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複" +#: builtin/cat-file.c +msgid "like --batch, but don't emit " +msgstr "類似 --batch 但不輸出 " -#: dir.c:828 -msgid "disabling cone pattern matching" -msgstr "停用 cone 樣式符合模式" +#: builtin/cat-file.c +msgid "read commands from stdin" +msgstr "從標準輸入讀取命令" -#: dir.c:1212 -#, c-format -msgid "cannot use %s as an exclude file" -msgstr "不能將 %s 用作排除檔案" +#: builtin/cat-file.c +msgid "with --batch[-check]: ignores stdin, batches all known objects" +msgstr "傳入 --batch[-check]：忽略標準輸入，批次處理所有已知物件" -#: dir.c:2419 -#, c-format -msgid "could not open directory '%s'" -msgstr "不能開啟目錄 '%s'" +#: builtin/cat-file.c +msgid "Change or optimize batch output" +msgstr "變更或最佳化批次處理的輸出" -#: dir.c:2721 -msgid "failed to get kernel name and information" -msgstr "無法獲得核心名稱和訊息" +#: builtin/cat-file.c +msgid "buffer --batch output" +msgstr "緩衝 --batch 的輸出" -#: dir.c:2846 -msgid "untracked cache is disabled on this system or location" -msgstr "快取未追蹤檔案在本系統或位置中被停用" +#: builtin/cat-file.c +msgid "follow in-tree symlinks" +msgstr "追蹤樹中的符號連結" + +#: builtin/cat-file.c +msgid "do not order objects before emitting them" +msgstr "不要在輸出物件前排序" -#: dir.c:3119 +#: builtin/cat-file.c msgid "" -"No directory name could be guessed.\n" -"Please specify a directory on the command line" -msgstr "" -"無法猜到目錄名。\n" -"請在指令列指定一個目錄" +"Emit object (blob or tree) with conversion or filter (stand-alone, or with " +"batch)" +msgstr "轉換或過濾後輸出物件（blob 或樹）（單獨或批次處理）" -#: dir.c:3807 -#, c-format -msgid "index file corrupt in repo %s" -msgstr "版本庫 %s 中的索引檔案損壞" +#: builtin/cat-file.c +msgid "run textconv on object's content" +msgstr "在物件內容執行 textconv" -#: dir.c:3854 dir.c:3859 -#, c-format -msgid "could not create directories for %s" -msgstr "不能為 %s 建立目錄" +#: builtin/cat-file.c +msgid "run filters on object's content" +msgstr "在物件內容執行過濾器" -#: dir.c:3888 -#, c-format -msgid "could not migrate git directory from '%s' to '%s'" -msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" +#: builtin/cat-file.c +msgid "blob|tree" +msgstr "blob|tree" + +#: builtin/cat-file.c +msgid "use a for (--textconv | --filters); Not with 'batch'" +msgstr "請在 (--textconv | --filters) 使用 ，而非 “batch”" -#: editor.c:74 +#: builtin/cat-file.c #, c-format -msgid "hint: Waiting for your editor to close the file...%c" -msgstr "提示：等待您的編輯器關閉檔案...%c" +msgid "'%s=<%s>' needs '%s' or '%s'" +msgstr "「%s=<%s>」需要「%s」或「%s」" -#: entry.c:179 -msgid "Filtering content" -msgstr "過濾內容" +#: builtin/cat-file.c +msgid "path|tree-ish" +msgstr "path|tree-ish" -#: entry.c:500 +#: builtin/cat-file.c #, c-format -msgid "could not stat file '%s'" -msgstr "不能對檔案 '%s' 呼叫 stat" +msgid "'%s' requires a batch mode" +msgstr "「%s」需要批次處理模式" -#: environment.c:147 +#: builtin/cat-file.c #, c-format -msgid "bad git namespace path \"%s\"" -msgstr "錯誤的 git 名字空間路徑 \"%s\"" +msgid "'-%c' is incompatible with batch mode" +msgstr "「-%c」與批次處理模式不相容" -#: exec-cmd.c:363 -#, c-format -msgid "too many args to run %s" -msgstr "執行 %s 的參數太多" +#: builtin/cat-file.c +msgid "batch modes take no arguments" +msgstr "批次處理模式不取引數" -#: fetch-pack.c:194 -msgid "git fetch-pack: expected shallow list" -msgstr "git fetch-pack：應為 shallow 列表" +#: builtin/cat-file.c +#, c-format +msgid " required with '%s'" +msgstr " 需要搭配「%s」" -#: fetch-pack.c:197 -msgid "git fetch-pack: expected a flush packet after shallow list" -msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包" +#: builtin/cat-file.c +#, c-format +msgid " required with '-%c'" +msgstr " 需要搭配「-%c」" -#: fetch-pack.c:208 -msgid "git fetch-pack: expected ACK/NAK, got a flush packet" -msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包" +#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c +#: builtin/receive-pack.c builtin/tag.c +msgid "too many arguments" +msgstr "太多參數" -#: fetch-pack.c:228 +#: builtin/cat-file.c #, c-format -msgid "git fetch-pack: expected ACK/NAK, got '%s'" -msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'" +msgid "only two arguments allowed in mode, not %d" +msgstr "只允許在 模式傳入兩個引數，但傳了 %d 個" -#: fetch-pack.c:239 -msgid "unable to write to remote" -msgstr "無法寫到遠端" +#: builtin/check-attr.c +msgid "git check-attr [-a | --all | ...] [--] ..." +msgstr "git check-attr [-a | --all | <屬性>...] [--] <路徑名>..." -#: fetch-pack.c:397 fetch-pack.c:1460 -#, c-format -msgid "invalid shallow line: %s" -msgstr "無效的 shallow 訊息：%s" +#: builtin/check-attr.c +msgid "git check-attr --stdin [-z] [-a | --all | ...]" +msgstr "git check-attr --stdin [-z] [-a | --all | <屬性>...]" -#: fetch-pack.c:403 fetch-pack.c:1466 -#, c-format -msgid "invalid unshallow line: %s" -msgstr "無效的 unshallow 訊息：%s" +#: builtin/check-attr.c +msgid "report all attributes set on file" +msgstr "報告設定在檔案上的所有屬性" -#: fetch-pack.c:405 fetch-pack.c:1468 -#, c-format -msgid "object not found: %s" -msgstr "物件未找到：%s" +#: builtin/check-attr.c +msgid "use .gitattributes only from the index" +msgstr "只使用索引中的 .gitattributes" -#: fetch-pack.c:408 fetch-pack.c:1471 -#, c-format -msgid "error in object: %s" -msgstr "物件中發生錯誤：%s" +#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c +msgid "read file names from stdin" +msgstr "從標準輸入讀出檔案名" -#: fetch-pack.c:410 fetch-pack.c:1473 -#, c-format -msgid "no shallow found: %s" -msgstr "未發現 shallow：%s" +#: builtin/check-attr.c builtin/check-ignore.c +msgid "terminate input and output records by a NUL character" +msgstr "輸入和輸出的紀錄使用 NUL 字元終結" -#: fetch-pack.c:413 fetch-pack.c:1477 -#, c-format -msgid "expected shallow/unshallow, got %s" -msgstr "應為 shallow/unshallow，卻得到 %s" +#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c +msgid "suppress progress reporting" +msgstr "不顯示進度報告" -#: fetch-pack.c:453 -#, c-format -msgid "got %s %d %s" -msgstr "得到 %s %d %s" +#: builtin/check-ignore.c +msgid "show non-matching input paths" +msgstr "顯示未符合的輸入路徑" -#: fetch-pack.c:470 -#, c-format -msgid "invalid commit %s" -msgstr "無效提交 %s" +#: builtin/check-ignore.c +msgid "ignore index when checking" +msgstr "檢查時忽略索引" -#: fetch-pack.c:501 -msgid "giving up" -msgstr "放棄" +#: builtin/check-ignore.c +msgid "cannot specify pathnames with --stdin" +msgstr "不能同時指定路徑及 --stdin 參數" -#: fetch-pack.c:514 progress.h:25 -msgid "done" -msgstr "完成" +#: builtin/check-ignore.c +msgid "-z only makes sense with --stdin" +msgstr "-z 需要和 --stdin 參數共用才有意義" -#: fetch-pack.c:526 -#, c-format -msgid "got %s (%d) %s" -msgstr "得到 %s (%d) %s" +#: builtin/check-ignore.c +msgid "no path specified" +msgstr "未指定路徑" -#: fetch-pack.c:562 -#, c-format -msgid "Marking %s as complete" -msgstr "標記 %s 為完成" +#: builtin/check-ignore.c +msgid "--quiet is only valid with a single pathname" +msgstr "參數 --quiet 只在提供一個路徑名時有效" -#: fetch-pack.c:784 -#, c-format -msgid "already have %s (%s)" -msgstr "已經有 %s（%s）" +#: builtin/check-ignore.c +msgid "cannot have both --quiet and --verbose" +msgstr "不能同時提供 --quiet 和 --verbose 參數" -#: fetch-pack.c:870 -msgid "fetch-pack: unable to fork off sideband demultiplexer" -msgstr "fetch-pack：無法衍生 sideband 多路輸出" +#: builtin/check-ignore.c +msgid "--non-matching is only valid with --verbose" +msgstr "--non-matching 選項只在使用 --verbose 時有效" -#: fetch-pack.c:878 -msgid "protocol error: bad pack header" -msgstr "協定錯誤：壞的包頭" +#: builtin/check-mailmap.c +msgid "git check-mailmap [] ..." +msgstr "git check-mailmap [<選項>] <聯繫位址>..." + +#: builtin/check-mailmap.c +msgid "also read contacts from stdin" +msgstr "還從標準輸入讀取聯繫位址" -#: fetch-pack.c:974 +#: builtin/check-mailmap.c #, c-format -msgid "fetch-pack: unable to fork off %s" -msgstr "fetch-pack：無法 fork %s 處理程序" +msgid "unable to parse contact: %s" +msgstr "不能解析聯繫位址：%s" -#: fetch-pack.c:980 -msgid "fetch-pack: invalid index-pack output" -msgstr "fetch-pack：無效的 index-pack 輸出" +#: builtin/check-mailmap.c +msgid "no contacts specified" +msgstr "未指定聯繫位址" -#: fetch-pack.c:997 -#, c-format -msgid "%s failed" -msgstr "%s 失敗" +#: builtin/checkout--worker.c +msgid "git checkout--worker []" +msgstr "git checkout--worker [<選項>]" -#: fetch-pack.c:999 -msgid "error in sideband demultiplexer" -msgstr "sideband 多路輸出發生錯誤" +#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c +#: builtin/submodule--helper.c builtin/worktree.c +msgid "string" +msgstr "字串" -#: fetch-pack.c:1048 -#, c-format -msgid "Server version is %.*s" -msgstr "伺服器版本 %.*s" +#: builtin/checkout--worker.c builtin/checkout-index.c +msgid "when creating files, prepend " +msgstr "在建立檔案時，在前面加上 <字串>" -#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071 -#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087 -#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103 -#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125 -#, c-format -msgid "Server supports %s" -msgstr "伺服器支援 %s" +#: builtin/checkout-index.c +msgid "git checkout-index [] [--] [...]" +msgstr "git checkout-index [<選項>] [--] [<檔案>...]" -#: fetch-pack.c:1058 -msgid "Server does not support shallow clients" -msgstr "伺服器不支援 shallow 用戶端" +#: builtin/checkout-index.c +msgid "stage should be between 1 and 3 or all" +msgstr "索引值應該取值 1 到 3 或者 all" -#: fetch-pack.c:1118 -msgid "Server does not support --shallow-since" -msgstr "伺服器不支援 --shallow-since" +#: builtin/checkout-index.c +msgid "check out all files in the index" +msgstr "簽出索引區的所有檔案" -#: fetch-pack.c:1123 -msgid "Server does not support --shallow-exclude" -msgstr "伺服器不支援 --shallow-exclude" +#: builtin/checkout-index.c +msgid "do not skip files with skip-worktree set" +msgstr "設定 skip-worktree 時不略過檔案" -#: fetch-pack.c:1127 -msgid "Server does not support --deepen" -msgstr "伺服器不支援 --deepen" +#: builtin/checkout-index.c +msgid "force overwrite of existing files" +msgstr "強制覆蓋現有的檔案" -#: fetch-pack.c:1129 -msgid "Server does not support this repository's object format" -msgstr "伺服器不支援此版本庫的物件格式" +#: builtin/checkout-index.c +msgid "no warning for existing files and files not in index" +msgstr "存在或不在索引中的檔案都沒有警告" -#: fetch-pack.c:1142 -msgid "no common commits" -msgstr "沒有共同的提交" +#: builtin/checkout-index.c +msgid "don't checkout new files" +msgstr "不簽出新檔案" -#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166 -msgid "source repository is shallow, reject to clone." -msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。" +#: builtin/checkout-index.c +msgid "update stat information in the index file" +msgstr "更新索引中檔案的狀態訊息" -#: fetch-pack.c:1157 fetch-pack.c:1705 -msgid "git fetch-pack: fetch failed." -msgstr "git fetch-pack：取得失敗。" +#: builtin/checkout-index.c +msgid "read list of paths from the standard input" +msgstr "從標準輸入讀取路徑列表" -#: fetch-pack.c:1271 -#, c-format -msgid "mismatched algorithms: client %s; server %s" -msgstr "算法不一致：用戶端 %s；伺服器 %s" +#: builtin/checkout-index.c +msgid "write the content to temporary files" +msgstr "將內容寫入暫存檔" -#: fetch-pack.c:1275 -#, c-format -msgid "the server does not support algorithm '%s'" -msgstr "伺服器不支援「%s」算法" +#: builtin/checkout-index.c +msgid "copy out the files from named stage" +msgstr "從指定暫存區中拷出檔案" -#: fetch-pack.c:1308 -msgid "Server does not support shallow requests" -msgstr "伺服器不支援 shallow 請求" +#: builtin/checkout.c +msgid "git checkout [] " +msgstr "git checkout [<選項>] <分支>" -#: fetch-pack.c:1315 -msgid "Server supports filter" -msgstr "伺服器支援 filter" +#: builtin/checkout.c +msgid "git checkout [] [] -- ..." +msgstr "git checkout [<選項>] [<分支>] -- <檔案>..." -#: fetch-pack.c:1358 fetch-pack.c:2087 -msgid "unable to write request to remote" -msgstr "無法將請求寫到遠端" +#: builtin/checkout.c +msgid "git switch [] []" +msgstr "git switch [<選項>] [<分支>]" + +#: builtin/checkout.c +msgid "git restore [] [--source=] ..." +msgstr "git restore [<選項>] [--source=<分支>] <檔案>..." -#: fetch-pack.c:1376 +#: builtin/checkout.c #, c-format -msgid "error reading section header '%s'" -msgstr "讀取節標題 '%s' 發生錯誤" +msgid "path '%s' does not have our version" +msgstr "路徑 '%s' 沒有我們的版本" -#: fetch-pack.c:1382 +#: builtin/checkout.c #, c-format -msgid "expected '%s', received '%s'" -msgstr "預期 '%s'，得到 '%s'" +msgid "path '%s' does not have their version" +msgstr "路徑 '%s' 沒有他們的版本" -#: fetch-pack.c:1416 +#: builtin/checkout.c #, c-format -msgid "unexpected acknowledgment line: '%s'" -msgstr "意外的確認行：'%s'" +msgid "path '%s' does not have all necessary versions" +msgstr "路徑 '%s' 沒有全部必需的版本" -#: fetch-pack.c:1421 +#: builtin/checkout.c #, c-format -msgid "error processing acks: %d" -msgstr "處理 ack 發生錯誤：%d" +msgid "path '%s' does not have necessary versions" +msgstr "路徑 '%s' 沒有必需的版本" -#. TRANSLATORS: The parameter will be 'ready', a protocol -#. keyword. -#. -#: fetch-pack.c:1435 +#: builtin/checkout.c #, c-format -msgid "expected packfile to be sent after '%s'" -msgstr "預期在 「%s」後傳送 packfile" +msgid "path '%s': cannot merge" +msgstr "path '%s'：無法合併" -#. TRANSLATORS: The parameter will be 'ready', a protocol -#. keyword. -#. -#: fetch-pack.c:1441 +#: builtin/checkout.c #, c-format -msgid "expected no other sections to be sent after no '%s'" -msgstr "預期在沒有「%s」後不傳送其他區段" +msgid "Unable to add merge result for '%s'" +msgstr "無法為 '%s' 新增合併結果" -#: fetch-pack.c:1482 +#: builtin/checkout.c #, c-format -msgid "error processing shallow info: %d" -msgstr "處理淺複製訊息發生錯誤：%d" +msgid "Recreated %d merge conflict" +msgid_plural "Recreated %d merge conflicts" +msgstr[0] "重新建立了 %d 個合併衝突" -#: fetch-pack.c:1531 +#: builtin/checkout.c #, c-format -msgid "expected wanted-ref, got '%s'" -msgstr "預期 wanted-ref，得到 '%s'" +msgid "Updated %d path from %s" +msgid_plural "Updated %d paths from %s" +msgstr[0] "從 %2$s 更新了 %1$d 個路徑" -#: fetch-pack.c:1536 +#: builtin/checkout.c #, c-format -msgid "unexpected wanted-ref: '%s'" -msgstr "意外的 wanted-ref：'%s'" +msgid "Updated %d path from the index" +msgid_plural "Updated %d paths from the index" +msgstr[0] "從索引區更新了 %d 個路徑" -#: fetch-pack.c:1541 +#: builtin/checkout.c #, c-format -msgid "error processing wanted refs: %d" -msgstr "處理要取得的引用發生錯誤：%d" - -#: fetch-pack.c:1571 -msgid "git fetch-pack: expected response end packet" -msgstr "git fetch-pack: 預期要有回應結束封包" - -#: fetch-pack.c:1983 -msgid "no matching remote head" -msgstr "沒有符合的遠端分支" - -#: fetch-pack.c:2006 builtin/clone.c:587 -msgid "remote did not send all necessary objects" -msgstr "遠端沒有傳送所有必需的物件" - -#: fetch-pack.c:2109 -msgid "unexpected 'ready' from remote" -msgstr "從遠端收到非預期的 ‘ready’" +msgid "'%s' cannot be used with updating paths" +msgstr "'%s' 不能在更新路徑時使用" -#: fetch-pack.c:2132 +#: builtin/checkout.c #, c-format -msgid "no such remote ref %s" -msgstr "沒有這樣的遠端引用 %s" +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "不能同時更新路徑並切換到分支'%s'。" -#: fetch-pack.c:2135 +#: builtin/checkout.c #, c-format -msgid "Server does not allow request for unadvertised object %s" -msgstr "伺服器不允許請求未公開的物件 %s" +msgid "neither '%s' or '%s' is specified" +msgstr "'%s' 或 '%s' 都沒有指定" -#: fsmonitor-ipc.c:119 +#: builtin/checkout.c #, c-format -msgid "fsmonitor_ipc__send_query: invalid path '%s'" -msgstr "fsmonitor_ipc__send_query：路徑「%s」無效" +msgid "'%s' must be used when '%s' is not specified" +msgstr "未指定 '%2$s' 時，必須使用 '%1$s'" -#: fsmonitor-ipc.c:125 +#: builtin/checkout.c #, c-format -msgid "fsmonitor_ipc__send_query: unspecified error on '%s'" -msgstr "fsmonitor_ipc__send_query：「%s」上有未指定的錯誤" - -#: fsmonitor-ipc.c:155 -msgid "fsmonitor--daemon is not running" -msgstr "fsmonitor--daemon 未在運作" +msgid "'%s' or '%s' cannot be used with %s" +msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: fsmonitor-ipc.c:164 +#: builtin/checkout.c #, c-format -msgid "could not send '%s' command to fsmonitor--daemon" -msgstr "無法將「%s」命令傳送到 fsmonitor--daemon" +msgid "path '%s' is unmerged" +msgstr "路徑 '%s' 未合併" -#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995 -#: gpg-interface.c:1011 -msgid "could not create temporary file" -msgstr "不能建立暫存檔" +#: builtin/checkout.c +msgid "you need to resolve your current index first" +msgstr "您需要先解決目前索引的衝突" -#: gpg-interface.c:332 gpg-interface.c:459 +#: builtin/checkout.c #, c-format -msgid "failed writing detached signature to '%s'" -msgstr "無法將分離式簽名寫入 '%s'" - -#: gpg-interface.c:450 -msgid "" -"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " -"signature verification" -msgstr "SSH 簽名驗證需要設定 gpg.ssh.allowedSignersFile，簽名檔案也要存在" - -#: gpg-interface.c:479 msgid "" -"ssh-keygen -Y find-principals/verify is needed for ssh signature " -"verification (available in openssh version 8.2p1+)" +"cannot continue with staged changes in the following files:\n" +"%s" msgstr "" -"SSH 簽名驗證需要 ssh-keygen -Y find-principals/verify（可以在 openssh 8.2p1+ " -"版本使用）" - -#: gpg-interface.c:550 -#, c-format -msgid "ssh signing revocation file configured but not found: %s" -msgstr "有設定 SSH 簽名廢止檔案，但找不到檔案本體：%s" +"不能繼續，下列檔案有暫存的修改：\n" +"%s" -#: gpg-interface.c:638 +#: builtin/checkout.c #, c-format -msgid "bad/incompatible signature '%s'" -msgstr "簽名「%s」損壞或者不相容" +msgid "Can not do reflog for '%s': %s\n" +msgstr "不能對 '%s' 執行 reflog 動作：%s\n" -#: gpg-interface.c:815 gpg-interface.c:820 -#, c-format -msgid "failed to get the ssh fingerprint for key '%s'" -msgstr "無法取得「%s」金鑰的 SSH 指紋" +#: builtin/checkout.c +msgid "HEAD is now at" +msgstr "HEAD 目前位於" -#: gpg-interface.c:843 -msgid "" -"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" -msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一" +#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c +msgid "unable to update HEAD" +msgstr "不能更新 HEAD" -#: gpg-interface.c:865 +#: builtin/checkout.c #, c-format -msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" -msgstr "gpg.ssh.defaultKeyCommand 執行成功，但沒回傳按鍵：%s %s" +msgid "Reset branch '%s'\n" +msgstr "重設分支 '%s'\n" -#: gpg-interface.c:871 +#: builtin/checkout.c #, c-format -msgid "gpg.ssh.defaultKeyCommand failed: %s %s" -msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s" +msgid "Already on '%s'\n" +msgstr "已經位於 '%s'\n" -#: gpg-interface.c:966 -msgid "gpg failed to sign the data" -msgstr "gpg 無法為資料簽名" +#: builtin/checkout.c +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "切換並重設分支 '%s'\n" -#: gpg-interface.c:988 -msgid "user.signingkey needs to be set for ssh signing" -msgstr "需要設定 user.signingkey 才能進行 SSH 簽名" +#: builtin/checkout.c +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "切換到一個新分支 '%s'\n" -#: gpg-interface.c:999 +#: builtin/checkout.c #, c-format -msgid "failed writing ssh signing key to '%s'" -msgstr "無法將 SSH 簽名金鑰寫入「%s」" +msgid "Switched to branch '%s'\n" +msgstr "切換到分支 '%s'\n" -#: gpg-interface.c:1017 +# 譯者：請維持前導空格 +#: builtin/checkout.c #, c-format -msgid "failed writing ssh signing key buffer to '%s'" -msgstr "無法將 SSH 簽名金鑰緩衝區寫入「%s」" +msgid " ... and %d more.\n" +msgstr " ... 及其它 %d 個。\n" -#: gpg-interface.c:1035 +#: builtin/checkout.c +#, c-format msgid "" -"ssh-keygen -Y sign is needed for ssh signing (available in openssh version " -"8.2p1+)" -msgstr "SSH 簽名需要 ssh-keygen -Y sign（可以在 openssh 8.2p1+ 版本使用）" +"Warning: you are leaving %d commit behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgid_plural "" +"Warning: you are leaving %d commits behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgstr[0] "" +"警告：您正丟下 %d 個提交，未和任何分支關聯：\n" +"\n" +"%s\n" -#: gpg-interface.c:1047 +#: builtin/checkout.c #, c-format -msgid "failed reading ssh signing data buffer from '%s'" -msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區" +msgid "" +"If you want to keep it by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch %s\n" +"\n" +msgid_plural "" +"If you want to keep them by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch %s\n" +"\n" +msgstr[0] "" +"如果您想要透過建立新分支儲存它，這可能是一個好時候。\n" +"如下動作：\n" +"\n" +" git branch <新分支名> %s\n" +"\n" + +#: builtin/checkout.c +msgid "internal error in revision walk" +msgstr "在版本遍歷時遇到內部錯誤" + +#: builtin/checkout.c +msgid "Previous HEAD position was" +msgstr "之前的 HEAD 位置是" + +#: builtin/checkout.c +msgid "You are on a branch yet to be born" +msgstr "您位於一個尚未初始化的分支" -#: graph.c:98 +#: builtin/checkout.c #, c-format -msgid "ignored invalid color '%.*s' in log.graphColors" -msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩" +msgid "" +"'%s' could be both a local file and a tracking branch.\n" +"Please use -- (and optionally --no-guess) to disambiguate" +msgstr "" +"'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n" +"請使用 --（和可選的 --no-guess）來消除歧義" -#: grep.c:446 +#: builtin/checkout.c msgid "" -"given pattern contains NULL byte (via -f ). This is only supported " -"with -P under PCRE v2" +"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" +"\n" +" git checkout --track origin/\n" +"\n" +"If you'd like to always have checkouts of an ambiguous prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." msgstr "" -"提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此" -"功能" +"如果您想要簽出一個遠端追蹤分支，例如 'origin'，您可以\n" +"使用 --track 選項寫出全名：\n" +"\n" +" git checkout --track origin/\n" +"\n" +"如果您總是喜歡使用模糊的簡短分支名 ，而不喜歡如 'origin' 的遠端\n" +"版本庫名，可以在設定中設定 checkout.defaultRemote=origin。" -#: grep.c:1859 +#: builtin/checkout.c #, c-format -msgid "'%s': unable to read %s" -msgstr "'%s'：無法讀取 %s" +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "'%s' 符合多個 (%d) 遠端追蹤分支" -#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90 -#: builtin/rm.c:136 -#, c-format -msgid "failed to stat '%s'" -msgstr "對 '%s' 呼叫 stat 失敗" +#: builtin/checkout.c +msgid "only one reference expected" +msgstr "預期只有一個引用" -#: grep.c:1887 +#: builtin/checkout.c #, c-format -msgid "'%s': short read" -msgstr "'%s'：讀取不完整" +msgid "only one reference expected, %d given." +msgstr "應只有一個引用，卻提供了 %d 個。" -#: help.c:25 -msgid "start a working area (see also: git help tutorial)" -msgstr "開始一個工作區（參見：git help tutorial）" +#: builtin/checkout.c builtin/worktree.c +#, c-format +msgid "invalid reference: %s" +msgstr "無效引用：%s" -#: help.c:26 -msgid "work on the current change (see also: git help everyday)" -msgstr "在目前變更上工作（參見：git help everyday）" +#: builtin/checkout.c +#, c-format +msgid "reference is not a tree: %s" +msgstr "引用不是一個樹：%s" -#: help.c:27 -msgid "examine the history and state (see also: git help revisions)" -msgstr "檢查歷史和狀態（參見：git help revisions）" +#: builtin/checkout.c +#, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "期望一個分支，得到標籤 '%s'" -#: help.c:28 -msgid "grow, mark and tweak your common history" -msgstr "擴展、標記和調校您的歷史記錄" +#: builtin/checkout.c +#, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "期望一個分支，得到遠端分支 '%s'" -#: help.c:29 -msgid "collaborate (see also: git help workflows)" -msgstr "協同（參見：git help workflows）" +#: builtin/checkout.c +#, c-format +msgid "a branch is expected, got '%s'" +msgstr "期望一個分支，得到 '%s'" -#: help.c:33 -msgid "Main Porcelain Commands" -msgstr "主要的上層指令" +#: builtin/checkout.c +#, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "期望一個分支，得到提交 '%s'" -#: help.c:34 -msgid "Ancillary Commands / Manipulators" -msgstr "輔助指令/動作者" +#: builtin/checkout.c +msgid "" +"If you want to detach HEAD at the commit, try again with the --detach option." +msgstr "若您想要分離提交的 HEAD，請傳入 --detach 選項重試。" -#: help.c:35 -msgid "Ancillary Commands / Interrogators" -msgstr "輔助指令/詢問者" +#: builtin/checkout.c +msgid "" +"cannot switch branch while merging\n" +"Consider \"git merge --quit\" or \"git worktree add\"." +msgstr "" +"不能在合併時切換分支\n" +"考慮使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: help.c:36 -msgid "Interacting with Others" -msgstr "與其它系統互動" +#: builtin/checkout.c +msgid "" +"cannot switch branch in the middle of an am session\n" +"Consider \"git am --quit\" or \"git worktree add\"." +msgstr "" +"不能在 am 工作階段期間切換分支\n" +"考慮使用 \"git am --quit\" 或 \"git worktree add\"。" -#: help.c:37 -msgid "Low-level Commands / Manipulators" -msgstr "低級指令/動作者" +#: builtin/checkout.c +msgid "" +"cannot switch branch while rebasing\n" +"Consider \"git rebase --quit\" or \"git worktree add\"." +msgstr "" +"不能在重定基底時切換分支\n" +"考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: help.c:38 -msgid "Low-level Commands / Interrogators" -msgstr "低級指令/詢問者" +#: builtin/checkout.c +msgid "" +"cannot switch branch while cherry-picking\n" +"Consider \"git cherry-pick --quit\" or \"git worktree add\"." +msgstr "" +"不能在揀選時切換分支\n" +"考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: help.c:39 -msgid "Low-level Commands / Syncing Repositories" -msgstr "低級指令 / 同步版本庫" +#: builtin/checkout.c +msgid "" +"cannot switch branch while reverting\n" +"Consider \"git revert --quit\" or \"git worktree add\"." +msgstr "" +"不能在還原時切換分支\n" +"考慮使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: help.c:40 -msgid "Low-level Commands / Internal Helpers" -msgstr "低級指令/內部協助工具" +#: builtin/checkout.c +msgid "you are switching branch while bisecting" +msgstr "您在執行二分搜尋時切換分支" + +#: builtin/checkout.c +msgid "paths cannot be used with switching branches" +msgstr "路徑不能和切換分支同時使用" -#: help.c:316 +#: builtin/checkout.c #, c-format -msgid "available git commands in '%s'" -msgstr "在 '%s' 下可用的 git 指令" +msgid "'%s' cannot be used with switching branches" +msgstr "'%s' 不能和切換分支同時使用" -#: help.c:323 -msgid "git commands available from elsewhere on your $PATH" -msgstr "在 $PATH 路徑中的其他地方可用的 git 指令" +#: builtin/checkout.c +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "'%s' 不能和 '%s' 同時使用" -#: help.c:332 -msgid "These are common Git commands used in various situations:" -msgstr "這些是各種場合常見的 Git 指令：" +#: builtin/checkout.c +#, c-format +msgid "'%s' cannot take " +msgstr "'%s' 不帶 <起始點>" -#: help.c:382 git.c:100 +#: builtin/checkout.c #, c-format -msgid "unsupported command listing type '%s'" -msgstr "不支援的指令列表類型 '%s'" +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "不能切換分支到一個非提交 '%s'" -#: help.c:422 -msgid "The Git concept guides are:" -msgstr "Git 概念嚮導有：" +#: builtin/checkout.c +msgid "missing branch or commit argument" +msgstr "缺少分支或提交參數" -#: help.c:446 -msgid "External commands" -msgstr "外部指令" +#: builtin/checkout.c +msgid "perform a 3-way merge with the new branch" +msgstr "和新的分支執行三方合併" -#: help.c:468 -msgid "Command aliases" -msgstr "指令別名" +#: builtin/checkout.c builtin/log.c parse-options.h +msgid "style" +msgstr "風格" -#: help.c:486 -msgid "See 'git help ' to read about a specific subcommand" -msgstr "執行　'git help ' 來檢視特定子指令" +#: builtin/checkout.c +msgid "conflict style (merge, diff3, or zdiff3)" +msgstr "衝突輸出風格（merge、diff3 或 zdiff3）" -#: help.c:563 -#, c-format -msgid "" -"'%s' appears to be a git command, but we were not\n" -"able to execute it. Maybe git-%s is broken?" -msgstr "" -"'%s' 像是一個 git 指令，但卻無法執行。\n" -"可能是 git-%s 受損？" +#: builtin/checkout.c builtin/worktree.c +msgid "detach HEAD at named commit" +msgstr "HEAD 從指定的提交分離" -#: help.c:585 help.c:682 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。" +#: builtin/checkout.c +msgid "force checkout (throw away local modifications)" +msgstr "強制簽出（捨棄本機修改）" -#: help.c:633 -msgid "Uh oh. Your system reports no Git commands at all." -msgstr "唉呀，您的系統中未發現 Git 指令。" +#: builtin/checkout.c +msgid "new-branch" +msgstr "新分支" -#: help.c:655 -#, c-format -msgid "WARNING: You called a Git command named '%s', which does not exist." -msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。" +#: builtin/checkout.c +msgid "new unparented branch" +msgstr "新的沒有父提交的分支" -#: help.c:660 -#, c-format -msgid "Continuing under the assumption that you meant '%s'." -msgstr "假定你想要的是 '%s' 並繼續。" +#: builtin/checkout.c builtin/merge.c +msgid "update ignored files (default)" +msgstr "更新忽略的檔案（預設）" -#: help.c:666 -#, c-format -msgid "Run '%s' instead [y/N]? " -msgstr "改執行「%s」[y/N]？ " +#: builtin/checkout.c +msgid "do not check if another worktree is holding the given ref" +msgstr "不檢查指定的引用是否被其他工作區所占用" -#: help.c:674 -#, c-format -msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." -msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。" +#: builtin/checkout.c +msgid "checkout our version for unmerged files" +msgstr "對尚未合併的檔案簽出我們的版本" -#: help.c:686 -msgid "" -"\n" -"The most similar command is" -msgid_plural "" -"\n" -"The most similar commands are" -msgstr[0] "" -"\n" -"最類似的指令有" +#: builtin/checkout.c +msgid "checkout their version for unmerged files" +msgstr "對尚未合併的檔案簽出他們的版本" -#: help.c:729 -msgid "git version []" -msgstr "git version [<選項>]" +#: builtin/checkout.c +msgid "do not limit pathspecs to sparse entries only" +msgstr "對路徑不做稀疏簽出的限制" -#: help.c:784 +#: builtin/checkout.c #, c-format -msgid "%s: %s - %s" -msgstr "%s：%s - %s" +msgid "options '-%c', '-%c', and '%s' cannot be used together" +msgstr "「-%c」、「-%c」和「%s」選項不得同時使用" -#: help.c:788 -msgid "" -"\n" -"Did you mean this?" -msgid_plural "" -"\n" -"Did you mean one of these?" -msgstr[0] "" -"\n" -"您指的是這個嗎？" +#: builtin/checkout.c +msgid "--track needs a branch name" +msgstr "--track 需要一個分支名" -#: hook.c:28 +#: builtin/checkout.c #, c-format -msgid "" -"The '%s' hook was ignored because it's not set as executable.\n" -"You can disable this warning with `git config advice.ignoredHook false`." -msgstr "" -"因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n" -"設定 `git config advice.ignoredHook false` 來關閉這條警告。" +msgid "missing branch name; try -%c" +msgstr "缺少分支名稱，請嘗試 -%c" -#: hook.c:87 +#: builtin/checkout.c #, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "無法啟動「%s」掛鉤\n" +msgid "could not resolve %s" +msgstr "無法解析 %s" -#: ident.c:354 -msgid "Author identity unknown\n" -msgstr "作者身分未知\n" +#: builtin/checkout.c +msgid "invalid path specification" +msgstr "無效的路徑規格" -#: ident.c:357 -msgid "Committer identity unknown\n" -msgstr "提交者身分未知\n" +#: builtin/checkout.c +#, c-format +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" +msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'" + +#: builtin/checkout.c +#, c-format +msgid "git checkout: --detach does not take a path argument '%s'" +msgstr "git checkout：--detach 不能接收路徑參數 '%s'" -#: ident.c:363 +#: builtin/checkout.c msgid "" -"\n" -"*** Please tell me who you are.\n" -"\n" -"Run\n" -"\n" -" git config --global user.email \"you@example.com\"\n" -" git config --global user.name \"Your Name\"\n" -"\n" -"to set your account's default identity.\n" -"Omit --global to set the identity only in this repository.\n" -"\n" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." msgstr "" -"\n" -"*** 請告訴我你是誰。\n" -"\n" -"執行\n" -"\n" -" git config --global user.email \"you@example.com\"\n" -" git config --global user.name \"Your Name\"\n" -"\n" -"來設定您帳號的預設身份標記。\n" -"若只要在這個版本庫設定身份標記，請省略 --global 參數。\n" -"\n" +"git checkout：在從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。" -#: ident.c:398 -msgid "no email was given and auto-detection is disabled" -msgstr "未提供信件位址且自動偵測被停用" +#: builtin/checkout.c +msgid "you must specify path(s) to restore" +msgstr "您必須指定一個要復原的路徑" -#: ident.c:403 -#, c-format -msgid "unable to auto-detect email address (got '%s')" -msgstr "無法自動偵測信件位址（得到 '%s'）" +#: builtin/checkout.c builtin/clone.c builtin/remote.c +#: builtin/submodule--helper.c builtin/worktree.c +msgid "branch" +msgstr "分支" -#: ident.c:420 -msgid "no name was given and auto-detection is disabled" -msgstr "未提供姓名且自動偵測被停用" +#: builtin/checkout.c +msgid "create and checkout a new branch" +msgstr "建立並簽出一個新的分支" -#: ident.c:426 -#, c-format -msgid "unable to auto-detect name (got '%s')" -msgstr "無法自動偵測姓名（得到 '%s'）" +#: builtin/checkout.c +msgid "create/reset and checkout a branch" +msgstr "建立/重設並簽出一個分支" -#: ident.c:434 -#, c-format -msgid "empty ident name (for <%s>) not allowed" -msgstr "不允許空的姓名（對於 <%s>）" +#: builtin/checkout.c +msgid "create reflog for new branch" +msgstr "為新的分支建立引用日誌" -#: ident.c:440 -#, c-format -msgid "name consists only of disallowed characters: %s" -msgstr "姓名中僅包含停用字元：%s" +#: builtin/checkout.c +msgid "second guess 'git checkout ' (default)" +msgstr "二次猜測 'git checkout <無此分支>'（預設）" -#: ident.c:455 builtin/commit.c:649 -#, c-format -msgid "invalid date format: %s" -msgstr "無效的日期格式：%s" +#: builtin/checkout.c +msgid "use overlay mode (default)" +msgstr "使用疊加模式（預設）" -#: list-objects-filter-options.c:68 -msgid "expected 'tree:'" -msgstr "期望 'tree:<深度>'" +#: builtin/checkout.c +msgid "create and switch to a new branch" +msgstr "建立並切換一個新分支" -#: list-objects-filter-options.c:83 -msgid "sparse:path filters support has been dropped" -msgstr "sparse:path 過濾器支援已被刪除" +#: builtin/checkout.c +msgid "create/reset and switch to a branch" +msgstr "建立/重設並切換一個分支" -#: list-objects-filter-options.c:90 -#, c-format -msgid "'%s' for 'object:type=' is not a valid object type" -msgstr "“object:type=” 的 “%s” 不是有效的物件格式" +#: builtin/checkout.c +msgid "second guess 'git switch '" +msgstr "二次猜測 'git switch <無此分支>'" -#: list-objects-filter-options.c:109 -#, c-format -msgid "invalid filter-spec '%s'" -msgstr "無效的過濾器規格 '%s'" +#: builtin/checkout.c +msgid "throw away local modifications" +msgstr "捨棄本機修改" -#: list-objects-filter-options.c:125 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'" +#: builtin/checkout.c +msgid "which tree-ish to checkout from" +msgstr "要簽出哪一個樹" -#: list-objects-filter-options.c:167 -msgid "expected something after combine:" -msgstr "期望在組合後有一些東西：" +#: builtin/checkout.c +msgid "restore the index" +msgstr "復原索引" -#: list-objects-filter-options.c:249 -msgid "multiple filter-specs cannot be combined" -msgstr "不能混用多種過濾規格" +#: builtin/checkout.c +msgid "restore the working tree (default)" +msgstr "復原工作區（預設）" -#: list-objects-filter-options.c:365 -msgid "unable to upgrade repository format to support partial clone" -msgstr "無法升級版本庫格式，以致不支援部分複製" +#: builtin/checkout.c +msgid "ignore unmerged entries" +msgstr "忽略未合併條目" -#: list-objects-filter.c:532 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "不能存取 '%s' 中的稀疏資料物件" +#: builtin/checkout.c +msgid "use overlay mode" +msgstr "使用疊加模式" -#: list-objects-filter.c:535 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "無法解析 %s 中的稀疏過濾器資料" +#: builtin/clean.c +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." +msgstr "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路徑>..." -#: list-objects.c:144 +#: builtin/clean.c #, c-format -msgid "entry '%s' in tree %s has tree mode, but is not a tree" -msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀物件" +msgid "Removing %s\n" +msgstr "正刪除 %s\n" -#: list-objects.c:157 +#: builtin/clean.c #, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件" +msgid "Would remove %s\n" +msgstr "將刪除 %s\n" -#: list-objects.c:415 +#: builtin/clean.c #, c-format -msgid "unable to load root tree for commit %s" -msgstr "無法為提交 %s 載入根樹" +msgid "Skipping repository %s\n" +msgstr "忽略版本庫 %s\n" -#: lockfile.c:152 +#: builtin/clean.c #, c-format -msgid "" -"Unable to create '%s.lock': %s.\n" -"\n" -"Another git process seems to be running in this repository, e.g.\n" -"an editor opened by 'git commit'. Please make sure all processes\n" -"are terminated then try again. If it still fails, a git process\n" -"may have crashed in this repository earlier:\n" -"remove the file manually to continue." -msgstr "" -"無法建立 '%s.lock'：%s。\n" -"\n" -"這個版本庫似乎有另一個 git 處理程序在執行，\n" -"例如「git commit」命令開啟的編輯器。\n" -"請確認所有處理程序都已經終止後再重試一次。如果錯誤沒有消失，\n" -"有可能是之前在這個版本庫執行的 git 處理程序當掉了。\n" -"如果是這樣，請自行刪除這個檔案再繼續。" +msgid "Would skip repository %s\n" +msgstr "將忽略版本庫 %s\n" -#: lockfile.c:160 +#: builtin/clean.c midx.c #, c-format -msgid "Unable to create '%s.lock': %s" -msgstr "不能建立 '%s.lock'：%s" +msgid "failed to remove %s" +msgstr "刪除 %s 失敗" -#: ls-refs.c:175 +#: builtin/clean.c #, c-format -msgid "unexpected line: '%s'" -msgstr "遇到非預期橫列：「%s」" +msgid "could not lstat %s\n" +msgstr "不能對 %s 呼叫 lstat\n" -#: ls-refs.c:179 -msgid "expected flush after ls-refs arguments" -msgstr "在 ls-refs 引數之後應該有一個 flush 包" +#: builtin/clean.c +msgid "Refusing to remove current working directory\n" +msgstr "拒絕移除目前工作目錄\n" -#: mailinfo.c:1050 -msgid "quoted CRLF detected" -msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF" +#: builtin/clean.c +msgid "Would refuse to remove current working directory\n" +msgstr "會拒絕移除目前的工作目錄\n" -#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46 +#: builtin/clean.c git-add--interactive.perl #, c-format -msgid "bad action '%s' for '%s'" -msgstr "「%s」動作對「%s」無效" +msgid "" +"Prompt help:\n" +"1 - select a numbered item\n" +"foo - select item based on unique prefix\n" +" - (empty) select nothing\n" +msgstr "" +"協助：\n" +"1 - 透過編號選擇一個選項\n" +"foo - 透過唯一前綴選擇一個選項\n" +" - （空）什麼也不選擇\n" -#: merge-ort.c:1630 merge-recursive.c:1214 +#: builtin/clean.c git-add--interactive.perl #, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "無法合併子模組 %s （沒有簽出）" +msgid "" +"Prompt help:\n" +"1 - select a single item\n" +"3-5 - select a range of items\n" +"2-3,6-9 - select multiple ranges\n" +"foo - select item based on unique prefix\n" +"-... - unselect specified items\n" +"* - choose all items\n" +" - (empty) finish selecting\n" +msgstr "" +"協助：\n" +"1 - 選擇一個選項\n" +"3-5 - 選擇一個範圍內的所有選項\n" +"2-3,6-9 - 選擇多個範圍內的所有選項\n" +"foo - 透過唯一前綴選擇一個選項\n" +"-... - 反選特定的選項\n" +"* - 選擇所有選項\n" +" - （空）結束選擇\n" -#: merge-ort.c:1639 merge-recursive.c:1221 -#, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "無法合併子模組 %s（提交不存在）" +#: builtin/clean.c git-add--interactive.perl +#, c-format, perl-format +msgid "Huh (%s)?\n" +msgstr "嗯（%s）？\n" -#: merge-ort.c:1648 merge-recursive.c:1228 +#: builtin/clean.c #, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "無法合併子模組 %s （提交未跟隨合併基礎）" +msgid "Input ignore patterns>> " +msgstr "輸入範本以排除條目>> " -#: merge-ort.c:1658 merge-ort.c:1666 +#: builtin/clean.c #, c-format -msgid "Note: Fast-forwarding submodule %s to %s" -msgstr "注意：正在將 %s 子模組快轉到 %s" +msgid "WARNING: Cannot find items matched by: %s" +msgstr "警告：無法找到和 %s 符合的條目" -#: merge-ort.c:1688 -#, c-format -msgid "Failed to merge submodule %s" -msgstr "無法合併 %s 子模組" +#: builtin/clean.c +msgid "Select items to delete" +msgstr "選擇要刪除的條目" -#: merge-ort.c:1695 +#. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c #, c-format -msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" -msgstr "" -"無法合併 %s 子模組，但有找到一個可行的合併方案：\n" -"%s\n" +msgid "Remove %s [y/N]? " +msgstr "移除 %s [y/N]？ " -#: merge-ort.c:1699 merge-recursive.c:1284 -#, c-format +#: builtin/clean.c msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" +"clean - start cleaning\n" +"filter by pattern - exclude items from deletion\n" +"select by numbers - select items to be deleted by numbers\n" +"ask each - confirm each deletion (like \"rm -i\")\n" +"quit - stop cleaning\n" +"help - this screen\n" +"? - help for prompt selection" msgstr "" -"正確的話，就能直接加進索引，例如執行下述命令：\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"接受本建議。\n" +"clean - 開始清理\n" +"filter by pattern - 透過範本排除要刪除的條目\n" +"select by numbers - 透過數字選擇要刪除的條目\n" +"ask each - 針對刪除逐一詢問（就像 \"rm -i\"）\n" +"quit - 停止刪除並離開\n" +"help - 顯示本協助\n" +"? - 顯示如何在提示符下選擇的協助" -#: merge-ort.c:1712 -#, c-format -msgid "" -"Failed to merge submodule %s, but multiple possible merges exist:\n" -"%s" -msgstr "" -"無法合併 %s 子模組，但有找到幾個可行的合併方案：\n" -"%s" +#: builtin/clean.c +msgid "Would remove the following item:" +msgid_plural "Would remove the following items:" +msgstr[0] "將刪除如下條目：" -#: merge-ort.c:1937 merge-recursive.c:1375 -msgid "Failed to execute internal merge" -msgstr "無法執行內部合併" +#: builtin/clean.c +msgid "No more files to clean, exiting." +msgstr "沒有要清理的檔案，離開。" -#: merge-ort.c:1942 merge-recursive.c:1380 -#, c-format -msgid "Unable to add %s to database" -msgstr "不能新增 %s 至物件庫" +#: builtin/clean.c +msgid "do not print names of files removed" +msgstr "不列印刪除檔案的名稱" -#: merge-ort.c:1949 merge-recursive.c:1413 -#, c-format -msgid "Auto-merging %s" -msgstr "自動合併 %s" +#: builtin/clean.c +msgid "force" +msgstr "強制" -#: merge-ort.c:2088 merge-recursive.c:2135 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" -"衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑" -"放在：%s。" +#: builtin/clean.c +msgid "interactive cleaning" +msgstr "互動式清除" -#: merge-ort.c:2098 merge-recursive.c:2145 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -msgstr "" -"衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這" -"些路徑放置於此：%s" +#: builtin/clean.c +msgid "remove whole directories" +msgstr "刪除整個目錄" -#: merge-ort.c:2156 -#, c-format -msgid "" -"CONFLICT (directory rename split): Unclear where to rename %s to; it was " -"renamed to multiple other directories, with no destination getting a " -"majority of the files." -msgstr "" -"衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目" -"錄，但沒有目的地取得過半檔案。" +#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c +#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c +msgid "pattern" +msgstr "模式" -#: merge-ort.c:2310 merge-recursive.c:2481 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。" +#: builtin/clean.c +msgid "add to ignore rules" +msgstr "新增 <模式> 到忽略規則" -#: merge-ort.c:2450 merge-recursive.c:3264 -#, c-format -msgid "" -"Path updated: %s added in %s inside a directory that was renamed in %s; " -"moving it to %s." -msgstr "" -"路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。" +#: builtin/clean.c +msgid "remove ignored files, too" +msgstr "也刪除忽略的檔案" -#: merge-ort.c:2457 merge-recursive.c:3271 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" -"路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將" -"其移動到 %5$s。" +#: builtin/clean.c +msgid "remove only ignored files" +msgstr "只刪除忽略的檔案" -#: merge-ort.c:2470 merge-recursive.c:3267 -#, c-format +#: builtin/clean.c msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " +"clean" msgstr "" -"衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移" -"動到 %s。" +"clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" -#: merge-ort.c:2478 merge-recursive.c:3274 -#, c-format +#: builtin/clean.c msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " +"refusing to clean" msgstr "" -"衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s " -"中，建議將其移動到 %5$s。" +"clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" -#: merge-ort.c:2634 -#, c-format -msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." -msgstr "" -"衝突（重新命名/重新命名）：%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 " -"%4$s。" +#: builtin/clean.c +msgid "-x and -X cannot be used together" +msgstr "-x 和 -X 不能同時使用" -#: merge-ort.c:2729 -#, c-format -msgid "" -"CONFLICT (rename involved in collision): rename of %s -> %s has content " -"conflicts AND collides with another path; this may result in nested conflict " -"markers." -msgstr "" -"衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可" -"能會因此出現巢狀衝突標記。" +#: builtin/clone.c +msgid "git clone [] [--] []" +msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]" -#: merge-ort.c:2748 merge-ort.c:2772 -#, c-format -msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." -msgstr "" -"衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。" +#: builtin/clone.c +msgid "don't clone shallow repository" +msgstr "不要複製淺版本庫" -#: merge-ort.c:3261 merge-recursive.c:3025 -#, c-format -msgid "cannot read object %s" -msgstr "不能讀取物件 %s" +#: builtin/clone.c +msgid "don't create a checkout" +msgstr "不建立一個簽出" -#: merge-ort.c:3264 merge-recursive.c:3028 -#, c-format -msgid "object %s is not a blob" -msgstr "物件 %s 不是一個資料物件" +#: builtin/clone.c builtin/init-db.c +msgid "create a bare repository" +msgstr "建立一個純版本庫" -#: merge-ort.c:3693 -#, c-format -msgid "" -"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " -"%s instead." -msgstr "衝突（檔案/目錄）：目錄佔住 %2$s 中 %1$s 的位置。改移動到 %3$s。" +#: builtin/clone.c +msgid "create a mirror repository (implies bare)" +msgstr "建立一個鏡像版本庫（也是純版本庫）" -#: merge-ort.c:3770 -#, c-format -msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed both " -"of them so each can be recorded somewhere." -msgstr "" -"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分" -"別記錄這兩方檔案。" +#: builtin/clone.c +msgid "to clone from a local repository" +msgstr "從本機版本庫複製" -#: merge-ort.c:3777 -#, c-format -msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed one " -"of them so each can be recorded somewhere." -msgstr "" -"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以" -"分別記錄這兩方檔案。" +#: builtin/clone.c +msgid "don't use local hardlinks, always copy" +msgstr "不使用本機硬連結，始終複製" -#: merge-ort.c:3866 merge-recursive.c:3104 -msgid "content" -msgstr "內容" +#: builtin/clone.c +msgid "setup as shared repository" +msgstr "設定為共享版本庫" -#: merge-ort.c:3868 merge-recursive.c:3108 -msgid "add/add" -msgstr "新增/新增" +#: builtin/clone.c +msgid "pathspec" +msgstr "路徑規格" -#: merge-ort.c:3870 merge-recursive.c:3153 -msgid "submodule" -msgstr "子模組" +#: builtin/clone.c +msgid "initialize submodules in the clone" +msgstr "在複製時初始化子模組" -#: merge-ort.c:3872 merge-recursive.c:3154 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "衝突（%s）：合併衝突於 %s" +#: builtin/clone.c +msgid "number of submodules cloned in parallel" +msgstr "並行複製的子模組數" -#: merge-ort.c:3916 -#, c-format -msgid "" -"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " -"of %s left in tree." -msgstr "" -"衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹" -"上。" +#: builtin/clone.c builtin/init-db.c +msgid "template-directory" +msgstr "範本目錄" -#: merge-ort.c:4212 -#, c-format -msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" -msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重新命名至 %s" +#: builtin/clone.c builtin/init-db.c +msgid "directory from which templates will be used" +msgstr "範本目錄將被使用" -#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge -#. base, and 2-3) the trees for the two trees we're merging. -#. -#: merge-ort.c:4586 -#, c-format -msgid "collecting merge info failed for trees %s, %s, %s" -msgstr "%s, %s, %s 樹的合併資訊收集失敗" +#: builtin/clone.c builtin/submodule--helper.c +msgid "reference repository" +msgstr "引用版本庫" -#: merge-ort-wrappers.c:13 merge-recursive.c:3723 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"您對下列檔案的本機修改將被合併動作覆蓋：\n" -" %s" +#: builtin/clone.c builtin/submodule--helper.c +msgid "use --reference only while cloning" +msgstr "僅在複製時參考 --reference 指向的本機版本庫" -#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405 -msgid "Already up to date." -msgstr "已經是最新的。" +#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c +#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c +#: builtin/submodule--helper.c t/helper/test-simple-ipc.c +msgid "name" +msgstr "名稱" -#: merge-recursive.c:353 -msgid "(bad commit)\n" -msgstr "（壞提交）\n" +#: builtin/clone.c +msgid "use instead of 'origin' to track upstream" +msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游" -#: merge-recursive.c:381 -#, c-format -msgid "add_cacheinfo failed for path '%s'; merge aborting." -msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。" +#: builtin/clone.c +msgid "checkout instead of the remote's HEAD" +msgstr "簽出 <分支> 而不是遠端 HEAD" -#: merge-recursive.c:390 -#, c-format -msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。" +#: builtin/clone.c +msgid "path to git-upload-pack on the remote" +msgstr "遠端 git-upload-pack 路徑" -#: merge-recursive.c:881 -#, c-format -msgid "failed to create path '%s'%s" -msgstr "建立路徑 '%s'%s 失敗" +#: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c +msgid "depth" +msgstr "深度" -#: merge-recursive.c:892 -#, c-format -msgid "Removing %s to make room for subdirectory\n" -msgstr "刪除 %s 以便為子目錄留出空間\n" +#: builtin/clone.c +msgid "create a shallow clone of that depth" +msgstr "建立一個指定深度的淺複製" -#: merge-recursive.c:906 merge-recursive.c:925 -msgid ": perhaps a D/F conflict?" -msgstr "：可能是一個目錄/檔案衝突？" +#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c +msgid "time" +msgstr "時間" -#: merge-recursive.c:915 -#, c-format -msgid "refusing to lose untracked file at '%s'" -msgstr "拒絕捨棄 '%s' 中的未追蹤檔案" +#: builtin/clone.c +msgid "create a shallow clone since a specific time" +msgstr "建立從指定時間到現在的淺複製" -#: merge-recursive.c:956 builtin/cat-file.c:47 -#, c-format -msgid "cannot read object %s '%s'" -msgstr "不能讀取物件 %s '%s'" +#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c +msgid "revision" +msgstr "修訂版" -#: merge-recursive.c:961 -#, c-format -msgid "blob expected for %s '%s'" -msgstr "%s '%s' 應為資料物件" +#: builtin/clone.c builtin/fetch.c builtin/pull.c +msgid "deepen history of shallow clone, excluding rev" +msgstr "取得更多淺複製的過去歷史記錄，除了特定版本" -#: merge-recursive.c:986 -#, c-format -msgid "failed to open '%s': %s" -msgstr "開啟 '%s' 失敗：%s" +#: builtin/clone.c builtin/submodule--helper.c +msgid "clone only one branch, HEAD or --branch" +msgstr "只複製一個分支、HEAD 或 --branch" -#: merge-recursive.c:997 -#, c-format -msgid "failed to symlink '%s': %s" -msgstr "建立符號連結 '%s' 失敗：%s" +#: builtin/clone.c +msgid "don't clone any tags, and make later fetches not to follow them" +msgstr "不要複製任何標籤，之後取得也不要追蹤這些標籤" -#: merge-recursive.c:1002 -#, c-format -msgid "do not know what to do with %06o %s '%s'" -msgstr "不知道如何處理 %06o %s '%s'" +#: builtin/clone.c +msgid "any cloned submodules will be shallow" +msgstr "子模組將以淺下載模式複製" -#: merge-recursive.c:1236 merge-recursive.c:1249 -#, c-format -msgid "Fast-forwarding submodule %s to the following commit:" -msgstr "子模組 %s 快轉到如下提交：" +#: builtin/clone.c builtin/init-db.c +msgid "gitdir" +msgstr "git目錄" -#: merge-recursive.c:1239 merge-recursive.c:1252 -#, c-format -msgid "Fast-forwarding submodule %s" -msgstr "快轉子模組 %s" +#: builtin/clone.c builtin/init-db.c +msgid "separate git dir from working tree" +msgstr "git目錄和工作區分離" -#: merge-recursive.c:1276 -#, c-format -msgid "Failed to merge submodule %s (merge following commits not found)" -msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）" +#: builtin/clone.c +msgid "key=value" +msgstr "key=value" -#: merge-recursive.c:1280 -#, c-format -msgid "Failed to merge submodule %s (not fast-forward)" -msgstr "無法合併子模組 %s（非快轉）" +#: builtin/clone.c +msgid "set config inside the new repository" +msgstr "在新版本庫中設定設定訊息" -#: merge-recursive.c:1281 -msgid "Found a possible merge resolution for the submodule:\n" -msgstr "找到子模組的一個可能的合併方案：\n" +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c +#: builtin/push.c builtin/send-pack.c +msgid "server-specific" +msgstr "server-specific" -#: merge-recursive.c:1293 -#, c-format -msgid "Failed to merge submodule %s (multiple merges found)" -msgstr "無法合併子模組 %s （發現多個合併）" +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c +#: builtin/push.c builtin/send-pack.c +msgid "option to transmit" +msgstr "傳輸選項" -#: merge-recursive.c:1437 -#, c-format -msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." -msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。" +#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c +msgid "use IPv4 addresses only" +msgstr "只使用 IPv4 位址" + +#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c +msgid "use IPv6 addresses only" +msgstr "只使用 IPv6 位址" + +#: builtin/clone.c +msgid "apply partial clone filters to submodules" +msgstr "將部分複製過濾器套用至子模組" -#: merge-recursive.c:1509 +#: builtin/clone.c +msgid "any cloned submodules will use their remote-tracking branch" +msgstr "任何複製的子模組都將使用它們的遠端追蹤分支" + +#: builtin/clone.c +msgid "initialize sparse-checkout file to include only files at root" +msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案" + +#: builtin/clone.c #, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree." -msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" -"本被保留。" +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info: 不能為 '%s' 新增一個備用：%s\n" -#: merge-recursive.c:1514 +#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c #, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " -"left in tree." -msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " -"%7$s 版本被保留。" +msgid "failed to stat '%s'" +msgstr "對 '%s' 呼叫 stat 失敗" -#: merge-recursive.c:1521 +#: builtin/clone.c #, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree at %s." -msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" -"本保留在 %8$s 中。" +msgid "%s exists and is not a directory" +msgstr "%s 存在且不是一個目錄" -#: merge-recursive.c:1526 +#: builtin/clone.c #, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " -"left in tree at %s." -msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " -"%7$s 版本保留在 %9$s 中。" +msgid "failed to start iterator over '%s'" +msgstr "無法在 '%s' 上啟動疊代器" -#: merge-recursive.c:1561 -msgid "rename" -msgstr "重新命名" +#: builtin/clone.c compat/precompose_utf8.c +#, c-format +msgid "failed to unlink '%s'" +msgstr "刪除 '%s' 失敗" -#: merge-recursive.c:1561 -msgid "renamed" -msgstr "重新命名" +#: builtin/clone.c +#, c-format +msgid "failed to create link '%s'" +msgstr "建立連結 '%s' 失敗" -#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181 +#: builtin/clone.c #, c-format -msgid "Refusing to lose dirty file at %s" -msgstr "拒絕遺失髒檔案 '%s'" +msgid "failed to copy file to '%s'" +msgstr "複製檔案至 '%s' 失敗" -#: merge-recursive.c:1622 +#: builtin/clone.c #, c-format -msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。" +msgid "failed to iterate over '%s'" +msgstr "無法在 '%s' 上疊代" -#: merge-recursive.c:1680 +#: builtin/clone.c #, c-format -msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" +msgid "done.\n" +msgstr "完成。\n" + +#: builtin/clone.c +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry with 'git restore --source=HEAD :/'\n" msgstr "" -"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s" +"複製成功，但是簽出失敗。\n" +"您可以透過 'git status' 檢查哪些已被簽出，然後使用指令\n" +"'git restore --source=HEAD :/' 重試\n" -#: merge-recursive.c:1711 +#: builtin/clone.c #, c-format -msgid "%s is a directory in %s adding as %s instead" -msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增" +msgid "Could not find remote branch %s to clone." +msgstr "找不到要複製的遠端分支 %s。" -#: merge-recursive.c:1716 -#, c-format -msgid "Refusing to lose untracked file at %s; adding as %s instead" -msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s" +#: builtin/clone.c fetch-pack.c +msgid "remote did not send all necessary objects" +msgstr "遠端沒有傳送所有必需的物件" -#: merge-recursive.c:1743 +#: builtin/clone.c #, c-format -msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" -msgstr "" -"衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在" -"分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s" +msgid "unable to update %s" +msgstr "不能更新 %s" -#: merge-recursive.c:1748 -msgid " (left unresolved)" -msgstr " （留下未解決）" +#: builtin/clone.c +msgid "failed to initialize sparse-checkout" +msgstr "無法初始化稀疏簽出" -#: merge-recursive.c:1840 -#, c-format -msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" -msgstr "" -"衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 " -"%4$s->%5$s" +#: builtin/clone.c +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n" -#: merge-recursive.c:2103 -#, c-format -msgid "" -"CONFLICT (directory rename split): Unclear where to place %s because " -"directory %s was renamed to multiple other directories, with no destination " -"getting a majority of the files." -msgstr "" -"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到" -"多個其它目錄，沒有目錄包含大部分檔案。" +#: builtin/clone.c +msgid "unable to checkout working tree" +msgstr "不能簽出工作區" -#: merge-recursive.c:2237 -#, c-format -msgid "" -"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" -">%s in %s" -msgstr "" -"衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新" -"命名目錄 %4$s->%5$s" +#: builtin/clone.c +msgid "unable to write parameters to config file" +msgstr "無法將參數寫入設定檔案" -#: merge-recursive.c:3092 -msgid "modify" -msgstr "修改" +#: builtin/clone.c +msgid "cannot repack to clean up" +msgstr "無法執行 repack 來清理" -#: merge-recursive.c:3092 -msgid "modified" -msgstr "修改" +#: builtin/clone.c +msgid "cannot unlink temporary alternates file" +msgstr "無法刪除暫時的 alternates 檔案" -#: merge-recursive.c:3131 -#, c-format -msgid "Skipped %s (merged same as existing)" -msgstr "略過 %s（已經做過相同合併）" +#: builtin/clone.c +msgid "Too many arguments." +msgstr "太多參數。" -#: merge-recursive.c:3184 +#: builtin/clone.c contrib/scalar/scalar.c +msgid "You must specify a repository to clone." +msgstr "您必須指定要複製的版本庫。" + +#: builtin/clone.c #, c-format -msgid "Adding as %s instead" -msgstr "而是以 %s 為名新增" +msgid "options '%s' and '%s %s' cannot be used together" +msgstr "「%s」和「%s %s」選項不得同時使用" -#: merge-recursive.c:3388 +#: builtin/clone.c #, c-format -msgid "Removing %s" -msgstr "刪除 %s" +msgid "repository '%s' does not exist" +msgstr "版本庫 '%s' 不存在" -#: merge-recursive.c:3411 -msgid "file/directory" -msgstr "檔案/目錄" +#: builtin/clone.c builtin/fetch.c +#, c-format +msgid "depth %s is not a positive number" +msgstr "深度 %s 不是一個正數" -#: merge-recursive.c:3416 -msgid "directory/file" -msgstr "目錄/檔案" +#: builtin/clone.c +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "目的地路徑 '%s' 已經存在，並且不是一個空目錄。" -#: merge-recursive.c:3423 +#: builtin/clone.c #, c-format -msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" -msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s" +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。" -#: merge-recursive.c:3432 +#: builtin/clone.c #, c-format -msgid "Adding %s" -msgstr "新增 %s" +msgid "working tree '%s' already exists." +msgstr "工作區 '%s' 已經存在。" -#: merge-recursive.c:3441 +#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c #, c-format -msgid "CONFLICT (add/add): Merge conflict in %s" -msgstr "衝突（add/add）：合併衝突於 %s" +msgid "could not create leading directories of '%s'" +msgstr "不能為 '%s' 建立先導目錄" -#: merge-recursive.c:3494 +#: builtin/clone.c #, c-format -msgid "merging of trees %s and %s failed" -msgstr "無法合併樹 %s 和 %s" +msgid "could not create work tree dir '%s'" +msgstr "不能建立工作區目錄 '%s'" -#: merge-recursive.c:3588 -msgid "Merging:" -msgstr "合併：" +#: builtin/clone.c +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "複製到純版本庫 '%s'...\n" -#: merge-recursive.c:3601 +#: builtin/clone.c #, c-format -msgid "found %u common ancestor:" -msgid_plural "found %u common ancestors:" -msgstr[0] "發現 %u 個共同祖先：" +msgid "Cloning into '%s'...\n" +msgstr "正複製到 '%s'...\n" -#: merge-recursive.c:3651 -msgid "merge returned no commit" -msgstr "合併未返回提交" +#: builtin/clone.c +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容" -#: merge-recursive.c:3823 +#: builtin/clone.c builtin/remote.c #, c-format -msgid "Could not parse object '%s'" -msgstr "不能解析物件 '%s'" +msgid "'%s' is not a valid remote name" +msgstr "'%s' 不是一個有效的遠端名稱" -#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912 -#: builtin/stash.c:489 -msgid "Unable to write index." -msgstr "不能寫入索引。" +#: builtin/clone.c +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "本機複製會忽略 --depth。請改用 file:// 通訊協定。" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "讀取快取失敗" +#: builtin/clone.c +msgid "--shallow-since is ignored in local clones; use file:// instead." +msgstr "本機複製會忽略 --shallow-since。請改用 file:// 協定。" -#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023 -#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714 -#: builtin/stash.c:269 -msgid "unable to write new index file" -msgstr "無法寫新的索引檔案" +#: builtin/clone.c +msgid "--shallow-exclude is ignored in local clones; use file:// instead." +msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// 協定。" -#: midx.c:79 -msgid "multi-pack-index OID fanout is of the wrong size" -msgstr "多包索引的物件 ID fanout 大小錯誤" +#: builtin/clone.c +msgid "--filter is ignored in local clones; use file:// instead." +msgstr "本機複製會忽略 --filter。請改用 file:// 協定。" -#: midx.c:112 -#, c-format -msgid "multi-pack-index file %s is too small" -msgstr "多包索引檔案 %s 太小" +#: builtin/clone.c fetch-pack.c +msgid "source repository is shallow, reject to clone." +msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。" -#: midx.c:128 -#, c-format -msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" -msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合" +#: builtin/clone.c +msgid "source repository is shallow, ignoring --local" +msgstr "來源版本庫是淺複製，忽略 --local" -#: midx.c:133 -#, c-format -msgid "multi-pack-index version %d not recognized" -msgstr "multi-pack-index 版本 %d 不能被識別" +#: builtin/clone.c +msgid "--local is ignored" +msgstr "--local 被忽略" -#: midx.c:138 -#, c-format -msgid "multi-pack-index hash version %u does not match version %u" -msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合" +#: builtin/clone.c +msgid "cannot clone from filtered bundle" +msgstr "無法從過濾後的套件複製" -#: midx.c:155 -msgid "multi-pack-index missing required pack-name chunk" -msgstr "多包索引缺少必需的包名區塊" +#: builtin/clone.c +msgid "remote transport reported error" +msgstr "遠端傳輸回報錯誤" -#: midx.c:157 -msgid "multi-pack-index missing required OID fanout chunk" -msgstr "多包索引缺少必需的物件 ID fanout 區塊" +#: builtin/clone.c +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "遠端分支 %s 在上游 %s 未發現" -#: midx.c:159 -msgid "multi-pack-index missing required OID lookup chunk" -msgstr "多包索引缺少必需的物件 ID 查詢區塊" +#: builtin/clone.c +msgid "You appear to have cloned an empty repository." +msgstr "您複製的版本庫似乎是空的。" -#: midx.c:161 -msgid "multi-pack-index missing required object offsets chunk" -msgstr "多包索引缺少必需的物件位移區塊" +#: builtin/column.c +msgid "git column []" +msgstr "git column [<選項>]" -#: midx.c:180 -#, c-format -msgid "multi-pack-index pack names out of order: '%s' before '%s'" -msgstr "多包索引包名無序：'%s' 在 '%s' 之前" +#: builtin/column.c +msgid "lookup config vars" +msgstr "尋找設定變數" -#: midx.c:228 -#, c-format -msgid "bad pack-int-id: %u (%u total packs)" -msgstr "錯的 pack-int-id：%u（共有 %u 個包）" +#: builtin/column.c +msgid "layout to use" +msgstr "要使用的配置" -#: midx.c:278 -msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" -msgstr "多包索引儲存一個64位位移，但是 off_t 太小" +#: builtin/column.c +msgid "maximum width" +msgstr "最大寬度" -#: midx.c:509 -#, c-format -msgid "failed to add packfile '%s'" -msgstr "新增 packfile '%s' 失敗" +#: builtin/column.c +msgid "padding space on left border" +msgstr "左邊框的填充空間" -#: midx.c:515 -#, c-format -msgid "failed to open pack-index '%s'" -msgstr "開啟包索引 '%s' 失敗" +#: builtin/column.c +msgid "padding space on right border" +msgstr "右邊框的填充空間" -#: midx.c:583 -#, c-format -msgid "failed to locate object %d in packfile" -msgstr "在 packfile 中定位物件 %d 失敗" +#: builtin/column.c +msgid "padding space between columns" +msgstr "兩直行之間的填充空間" -#: midx.c:911 -msgid "cannot store reverse index file" -msgstr "無法儲存倒排索引檔案" +#: builtin/column.c +msgid "--command must be the first argument" +msgstr "--command 必須是第一個參數" -#: midx.c:1009 -#, c-format -msgid "could not parse line: %s" -msgstr "無法解析橫列：%s" +#: builtin/commit-graph.c +msgid "" +"git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" +msgstr "" +"git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--" +"[no-]progress]" -#: midx.c:1011 -#, c-format -msgid "malformed line: %s" -msgstr "橫列格式錯誤：%s" +#: builtin/commit-graph.c +msgid "" +"git commit-graph write [--object-dir ] [--append] [--" +"split[=]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters ] [--[no-]progress] " +msgstr "" +"git commit-graph write [--object-dir ] [--append] [--" +"split[=]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters ] [--[no-]progress] " -#: midx.c:1181 -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "忽略現有的多包索引：總和檢查碼不符" +#: builtin/commit-graph.c builtin/fetch.c builtin/log.c +msgid "dir" +msgstr "目錄" -#: midx.c:1206 -msgid "could not load pack" -msgstr "無法載入包" +#: builtin/commit-graph.c +msgid "the object directory to store the graph" +msgstr "儲存圖形的物件目錄" -#: midx.c:1212 -#, c-format -msgid "could not open index for %s" -msgstr "無法開啟 %s 的索引" +#: builtin/commit-graph.c +msgid "if the commit-graph is split, only verify the tip file" +msgstr "如果提交圖形被分割，只驗證頭一個檔案" -#: midx.c:1223 -msgid "Adding packfiles to multi-pack-index" -msgstr "正在新增 packfile 至多包索引" +#: builtin/commit-graph.c +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "無法開啟提交圖形 '%s'" -#: midx.c:1266 +#: builtin/commit-graph.c #, c-format -msgid "unknown preferred pack: '%s'" -msgstr "未知偏好包：「%s」" +msgid "unrecognized --split argument, %s" +msgstr "無法識別的 --split 參數，%s" -#: midx.c:1311 +#: builtin/commit-graph.c #, c-format -msgid "cannot select preferred pack %s with no objects" -msgstr "無法選取偏好，沒有物件的 %s 包" +msgid "unexpected non-hex object ID: %s" +msgstr "非期望的非十六進位物件 ID：%s" -#: midx.c:1343 +#: builtin/commit-graph.c #, c-format -msgid "did not see pack-file %s to drop" -msgstr "沒有看到要捨棄的包檔案 %s" +msgid "invalid object: %s" +msgstr "物件無效：%s" -#: midx.c:1389 +#: builtin/commit-graph.c parse-options-cb.c #, c-format -msgid "preferred pack '%s' is expired" -msgstr "偏好包「%s」已經過期" +msgid "option `%s' expects a numerical value" +msgstr "選項 `%s' 期望一個數字值" -#: midx.c:1402 -msgid "no pack files to index." -msgstr "沒有要索引的 pack 檔案。" +#: builtin/commit-graph.c +msgid "start walk at all refs" +msgstr "開始遍歷所有引用" -#: midx.c:1409 -msgid "refusing to write multi-pack .bitmap without any objects" -msgstr "拒絕寫入無任何物件的多包 .bitmap" +#: builtin/commit-graph.c +msgid "scan pack-indexes listed by stdin for commits" +msgstr "從標準輸入中的包索引檔案列表中掃描提交" -#: midx.c:1451 -msgid "could not write multi-pack bitmap" -msgstr "無法寫入多包位圖" +#: builtin/commit-graph.c +msgid "start walk at commits listed by stdin" +msgstr "從標準輸入中的提交開始掃描" -#: midx.c:1461 -msgid "could not write multi-pack-index" -msgstr "無法寫入多包索引" +#: builtin/commit-graph.c +msgid "include all commits already in the commit-graph file" +msgstr "包含 commit-graph 檔案中已有所有提交" -#: midx.c:1520 builtin/clean.c:37 -#, c-format -msgid "failed to remove %s" -msgstr "刪除 %s 失敗" +#: builtin/commit-graph.c +msgid "enable computation for changed paths" +msgstr "啟用已變更路徑的計算" -#: midx.c:1553 -#, c-format -msgid "failed to clear multi-pack-index at %s" -msgstr "清理位於 %s 的多包索引失敗" +#: builtin/commit-graph.c +msgid "allow writing an incremental commit-graph file" +msgstr "允許寫一個增量提交圖形檔案" -#: midx.c:1616 -msgid "multi-pack-index file exists, but failed to parse" -msgstr "有 multi-pack-index 檔案，但無法解析" +#: builtin/commit-graph.c +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "在非基本分割提交圖形中的最大提交數" -#: midx.c:1624 -msgid "incorrect checksum" -msgstr "總和檢查碼不正確" +#: builtin/commit-graph.c +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "一個分割提交圖形的兩個級別之間的最大比率" -#: midx.c:1627 -msgid "Looking for referenced packfiles" -msgstr "正在尋找引用的 packfile" +#: builtin/commit-graph.c +msgid "only expire files older than a given date-time" +msgstr "只將舊於指定日期與時間的檔案設為過期" -#: midx.c:1642 -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" -msgstr "物件 ID 扇出無序：fanout[%d] = % > % = fanout[%d]" +#: builtin/commit-graph.c +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "變更路徑的布隆過濾器要計算的最大量" -#: midx.c:1647 -msgid "the midx contains no oid" -msgstr "midx 沒有 oid" +#: builtin/commit-graph.c +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs" -#: midx.c:1656 -msgid "Verifying OID order in multi-pack-index" -msgstr "正在驗證多包索引中的物件 ID 順序" +#: builtin/commit-graph.c +msgid "Collecting commits from input" +msgstr "正在從輸入收集提交" -#: midx.c:1665 +#: builtin/commit-graph.c builtin/multi-pack-index.c #, c-format -msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" -msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]" +msgid "unrecognized subcommand: %s" +msgstr "未識別的子指令：%s" -#: midx.c:1685 -msgid "Sorting objects by packfile" -msgstr "透過 packfile 為物件排序" +#: builtin/commit-tree.c +msgid "" +"git commit-tree [(-p )...] [-S[]] [(-m )...] [(-F " +")...] " +msgstr "" +"git commit-tree [(-p <父提交>)...] [-S[]] [(-m <消息>)...] [(-F <檔案" +">)...] <樹>" -#: midx.c:1692 -msgid "Verifying object offsets" -msgstr "正在驗證物件位移" +#: builtin/commit-tree.c +#, c-format +msgid "duplicate parent %s ignored" +msgstr "忽略重複的父提交 %s" -#: midx.c:1708 +#: builtin/commit-tree.c builtin/log.c #, c-format -msgid "failed to load pack entry for oid[%d] = %s" -msgstr "為 oid[%d] = %s 載入包條目失敗" +msgid "not a valid object name %s" +msgstr "不是一個有效的物件名 %s" -#: midx.c:1714 +#: builtin/commit-tree.c #, c-format -msgid "failed to load pack-index for packfile %s" -msgstr "為 packfile %s 載入包索引失敗" +msgid "git commit-tree: failed to read '%s'" +msgstr "git commit-tree：無法讀取 '%s'" -#: midx.c:1723 +#: builtin/commit-tree.c #, c-format -msgid "incorrect object offset for oid[%d] = %s: % != %" -msgstr "oid[%d] = %s 錯誤的物件位移：% != %" +msgid "git commit-tree: failed to close '%s'" +msgstr "git commit-tree：無法關閉 '%s'" -#: midx.c:1750 -msgid "Counting referenced objects" -msgstr "正在計算引用物件" +#: builtin/commit-tree.c +msgid "parent" +msgstr "父提交" -#: midx.c:1760 -msgid "Finding and deleting unreferenced packfiles" -msgstr "正在尋找並刪除沒有引用的 packfile" +#: builtin/commit-tree.c +msgid "id of a parent commit object" +msgstr "父提交物件 ID" -#: midx.c:1952 -msgid "could not start pack-objects" -msgstr "不能開始 pack-objects" +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c +#: builtin/stash.c builtin/tag.c +msgid "message" +msgstr "訊息" -#: midx.c:1972 -msgid "could not finish pack-objects" -msgstr "不能結束 pack-objects" +#: builtin/commit-tree.c builtin/commit.c +msgid "commit message" +msgstr "提交說明" -#: name-hash.c:542 -#, c-format -msgid "unable to create lazy_dir thread: %s" -msgstr "不能建立 lazy_dir 執行緒：%s" +#: builtin/commit-tree.c +msgid "read commit log message from file" +msgstr "從檔案中讀取提交說明" -#: name-hash.c:564 -#, c-format -msgid "unable to create lazy_name thread: %s" -msgstr "不能建立 lazy_name 執行緒：%s" +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c +#: builtin/revert.c +msgid "GPG sign commit" +msgstr "GPG 提交簽名" -#: name-hash.c:570 -#, c-format -msgid "unable to join lazy_name thread: %s" -msgstr "不能加入 lazy_name 執行緒：%s" +#: builtin/commit-tree.c +msgid "must give exactly one tree" +msgstr "必須精確地提供一個樹" -#: notes-merge.c:276 -#, c-format +#: builtin/commit-tree.c +msgid "git commit-tree: failed to read" +msgstr "git commit-tree：讀取失敗" + +#: builtin/commit.c +msgid "git commit [] [--] ..." +msgstr "git commit [<選項>] [--] <路徑規格>..." + +#: builtin/commit.c +msgid "git status [] [--] ..." +msgstr "git status [<選項>] [--] <路徑規格>..." + +#: builtin/commit.c msgid "" -"You have not concluded your previous notes merge (%s exists).\n" -"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " -"commit/abort the previous merge before you start a new notes merge." +"You asked to amend the most recent commit, but doing so would make\n" +"it empty. You can repeat your command with --allow-empty, or you can\n" +"remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -"您的前一次備註合併尚未結束（存在 %s）。\n" -"在開始一個新的備註合併之前，請使用 'git notes merge --commit' 或者 'git " -"notes merge --abort' 來提交/終止前一次合併。" +"您要修補最近的提交，但這麼做會讓它成為空提交。您可以重複您的指令並帶上\n" +"--allow-empty 選項，或者您可用指令 \"git reset HEAD^\" 整個刪除該提交。\n" -#: notes-merge.c:283 -#, c-format -msgid "You have not concluded your notes merge (%s exists)." -msgstr "您尚未結束備註合併（存在 %s）。" +#: builtin/commit.c +msgid "" +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" +"If you wish to commit it anyway, use:\n" +"\n" +" git commit --allow-empty\n" +"\n" +msgstr "" +"之前的揀選動作現在是一個空提交，可能是由衝突解決導致的。如果您無論如何\n" +"也要提交，使用指令：\n" +"\n" +" git commit --allow-empty\n" +"\n" -#: notes-utils.c:46 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "不能提交未初始化/未引用的註解樹" +#: builtin/commit.c +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "否則，請使用 'git rebase --skip'\n" -#: notes-utils.c:105 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "壞的 notes.rewriteMode 值：'%s'" +#: builtin/commit.c +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "否則，請使用 'git cherry-pick --skip'\n" -#: notes-utils.c:115 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解" +#: builtin/commit.c +msgid "" +"and then use:\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"to resume cherry-picking the remaining commits.\n" +"If you wish to skip this commit, use:\n" +"\n" +" git cherry-pick --skip\n" +"\n" +msgstr "" +"然後使用：\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"來繼續揀選剩餘提交。如果您想略過此提交，使用：\n" +"\n" +" git cherry-pick --skip\n" +"\n" -#. TRANSLATORS: The first %s is the name of -#. the environment variable, the second %s is -#. its value. -#. -#: notes-utils.c:145 -#, c-format -msgid "Bad %s value: '%s'" -msgstr "壞的 %s 值：'%s'" +#: builtin/commit.c +msgid "failed to unpack HEAD tree object" +msgstr "解包 HEAD 樹狀物件失敗" -#: object-file.c:457 -#, c-format -msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates" +#: builtin/commit.c +msgid "No paths with --include/--only does not make sense." +msgstr "參數 --include/--only 不跟路徑沒有意義。" -#: object-file.c:515 -#, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "無法規範化備用物件路徑：%s" +#: builtin/commit.c +msgid "unable to create temporary index" +msgstr "不能建立暫時索引" -#: object-file.c:589 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s：忽略備用物件庫，嵌套太深" +#: builtin/commit.c +msgid "interactive add failed" +msgstr "互動式新增失敗" -#: object-file.c:596 -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "無法規範化物件目錄: %s" +#: builtin/commit.c +msgid "unable to update temporary index" +msgstr "無法更新暫時索引" -#: object-file.c:639 -msgid "unable to fdopen alternates lockfile" -msgstr "無法 fdopen 取代鎖檔案" +#: builtin/commit.c +msgid "Failed to update main cache tree" +msgstr "不能更新樹的主快取" -#: object-file.c:657 -msgid "unable to read alternates file" -msgstr "無法讀取替代檔案" +#: builtin/commit.c +msgid "unable to write new_index file" +msgstr "無法寫 new_index 檔案" -#: object-file.c:664 -msgid "unable to move new alternates file into place" -msgstr "無法將新的替代檔案移動到位" +#: builtin/commit.c +msgid "cannot do a partial commit during a merge." +msgstr "在合併過程中不能做部分提交。" -#: object-file.c:742 -#, c-format -msgid "path '%s' does not exist" -msgstr "路徑 '%s' 不存在" +#: builtin/commit.c +msgid "cannot do a partial commit during a cherry-pick." +msgstr "在揀選過程中不能做部分提交。" -#: object-file.c:763 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。" +#: builtin/commit.c +msgid "cannot do a partial commit during a rebase." +msgstr "在重定基底過程中不能做部分提交。" -#: object-file.c:769 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "引用版本庫 '%s' 不是一個本機版本庫。" +#: builtin/commit.c +msgid "cannot read the index" +msgstr "無法讀取索引" -#: object-file.c:775 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "引用版本庫 '%s' 是一個淺複製" +#: builtin/commit.c +msgid "unable to write temporary index file" +msgstr "無法寫暫時索引檔案" -#: object-file.c:783 +#: builtin/commit.c #, c-format -msgid "reference repository '%s' is grafted" -msgstr "引用版本庫 '%s' 已被移植" +msgid "commit '%s' lacks author header" +msgstr "提交 '%s' 缺少作者訊息" -#: object-file.c:814 +#: builtin/commit.c #, c-format -msgid "could not find object directory matching %s" -msgstr "找不到符合 %s 的物件目錄" +msgid "commit '%s' has malformed author line" +msgstr "提交 '%s' 有格式錯誤的作者訊息" -#: object-file.c:864 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "解析備用引用時無效的行：%s" +#: builtin/commit.c +msgid "malformed --author parameter" +msgstr "格式錯誤的 --author 參數" -#: object-file.c:1014 +#: builtin/commit.c ident.c #, c-format -msgid "attempting to mmap % over limit %" -msgstr "嘗試 mmap %，超過了最大值 %" +msgid "invalid date format: %s" +msgstr "無效的日期格式：%s" -#: object-file.c:1049 -#, c-format -msgid "mmap failed%s" -msgstr "mmap 失敗%s" +#: builtin/commit.c +msgid "" +"unable to select a comment character that is not used\n" +"in the current commit message" +msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: object-file.c:1230 +#: builtin/commit.c #, c-format -msgid "object file %s is empty" -msgstr "物件檔案 %s 為空" +msgid "could not lookup commit %s" +msgstr "不能查詢提交 %s" -#: object-file.c:1349 object-file.c:2588 +#: builtin/commit.c builtin/shortlog.c #, c-format -msgid "corrupt loose object '%s'" -msgstr "損壞的鬆散物件 '%s'" +msgid "(reading log message from standard input)\n" +msgstr "（正從標準輸入中讀取日誌訊息）\n" + +#: builtin/commit.c +msgid "could not read log from standard input" +msgstr "不能從標準輸入中讀取日誌訊息" -#: object-file.c:1351 object-file.c:2592 +#: builtin/commit.c #, c-format -msgid "garbage at end of loose object '%s'" -msgstr "鬆散物件 '%s' 後面有垃圾資料" +msgid "could not read log file '%s'" +msgstr "不能讀取日誌檔案 '%s'" -#: object-file.c:1473 +#: builtin/commit.c #, c-format -msgid "unable to parse %s header" -msgstr "無法解析 %s 頭部" +msgid "options '%s' and '%s:%s' cannot be used together" +msgstr "「%s」和「%s:%s」選項不得同時使用" -#: object-file.c:1475 -msgid "invalid object type" -msgstr "無效的物件類型" +#: builtin/commit.c +msgid "could not read SQUASH_MSG" +msgstr "不能讀取 SQUASH_MSG" -#: object-file.c:1486 -#, c-format -msgid "unable to unpack %s header" -msgstr "無法解開 %s 頭部" +#: builtin/commit.c +msgid "could not read MERGE_MSG" +msgstr "不能讀取 MERGE_MSG" -#: object-file.c:1490 +#: builtin/commit.c bundle.c rerere.c sequencer.c #, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "%s 的標頭過長，超出 %d 位元組" +msgid "could not open '%s'" +msgstr "不能開啟 '%s'" -#: object-file.c:1720 -#, c-format -msgid "failed to read object %s" -msgstr "讀取物件 %s 失敗" +#: builtin/commit.c +msgid "could not write commit template" +msgstr "不能寫提交範本" -#: object-file.c:1724 +#: builtin/commit.c #, c-format -msgid "replacement %s not found for %s" -msgstr "找不到 %2$s 的替代 %1$s" +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "" +"請輸入描述您變更的提交訊息。\n" +"開頭是「%c」的行皆會忽略。\n" -#: object-file.c:1728 +#: builtin/commit.c #, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "鬆散物件 %s（儲存在 %s）已損壞" +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"請輸入描述您變更的提交訊息。開頭是「%c」\n" +"的行皆會忽略。提交訊息空白則取消本次提交作業。\n" -#: object-file.c:1732 +#: builtin/commit.c #, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "打包物件 %s（儲存在 %s）已損壞" +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "" +"請輸入描述您變更的提交訊息。會保留開頭是「%c」\n" +"的行，但也可以自己移除掉這些行。\n" -#: object-file.c:1855 +#: builtin/commit.c #, c-format -msgid "unable to write file %s" -msgstr "無法寫檔案 %s" +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"請輸入描述您變更的提交訊息。會保留開頭是\n" +"「%c」的行，但也可以自己移除掉這些行。\n" +"提交訊息空白則取消本次提交作業。\n" -#: object-file.c:1862 -#, c-format -msgid "unable to set permission to '%s'" -msgstr "無法為 '%s' 設定權限" +#: builtin/commit.c +msgid "" +"\n" +"It looks like you may be committing a merge.\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" +"and try again.\n" +msgstr "" +"\n" +"您似乎正在提交一個合併提交。\n" +"如果錯誤，請執行\n" +"\tgit update-ref -d MERGE_HEAD\n" +"後重試。\n" -#: object-file.c:1869 -msgid "file write error" -msgstr "檔案寫錯誤" +#: builtin/commit.c +msgid "" +"\n" +"It looks like you may be committing a cherry-pick.\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"and try again.\n" +msgstr "" +"\n" +"您似乎正在提交一個揀選提交。\n" +"如果錯誤，請執行\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"後重試。\n" -#: object-file.c:1904 -msgid "error when closing loose object file" -msgstr "關閉鬆散物件檔案時發生錯誤" +# 譯者：為保證在輸出中對齊，注意調整句中空格！ +#: builtin/commit.c +#, c-format +msgid "%sAuthor: %.*s <%.*s>" +msgstr "%s作者： %.*s <%.*s>" -#: object-file.c:1971 +# 譯者：為保證在輸出中對齊，注意調整句中空格！ +#: builtin/commit.c #, c-format -msgid "insufficient permission for adding an object to repository database %s" -msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件" +msgid "%sDate: %s" +msgstr "%s日期： %s" -#: object-file.c:1973 -msgid "unable to create temporary file" -msgstr "無法建立暫存檔" +# 譯者：為保證在輸出中對齊，注意調整句中空格！ +#: builtin/commit.c +#, c-format +msgid "%sCommitter: %.*s <%.*s>" +msgstr "%s提交者：%.*s <%.*s>" -#: object-file.c:1997 -msgid "unable to write loose object file" -msgstr "不能寫鬆散物件檔案" +#: builtin/commit.c +msgid "Cannot read index" +msgstr "無法讀取索引" -#: object-file.c:2003 -#, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "不能壓縮新物件 %s（%d）" +#: builtin/commit.c +msgid "unable to pass trailers to --trailers" +msgstr "無法將尾部署名傳遞至 --trailers" + +#: builtin/commit.c +msgid "Error building trees" +msgstr "無法建立樹狀物件" -#: object-file.c:2007 +#: builtin/commit.c builtin/tag.c #, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）" +msgid "Please supply the message using either -m or -F option.\n" +msgstr "請使用 -m 或 -F 選項提供提交說明。\n" -#: object-file.c:2011 +#: builtin/commit.c #, c-format -msgid "confused by unstable object source data for %s" -msgstr "被 %s 的不穩定物件來源資料混淆" +msgid "--author '%s' is not 'Name ' and matches no existing author" +msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合" -#: object-file.c:2022 builtin/pack-objects.c:1251 +#: builtin/commit.c #, c-format -msgid "failed utime() on %s" -msgstr "在 %s 上呼叫 utime() 失敗" +msgid "Invalid ignored mode '%s'" +msgstr "無效的忽略模式 '%s'" -#: object-file.c:2100 +#: builtin/commit.c #, c-format -msgid "cannot read object for %s" -msgstr "不能讀取物件 %s" +msgid "Invalid untracked files mode '%s'" +msgstr "無效的未追蹤檔案參數 '%s'" -#: object-file.c:2151 -msgid "corrupt commit" -msgstr "損壞的提交" +#: builtin/commit.c +msgid "You are in the middle of a merge -- cannot reword." +msgstr "正在合併中——不能重新輸入。" -#: object-file.c:2159 -msgid "corrupt tag" -msgstr "損壞的標籤" +#: builtin/commit.c +msgid "You are in the middle of a cherry-pick -- cannot reword." +msgstr "正在揀選中——不能重新輸入。" -#: object-file.c:2259 +#: builtin/commit.c #, c-format -msgid "read error while indexing %s" -msgstr "索引 %s 時讀取錯誤" +msgid "reword option of '%s' and path '%s' cannot be used together" +msgstr "「%s」的改寫選項和「%s」路徑不得同時使用" -#: object-file.c:2262 +#: builtin/commit.c #, c-format -msgid "short read while indexing %s" -msgstr "索引 %s 時讀入不完整" +msgid "reword option of '%s' and '%s' cannot be used together" +msgstr "「%s」的改寫選項和「%s」不得同時使用" -#: object-file.c:2335 object-file.c:2345 -#, c-format -msgid "%s: failed to insert into database" -msgstr "%s：插入資料庫失敗" +#: builtin/commit.c +msgid "You have nothing to amend." +msgstr "您沒有可修補的提交。" -#: object-file.c:2351 -#, c-format -msgid "%s: unsupported file type" -msgstr "%s：不支援的檔案類型" +#: builtin/commit.c +msgid "You are in the middle of a merge -- cannot amend." +msgstr "您正處於一個合併過程中 -- 無法修補提交。" -#: object-file.c:2375 builtin/fetch.c:1494 -#, c-format -msgid "%s is not a valid object" -msgstr "%s 不是一個有效的物件" +#: builtin/commit.c +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "您正處於一個揀選過程中 -- 無法修補提交。" -#: object-file.c:2377 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s 不是一個有效的 '%s' 物件" +#: builtin/commit.c +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "您正處於重定基底的過程中 -- 無法修訂。" -#: object-file.c:2404 -#, c-format -msgid "unable to open %s" -msgstr "不能開啟 %s" +#: builtin/commit.c +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。" -#: object-file.c:2599 +#: builtin/commit.c #, c-format -msgid "hash mismatch for %s (expected %s)" -msgstr "%s 的雜湊值不符合（預期 %s）" +msgid "unknown option: --fixup=%s:%s" +msgstr "未知選項：--fixup=%s:%s" -#: object-file.c:2622 +#: builtin/commit.c #, c-format -msgid "unable to mmap %s" -msgstr "不能 mmap %s" +msgid "paths '%s ...' with -a does not make sense" +msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: object-file.c:2628 -#, c-format -msgid "unable to unpack header of %s" -msgstr "無法解壓縮 %s 的頭部" +#: builtin/commit.c +msgid "show status concisely" +msgstr "以簡潔的格式顯示狀態" -#: object-file.c:2633 -#, c-format -msgid "unable to parse header of %s" -msgstr "無法解析 %s 的頭部" +#: builtin/commit.c +msgid "show branch information" +msgstr "顯示分支訊息" -#: object-file.c:2644 -#, c-format -msgid "unable to unpack contents of %s" -msgstr "無法解壓縮 %s 的內容" +#: builtin/commit.c +msgid "show stash information" +msgstr "顯示儲藏區訊息" -#. TRANSLATORS: This is a line of ambiguous object -#. output shown when we cannot look up or parse the -#. object in question. E.g. "deadbeef [bad object]". -#. -#: object-name.c:382 -#, c-format -msgid "%s [bad object]" -msgstr "%s [無效物件]" +#: builtin/commit.c +msgid "compute full ahead/behind values" +msgstr "計算完整的領先/落後值" -#. TRANSLATORS: This is a line of ambiguous commit -#. object output. E.g.: -#. * -#. "deadbeef commit 2021-01-01 - Some Commit Message" -#. -#: object-name.c:407 -#, c-format -msgid "%s commit %s - %s" -msgstr "%s 提交 %s - %s" +#: builtin/commit.c +msgid "version" +msgstr "版本" -#. TRANSLATORS: This is a line of ambiguous -#. tag object output. E.g.: -#. * -#. "deadbeef tag 2022-01-01 - Some Tag Message" -#. * -#. The second argument is the YYYY-MM-DD found -#. in the tag. -#. * -#. The third argument is the "tag" string -#. from object.c. -#. -#: object-name.c:428 -#, c-format -msgid "%s tag %s - %s" -msgstr "%s 標籤 %s - %s" +#: builtin/commit.c builtin/push.c builtin/worktree.c +msgid "machine-readable output" +msgstr "機器可讀的輸出" -#. TRANSLATORS: This is a line of ambiguous -#. tag object output where we couldn't parse -#. the tag itself. E.g.: -#. * -#. "deadbeef [bad tag, could not parse it]" -#. -#: object-name.c:439 -#, c-format -msgid "%s [bad tag, could not parse it]" -msgstr "%s [無效標籤，無法解析]" +#: builtin/commit.c +msgid "show status in long format (default)" +msgstr "以長格式顯示狀態（預設）" -#. TRANSLATORS: This is a line of ambiguous -#. object output. E.g. "deadbeef tree". -#. -#: object-name.c:447 -#, c-format -msgid "%s tree" -msgstr "%s 樹" +#: builtin/commit.c +msgid "terminate entries with NUL" +msgstr "條目以 NUL 字元結尾" -#. TRANSLATORS: This is a line of ambiguous -#. object output. E.g. "deadbeef blob". -#. -#: object-name.c:453 -#, c-format -msgid "%s blob" -msgstr "%s blob" +#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h +msgid "mode" +msgstr "模式" -#: object-name.c:569 -#, c-format -msgid "short object ID %s is ambiguous" -msgstr "短物件 ID %s 存在歧義" +#: builtin/commit.c +msgid "show untracked files, optional modes: all, normal, no. (Default: all)" +msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）" -#. TRANSLATORS: The argument is the list of ambiguous -#. objects composed in show_ambiguous_object(). See -#. its "TRANSLATORS" comments for details. -#. -#: object-name.c:591 -#, c-format +#: builtin/commit.c msgid "" -"The candidates are:\n" -"%s" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" msgstr "" -"候選物件有：\n" -"%s" +"顯示已忽略的檔案，可選模式：traditional、matching、no。（預設值：" +"traditional）" -#: object-name.c:888 +#: builtin/commit.c parse-options.h +msgid "when" +msgstr "何時" + +#: builtin/commit.c msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"may be created by mistake. For example,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"running \"git config advice.objectNameWarning false\"" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" msgstr "" -"Git 通常不會建立以 40 個十六進位字元結尾的引用，\n" -"因為當您只提供 40 個十六進位字元時，其將被忽略。\n" -"這些引用可能被意外建立。例如：\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"當「$br」因為某些原因空白時，會建立出 40 位十六進位的引用。\n" -"請檢查這些引用，並視需要刪除。執行\n" -"「git config advice.objectNameWarning false」命令以關閉本訊息通知" +"忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設值：all）" -#: object-name.c:1008 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "'%.*s' 的日誌只能回到 %s" +#: builtin/commit.c +msgid "list untracked files in columns" +msgstr "以列的方式顯示未追蹤的檔案" -#: object-name.c:1016 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "'%.*s' 的日誌只有 %d 個項目" +#: builtin/commit.c +msgid "do not detect renames" +msgstr "不檢測重新命名" -#: object-name.c:1794 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'" +#: builtin/commit.c +msgid "detect renames, optionally set similarity index" +msgstr "檢測重新命名，可以設定索引相似度" -#: object-name.c:1800 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"'%s' 路徑存在，但不是 '%s'\n" -"提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？" +#: builtin/commit.c +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "不支援已忽略和未追蹤檔案參數的組合" -#: object-name.c:1809 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "'%s' 路徑不存在於 '%.*s'" +#: builtin/commit.c +msgid "suppress summary after successful commit" +msgstr "提交成功後不顯示概述訊息" -#: object-name.c:1837 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"'%s' 路徑在索引，但不在 %d 暫存區\n" -"提示：你在說 ':%d:%s' 嗎？" +#: builtin/commit.c +msgid "show diff in commit message template" +msgstr "在提交說明範本裡顯示差異" -#: object-name.c:1853 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"'%s' 路徑在索引，但不是 '%s'\n" -"提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？" +#: builtin/commit.c +msgid "Commit message options" +msgstr "提交說明選項" -#: object-name.c:1861 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "磁碟上存在 '%s' 路徑，但不在索引中" +#: builtin/commit.c builtin/merge.c builtin/tag.c +msgid "read message from file" +msgstr "從檔案中讀取提交說明" -#: object-name.c:1863 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)" +#: builtin/commit.c +msgid "author" +msgstr "作者" -#: object-name.c:1876 -msgid "relative path syntax can't be used outside working tree" -msgstr "相對路徑與法不能用在工作區外" +#: builtin/commit.c +msgid "override author for commit" +msgstr "提交時覆蓋作者" -#: object-name.c:1901 -#, c-format -msgid ": required, only '%s' given" -msgstr "需要指定 :，卻只指定 「%s」" +#: builtin/commit.c builtin/gc.c +msgid "date" +msgstr "日期" -#: object-name.c:2014 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "'%.*s' 物件名稱無效。" +#: builtin/commit.c +msgid "override date for commit" +msgstr "提交時覆蓋日期" -#: object.c:53 -#, c-format -msgid "invalid object type \"%s\"" -msgstr "無效的物件類型 \"%s\"" +#: builtin/commit.c parse-options.h ref-filter.h +msgid "commit" +msgstr "提交" -#: object.c:173 -#, c-format -msgid "object %s is a %s, not a %s" -msgstr "物件 %s 是一個 %s，不是一個 %s" +#: builtin/commit.c +msgid "reuse and edit message from specified commit" +msgstr "重用並編輯指定提交的提交說明" -#: object.c:250 -#, c-format -msgid "object %s has unknown type id %d" -msgstr "物件 %s 有未知的類型 id %d" +#: builtin/commit.c +msgid "reuse message from specified commit" +msgstr "重用指定提交的提交說明" -#: object.c:263 -#, c-format -msgid "unable to parse object: %s" -msgstr "不能解析物件：%s" +#. TRANSLATORS: Leave "[(amend|reword):]" as-is, +#. and only translate . +#. +#: builtin/commit.c +msgid "[(amend|reword):]commit" +msgstr "[(amend|reword):]commit" -#: object.c:283 object.c:294 -#, c-format -msgid "hash mismatch %s" -msgstr "雜湊值與 %s 不符合" +#: builtin/commit.c +msgid "" +"use autosquash formatted message to fixup or amend/reword specified commit" +msgstr "使用 autosquash 格式化後的說明來 fixup 或是 amend/reword 指定提交" -#: pack-bitmap.c:353 -msgid "multi-pack bitmap is missing required reverse index" -msgstr "多包位圖缺少需要的反向索引" +#: builtin/commit.c +msgid "use autosquash formatted message to squash specified commit" +msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" -#: pack-bitmap.c:433 -msgid "load_reverse_index: could not open pack" -msgstr "load_reverse_index：無法開啟包" +#: builtin/commit.c +msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" -#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432 -#, c-format -msgid "unable to get size of %s" -msgstr "不能得到 %s 的大小" +#: builtin/commit.c builtin/interpret-trailers.c +msgid "trailer" +msgstr "尾部署名" -#: pack-bitmap.c:1937 -#, c-format -msgid "could not find %s in pack %s at offset %" -msgstr "找不到 %2$s 包，偏移位置 %3$ 的 %1$s" +#: builtin/commit.c +msgid "add custom trailer(s)" +msgstr "加入自訂尾部署名" -#: pack-bitmap.c:1973 builtin/rev-list.c:91 -#, c-format -msgid "unable to get disk usage of %s" -msgstr "無法取得 %s 的磁碟用量" +#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c +#: builtin/revert.c +msgid "add a Signed-off-by trailer" +msgstr "在結尾加入 Signed-off-by" -#: pack-revindex.c:221 -#, c-format -msgid "reverse-index file %s is too small" -msgstr "%s 倒排索引檔案過小" +#: builtin/commit.c +msgid "use specified template file" +msgstr "使用指定的範本檔案" -#: pack-revindex.c:226 -#, c-format -msgid "reverse-index file %s is corrupt" -msgstr "%s 倒排索引檔案損壞" +#: builtin/commit.c +msgid "force edit of commit" +msgstr "強制編輯提交" -#: pack-revindex.c:234 -#, c-format -msgid "reverse-index file %s has unknown signature" -msgstr "%s 倒排索引檔案有未知簽章" +#: builtin/commit.c +msgid "include status in commit message template" +msgstr "在提交說明範本裡包含狀態訊息" -#: pack-revindex.c:238 -#, c-format -msgid "reverse-index file %s has unsupported version %" -msgstr "倒排索引檔案 %s 有不支援的版本 %" +#: builtin/commit.c +msgid "Commit contents options" +msgstr "提交內容選項" -#: pack-revindex.c:243 -#, c-format -msgid "reverse-index file %s has unsupported hash id %" -msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %" +#: builtin/commit.c +msgid "commit all changed files" +msgstr "提交所有改動的檔案" -#: pack-write.c:251 -msgid "cannot both write and verify reverse index" -msgstr "無法同時寫入和驗證倒排索引" +#: builtin/commit.c +msgid "add specified files to index for commit" +msgstr "新增指定的檔案到索引區等待提交" -#: pack-write.c:270 -#, c-format -msgid "could not stat: %s" -msgstr "無法 stat：%s" +#: builtin/commit.c +msgid "interactively add files" +msgstr "互動式新增檔案" -#: pack-write.c:282 -#, c-format -msgid "failed to make %s readable" -msgstr "無法讓 %s 能夠寫入" +#: builtin/commit.c +msgid "interactively add changes" +msgstr "互動式新增變更" -#: pack-write.c:521 -#, c-format -msgid "could not write '%s' promisor file" -msgstr "無法寫入「%s」promisor 檔案" +#: builtin/commit.c +msgid "commit only specified files" +msgstr "只提交指定的檔案" -#: packfile.c:627 -msgid "offset before end of packfile (broken .idx?)" -msgstr "位移量在 packfile 結束之前（損壞的 .idx？）" +#: builtin/commit.c +msgid "bypass pre-commit and commit-msg hooks" +msgstr "繞過 pre-commit 和 commit-msg 掛鉤" -#: packfile.c:657 -#, c-format -msgid "packfile %s cannot be mapped%s" -msgstr "包檔案 %s 無法映射%s" +#: builtin/commit.c +msgid "show what would be committed" +msgstr "顯示將要提交的內容" -#: packfile.c:1924 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）" +#: builtin/commit.c +msgid "amend previous commit" +msgstr "修改先前的提交" -#: packfile.c:1928 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）" +#: builtin/commit.c +msgid "bypass post-rewrite hook" +msgstr "繞過 post-rewrite 掛鉤" -#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "選項 `%s' 期望一個數字值" +#: builtin/commit.c +msgid "ok to record an empty change" +msgstr "允許一個空提交" -#: parse-options-cb.c:42 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "格式錯誤的到期時間：'%s'" +#: builtin/commit.c +msgid "ok to record a change with an empty message" +msgstr "允許空的提交說明" -#: parse-options-cb.c:55 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" +#: builtin/commit.c sequencer.c +msgid "could not parse HEAD commit" +msgstr "不能解析 HEAD 提交" -#: parse-options-cb.c:133 parse-options-cb.c:150 +#: builtin/commit.c #, c-format -msgid "malformed object name '%s'" -msgstr "格式錯誤的物件名 '%s'" +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "損壞的 MERGE_HEAD 檔案（%s）" -#: parse-options-cb.c:307 -#, c-format -msgid "option `%s' expects \"%s\" or \"%s\"" -msgstr "選項「%s」期望「%s」或「%s」" +#: builtin/commit.c +msgid "could not read MERGE_MODE" +msgstr "不能讀取 MERGE_MODE" -#: parse-options.c:58 +#: builtin/commit.c #, c-format -msgid "%s requires a value" -msgstr "%s 需要一個值" +msgid "could not read commit message: %s" +msgstr "不能讀取提交說明：%s" -#: parse-options.c:93 +#: builtin/commit.c #, c-format -msgid "%s is incompatible with %s" -msgstr "%s 與 %s 不相容" +msgid "Aborting commit due to empty commit message.\n" +msgstr "終止提交因為提交說明為空。\n" -#: parse-options.c:98 +#: builtin/commit.c #, c-format -msgid "%s : incompatible with something else" -msgstr "%s：和其它的不相容" +msgid "Aborting commit; you did not edit the message.\n" +msgstr "終止提交；您未更改來自範本的提交說明。\n" -#: parse-options.c:112 parse-options.c:116 +#: builtin/commit.c #, c-format -msgid "%s takes no value" -msgstr "%s 不取值" +msgid "Aborting commit due to empty commit message body.\n" +msgstr "提交說明內文空白，中止提交作業。\n" -#: parse-options.c:114 -#, c-format -msgid "%s isn't available" -msgstr "%s 不可用" +#: builtin/commit.c +msgid "" +"repository has been updated, but unable to write\n" +"new_index file. Check that disk is not full and quota is\n" +"not exceeded, and then \"git restore --staged :/\" to recover." +msgstr "" +"版本庫已更新，但無法寫 new_index 檔案。檢查是否磁碟已滿或\n" +"磁碟配額已耗盡，然後執行 \"git restore --staged :/\" 復原。" -#: parse-options.c:237 -#, c-format -msgid "%s expects a non-negative integer value with an optional k/m/g suffix" -msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴" +#: builtin/config.c +msgid "git config []" +msgstr "git config [<選項>]" -#: parse-options.c:393 +#: builtin/config.c builtin/env--helper.c #, c-format -msgid "ambiguous option: %s (could be --%s%s or --%s%s)" -msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）" +msgid "unrecognized --type argument, %s" +msgstr "無法識別的 --type 參數，%s" -#: parse-options.c:428 parse-options.c:436 -#, c-format -msgid "did you mean `--%s` (with two dashes)?" -msgstr "你的意思是 `--%s`（有兩個短線）嗎？" +#: builtin/config.c +msgid "only one type at a time" +msgstr "一次只能一個類型" -#: parse-options.c:678 parse-options.c:1054 -#, c-format -msgid "alias of --%s" -msgstr "--%s 的別名" +#: builtin/config.c +msgid "Config file location" +msgstr "設定檔案位置" -#: parse-options.c:892 -#, c-format -msgid "unknown option `%s'" -msgstr "未知選項 `%s'" +#: builtin/config.c +msgid "use global config file" +msgstr "使用全域設定檔案" -#: parse-options.c:894 -#, c-format -msgid "unknown switch `%c'" -msgstr "未知開關 `%c'" +#: builtin/config.c +msgid "use system config file" +msgstr "使用系統級設定檔案" -#: parse-options.c:896 -#, c-format -msgid "unknown non-ascii option in string: `%s'" -msgstr "字串中未知的非 ascii 字元選項：`%s'" +#: builtin/config.c +msgid "use repository config file" +msgstr "使用版本庫級設定檔案" -#: parse-options.c:920 -msgid "..." -msgstr "..." +#: builtin/config.c +msgid "use per-worktree config file" +msgstr "使用工作區級別的設定檔案" -#: parse-options.c:934 -#, c-format -msgid "usage: %s" -msgstr "用法：%s" +#: builtin/config.c +msgid "use given config file" +msgstr "使用指定的設定檔案" -#. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation. -#. -#: parse-options.c:949 -#, c-format -msgid " or: %s" -msgstr " 或：%s" +#: builtin/config.c +msgid "blob-id" +msgstr "資料物件 ID" -#. TRANSLATORS: You should only need to translate this format -#. string if your language is a RTL language (e.g. Arabic, -#. Hebrew etc.), not if it's a LTR language (e.g. German, -#. Russian, Chinese etc.). -#. * -#. When a translated usage string has an embedded "\n" it's -#. because options have wrapped to the next line. The line -#. after the "\n" will then be padded to align with the -#. command name, such as N_("git cmd [opt]\n<8 -#. spaces>[opt2]"), where the 8 spaces are the same length as -#. "git cmd ". -#. * -#. This format string prints out that already-translated -#. line. The "%*s" is whitespace padding to account for the -#. padding at the start of the line that we add in this -#. function. The "%s" is a line in the (hopefully already -#. translated) N_() usage string, which contained embedded -#. newlines before we split it up. -#. -#: parse-options.c:970 -#, c-format -msgid "%*s%s" -msgstr "%*s%s" +#: builtin/config.c +msgid "read config from given blob object" +msgstr "從提供的資料物件讀取設定" -# 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: parse-options.c:993 -#, c-format -msgid " %s" -msgstr " %s" +#: builtin/config.c +msgid "Action" +msgstr "動作" -#: parse-options.c:1040 -msgid "-NUM" -msgstr "-數字" +#: builtin/config.c +msgid "get value: name [value-pattern]" +msgstr "取得值：name [value-pattern]" -#: path.c:922 -#, c-format -msgid "Could not make %s writable by group" -msgstr "不能設定 %s 為組可寫" +#: builtin/config.c +msgid "get all values: key [value-pattern]" +msgstr "取得所有值：key [value-pattern]" -#: pathspec.c:150 -msgid "Escape character '\\' not allowed as last character in attr value" -msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元" +#: builtin/config.c +msgid "get values for regexp: name-regex [value-pattern]" +msgstr "根據常規表示式取得值：name-regex [value-pattern]" -#: pathspec.c:168 -msgid "Only one 'attr:' specification is allowed." -msgstr "只允許一個 'attr:' 規格。" +#: builtin/config.c +msgid "get value specific for the URL: section[.var] URL" +msgstr "獲得 URL 取值：section[.var] URL" -#: pathspec.c:171 -msgid "attr spec must not be empty" -msgstr "屬性規格不能為空" +#: builtin/config.c +msgid "replace all matching variables: name value [value-pattern]" +msgstr "取代所有符合的變數：name value [value-pattern]" -#: pathspec.c:214 -#, c-format -msgid "invalid attribute name %s" -msgstr "無效的屬性名 %s" +#: builtin/config.c +msgid "add a new variable: name value" +msgstr "新增一個新的變數：name value" -#: pathspec.c:279 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容" +#: builtin/config.c +msgid "remove a variable: name [value-pattern]" +msgstr "移除一個變數：name [value-pattern]" -#: pathspec.c:286 -msgid "" -"global 'literal' pathspec setting is incompatible with all other global " -"pathspec settings" -msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容" +#: builtin/config.c +msgid "remove all matches: name [value-pattern]" +msgstr "移除所有符合項目：name [value-pattern]" -#: pathspec.c:326 -msgid "invalid parameter for pathspec magic 'prefix'" -msgstr "路徑規格包含無效的神奇前綴" +#: builtin/config.c +msgid "rename section: old-name new-name" +msgstr "重新命名小節：old-name new-name" -#: pathspec.c:347 -#, c-format -msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'" +#: builtin/config.c +msgid "remove a section: name" +msgstr "刪除一個小節：name" -#: pathspec.c:352 -#, c-format -msgid "Missing ')' at the end of pathspec magic in '%s'" -msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'" +#: builtin/config.c +msgid "list all" +msgstr "全部列出" -#: pathspec.c:390 -#, c-format -msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'" +#: builtin/config.c +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "比較「value-pattern」的值時，使用字串相等比較" -#: pathspec.c:449 -#, c-format -msgid "%s: 'literal' and 'glob' are incompatible" -msgstr "%s：'literal' 和 'glob' 不相容" +#: builtin/config.c +msgid "open an editor" +msgstr "開啟一個編輯器" -#: pathspec.c:465 -#, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s：'%s' 在位於 '%s' 的版本庫之外" +#: builtin/config.c +msgid "find the color configured: slot [default]" +msgstr "獲得設定的顏色：設定 [預設]" -#: pathspec.c:541 -#, c-format -msgid "'%s' (mnemonic: '%c')" -msgstr "'%s'（助記符：'%c'）" +#: builtin/config.c +msgid "find the color setting: slot [stdout-is-tty]" +msgstr "獲得顏色設定：設定 [stdout-is-tty]" -#: pathspec.c:551 -#, c-format -msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s：路徑規格神奇前綴不被此指令支援：%s" +#: builtin/config.c +msgid "Type" +msgstr "類型" -#: pathspec.c:618 -#, c-format -msgid "pathspec '%s' is beyond a symbolic link" -msgstr "路徑規格 '%s' 位於符號連結中" +#: builtin/config.c builtin/env--helper.c builtin/hash-object.c +msgid "type" +msgstr "類型" -#: pathspec.c:663 -#, c-format -msgid "line is badly quoted: %s" -msgstr "某行不應該被括號括住：%s" +#: builtin/config.c builtin/env--helper.c +msgid "value is given this type" +msgstr "取值為該類型" -#: pkt-line.c:92 -msgid "unable to write flush packet" -msgstr "無法寫 flush 包" +#: builtin/config.c +msgid "value is \"true\" or \"false\"" +msgstr "值是 \"true\" 或 \"false\"" -#: pkt-line.c:99 -msgid "unable to write delim packet" -msgstr "無法寫 delim 包" +#: builtin/config.c +msgid "value is decimal number" +msgstr "值是十進位數" -#: pkt-line.c:106 -msgid "unable to write response end packet" -msgstr "無法寫入回應結尾封包" +#: builtin/config.c +msgid "value is --bool or --int" +msgstr "值是 --bool or --int" -#: pkt-line.c:113 -msgid "flush packet write failed" -msgstr "flush 包寫錯誤" +#: builtin/config.c +msgid "value is --bool or string" +msgstr "值是 --bool 或 string" -#: pkt-line.c:153 -msgid "protocol error: impossibly long line" -msgstr "協定錯誤：不可能的長行" +#: builtin/config.c +msgid "value is a path (file or directory name)" +msgstr "值是一個路徑（檔案或目錄名）" -#: pkt-line.c:169 pkt-line.c:171 -msgid "packet write with format failed" -msgstr "格式化包寫入錯誤" +#: builtin/config.c +msgid "value is an expiry date" +msgstr "值是一個到期日期" -#: pkt-line.c:204 pkt-line.c:252 -msgid "packet write failed - data exceeds max packet size" -msgstr "寫封包失敗：資料超過了包的最大長度" +#: builtin/config.c +msgid "Other" +msgstr "其它" -#: pkt-line.c:222 -#, c-format -msgid "packet write failed: %s" -msgstr "封包寫入失敗：%s" +#: builtin/config.c +msgid "terminate values with NUL byte" +msgstr "終止值是 NUL 位元組" -#: pkt-line.c:349 pkt-line.c:350 -msgid "read error" -msgstr "讀取錯誤" +#: builtin/config.c +msgid "show variable names only" +msgstr "只顯示變數名" -#: pkt-line.c:360 pkt-line.c:361 -msgid "the remote end hung up unexpectedly" -msgstr "遠端意外掛斷了" +#: builtin/config.c +msgid "respect include directives on lookup" +msgstr "查詢時參照 include 指令遞迴尋找" + +#: builtin/config.c +msgid "show origin of config (file, standard input, blob, command line)" +msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或指令列）" + +#: builtin/config.c +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" +"顯示設定檔的作用域 (工作區 worktree、本機 local、全域 global、系統 system、指" +"令 command)" + +#: builtin/config.c builtin/env--helper.c +msgid "value" +msgstr "取值" + +#: builtin/config.c +msgid "with --get, use default value when missing entry" +msgstr "使用 --get 但未指定參數時所使用的預設值" -#: pkt-line.c:417 pkt-line.c:419 +#: builtin/config.c #, c-format -msgid "protocol error: bad line length character: %.4s" -msgstr "協定錯誤：錯誤的行長度字串：%.4s" +msgid "wrong number of arguments, should be %d" +msgstr "錯誤的參數個數，應該為 %d 個" -#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444 +#: builtin/config.c #, c-format -msgid "protocol error: bad line length %d" -msgstr "協定錯誤：錯誤的行長度 %d" +msgid "wrong number of arguments, should be from %d to %d" +msgstr "錯誤的參數個數，應該為從 %d 個到 %d 個" -#: pkt-line.c:472 sideband.c:165 +#: builtin/config.c #, c-format -msgid "remote error: %s" -msgstr "遠端錯誤：%s" +msgid "invalid key pattern: %s" +msgstr "無效鍵名模式：%s" -#: preload-index.c:125 -msgid "Refreshing index" -msgstr "正在重新整理索引" +#: builtin/config.c config.c +#, c-format +msgid "invalid pattern: %s" +msgstr "無效模式：%s" -#: preload-index.c:144 +#: builtin/config.c #, c-format -msgid "unable to create threaded lstat: %s" -msgstr "無法建立執行緒 lstat：%s" +msgid "failed to format default config value: %s" +msgstr "格式化預設設定值失敗：%s" -#: pretty.c:1051 -msgid "unable to parse --pretty format" -msgstr "不能解析 --pretty 格式" +#: builtin/config.c +#, c-format +msgid "cannot parse color '%s'" +msgstr "無法解析顏色 '%s'" -#: promisor-remote.c:31 -msgid "promisor-remote: unable to fork off fetch subprocess" -msgstr "promisor-remote: 無法 fork fetch 子處理程序" +#: builtin/config.c +msgid "unable to parse default color value" +msgstr "無法解析預設顏色值" -#: promisor-remote.c:38 promisor-remote.c:40 -msgid "promisor-remote: could not write to fetch subprocess" -msgstr "promisor-remote: 無法寫入 fetch 子處理程序" +#: builtin/config.c +msgid "not in a git directory" +msgstr "不在 git 版本庫中" -#: promisor-remote.c:44 -msgid "promisor-remote: could not close stdin to fetch subprocess" -msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin" +#: builtin/config.c +msgid "writing to stdin is not supported" +msgstr "不支援寫到標準輸入" -#: promisor-remote.c:54 +#: builtin/config.c +msgid "writing config blobs is not supported" +msgstr "不支援寫到設定資料物件" + +#: builtin/config.c #, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "promisor 遠端名稱不能以 '/' 開始：%s" +msgid "" +"# This is Git's per-user configuration file.\n" +"[user]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tname = %s\n" +"#\temail = %s\n" +msgstr "" +"# This is Git's per-user configuration file.\n" +"[user]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tname = %s\n" +"#\temail = %s\n" -#: protocol-caps.c:103 -msgid "object-info: expected flush after arguments" -msgstr "object-info：引數後預期要有 flush" +#: builtin/config.c +msgid "only one config file at a time" +msgstr "一次只能有一個設定檔案" -#: prune-packed.c:35 -msgid "Removing duplicate objects" -msgstr "正在刪除重複物件" +#: builtin/config.c +msgid "--local can only be used inside a git repository" +msgstr "--local 只能在一個版本庫內使用" -#: range-diff.c:68 -msgid "could not start `log`" -msgstr "不能啟動 `log`" +#: builtin/config.c +msgid "--blob can only be used inside a git repository" +msgstr "--blob 只能在一個版本庫內使用" -#: range-diff.c:70 -msgid "could not read `log` output" -msgstr "不能讀取 `log` 的輸出" +#: builtin/config.c +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree 只能在 git 版本庫中使用" -#: range-diff.c:98 sequencer.c:5575 -#, c-format -msgid "could not parse commit '%s'" -msgstr "不能解析提交 '%s'" +#: builtin/config.c +msgid "$HOME not set" +msgstr "$HOME 未設定" -#: range-diff.c:109 -#, c-format +#: builtin/config.c msgid "" -"could not parse first line of `log` output: did not start with 'commit ': " -"'%s'" -msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s」" +"--worktree cannot be used with multiple working trees unless the config\n" +"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" +"section in \"git help worktree\" for details" +msgstr "" +"不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴充部分。\n" +"詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節" -#: range-diff.c:132 -#, c-format -msgid "could not parse git header '%.*s'" -msgstr "無法解析 git 頭 '%.*s'" +#: builtin/config.c +msgid "--get-color and variable type are incoherent" +msgstr "--get-color 和變數類型不相容" -#: range-diff.c:300 -msgid "failed to generate diff" -msgstr "生成 diff 失敗" +#: builtin/config.c +msgid "only one action at a time" +msgstr "一次只能有一個動作" -#: range-diff.c:558 range-diff.c:560 -#, c-format -msgid "could not parse log for '%s'" -msgstr "不能解析 '%s' 的日誌" +#: builtin/config.c +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only 僅適用於 --list 或 --get-regexp" -#: read-cache.c:737 -#, c-format -msgid "will not add file alias '%s' ('%s' already exists in index)" -msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）" +#: builtin/config.c +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "--show-origin 僅適用於 --get、--get-all、--get-regexp 和 --list" -#: read-cache.c:753 -msgid "cannot create an empty blob in the object database" -msgstr "不能在物件資料庫中建立空的資料物件" +#: builtin/config.c +msgid "--default is only applicable to --get" +msgstr "--default 僅適用於 --get" -#: read-cache.c:775 -#, c-format -msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "%s：只能新增一般檔案、符號連結或 git 目錄" +#: builtin/config.c +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "--fixed-value 僅套用至 'value-pattern'" -#: read-cache.c:780 builtin/submodule--helper.c:3359 +#: builtin/config.c #, c-format -msgid "'%s' does not have a commit checked out" -msgstr "'%s' 沒有簽出一個提交" +msgid "unable to read config file '%s'" +msgstr "無法讀取設定檔案 '%s'" -#: read-cache.c:832 -#, c-format -msgid "unable to index file '%s'" -msgstr "無法索引檔案 '%s'" +#: builtin/config.c +msgid "error processing config file(s)" +msgstr "處理設定檔案發生錯誤" -#: read-cache.c:851 -#, c-format -msgid "unable to add '%s' to index" -msgstr "無法在索引中新增 '%s'" +#: builtin/config.c +msgid "editing stdin is not supported" +msgstr "不支援編輯標準輸入" -#: read-cache.c:862 -#, c-format -msgid "unable to stat '%s'" -msgstr "無法對 %s 執行 stat" +#: builtin/config.c +msgid "editing blobs is not supported" +msgstr "不支援編輯資料物件" -#: read-cache.c:1404 +#: builtin/config.c #, c-format -msgid "'%s' appears as both a file and as a directory" -msgstr "'%s' 看起來既是檔案又是目錄" - -#: read-cache.c:1619 -msgid "Refresh index" -msgstr "重新整理索引" +msgid "cannot create configuration file %s" +msgstr "不能建立設定檔案 %s" -#: read-cache.c:1751 +#: builtin/config.c #, c-format msgid "" -"index.version set, but the value is invalid.\n" -"Using version %i" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." msgstr "" -"設定了 index.version，但是取值無效。\n" -"使用版本 %i" +"無法用一個值覆蓋多個值\n" +" 使用一個常規表示式、--add 或 --replace-all 來修改 %s。" -#: read-cache.c:1761 +#: builtin/config.c #, c-format -msgid "" -"GIT_INDEX_VERSION set, but the value is invalid.\n" -"Using version %i" -msgstr "" -"設定了 GIT_INDEX_VERSION，但是取值無效。\n" -"使用版本 %i" +msgid "no such section: %s" +msgstr "無此小節：%s" -#: read-cache.c:1817 -#, c-format -msgid "bad signature 0x%08x" -msgstr "壞的簽名 0x%08x" +#: builtin/count-objects.c +msgid "print sizes in human readable format" +msgstr "以使用者可讀的格式顯示大小" -#: read-cache.c:1820 +#: builtin/credential-cache--daemon.c #, c-format -msgid "bad index version %d" -msgstr "壞的索引版本 %d" +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" -#: read-cache.c:1829 -msgid "bad index file sha1 signature" -msgstr "壞的索引檔案 sha1 簽名" +#: builtin/credential-cache--daemon.c +msgid "print debugging messages to stderr" +msgstr "除錯訊息輸出到標準錯誤" -#: read-cache.c:1863 -#, c-format -msgid "index uses %.4s extension, which we do not understand" -msgstr "索引使用不被支援的 %.4s 副檔名" +#: builtin/credential-cache--daemon.c +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援" -# -#: read-cache.c:1865 -#, c-format -msgid "ignoring %.4s extension" -msgstr "忽略 %.4s 副檔名" +#: builtin/credential-cache.c +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache 無法使用；缺少 unix socket 支援" -#: read-cache.c:1902 +#: builtin/credential-store.c #, c-format -msgid "unknown index entry format 0x%08x" -msgstr "未知的索引條目格式 0x%08x" +msgid "unable to get credential storage lock in %d ms" +msgstr "無法在 %d 毫秒內取得憑證儲存空間的鎖" -#: read-cache.c:1918 -#, c-format -msgid "malformed name field in the index, near path '%s'" -msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位" +#: builtin/describe.c +msgid "git describe [] [...]" +msgstr "git describe [<選項>] [<提交號>...]" -#: read-cache.c:1975 -msgid "unordered stage entries in index" -msgstr "索引中有未排序的暫存條目" +#: builtin/describe.c +msgid "git describe [] --dirty" +msgstr "git describe [<選項>] --dirty" -#: read-cache.c:1978 -#, c-format -msgid "multiple stage entries for merged file '%s'" -msgstr "合併檔案 '%s' 有多個暫存條目" +#: builtin/describe.c +msgid "head" +msgstr "HEAD" -#: read-cache.c:1981 -#, c-format -msgid "unordered stage entries for '%s'" -msgstr "'%s' 的未排序暫存條目" +#: builtin/describe.c +msgid "lightweight" +msgstr "輕量級的" -#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096 -#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183 -#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016 -#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521 -#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293 -#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319 -msgid "index file corrupt" -msgstr "索引檔案損壞" +#: builtin/describe.c +msgid "annotated" +msgstr "附註的" -#: read-cache.c:2240 +#: builtin/describe.c #, c-format -msgid "unable to create load_cache_entries thread: %s" -msgstr "無法建立 load_cache_entries 執行緒：%s" +msgid "annotated tag %s not available" +msgstr "附註標籤 %s 無效" -#: read-cache.c:2253 +#: builtin/describe.c #, c-format -msgid "unable to join load_cache_entries thread: %s" -msgstr "無法加入 load_cache_entries 執行緒：%s" +msgid "tag '%s' is externally known as '%s'" +msgstr "「%s」標籤在外部被認為是「%s」" -#: read-cache.c:2286 +#: builtin/describe.c #, c-format -msgid "%s: index file open failed" -msgstr "%s：開啟索引檔案失敗" +msgid "no tag exactly matches '%s'" +msgstr "沒有標籤準確符合 '%s'" -#: read-cache.c:2290 +#: builtin/describe.c #, c-format -msgid "%s: cannot stat the open index" -msgstr "%s：不能對開啟的索引執行 stat 動作" +msgid "No exact match on refs or tags, searching to describe\n" +msgstr "沒有精確符合到引用或標籤，繼續搜尋進行描述\n" -#: read-cache.c:2294 +#: builtin/describe.c #, c-format -msgid "%s: index file smaller than expected" -msgstr "%s：索引檔案比預期的小" +msgid "finished search at %s\n" +msgstr "完成搜尋 %s\n" -#: read-cache.c:2298 +#: builtin/describe.c #, c-format -msgid "%s: unable to map index file%s" -msgstr "%s：無法 map 索引檔案%s" +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" +"沒有附註標籤能描述 '%s'。\n" +"然而，存在未附註標籤：嘗試 --tags。" -#: read-cache.c:2341 +#: builtin/describe.c #, c-format -msgid "unable to create load_index_extensions thread: %s" -msgstr "無法建立 load_index_extensions 執行緒：%s" +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" +"沒有標籤能描述 '%s'。\n" +"嘗試 --always，或者建立一些標籤。" -#: read-cache.c:2368 +#: builtin/describe.c #, c-format -msgid "unable to join load_index_extensions thread: %s" -msgstr "無法加入 load_index_extensions 執行緒：%s" +msgid "traversed %lu commits\n" +msgstr "已遍歷 %lu 個提交\n" -#: read-cache.c:2414 +#: builtin/describe.c #, c-format -msgid "could not freshen shared index '%s'" -msgstr "無法重新整理共享索引 '%s'" +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" +"發現多於 %i 個標籤，列出最近的 %i 個\n" +"在 %s 放棄搜尋\n" -#: read-cache.c:2473 +#: builtin/describe.c #, c-format -msgid "broken index, expect %s in %s, got %s" -msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s" +msgid "describe %s\n" +msgstr "描述 %s\n" -#: read-cache.c:3032 -msgid "cannot write split index for a sparse index" -msgstr "無法寫入稀疏索引的索引分割" +#: builtin/describe.c +#, c-format +msgid "Not a valid object name %s" +msgstr "不是一個有效的物件名 %s" -#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156 +#: builtin/describe.c #, c-format -msgid "could not close '%s'" -msgstr "不能關閉 '%s'" +msgid "%s is neither a commit nor blob" +msgstr "%s 既不是提交也不是資料物件" -#: read-cache.c:3157 -msgid "failed to convert to a sparse-index" -msgstr "無法轉換成稀疏索引" +#: builtin/describe.c +msgid "find the tag that comes after the commit" +msgstr "尋找該提交之後的標籤" -#: read-cache.c:3228 -#, c-format -msgid "could not stat '%s'" -msgstr "不能對 '%s' 呼叫 stat" +#: builtin/describe.c +msgid "debug search strategy on stderr" +msgstr "在標準錯誤上除錯搜尋策略" -#: read-cache.c:3241 -#, c-format -msgid "unable to open git dir: %s" -msgstr "不能開啟 git 目錄：%s" +#: builtin/describe.c +msgid "use any ref" +msgstr "使用任意引用" -#: read-cache.c:3253 -#, c-format -msgid "unable to unlink: %s" -msgstr "無法刪除：%s" +#: builtin/describe.c +msgid "use any tag, even unannotated" +msgstr "使用任意標籤，即使未附帶備註" -#: read-cache.c:3282 -#, c-format -msgid "cannot fix permission bits on '%s'" -msgstr "不能修復 '%s' 的權限位" +#: builtin/describe.c +msgid "always use long format" +msgstr "始終使用長提交號格式" -#: read-cache.c:3439 -#, c-format -msgid "%s: cannot drop to stage #0" -msgstr "%s：不能落到暫存區 #0" +#: builtin/describe.c +msgid "only follow first parent" +msgstr "只跟隨第一個父提交" -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n" -"或者您可以用 'git rebase --abort' 終止重定基底。\n" +#: builtin/describe.c +msgid "only output exact matches" +msgstr "只輸出精確符合" -#: rebase-interactive.c:33 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "選項 rebase.missingCommitsCheck 的值 %s 無法識別。已忽略。" +#: builtin/describe.c +msgid "consider most recent tags (default: 10)" +msgstr "考慮最近 個標籤（預設值：10）" -#: rebase-interactive.c:42 -msgid "" -"\n" -"Commands:\n" -"p, pick = use commit\n" -"r, reword = use commit, but edit the commit message\n" -"e, edit = use commit, but stop for amending\n" -"s, squash = use commit, but meld into previous commit\n" -"f, fixup [-C | -c] = like \"squash\" but keep only the previous\n" -" commit's log message, unless -C is used, in which case\n" -" keep only this commit's message; -c is same as -C but\n" -" opens the editor\n" -"x, exec = run command (the rest of the line) using shell\n" -"b, break = stop here (continue rebase later with 'git rebase --continue')\n" -"d, drop = remove commit\n" -"l, label