From 2c146360eabfa8c8f04141a944130699d0f04a45 Mon Sep 17 00:00:00 2001 From: Yi-Jyun Pan Date: Sun, 28 Apr 2024 18:46:20 +0800 Subject: [PATCH] l10n: zh-TW: Git 2.45 Co-Authored-By: Lumynous Co-Authored-By: Kisaragi Hiu Signed-off-by: Yi-Jyun Pan --- po/zh_TW.po | 12644 ++++++++++++++++++++++++++------------------------ 1 file changed, 6617 insertions(+), 6027 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index f777a0596f8caa..87a794928ced1b 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -19,15 +19,16 @@ # - Yichao Yu # - Zhuang Ya # -# Yi-Jyun Pan , 2021, 2022, 2023. +# Yi-Jyun Pan , 2021, 2022, 2023, 2024. # Kaiyang Wu , 2022. -# lumynou5 , 2023. +# lumynou5 , 2023, 2024. +# Kisaragi Hiu , 2024. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-11-19 22:29+0800\n" -"PO-Revision-Date: 2023-11-19 23:34+0800\n" +"POT-Creation-Date: 2024-04-27 20:54+0800\n" +"PO-Revision-Date: 2024-04-28 18:44+0800\n" "Last-Translator: Yi-Jyun Pan \n" "Language-Team: Chinese (Traditional) \n" @@ -36,234 +37,241 @@ 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.4.1\n" +"X-Generator: Poedit 3.4.2\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" -#: add-interactive.c +#: add-interactive.c:389 #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c +#: add-interactive.c:542 add-interactive.c:850 builtin/merge.c:377 +#: builtin/rebase.c:1286 builtin/rebase.c:1699 reset.c:139 sequencer.c:3679 +#: sequencer.c:4162 sequencer.c:4554 msgid "could not read index" msgstr "無法讀取索引" -#: add-interactive.c +#: add-interactive.c:596 msgid "binary" msgstr "二進位" -#: add-interactive.c +#: add-interactive.c:654 msgid "nothing" msgstr "無" -#: add-interactive.c +#: add-interactive.c:655 msgid "unchanged" msgstr "未變更" -#: add-interactive.c +#: add-interactive.c:692 msgid "Update" msgstr "更新" -#: add-interactive.c +#: add-interactive.c:713 add-interactive.c:717 add-interactive.c:906 #, c-format msgid "could not stage '%s'" msgstr "無法暫存 “%s”" -#: add-interactive.c builtin/stash.c reset.c sequencer.c +#: add-interactive.c:723 add-interactive.c:913 builtin/stash.c:523 +#: builtin/stash.c:540 builtin/stash.c:610 builtin/stash.c:1368 +#: builtin/stash.c:1559 reset.c:168 sequencer.c:3919 msgid "could not write index" msgstr "無法寫入索引" -#: add-interactive.c +#: add-interactive.c:726 #, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "已更新 %d 個路徑\n" -#: add-interactive.c +#: add-interactive.c:744 #, c-format msgid "note: %s is untracked now.\n" msgstr "註：現已不再追蹤 %s。\n" -#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c +#: add-interactive.c:749 apply.c:4180 builtin/checkout.c:324 +#: builtin/reset.c:183 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "對 “%s” 路徑執行 make_cache_entry 失敗" -#: add-interactive.c +#: add-interactive.c:779 msgid "Revert" msgstr "還原" -#: add-interactive.c +#: add-interactive.c:795 msgid "Could not parse HEAD^{tree}" msgstr "無法解析 HEAD^{tree}" -#: add-interactive.c +#: add-interactive.c:833 #, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "已還原 %d 個路徑\n" -#: add-interactive.c +#: add-interactive.c:885 #, c-format msgid "No untracked files.\n" msgstr "沒有未追蹤的檔案。\n" -#: add-interactive.c +#: add-interactive.c:889 msgid "Add untracked" msgstr "加入未追蹤項目" -#: add-interactive.c +#: add-interactive.c:916 #, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "已加入 %d 個路徑\n" -#: add-interactive.c +#: add-interactive.c:946 #, c-format msgid "ignoring unmerged: %s" msgstr "忽略未合併項目：%s" -#: add-interactive.c add-patch.c +#: add-interactive.c:958 add-patch.c:1783 #, c-format msgid "Only binary files changed.\n" msgstr "只有二進位檔案更動了。\n" -#: add-interactive.c add-patch.c +#: add-interactive.c:960 add-patch.c:1781 #, c-format msgid "No changes.\n" msgstr "沒有更動。\n" -#: add-interactive.c +#: add-interactive.c:964 msgid "Patch update" msgstr "修補檔更新" -#: add-interactive.c +#: add-interactive.c:1003 msgid "Review diff" msgstr "檢閱差異" -#: add-interactive.c +#: add-interactive.c:1030 msgid "show paths with changes" msgstr "顯示有更動的路徑" -#: add-interactive.c +#: add-interactive.c:1032 msgid "add working tree state to the staged set of changes" msgstr "將工作區狀態加入至暫存更動集" -#: add-interactive.c +#: add-interactive.c:1034 msgid "revert staged set of changes back to the HEAD version" msgstr "將暫存的更動集還原回 HEAD 版本" -#: add-interactive.c +#: add-interactive.c:1036 msgid "pick hunks and update selectively" msgstr "挑選區塊並選擇性更新" -#: add-interactive.c +#: add-interactive.c:1038 msgid "view diff between HEAD and index" msgstr "檢視 HEAD 及索引之間的差異" -#: add-interactive.c +#: add-interactive.c:1040 msgid "add contents of untracked files to the staged set of changes" msgstr "將未追蹤檔案的內容加入至更動暫存集" -#: add-interactive.c +#: add-interactive.c:1048 add-interactive.c:1097 msgid "Prompt help:" msgstr "提示說明：" -#: add-interactive.c +#: add-interactive.c:1050 msgid "select a single item" msgstr "選取一個項目" -#: add-interactive.c +#: add-interactive.c:1052 msgid "select a range of items" msgstr "選取範圍中項目" -#: add-interactive.c +#: add-interactive.c:1054 msgid "select multiple ranges" msgstr "選取多個範圍" -#: add-interactive.c +#: add-interactive.c:1056 add-interactive.c:1101 msgid "select item based on unique prefix" msgstr "根據獨特前綴選取項目" -#: add-interactive.c +#: add-interactive.c:1058 msgid "unselect specified items" msgstr "取消選取指定項目" -#: add-interactive.c +#: add-interactive.c:1060 msgid "choose all items" msgstr "選擇所有項目" -#: add-interactive.c +#: add-interactive.c:1062 msgid "(empty) finish selecting" msgstr "（空）完成選取" -#: add-interactive.c +#: add-interactive.c:1099 msgid "select a numbered item" msgstr "選取編號過的項目" -#: add-interactive.c +#: add-interactive.c:1103 msgid "(empty) select nothing" msgstr "（空）全部不選取" -#: add-interactive.c builtin/clean.c +#: add-interactive.c:1111 builtin/clean.c:847 msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c builtin/clean.c +#: add-interactive.c:1112 builtin/clean.c:848 msgid "What now" msgstr "請選擇" -#: add-interactive.c +#: add-interactive.c:1164 msgid "staged" msgstr "已暫存" -#: add-interactive.c +#: add-interactive.c:1164 msgid "unstaged" msgstr "未暫存" -#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c -#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c -#: builtin/pull.c builtin/submodule--helper.c +#: add-interactive.c:1164 apply.c:5093 apply.c:5096 builtin/am.c:2346 +#: builtin/am.c:2349 builtin/bugreport.c:120 builtin/clone.c:144 +#: builtin/diagnose.c:25 builtin/fetch.c:2165 builtin/hook.c:30 +#: builtin/merge.c:269 builtin/pull.c:196 builtin/submodule--helper.c:1776 +#: builtin/submodule--helper.c:1779 msgid "path" msgstr "路徑" -#: add-interactive.c +#: add-interactive.c:1171 msgid "could not refresh index" msgstr "無法重新整理索引" -#: add-interactive.c builtin/clean.c +#: add-interactive.c:1185 builtin/clean.c:812 #, c-format msgid "Bye.\n" msgstr "再見。\n" -#: add-patch.c +#: add-patch.c:40 #, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暫存模式更動 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:41 #, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:42 #, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "暫存加入動作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:43 #, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暫存此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:45 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "如果修補檔能完全套用，編輯區塊將立即標記為暫存。" -#: add-patch.c +#: add-patch.c:48 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -277,33 +285,33 @@ msgstr "" "a - 暫存此區塊和本檔案中後面的全部區塊\n" "d - 不暫存此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c +#: add-patch.c:62 #, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "貯存模式更動 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:63 #, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "貯存刪除動作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:64 #, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "貯存加入動作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:65 #, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "貯存此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:67 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "如果修補檔能完全套用，編輯區塊將立即標記為貯存。" -#: add-patch.c +#: add-patch.c:70 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -317,33 +325,33 @@ msgstr "" "a - 貯存此區塊和本檔案中後面的全部區塊\n" "d - 不貯存此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c +#: add-patch.c:86 #, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暫存模式更動 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:87 #, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:88 #, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "取消暫存加入動作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:89 #, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:91 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "如果修補檔能完全套用，編輯區塊將立即標記為未暫存。" -#: add-patch.c +#: add-patch.c:94 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -357,33 +365,33 @@ msgstr "" "a - 不暫存此區塊和本檔案中後面的全部區塊\n" "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c +#: add-patch.c:109 #, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "將模式更動套用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:110 #, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "將刪除動作套用至索引 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:111 #, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "將加入動作套用至索引 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:112 #, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:114 add-patch.c:182 add-patch.c:227 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "如果修補檔能完全套用，編輯區塊將立即標記為套用。" -#: add-patch.c +#: add-patch.c:117 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -397,33 +405,33 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c +#: add-patch.c:132 add-patch.c:200 #, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "從工作區捨棄模式更動 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:133 add-patch.c:201 #, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "從工作區捨棄刪除動作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:134 add-patch.c:202 #, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "從工作區捨棄加入動作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:135 add-patch.c:203 #, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "從工作區捨棄此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:137 add-patch.c:160 add-patch.c:205 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "如果修補檔能完全套用，編輯區塊將立即標記為捨棄。" -#: add-patch.c +#: add-patch.c:140 add-patch.c:208 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -437,27 +445,27 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c +#: add-patch.c:155 #, c-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 +#: add-patch.c:156 #, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作區捨棄刪除 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:157 #, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作區捨棄加入動作 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:158 #, c-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 +#: add-patch.c:163 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -471,27 +479,27 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c +#: add-patch.c:177 #, c-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 +#: add-patch.c:178 #, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:179 #, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "將加入動作套用到索引和工作區 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:180 #, c-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 +#: add-patch.c:185 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -505,27 +513,27 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c +#: add-patch.c:222 #, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "將模式更動套用到工作區 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:223 #, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "將刪除動作套用到工作區 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:224 #, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "將加入動作套用到工作區 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:225 #, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c:230 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -539,29 +547,29 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c +#: add-patch.c:350 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "無法解析區塊標頭 “%.*s”" -#: add-patch.c +#: add-patch.c:438 msgid "could not parse diff" msgstr "無法解析差異" -#: add-patch.c +#: add-patch.c:457 msgid "could not parse colored diff" msgstr "無法解析上色過的差異" -#: add-patch.c +#: add-patch.c:471 #, c-format msgid "failed to run '%s'" msgstr "無法執行 “%s”" -#: add-patch.c +#: add-patch.c:629 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的輸出不符" -#: add-patch.c +#: add-patch.c:630 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -569,7 +577,7 @@ msgstr "" "您的過濾器必須在其輸入及輸出列\n" "維持一對一的對應關係。" -#: add-patch.c +#: add-patch.c:817 #, c-format msgid "" "expected context line #%d in\n" @@ -578,7 +586,7 @@ msgstr "" "預期在下述位置有上下文列 #%d：\n" "%.*s" -#: add-patch.c +#: add-patch.c:832 #, c-format msgid "" "hunks do not overlap:\n" @@ -591,24 +599,24 @@ msgstr "" "\t結尾不是：\n" "%.*s" -#: add-patch.c +#: add-patch.c:1109 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手動區塊編輯模式——檢視底部的快速指引。\n" -#: add-patch.c +#: add-patch.c:1113 #, c-format msgid "" "---\n" "To remove '%c' lines, make them ' ' lines (context).\n" "To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" +"Lines starting with %s will be removed.\n" msgstr "" "---\n" -"要刪除 “%c” 開頭的列，請將列首（上下文）改成空白。\n" -"要刪除 “%c” 開頭的列，請直接刪除。\n" -"開頭是 %c 的列將會被移除。\n" +"要刪除「%c」開頭的列，請將列首（上下文）改成空白。\n" +"要刪除「%c」開頭的列，請直接刪除。\n" +"開頭是 %s 的列將會被移除。\n" -#: add-patch.c +#: add-patch.c:1128 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" @@ -618,11 +626,11 @@ msgstr "" "若刪掉此區塊的所有內容，則會中止編輯，\n" "區塊則不會變更。\n" -#: add-patch.c +#: add-patch.c:1161 msgid "could not parse hunk header" msgstr "無法解析區塊標頭" -#: add-patch.c +#: add-patch.c:1206 msgid "'git apply --cached' failed" msgstr "“git apply --cached” 失敗" @@ -632,24 +640,24 @@ msgstr "“git apply --cached” 失敗" #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#: add-patch.c +#: add-patch.c:1275 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "未套用您編輯的區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? " -#: add-patch.c +#: add-patch.c:1318 msgid "The selected hunks do not apply to the index!" msgstr "選取的區塊無法套用至索引！" -#: add-patch.c +#: add-patch.c:1319 msgid "Apply them to the worktree anyway? " msgstr "無論如何都要套用到工作區嗎? " -#: add-patch.c +#: add-patch.c:1326 msgid "Nothing was applied.\n" msgstr "未套用。\n" -#: add-patch.c +#: add-patch.c:1383 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -659,84 +667,86 @@ msgid "" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" +"p - print the current hunk\n" "? - print help\n" msgstr "" -"j - 維持此區塊未決狀態，檢視下一個未決定區塊\n" -"J - 維持此區塊未決狀態，檢視下一個區塊\n" -"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n" -"K - 維持此區塊未決狀態，檢視上一個區塊\n" +"j - 維持此區塊未決定狀態，檢視下一個未決定區塊\n" +"J - 維持此區塊未決定狀態，檢視下一個區塊\n" +"k - 維持此區塊未決定狀態，檢視上一個未決定區塊\n" +"K - 維持此區塊未決定狀態，檢視上一個區塊\n" "g - 選擇要跳轉至的區塊\n" "/ - 尋找符合提供之常規表示式的區塊\n" "s - 分割目前區塊為更小的區塊\n" "e - 手動編輯目前區塊\n" +"p - 輸出目前區塊\n" "? - 顯示說明\n" -#: add-patch.c +#: add-patch.c:1550 add-patch.c:1560 msgid "No previous hunk" msgstr "沒有上一個區塊" -#: add-patch.c +#: add-patch.c:1555 add-patch.c:1565 msgid "No next hunk" msgstr "沒有下一個區塊" -#: add-patch.c +#: add-patch.c:1571 msgid "No other hunks to goto" msgstr "沒有其它可以跳轉的區塊" -#: add-patch.c +#: add-patch.c:1582 msgid "go to which hunk ( to see more)? " msgstr "要跳轉到哪個區塊（ 檢視更多）? " -#: add-patch.c +#: add-patch.c:1583 msgid "go to which hunk? " msgstr "跳轉到哪個區塊? " -#: add-patch.c +#: add-patch.c:1594 #, c-format msgid "Invalid number: '%s'" msgstr "無效數字：“%s”" -#: add-patch.c +#: add-patch.c:1599 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "對不起，只有 %d 個可用區塊。" -#: add-patch.c +#: add-patch.c:1608 msgid "No other hunks to search" msgstr "沒有其它可以尋找的區塊" -#: add-patch.c +#: add-patch.c:1614 msgid "search for regex? " msgstr "使用常規表示式搜尋? " -#: add-patch.c +#: add-patch.c:1629 #, c-format msgid "Malformed search regexp %s: %s" msgstr "格式錯誤的常規表示式 %s：%s" -#: add-patch.c +#: add-patch.c:1646 msgid "No hunk matches the given pattern" msgstr "沒有符合提供模式的區塊" -#: add-patch.c +#: add-patch.c:1654 msgid "Sorry, cannot split this hunk" msgstr "對不起，不能分割這個區塊" -#: add-patch.c +#: add-patch.c:1658 #, c-format msgid "Split into %d hunks." msgstr "分割為 %d 個區塊。" -#: add-patch.c +#: add-patch.c:1664 msgid "Sorry, cannot edit this hunk" msgstr "對不起，無法編輯這個區塊" -#: add-patch.c +#: add-patch.c:1718 msgid "'git apply' failed" msgstr "“git apply” 失敗" -#: advice.c +#: advice.c:92 #, c-format msgid "" "\n" @@ -745,36 +755,36 @@ msgstr "" "\n" "請使用 “git config advice.%s false” 停用此訊息" -#: advice.c +#: advice.c:108 #, c-format -msgid "%shint: %.*s%s\n" -msgstr "%s提示：%.*s%s\n" +msgid "%shint:%s%.*s%s\n" +msgstr "%s提示：%s%.*s%s\n" -#: advice.c +#: advice.c:196 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "無法揀選，有未合併的檔案。" -#: advice.c +#: advice.c:198 msgid "Committing is not possible because you have unmerged files." msgstr "無法提交，有未合併的檔案。" -#: advice.c +#: advice.c:200 msgid "Merging is not possible because you have unmerged files." msgstr "無法合併，有未合併的檔案。" -#: advice.c +#: advice.c:202 msgid "Pulling is not possible because you have unmerged files." msgstr "無法拉取，有未合併的檔案。" -#: advice.c +#: advice.c:204 msgid "Reverting is not possible because you have unmerged files." msgstr "無法還原提交，有未合併的檔案。" -#: advice.c +#: advice.c:206 msgid "Rebasing is not possible because you have unmerged files." msgstr "無法重定基底，有未合併的檔案。" -#: advice.c +#: advice.c:215 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -782,23 +792,23 @@ msgstr "" "請在工作區修正檔案，然後視情況使用 “git add/rm ”\n" "命令標記解決方案並提交。" -#: advice.c +#: advice.c:223 msgid "Exiting because of an unresolved conflict." msgstr "存在未解決的衝突，離開。" -#: advice.c builtin/merge.c +#: advice.c:228 builtin/merge.c:1380 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "合併尚未結束（有 MERGE_HEAD）。" -#: advice.c +#: advice.c:230 msgid "Please, commit your changes before merging." msgstr "請在合併前先提交您的更動。" -#: advice.c +#: advice.c:231 msgid "Exiting because of unfinished merge." msgstr "存在未完成的合併，離開。" -#: advice.c +#: advice.c:237 msgid "" "Diverging branches can't be fast-forwarded, you need to either:\n" "\n" @@ -816,11 +826,11 @@ msgstr "" "\n" "\tgit rebase\n" -#: advice.c +#: advice.c:244 msgid "Not possible to fast-forward, aborting." msgstr "無法快轉，中止。" -#: advice.c +#: advice.c:254 #, c-format msgid "" "The following paths and/or pathspecs matched paths that exist\n" @@ -831,7 +841,7 @@ msgstr "" "符合稀疏簽出定義外且存在的路徑，\n" "所以不會在索引中更新：\n" -#: advice.c +#: advice.c:261 msgid "" "If you intend to update such entries, try one of the following:\n" "* Use the --sparse option.\n" @@ -841,7 +851,7 @@ msgstr "" "* 使用 --sparse 選項。\n" "* 停用或修改稀疏規則。" -#: advice.c +#: advice.c:269 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -881,7 +891,7 @@ msgstr "" "將組態變數 advice.detachedHead 設定為 false，即可關閉本建議\n" "\n" -#: advice.c +#: advice.c:296 #, c-format msgid "" "The following paths have been moved outside the\n" @@ -891,7 +901,7 @@ msgstr "" "以下路徑已經移到稀疏簽出定義之外的地方，\n" "但因為有本機更動，因此路徑不是稀疏的。\n" -#: advice.c +#: advice.c:303 msgid "" "To correct the sparsity of these paths, do the following:\n" "* Use \"git add --sparse \" to update the index\n" @@ -901,101 +911,122 @@ msgstr "" "* 使用 “git add --sparse <路徑” 更新索引\n" "* 使用 “git sparse-checkout reapply” 套用稀疏規則" -#: alias.c +#: alias.c:71 msgid "cmdline ends with \\" msgstr "命令列以 \\ 結尾" -#: alias.c +#: alias.c:72 msgid "unclosed quote" msgstr "未閉合的引號" -#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c +#: alias.c:73 builtin/cat-file.c:1072 builtin/notes.c:450 builtin/notes.c:512 +#: builtin/notes.c:594 builtin/notes.c:606 builtin/notes.c:689 +#: builtin/notes.c:765 builtin/notes.c:916 builtin/notes.c:1068 +#: builtin/notes.c:1090 builtin/prune-packed.c:26 builtin/receive-pack.c:2499 +#: builtin/tag.c:625 t/helper/test-pkt-line.c:89 msgid "too many arguments" msgstr "引數過多" -#: apply.c +#: apply.c:84 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "空白字元選項 “%s” 無法識別" -#: apply.c +#: apply.c:100 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "空白字元忽略選項 “%s” 無法識別" -#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.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 +#: apply.c:152 archive.c:683 builtin/add.c:385 builtin/add.c:387 +#: builtin/add.c:393 builtin/add.c:405 builtin/branch.c:832 +#: builtin/checkout-index.c:275 builtin/checkout.c:486 builtin/checkout.c:489 +#: builtin/checkout.c:1781 builtin/checkout.c:1891 builtin/checkout.c:1894 +#: builtin/clean.c:964 builtin/clone.c:976 builtin/clone.c:981 +#: builtin/commit.c:367 builtin/commit.c:370 builtin/commit.c:1244 +#: builtin/commit.c:1300 builtin/commit.c:1317 builtin/describe.c:614 +#: builtin/diff-tree.c:164 builtin/difftool.c:744 builtin/fast-export.c:1262 +#: builtin/fetch.c:2276 builtin/fetch.c:2303 builtin/fetch.c:2317 +#: builtin/fetch.c:2322 builtin/help.c:618 builtin/index-pack.c:1866 +#: builtin/init-db.c:110 builtin/log.c:2109 builtin/log.c:2111 +#: builtin/ls-files.c:744 builtin/merge-base.c:174 builtin/merge-base.c:180 +#: builtin/merge-tree.c:594 builtin/merge.c:1401 builtin/merge.c:1403 +#: builtin/pack-objects.c:4496 builtin/rebase.c:1241 builtin/rebase.c:1243 +#: builtin/rebase.c:1252 builtin/repack.c:1260 builtin/replay.c:312 +#: builtin/reset.c:379 builtin/reset.c:416 builtin/rev-list.c:573 +#: builtin/rev-parse.c:917 builtin/rev-parse.c:924 builtin/rev-parse.c:935 +#: builtin/show-branch.c:722 builtin/show-branch.c:727 builtin/stash.c:1774 +#: builtin/stash.c:1777 builtin/submodule--helper.c:1204 +#: builtin/submodule--helper.c:2960 builtin/tag.c:559 builtin/tag.c:606 +#: builtin/worktree.c:730 builtin/worktree.c:733 builtin/worktree.c:806 +#: builtin/worktree.c:809 builtin/worktree.c:812 builtin/worktree.c:1053 +#: parse-options.c:280 parse-options.c:1326 range-diff.c:572 revision.c:2442 +#: revision.c:2447 revision.c:2451 revision.c:2460 revision.c:2465 +#: revision.c:2696 revision.c:2767 revision.c:2779 revision.c:2785 +#: revision.c:2804 revision.c:2812 revision.c:2820 revision.c:3103 +#: revision.c:3115 #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "無法同時使用 “%s” 和 “%s” 選項" -#: apply.c +#: apply.c:155 apply.c:166 apply.c:169 #, c-format msgid "'%s' outside a repository" msgstr "“%s” 在版本庫之外" -#: apply.c +#: apply.c:416 msgid "failed to read patch" msgstr "無法讀取修補檔" -#: apply.c +#: apply.c:418 msgid "patch too large" msgstr "修補檔過大" -#: apply.c +#: apply.c:832 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "無法準備時間戳常規表示式 %s" -#: apply.c +#: apply.c:841 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 回傳 %d，輸入為：%s" -#: apply.c +#: apply.c:915 #, c-format msgid "unable to find filename in patch at line %d" msgstr "無法在修補檔的第 %d 列找到檔案名稱" -#: apply.c +#: apply.c:953 #, 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 +#: apply.c:959 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：無效的 git-diff — 第 %d 列的新檔案名稱不一致" -#: apply.c +#: apply.c:960 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：無效的 git-diff — 第 %d 列上舊檔案名稱不一致" -#: apply.c +#: apply.c:965 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：無效的 git-diff — 第 %d 列處預期是 /dev/null" -#: apply.c +#: apply.c:994 #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 列包含無效檔案模式：%s" -#: apply.c +#: apply.c:1320 #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的檔案標頭（%d 列和 %d 列）" -#: apply.c +#: apply.c:1410 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1005,91 +1036,91 @@ msgid_plural "" "components (line %d)" msgstr[0] "移除 %d 個前導路徑部分後，git diff 標頭缺少檔案名稱資訊（第 %d 列）" -#: apply.c +#: apply.c:1423 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 標頭缺少檔案名稱資訊（第 %d 列）" -#: apply.c +#: apply.c:1519 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：遇到非預期的列：%.*s" -#: apply.c +#: apply.c:1588 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 列的修補檔區段沒有標頭：%.*s" -#: apply.c +#: apply.c:1791 msgid "new file depends on old contents" msgstr "新檔案依賴舊內容" -#: apply.c +#: apply.c:1793 msgid "deleted file still has contents" msgstr "刪除的檔案仍有內容" -#: apply.c +#: apply.c:1827 #, c-format msgid "corrupt patch at line %d" msgstr "修補檔在第 %d 列發現損壞" -#: apply.c +#: apply.c:1864 #, c-format msgid "new file %s depends on old contents" msgstr "新檔案 %s 依賴舊內容" -#: apply.c +#: apply.c:1866 #, c-format msgid "deleted file %s still has contents" msgstr "刪除的檔案 %s 仍有內容" -#: apply.c +#: apply.c:1869 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：檔案 %s 成為空檔案但並未刪除" -#: apply.c +#: apply.c:2017 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二進位修補檔在第 %d 列損壞：%.*s" -#: apply.c +#: apply.c:2054 #, c-format msgid "unrecognized binary patch at line %d" msgstr "第 %d 列的二進位修補檔無法識別" -#: apply.c +#: apply.c:2216 #, c-format msgid "patch with only garbage at line %d" msgstr "修補檔案的第 %d 列只有垃圾資料" -#: apply.c +#: apply.c:2303 #, c-format msgid "unable to read symlink %s" msgstr "無法讀取符號連結 %s" -#: apply.c +#: apply.c:2307 #, c-format msgid "unable to open or read %s" msgstr "無法開啟或讀取 %s" -#: apply.c +#: apply.c:2976 #, c-format msgid "invalid start of line: '%c'" msgstr "無效的列首字元：“%c”" -#: apply.c +#: apply.c:3097 #, 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 +#: apply.c:3109 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文減少到（%ld/%ld）以在第 %d 列套用修補檔區塊" -#: apply.c +#: apply.c:3115 #, c-format msgid "" "while searching for:\n" @@ -1098,670 +1129,683 @@ msgstr "" "當查詢：\n" "%.*s" -#: apply.c +#: apply.c:3137 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺少 “%s” 的二進位修補檔資料" -#: apply.c +#: apply.c:3145 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "無法反向套用一個缺少至 “%s” 的反向資料區塊的二進位修補檔" -#: apply.c +#: apply.c:3192 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "無法在 “%s” 上套用沒有完整索引列的二進位修補檔" -#: apply.c +#: apply.c:3203 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "修補檔要套用到 “%s”（%s），但與目前內容不符。" -#: apply.c +#: apply.c:3211 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "修補檔要套用至空檔案 “%s”，但其非空檔案" -#: apply.c +#: apply.c:3230 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "無法讀取 “%2$s” 必須的目標檔案 %1$s" -#: apply.c +#: apply.c:3243 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二進位修補檔未套用到 “%s”" -#: apply.c +#: apply.c:3250 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "修補 “%s” 的二進位修補檔，產生了不正確的結果（預期 %s，卻為 %s）" -#: apply.c +#: apply.c:3271 #, c-format msgid "patch failed: %s:%ld" msgstr "修補失敗：%s:%ld" -#: apply.c builtin/mv.c +#: apply.c:3395 builtin/mv.c:507 #, c-format msgid "cannot checkout %s" msgstr "無法簽出 %s" -#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c +#: apply.c:3447 apply.c:3458 apply.c:3504 midx.c:110 pack-mtimes.c:42 +#: pack-revindex.c:223 setup.c:324 #, c-format msgid "failed to read %s" msgstr "無法讀取 %s" -#: apply.c +#: apply.c:3455 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "讀取符號連結背後的 “%s”" -#: apply.c +#: apply.c:3484 apply.c:3759 #, c-format msgid "path %s has been renamed/deleted" msgstr "路徑 %s 已被重新命名或刪除" -#: apply.c +#: apply.c:3595 apply.c:3774 #, c-format msgid "%s: does not exist in index" msgstr "%s：不在索引中" -#: apply.c +#: apply.c:3604 apply.c:3782 apply.c:4007 #, c-format msgid "%s: does not match index" msgstr "%s：與索引不符" -#: apply.c +#: apply.c:3641 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "版本庫缺少用來進行三方合併，所需要的資料物件。" -#: apply.c +#: apply.c:3644 #, c-format msgid "Performing three-way merge...\n" msgstr "正在進行三方合併……\n" -#: apply.c +#: apply.c:3660 apply.c:3664 #, c-format msgid "cannot read the current contents of '%s'" msgstr "無法讀取 “%s” 目前的內容" -#: apply.c +#: apply.c:3676 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "無法進行三方合併……\n" -#: apply.c +#: apply.c:3690 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "已套用對 “%s” 的修補檔，但有衝突。\n" -#: apply.c +#: apply.c:3695 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "已完全套用對 “%s” 的修補檔。\n" -#: apply.c +#: apply.c:3712 #, c-format msgid "Falling back to direct application...\n" msgstr "回復至直接套用模式⋯⋯\n" -#: apply.c +#: apply.c:3726 msgid "removal patch leaves file contents" msgstr "移除性的修補檔仍有留下檔案內容" -#: apply.c +#: apply.c:3808 #, c-format msgid "%s: wrong type" msgstr "%s：錯誤類型" -#: apply.c +#: apply.c:3810 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，預期是 %o" -#: apply.c read-cache.c +#: apply.c:3947 apply.c:3949 read-cache.c:838 read-cache.c:867 +#: read-cache.c:1334 #, c-format msgid "invalid path '%s'" msgstr "路徑 “%s” 無效" -#: apply.c +#: apply.c:4005 #, c-format msgid "%s: already exists in index" msgstr "%s：已存在於索引中" -#: apply.c +#: apply.c:4009 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已存在於工作區中" -#: apply.c +#: apply.c:4029 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "%2$s 的新模式 (%1$o) 和舊模式 (%3$o) 不符" +msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符" -#: apply.c +#: apply.c:4034 #, 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) 不符" +msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符" -#: apply.c +#: apply.c:4054 apply.c:4484 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影響的檔案 “%s” 在符號連結後" -#: apply.c +#: apply.c:4058 #, c-format msgid "%s: patch does not apply" msgstr "%s：未套用修補檔" -#: apply.c +#: apply.c:4073 #, c-format msgid "Checking patch %s..." msgstr "正在檢查修補檔 %s……" -#: apply.c +#: apply.c:4165 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "%s 子模組缺少 sha1 資訊或沒有幫助" -#: apply.c +#: apply.c:4172 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式有更動，但其不在目前 HEAD 中" -#: apply.c +#: apply.c:4175 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "缺少 sha1 資訊或沒有幫助 (%s)。" -#: apply.c +#: apply.c:4184 #, c-format msgid "could not add %s to temporary index" msgstr "無法將 %s 加進暫存索引" -#: apply.c +#: apply.c:4194 #, c-format msgid "could not write temporary index to %s" msgstr "無法將暫存索引寫入 %s" -#: apply.c +#: apply.c:4332 #, c-format msgid "unable to remove %s from index" msgstr "無法從索引移除 %s" -#: apply.c +#: apply.c:4366 #, c-format msgid "corrupt patch for submodule %s" msgstr "修補 %s 子模組的修補檔損壞" -#: apply.c +#: apply.c:4372 #, c-format msgid "unable to stat newly created file '%s'" msgstr "無法對剛建立的檔案 “%s” 執行 stat" -#: apply.c +#: apply.c:4380 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "無法對剛建立的檔案 %s 建立後端儲存" -#: apply.c +#: apply.c:4386 apply.c:4561 #, c-format msgid "unable to add cache entry for %s" msgstr "無法為 %s 加入快取項目" -#: apply.c builtin/bisect.c builtin/gc.c +#: apply.c:4429 builtin/bisect.c:607 builtin/gc.c:2410 builtin/gc.c:2472 #, c-format msgid "failed to write to '%s'" msgstr "無法寫入 “%s”" -#: apply.c +#: apply.c:4433 #, c-format msgid "closing file '%s'" msgstr "關閉檔案 “%s”" -#: apply.c +#: apply.c:4531 #, c-format msgid "unable to write file '%s' mode %o" msgstr "無法以模式 %2$o 寫入 “%1$s” 檔案" -#: apply.c +#: apply.c:4631 #, c-format msgid "Applied patch %s cleanly." msgstr "已完全套用 %s 修補檔。" -#: apply.c +#: apply.c:4639 msgid "internal error" msgstr "內部錯誤" -#: apply.c +#: apply.c:4642 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕……" -#: apply.c -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "正在將 .rej 檔案名稱截短為 %.*s.rej" - -#: apply.c +#: apply.c:4655 apply.c:4664 apply.c:4670 #, c-format msgid "cannot open %s" msgstr "無法開啟 %s" -#: apply.c rerere.c +#: apply.c:4659 rerere.c:1076 #, c-format msgid "cannot unlink '%s'" msgstr "無法刪除 “%s”" -#: apply.c +#: apply.c:4687 #, c-format msgid "Hunk #%d applied cleanly." msgstr "成功完全套用第 #%d 個區塊。" -#: apply.c +#: apply.c:4691 #, c-format msgid "Rejected hunk #%d." msgstr "拒絕第 #%d 個區塊。" -#: apply.c +#: apply.c:4822 #, c-format msgid "Skipped patch '%s'." msgstr "略過修補檔 “%s”。" -#: apply.c +#: apply.c:4831 msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "輸入沒有有效的修補檔內容（傳入 “--allow-empty” 允許此行為）" -#: apply.c t/helper/test-cache-tree.c +#: apply.c:4852 t/helper/test-cache-tree.c:39 msgid "unable to read index file" msgstr "無法讀取索引檔案" -#: apply.c +#: apply.c:5009 #, c-format msgid "can't open patch '%s': %s" msgstr "無法開啟修補檔 “%s”：%s" -#: apply.c +#: apply.c:5036 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 個空白字元誤用" -#: apply.c +#: apply.c:5042 apply.c:5057 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 列加入了空白字元誤用。" -#: apply.c +#: apply.c:5050 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修正空白誤用後，套用了 %d 列。" -#: apply.c builtin/mv.c builtin/rm.c +#: apply.c:5066 builtin/mv.c:566 builtin/rm.c:440 msgid "Unable to write new index file" msgstr "無法寫入新索引檔案" -#: apply.c +#: apply.c:5094 msgid "don't apply changes matching the given path" msgstr "不要套用符合提供路徑的更動" -#: apply.c +#: apply.c:5097 msgid "apply changes matching the given path" msgstr "套用符合提供路徑的更動" -#: apply.c builtin/am.c +#: apply.c:5099 builtin/am.c:2355 msgid "num" msgstr "數字" -#: apply.c +#: apply.c:5100 msgid "remove leading slashes from traditional diff paths" msgstr "從傳統的 diff 路徑中移除 個前導斜線" -#: apply.c +#: apply.c:5103 msgid "ignore additions made by the patch" msgstr "忽略修補檔中的加入內容" -#: apply.c +#: apply.c:5105 msgid "instead of applying the patch, output diffstat for the input" msgstr "不套用修補檔，而是顯示輸入的差異統計 (diffstat)" -#: apply.c +#: apply.c:5109 msgid "show number of added and deleted lines in decimal notation" msgstr "以十進位數字，顯示加入和刪除的列數" -#: apply.c +#: apply.c:5111 msgid "instead of applying the patch, output a summary for the input" msgstr "不套用修補檔，而是顯示輸入的概要" -#: apply.c +#: apply.c:5113 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不套用修補檔，而是檢視修補檔是否可套用" -#: apply.c +#: apply.c:5115 msgid "make sure the patch is applicable to the current index" msgstr "確認修補檔可以套用到目前索引" -#: apply.c +#: apply.c:5117 msgid "mark new files with `git add --intent-to-add`" msgstr "使用 `git add --intent-to-add` 命令標記新檔案" -#: apply.c +#: apply.c:5119 msgid "apply a patch without touching the working tree" msgstr "套用修補檔而不修改工作區" -#: apply.c +#: apply.c:5121 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作區之外檔案的修補檔" -#: apply.c +#: apply.c:5124 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "亦套用修補檔（與 --stat/--summary/--check 選項同時使用）" -#: apply.c +#: apply.c:5126 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "嘗試三方合併，若失敗則回到正常修補模式" -#: apply.c +#: apply.c:5128 msgid "build a temporary index based on embedded index information" msgstr "組建以嵌入索引資訊為基礎的暫存索引" -#: apply.c builtin/checkout-index.c +#: apply.c:5131 builtin/checkout-index.c:235 msgid "paths are separated with NUL character" msgstr "路徑以 NUL 字元分隔" -#: apply.c +#: apply.c:5133 msgid "ensure at least lines of context match" msgstr "確保至少符合 列上下文" -#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c -#: builtin/rebase.c +#: apply.c:5134 builtin/am.c:2331 builtin/am.c:2334 +#: builtin/interpret-trailers.c:202 builtin/interpret-trailers.c:204 +#: builtin/pack-objects.c:4378 builtin/rebase.c:1096 msgid "action" msgstr "動作" -#: apply.c +#: apply.c:5135 msgid "detect new or modified lines that have whitespace errors" msgstr "檢查新增和修改的列中間，是否有空白字元誤用" -#: apply.c +#: apply.c:5138 apply.c:5141 msgid "ignore changes in whitespace when finding context" msgstr "尋找上下文時忽略空白字元更動" -#: apply.c +#: apply.c:5144 msgid "apply the patch in reverse" msgstr "反向套用修補檔" -#: apply.c +#: apply.c:5146 msgid "don't expect at least one line of context" msgstr "無需至少一列上下文" -#: apply.c +#: apply.c:5148 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "將拒絕的修補檔區塊，留在對應的 *.rej 檔案中" -#: apply.c +#: apply.c:5150 msgid "allow overlapping hunks" msgstr "允許重疊區塊" -#: apply.c +#: apply.c:5153 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允許不正確的檔案末尾換列符號" -#: apply.c +#: apply.c:5156 msgid "do not trust the line counts in the hunk headers" msgstr "不信任區塊標頭中的列號" -#: apply.c builtin/am.c +#: apply.c:5158 builtin/am.c:2343 msgid "root" msgstr "根目錄" -#: apply.c +#: apply.c:5159 msgid "prepend to all filenames" msgstr "在所有檔案名稱前加上 " -#: apply.c +#: apply.c:5162 msgid "don't return error for empty patches" msgstr "遇到空白修補檔時，不回傳錯誤" -#: archive-tar.c archive-zip.c +#: archive-tar.c:137 archive-zip.c:351 #, c-format msgid "cannot stream blob %s" msgstr "無法串流資料物件 %s" -#: archive-tar.c archive-zip.c +#: archive-tar.c:277 archive-zip.c:364 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支援的檔案模式：0%o (SHA1：%s)" -#: archive-tar.c archive-zip.c builtin/pack-objects.c +#: archive-tar.c:457 archive-zip.c:475 builtin/pack-objects.c:376 +#: builtin/pack-objects.c:379 #, c-format msgid "deflate error (%d)" msgstr "壓縮錯誤 (%d)" -#: archive-tar.c +#: archive-tar.c:510 #, c-format msgid "unable to start '%s' filter" msgstr "無法啟動 “%s” 過濾器" -#: archive-tar.c +#: archive-tar.c:513 msgid "unable to redirect descriptor" msgstr "無法重新導向描述元" -#: archive-tar.c +#: archive-tar.c:520 #, c-format msgid "'%s' filter reported error" msgstr "“%s” 過濾器回報錯誤" -#: archive-zip.c +#: archive-zip.c:324 #, c-format msgid "path is not valid UTF-8: %s" msgstr "路徑不是有效的 UTF-8：%s" -#: archive-zip.c +#: archive-zip.c:328 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路徑太長（%d 個字元，SHA1：%s）：%s" -#: archive-zip.c +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %" msgstr "對本系統而言時間戳太大：%" -#: archive.c +#: archive.c:24 msgid "git archive [] [...]" msgstr "git archive [] [...]" -#: archive.c +#: archive.c:26 msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" "git archive --remote [--exec ] [] [...]" -#: archive.c +#: archive.c:27 msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote [--exec ] --list" -#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c +#: archive.c:220 archive.c:376 builtin/gc.c:566 builtin/notes.c:298 +#: builtin/tag.c:612 #, c-format msgid "cannot read '%s'" msgstr "無法讀取 “%s”" -#: archive.c +#: archive.c:471 #, c-format msgid "pathspec '%s' matches files outside the current directory" msgstr "符合路徑規格 “%s” 的檔案在目前目錄之外" -#: archive.c builtin/add.c builtin/rm.c +#: archive.c:494 builtin/add.c:133 builtin/add.c:534 builtin/rm.c:344 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路徑規格 “%s” 未符合任何檔案" -#: archive.c +#: archive.c:517 #, c-format msgid "no such ref: %.*s" msgstr "無此引用：%.*s" -#: archive.c +#: archive.c:524 #, c-format msgid "not a valid object name: %s" msgstr "非有效物件名稱：%s" -#: archive.c t/helper/test-cache-tree.c +#: archive.c:539 t/helper/test-cache-tree.c:44 #, c-format msgid "not a tree object: %s" msgstr "非樹狀物件：%s" -#: archive.c +#: archive.c:580 #, c-format msgid "File not found: %s" msgstr "找不到檔案：%s" -#: archive.c +#: archive.c:582 #, c-format msgid "Not a regular file: %s" msgstr "不是一般檔案：%s" -#: archive.c +#: archive.c:591 #, c-format msgid "unclosed quote: '%s'" msgstr "未閉合的引號：“%s”" -#: archive.c +#: archive.c:594 #, c-format msgid "missing colon: '%s'" msgstr "缺少冒號：“%s”" -#: archive.c +#: archive.c:597 #, c-format msgid "empty file name: '%s'" msgstr "檔案名稱空白：“%s”" -#: archive.c +#: archive.c:644 msgid "fmt" msgstr "fmt" -#: archive.c +#: archive.c:644 msgid "archive format" msgstr "封存格式" -#: archive.c builtin/log.c parse-options.h +#: archive.c:645 builtin/log.c:1941 parse-options.h:532 msgid "prefix" msgstr "前綴" -#: archive.c +#: archive.c:646 msgid "prepend prefix to each pathname in the archive" msgstr "為封存中的每個路徑名稱加上前綴" -#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c -#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c -#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h +#: archive.c:647 archive.c:653 builtin/blame.c:899 builtin/blame.c:903 +#: builtin/blame.c:904 builtin/commit-tree.c:107 builtin/config.c:144 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1200 +#: builtin/fast-export.c:1204 builtin/gc.c:1525 builtin/gc.c:1590 +#: builtin/grep.c:992 builtin/hash-object.c:112 builtin/ls-files.c:610 +#: builtin/ls-files.c:613 builtin/notes.c:487 builtin/notes.c:663 +#: builtin/read-tree.c:122 parse-options.h:330 msgid "file" msgstr "file" -#: archive.c +#: archive.c:648 archive.c:651 msgid "add untracked file to archive" msgstr "將未追蹤檔案加進封存" -#: archive.c +#: archive.c:651 msgid "path:content" msgstr "path:content" -#: archive.c builtin/archive.c +#: archive.c:654 builtin/archive.c:88 msgid "write the archive to this file" msgstr "將封存寫入此檔案" -#: archive.c +#: archive.c:656 msgid "read .gitattributes in working directory" msgstr "讀取工作目錄中的 .gitattributes" -#: archive.c +#: archive.c:657 msgid "report archived files on stderr" msgstr "在 stderr 上回報封存的檔案" -#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c +#: archive.c:658 builtin/clone.c:148 builtin/fetch.c:2196 +#: builtin/pack-objects.c:4347 builtin/pack-objects.c:4351 builtin/pull.c:217 msgid "time" msgstr "time" -#: archive.c +#: archive.c:659 msgid "set modification time of archive entries" msgstr "設定封存項目的修改時間" -#: archive.c +#: archive.c:662 msgid "set compression level" msgstr "設定壓縮級別" -#: archive.c +#: archive.c:665 msgid "list supported archive formats" msgstr "列出支援的封存格式" -#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c +#: archive.c:667 builtin/archive.c:89 builtin/clone.c:134 builtin/clone.c:137 +#: builtin/submodule--helper.c:1788 builtin/submodule--helper.c:2684 msgid "repo" msgstr "repo" -#: archive.c builtin/archive.c +#: archive.c:668 builtin/archive.c:90 msgid "retrieve the archive from remote repository " msgstr "從遠端版本庫 擷取封存檔案" -#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c +#: archive.c:669 builtin/archive.c:91 builtin/difftool.c:719 +#: builtin/notes.c:583 msgid "command" msgstr "command" -#: archive.c builtin/archive.c +#: archive.c:670 builtin/archive.c:92 msgid "path to the remote git-upload-archive command" msgstr "遠端 git-upload-archive 命令的路徑" -#: archive.c +#: archive.c:677 msgid "Unexpected option --remote" msgstr "非預期選項 --remote" -#: 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 +#: archive.c:679 builtin/add.c:408 builtin/add.c:440 builtin/checkout.c:1900 +#: builtin/clone.c:1210 builtin/clone.c:1213 builtin/commit.c:379 +#: builtin/fast-export.c:1247 builtin/index-pack.c:1862 builtin/log.c:2279 +#: builtin/reset.c:388 builtin/reset.c:449 builtin/rm.c:288 +#: builtin/stash.c:1786 builtin/worktree.c:818 builtin/worktree.c:1055 +#: fetch-pack.c:342 http-fetch.c:150 http-fetch.c:159 revision.c:3117 #, c-format msgid "the option '%s' requires '%s'" msgstr "“%s” 選項需要 “%s”" -#: archive.c +#: archive.c:681 msgid "Unexpected option --output" msgstr "非預期選項 --output" -#: archive.c +#: archive.c:690 +#, c-format +msgid "extra command line parameter '%s'" +msgstr "多出命令列參數 “%s”" + +#: archive.c:707 #, c-format msgid "Unknown archive format '%s'" msgstr "封存格式 “%s” 未知" -#: archive.c +#: archive.c:716 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "引數不支援 “%s” 格式：-%d" -#: attr.c +#: attr.c:219 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是有效的屬性名稱" -#: attr.c +#: attr.c:247 msgid "unable to add additional attribute" msgstr "無法加入其他屬性" -#: attr.c +#: attr.c:369 #, c-format msgid "ignoring overly long attributes line %d" msgstr "忽略過長的屬性列 (第 %d 列)" -#: attr.c +#: attr.c:384 #, c-format msgid "%s not allowed: %s:%d" msgstr "不允許 %s：%s:%d" -#: attr.c +#: attr.c:423 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1769,41 +1813,54 @@ msgstr "" "git attributes 會忽略反向模式\n" "當字串確定要以驚嘆號開始時，請使用 “\\!”。" -#: attr.c +#: attr.c:746 #, c-format msgid "cannot fstat gitattributes file '%s'" msgstr "無法 fstat gitattributes 檔案 “%s”" -#: attr.c +#: attr.c:751 #, c-format msgid "ignoring overly large gitattributes file '%s'" msgstr "忽略過大的 gitattributes 檔案 “%s”" -#: attr.c +#: attr.c:866 #, c-format msgid "ignoring overly large gitattributes blob '%s'" msgstr "忽略過大的 gitattributes 資料物件 “%s”" -#: attr.c +#: attr.c:1239 msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE" -#: bisect.c +#: attr.c:1286 read-cache.c:797 +#, c-format +msgid "unable to stat '%s'" +msgstr "無法對 %s 執行 stat" + +#: bisect.c:162 builtin/cat-file.c:229 builtin/cat-file.c:493 +#: builtin/index-pack.c:765 builtin/notes.c:720 builtin/pack-objects.c:302 +#: builtin/pack-objects.c:363 builtin/pack-objects.c:471 combine-diff.c:341 +#: rerere.c:982 +#, c-format +msgid "unable to read %s" +msgstr "不能讀 %s" + +#: bisect.c:492 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "檔案 “%s” 包含無效的引用內容：%s" -#: bisect.c +#: bisect.c:704 #, c-format msgid "We cannot bisect more!\n" msgstr "已經無法繼續二分搜尋！\n" -#: bisect.c +#: bisect.c:758 #, c-format msgid "Not a valid commit name %s" msgstr "%s 不是有效的提交名稱" -#: bisect.c +#: bisect.c:783 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1812,7 +1869,7 @@ msgstr "" "合併基礎 %s 是壞的。\n" "這意味著 bug 已經在 %s 和 [%s] 之間被修正。\n" -#: bisect.c +#: bisect.c:788 #, c-format msgid "" "The merge base %s is new.\n" @@ -1821,7 +1878,7 @@ msgstr "" "合併基礎 %s 是新的。\n" "介於 %s 和 [%s] 之間的屬性已被修改。\n" -#: bisect.c +#: bisect.c:793 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1830,7 +1887,7 @@ msgstr "" "合併基礎 %s 是 %s。\n" "這意味著第一個 “%s” 提交位於 %s 和 [%s] 之間。\n" -#: bisect.c +#: bisect.c:801 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1841,7 +1898,7 @@ msgstr "" "這種情況下 git bisect 無法正常運作。\n" "您可能弄錯了 %s 和 %s 修訂版？\n" -#: bisect.c +#: bisect.c:814 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1852,36 +1909,41 @@ msgstr "" "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n" "我們仍舊繼續。" -#: bisect.c +#: bisect.c:855 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分搜尋中：合併基礎必須經過測試\n" -#: bisect.c +#: bisect.c:908 #, c-format msgid "a %s revision is needed" msgstr "需要一個 %s 修訂版" -#: bisect.c +#: bisect.c:938 #, c-format msgid "could not create file '%s'" msgstr "無法建立 “%s” 檔案" -#: bisect.c builtin/merge.c +#: bisect.c:973 builtin/notes.c:177 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "不能為物件 '%s' 開始 'show'" + +#: bisect.c:994 builtin/merge.c:158 #, c-format msgid "could not read file '%s'" msgstr "無法讀取 “%s” 檔案" -#: bisect.c +#: bisect.c:1035 msgid "reading bisect refs failed" msgstr "無法讀取二分搜尋的引用" -#: bisect.c +#: bisect.c:1065 #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同時為 %s 和 %s\n" -#: bisect.c +#: bisect.c:1075 #, c-format msgid "" "No testable commit found.\n" @@ -1890,7 +1952,7 @@ msgstr "" "沒找到能夠測試的提交。\n" "可能是傳入的路徑引數有誤？\n" -#: bisect.c +#: bisect.c:1106 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1899,72 +1961,76 @@ msgstr[0] "（大約 %d 步）" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c +#: bisect.c:1112 #, 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] "二分搜尋中：在此 (%2$s) 之後，尚餘 %1$d 個版本待測試\n" -#: blame.c +#: blame.c:2772 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" -#: blame.c +#: blame.c:2824 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c -#: sequencer.c submodule.c +#: blame.c:2833 builtin/commit.c:1138 builtin/log.c:508 builtin/log.c:1179 +#: builtin/log.c:1791 builtin/log.c:2235 builtin/log.c:2533 builtin/merge.c:413 +#: builtin/pack-objects.c:3510 builtin/pack-objects.c:3668 +#: builtin/pack-objects.c:4156 builtin/pack-objects.c:4171 +#: builtin/shortlog.c:272 midx-write.c:777 pack-bitmap.c:1065 +#: pack-bitmap.c:2318 remote.c:2204 sequencer.c:2484 sequencer.c:5360 +#: submodule.c:921 msgid "revision walk setup failed" msgstr "修訂版遍歷設定失敗" -#: blame.c +#: blame.c:2851 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一上級鏈的提交範圍" -#: blame.c +#: blame.c:2862 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中，沒有路徑 %1$s" -#: blame.c +#: blame.c:2875 #, c-format msgid "cannot read blob %s for path %s" msgstr "無法為 %2$s 路徑讀取資料物件 %1$s" -#: branch.c +#: branch.c:100 msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" msgstr "請求重定基底時，無法繼承多個引用的上游追蹤設定" -#: branch.c +#: branch.c:111 #, c-format msgid "not setting branch '%s' as its own upstream" msgstr "未將 “%s” 分支設為其自己的上游" -#: branch.c +#: branch.c:167 #, c-format msgid "branch '%s' set up to track '%s' by rebasing." msgstr "已藉由重訂基底，將 “%s” 分支設定為追蹤 “%s”。" -#: branch.c +#: branch.c:168 #, c-format msgid "branch '%s' set up to track '%s'." msgstr "已將 “%s” 分支設定為追蹤 “%s”。" -#: branch.c +#: branch.c:171 #, c-format msgid "branch '%s' set up to track:" msgstr "“%s” 分支已設定追蹤：" -#: branch.c +#: branch.c:183 msgid "unable to write upstream branch configuration" msgstr "無法寫入上游分支設定" -#: branch.c +#: branch.c:185 msgid "" "\n" "After fixing the error cause you may try to fix up\n" @@ -1974,17 +2040,17 @@ msgstr "" "修正病灶後，您可以執行下述命令\n" "修正遠端追蹤資訊：" -#: branch.c +#: branch.c:226 #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "請求繼承 “%s” 的追蹤設定，但未設定遠端" -#: branch.c +#: branch.c:232 #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "請求繼承 “%s” 的追蹤設定，但未設定合併設定" -#: branch.c +#: branch.c:292 #, c-format msgid "not tracking: ambiguous information for ref '%s'" msgstr "未追蹤：“%s” 引用有歧義" @@ -1999,7 +2065,7 @@ msgstr "未追蹤：“%s” 引用有歧義" #. you'll probably want to swap the "%s" and leading " " space #. around. #. -#: branch.c object-name.c +#: branch.c:304 object-name.c:485 #, c-format msgid " %s\n" msgstr " %s\n" @@ -2007,7 +2073,7 @@ msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. #. -#: branch.c +#: branch.c:310 #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" @@ -2027,32 +2093,36 @@ msgstr "" "若要支援設定追蹤分支，請確定不同遠端的\n" "抓取引用規格，映射到不同的追蹤命名空間。" -#: branch.c +#: branch.c:374 #, c-format msgid "'%s' is not a valid branch name" msgstr "“%s” 不是有效的分支名稱" -#: branch.c +#: branch.c:376 builtin/branch.c:588 +msgid "See `man git check-ref-format`" +msgstr "請參閱「man git check-ref-format」" + +#: branch.c:473 #, c-format msgid "a branch named '%s' already exists" msgstr "已有同名 “%s” 分支" -#: branch.c +#: branch.c:477 #, c-format msgid "cannot force update the branch '%s' used by worktree at '%s'" msgstr "無法強制更新被位於 “%2$s” 的工作區使用的 “%1$s” 分支" -#: branch.c +#: branch.c:502 #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" msgstr "無法設定追蹤資訊：起始點 “%s” 不是分支" -#: branch.c +#: branch.c:504 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "請求的上游分支 “%s” 不存在" -#: branch.c +#: branch.c:506 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -2071,27 +2141,28 @@ msgstr "" "並建立兩個分支間的追蹤關係，您可能需要使用 `git push -u`\n" "推送分支並設定和上游的關聯。" -#: branch.c builtin/replace.c +#: branch.c:554 builtin/replace.c:332 builtin/replace.c:388 +#: builtin/replace.c:434 builtin/replace.c:464 #, c-format msgid "not a valid object name: '%s'" msgstr "物件名稱無效：“%s”" -#: branch.c +#: branch.c:575 #, c-format msgid "ambiguous object name: '%s'" msgstr "物件名稱有歧義：“%s”" -#: branch.c +#: branch.c:580 #, c-format msgid "not a valid branch point: '%s'" msgstr "分支點無效：“%s”" -#: branch.c +#: branch.c:771 #, c-format msgid "submodule '%s': unable to find submodule" msgstr "“%s” 子模組：找不到子模組" -#: branch.c +#: branch.c:774 #, c-format msgid "" "You may try updating the submodules using 'git checkout --no-recurse-" @@ -2100,30 +2171,30 @@ msgstr "" "您可以使用 “git checkout --no-recurse-submodules %s && git submodule update " "--init” 命令嘗試更新子模組" -#: branch.c +#: branch.c:785 branch.c:811 #, c-format msgid "submodule '%s': cannot create branch '%s'" msgstr "“%s” 子模組：無法建立 “%s” 分支" -#: branch.c +#: branch.c:846 #, c-format msgid "'%s' is already used by worktree at '%s'" msgstr "“%s” 已被位於 “%s” 的工作區使用" -#: builtin/add.c +#: builtin/add.c:29 msgid "git add [] [--] ..." msgstr "git add [] [--] ..." -#: builtin/add.c +#: builtin/add.c:61 #, c-format msgid "cannot chmod %cx '%s'" msgstr "無法 chmod %cx '%s'" -#: builtin/add.c +#: builtin/add.c:123 msgid "Unstaged changes after refreshing the index:" msgstr "重新整理索引之後，尚未被暫存的更動：" -#: builtin/add.c +#: builtin/add.c:156 msgid "" "the add.interactive.useBuiltin setting has been removed!\n" "See its entry in 'git help config' for details." @@ -2131,105 +2202,105 @@ msgstr "" "add.interactive.useBuiltin 設定已被移除！\n" "深入了解請參閱 “git help config” 中的對應條目。" -#: builtin/add.c +#: builtin/add.c:185 msgid "could not read the index" msgstr "無法讀取索引" -#: builtin/add.c +#: builtin/add.c:200 msgid "editing patch failed" msgstr "編輯修補檔失敗" -#: builtin/add.c read-cache.c +#: builtin/add.c:203 read-cache.c:3234 #, c-format msgid "could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: builtin/add.c +#: builtin/add.c:205 msgid "empty patch. aborted" msgstr "修補檔空白。中止" -#: builtin/add.c +#: builtin/add.c:211 #, c-format msgid "could not apply '%s'" msgstr "無法套用 “%s”" -#: builtin/add.c +#: builtin/add.c:220 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路徑根據其中一個 .gitignore 檔案而被忽略：\n" -#: 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 +#: builtin/add.c:242 builtin/clean.c:935 builtin/fetch.c:2186 builtin/mv.c:173 +#: builtin/prune-packed.c:15 builtin/pull.c:210 builtin/push.c:598 +#: builtin/remote.c:1484 builtin/rm.c:251 builtin/send-pack.c:189 msgid "dry run" msgstr "測試執行" -#: 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 +#: builtin/add.c:243 builtin/check-ignore.c:24 builtin/commit.c:1525 +#: builtin/count-objects.c:102 builtin/fsck.c:903 builtin/log.c:2484 +#: builtin/mv.c:172 builtin/read-tree.c:127 msgid "be verbose" msgstr "詳細輸出" -#: builtin/add.c +#: builtin/add.c:245 msgid "interactive picking" msgstr "互動式挑選" -#: builtin/add.c builtin/checkout.c builtin/reset.c +#: builtin/add.c:246 builtin/checkout.c:1716 builtin/reset.c:363 msgid "select hunks interactively" msgstr "互動式選取區塊" -#: builtin/add.c +#: builtin/add.c:247 msgid "edit current diff and apply" msgstr "編輯目前差異並套用" -#: builtin/add.c +#: builtin/add.c:248 msgid "allow adding otherwise ignored files" msgstr "允許加入原先被忽略的檔案" -#: builtin/add.c +#: builtin/add.c:249 msgid "update tracked files" msgstr "更新已追蹤的檔案" -#: builtin/add.c +#: builtin/add.c:250 msgid "renormalize EOL of tracked files (implies -u)" msgstr "對已追蹤檔案（隱含 -u）重新標準化 EOL" -#: builtin/add.c +#: builtin/add.c:251 msgid "record only the fact that the path will be added later" msgstr "只記錄「路徑稍後會再加入」" -#: builtin/add.c +#: builtin/add.c:252 msgid "add changes from all tracked and untracked files" msgstr "從所有已追蹤和未追蹤檔案加入更動" -#: builtin/add.c +#: builtin/add.c:255 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作區中移除的路徑（和 --no-all 相同）" -#: builtin/add.c +#: builtin/add.c:257 msgid "don't add, only refresh the index" msgstr "不新增，只重新整理索引" -#: builtin/add.c +#: builtin/add.c:258 msgid "just skip files which cannot be added because of errors" msgstr "略過因發生錯誤不能新增的檔案" -#: builtin/add.c +#: builtin/add.c:259 msgid "check if - even missing - files are ignored in dry run" msgstr "檢查（即使不存在的）檔案是否在測試執行模式中被忽略" -#: builtin/add.c builtin/mv.c builtin/rm.c +#: builtin/add.c:260 builtin/mv.c:177 builtin/rm.c:258 msgid "allow updating entries outside of the sparse-checkout cone" msgstr "允許更新稀疏簽出 cone 外的項目" -#: builtin/add.c builtin/update-index.c +#: builtin/add.c:262 builtin/update-index.c:969 msgid "override the executable bit of the listed files" msgstr "覆寫列出檔案中的可執行位元" -#: builtin/add.c +#: builtin/add.c:264 msgid "warn when adding an embedded repository" msgstr "嵌入版本庫時發出警告" -#: builtin/add.c +#: builtin/add.c:286 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -2260,200 +2331,201 @@ msgstr "" "\n" "參見 “git help submodule” 深入了解。" -#: builtin/add.c +#: builtin/add.c:315 #, c-format msgid "adding embedded git repository: %s" msgstr "正在加入嵌入式 git 版本庫：%s" -#: 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”" +#: builtin/add.c:335 +msgid "Use -f if you really want to add them." +msgstr "如果您確定想要加入他們，請使用「-f」。" -#: builtin/add.c +#: builtin/add.c:348 msgid "adding files failed" msgstr "加入檔案失敗" -#: builtin/add.c +#: builtin/add.c:412 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod 的參數 “%s” 必須是 -x 或 +x" -#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c -#: builtin/rm.c builtin/stash.c +#: builtin/add.c:433 builtin/checkout.c:1888 builtin/commit.c:373 +#: builtin/reset.c:382 builtin/rm.c:282 builtin/stash.c:1780 #, c-format msgid "'%s' and pathspec arguments cannot be used together" msgstr "“%s” 和路徑規格引數不得同時使用" -#: builtin/add.c +#: builtin/add.c:444 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "沒有指定，亦未加入檔案。\n" -#: 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”" +#: builtin/add.c:446 +msgid "Maybe you wanted to say 'git add .'?" +msgstr "也許您想要執行的是「git add .」？" -#: 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 +#: builtin/add.c:462 builtin/check-ignore.c:185 builtin/checkout.c:569 +#: builtin/checkout.c:784 builtin/clean.c:1014 builtin/commit.c:387 +#: builtin/diff-tree.c:131 builtin/grep.c:556 builtin/mv.c:202 +#: builtin/reset.c:455 builtin/rm.c:302 builtin/submodule--helper.c:208 +#: builtin/submodule--helper.c:3239 read-cache.c:2060 read-cache.c:2378 +#: rerere.c:559 rerere.c:593 rerere.c:1110 submodule.c:1849 msgid "index file corrupt" msgstr "索引檔案損壞" -#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c -#: builtin/commit.c builtin/stash.c merge.c rerere.c +#: builtin/add.c:574 builtin/am.c:2010 builtin/am.c:2044 builtin/checkout.c:638 +#: builtin/checkout.c:926 builtin/clone.c:750 builtin/commit.c:455 +#: builtin/commit.c:480 builtin/commit.c:528 builtin/stash.c:303 merge.c:109 +#: rerere.c:715 msgid "unable to write new index file" msgstr "無法寫入新的索引檔案" -#: builtin/am.c builtin/mailinfo.c mailinfo.c +#: builtin/am.c:198 builtin/mailinfo.c:47 mailinfo.c:1263 #, c-format msgid "bad action '%s' for '%s'" msgstr "“%s” 動作對 “%s” 無效" -#: 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 +#: builtin/am.c:216 builtin/am.c:2262 builtin/am.c:2284 builtin/blame.c:740 +#: builtin/blame.c:760 builtin/fetch.c:169 builtin/pack-objects.c:3855 +#: builtin/pull.c:46 builtin/pull.c:48 builtin/pull.c:323 builtin/revert.c:66 +#: config.c:1397 diff-merges.c:94 gpg-interface.c:744 gpg-interface.c:759 +#: ls-refs.c:36 parallel-checkout.c:47 sequencer.c:2983 setup.c:590 setup.c:602 +#: setup.c:620 #, c-format msgid "invalid value for '%s': '%s'" msgstr "“%s” 的值無效：“%s”" -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c +#: builtin/am.c:303 builtin/commit.c:857 builtin/merge.c:1145 sequencer.c:551 +#: sequencer.c:2026 sequencer.c:3282 sequencer.c:3721 #, c-format msgid "could not read '%s'" msgstr "無法讀取 “%s”" -#: builtin/am.c +#: builtin/am.c:406 msgid "could not parse author script" msgstr "無法解析作者文稿" -#: builtin/am.c builtin/replace.c commit.c sequencer.c +#: builtin/am.c:413 builtin/am.c:458 builtin/am.c:463 builtin/am.c:1459 +#: builtin/am.c:2145 builtin/replace.c:467 commit.c:60 sequencer.c:3275 #, c-format msgid "could not parse %s" msgstr "無法解析 %s" -#: builtin/am.c +#: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "“%s” 被 applypatch-msg 掛鉤刪除" -#: builtin/am.c +#: builtin/am.c:528 #, c-format msgid "Malformed input line: '%s'." msgstr "格式錯誤的輸入列：“%s”。" -#: builtin/am.c +#: builtin/am.c:566 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "從 “%s” 拷貝註解到 “%s” 失敗" -#: builtin/am.c +#: builtin/am.c:592 msgid "fseek failed" msgstr "fseek 失敗" -#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c +#: builtin/am.c:760 builtin/am.c:852 builtin/rebase.c:659 sequencer.c:935 +#: wrapper.c:198 wrapper.c:368 #, c-format msgid "could not open '%s' for reading" msgstr "無法開啟 “%s” 進行讀取" -#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c +#: builtin/am.c:769 builtin/rebase.c:610 editor.c:147 sequencer.c:4289 +#: wrapper.c:196 wrapper.c:366 #, c-format msgid "could not open '%s' for writing" msgstr "無法開啟 “%s” 進行寫入" -#: builtin/am.c +#: builtin/am.c:780 #, c-format msgid "could not parse patch '%s'" msgstr "無法解析修補檔 “%s”" -#: builtin/am.c +#: builtin/am.c:845 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能套用一個 StGIT 修補檔序列" -#: builtin/am.c +#: builtin/am.c:893 msgid "invalid timestamp" msgstr "無效的時間戳" -#: builtin/am.c +#: builtin/am.c:898 builtin/am.c:910 msgid "invalid Date line" msgstr "無效的 Date 列" -#: builtin/am.c +#: builtin/am.c:905 msgid "invalid timezone offset" msgstr "無效的時區偏移" -#: builtin/am.c +#: builtin/am.c:998 msgid "Patch format detection failed." msgstr "修補檔格式偵測失敗。" -#: builtin/am.c builtin/clone.c +#: builtin/am.c:1003 builtin/clone.c:319 #, c-format msgid "failed to create directory '%s'" msgstr "無法建立目錄 “%s”" -#: builtin/am.c +#: builtin/am.c:1008 msgid "Failed to split patches." msgstr "無法切割修補檔。" -#: builtin/am.c +#: builtin/am.c:1158 #, c-format -msgid "When you have resolved this problem, run \"%s --continue\"." -msgstr "解決此問題後，請執行 “%s --continue”。" +msgid "When you have resolved this problem, run \"%s --continue\".\n" +msgstr "解決此問題後，請執行「%s --continue」。\n" -#: builtin/am.c +#: builtin/am.c:1159 #, c-format -msgid "If you prefer to skip this patch, run \"%s --skip\" instead." -msgstr "若要略過此修補，請改執行 “%s --skip”。" +msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n" +msgstr "若要略過此修補，請改執行「%s --skip」。\n" -#: builtin/am.c +#: builtin/am.c:1164 #, c-format -msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." -msgstr "若要將空白修補檔錄入為空白提交，請執行 “%s --allow-empty”。" +msgid "" +"To record the empty patch as an empty commit, run \"%s --allow-empty\".\n" +msgstr "若要將空白修補檔錄入為空白提交，請執行「%s --allow-empty」。\n" -#: builtin/am.c +#: builtin/am.c:1166 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要還原至原始分支，並停止修補動作，請執行 “%s --abort”。" -#: builtin/am.c +#: builtin/am.c:1264 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "修補檔使用 format=flowed 格式傳送：列尾的空格可能會遺失。" -#: builtin/am.c +#: builtin/am.c:1353 #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺少作者列" -#: builtin/am.c +#: builtin/am.c:1356 #, c-format msgid "invalid ident line: %.*s" msgstr "ident 列無效：%.*s" -#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c +#: builtin/am.c:1378 builtin/checkout.c:830 builtin/clone.c:740 +#: commit-graph.c:1215 #, c-format msgid "unable to parse commit %s" msgstr "無法解析 %s 提交" -#: builtin/am.c +#: builtin/am.c:1586 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本庫缺少必要的資料物件，無法進行三方合併。" -#: builtin/am.c +#: builtin/am.c:1588 msgid "Using index info to reconstruct a base tree..." msgstr "正在使用索引資訊重建基礎樹……" -#: builtin/am.c +#: builtin/am.c:1608 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2461,33 +2533,33 @@ msgstr "" "您是否曾自行編輯過您的修補檔？\n" "未能套用至索引錄入的資料物件。" -#: builtin/am.c +#: builtin/am.c:1614 msgid "Falling back to patching base and 3-way merge..." msgstr "正在回復到修補基礎處，並進行三方合併……" -#: builtin/am.c +#: builtin/am.c:1640 msgid "Failed to merge in the changes." msgstr "無法合併更動。" -#: builtin/am.c builtin/merge.c sequencer.c +#: builtin/am.c:1664 builtin/merge.c:691 sequencer.c:1537 msgid "git write-tree failed to write a tree" msgstr "git write-tree 無法寫入樹狀物件" -#: builtin/am.c +#: builtin/am.c:1672 msgid "applying to an empty history" msgstr "正在套用至空白歷史記錄上" -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c -#: t/helper/test-fast-rebase.c +#: builtin/am.c:1691 builtin/commit.c:1863 builtin/merge.c:911 +#: builtin/merge.c:936 builtin/replay.c:76 sequencer.c:1647 msgid "failed to write commit object" msgstr "無法寫入提交物件" -#: builtin/am.c +#: builtin/am.c:1724 builtin/am.c:1728 #, c-format msgid "cannot resume: %s does not exist." msgstr "無法繼續：%s 不存在。" -#: builtin/am.c +#: builtin/am.c:1746 msgid "Commit Body is:" msgstr "提交內文為：" @@ -2496,57 +2568,57 @@ msgstr "提交內文為：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c +#: builtin/am.c:1756 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "是否套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]: " -#: builtin/am.c builtin/commit.c +#: builtin/am.c:1803 builtin/commit.c:420 msgid "unable to write index file" msgstr "無法寫入索引檔案" -#: builtin/am.c +#: builtin/am.c:1807 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "有異動索引：無法套用修補檔（異動處：%s）" -#: builtin/am.c +#: builtin/am.c:1849 #, c-format msgid "Skipping: %.*s" msgstr "略過：%.*s" -#: builtin/am.c +#: builtin/am.c:1854 #, c-format msgid "Creating an empty commit: %.*s" msgstr "建立空白提交：%.*s" -#: builtin/am.c +#: builtin/am.c:1858 msgid "Patch is empty." msgstr "修補檔空白。" -#: builtin/am.c +#: builtin/am.c:1869 builtin/am.c:1938 #, c-format msgid "Applying: %.*s" msgstr "套用：%.*s" -#: builtin/am.c +#: builtin/am.c:1886 msgid "No changes -- Patch already applied." msgstr "沒有變更——修補檔已套用過。" -#: builtin/am.c +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "在 %s %.*s 處修補失敗" -#: builtin/am.c +#: builtin/am.c:1896 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "使用 “git am --show-current-patch=diff” 命令檢視失敗的修補檔" -#: builtin/am.c +#: builtin/am.c:1942 msgid "No changes - recorded it as an empty commit." msgstr "沒有變更：將其錄入為空白提交。" -#: builtin/am.c +#: builtin/am.c:1944 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2556,7 +2628,7 @@ msgstr "" "如果沒有其他要新增到暫存區的，則很可能是其它提交\n" "已經引入了相同的變更。您也許想要略過這個修補檔。" -#: builtin/am.c +#: builtin/am.c:1952 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -2567,16 +2639,17 @@ msgstr "" "您應該對已經解決衝突的每一個檔案執行 `git add`，標記為已經完成。\n" "你可以對「由他們刪除」的檔案，執行 `git rm` 指令。" -#: builtin/am.c builtin/reset.c +#: builtin/am.c:2060 builtin/am.c:2064 builtin/am.c:2076 builtin/reset.c:402 +#: builtin/reset.c:410 #, c-format msgid "Could not parse object '%s'." msgstr "無法解析 “%s” 物件。" -#: builtin/am.c +#: builtin/am.c:2112 builtin/am.c:2188 msgid "failed to clean index" msgstr "無法清除索引" -#: builtin/am.c +#: builtin/am.c:2156 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2584,150 +2657,159 @@ msgstr "" "您似乎在上一次 “am” 失敗後移動了 HEAD。\n" "未倒轉回 ORIG_HEAD" -#: builtin/am.c builtin/bisect.c worktree.c +#: builtin/am.c:2229 builtin/bisect.c:181 worktree.c:262 #, c-format msgid "failed to read '%s'" msgstr "無法讀取 “%s”" -#: builtin/am.c +#: builtin/am.c:2300 msgid "git am [] [( | )...]" msgstr "git am [] [( | )...]" -#: builtin/am.c +#: builtin/am.c:2301 msgid "git am [] (--continue | --skip | --abort)" msgstr "git am [] (--continue | --skip | --abort)" -#: builtin/am.c +#: builtin/am.c:2307 msgid "run interactively" msgstr "互動式執行" -#: builtin/am.c +#: builtin/am.c:2309 msgid "bypass pre-applypatch and applypatch-msg hooks" msgstr "繞過 pre-applypatch 和 applypatch-msg 掛鉤" -#: builtin/am.c +#: builtin/am.c:2311 msgid "historical option -- no-op" msgstr "歷史遺留選項——無作用" -#: builtin/am.c +#: builtin/am.c:2313 msgid "allow fall back on 3way merging if needed" msgstr "必要時允許回復至三方合併" -#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c -#: builtin/stash.c +#: builtin/am.c:2314 builtin/init-db.c:95 builtin/prune-packed.c:17 +#: builtin/repack.c:1159 builtin/stash.c:1022 msgid "be quiet" msgstr "靜默模式" -#: builtin/am.c +#: builtin/am.c:2316 msgid "add a Signed-off-by trailer to the commit message" msgstr "在提交說明結尾處加入 Signed-off-by" -#: builtin/am.c +#: builtin/am.c:2319 msgid "recode into utf8 (default)" msgstr "使用 utf8 字元集（預設值）" -#: builtin/am.c +#: builtin/am.c:2321 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 傳入 -k 參數" -#: builtin/am.c +#: builtin/am.c:2323 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 傳入 -b 參數" -#: builtin/am.c +#: builtin/am.c:2325 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 傳入 -m 參數" -#: builtin/am.c +#: builtin/am.c:2327 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "若為 mbox 格式，向 git-mailsplit 傳入 --keep-cr 標記" -#: builtin/am.c +#: builtin/am.c:2330 msgid "strip everything before a scissors line" msgstr "截掉裁切線前的所有內容" -#: builtin/am.c +#: builtin/am.c:2332 msgid "pass it through git-mailinfo" msgstr "透過 git-mailinfo 傳入" -#: builtin/am.c +#: builtin/am.c:2335 builtin/am.c:2338 builtin/am.c:2341 builtin/am.c:2344 +#: builtin/am.c:2347 builtin/am.c:2350 builtin/am.c:2353 builtin/am.c:2356 +#: builtin/am.c:2362 msgid "pass it through git-apply" msgstr "透過 git-apply 傳入" -#: 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 +#: builtin/am.c:2352 builtin/commit.c:1556 builtin/fmt-merge-msg.c:19 +#: builtin/fmt-merge-msg.c:22 builtin/grep.c:976 builtin/merge.c:245 +#: builtin/pull.c:144 builtin/pull.c:206 builtin/pull.c:223 +#: builtin/rebase.c:1091 builtin/repack.c:1170 builtin/repack.c:1174 +#: builtin/repack.c:1176 builtin/show-branch.c:661 builtin/show-ref.c:300 +#: builtin/tag.c:470 parse-options.h:215 parse-options.h:276 +#: parse-options.h:526 msgid "n" msgstr "n" -#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c -#: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c -#: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c +#: builtin/am.c:2358 builtin/branch.c:767 builtin/bugreport.c:122 +#: builtin/cat-file.c:959 builtin/cat-file.c:963 builtin/cat-file.c:970 +#: builtin/clone.c:160 builtin/diagnose.c:27 builtin/for-each-ref.c:43 +#: builtin/init-db.c:102 builtin/ls-files.c:634 builtin/ls-tree.c:363 +#: builtin/replace.c:566 builtin/tag.c:506 builtin/verify-tag.c:30 msgid "format" msgstr "format" -#: builtin/am.c +#: builtin/am.c:2359 msgid "format the patch(es) are in" msgstr "修補檔的格式" -#: builtin/am.c +#: builtin/am.c:2365 msgid "override error message when patch failure occurs" msgstr "覆蓋修補失敗時顯示的錯誤訊息" -#: builtin/am.c +#: builtin/am.c:2367 msgid "continue applying patches after resolving a conflict" msgstr "衝突解決後繼續套用修補檔" -#: builtin/am.c +#: builtin/am.c:2370 msgid "synonyms for --continue" msgstr "和 --continue 同義" -#: builtin/am.c +#: builtin/am.c:2373 msgid "skip the current patch" msgstr "略過目前修補檔" -#: builtin/am.c +#: builtin/am.c:2376 msgid "restore the original branch and abort the patching operation" msgstr "還原原始分支並中止修補動作" -#: builtin/am.c +#: builtin/am.c:2379 msgid "abort the patching operation but keep HEAD where it is" msgstr "中止修補動作但保持 HEAD 不變" -#: builtin/am.c +#: builtin/am.c:2383 msgid "show the patch being applied" msgstr "顯示正在套用的修補檔" -#: builtin/am.c +#: builtin/am.c:2387 msgid "record the empty patch as an empty commit" msgstr "將空白修補檔錄入為空白提交" -#: builtin/am.c +#: builtin/am.c:2391 msgid "lie about committer date" msgstr "將作者日期當作提交日期" -#: builtin/am.c +#: builtin/am.c:2393 msgid "use current timestamp for author date" msgstr "把目前時間戳當作是作者日期" -#: 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 +#: builtin/am.c:2395 builtin/commit-tree.c:110 builtin/commit.c:1682 +#: builtin/merge.c:284 builtin/pull.c:181 builtin/rebase.c:1147 +#: builtin/revert.c:131 builtin/tag.c:485 msgid "key-id" msgstr "key-id" -#: builtin/am.c builtin/rebase.c +#: builtin/am.c:2396 builtin/rebase.c:1148 msgid "GPG-sign commits" msgstr "使用 GPG 簽名提交" -#: builtin/am.c +#: builtin/am.c:2399 msgid "how to handle empty patches" msgstr "空白修補檔的處理方式" -#: builtin/am.c +#: builtin/am.c:2402 msgid "(internal use for git-rebase)" msgstr "（內部使用，用於 git-rebase）" -#: builtin/am.c +#: builtin/am.c:2420 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." @@ -2735,16 +2817,16 @@ msgstr "" "-b/--binary 選項已經有很長時間不做任何實質動作了，\n" "並且將被移除。請不要再使用它了。" -#: builtin/am.c +#: builtin/am.c:2427 msgid "failed to read the index" msgstr "讀取索引失敗" -#: builtin/am.c +#: builtin/am.c:2442 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。" -#: builtin/am.c +#: builtin/am.c:2466 #, c-format msgid "" "Stray %s directory found.\n" @@ -2753,44 +2835,44 @@ msgstr "" "發現失散的 %s 目錄。\n" "使用 “git am --abort” 移除。" -#: builtin/am.c +#: builtin/am.c:2472 msgid "Resolve operation not in progress, we are not resuming." msgstr "未在進行解決動作，不會繼續。" -#: builtin/am.c +#: builtin/am.c:2482 msgid "interactive mode requires patches on the command line" msgstr "互動模式需要命令列上提供修補檔" -#: builtin/apply.c +#: builtin/apply.c:7 msgid "git apply [] [...]" msgstr "git apply [] [...]" -#: builtin/archive.c diagnose.c +#: builtin/archive.c:18 diagnose.c:209 msgid "could not redirect output" msgstr "無法重新導向輸出" -#: builtin/archive.c +#: builtin/archive.c:35 msgid "git archive: Remote with no URL" msgstr "git archive: 未提供遠端 URL" -#: builtin/archive.c +#: builtin/archive.c:59 msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive：預期是 ACK/NAK，卻收到 flush 封包" -#: builtin/archive.c +#: builtin/archive.c:62 #, c-format msgid "git archive: NACK %s" msgstr "git archive: NACK %s" -#: builtin/archive.c +#: builtin/archive.c:63 msgid "git archive: protocol error" msgstr "git archive：通訊協定錯誤" -#: builtin/archive.c +#: builtin/archive.c:67 msgid "git archive: expected a flush" msgstr "git archive：預期收到 flush 封包" -#: builtin/bisect.c +#: builtin/bisect.c:27 msgid "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" @@ -2798,97 +2880,97 @@ msgstr "" "git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" -#: builtin/bisect.c +#: builtin/bisect.c:31 msgid "git bisect (good|bad) [...]" msgstr "git bisect (good|bad) [...]" -#: builtin/bisect.c +#: builtin/bisect.c:35 msgid "git bisect skip [(|)...]" msgstr "git bisect skip [(|)...]" -#: builtin/bisect.c +#: builtin/bisect.c:39 msgid "git bisect reset []" msgstr "git bisect reset []" -#: builtin/bisect.c +#: builtin/bisect.c:43 msgid "git bisect replay " msgstr "git bisect replay " -#: builtin/bisect.c +#: builtin/bisect.c:47 msgid "git bisect run [...]" msgstr "git bisect run [...]" -#: builtin/bisect.c +#: builtin/bisect.c:134 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "無法以 “%2$s” 模式開啟 “%1$s” 檔案" -#: builtin/bisect.c +#: builtin/bisect.c:141 #, c-format msgid "could not write to file '%s'" msgstr "無法寫入 “%s” 檔案" -#: builtin/bisect.c +#: builtin/bisect.c:179 #, c-format msgid "cannot open file '%s' for reading" msgstr "無法開啟 “%s” 檔案進行讀取" -#: builtin/bisect.c +#: builtin/bisect.c:195 #, c-format msgid "'%s' is not a valid term" msgstr "“%s” 不是有效術語" -#: builtin/bisect.c +#: builtin/bisect.c:199 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能將內建命令 “%s” 當作術語使用" -#: builtin/bisect.c +#: builtin/bisect.c:209 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能變更術語 “%s” 的含義" -#: builtin/bisect.c +#: builtin/bisect.c:219 msgid "please use two different terms" msgstr "請使用兩個不同的術語" -#: builtin/bisect.c +#: builtin/bisect.c:235 #, c-format msgid "We are not bisecting.\n" msgstr "我們沒有在二分搜尋。\n" -#: builtin/bisect.c +#: builtin/bisect.c:242 #, c-format msgid "'%s' is not a valid commit" msgstr "“%s” 不是有效的提交" -#: builtin/bisect.c +#: builtin/bisect.c:253 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." msgstr "不能簽出原始 HEAD “%s”。請嘗試 “git bisect reset ”。" -#: builtin/bisect.c +#: builtin/bisect.c:296 #, c-format msgid "Bad bisect_write argument: %s" msgstr "bisect_write 引數無效：%s" -#: builtin/bisect.c +#: builtin/bisect.c:301 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "無法取得修訂版 “%s” 的物件 ID" -#: builtin/bisect.c +#: builtin/bisect.c:313 #, c-format msgid "couldn't open the file '%s'" msgstr "無法開啟檔案 “%s”" -#: builtin/bisect.c +#: builtin/bisect.c:339 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "命令無效：您目前正處於二分搜尋 %s/%s 的狀態" -#: builtin/bisect.c +#: builtin/bisect.c:367 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -2897,7 +2979,7 @@ msgstr "" "需指定至少一個 %s 和一個 %s 修訂版。\n" "為此您可以用 “git bisect %s” 和 “git bisect %s”。" -#: builtin/bisect.c +#: builtin/bisect.c:371 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -2908,7 +2990,7 @@ msgstr "" "接著提供至少一個 %s 和一個 %s 修訂版。\n" "為此您可以用 “git bisect %s” 和 “git bisect %s”。" -#: builtin/bisect.c +#: builtin/bisect.c:391 #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一個 %s 提交的情況下二分搜尋" @@ -2918,29 +3000,29 @@ msgstr "在只有一個 %s 提交的情況下二分搜尋" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect.c +#: builtin/bisect.c:399 msgid "Are you sure [Y/n]? " msgstr "是否確定 [Y/n]? " -#: builtin/bisect.c +#: builtin/bisect.c:456 msgid "status: waiting for both good and bad commits\n" msgstr "狀態：正在等待好和壞的提交\n" -#: builtin/bisect.c +#: builtin/bisect.c:458 #, c-format 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" -#: builtin/bisect.c +#: builtin/bisect.c:462 msgid "status: waiting for good commit(s), bad commit known\n" msgstr "狀態：正在等待好的提交，已知有壞的提交\n" -#: builtin/bisect.c +#: builtin/bisect.c:501 msgid "no terms defined" msgstr "未定義術語" -#: builtin/bisect.c +#: builtin/bisect.c:504 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -2949,7 +3031,7 @@ msgstr "" "您目前針對舊狀態的術語是 %s；\n" "對新狀態的術語是 %s。\n" -#: builtin/bisect.c +#: builtin/bisect.c:514 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -2958,48 +3040,48 @@ msgstr "" "傳入 “git bisect terms” 的 %s 引數無效。\n" "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect.c +#: builtin/bisect.c:581 builtin/bisect.c:1103 msgid "revision walk setup failed\n" msgstr "修訂版遍歷設定失敗\n" -#: builtin/bisect.c +#: builtin/bisect.c:603 #, c-format msgid "could not open '%s' for appending" msgstr "無法開啟 “%s” 進行附加" -#: builtin/bisect.c +#: builtin/bisect.c:727 builtin/bisect.c:740 msgid "'' is not a valid term" msgstr "“ ” 不是有效術語" -#: builtin/bisect.c +#: builtin/bisect.c:750 #, c-format msgid "unrecognized option: '%s'" msgstr "無法識別選項：“%s”" -#: builtin/bisect.c +#: builtin/bisect.c:754 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "“%s” 似乎不是有效修訂版" -#: builtin/bisect.c +#: builtin/bisect.c:785 msgid "bad HEAD - I need a HEAD" msgstr "HEAD 無效 — 需要一個 HEAD" -#: builtin/bisect.c +#: builtin/bisect.c:801 #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "簽出 “%s” 失敗。請嘗試 “git bisect start ”。" -#: builtin/bisect.c +#: builtin/bisect.c:818 msgid "bad HEAD - strange symbolic ref" msgstr "HEAD 無效 — 異常符號引用" -#: builtin/bisect.c +#: builtin/bisect.c:838 #, c-format msgid "invalid ref: '%s'" msgstr "引用無效：“%s”" -#: builtin/bisect.c +#: builtin/bisect.c:896 msgid "You need to start by \"git bisect start\"\n" msgstr "要開始，請執行 “git bisect start”\n" @@ -3008,267 +3090,270 @@ msgstr "要開始，請執行 “git bisect start”\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect.c +#: builtin/bisect.c:907 msgid "Do you want me to do it for you [Y/n]? " msgstr "是否要這麼做 [Y/n]? " -#: builtin/bisect.c +#: builtin/bisect.c:924 msgid "Please call `--bisect-state` with at least one argument" msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數" -#: builtin/bisect.c +#: builtin/bisect.c:937 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "“git bisect %s” 只取一個引數。" -#: builtin/bisect.c +#: builtin/bisect.c:950 builtin/bisect.c:963 #, c-format msgid "Bad rev input: %s" msgstr "rev 輸入格式錯誤：%s" -#: builtin/bisect.c +#: builtin/bisect.c:970 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "rev 輸入有誤（不是提交）：%s" -#: builtin/bisect.c +#: builtin/bisect.c:1000 msgid "We are not bisecting." msgstr "我們沒有在二分搜尋。" -#: builtin/bisect.c +#: builtin/bisect.c:1050 #, c-format msgid "'%s'?? what are you talking about?" msgstr "「%s」？？您在說什麼？" -#: builtin/bisect.c +#: builtin/bisect.c:1062 #, c-format msgid "cannot read file '%s' for replaying" msgstr "無法讀取「%s」檔案進行重放" -#: builtin/bisect.c +#: builtin/bisect.c:1169 #, c-format msgid "running %s\n" msgstr "正在執行 %s\n" -#: builtin/bisect.c +#: builtin/bisect.c:1216 msgid "bisect run failed: no command provided." msgstr "二分搜尋執行失敗：沒有提供命令。" -#: builtin/bisect.c +#: builtin/bisect.c:1236 #, c-format msgid "unable to verify %s on good revision" msgstr "無法在好的修訂版上驗證 %s" -#: builtin/bisect.c +#: builtin/bisect.c:1242 #, c-format msgid "bogus exit code %d for good revision" msgstr "好的修訂版回傳偽造的錯誤碼 %d" -#: builtin/bisect.c +#: builtin/bisect.c:1250 #, c-format msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" msgstr "二分搜尋執行失敗：%2$s 回傳的結束代碼 %1$d 小於 0 或大於 128" -#: builtin/bisect.c +#: builtin/bisect.c:1265 #, c-format msgid "cannot open file '%s' for writing" msgstr "無法開啟 “%s” 檔案進行寫入" -#: builtin/bisect.c +#: builtin/bisect.c:1283 msgid "bisect run cannot continue any more" msgstr "二分搜尋不能繼續執行" -#: builtin/bisect.c +#: builtin/bisect.c:1285 msgid "bisect run success" msgstr "二分搜尋執行成功" -#: builtin/bisect.c +#: builtin/bisect.c:1288 msgid "bisect found first bad commit" msgstr "二分搜尋發現到第一個有問題的提交" -#: builtin/bisect.c +#: builtin/bisect.c:1291 #, c-format msgid "bisect run failed: 'git bisect %s' exited with error code %d" msgstr "二分搜尋執行失敗：“git bisect %s” 以錯誤碼 %d 離開" -#: builtin/bisect.c +#: builtin/bisect.c:1306 #, c-format msgid "'%s' requires either no argument or a commit" msgstr "“%s” 不需要引數，或者得傳入一個提交" -#: builtin/bisect.c +#: builtin/bisect.c:1317 #, c-format msgid "'%s' requires 0 or 1 argument" msgstr "“%s” 需要 0 或 1 個引數" -#: builtin/bisect.c +#: builtin/bisect.c:1341 #, c-format msgid "'%s' requires 0 arguments" msgstr "“%s” 不需引數" -#: builtin/bisect.c +#: builtin/bisect.c:1360 msgid "no logfile given" msgstr "未提供日誌檔案" -#: builtin/bisect.c +#: builtin/bisect.c:1396 #, c-format msgid "'%s' failed: no command provided." msgstr "“%s” 失敗：沒有提供命令。" -#: builtin/bisect.c +#: builtin/bisect.c:1427 msgid "need a command" msgstr "需要提供命令" -#: builtin/bisect.c builtin/cat-file.c +#: builtin/bisect.c:1432 builtin/cat-file.c:742 #, c-format msgid "unknown command: '%s'" msgstr "未知命令：“%s”" -#: builtin/blame.c +#: builtin/blame.c:38 msgid "git blame [] [] [] [--] " msgstr "git blame [] [] [] [--] " -#: builtin/blame.c +#: builtin/blame.c:39 msgid "git annotate [] [] [] [--] " msgstr "git annotate [] [] [] [--] " -#: builtin/blame.c +#: builtin/blame.c:44 builtin/blame.c:51 msgid " are documented in git-rev-list(1)" msgstr " 的文件在 git-rev-list(1)" -#: builtin/blame.c +#: builtin/blame.c:420 #, c-format msgid "expecting a color: %s" msgstr "預期是個顏色：%s" -#: builtin/blame.c +#: builtin/blame.c:427 msgid "must end with a color" msgstr "結尾必須是一個顏色" -#: builtin/blame.c +#: builtin/blame.c:860 #, c-format msgid "cannot find revision %s to ignore" msgstr "不能找到要忽略的 %s 修訂版" -#: builtin/blame.c +#: builtin/blame.c:882 msgid "show blame entries as we find them, incrementally" msgstr "漸進式顯示發現的溯源項目" -#: builtin/blame.c +#: builtin/blame.c:883 msgid "do not show object names of boundary commits (Default: off)" msgstr "不要顯示邊界提交的物件名稱（預設值：off）" -#: builtin/blame.c +#: builtin/blame.c:884 msgid "do not treat root commits as boundaries (Default: off)" msgstr "不把根提交當作邊界（預設值：off）" -#: builtin/blame.c +#: builtin/blame.c:885 msgid "show work cost statistics" msgstr "顯示工作量統計" -#: 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 +#: builtin/blame.c:886 builtin/checkout.c:1670 builtin/clone.c:110 +#: builtin/commit-graph.c:83 builtin/commit-graph.c:253 builtin/fetch.c:2193 +#: builtin/merge.c:283 builtin/multi-pack-index.c:130 +#: builtin/multi-pack-index.c:182 builtin/multi-pack-index.c:209 +#: builtin/multi-pack-index.c:238 builtin/pull.c:122 builtin/push.c:614 +#: builtin/remote.c:696 builtin/send-pack.c:197 msgid "force progress reporting" msgstr "強制顯示進度報告" -#: builtin/blame.c +#: builtin/blame.c:887 msgid "show output score for blame entries" msgstr "顯示溯源項目的輸出得分" -#: builtin/blame.c +#: builtin/blame.c:888 msgid "show original filename (Default: auto)" msgstr "顯示原始檔案名稱（預設值：auto）" -#: builtin/blame.c +#: builtin/blame.c:889 msgid "show original linenumber (Default: off)" msgstr "顯示原始列碼（預設值：off）" -#: builtin/blame.c +#: builtin/blame.c:890 msgid "show in a format designed for machine consumption" msgstr "顯示成適合機器讀取的格式" -#: builtin/blame.c +#: builtin/blame.c:891 msgid "show porcelain format with per-line commit information" msgstr "顯示包含每一列提交資訊，適合機器讀取的格式" -#: builtin/blame.c +#: builtin/blame.c:892 msgid "use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的輸出模式（預設值：off）" -#: builtin/blame.c +#: builtin/blame.c:893 msgid "show raw timestamp (Default: off)" msgstr "顯示原始時間戳（預設值：off）" -#: builtin/blame.c +#: builtin/blame.c:894 msgid "show long commit SHA1 (Default: off)" msgstr "顯示較長的 SHA1 提交編號（預設值：off）" -#: builtin/blame.c +#: builtin/blame.c:895 msgid "suppress author name and timestamp (Default: off)" msgstr "隱藏作者名字及時間戳（預設值：off）" -#: builtin/blame.c +#: builtin/blame.c:896 msgid "show author email instead of name (Default: off)" msgstr "顯示作者信箱而非名稱（預設值：off）" -#: builtin/blame.c +#: builtin/blame.c:897 msgid "ignore whitespace differences" msgstr "忽略空白差異" -#: builtin/blame.c builtin/log.c +#: builtin/blame.c:898 builtin/log.c:1989 msgid "rev" msgstr "rev" -#: builtin/blame.c +#: builtin/blame.c:898 msgid "ignore when blaming" msgstr "在執行溯源動作時忽略 " -#: builtin/blame.c +#: builtin/blame.c:899 msgid "ignore revisions from " msgstr "忽略 中的修訂版" -#: builtin/blame.c +#: builtin/blame.c:900 msgid "color redundant metadata from previous line differently" msgstr "使用顏色間隔輸出與前一行不同的重複中介資料" -#: builtin/blame.c +#: builtin/blame.c:901 msgid "color lines by age" msgstr "根據時間著色" -#: builtin/blame.c +#: builtin/blame.c:902 msgid "spend extra cycles to find better match" msgstr "循環更多次來找到更佳符合項目" -#: builtin/blame.c +#: builtin/blame.c:903 msgid "use revisions from instead of calling git-rev-list" msgstr "使用來自 的修訂集而不是呼叫 git-rev-list" -#: builtin/blame.c +#: builtin/blame.c:904 msgid "use 's contents as the final image" msgstr "將 的內容當成是最終印象" -#: builtin/blame.c +#: builtin/blame.c:905 builtin/blame.c:906 msgid "score" msgstr "score" -#: builtin/blame.c +#: builtin/blame.c:905 msgid "find line copies within and across files" msgstr "找到檔案內及跨檔案的列拷貝動作" -#: builtin/blame.c +#: builtin/blame.c:906 msgid "find line movements within and across files" msgstr "找到檔案內及跨檔案的列移動動作" -#: builtin/blame.c +#: builtin/blame.c:907 msgid "range" msgstr "range" -#: builtin/blame.c +#: builtin/blame.c:908 msgid "process only line range , or function :" msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函數" -#: builtin/blame.c +#: builtin/blame.c:971 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用" @@ -3280,25 +3365,25 @@ msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c +#: builtin/blame.c:1022 msgid "4 years, 11 months ago" msgstr "4 年 11 個月前" -#: builtin/blame.c +#: builtin/blame.c:1138 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "檔案 %s 只有 %lu 列" -#: builtin/blame.c +#: builtin/blame.c:1186 msgid "Blaming lines" msgstr "溯源文字列" -#: builtin/branch.c +#: builtin/branch.c:31 msgid "git branch [] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [] [-r | -a] [--merged] [--no-merged]" -#: builtin/branch.c +#: builtin/branch.c:32 msgid "" "git branch [] [-f] [--recurse-submodules] []" @@ -3306,32 +3391,32 @@ msgstr "" "git branch [] [-f] [--recurse-submodules] []" -#: builtin/branch.c +#: builtin/branch.c:33 msgid "git branch [] [-l] [...]" msgstr "git branch [] [-l] [...]" -#: builtin/branch.c +#: builtin/branch.c:34 msgid "git branch [] [-r] (-d | -D) ..." msgstr "git branch [] [-r] (-d | -D) ..." -#: builtin/branch.c +#: builtin/branch.c:35 msgid "git branch [] (-m | -M) [] " msgstr "git branch [] (-m | -M) [] " -#: builtin/branch.c +#: builtin/branch.c:36 msgid "git branch [] (-c | -C) [] " msgstr "git branch [] (-c | -C) [] " -#: builtin/branch.c +#: builtin/branch.c:37 msgid "git branch [] [-r | -a] [--points-at]" msgstr "git branch [] [-r | -a] [--points-at]" -#: builtin/branch.c +#: builtin/branch.c:38 msgid "git branch [] [-r | -a] [--format]" msgstr "git branch [] [-r | -a] [--format]" # 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長 -#: builtin/branch.c +#: builtin/branch.c:178 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3341,7 +3426,7 @@ msgstr "" " “%s”，但尚未合併到 HEAD" # 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長 -#: builtin/branch.c +#: builtin/branch.c:182 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3350,39 +3435,40 @@ msgstr "" "並未刪除分支 “%s”， 雖然已經合併到 HEAD，\n" " 卻尚未被合併至 “%s” 分支" -#: builtin/branch.c +#: builtin/branch.c:196 #, c-format msgid "couldn't look up commit object for '%s'" msgstr "無法查詢 “%s” 指向的提交物件" -#: builtin/branch.c +#: builtin/branch.c:200 #, c-format -msgid "" -"the branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'" -msgstr "" -"分支 “%s” 沒有完全合併。\n" -"如果確定要刪除它，請執行 “git branch -D %s”" +msgid "the branch '%s' is not fully merged" +msgstr "分支 “%s” 沒有完全合併" + +#: builtin/branch.c:202 +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" +msgstr "如果確定要刪除它，請執行 “git branch -D %s”" -#: builtin/branch.c +#: builtin/branch.c:214 msgid "update of config-file failed" msgstr "更新組態檔案失敗" -#: builtin/branch.c +#: builtin/branch.c:249 msgid "cannot use -a with -d" msgstr "不能將 -a 和 -d 同時使用" -#: builtin/branch.c +#: builtin/branch.c:267 #, c-format msgid "cannot delete branch '%s' used by worktree at '%s'" msgstr "無法刪除被位於 “%2$s” 的工作區使用的 “%1$s” 分支" -#: builtin/branch.c +#: builtin/branch.c:282 #, c-format msgid "remote-tracking branch '%s' not found" msgstr "找不到 “%s” 遠端追蹤分支" -#: builtin/branch.c +#: builtin/branch.c:293 #, c-format msgid "" "branch '%s' not found.\n" @@ -3391,324 +3477,327 @@ msgstr "" "找不到 “%s” 分支。\n" "您可能要加上 --remote？" -#: builtin/branch.c +#: builtin/branch.c:297 #, c-format msgid "branch '%s' not found" msgstr "找不到 “%s” 分支" -#: builtin/branch.c +#: builtin/branch.c:330 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "已刪除遠端追蹤分支 %s（曾為 %s）。\n" -#: builtin/branch.c +#: builtin/branch.c:331 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已刪除分支 %s（曾為 %s）。\n" -#: builtin/branch.c builtin/tag.c +#: builtin/branch.c:469 builtin/tag.c:67 msgid "unable to parse format string" msgstr "無法解析格式化字串" -#: builtin/branch.c +#: builtin/branch.c:505 msgid "could not resolve HEAD" msgstr "無法解析 HEAD 指針" -#: builtin/branch.c +#: builtin/branch.c:511 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD 指針 (%s) 指向 refs/heads/ 之外" -#: builtin/branch.c +#: builtin/branch.c:526 #, c-format msgid "branch %s is being rebased at %s" msgstr "%s 分支正在重定基底至 %s" -#: builtin/branch.c +#: builtin/branch.c:530 #, c-format msgid "branch %s is being bisected at %s" msgstr "%s 分支正於 %s 進行二分搜尋" -#: builtin/branch.c +#: builtin/branch.c:559 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "%s 工作區的 HEAD 指針未被更新" -#: builtin/branch.c +#: builtin/branch.c:586 #, c-format msgid "invalid branch name: '%s'" msgstr "分支名稱無效：“%s”" -#: builtin/branch.c +#: builtin/branch.c:606 builtin/branch.c:896 builtin/branch.c:941 #, c-format msgid "no commit on branch '%s' yet" msgstr "分支 “%s” 尚無提交" -#: builtin/branch.c +#: builtin/branch.c:608 builtin/branch.c:897 #, c-format msgid "no branch named '%s'" msgstr "沒有名為 “%s” 的分支" -#: builtin/branch.c +#: builtin/branch.c:636 msgid "branch rename failed" msgstr "分支重新命名失敗" -#: builtin/branch.c +#: builtin/branch.c:638 msgid "branch copy failed" msgstr "分支拷貝失敗" -#: builtin/branch.c +#: builtin/branch.c:642 #, c-format msgid "created a copy of a misnamed branch '%s'" msgstr "已為誤命名的 “%s” 分支建立拷貝" -#: builtin/branch.c +#: builtin/branch.c:645 #, c-format msgid "renamed a misnamed branch '%s' away" msgstr "已更改誤命名的 “%s” 分支的名稱" -#: builtin/branch.c +#: builtin/branch.c:652 #, c-format msgid "branch renamed to %s, but HEAD is not updated" msgstr "分支已重新命名為 %s，但 HEAD 指針尚未更新" -#: builtin/branch.c +#: builtin/branch.c:659 msgid "branch is renamed, but update of config-file failed" msgstr "分支已重新命名，但無法更新組態檔案" -#: builtin/branch.c +#: builtin/branch.c:661 msgid "branch is copied, but update of config-file failed" msgstr "分支已拷貝，但無法更新組態檔案" -#: builtin/branch.c +#: builtin/branch.c:681 #, c-format msgid "" "Please edit the description for the branch\n" " %s\n" -"Lines starting with '%c' will be stripped.\n" +"Lines starting with '%s' will be stripped.\n" msgstr "" "請編輯下述分支的描述\n" " %s\n" -"開頭是 “%c” 的列將被刪除。\n" +"開頭是「%s」的列將被刪除。\n" -#: builtin/branch.c +#: builtin/branch.c:719 msgid "Generic options" msgstr "一般性選項" -#: builtin/branch.c +#: builtin/branch.c:721 msgid "show hash and subject, give twice for upstream branch" msgstr "顯示雜湊值和主旨，若傳入兩次則顯示上游分支" -#: builtin/branch.c +#: builtin/branch.c:722 msgid "suppress informational messages" msgstr "不顯示資訊訊息" -#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c +#: builtin/branch.c:724 builtin/checkout.c:1688 +#: builtin/submodule--helper.c:2988 msgid "set branch tracking configuration" msgstr "設定分支追蹤組態" -#: builtin/branch.c +#: builtin/branch.c:727 msgid "do not use" msgstr "請勿使用" -#: builtin/branch.c +#: builtin/branch.c:729 msgid "upstream" msgstr "upstream" -#: builtin/branch.c +#: builtin/branch.c:729 msgid "change the upstream info" msgstr "變更上游資訊" -#: builtin/branch.c +#: builtin/branch.c:730 msgid "unset the upstream info" msgstr "取消設定上游資訊" -#: builtin/branch.c +#: builtin/branch.c:731 msgid "use colored output" msgstr "使用彩色輸出" -#: builtin/branch.c +#: builtin/branch.c:732 msgid "act on remote-tracking branches" msgstr "作用於遠端追蹤分支" -#: builtin/branch.c +#: builtin/branch.c:735 builtin/branch.c:737 msgid "print only branches that contain the commit" msgstr "只輸出包含此提交的分支" -#: builtin/branch.c +#: builtin/branch.c:736 builtin/branch.c:738 msgid "print only branches that don't contain the commit" msgstr "只輸出不包含此提交的分支" -#: builtin/branch.c +#: builtin/branch.c:741 msgid "Specific git-branch actions:" msgstr "特定的 git-branch 動作：" -#: builtin/branch.c +#: builtin/branch.c:742 msgid "list both remote-tracking and local branches" msgstr "列出遠端追蹤和本機分支" -#: builtin/branch.c +#: builtin/branch.c:745 msgid "delete fully merged branch" msgstr "刪除完全合併的分支" -#: builtin/branch.c +#: builtin/branch.c:746 msgid "delete branch (even if not merged)" msgstr "刪除分支（即使尚未合併）" -#: builtin/branch.c +#: builtin/branch.c:747 msgid "move/rename a branch and its reflog" msgstr "移動或重新命名分支及其引用日誌" -#: builtin/branch.c +#: builtin/branch.c:748 msgid "move/rename a branch, even if target exists" msgstr "即使目標已存在，仍移動或重新命名分支" -#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c +#: builtin/branch.c:750 builtin/for-each-ref.c:39 builtin/tag.c:499 msgid "do not output a newline after empty formatted refs" msgstr "在格式化引用結果為空之後，不要輸出換列符號" -#: builtin/branch.c +#: builtin/branch.c:751 msgid "copy a branch and its reflog" msgstr "拷貝分支及其引用日誌" -#: builtin/branch.c +#: builtin/branch.c:752 msgid "copy a branch, even if target exists" msgstr "即使目標已存在仍拷貝分支" -#: builtin/branch.c +#: builtin/branch.c:753 msgid "list branch names" msgstr "列出分支名稱" -#: builtin/branch.c +#: builtin/branch.c:754 msgid "show current branch name" msgstr "顯示目前分支名稱" -#: builtin/branch.c builtin/submodule--helper.c +#: builtin/branch.c:755 builtin/submodule--helper.c:2986 msgid "create the branch's reflog" msgstr "建立分支的引用日誌" -#: builtin/branch.c +#: builtin/branch.c:757 msgid "edit the description for the branch" msgstr "編輯分支的描述" -#: builtin/branch.c +#: builtin/branch.c:758 msgid "force creation, move/rename, deletion" msgstr "強制建立、移動/重新命名、刪除" -#: builtin/branch.c +#: builtin/branch.c:759 msgid "print only branches that are merged" msgstr "只輸出已經合併的分支" -#: builtin/branch.c +#: builtin/branch.c:760 msgid "print only branches that are not merged" msgstr "只輸出尚未合併的分支" -#: builtin/branch.c +#: builtin/branch.c:761 msgid "list branches in columns" msgstr "以行的形式列出分支" -#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c +#: builtin/branch.c:763 builtin/for-each-ref.c:48 builtin/notes.c:490 +#: builtin/notes.c:493 builtin/notes.c:666 builtin/notes.c:669 +#: builtin/tag.c:502 msgid "object" msgstr "object" -#: builtin/branch.c +#: builtin/branch.c:764 msgid "print only branches of the object" msgstr "只輸出指向此物件的分支" -#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c +#: builtin/branch.c:765 builtin/for-each-ref.c:54 builtin/tag.c:509 msgid "sorting and filtering are case insensitive" msgstr "排序和過濾不區分大小寫" -#: builtin/branch.c builtin/ls-files.c +#: builtin/branch.c:766 builtin/ls-files.c:623 msgid "recurse through submodules" msgstr "在子模組中遞迴" -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c -#: builtin/tag.c builtin/verify-tag.c +#: builtin/branch.c:767 builtin/for-each-ref.c:43 builtin/ls-files.c:635 +#: builtin/ls-tree.c:364 builtin/tag.c:507 builtin/verify-tag.c:30 msgid "format to use for the output" msgstr "輸出格式" -#: builtin/branch.c +#: builtin/branch.c:791 msgid "failed to resolve HEAD as a valid ref" msgstr "無法將 HEAD 解析為有效引用" -#: builtin/branch.c builtin/clone.c +#: builtin/branch.c:795 builtin/clone.c:719 msgid "HEAD not found below refs/heads!" msgstr "HEAD 指針不在 /refs/heads 中！" -#: builtin/branch.c +#: builtin/branch.c:816 msgid "" "branch with --recurse-submodules can only be used if submodule." "propagateBranches is enabled" msgstr "" "有 --recurse-submodules 的分支，只能在啟用 submodule.propagateBranches 時使用" -#: builtin/branch.c +#: builtin/branch.c:818 msgid "--recurse-submodules can only be used to create branches" msgstr "--recurse-submodules 只能用來建立分支" -#: builtin/branch.c +#: builtin/branch.c:849 builtin/branch.c:908 msgid "branch name required" msgstr "必須提供分支名稱" -#: builtin/branch.c +#: builtin/branch.c:884 msgid "cannot give description to detached HEAD" msgstr "無法向分離 HEAD 指針提供描述" -#: builtin/branch.c +#: builtin/branch.c:890 msgid "cannot edit description of more than one branch" msgstr "無法編輯超過一個分支的描述" -#: builtin/branch.c +#: builtin/branch.c:910 msgid "cannot copy the current branch while not on any" msgstr "不在任何分支上，無法拷貝目前分支" -#: builtin/branch.c +#: builtin/branch.c:911 msgid "cannot rename the current branch while not on any" msgstr "不在任何分支上，無法重新命名目前分支" -#: builtin/branch.c +#: builtin/branch.c:917 msgid "too many branches for a copy operation" msgstr "要進行拷貝動作的分支太多" -#: builtin/branch.c +#: builtin/branch.c:918 msgid "too many arguments for a rename operation" msgstr "傳入重新命名動作的引數太多" -#: builtin/branch.c +#: builtin/branch.c:929 msgid "too many arguments to set new upstream" msgstr "要設定新上游的引數太多" -#: builtin/branch.c +#: builtin/branch.c:933 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch" msgstr "無法將 HEAD 的上游設為 %s：其未指向任何分支" -#: builtin/branch.c +#: builtin/branch.c:936 builtin/branch.c:965 #, c-format msgid "no such branch '%s'" msgstr "無 “%s” 分支" -#: builtin/branch.c +#: builtin/branch.c:942 #, c-format msgid "branch '%s' does not exist" msgstr "沒有 “%s” 分支" -#: builtin/branch.c +#: builtin/branch.c:959 msgid "too many arguments to unset upstream" msgstr "要取消設定上游的引數太多" -#: builtin/branch.c +#: builtin/branch.c:963 msgid "could not unset upstream of HEAD when it does not point to any branch" msgstr "無法取消設定 HEAD 的上游：其未指向任何分支" -#: builtin/branch.c +#: builtin/branch.c:969 #, c-format msgid "branch '%s' has no upstream information" msgstr "分支 “%s” 沒有上游資訊" -#: builtin/branch.c +#: builtin/branch.c:983 msgid "" "the -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list ?" @@ -3716,42 +3805,44 @@ msgstr "" "“git branch” 的 -a 和 -r 選項不取分支名稱。\n" "您是想使用：-a|-r --list 嗎？" -#: builtin/branch.c +#: builtin/branch.c:987 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead" msgstr "不再支援選項 “--set-upstream”。請改用 “--track” 或 “--set-upstream-to”" -#: builtin/bugreport.c +#: builtin/bugreport.c:21 msgid "git version:\n" msgstr "git 版本：\n" -#: builtin/bugreport.c +#: builtin/bugreport.c:27 #, c-format msgid "uname() failed with error '%s' (%d)\n" msgstr "uname() 失敗，錯誤：“%s” (%d)\n" -#: builtin/bugreport.c +#: builtin/bugreport.c:37 msgid "compiler info: " msgstr "編譯器資訊： " -#: builtin/bugreport.c +#: builtin/bugreport.c:40 msgid "libc info: " msgstr "libc 資訊： " -#: builtin/bugreport.c +#: builtin/bugreport.c:54 msgid "not run from a git repository - no hooks to show\n" msgstr "不是在 git 版本庫執行 — 沒有可顯示的掛鉤\n" -#: builtin/bugreport.c +#: builtin/bugreport.c:67 msgid "" -"git bugreport [(-o | --output-directory) ] [(-s | --suffix) ]\n" +"git bugreport [(-o | --output-directory) ]\n" +" [(-s | --suffix) | --no-suffix]\n" " [--diagnose[=]]" msgstr "" -"git bugreport [(-o | --output-directory) ] [(-s | --suffix) ]\n" +"git bugreport [(-o | --output-directory) ]\n" +" [(-s | --suffix) | --no-suffix]\n" " [--diagnose[=]]" -#: builtin/bugreport.c +#: builtin/bugreport.c:76 msgid "" "Thank you for filling out a Git bug report!\n" "Please answer the following questions to help us understand your issue.\n" @@ -3785,58 +3876,59 @@ msgstr "" "請檢閱臭蟲報告下方的剩餘部分。\n" "您可刪除任何您不想分享的地方。\n" -#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c -#: parse-options.h +#: builtin/bugreport.c:117 builtin/commit.c:1543 builtin/commit.c:1547 +#: builtin/commit.c:1708 builtin/fast-export.c:1189 builtin/fast-export.c:1192 +#: builtin/fast-export.c:1195 builtin/rebase.c:1158 parse-options.h:581 msgid "mode" msgstr "mode" -#: builtin/bugreport.c +#: builtin/bugreport.c:118 msgid "" "create an additional zip archive of detailed diagnostics (default 'stats')" msgstr "另外建立有詳細診斷資訊的 ZIP 封存檔（預設值 “stats”）" -#: builtin/bugreport.c +#: builtin/bugreport.c:121 msgid "specify a destination for the bugreport file(s)" msgstr "指定臭蟲報告檔案的目的地" -#: builtin/bugreport.c +#: builtin/bugreport.c:123 msgid "specify a strftime format suffix for the filename(s)" msgstr "指定用於檔名的 strftime 格式後綴" -#: builtin/bugreport.c +#: builtin/bugreport.c:131 #, c-format msgid "unknown argument `%s'" msgstr "未知引數 “%s”" -#: builtin/bugreport.c builtin/diagnose.c +#: builtin/bugreport.c:154 builtin/diagnose.c:53 #, c-format msgid "could not create leading directories for '%s'" msgstr "無法建立 “%s” 的前置目錄" -#: builtin/bugreport.c builtin/diagnose.c +#: builtin/bugreport.c:167 builtin/diagnose.c:59 #, c-format msgid "unable to create diagnostics archive %s" msgstr "無法建立 %s 診斷封存檔" -#: builtin/bugreport.c +#: builtin/bugreport.c:175 msgid "System Info" msgstr "系統資訊" -#: builtin/bugreport.c +#: builtin/bugreport.c:178 msgid "Enabled Hooks" msgstr "啟用的掛鉤" -#: builtin/bugreport.c +#: builtin/bugreport.c:185 #, c-format msgid "unable to write to %s" msgstr "無法寫入 %s" -#: builtin/bugreport.c +#: builtin/bugreport.c:195 #, c-format msgid "Created new report at '%s'.\n" msgstr "已在 “%s” 建立新報告。\n" -#: builtin/bundle.c +#: builtin/bundle.c:19 msgid "" "git bundle create [-q | --quiet | --progress]\n" " [--version=] " @@ -3844,108 +3936,108 @@ msgstr "" "git bundle create [-q | --quiet | --progress]\n" " [--version=] " -#: builtin/bundle.c +#: builtin/bundle.c:22 msgid "git bundle verify [-q | --quiet] " msgstr "git bundle verify [-q | --quiet] " -#: builtin/bundle.c +#: builtin/bundle.c:24 msgid "git bundle list-heads [...]" msgstr "git bundle list-heads [...]" -#: builtin/bundle.c +#: builtin/bundle.c:26 msgid "git bundle unbundle [--progress] [...]" msgstr "git bundle unbundle [--progress] [...]" -#: builtin/bundle.c +#: builtin/bundle.c:65 msgid "need a argument" msgstr "需要提供 引數" -#: builtin/bundle.c builtin/pack-objects.c +#: builtin/bundle.c:76 builtin/pack-objects.c:4289 msgid "do not show progress meter" msgstr "不顯示進度列" -#: builtin/bundle.c builtin/pack-objects.c +#: builtin/bundle.c:79 builtin/bundle.c:195 builtin/pack-objects.c:4292 msgid "show progress meter" msgstr "顯示進度列" -#: builtin/bundle.c +#: builtin/bundle.c:82 msgid "historical; same as --progress" msgstr "歷史遺留選項；和 --progress 相同" -#: builtin/bundle.c +#: builtin/bundle.c:85 msgid "historical; does nothing" msgstr "歷史遺留選項；沒有作用" -#: builtin/bundle.c +#: builtin/bundle.c:88 msgid "specify bundle format version" msgstr "指定套件包的格式版本" -#: builtin/bundle.c +#: builtin/bundle.c:102 msgid "Need a repository to create a bundle." msgstr "需要版本庫來建立套件包。" -#: builtin/bundle.c +#: builtin/bundle.c:133 msgid "do not show bundle details" msgstr "不顯示套件包的詳細資訊" -#: builtin/bundle.c +#: builtin/bundle.c:154 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c +#: builtin/bundle.c:210 msgid "Need a repository to unbundle." msgstr "需要版本庫才能拆分套件包。" -#: builtin/bundle.c +#: builtin/bundle.c:213 msgid "Unbundling objects" msgstr "正在拆分物件" -#: builtin/cat-file.c merge-recursive.c +#: builtin/cat-file.c:73 merge-recursive.c:962 #, c-format msgid "cannot read object %s '%s'" msgstr "無法讀取物件 %s “%s”" -#: builtin/cat-file.c +#: builtin/cat-file.c:674 msgid "flush is only for --buffer mode" msgstr "排清功能只能用於 --buffer 模式" -#: builtin/cat-file.c +#: builtin/cat-file.c:718 msgid "empty command in input" msgstr "輸入中沒有命令" -#: builtin/cat-file.c +#: builtin/cat-file.c:720 #, c-format msgid "whitespace before command: '%s'" msgstr "命令前有空格：“%s”" -#: builtin/cat-file.c +#: builtin/cat-file.c:729 #, c-format msgid "%s requires arguments" msgstr "%s 需要引數" -#: builtin/cat-file.c +#: builtin/cat-file.c:734 #, c-format msgid "%s takes no arguments" msgstr "%s 不取引數" -#: builtin/cat-file.c +#: builtin/cat-file.c:902 msgid "only one batch option may be specified" msgstr "只能指定一個批次處理選項" -#: builtin/cat-file.c +#: builtin/cat-file.c:933 msgid "git cat-file " msgstr "git cat-file " -#: builtin/cat-file.c +#: builtin/cat-file.c:934 msgid "git cat-file (-e | -p) " msgstr "git cat-file (-e | -p) " -#: builtin/cat-file.c +#: builtin/cat-file.c:935 msgid "git cat-file (-t | -s) [--allow-unknown-type] " msgstr "git cat-file (-t | -s) [--allow-unknown-type] " -#: builtin/cat-file.c +#: builtin/cat-file.c:936 msgid "" "git cat-file (--textconv | --filters)\n" " [: | --path= ]" @@ -3953,7 +4045,7 @@ msgstr "" "git cat-file (--textconv | --filters)\n" " [: | --path= ]" -#: builtin/cat-file.c +#: builtin/cat-file.c:938 msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" @@ -3965,143 +4057,144 @@ msgstr "" " [--buffer] [--follow-symlinks] [--unordered]\n" " [--textconv | --filters] [-Z]" -#: builtin/cat-file.c +#: builtin/cat-file.c:945 msgid "Check object existence or emit object contents" msgstr "檢查物件的存在狀態，或輸出物件內容" -#: builtin/cat-file.c +#: builtin/cat-file.c:947 msgid "check if exists" msgstr "檢查 是否存在" -#: builtin/cat-file.c +#: builtin/cat-file.c:948 msgid "pretty-print content" msgstr "美化輸出 的內容" -#: builtin/cat-file.c +#: builtin/cat-file.c:950 msgid "Emit [broken] object attributes" msgstr "輸出 [損壞的] ([broken]) 物件屬性" -#: builtin/cat-file.c +#: builtin/cat-file.c:951 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" msgstr "顯示物件類型（可以是 “blob”、“tree”、“commit”、“tag” 等其中一個）" -#: builtin/cat-file.c +#: builtin/cat-file.c:952 msgid "show object size" msgstr "顯示物件大小" -#: builtin/cat-file.c +#: builtin/cat-file.c:954 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允許 -s 和 -t 對損壞的物件生效" -#: builtin/cat-file.c builtin/log.c +#: builtin/cat-file.c:955 builtin/log.c:251 msgid "use mail map file" msgstr "使用信件映射檔案" -#: builtin/cat-file.c +#: builtin/cat-file.c:958 msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "批次處理 stdin 上請求的物件（或 --batch-all-objects）" -#: builtin/cat-file.c +#: builtin/cat-file.c:960 msgid "show full or contents" msgstr "顯示完整的 或 內容" -#: builtin/cat-file.c +#: builtin/cat-file.c:964 msgid "like --batch, but don't emit " msgstr "類似 --batch 但不輸出 " -#: builtin/cat-file.c +#: builtin/cat-file.c:967 msgid "stdin is NUL-terminated" msgstr "stdin 以 NUL 字元終止" -#: builtin/cat-file.c +#: builtin/cat-file.c:969 msgid "stdin and stdout is NUL-terminated" msgstr "stdin 和 stdout 以 NUL 字元終止" -#: builtin/cat-file.c +#: builtin/cat-file.c:971 msgid "read commands from stdin" msgstr "從 stdin 讀取命令" -#: builtin/cat-file.c +#: builtin/cat-file.c:975 msgid "with --batch[-check]: ignores stdin, batches all known objects" msgstr "傳入 --batch[-check]：忽略 stdin，批次處理所有已知物件" -#: builtin/cat-file.c +#: builtin/cat-file.c:977 msgid "Change or optimize batch output" msgstr "變更或最佳化批次處理的輸出" -#: builtin/cat-file.c +#: builtin/cat-file.c:978 msgid "buffer --batch output" msgstr "緩衝 --batch 的輸出" -#: builtin/cat-file.c +#: builtin/cat-file.c:980 msgid "follow in-tree symlinks" msgstr "追蹤樹狀物件中的符號連結" -#: builtin/cat-file.c +#: builtin/cat-file.c:982 msgid "do not order objects before emitting them" msgstr "不要在輸出前排序物件" -#: builtin/cat-file.c +#: builtin/cat-file.c:984 msgid "" "Emit object (blob or tree) with conversion or filter (stand-alone, or with " "batch)" msgstr "轉換或過濾後輸出物件 (blob 或 tree)（單獨或批次處理）" -#: builtin/cat-file.c +#: builtin/cat-file.c:986 msgid "run textconv on object's content" msgstr "對物件內容進行文字轉換 (textconv)" -#: builtin/cat-file.c +#: builtin/cat-file.c:988 msgid "run filters on object's content" msgstr "在物件內容執行過濾器" -#: builtin/cat-file.c +#: builtin/cat-file.c:989 msgid "blob|tree" msgstr "blob|tree" -#: builtin/cat-file.c +#: builtin/cat-file.c:990 msgid "use a for (--textconv | --filters); Not with 'batch'" msgstr "請在 (--textconv | --filters) 使用 ，而非 “batch”" -#: builtin/cat-file.c +#: builtin/cat-file.c:1011 #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" msgstr "“%s=<%s>” 需要 “%s” 或 “%s”" -#: builtin/cat-file.c +#: builtin/cat-file.c:1013 msgid "path|tree-ish" msgstr "path|tree-ish" -#: builtin/cat-file.c +#: builtin/cat-file.c:1020 builtin/cat-file.c:1023 builtin/cat-file.c:1026 +#: builtin/cat-file.c:1029 builtin/cat-file.c:1032 #, c-format msgid "'%s' requires a batch mode" msgstr "“%s” 需要批次處理模式" -#: builtin/cat-file.c +#: builtin/cat-file.c:1050 #, c-format msgid "'-%c' is incompatible with batch mode" msgstr "“-%c” 與批次處理模式不相容" -#: builtin/cat-file.c +#: builtin/cat-file.c:1053 msgid "batch modes take no arguments" msgstr "批次處理模式不取引數" -#: builtin/cat-file.c +#: builtin/cat-file.c:1061 builtin/cat-file.c:1064 #, c-format msgid " required with '%s'" msgstr "“%s” 需要 " -#: builtin/cat-file.c +#: builtin/cat-file.c:1067 #, c-format msgid " required with '-%c'" msgstr "“-%c” 需要 " -#: builtin/cat-file.c +#: builtin/cat-file.c:1076 #, c-format msgid "only two arguments allowed in mode, not %d" msgstr "只允許在 模式傳入兩個引數，但傳了 %d 個" -#: builtin/check-attr.c +#: builtin/check-attr.c:19 msgid "" "git check-attr [--source ] [-a | --all | ...] [--] " "..." @@ -4109,250 +4202,263 @@ msgstr "" "git check-attr [--source ] [-a | --all | ...] [--] " "..." -#: builtin/check-attr.c +#: builtin/check-attr.c:20 msgid "" "git check-attr --stdin [-z] [--source ] [-a | --all | ...]" msgstr "" "git check-attr --stdin [-z] [--source ] [-a | --all | ...]" -#: builtin/check-attr.c +#: builtin/check-attr.c:27 msgid "report all attributes set on file" msgstr "回報設定在檔案上的所有屬性" -#: builtin/check-attr.c +#: builtin/check-attr.c:28 msgid "use .gitattributes only from the index" msgstr "只使用索引中的 .gitattributes" -#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c +#: builtin/check-attr.c:29 builtin/check-ignore.c:27 builtin/hash-object.c:109 msgid "read file names from stdin" msgstr "從 stdin 讀出檔案名稱" -#: builtin/check-attr.c builtin/check-ignore.c +#: builtin/check-attr.c:31 builtin/check-ignore.c:29 msgid "terminate input and output records by a NUL character" msgstr "輸入和輸出的紀錄使用 NUL 字元終止" -#: builtin/check-attr.c +#: builtin/check-attr.c:32 msgid "" msgstr "" -#: builtin/check-attr.c +#: builtin/check-attr.c:32 msgid "which tree-ish to check attributes at" msgstr "要用哪一個樹狀物件檢查屬性" -#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c +#: builtin/check-ignore.c:23 builtin/checkout.c:1666 builtin/gc.c:626 +#: builtin/worktree.c:790 msgid "suppress progress reporting" msgstr "不顯示進度報告" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:31 msgid "show non-matching input paths" msgstr "顯示不符合的輸入路徑" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:33 msgid "ignore index when checking" msgstr "檢查時忽略索引" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:167 msgid "cannot specify pathnames with --stdin" msgstr "無法同時指定路徑名稱及 --stdin" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:170 msgid "-z only makes sense with --stdin" msgstr "-z 需要和 --stdin 同時使用才有意義" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:172 msgid "no path specified" msgstr "未指定路徑" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:176 msgid "--quiet is only valid with a single pathname" msgstr "引數 --quiet 只在提供一個路徑名稱時有效" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:178 msgid "cannot have both --quiet and --verbose" msgstr "無法同時傳入 --quiet 和 --verbose" -#: builtin/check-ignore.c +#: builtin/check-ignore.c:181 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 選項只在使用 --verbose 時有效" -#: builtin/check-mailmap.c +#: builtin/check-mailmap.c:13 msgid "git check-mailmap [] ..." msgstr "git check-mailmap [] ..." -#: builtin/check-mailmap.c +#: builtin/check-mailmap.c:18 msgid "also read contacts from stdin" msgstr "亦從 stdin 讀取聯絡地址" -#: builtin/check-mailmap.c +#: builtin/check-mailmap.c:29 #, c-format msgid "unable to parse contact: %s" msgstr "無法解析聯絡地址：%s" -#: builtin/check-mailmap.c +#: builtin/check-mailmap.c:52 msgid "no contacts specified" msgstr "未指定聯絡地址" -#: builtin/checkout--worker.c +#: builtin/checkout--worker.c:112 msgid "git checkout--worker []" msgstr "git checkout--worker []" -#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c -#: builtin/submodule--helper.c builtin/worktree.c +#: builtin/checkout--worker.c:120 builtin/checkout-index.c:240 +#: builtin/column.c:32 builtin/column.c:33 builtin/submodule--helper.c:1782 +#: builtin/submodule--helper.c:1785 builtin/submodule--helper.c:1793 +#: builtin/worktree.c:788 builtin/worktree.c:1082 msgid "string" msgstr "string" -#: builtin/checkout--worker.c builtin/checkout-index.c +#: builtin/checkout--worker.c:121 builtin/checkout-index.c:241 msgid "when creating files, prepend " msgstr "建立檔案時，在前面加上 " -#: builtin/checkout-index.c +#: builtin/checkout-index.c:188 msgid "git checkout-index [] [--] [...]" msgstr "git checkout-index [] [--] [...]" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:206 msgid "stage should be between 1 and 3 or all" msgstr "stage 應該是 1 到 3 的值，或者是 all" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:224 msgid "check out all files in the index" msgstr "簽出索引區的所有檔案" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:226 msgid "do not skip files with skip-worktree set" msgstr "設定 skip-worktree 時不略過檔案" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:227 msgid "force overwrite of existing files" msgstr "強制覆蓋現有的檔案" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:229 msgid "no warning for existing files and files not in index" msgstr "存在或不在索引中的檔案都沒有警告" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:231 msgid "don't checkout new files" msgstr "不簽出新檔案" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:233 msgid "update stat information in the index file" msgstr "更新索引檔案的狀態訊息" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:237 msgid "read list of paths from the standard input" msgstr "從標準輸入讀取路徑清單" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:239 msgid "write the content to temporary files" msgstr "將內容寫入暫存檔" -#: builtin/checkout-index.c +#: builtin/checkout-index.c:243 msgid "copy out the files from named stage" msgstr "從指定暫存區中拷出檔案" -#: builtin/checkout.c +#: builtin/checkout.c:43 msgid "git checkout [] " msgstr "git checkout [] " -#: builtin/checkout.c +#: builtin/checkout.c:44 msgid "git checkout [] [] -- ..." msgstr "git checkout [] [] -- ..." -#: builtin/checkout.c +#: builtin/checkout.c:49 msgid "git switch [] []" msgstr "git switch [] []" -#: builtin/checkout.c +#: builtin/checkout.c:54 msgid "git restore [] [--source=] ..." msgstr "git restore [] [--source=] ..." -#: builtin/checkout.c +#: builtin/checkout.c:211 builtin/checkout.c:250 #, c-format msgid "path '%s' does not have our version" msgstr "“%s” 路徑沒有我們的版本" -#: builtin/checkout.c +#: builtin/checkout.c:213 builtin/checkout.c:252 #, c-format msgid "path '%s' does not have their version" msgstr "“%s” 路徑沒有他們的版本" -#: builtin/checkout.c +#: builtin/checkout.c:229 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "“%s” 路徑沒有所有必須的版本" -#: builtin/checkout.c +#: builtin/checkout.c:284 #, c-format msgid "path '%s' does not have necessary versions" msgstr "“%s” 路徑沒有必須的版本" -#: builtin/checkout.c +#: builtin/checkout.c:304 #, c-format msgid "path '%s': cannot merge" msgstr "path “%s”：無法合併" -#: builtin/checkout.c +#: builtin/checkout.c:320 #, c-format msgid "Unable to add merge result for '%s'" msgstr "無法為 “%s” 加上合併結果" -#: builtin/checkout.c +#: builtin/checkout.c:438 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新建立了 %d 個合併衝突" -#: builtin/checkout.c +#: builtin/checkout.c:443 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "從 %2$s 更新了 %1$d 個路徑" -#: builtin/checkout.c +#: builtin/checkout.c:450 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "已從索引區更新 %d 個路徑" -#: builtin/checkout.c +#: builtin/checkout.c:473 builtin/checkout.c:476 builtin/checkout.c:479 +#: builtin/checkout.c:483 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "無法在更新路徑時使用 “%s”" -#: builtin/checkout.c +#: builtin/checkout.c:493 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "無法同時更新路徑和切換至 “%s” 分支。" -#: builtin/checkout.c +#: builtin/checkout.c:497 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "“%s” 或 “%s” 皆未指定" -#: builtin/checkout.c +#: builtin/checkout.c:501 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 “%2$s” 時，必須使用 “%1$s”" -#: builtin/checkout.c +#: builtin/checkout.c:519 builtin/checkout.c:523 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "“%s” 或 “%s” 無法與 %s 一起使用" -#: builtin/checkout.c +#: builtin/checkout.c:533 #, c-format msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree" msgstr "“%s”、“%s” 或 “%s” 無法在簽出樹狀物件時使用" -#: builtin/checkout.c +#: builtin/checkout.c:606 builtin/checkout.c:613 #, c-format msgid "path '%s' is unmerged" msgstr "路徑 “%s” 未合併" -#: builtin/checkout.c +#: builtin/checkout.c:797 builtin/checkout.c:1261 builtin/checkout.c:1267 +#: builtin/grep.c:525 builtin/grep.c:668 builtin/grep.c:708 +#: builtin/merge-tree.c:450 builtin/merge-tree.c:455 builtin/merge-tree.c:460 +#: builtin/reset.c:120 merge-ort.c:5058 reset.c:161 sequencer.c:726 +#: sequencer.c:3915 tree-walk.c:93 +#, c-format +msgid "unable to read tree (%s)" +msgstr "無法讀取樹（%s）" + +#: builtin/checkout.c:813 msgid "you need to resolve your current index first" msgstr "您需要先解決目前索引區的衝突" -#: builtin/checkout.c +#: builtin/checkout.c:868 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -4361,51 +4467,51 @@ msgstr "" "無法繼續，下列檔案有暫存的更動：\n" "%s" -#: builtin/checkout.c +#: builtin/checkout.c:963 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "無法對 “%s” 執行 reflog 動作：%s\n" -#: builtin/checkout.c +#: builtin/checkout.c:1008 msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c +#: builtin/checkout.c:1012 builtin/clone.c:641 builtin/clone.c:667 msgid "unable to update HEAD" msgstr "無法更新 HEAD" -#: builtin/checkout.c +#: builtin/checkout.c:1016 #, c-format msgid "Reset branch '%s'\n" msgstr "重設分支 “%s”\n" -#: builtin/checkout.c +#: builtin/checkout.c:1019 #, c-format msgid "Already on '%s'\n" msgstr "已經位於 “%s”\n" -#: builtin/checkout.c +#: builtin/checkout.c:1023 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "已切換並重設分支 “%s”\n" -#: builtin/checkout.c +#: builtin/checkout.c:1025 builtin/checkout.c:1472 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "已切換至新分支 “%s”\n" -#: builtin/checkout.c +#: builtin/checkout.c:1027 #, c-format msgid "Switched to branch '%s'\n" msgstr "已切換至分支 “%s”\n" # 譯者：請維持前導空格 -#: builtin/checkout.c +#: builtin/checkout.c:1079 #, c-format msgid " ... and %d more.\n" msgstr " …… 及其它 %d 個。\n" -#: builtin/checkout.c +#: builtin/checkout.c:1085 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4423,7 +4529,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c +#: builtin/checkout.c:1104 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4444,19 +4550,19 @@ msgstr[0] "" " git branch <新分支名稱> %s\n" "\n" -#: builtin/checkout.c +#: builtin/checkout.c:1139 msgid "internal error in revision walk" msgstr "在修訂版遍歷時遇到內部錯誤" -#: builtin/checkout.c +#: builtin/checkout.c:1143 msgid "Previous HEAD position was" msgstr "之前的 HEAD 指針位置在" -#: builtin/checkout.c +#: builtin/checkout.c:1187 builtin/checkout.c:1467 msgid "You are on a branch yet to be born" msgstr "您正位於一個尚未初始化的分支" -#: builtin/checkout.c +#: builtin/checkout.c:1280 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -4465,7 +4571,7 @@ msgstr "" "“%s” 既可以是本機檔案，也可以是追蹤分支。\n" "請使用 --（和可選的 --no-guess）來消除歧義" -#: builtin/checkout.c +#: builtin/checkout.c:1287 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -4485,56 +4591,56 @@ msgstr "" "而不太想寫如 “origin” 的遠端版本庫名稱，\n" "可以在組態中設定 checkout.defaultRemote=origin。" -#: builtin/checkout.c +#: builtin/checkout.c:1297 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "“%s” 符合多個 (%d) 遠端追蹤分支" -#: builtin/checkout.c +#: builtin/checkout.c:1363 msgid "only one reference expected" msgstr "預期只有一個引用" -#: builtin/checkout.c +#: builtin/checkout.c:1380 #, c-format msgid "only one reference expected, %d given." msgstr "預期只有一個引用，卻提供了 %d 個。" -#: builtin/checkout.c builtin/worktree.c +#: builtin/checkout.c:1426 builtin/worktree.c:443 builtin/worktree.c:896 #, c-format msgid "invalid reference: %s" msgstr "無效引用：%s" -#: builtin/checkout.c +#: builtin/checkout.c:1439 builtin/checkout.c:1862 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是樹狀物件：%s" -#: builtin/checkout.c +#: builtin/checkout.c:1488 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "預期收到分支，卻收到標籤 “%s”" -#: builtin/checkout.c +#: builtin/checkout.c:1490 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "預期收到分支，卻收到遠端分支 “%s”" -#: builtin/checkout.c +#: builtin/checkout.c:1492 builtin/checkout.c:1501 #, c-format msgid "a branch is expected, got '%s'" msgstr "預期收到分支，卻收到 “%s”" -#: builtin/checkout.c +#: builtin/checkout.c:1495 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "預期收到分支，卻收到提交 “%s”" -#: builtin/checkout.c +#: builtin/checkout.c:1504 msgid "" "If you want to detach HEAD at the commit, try again with the --detach option." msgstr "若您想要在此提交分離 HEAD 指針，請傳入 --detach 選項重試。" -#: builtin/checkout.c +#: builtin/checkout.c:1517 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -4542,7 +4648,7 @@ msgstr "" "無法在合併時切換分支\n" "請試試 “git merge --quit” 或 “git worktree add”。" -#: builtin/checkout.c +#: builtin/checkout.c:1521 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -4550,7 +4656,7 @@ msgstr "" "無法在 am 工作階段期間時切換分支\n" "請試試 “git am --quit” 或 “git worktree add”。" -#: builtin/checkout.c +#: builtin/checkout.c:1525 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -4558,7 +4664,7 @@ msgstr "" "無法在重定基底時切換分支\n" "請試試 “git rebase --quit” 或 “git worktree add”。" -#: builtin/checkout.c +#: builtin/checkout.c:1529 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -4566,7 +4672,7 @@ msgstr "" "無法在揀選時切換分支\n" "請試試 “git cherry-pick --quit” 或 “git worktree add”。" -#: builtin/checkout.c +#: builtin/checkout.c:1533 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -4574,120 +4680,126 @@ msgstr "" "無法在還原時切換分支\n" "請試試 “git revert --quit” 或 “git worktree add”。" -#: builtin/checkout.c +#: builtin/checkout.c:1537 msgid "you are switching branch while bisecting" msgstr "您在進行二分搜尋時切換分支" -#: builtin/checkout.c +#: builtin/checkout.c:1566 msgid "paths cannot be used with switching branches" msgstr "路徑不能與切換分支同時使用" -#: builtin/checkout.c +#: builtin/checkout.c:1569 builtin/checkout.c:1573 builtin/checkout.c:1577 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "“%s” 不能與切換分支同時使用" -#: builtin/checkout.c +#: builtin/checkout.c:1581 builtin/checkout.c:1584 builtin/checkout.c:1587 +#: builtin/checkout.c:1592 builtin/checkout.c:1597 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "“%s” 不能與 “%s” 同時使用" -#: builtin/checkout.c +#: builtin/checkout.c:1594 #, c-format msgid "'%s' cannot take " msgstr "“%s” 不取 " -#: builtin/checkout.c +#: builtin/checkout.c:1602 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "無法將分支切換至非提交項目 “%s”" -#: builtin/checkout.c +#: builtin/checkout.c:1609 msgid "missing branch or commit argument" msgstr "缺少分支或提交引數" -#: builtin/checkout.c +#: builtin/checkout.c:1654 +#, c-format +msgid "unknown conflict style '%s'" +msgstr "未知的衝突輸出風格「%s」" + +#: builtin/checkout.c:1671 msgid "perform a 3-way merge with the new branch" msgstr "和新分支進行三方合併" -#: builtin/checkout.c builtin/log.c parse-options.h +#: builtin/checkout.c:1672 builtin/log.c:1976 parse-options.h:542 msgid "style" msgstr "style" -#: builtin/checkout.c +#: builtin/checkout.c:1673 msgid "conflict style (merge, diff3, or zdiff3)" msgstr "衝突輸出風格（merge、diff3 或 zdiff3）" -#: builtin/checkout.c builtin/worktree.c +#: builtin/checkout.c:1686 builtin/worktree.c:785 msgid "detach HEAD at named commit" msgstr "自指定提交分離 HEAD 指針" -#: builtin/checkout.c +#: builtin/checkout.c:1691 msgid "force checkout (throw away local modifications)" msgstr "強制簽出（捨棄本機修改）" -#: builtin/checkout.c +#: builtin/checkout.c:1693 msgid "new-branch" msgstr "new-branch" -#: builtin/checkout.c -msgid "new unparented branch" -msgstr "新的，沒有父提交的分支" +#: builtin/checkout.c:1693 +msgid "new unborn branch" +msgstr "新的未誕生分支" -#: builtin/checkout.c builtin/merge.c +#: builtin/checkout.c:1695 builtin/merge.c:287 msgid "update ignored files (default)" msgstr "更新忽略的檔案（預設值）" -#: builtin/checkout.c +#: builtin/checkout.c:1698 msgid "do not check if another worktree is holding the given ref" msgstr "不檢查其他工作區是否正在佔用指定的引用" -#: builtin/checkout.c +#: builtin/checkout.c:1711 msgid "checkout our version for unmerged files" msgstr "對尚未合併的檔案簽出我們的版本" -#: builtin/checkout.c +#: builtin/checkout.c:1714 msgid "checkout their version for unmerged files" msgstr "對尚未合併的檔案簽出他們的版本" -#: builtin/checkout.c +#: builtin/checkout.c:1718 msgid "do not limit pathspecs to sparse entries only" msgstr "對路徑規格不做稀疏簽出的限制" -#: builtin/checkout.c +#: builtin/checkout.c:1777 #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" msgstr "“-%c”、“-%c” 和 “%s” 選項不得同時使用" -#: builtin/checkout.c +#: builtin/checkout.c:1818 msgid "--track needs a branch name" msgstr "--track 需要分支名稱" -#: builtin/checkout.c +#: builtin/checkout.c:1823 #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名稱，請嘗試 -%c" -#: builtin/checkout.c +#: builtin/checkout.c:1855 #, c-format msgid "could not resolve %s" msgstr "無法解析 %s" -#: builtin/checkout.c +#: builtin/checkout.c:1871 msgid "invalid path specification" msgstr "無效的路徑規格" -#: builtin/checkout.c +#: builtin/checkout.c:1878 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "“%s” 不是提交，因此不能以這為基礎建立 “%s” 分支" -#: builtin/checkout.c +#: builtin/checkout.c:1882 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不取路徑引數 “%s”" -#: builtin/checkout.c +#: builtin/checkout.c:1907 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4695,72 +4807,75 @@ msgstr "" "git checkout：在從索引簽出時，--ours/--theirs、--force\n" "和 --merge 不相容。" -#: builtin/checkout.c +#: builtin/checkout.c:1912 msgid "you must specify path(s) to restore" msgstr "您必須指定要還原的路徑" -#: builtin/checkout.c builtin/clone.c builtin/remote.c -#: builtin/submodule--helper.c builtin/worktree.c +#: builtin/checkout.c:1944 builtin/checkout.c:1946 builtin/checkout.c:1991 +#: builtin/checkout.c:1993 builtin/clone.c:142 builtin/remote.c:174 +#: builtin/remote.c:176 builtin/replay.c:293 builtin/submodule--helper.c:2943 +#: builtin/submodule--helper.c:3289 builtin/worktree.c:780 +#: builtin/worktree.c:782 msgid "branch" msgstr "branch" -#: builtin/checkout.c +#: builtin/checkout.c:1945 msgid "create and checkout a new branch" msgstr "建立並簽出新分支" -#: builtin/checkout.c +#: builtin/checkout.c:1947 msgid "create/reset and checkout a branch" msgstr "建立/重設並簽出分支" -#: builtin/checkout.c +#: builtin/checkout.c:1948 msgid "create reflog for new branch" msgstr "為新分支建立引用日誌" -#: builtin/checkout.c +#: builtin/checkout.c:1950 msgid "second guess 'git checkout ' (default)" msgstr "二次猜測 “git checkout <無此分支>”（預設值）" -#: builtin/checkout.c +#: builtin/checkout.c:1951 msgid "use overlay mode (default)" msgstr "使用疊加模式（預設值）" -#: builtin/checkout.c +#: builtin/checkout.c:1992 msgid "create and switch to a new branch" msgstr "建立並切換至新分支" -#: builtin/checkout.c +#: builtin/checkout.c:1994 msgid "create/reset and switch to a branch" msgstr "建立/重設並切換至指定分支" -#: builtin/checkout.c +#: builtin/checkout.c:1996 msgid "second guess 'git switch '" msgstr "二次猜測 “git switch <無此分支>”" -#: builtin/checkout.c +#: builtin/checkout.c:1998 msgid "throw away local modifications" msgstr "捨棄本機修改" -#: builtin/checkout.c +#: builtin/checkout.c:2028 msgid "which tree-ish to checkout from" msgstr "要自哪一個樹狀物件指示元簽出" -#: builtin/checkout.c +#: builtin/checkout.c:2030 msgid "restore the index" msgstr "還原索引" -#: builtin/checkout.c +#: builtin/checkout.c:2032 msgid "restore the working tree (default)" msgstr "還原工作區（預設值）" -#: builtin/checkout.c +#: builtin/checkout.c:2034 msgid "ignore unmerged entries" msgstr "忽略未合併項目" -#: builtin/checkout.c +#: builtin/checkout.c:2035 msgid "use overlay mode" msgstr "使用疊加模式" -#: builtin/clean.c +#: builtin/clean.c:34 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] " "[...]" @@ -4768,45 +4883,45 @@ msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] " "[...]" -#: builtin/clean.c +#: builtin/clean.c:38 #, c-format msgid "Removing %s\n" msgstr "正在刪除 %s\n" -#: builtin/clean.c +#: builtin/clean.c:39 #, c-format msgid "Would remove %s\n" msgstr "將會刪除 %s\n" -#: builtin/clean.c +#: builtin/clean.c:40 #, c-format msgid "Skipping repository %s\n" msgstr "忽略版本庫 %s\n" -#: builtin/clean.c +#: builtin/clean.c:41 #, c-format msgid "Would skip repository %s\n" msgstr "將忽略版本庫 %s\n" -#: builtin/clean.c midx.c +#: builtin/clean.c:42 midx.c:508 #, c-format msgid "failed to remove %s" msgstr "無法移除 %s" -#: builtin/clean.c +#: builtin/clean.c:43 #, c-format msgid "could not lstat %s\n" msgstr "不能對 %s 進行 lstat\n" -#: builtin/clean.c +#: builtin/clean.c:44 msgid "Refusing to remove current working directory\n" msgstr "拒絕移除目前工作目錄\n" -#: builtin/clean.c +#: builtin/clean.c:45 msgid "Would refuse to remove current working directory\n" msgstr "會拒絕移除目前的工作目錄\n" -#: builtin/clean.c +#: builtin/clean.c:334 #, c-format msgid "" "Prompt help:\n" @@ -4819,7 +4934,7 @@ msgstr "" "foo - 根據獨特前綴選擇項目\n" " - （空）什麼也不選擇\n" -#: builtin/clean.c +#: builtin/clean.c:338 #, c-format msgid "" "Prompt help:\n" @@ -4840,32 +4955,32 @@ msgstr "" "* - 選擇所有項目\n" " - （空）完成選擇\n" -#: builtin/clean.c +#: builtin/clean.c:553 #, c-format msgid "Huh (%s)?\n" msgstr "嗯（%s）?\n" -#: builtin/clean.c +#: builtin/clean.c:693 #, c-format msgid "Input ignore patterns>> " msgstr "輸入要忽略的模式項目>> " -#: builtin/clean.c +#: builtin/clean.c:727 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：無法找到和 %s 符合的項目" -#: builtin/clean.c +#: builtin/clean.c:748 msgid "Select items to delete" msgstr "選擇要刪除的項目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c +#: builtin/clean.c:789 #, c-format msgid "Remove %s [y/N]? " msgstr "移除 %s [y/N]? " -#: builtin/clean.c +#: builtin/clean.c:820 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -4883,279 +4998,279 @@ msgstr "" "help - 顯示本輔助說明\n" "? - 顯示如何在提示下選擇的協助" -#: builtin/clean.c +#: builtin/clean.c:856 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "將移除以下項目：" -#: builtin/clean.c +#: builtin/clean.c:872 msgid "No more files to clean, exiting." msgstr "沒有要清理的檔案，離開。" -#: builtin/clean.c +#: builtin/clean.c:934 msgid "do not print names of files removed" msgstr "不輸出移除的檔案的名稱" -#: builtin/clean.c +#: builtin/clean.c:936 msgid "force" msgstr "force" -#: builtin/clean.c +#: builtin/clean.c:937 msgid "interactive cleaning" msgstr "互動式清除" -#: builtin/clean.c +#: builtin/clean.c:939 msgid "remove whole directories" msgstr "移除整個目錄" -#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c -#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c -#: ref-filter.h +#: builtin/clean.c:940 builtin/describe.c:586 builtin/describe.c:588 +#: builtin/grep.c:994 builtin/log.c:258 builtin/log.c:260 +#: builtin/ls-files.c:607 builtin/name-rev.c:569 builtin/name-rev.c:571 +#: builtin/pack-refs.c:32 builtin/pack-refs.c:34 builtin/show-ref.c:307 +#: ref-filter.h:133 msgid "pattern" msgstr "pattern" -#: builtin/clean.c +#: builtin/clean.c:941 msgid "add to ignore rules" msgstr "將 加到忽略規則" -#: builtin/clean.c +#: builtin/clean.c:942 msgid "remove ignored files, too" msgstr "亦移除忽略的檔案" -#: builtin/clean.c +#: builtin/clean.c:944 msgid "remove only ignored files" msgstr "只移除忽略的檔案" -#: builtin/clean.c -msgid "" -"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " -"clean" -msgstr "" -"clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" - -#: builtin/clean.c -msgid "" -"clean.requireForce defaults to true and neither -i, -n, nor -f given; " -"refusing to clean" -msgstr "" -"clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" - -#: builtin/clean.c -msgid "-x and -X cannot be used together" -msgstr "-x 和 -X 不能同時使用" +#: builtin/clean.c:954 +msgid "clean.requireForce is true and -f not given: refusing to clean" +msgstr "clean.requireForce 是 true 且未給定 -f 選項：拒絕清理" -#: builtin/clone.c +#: builtin/clone.c:57 msgid "git clone [] [--] []" msgstr "git clone [] [--] []" -#: builtin/clone.c +#: builtin/clone.c:112 msgid "don't clone shallow repository" msgstr "不要複製淺層版本庫" -#: builtin/clone.c +#: builtin/clone.c:114 msgid "don't create a checkout" msgstr "不要建立簽出" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c:115 builtin/clone.c:117 builtin/init-db.c:90 msgid "create a bare repository" msgstr "建立裸版本庫" -#: builtin/clone.c -msgid "create a mirror repository (implies bare)" -msgstr "建立鏡像版本庫（亦即裸版本庫）" +#: builtin/clone.c:119 +msgid "create a mirror repository (implies --bare)" +msgstr "建立鏡像版本庫（隱含 --bare）" -#: builtin/clone.c +#: builtin/clone.c:121 msgid "to clone from a local repository" msgstr "從本機版本庫複製" -#: builtin/clone.c +#: builtin/clone.c:123 msgid "don't use local hardlinks, always copy" msgstr "不使用本機硬連結，始終拷貝" -#: builtin/clone.c +#: builtin/clone.c:125 msgid "setup as shared repository" msgstr "設定為共享版本庫" -#: builtin/clone.c +#: builtin/clone.c:127 msgid "pathspec" msgstr "路徑規格" -#: builtin/clone.c +#: builtin/clone.c:127 msgid "initialize submodules in the clone" msgstr "在複製時初始化子模組" -#: builtin/clone.c +#: builtin/clone.c:131 msgid "number of submodules cloned in parallel" msgstr "平行複製的子模組數量" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c:132 builtin/init-db.c:87 msgid "template-directory" msgstr "模板目錄" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c:133 builtin/init-db.c:88 msgid "directory from which templates will be used" msgstr "將被使用的模板目錄" -#: builtin/clone.c builtin/submodule--helper.c +#: builtin/clone.c:135 builtin/clone.c:137 builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:2685 builtin/submodule--helper.c:3296 msgid "reference repository" msgstr "引用版本庫" -#: builtin/clone.c builtin/submodule--helper.c +#: builtin/clone.c:139 builtin/submodule--helper.c:1791 +#: builtin/submodule--helper.c:2687 msgid "use --reference only while cloning" msgstr "僅在複製時使用 --reference" -#: 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 +#: builtin/clone.c:140 builtin/column.c:28 builtin/fmt-merge-msg.c:28 +#: builtin/init-db.c:98 builtin/merge-file.c:82 builtin/merge.c:272 +#: builtin/pack-objects.c:4362 builtin/repack.c:1183 +#: builtin/submodule--helper.c:3298 t/helper/test-simple-ipc.c:596 +#: t/helper/test-simple-ipc.c:598 msgid "name" msgstr "name" -#: builtin/clone.c +#: builtin/clone.c:141 msgid "use instead of 'origin' to track upstream" msgstr "使用 而不是 “origin” 追蹤上游" -#: builtin/clone.c +#: builtin/clone.c:143 msgid "checkout instead of the remote's HEAD" msgstr "簽出 而不是遠端 HEAD" -#: builtin/clone.c +#: builtin/clone.c:145 msgid "path to git-upload-pack on the remote" msgstr "遠端 git-upload-pack 路徑" -#: builtin/clone.c builtin/fetch.c builtin/pull.c +#: builtin/clone.c:146 builtin/fetch.c:2194 builtin/pull.c:214 msgid "depth" msgstr "depth" -#: builtin/clone.c +#: builtin/clone.c:147 msgid "create a shallow clone of that depth" msgstr "建立指定深度的淺層複製" -#: builtin/clone.c +#: builtin/clone.c:149 msgid "create a shallow clone since a specific time" msgstr "建立從指定時間到現在的淺層複製" -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c +#: builtin/clone.c:150 builtin/fetch.c:2198 builtin/fetch.c:2221 +#: builtin/pull.c:220 builtin/pull.c:245 builtin/rebase.c:1067 +#: builtin/replay.c:296 msgid "revision" msgstr "revision" -#: builtin/clone.c builtin/fetch.c builtin/pull.c +#: builtin/clone.c:151 builtin/fetch.c:2199 builtin/pull.c:221 msgid "deepen history of shallow clone, excluding rev" msgstr "取得更多淺層複製的過去歷史記錄，除了特定修訂版" -#: builtin/clone.c builtin/submodule--helper.c +#: builtin/clone.c:153 builtin/submodule--helper.c:1801 +#: builtin/submodule--helper.c:2701 msgid "clone only one branch, HEAD or --branch" msgstr "只複製一個分支、HEAD 或 --branch" -#: builtin/clone.c +#: builtin/clone.c:155 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "不要複製任何標籤，之後取得也不要追蹤這些標籤" -#: builtin/clone.c +#: builtin/clone.c:157 msgid "any cloned submodules will be shallow" msgstr "子模組將以淺下載模式複製" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c:158 builtin/init-db.c:96 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c:159 builtin/init-db.c:97 msgid "separate git dir from working tree" msgstr "git 目錄和工作區分離" -#: builtin/clone.c +#: builtin/clone.c:161 builtin/init-db.c:103 +msgid "specify the reference format to use" +msgstr "指定要使用的引用格式" + +#: builtin/clone.c:162 msgid "key=value" msgstr "key=value" -#: builtin/clone.c +#: builtin/clone.c:163 msgid "set config inside the new repository" msgstr "在新版本庫中設定設定訊息" -#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c -#: builtin/push.c builtin/send-pack.c +#: builtin/clone.c:165 builtin/fetch.c:2219 builtin/ls-remote.c:81 +#: builtin/pull.c:236 builtin/push.c:623 builtin/send-pack.c:195 msgid "server-specific" msgstr "server-specific" -#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c -#: builtin/push.c builtin/send-pack.c +#: builtin/clone.c:165 builtin/fetch.c:2219 builtin/ls-remote.c:81 +#: builtin/pull.c:237 builtin/push.c:623 builtin/send-pack.c:196 msgid "option to transmit" msgstr "傳輸選項" -#: builtin/clone.c +#: builtin/clone.c:169 msgid "apply partial clone filters to submodules" msgstr "將部分複製過濾器套用至子模組" -#: builtin/clone.c +#: builtin/clone.c:171 msgid "any cloned submodules will use their remote-tracking branch" msgstr "任何複製的子模組都將使用它們的遠端追蹤分支" -#: builtin/clone.c +#: builtin/clone.c:173 msgid "initialize sparse-checkout file to include only files at root" msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案" -#: builtin/clone.c +#: builtin/clone.c:175 msgid "uri" msgstr "uri" -#: builtin/clone.c +#: builtin/clone.c:175 msgid "a URI for downloading bundles before fetching from origin remote" msgstr "在從 origin 遠端抓取前，用來下載套件包的 URI" -#: builtin/clone.c +#: builtin/clone.c:250 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能為 '%s' 新增一個備用：%s\n" -#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c +#: builtin/clone.c:321 builtin/diff.c:93 builtin/rm.c:143 grep.c:1940 +#: setup.c:192 #, c-format msgid "failed to stat '%s'" msgstr "對 '%s' 呼叫 stat 失敗" -#: builtin/clone.c +#: builtin/clone.c:323 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一個目錄" -#: builtin/clone.c +#: builtin/clone.c:344 #, c-format msgid "'%s' is a symlink, refusing to clone with --local" msgstr "“%s” 是個符號連結，故不能使用 --local 複製" -#: builtin/clone.c +#: builtin/clone.c:348 #, c-format msgid "failed to start iterator over '%s'" msgstr "無法在 '%s' 上啟動疊代器" -#: builtin/clone.c +#: builtin/clone.c:363 #, c-format msgid "symlink '%s' exists, refusing to clone with --local" msgstr "「%s」符號連結已存在，拒絕使用 --local 複製" -#: builtin/clone.c compat/precompose_utf8.c +#: builtin/clone.c:378 compat/precompose_utf8.c:62 #, c-format msgid "failed to unlink '%s'" msgstr "無法刪除 “%s”" -#: builtin/clone.c +#: builtin/clone.c:384 #, c-format msgid "failed to create link '%s'" msgstr "建立連結 '%s' 失敗" -#: builtin/clone.c +#: builtin/clone.c:388 #, c-format msgid "failed to copy file to '%s'" msgstr "複製檔案至 '%s' 失敗" -#: builtin/clone.c +#: builtin/clone.c:393 #, c-format msgid "failed to iterate over '%s'" msgstr "無法在 '%s' 上疊代" -#: builtin/clone.c +#: builtin/clone.c:420 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c +#: builtin/clone.c:434 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -5165,321 +5280,327 @@ msgstr "" "您可以透過 'git status' 檢查哪些已被簽出，然後使用指令\n" "'git restore --source=HEAD :/' 重試\n" -#: builtin/clone.c +#: builtin/clone.c:511 #, c-format msgid "Could not find remote branch %s to clone." msgstr "找不到要複製的遠端分支 %s。" -#: builtin/clone.c fetch-pack.c +#: builtin/clone.c:613 fetch-pack.c:2093 msgid "remote did not send all necessary objects" msgstr "遠端沒有傳送所有必需的物件" -#: builtin/clone.c +#: builtin/clone.c:629 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c +#: builtin/clone.c:687 msgid "failed to initialize sparse-checkout" msgstr "無法初始化稀疏簽出" -#: builtin/clone.c +#: builtin/clone.c:709 msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出" -#: builtin/clone.c +#: builtin/clone.c:745 msgid "unable to checkout working tree" msgstr "不能簽出工作區" -#: builtin/clone.c +#: builtin/clone.c:835 msgid "unable to write parameters to config file" msgstr "無法將參數寫入設定檔案" -#: builtin/clone.c +#: builtin/clone.c:902 msgid "cannot repack to clean up" msgstr "無法執行 repack 來清理" -#: builtin/clone.c +#: builtin/clone.c:904 msgid "cannot unlink temporary alternates file" msgstr "無法刪除暫存 alternates 檔案" -#: builtin/clone.c +#: builtin/clone.c:953 msgid "Too many arguments." msgstr "太多參數。" -#: builtin/clone.c scalar.c +#: builtin/clone.c:957 scalar.c:456 msgid "You must specify a repository to clone." msgstr "您必須指定要複製的版本庫。" -#: builtin/clone.c -msgid "" -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" -"exclude" -msgstr "--bundle-uri 與 --depth、--shallow-since 和 --shallow-exclude 不相容" +#: builtin/clone.c:968 builtin/init-db.c:170 setup.c:2191 +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "未知的引用儲存格式 “%s”" -#: builtin/clone.c +#: builtin/clone.c:995 #, c-format msgid "repository '%s' does not exist" msgstr "版本庫 '%s' 不存在" -#: builtin/clone.c builtin/fetch.c +#: builtin/clone.c:999 builtin/fetch.c:2331 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一個正數" -#: builtin/clone.c +#: builtin/clone.c:1009 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目的地路徑 '%s' 已經存在，並且不是一個空目錄。" -#: builtin/clone.c +#: builtin/clone.c:1015 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。" -#: builtin/clone.c +#: builtin/clone.c:1029 #, c-format msgid "working tree '%s' already exists." msgstr "工作區 '%s' 已經存在。" -#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c +#: builtin/clone.c:1044 builtin/clone.c:1065 builtin/difftool.c:267 +#: builtin/log.c:2176 builtin/worktree.c:455 builtin/worktree.c:487 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能為 '%s' 建立先導目錄" -#: builtin/clone.c +#: builtin/clone.c:1049 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能建立工作區目錄 '%s'" -#: builtin/clone.c +#: builtin/clone.c:1069 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "複製到純版本庫 '%s'...\n" -#: builtin/clone.c +#: builtin/clone.c:1071 #, c-format msgid "Cloning into '%s'...\n" msgstr "正複製到 '%s'...\n" -#: builtin/clone.c +#: builtin/clone.c:1100 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容" -#: builtin/clone.c builtin/remote.c +#: builtin/clone.c:1229 builtin/remote.c:204 builtin/remote.c:734 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一個有效的遠端名稱" -#: builtin/clone.c +#: builtin/clone.c:1263 msgid "--depth is ignored in local clones; use file:// instead." msgstr "本機複製會忽略 --depth。請改用 file:// 通訊協定。" -#: builtin/clone.c +#: builtin/clone.c:1265 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "本機複製會忽略 --shallow-since。請改用 file:// 協定。" -#: builtin/clone.c +#: builtin/clone.c:1267 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// 協定。" -#: builtin/clone.c +#: builtin/clone.c:1269 msgid "--filter is ignored in local clones; use file:// instead." msgstr "本機複製會忽略 --filter。請改用 file:// 協定。" -#: builtin/clone.c fetch-pack.c +#: builtin/clone.c:1272 fetch-pack.c:1221 fetch-pack.c:1574 msgid "source repository is shallow, reject to clone." msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。" -#: builtin/clone.c +#: builtin/clone.c:1274 msgid "source repository is shallow, ignoring --local" msgstr "來源版本庫是淺複製，忽略 --local" -#: builtin/clone.c +#: builtin/clone.c:1279 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c +#: builtin/clone.c:1295 msgid "cannot clone from filtered bundle" msgstr "無法從過濾後的套件包複製" -#: builtin/clone.c +#: builtin/clone.c:1362 builtin/clone.c:1379 msgid "failed to initialize the repo, skipping bundle URI" msgstr "無法初始化版本庫，略過套件包 URI" -#: builtin/clone.c +#: builtin/clone.c:1364 #, c-format msgid "failed to fetch objects from bundle URI '%s'" msgstr "無法從套件包 URL “%s” 抓取物件" -#: builtin/clone.c +#: builtin/clone.c:1382 msgid "failed to fetch advertised bundles" msgstr "無法抓取公佈的套件包" -#: builtin/clone.c +#: builtin/clone.c:1411 builtin/clone.c:1468 msgid "remote transport reported error" msgstr "遠端傳輸回報錯誤" -#: builtin/clone.c +#: builtin/clone.c:1421 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "遠端分支 %s 在上游 %s 未發現" -#: builtin/clone.c +#: builtin/clone.c:1431 msgid "You appear to have cloned an empty repository." msgstr "您複製的版本庫似乎是空的。" -#: builtin/column.c +#: builtin/column.c:10 msgid "git column []" msgstr "git column [<選項>]" -#: builtin/column.c +#: builtin/column.c:28 msgid "lookup config vars" msgstr "尋找設定變數" -#: builtin/column.c +#: builtin/column.c:29 builtin/column.c:30 msgid "layout to use" msgstr "要使用的配置" -#: builtin/column.c +#: builtin/column.c:31 msgid "maximum width" msgstr "最大寬度" -#: builtin/column.c +#: builtin/column.c:32 msgid "padding space on left border" msgstr "左邊框的填充空間" -#: builtin/column.c +#: builtin/column.c:33 msgid "padding space on right border" msgstr "右邊框的填充空間" -#: builtin/column.c +#: builtin/column.c:34 msgid "padding space between columns" msgstr "兩直行之間的填充空間" -#: builtin/column.c +#: builtin/column.c:49 +#, c-format +msgid "%s must be non-negative" +msgstr "%s 不得為負數" + +#: builtin/column.c:54 msgid "--command must be the first argument" msgstr "--command 必須是第一個參數" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:18 msgid "" "git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir <目錄>] [--shallow] [--[no-]progress]" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:21 msgid "" "git commit-graph write [--object-dir ] [--append]\n" " [--split[=]] [--reachable | --stdin-packs | " "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " msgstr "" "git commit-graph write [--object-dir ] [--append]\n" " [--split[=]] [--reachable | --stdin-packs | " "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" -" " +" " -#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c +#: builtin/commit-graph.c:56 builtin/fetch.c:2208 builtin/log.c:1945 +#: builtin/repack.c:1189 builtin/repack.c:1191 msgid "dir" msgstr "目錄" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:57 msgid "the object directory to store the graph" msgstr "儲存圖形的物件目錄" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:81 msgid "if the commit-graph is split, only verify the tip file" msgstr "如果提交圖形被分割，只驗證頭一個檔案" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:110 #, c-format msgid "Could not open commit-graph '%s'" msgstr "無法開啟提交圖形 '%s'" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:114 #, c-format msgid "could not open commit-graph chain '%s'" msgstr "無法開啟提交圖鏈 “%s”" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:161 #, c-format msgid "unrecognized --split argument, %s" msgstr "無法識別的 --split 參數，%s" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:174 #, c-format msgid "unexpected non-hex object ID: %s" msgstr "非期望的非十六進位物件 ID：%s" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:179 #, c-format msgid "invalid object: %s" msgstr "物件無效：%s" -#: builtin/commit-graph.c parse-options-cb.c +#: builtin/commit-graph.c:199 parse-options-cb.c:24 parse-options-cb.c:28 #, c-format msgid "option `%s' expects a numerical value" msgstr "選項 `%s' 期望一個數字值" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:230 msgid "start walk at all refs" msgstr "開始遍歷所有引用" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:232 msgid "scan pack-indexes listed by stdin for commits" msgstr "從標準輸入中的包索引檔案列表中掃描提交" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:234 msgid "start walk at commits listed by stdin" msgstr "從標準輸入中的提交開始掃描" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:236 msgid "include all commits already in the commit-graph file" msgstr "包含 commit-graph 檔案中已有所有提交" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:238 msgid "enable computation for changed paths" msgstr "啟用已變更路徑的計算" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:240 msgid "allow writing an incremental commit-graph file" msgstr "允許寫一個增量提交圖形檔案" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:244 msgid "maximum number of commits in a non-base split commit-graph" msgstr "在非基本分割提交圖形中的最大提交數" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:246 msgid "maximum ratio between two levels of a split commit-graph" msgstr "一個分割提交圖形的兩個級別之間的最大比率" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:248 msgid "only expire files older than a given date-time" msgstr "只將舊於指定日期與時間的檔案設為過期" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:250 msgid "maximum number of changed-path Bloom filters to compute" msgstr "變更路徑的布隆過濾器要計算的最大量" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:276 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs" -#: builtin/commit-graph.c +#: builtin/commit-graph.c:307 msgid "Collecting commits from input" msgstr "正在從輸入收集提交" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:17 msgid "git commit-tree [(-p )...]" msgstr "git commit-tree [(-p )...]" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p )...] [-S[]] [(-m )...]\n" " [(-F )...] " @@ -5487,61 +5608,62 @@ msgstr "" "git commit-tree [(-p )...] [-S[]] [(-m )...]\n" " [(-F )...] " -#: builtin/commit-tree.c +#: builtin/commit-tree.c:31 #, c-format msgid "duplicate parent %s ignored" msgstr "忽略重複的父提交 %s" -#: builtin/commit-tree.c builtin/log.c +#: builtin/commit-tree.c:48 builtin/commit-tree.c:126 builtin/log.c:671 #, c-format msgid "not a valid object name %s" msgstr "不是一個有效的物件名 %s" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:86 #, c-format msgid "git commit-tree: failed to read '%s'" msgstr "git commit-tree：無法讀取 '%s'" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:88 #, c-format msgid "git commit-tree: failed to close '%s'" msgstr "git commit-tree：無法關閉 '%s'" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:101 msgid "parent" msgstr "父提交" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:102 msgid "id of a parent commit object" msgstr "父提交物件 ID" -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c -#: builtin/stash.c builtin/tag.c +#: builtin/commit-tree.c:104 builtin/commit.c:1666 builtin/merge.c:266 +#: builtin/notes.c:484 builtin/notes.c:660 builtin/stash.c:1743 +#: builtin/tag.c:479 msgid "message" msgstr "訊息" -#: builtin/commit-tree.c builtin/commit.c +#: builtin/commit-tree.c:105 builtin/commit.c:1666 msgid "commit message" msgstr "提交說明" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:108 msgid "read commit log message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c -#: builtin/revert.c +#: builtin/commit-tree.c:111 builtin/commit.c:1683 builtin/merge.c:285 +#: builtin/pull.c:182 builtin/revert.c:132 msgid "GPG sign commit" msgstr "GPG 提交簽名" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:123 msgid "must give exactly one tree" msgstr "必須精確地提供一個樹" -#: builtin/commit-tree.c +#: builtin/commit-tree.c:130 msgid "git commit-tree: failed to read" msgstr "git commit-tree：讀取失敗" -#: builtin/commit.c +#: builtin/commit.c:43 msgid "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" @@ -5563,11 +5685,11 @@ msgstr "" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" -#: builtin/commit.c +#: builtin/commit.c:55 msgid "git status [] [--] [...]" msgstr "git status [<選項>] [--] [<路徑規格>...]" -#: builtin/commit.c +#: builtin/commit.c:60 msgid "" "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" @@ -5576,7 +5698,7 @@ msgstr "" "您要修補最近的提交，但這麼做會讓它成為空提交。您可以重複您的指令並帶上\n" "--allow-empty 選項，或者您可用指令 \"git reset HEAD^\" 整個刪除該提交。\n" -#: builtin/commit.c +#: builtin/commit.c:65 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -5590,15 +5712,15 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c +#: builtin/commit.c:72 msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "否則，請使用 'git rebase --skip'\n" -#: builtin/commit.c +#: builtin/commit.c:75 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "否則，請使用 'git cherry-pick --skip'\n" -#: builtin/commit.c +#: builtin/commit.c:78 msgid "" "and then use:\n" "\n" @@ -5619,159 +5741,160 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c read-cache.c +#: builtin/commit.c:306 read-cache.c:3944 msgid "updating files failed" msgstr "更新檔案失敗" -#: builtin/commit.c +#: builtin/commit.c:333 msgid "failed to unpack HEAD tree object" msgstr "解包 HEAD 樹狀物件失敗" -#: builtin/commit.c +#: builtin/commit.c:384 msgid "No paths with --include/--only does not make sense." msgstr "參數 --include/--only 不跟路徑沒有意義。" -#: builtin/commit.c +#: builtin/commit.c:397 msgid "unable to create temporary index" msgstr "不能建立暫時索引" -#: builtin/commit.c +#: builtin/commit.c:406 msgid "interactive add failed" msgstr "互動式新增失敗" -#: builtin/commit.c +#: builtin/commit.c:422 msgid "unable to update temporary index" msgstr "無法更新暫時索引" -#: builtin/commit.c +#: builtin/commit.c:424 msgid "Failed to update main cache tree" msgstr "不能更新樹的主快取" -#: builtin/commit.c +#: builtin/commit.c:509 msgid "cannot do a partial commit during a merge." msgstr "在合併過程中不能做部分提交。" -#: builtin/commit.c +#: builtin/commit.c:511 msgid "cannot do a partial commit during a cherry-pick." msgstr "在揀選過程中不能做部分提交。" -#: builtin/commit.c +#: builtin/commit.c:513 msgid "cannot do a partial commit during a rebase." msgstr "在重定基底過程中不能做部分提交。" -#: builtin/commit.c +#: builtin/commit.c:521 msgid "cannot read the index" msgstr "無法讀取索引" -#: builtin/commit.c +#: builtin/commit.c:540 msgid "unable to write temporary index file" msgstr "無法寫暫時索引檔案" -#: builtin/commit.c +#: builtin/commit.c:638 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者訊息" -#: builtin/commit.c +#: builtin/commit.c:640 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有格式錯誤的作者訊息" -#: builtin/commit.c +#: builtin/commit.c:659 msgid "malformed --author parameter" msgstr "格式錯誤的 --author 參數" -#: builtin/commit.c ident.c +#: builtin/commit.c:667 ident.c:531 #, c-format msgid "invalid date format: %s" msgstr "無效的日期格式：%s" -#: builtin/commit.c +#: builtin/commit.c:713 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: builtin/commit.c builtin/merge-tree.c +#: builtin/commit.c:768 builtin/commit.c:803 builtin/commit.c:1214 #, c-format msgid "could not lookup commit '%s'" msgstr "無法查詢提交 “%s”" -#: builtin/commit.c builtin/shortlog.c +#: builtin/commit.c:781 builtin/shortlog.c:457 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正從標準輸入中讀取日誌訊息）\n" -#: builtin/commit.c +#: builtin/commit.c:783 msgid "could not read log from standard input" msgstr "不能從標準輸入中讀取日誌訊息" -#: builtin/commit.c +#: builtin/commit.c:787 #, c-format msgid "could not read log file '%s'" msgstr "不能讀取日誌檔案 '%s'" -#: builtin/commit.c +#: builtin/commit.c:825 #, c-format msgid "options '%s' and '%s:%s' cannot be used together" msgstr "「%s」和「%s:%s」選項不得同時使用" -#: builtin/commit.c +#: builtin/commit.c:837 builtin/commit.c:853 msgid "could not read SQUASH_MSG" msgstr "不能讀取 SQUASH_MSG" -#: builtin/commit.c +#: builtin/commit.c:844 msgid "could not read MERGE_MSG" msgstr "不能讀取 MERGE_MSG" -#: builtin/commit.c bundle.c rerere.c sequencer.c +#: builtin/commit.c:885 bundle.c:150 rerere.c:474 rerere.c:685 sequencer.c:2789 +#: sequencer.c:3571 #, c-format msgid "could not open '%s'" -msgstr "不能開啟 '%s'" +msgstr "無法開啟「%s」" -#: builtin/commit.c +#: builtin/commit.c:904 msgid "could not write commit template" msgstr "不能寫提交範本" -#: builtin/commit.c +#: builtin/commit.c:917 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored.\n" +"with '%s' will be ignored.\n" msgstr "" "請輸入描述您變更的提交訊息。\n" -"開頭是「%c」的行皆會忽略。\n" +"開頭是「%s」的列皆會忽略。\n" -#: builtin/commit.c +#: builtin/commit.c:919 #, c-format 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" +"with '%s' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"請輸入描述您變更的提交訊息。開頭是「%c」\n" -"的行皆會忽略。提交訊息空白則取消本次提交作業。\n" +"請輸入描述您變更的提交訊息。開頭是「%s」的列\n" +"皆會忽略。提交訊息空白則取消本次提交作業。\n" -#: builtin/commit.c +#: builtin/commit.c:923 #, c-format 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" +"with '%s' will be kept; you may remove them yourself if you want to.\n" msgstr "" -"請輸入描述您變更的提交訊息。會保留開頭是「%c」\n" -"的行，但也可以自己移除掉這些行。\n" +"請輸入描述您變更的提交訊息。會保留開頭是「%s」\n" +"的列，但也可以自己移除掉這些列。\n" -#: builtin/commit.c +#: builtin/commit.c:927 #, c-format 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" +"with '%s' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" "請輸入描述您變更的提交訊息。會保留開頭是\n" -"「%c」的行，但也可以自己移除掉這些行。\n" +"「%s」的列，但也可以自己移除掉這些列。\n" "提交訊息空白則取消本次提交作業。\n" -#: builtin/commit.c +#: builtin/commit.c:938 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -5785,7 +5908,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "後重試。\n" -#: builtin/commit.c +#: builtin/commit.c:943 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -5800,140 +5923,141 @@ msgstr "" "後重試。\n" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c +#: builtin/commit.c:970 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c +#: builtin/commit.c:978 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c +#: builtin/commit.c:985 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c +#: builtin/commit.c:1003 msgid "Cannot read index" msgstr "無法讀取索引" -#: builtin/commit.c +#: builtin/commit.c:1049 msgid "unable to pass trailers to --trailers" msgstr "無法將尾部署名傳遞至 --trailers" -#: builtin/commit.c +#: builtin/commit.c:1089 msgid "Error building trees" msgstr "無法建立樹狀物件" -#: builtin/commit.c builtin/tag.c +#: builtin/commit.c:1103 builtin/tag.c:343 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "請使用 -m 或 -F 選項提供提交說明。\n" -#: builtin/commit.c +#: builtin/commit.c:1149 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合" -#: builtin/commit.c +#: builtin/commit.c:1163 #, c-format msgid "Invalid ignored mode '%s'" msgstr "無效的忽略模式 '%s'" -#: builtin/commit.c +#: builtin/commit.c:1202 builtin/commit.c:1491 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "無效的未追蹤檔案參數 '%s'" -#: builtin/commit.c +#: builtin/commit.c:1275 msgid "You are in the middle of a merge -- cannot reword." msgstr "正在合併中——不能重新輸入。" -#: builtin/commit.c +#: builtin/commit.c:1277 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "正在揀選中——不能重新輸入。" -#: builtin/commit.c +#: builtin/commit.c:1280 #, c-format msgid "reword option of '%s' and path '%s' cannot be used together" msgstr "「%s」的改寫選項和「%s」路徑不得同時使用" -#: builtin/commit.c +#: builtin/commit.c:1282 #, c-format msgid "reword option of '%s' and '%s' cannot be used together" msgstr "「%s」的改寫選項和「%s」不得同時使用" -#: builtin/commit.c +#: builtin/commit.c:1307 msgid "You have nothing to amend." msgstr "您沒有可修補的提交。" -#: builtin/commit.c +#: builtin/commit.c:1310 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正處於一個合併過程中 -- 無法修補提交。" -#: builtin/commit.c +#: builtin/commit.c:1312 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正處於一個揀選過程中 -- 無法修補提交。" -#: builtin/commit.c +#: builtin/commit.c:1314 msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正處於重定基底的過程中 -- 無法修訂。" -#: builtin/commit.c +#: builtin/commit.c:1334 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。" -#: builtin/commit.c +#: builtin/commit.c:1381 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "未知選項：--fixup=%s:%s" -#: builtin/commit.c +#: builtin/commit.c:1398 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: builtin/commit.c +#: builtin/commit.c:1527 builtin/commit.c:1694 msgid "show status concisely" msgstr "以簡潔的格式顯示狀態" -#: builtin/commit.c +#: builtin/commit.c:1529 builtin/commit.c:1696 msgid "show branch information" msgstr "顯示分支訊息" -#: builtin/commit.c +#: builtin/commit.c:1531 msgid "show stash information" msgstr "顯示貯存區訊息" -#: builtin/commit.c +#: builtin/commit.c:1533 builtin/commit.c:1698 msgid "compute full ahead/behind values" msgstr "計算完整的領先/落後值" -#: builtin/commit.c +#: builtin/commit.c:1535 msgid "version" msgstr "版本" -#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c +#: builtin/commit.c:1535 builtin/commit.c:1700 builtin/fetch.c:2187 +#: builtin/push.c:599 builtin/worktree.c:1039 msgid "machine-readable output" msgstr "機器可讀的輸出" -#: builtin/commit.c +#: builtin/commit.c:1538 builtin/commit.c:1702 msgid "show status in long format (default)" msgstr "以長格式顯示狀態（預設值）" -#: builtin/commit.c +#: builtin/commit.c:1541 builtin/commit.c:1705 msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c +#: builtin/commit.c:1544 builtin/commit.c:1708 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）" -#: builtin/commit.c +#: builtin/commit.c:1548 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -5941,204 +6065,205 @@ msgstr "" "顯示已忽略的檔案，可選模式：traditional、matching、no。（預設值：" "traditional）" -#: builtin/commit.c parse-options.h +#: builtin/commit.c:1550 parse-options.h:338 msgid "when" msgstr "何時" -#: builtin/commit.c +#: builtin/commit.c:1551 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設值：all）" -#: builtin/commit.c +#: builtin/commit.c:1553 msgid "list untracked files in columns" msgstr "以列的方式顯示未追蹤的檔案" -#: builtin/commit.c +#: builtin/commit.c:1554 msgid "do not detect renames" msgstr "不檢測重新命名" -#: builtin/commit.c +#: builtin/commit.c:1556 msgid "detect renames, optionally set similarity index" msgstr "檢測重新命名，可以設定索引相似度" -#: builtin/commit.c +#: builtin/commit.c:1579 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支援已忽略和未追蹤檔案參數的組合" -#: builtin/commit.c +#: builtin/commit.c:1659 msgid "suppress summary after successful commit" msgstr "提交成功後不顯示概述訊息" -#: builtin/commit.c +#: builtin/commit.c:1660 msgid "show diff in commit message template" msgstr "在提交說明範本裡顯示差異" -#: builtin/commit.c +#: builtin/commit.c:1662 msgid "Commit message options" msgstr "提交說明選項" -#: builtin/commit.c builtin/merge.c builtin/tag.c +#: builtin/commit.c:1663 builtin/merge.c:270 builtin/tag.c:481 msgid "read message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit.c +#: builtin/commit.c:1664 msgid "author" msgstr "作者" -#: builtin/commit.c +#: builtin/commit.c:1664 msgid "override author for commit" msgstr "提交時覆蓋作者" -#: builtin/commit.c builtin/gc.c +#: builtin/commit.c:1665 builtin/gc.c:627 msgid "date" msgstr "日期" -#: builtin/commit.c +#: builtin/commit.c:1665 msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h +#: builtin/commit.c:1667 builtin/commit.c:1668 builtin/commit.c:1674 +#: parse-options.h:571 ref-filter.h:121 msgid "commit" msgstr "提交" -#: builtin/commit.c +#: builtin/commit.c:1667 msgid "reuse and edit message from specified commit" msgstr "重用並編輯指定提交的提交說明" -#: builtin/commit.c +#: builtin/commit.c:1668 msgid "reuse message from specified commit" msgstr "重用指定提交的提交說明" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate . #. -#: builtin/commit.c +#: builtin/commit.c:1673 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" -#: builtin/commit.c +#: builtin/commit.c:1673 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "使用 autosquash 格式化後的說明來 fixup 或是 amend/reword 指定提交" -#: builtin/commit.c +#: builtin/commit.c:1674 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" -#: builtin/commit.c +#: builtin/commit.c:1675 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" -#: builtin/commit.c builtin/interpret-trailers.c +#: builtin/commit.c:1676 builtin/interpret-trailers.c:213 msgid "trailer" msgstr "尾部署名" -#: builtin/commit.c +#: builtin/commit.c:1676 msgid "add custom trailer(s)" msgstr "加入自訂尾部署名" -#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c -#: builtin/revert.c +#: builtin/commit.c:1677 builtin/log.c:1920 builtin/merge.c:288 +#: builtin/pull.c:148 builtin/revert.c:124 msgid "add a Signed-off-by trailer" msgstr "在結尾加入 Signed-off-by" -#: builtin/commit.c +#: builtin/commit.c:1678 msgid "use specified template file" msgstr "使用指定的範本檔案" -#: builtin/commit.c +#: builtin/commit.c:1679 msgid "force edit of commit" msgstr "強制編輯提交" -#: builtin/commit.c +#: builtin/commit.c:1681 msgid "include status in commit message template" msgstr "在提交說明範本裡包含狀態訊息" -#: builtin/commit.c +#: builtin/commit.c:1686 msgid "Commit contents options" msgstr "提交內容選項" -#: builtin/commit.c +#: builtin/commit.c:1687 msgid "commit all changed files" msgstr "提交所有改動的檔案" -#: builtin/commit.c +#: builtin/commit.c:1688 msgid "add specified files to index for commit" msgstr "新增指定的檔案到索引區等待提交" -#: builtin/commit.c +#: builtin/commit.c:1689 msgid "interactively add files" msgstr "互動式新增檔案" -#: builtin/commit.c +#: builtin/commit.c:1690 msgid "interactively add changes" msgstr "互動式新增變更" -#: builtin/commit.c +#: builtin/commit.c:1691 msgid "commit only specified files" msgstr "只提交指定的檔案" -#: builtin/commit.c +#: builtin/commit.c:1692 msgid "bypass pre-commit and commit-msg hooks" msgstr "繞過 pre-commit 和 commit-msg 掛鉤" -#: builtin/commit.c +#: builtin/commit.c:1693 msgid "show what would be committed" msgstr "顯示將要提交的內容" -#: builtin/commit.c +#: builtin/commit.c:1706 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c +#: builtin/commit.c:1707 msgid "bypass post-rewrite hook" msgstr "繞過 post-rewrite 掛鉤" -#: builtin/commit.c +#: builtin/commit.c:1714 msgid "ok to record an empty change" msgstr "允許一個空提交" -#: builtin/commit.c +#: builtin/commit.c:1716 msgid "ok to record a change with an empty message" msgstr "允許空的提交說明" -#: builtin/commit.c sequencer.c +#: builtin/commit.c:1748 sequencer.c:1469 sequencer.c:1548 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c +#: builtin/commit.c:1794 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "損壞的 MERGE_HEAD 檔案（%s）" -#: builtin/commit.c +#: builtin/commit.c:1801 msgid "could not read MERGE_MODE" msgstr "不能讀取 MERGE_MODE" -#: builtin/commit.c +#: builtin/commit.c:1822 #, c-format msgid "could not read commit message: %s" msgstr "不能讀取提交說明：%s" -#: builtin/commit.c +#: builtin/commit.c:1829 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "終止提交因為提交說明為空。\n" -#: builtin/commit.c +#: builtin/commit.c:1834 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "終止提交；您未更改來自範本的提交說明。\n" -#: builtin/commit.c +#: builtin/commit.c:1845 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "提交說明內文空白，中止提交作業。\n" -#: builtin/commit.c +#: builtin/commit.c:1880 msgid "" "repository has been updated, but unable to write\n" "new index file. Check that disk is not full and quota is\n" @@ -6147,232 +6272,236 @@ msgstr "" "版本庫已更新，但無法寫入新的索引檔案。請檢查磁碟是否\n" "已滿或磁碟配額已耗盡，然後執行 “git restore --staged :/” 復原。" -#: builtin/config.c +#: builtin/config.c:19 msgid "git config []" msgstr "git config [<選項>]" -#: builtin/config.c +#: builtin/config.c:118 #, c-format msgid "unrecognized --type argument, %s" msgstr "無法識別的 --type 參數，%s" -#: builtin/config.c +#: builtin/config.c:130 msgid "only one type at a time" msgstr "一次只能一個類型" -#: builtin/config.c +#: builtin/config.c:139 msgid "Config file location" msgstr "設定檔案位置" -#: builtin/config.c +#: builtin/config.c:140 msgid "use global config file" msgstr "使用全域設定檔案" -#: builtin/config.c +#: builtin/config.c:141 msgid "use system config file" msgstr "使用系統級設定檔案" -#: builtin/config.c +#: builtin/config.c:142 msgid "use repository config file" msgstr "使用版本庫級設定檔案" -#: builtin/config.c +#: builtin/config.c:143 msgid "use per-worktree config file" msgstr "使用工作區級別的設定檔案" -#: builtin/config.c builtin/gc.c +#: builtin/config.c:144 builtin/gc.c:1525 builtin/gc.c:1590 msgid "use given config file" msgstr "使用指定的設定檔案" -#: builtin/config.c +#: builtin/config.c:145 msgid "blob-id" msgstr "資料物件 ID" -#: builtin/config.c +#: builtin/config.c:145 msgid "read config from given blob object" msgstr "從提供的資料物件讀取設定" -#: builtin/config.c +#: builtin/config.c:146 msgid "Action" msgstr "動作" -#: builtin/config.c +#: builtin/config.c:147 msgid "get value: name [value-pattern]" msgstr "取得值：name [value-pattern]" -#: builtin/config.c +#: builtin/config.c:148 msgid "get all values: key [value-pattern]" msgstr "取得所有值：key [value-pattern]" -#: builtin/config.c +#: builtin/config.c:149 msgid "get values for regexp: name-regex [value-pattern]" msgstr "根據常規表示式取得值：name-regex [value-pattern]" -#: builtin/config.c +#: builtin/config.c:150 msgid "get value specific for the URL: section[.var] URL" msgstr "獲得 URL 取值：section[.var] URL" -#: builtin/config.c +#: builtin/config.c:151 msgid "replace all matching variables: name value [value-pattern]" msgstr "取代所有符合的變數：name value [value-pattern]" -#: builtin/config.c +#: builtin/config.c:152 msgid "add a new variable: name value" msgstr "新增一個新的變數：name value" -#: builtin/config.c +#: builtin/config.c:153 msgid "remove a variable: name [value-pattern]" msgstr "移除一個變數：name [value-pattern]" -#: builtin/config.c +#: builtin/config.c:154 msgid "remove all matches: name [value-pattern]" msgstr "移除所有符合項目：name [value-pattern]" -#: builtin/config.c +#: builtin/config.c:155 msgid "rename section: old-name new-name" msgstr "重新命名小節：old-name new-name" -#: builtin/config.c +#: builtin/config.c:156 msgid "remove a section: name" msgstr "刪除一個小節：name" -#: builtin/config.c +#: builtin/config.c:157 msgid "list all" msgstr "全部列出" -#: builtin/config.c +#: builtin/config.c:158 msgid "use string equality when comparing values to 'value-pattern'" msgstr "比較「value-pattern」的值時，使用字串相等比較" -#: builtin/config.c +#: builtin/config.c:159 msgid "open an editor" msgstr "開啟一個編輯器" -#: builtin/config.c +#: builtin/config.c:160 msgid "find the color configured: slot [default]" msgstr "獲得設定的顏色：設定 [預設值]" -#: builtin/config.c +#: builtin/config.c:161 msgid "find the color setting: slot [stdout-is-tty]" msgstr "獲得顏色設定：設定 [stdout-is-tty]" -#: builtin/config.c +#: builtin/config.c:162 msgid "Type" msgstr "類型" -#: builtin/config.c builtin/hash-object.c +#: builtin/config.c:163 builtin/hash-object.c:105 msgid "type" msgstr "類型" -#: builtin/config.c +#: builtin/config.c:163 msgid "value is given this type" msgstr "取值為該類型" -#: builtin/config.c +#: builtin/config.c:164 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c +#: builtin/config.c:165 msgid "value is decimal number" msgstr "值是十進位數" -#: builtin/config.c +#: builtin/config.c:166 msgid "value is --bool or --int" msgstr "值是 --bool or --int" -#: builtin/config.c +#: builtin/config.c:167 msgid "value is --bool or string" msgstr "值是 --bool 或 string" -#: builtin/config.c +#: builtin/config.c:168 msgid "value is a path (file or directory name)" msgstr "值是一個路徑（檔案或目錄名）" -#: builtin/config.c +#: builtin/config.c:169 msgid "value is an expiry date" msgstr "值是一個到期日期" -#: builtin/config.c +#: builtin/config.c:170 msgid "Other" msgstr "其它" -#: builtin/config.c +#: builtin/config.c:171 msgid "terminate values with NUL byte" msgstr "終止值是 NUL 位元組" -#: builtin/config.c +#: builtin/config.c:172 msgid "show variable names only" msgstr "只顯示變數名" -#: builtin/config.c +#: builtin/config.c:173 msgid "respect include directives on lookup" msgstr "查詢時引用 include 指令遞迴尋找" -#: builtin/config.c +#: builtin/config.c:174 msgid "show origin of config (file, standard input, blob, command line)" msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或命令列）" -#: builtin/config.c +#: builtin/config.c:175 msgid "show scope of config (worktree, local, global, system, command)" msgstr "" "顯示設定檔的作用域 (工作區 worktree、本機 local、全域 global、系統 system、指" "令 command)" -#: builtin/config.c +#: builtin/config.c:176 builtin/config.c:177 msgid "value" msgstr "取值" -#: builtin/config.c +#: builtin/config.c:176 msgid "with --get, use default value when missing entry" msgstr "使用 --get 但未指定參數時所使用的預設值" -#: builtin/config.c +#: builtin/config.c:177 +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "人類可讀的備註字串（將按需插入 # 至前方）" + +#: builtin/config.c:191 #, c-format msgid "wrong number of arguments, should be %d" msgstr "錯誤的參數個數，應該為 %d 個" -#: builtin/config.c +#: builtin/config.c:193 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "錯誤的參數個數，應該為從 %d 個到 %d 個" -#: builtin/config.c +#: builtin/config.c:359 #, c-format msgid "invalid key pattern: %s" msgstr "無效鍵名模式：%s" -#: builtin/config.c config.c +#: builtin/config.c:381 config.c:3346 #, c-format msgid "invalid pattern: %s" msgstr "無效模式：%s" -#: builtin/config.c +#: builtin/config.c:401 #, c-format msgid "failed to format default config value: %s" msgstr "格式化預設設定值失敗：%s" -#: builtin/config.c +#: builtin/config.c:466 #, c-format msgid "cannot parse color '%s'" msgstr "無法解析顏色 '%s'" -#: builtin/config.c +#: builtin/config.c:511 msgid "unable to parse default color value" msgstr "無法解析預設顏色值" -#: builtin/config.c +#: builtin/config.c:566 builtin/config.c:866 msgid "not in a git directory" msgstr "不在 git 版本庫中" -#: builtin/config.c +#: builtin/config.c:569 msgid "writing to stdin is not supported" msgstr "不支援寫到標準輸入" -#: builtin/config.c +#: builtin/config.c:572 msgid "writing config blobs is not supported" msgstr "不支援寫到設定資料物件" -#: builtin/config.c +#: builtin/config.c:664 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -6387,27 +6516,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c +#: builtin/config.c:691 msgid "only one config file at a time" msgstr "一次只能有一個設定檔案" -#: builtin/config.c +#: builtin/config.c:697 msgid "--local can only be used inside a git repository" msgstr "--local 只能在一個版本庫內使用" -#: builtin/config.c +#: builtin/config.c:699 msgid "--blob can only be used inside a git repository" msgstr "--blob 只能在一個版本庫內使用" -#: builtin/config.c +#: builtin/config.c:701 msgid "--worktree can only be used inside a git repository" msgstr "--worktree 只能在 git 版本庫中使用" -#: builtin/config.c builtin/gc.c +#: builtin/config.c:721 builtin/gc.c:1565 builtin/gc.c:1633 msgid "$HOME not set" msgstr "$HOME 未設定" -#: builtin/config.c +#: builtin/config.c:734 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -6416,55 +6545,59 @@ msgstr "" "不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴充部分。\n" "詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節" -#: builtin/config.c +#: builtin/config.c:768 msgid "--get-color and variable type are incoherent" msgstr "--get-color 和變數類型不相容" -#: builtin/config.c +#: builtin/config.c:773 msgid "only one action at a time" msgstr "一次只能有一個動作" -#: builtin/config.c +#: builtin/config.c:786 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only 僅適用於 --list 或 --get-regexp" -#: builtin/config.c +#: builtin/config.c:792 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "--show-origin 僅適用於 --get、--get-all、--get-regexp 和 --list" -#: builtin/config.c +#: builtin/config.c:798 msgid "--default is only applicable to --get" msgstr "--default 僅適用於 --get" -#: builtin/config.c +#: builtin/config.c:804 +msgid "--comment is only applicable to add/set/replace operations" +msgstr "--comment 只能用於加入、設定和取代動作" + +#: builtin/config.c:837 msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value 僅套用至 'value-pattern'" -#: builtin/config.c +#: builtin/config.c:855 #, c-format msgid "unable to read config file '%s'" msgstr "無法讀取設定檔案 '%s'" -#: builtin/config.c +#: builtin/config.c:858 msgid "error processing config file(s)" msgstr "處理設定檔案發生錯誤" -#: builtin/config.c +#: builtin/config.c:868 msgid "editing stdin is not supported" msgstr "不支援編輯標準輸入" -#: builtin/config.c +#: builtin/config.c:870 msgid "editing blobs is not supported" msgstr "不支援編輯資料物件" -#: builtin/config.c +#: builtin/config.c:884 #, c-format msgid "cannot create configuration file %s" msgstr "不能建立設定檔案 %s" -#: builtin/config.c +#: builtin/config.c:895 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -6473,16 +6606,16 @@ msgstr "" "無法用一個值覆蓋多個值\n" " 使用一個常規表示式、--add 或 --replace-all 來修改 %s。" -#: builtin/config.c +#: builtin/config.c:969 builtin/config.c:981 #, c-format msgid "no such section: %s" msgstr "無此小節：%s" -#: builtin/count-objects.c +#: builtin/count-objects.c:104 msgid "print sizes in human readable format" msgstr "以使用者可讀的格式顯示大小" -#: builtin/credential-cache--daemon.c +#: builtin/credential-cache--daemon.c:239 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -6495,77 +6628,78 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: builtin/credential-cache--daemon.c +#: builtin/credential-cache--daemon.c:288 msgid "print debugging messages to stderr" msgstr "除錯訊息輸出到標準錯誤" -#: builtin/credential-cache--daemon.c +#: builtin/credential-cache--daemon.c:298 +#: builtin/credential-cache--daemon.c:330 msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援" -#: builtin/credential-cache.c +#: builtin/credential-cache.c:153 builtin/credential-cache.c:185 msgid "credential-cache unavailable; no unix socket support" msgstr "credential-cache 無法使用；缺少 unix socket 支援" -#: builtin/credential-store.c +#: builtin/credential-store.c:70 #, c-format msgid "unable to get credential storage lock in %d ms" msgstr "無法在 %d 毫秒內取得憑證儲存空間的鎖" -#: builtin/describe.c +#: builtin/describe.c:31 msgid "" "git describe [--all] [--tags] [--contains] [--abbrev=] [...]" msgstr "" "git describe [--all] [--tags] [--contains] [--abbrev=] [...]" -#: builtin/describe.c +#: builtin/describe.c:32 msgid "" "git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=]" msgstr "" "git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=]" -#: builtin/describe.c +#: builtin/describe.c:33 msgid "git describe " msgstr "git describe " -#: builtin/describe.c +#: builtin/describe.c:69 msgid "head" msgstr "HEAD" -#: builtin/describe.c +#: builtin/describe.c:69 msgid "lightweight" msgstr "輕量級的" -#: builtin/describe.c +#: builtin/describe.c:69 msgid "annotated" msgstr "附註的" -#: builtin/describe.c +#: builtin/describe.c:284 #, c-format msgid "annotated tag %s not available" msgstr "附註標籤 %s 無效" -#: builtin/describe.c +#: builtin/describe.c:288 #, c-format msgid "tag '%s' is externally known as '%s'" msgstr "「%s」標籤在外部被認為是「%s」" -#: builtin/describe.c +#: builtin/describe.c:336 #, c-format msgid "no tag exactly matches '%s'" msgstr "沒有標籤準確符合 '%s'" -#: builtin/describe.c +#: builtin/describe.c:338 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "沒有精確符合到引用或標籤，繼續搜尋進行描述\n" -#: builtin/describe.c +#: builtin/describe.c:405 #, c-format msgid "finished search at %s\n" msgstr "完成搜尋 %s\n" -#: builtin/describe.c +#: builtin/describe.c:432 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -6574,7 +6708,7 @@ msgstr "" "沒有附註標籤能描述 '%s'。\n" "然而，存在未附註標籤：嘗試 --tags。" -#: builtin/describe.c +#: builtin/describe.c:436 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -6583,12 +6717,12 @@ msgstr "" "沒有標籤能描述 '%s'。\n" "嘗試 --always，或者建立一些標籤。" -#: builtin/describe.c +#: builtin/describe.c:466 #, c-format msgid "traversed %lu commits\n" msgstr "已遍歷 %lu 個提交\n" -#: builtin/describe.c +#: builtin/describe.c:469 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -6597,87 +6731,87 @@ msgstr "" "發現多於 %i 個標籤，列出最近的 %i 個\n" "在 %s 放棄搜尋\n" -#: builtin/describe.c +#: builtin/describe.c:538 #, c-format msgid "describe %s\n" msgstr "描述 %s\n" -#: builtin/describe.c +#: builtin/describe.c:541 #, c-format msgid "Not a valid object name %s" msgstr "不是一個有效的物件名 %s" -#: builtin/describe.c +#: builtin/describe.c:549 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s 既不是提交也不是資料物件" -#: builtin/describe.c +#: builtin/describe.c:574 msgid "find the tag that comes after the commit" msgstr "尋找該提交之後的標籤" -#: builtin/describe.c +#: builtin/describe.c:575 msgid "debug search strategy on stderr" msgstr "在標準錯誤上除錯搜尋策略" -#: builtin/describe.c +#: builtin/describe.c:576 msgid "use any ref" msgstr "使用任意引用" -#: builtin/describe.c +#: builtin/describe.c:577 msgid "use any tag, even unannotated" msgstr "使用任意標籤，即使未附帶備註" -#: builtin/describe.c +#: builtin/describe.c:578 msgid "always use long format" msgstr "始終使用長提交號格式" -#: builtin/describe.c +#: builtin/describe.c:579 msgid "only follow first parent" msgstr "只跟隨第一個父提交" -#: builtin/describe.c +#: builtin/describe.c:582 msgid "only output exact matches" msgstr "只輸出精確符合" -#: builtin/describe.c +#: builtin/describe.c:585 msgid "consider most recent tags (default: 10)" msgstr "考慮最近 個標籤（預設值：10）" -#: builtin/describe.c +#: builtin/describe.c:587 msgid "only consider tags matching " msgstr "只考慮符合 <模式> 的標籤" -#: builtin/describe.c +#: builtin/describe.c:589 msgid "do not consider tags matching " msgstr "不考慮符合 <模式> 的標籤" -#: builtin/describe.c builtin/name-rev.c +#: builtin/describe.c:591 builtin/name-rev.c:583 msgid "show abbreviated commit object as fallback" msgstr "顯示簡寫的提交號作為後備" -#: builtin/describe.c +#: builtin/describe.c:592 builtin/describe.c:595 msgid "mark" msgstr "標記" -#: builtin/describe.c +#: builtin/describe.c:593 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "對於髒工作區，追加 <標記>（預設值：”-dirty\"）" -#: builtin/describe.c +#: builtin/describe.c:596 msgid "append on broken working tree (default: \"-broken\")" msgstr "對於損壞的工作區，追加 <標記>（預設值：”-broken\"）" -#: builtin/describe.c +#: builtin/describe.c:643 msgid "No names found, cannot describe anything." msgstr "沒有發現名稱，無法描述任何東西。" -#: builtin/describe.c +#: builtin/describe.c:698 builtin/describe.c:700 #, c-format msgid "option '%s' and commit-ishes cannot be used together" msgstr "「%s」選項和提交號不得同時使用" -#: builtin/diagnose.c +#: builtin/diagnose.c:9 msgid "" "git diagnose [(-o | --output-directory) ] [(-s | --suffix) ]\n" " [--mode=]" @@ -6685,85 +6819,85 @@ msgstr "" "git diagnose [(-o | --output-directory) ] [(-s | --suffix) ]\n" " [--mode=]" -#: builtin/diagnose.c +#: builtin/diagnose.c:26 msgid "specify a destination for the diagnostics archive" msgstr "請指定診斷封存檔的目的地" -#: builtin/diagnose.c +#: builtin/diagnose.c:28 msgid "specify a strftime format suffix for the filename" msgstr "請指定檔案名稱的 strftime 格式後綴" -#: builtin/diagnose.c +#: builtin/diagnose.c:30 msgid "specify the content of the diagnostic archive" msgstr "指定診斷封存檔的內容" -#: builtin/diff-tree.c +#: builtin/diff-tree.c:166 msgid "--merge-base only works with two commits" msgstr "--merge-base 只對 2 個以上的提交有用" -#: builtin/diff.c +#: builtin/diff.c:95 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一個正規檔案或符號連結" -#: builtin/diff.c +#: builtin/diff.c:220 msgid "no merge given, only parents." msgstr "沒有提供合併提交，只有提供父提交。" -#: builtin/diff.c +#: builtin/diff.c:265 #, c-format msgid "invalid option: %s" msgstr "無效選項：%s" -#: builtin/diff.c +#: builtin/diff.c:384 #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s: 無合併基底" -#: builtin/diff.c +#: builtin/diff.c:499 msgid "Not a git repository" msgstr "不是一個 git 版本庫" -#: builtin/diff.c builtin/grep.c +#: builtin/diff.c:545 builtin/grep.c:749 #, c-format msgid "invalid object '%s' given." msgstr "提供了無效物件 '%s'。" -#: builtin/diff.c +#: builtin/diff.c:561 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超過兩個資料物件：'%s'" -#: builtin/diff.c +#: builtin/diff.c:566 #, c-format msgid "unhandled object '%s' given." msgstr "無法處理的物件 '%s'。" -#: builtin/diff.c +#: builtin/diff.c:600 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s：多個合併基底，使用 %s" -#: builtin/difftool.c +#: builtin/difftool.c:38 msgid "git difftool [] [ []] [--] [...]" msgstr "git difftool [<選項>] [<提交> [<提交>]] [--] [<路徑>...]" -#: builtin/difftool.c +#: builtin/difftool.c:298 #, c-format msgid "could not read symlink %s" msgstr "無法讀取符號連結 %s" -#: builtin/difftool.c +#: builtin/difftool.c:300 #, c-format msgid "could not read symlink file %s" msgstr "無法讀取符號連結檔案 %s" -#: builtin/difftool.c +#: builtin/difftool.c:309 #, c-format msgid "could not read object %s for symlink %s" msgstr "無法讀取符號連結 %2$s 指向的物件 %1$s" -#: builtin/difftool.c +#: builtin/difftool.c:431 msgid "" "combined diff formats ('-c' and '--cc') are not supported in\n" "directory diff mode ('-d' and '--dir-diff')." @@ -6771,294 +6905,296 @@ msgstr "" "不支援在目錄比較模式（'-d' 和 '--dir-diff'）中\n" "採用組合差異格式（'-c' 和 '--cc'）。" -#: builtin/difftool.c +#: builtin/difftool.c:637 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "兩個檔案都被修改：'%s' 和 '%s'。" -#: builtin/difftool.c +#: builtin/difftool.c:639 msgid "working tree file has been left." msgstr "工作區檔案被留了下來。" -#: builtin/difftool.c sequencer.c +#: builtin/difftool.c:644 sequencer.c:2353 sequencer.c:3655 sequencer.c:3659 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能複製 '%s' 至 '%s'" -#: builtin/difftool.c +#: builtin/difftool.c:650 #, c-format msgid "temporary files exist in '%s'." msgstr "暫存檔存在於 '%s'。" -#: builtin/difftool.c +#: builtin/difftool.c:651 msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者復原它們。" -#: builtin/difftool.c +#: builtin/difftool.c:656 #, c-format msgid "failed: %d" msgstr "失敗：%d" -#: builtin/difftool.c +#: builtin/difftool.c:701 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c +#: builtin/difftool.c:703 msgid "perform a full-directory diff" msgstr "執行一個全目錄差異比較" -#: builtin/difftool.c +#: builtin/difftool.c:705 msgid "do not prompt before launching a diff tool" msgstr "啟動差異比較工具之前不提示" -#: builtin/difftool.c +#: builtin/difftool.c:710 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符號連結" -#: builtin/difftool.c +#: builtin/difftool.c:711 msgid "tool" msgstr "工具" -#: builtin/difftool.c +#: builtin/difftool.c:712 msgid "use the specified diff tool" msgstr "使用指定的差異比較工具" -#: builtin/difftool.c +#: builtin/difftool.c:714 msgid "print a list of diff tools that may be used with `--tool`" msgstr "顯示可以用在 `--tool` 參數後的差異工具列表" -#: builtin/difftool.c +#: builtin/difftool.c:717 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" msgstr "當執行 diff 工具返回非零離開碼時，使 'git-difftool' 離開" -#: builtin/difftool.c +#: builtin/difftool.c:720 msgid "specify a custom command for viewing diffs" msgstr "指定一個用於檢視差異的自訂指令" -#: builtin/difftool.c +#: builtin/difftool.c:721 msgid "passed to `diff`" msgstr "傳遞給 `diff`" -#: builtin/difftool.c +#: builtin/difftool.c:737 msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作區或者 --no-index" -#: builtin/difftool.c +#: builtin/difftool.c:764 msgid "no given for --tool=" msgstr "沒有為 --tool=<工具> 參數提供 <工具>" -#: builtin/difftool.c +#: builtin/difftool.c:771 msgid "no given for --extcmd=" msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>" -#: builtin/fast-export.c +#: builtin/fast-export.c:30 msgid "git fast-export []" msgstr "git fast-export []" -#: builtin/fast-export.c +#: builtin/fast-export.c:863 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。" -#: builtin/fast-export.c +#: builtin/fast-export.c:1168 msgid "--anonymize-map token cannot be empty" msgstr "--anonymize-map 的鍵不能空白" -#: builtin/fast-export.c +#: builtin/fast-export.c:1188 msgid "show progress after objects" msgstr "在 個物件之後顯示進度" -#: builtin/fast-export.c +#: builtin/fast-export.c:1190 msgid "select handling of signed tags" msgstr "選擇如何處理簽名標籤" -#: builtin/fast-export.c +#: builtin/fast-export.c:1193 msgid "select handling of tags that tag filtered objects" msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式" -#: builtin/fast-export.c +#: builtin/fast-export.c:1196 msgid "select handling of commit messages in an alternate encoding" msgstr "選擇使用備用編碼處理提交說明" -#: builtin/fast-export.c +#: builtin/fast-export.c:1199 msgid "dump marks to this file" msgstr "把標記傾印到這個檔案" -#: builtin/fast-export.c +#: builtin/fast-export.c:1201 msgid "import marks from this file" msgstr "從這個檔案匯入標記" -#: builtin/fast-export.c +#: builtin/fast-export.c:1205 msgid "import marks from this file if it exists" msgstr "如果這個檔案存在，則從檔案匯入標記" -#: builtin/fast-export.c +#: builtin/fast-export.c:1207 msgid "fake a tagger when tags lack one" msgstr "當標籤缺少標記者欄位時假裝有一個" -#: builtin/fast-export.c +#: builtin/fast-export.c:1209 msgid "output full tree for each commit" msgstr "每次提交都輸出整棵樹" -#: builtin/fast-export.c +#: builtin/fast-export.c:1211 msgid "use the done feature to terminate the stream" msgstr "使用 done 功能終止串流" -#: builtin/fast-export.c +#: builtin/fast-export.c:1212 msgid "skip output of blob data" msgstr "略過資料物件資料的輸出" -#: builtin/fast-export.c builtin/log.c +#: builtin/fast-export.c:1213 builtin/log.c:1992 msgid "refspec" msgstr "引用規格" -#: builtin/fast-export.c +#: builtin/fast-export.c:1214 msgid "apply refspec to exported refs" msgstr "對匯出的引用套用引用規格" -#: builtin/fast-export.c +#: builtin/fast-export.c:1215 msgid "anonymize output" msgstr "匿名輸出" -#: builtin/fast-export.c +#: builtin/fast-export.c:1216 msgid "from:to" msgstr "from:to" -#: builtin/fast-export.c +#: builtin/fast-export.c:1217 msgid "convert to in anonymized output" msgstr "在匿名輸出中將 轉換為 " -#: builtin/fast-export.c +#: builtin/fast-export.c:1220 msgid "reference parents which are not in fast-export stream by object id" msgstr "依物件 ID 引用不在 fast-export 串流中的父物件" -#: builtin/fast-export.c +#: builtin/fast-export.c:1222 msgid "show original object ids of blobs/commits" msgstr "顯示資料物件及提交的原始物件 ID" -#: builtin/fast-export.c +#: builtin/fast-export.c:1224 msgid "label tags with mark ids" msgstr "為包含標記 ID 的標籤打上標記" -#: builtin/fast-import.c +#: builtin/fast-import.c:3108 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "「%s」子模組缺少 from 標記" -#: builtin/fast-import.c +#: builtin/fast-import.c:3110 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "「%s」子模組缺少 to 標記" -#: builtin/fast-import.c +#: builtin/fast-import.c:3238 #, c-format msgid "Expected 'mark' command, got %s" msgstr "預期 'mark' 指令，得到 %s" -#: builtin/fast-import.c +#: builtin/fast-import.c:3243 #, c-format msgid "Expected 'to' command, got %s" msgstr "預期 'to' 指令，得到 %s" -#: builtin/fast-import.c +#: builtin/fast-import.c:3337 msgid "Expected format name:filename for submodule rewrite option" msgstr "期望子模組 rewrite 選項的格式是 name:filename" -#: builtin/fast-import.c +#: builtin/fast-import.c:3394 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能" -#: builtin/fetch-pack.c +#: builtin/fetch-pack.c:250 #, c-format msgid "Lockfile created but not reported: %s" msgstr "已建立鎖定檔案，但尚未回報：%s" -#: builtin/fetch.c +#: builtin/fetch.c:45 msgid "git fetch [] [ [...]]" msgstr "git fetch [<選項>] [<版本庫> [<引用規格>...]]" -#: builtin/fetch.c +#: builtin/fetch.c:46 msgid "git fetch [] " msgstr "git fetch [<選項>] <組>" -#: builtin/fetch.c +#: builtin/fetch.c:47 msgid "git fetch --multiple [] [( | )...]" msgstr "git fetch --multiple [<選項>] [(<版本庫> | <組>)...]" -#: builtin/fetch.c +#: builtin/fetch.c:48 msgid "git fetch --all []" msgstr "git fetch --all [<選項>]" -#: builtin/fetch.c +#: builtin/fetch.c:155 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能為負數" -#: builtin/fetch.c +#: builtin/fetch.c:578 msgid "couldn't find remote ref HEAD" msgstr "找不到遠端 HEAD 引用" -#: builtin/fetch.c +#: builtin/fetch.c:861 #, c-format msgid "From %.*s\n" msgstr "來自 %.*s\n" -#: builtin/fetch.c +#: builtin/fetch.c:906 #, c-format msgid "object %s not found" -msgstr "物件 %s 未發現" +msgstr "找不到物件 %s" -#: builtin/fetch.c +#: builtin/fetch.c:910 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c +#: builtin/fetch.c:923 builtin/fetch.c:941 builtin/fetch.c:1020 msgid "[rejected]" msgstr "[已拒絕]" -#: builtin/fetch.c +#: builtin/fetch.c:924 msgid "can't fetch into checked-out branch" msgstr "無法抓取至已簽出分支" -#: builtin/fetch.c +#: builtin/fetch.c:935 msgid "[tag update]" msgstr "[標籤更新]" -#: builtin/fetch.c +#: builtin/fetch.c:936 builtin/fetch.c:975 builtin/fetch.c:1001 +#: builtin/fetch.c:1014 msgid "unable to update local ref" msgstr "不能更新本機引用" -#: builtin/fetch.c +#: builtin/fetch.c:942 msgid "would clobber existing tag" msgstr "會破壞現有的標籤" -#: builtin/fetch.c +#: builtin/fetch.c:964 msgid "[new tag]" msgstr "[新標籤]" -#: builtin/fetch.c +#: builtin/fetch.c:967 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c +#: builtin/fetch.c:970 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c +#: builtin/fetch.c:1014 msgid "forced update" msgstr "強制更新" -#: builtin/fetch.c +#: builtin/fetch.c:1020 msgid "non-fast-forward" msgstr "非快轉" -#: builtin/fetch.c builtin/grep.c sequencer.c +#: builtin/fetch.c:1052 builtin/fetch.c:1437 builtin/grep.c:829 +#: sequencer.c:3343 #, c-format msgid "cannot open '%s'" msgstr "不能開啟 '%s'" -#: builtin/fetch.c +#: builtin/fetch.c:1124 msgid "" "fetch normally indicates which branches had a forced update,\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n" @@ -7068,7 +7204,7 @@ msgstr "" "要重新啟用，請使用「--show-forced-updates」選項，或執行\n" "「git config fetch.showForcedUpdates true」" -#: builtin/fetch.c +#: builtin/fetch.c:1128 #, c-format msgid "" "it took %.2f seconds to check forced updates; you can use\n" @@ -7079,17 +7215,17 @@ msgstr "" "花了 %.2f 秒檢查強制更新。您可以使用「--no-show-forced-updates」\n" "或執行「git config fetch.showForcedUpdates false」避免此項檢查\n" -#: builtin/fetch.c +#: builtin/fetch.c:1155 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未傳送所有必需的物件\n" -#: builtin/fetch.c +#: builtin/fetch.c:1174 #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "已拒絕 %s，不允許更新淺複製" -#: builtin/fetch.c +#: builtin/fetch.c:1272 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7099,55 +7235,55 @@ msgstr "" " 'git remote prune %s' 來刪除舊的、有衝突的分支" # 譯者：請維持前導空格 -#: builtin/fetch.c +#: builtin/fetch.c:1379 #, c-format msgid " (%s will become dangling)" msgstr " （%s 將成為懸空狀態）" # 譯者：請維持前導空格 -#: builtin/fetch.c +#: builtin/fetch.c:1380 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成為懸空狀態）" -#: builtin/fetch.c +#: builtin/fetch.c:1405 msgid "[deleted]" msgstr "[已刪除]" -#: builtin/fetch.c builtin/remote.c +#: builtin/fetch.c:1406 builtin/remote.c:1174 msgid "(none)" msgstr "（無）" -#: builtin/fetch.c +#: builtin/fetch.c:1426 #, c-format msgid "refusing to fetch into branch '%s' checked out at '%s'" msgstr "拒絕取得在「%2$s」簽出的「%1$s」分支" -#: builtin/fetch.c +#: builtin/fetch.c:1446 #, c-format msgid "option \"%s\" value \"%s\" is not valid for %s" msgstr "選項「%s」的值「%s」對 %s 無效" -#: builtin/fetch.c +#: builtin/fetch.c:1449 #, c-format msgid "option \"%s\" is ignored for %s\n" msgstr "選項「%s」被 %s 忽略\n" -#: builtin/fetch.c object-file.c +#: builtin/fetch.c:1475 object-file.c:2698 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一個有效的物件" -#: builtin/fetch.c +#: builtin/fetch.c:1477 #, c-format msgid "the object %s does not exist" msgstr "%s 物件不存在" -#: builtin/fetch.c +#: builtin/fetch.c:1746 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "檢測到多分支，和 --set-upstream 不相容" -#: builtin/fetch.c +#: builtin/fetch.c:1758 #, c-format msgid "" "could not set upstream of HEAD to '%s' from '%s' when it does not point to " @@ -7155,19 +7291,19 @@ msgid "" msgstr "" "無法將 HEAD 的上游從「%2$s」設定為「%1$s」，因為 HEAD 沒有指向任何分支。" -#: builtin/fetch.c +#: builtin/fetch.c:1771 msgid "not setting upstream for a remote remote-tracking branch" msgstr "沒有為一個遠端追蹤分支設定上游" -#: builtin/fetch.c +#: builtin/fetch.c:1773 msgid "not setting upstream for a remote tag" msgstr "沒有為一個遠端標籤設定上游" -#: builtin/fetch.c +#: builtin/fetch.c:1775 msgid "unknown branch type" msgstr "未知的分支類型" -#: builtin/fetch.c +#: builtin/fetch.c:1777 msgid "" "no source branch found;\n" "you need to specify exactly one branch with the --set-upstream option" @@ -7175,22 +7311,22 @@ msgstr "" "找不到來源分支。\n" "您得使用 --set-upstream 選項明確指定一個分支" -#: builtin/fetch.c +#: builtin/fetch.c:1918 builtin/fetch.c:1996 #, c-format msgid "Fetching %s\n" msgstr "正在取得 %s\n" -#: builtin/fetch.c +#: builtin/fetch.c:1929 builtin/fetch.c:1999 #, c-format msgid "could not fetch %s" msgstr "不能取得 %s" -#: builtin/fetch.c +#: builtin/fetch.c:1941 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "無法取得 '%s'（離開碼：%d）\n" -#: builtin/fetch.c +#: builtin/fetch.c:2060 msgid "" "no remote repository specified; please specify either a URL or a\n" "remote name from which new revisions should be fetched" @@ -7198,345 +7334,350 @@ msgstr "" "未指定遠端版本庫。請指定用以取得新修訂版本之\n" "來源 URL 或者遠端版本庫名稱" -#: builtin/fetch.c +#: builtin/fetch.c:2096 msgid "you need to specify a tag name" msgstr "您需要指定標籤名稱" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2158 builtin/pull.c:191 msgid "fetch from all remotes" msgstr "從所有的遠端抓取" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2160 builtin/pull.c:251 msgid "set upstream for git pull/fetch" msgstr "為 git pull/fetch 設定上游" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2162 builtin/pull.c:194 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它" -#: builtin/fetch.c +#: builtin/fetch.c:2164 msgid "use atomic transaction to update references" msgstr "使用 atomic 事務更新引用" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2166 builtin/pull.c:197 msgid "path to upload pack on remote end" msgstr "上傳包到遠端的路徑" -#: builtin/fetch.c +#: builtin/fetch.c:2167 msgid "force overwrite of local reference" msgstr "強制覆蓋本機引用" -#: builtin/fetch.c +#: builtin/fetch.c:2169 msgid "fetch from multiple remotes" msgstr "從多個遠端抓取" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2171 builtin/pull.c:201 msgid "fetch all tags and associated objects" msgstr "抓取所有的標籤和關聯物件" -#: builtin/fetch.c +#: builtin/fetch.c:2173 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何標籤(--no-tags)" -#: builtin/fetch.c +#: builtin/fetch.c:2175 msgid "number of submodules fetched in parallel" msgstr "並行取得的子模組數量" -#: builtin/fetch.c +#: builtin/fetch.c:2177 msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2179 builtin/pull.c:204 msgid "prune remote-tracking branches no longer on remote" msgstr "清除遠端已經不存在的分支的追蹤分支" -#: builtin/fetch.c +#: builtin/fetch.c:2181 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除遠端不存在的本機標籤，並且取代變更標籤" # 譯者：可選值，不能翻譯 -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2182 builtin/fetch.c:2211 builtin/pull.c:125 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c +#: builtin/fetch.c:2183 msgid "control recursive fetching of submodules" msgstr "控制子模組的遞迴抓取" -#: builtin/fetch.c +#: builtin/fetch.c:2189 msgid "write fetched references to the FETCH_HEAD file" msgstr "將取得的引用寫入 FETCH_HEAD 檔案" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2190 builtin/pull.c:212 msgid "keep downloaded pack" msgstr "保持下載包" -#: builtin/fetch.c +#: builtin/fetch.c:2192 msgid "allow updating of HEAD ref" msgstr "允許更新 HEAD 引用" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2195 builtin/fetch.c:2201 builtin/pull.c:215 +#: builtin/pull.c:224 msgid "deepen history of shallow clone" msgstr "取得淺複製的更多過去歷史記錄" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2197 builtin/pull.c:218 msgid "deepen history of shallow repository based on time" msgstr "基於時間來深化淺複製的歷史" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2203 builtin/pull.c:227 msgid "convert to a complete repository" msgstr "轉換為一個完整的版本庫" -#: builtin/fetch.c +#: builtin/fetch.c:2206 msgid "re-fetch without negotiating common commits" msgstr "重新抓取而不協商共同提交" -#: builtin/fetch.c +#: builtin/fetch.c:2209 msgid "prepend this to submodule path output" msgstr "在子模組路徑輸出的前面加上此目錄" -#: builtin/fetch.c +#: builtin/fetch.c:2212 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2216 builtin/pull.c:230 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2217 builtin/pull.c:232 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2218 builtin/pull.c:233 msgid "specify fetch refmap" msgstr "指定取得動作的引用映射" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2222 builtin/pull.c:246 msgid "report that we have only objects reachable from this object" msgstr "報告我們只擁有從該物件開始可以取得的物件" -#: builtin/fetch.c +#: builtin/fetch.c:2224 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "不取得 packfile，而是輸出協商的祖先提交" -#: builtin/fetch.c +#: builtin/fetch.c:2227 builtin/fetch.c:2229 msgid "run 'maintenance --auto' after fetching" msgstr "取得 (fetch) 後執行 'maintenance --auto'" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c:2231 builtin/pull.c:249 msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上檢查強制更新" -#: builtin/fetch.c +#: builtin/fetch.c:2233 msgid "write the commit-graph after fetching" msgstr "抓取後寫入分支圖" -#: builtin/fetch.c +#: builtin/fetch.c:2235 msgid "accept refspecs from stdin" msgstr "從標準輸入中接受引用規格" -#: builtin/fetch.c +#: builtin/fetch.c:2311 msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only 需要一或多個 --negotiation-tip=*" -#: builtin/fetch.c +#: builtin/fetch.c:2315 msgid "negative depth in --deepen is not supported" msgstr "--deepen 不支援負數深度" -#: builtin/fetch.c +#: builtin/fetch.c:2324 msgid "--unshallow on a complete repository does not make sense" msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義" -#: builtin/fetch.c +#: builtin/fetch.c:2344 #, c-format msgid "failed to fetch bundles from '%s'" msgstr "無法自「%s」抓取套件包" -#: builtin/fetch.c +#: builtin/fetch.c:2356 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能帶一個版本庫參數" -#: builtin/fetch.c +#: builtin/fetch.c:2358 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 帶引用規格沒有任何意義" -#: builtin/fetch.c +#: builtin/fetch.c:2372 #, c-format msgid "no such remote or remote group: %s" msgstr "無此遠端或遠端群組：%s" -#: builtin/fetch.c +#: builtin/fetch.c:2380 msgid "fetching a group and specifying refspecs does not make sense" msgstr "取得群組並指定引用規格無意義" -#: builtin/fetch.c +#: builtin/fetch.c:2397 msgid "must supply remote when using --negotiate-only" msgstr "使用 --negotiate-only 時必須提供遠端" -#: builtin/fetch.c +#: builtin/fetch.c:2402 msgid "protocol does not support --negotiate-only, exiting" msgstr "通訊協定不支援 --negotiate-only。結束" -#: builtin/fetch.c +#: builtin/fetch.c:2423 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "只可以將 --filter 用於在 extensions.partialclone 中設定的遠端版本庫" -#: builtin/fetch.c +#: builtin/fetch.c:2427 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic 只能在擷取 (fetch) 一個遠端時使用" -#: builtin/fetch.c +#: builtin/fetch.c:2431 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin 只能在取得一個遠端時使用" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:8 msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" msgstr "git fmt-merge-msg [-m <說明>] [--log[=] | --no-log] [--file <檔案>]" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:20 msgid "populate log with at most entries from shortlog" msgstr "向提交說明中最多複製指定條目（合併而來的提交）的簡短說明" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:23 msgid "alias for --log (deprecated)" msgstr "參數 --log 的別名（已棄用）" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:26 msgid "text" msgstr "文字" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:27 msgid "use as start of message" msgstr "使用 <文字> 作為提交說明的開始" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:29 msgid "use instead of the real target branch" msgstr "使用 <名稱> 而非實際目的地分支" -#: builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c:30 msgid "file to read from" msgstr "從檔案中讀取" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:12 msgid "git for-each-ref [] []" msgstr "git for-each-ref [<選項>] [<模式>]" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:13 msgid "git for-each-ref [--points-at ]" msgstr "git for-each-ref [--points-at <物件>]" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:14 msgid "git for-each-ref [--merged []] [--no-merged []]" msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:15 msgid "git for-each-ref [--contains []] [--no-contains []]" msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for shells" msgstr "引用占位符適用於 shells" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:33 msgid "quote placeholders suitably for perl" msgstr "引用占位符適用於 perl" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:35 msgid "quote placeholders suitably for python" msgstr "引用占位符適用於 python" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:37 msgid "quote placeholders suitably for Tcl" msgstr "引用占位符適用於 Tcl" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:42 msgid "show only matched refs" msgstr "只顯示 個符合的引用" -#: builtin/for-each-ref.c builtin/tag.c +#: builtin/for-each-ref.c:44 builtin/tag.c:508 msgid "respect format colors" msgstr "遵照格式中的顏色輸出" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:48 msgid "print only refs which points at the given object" msgstr "只列印指向提供物件的引用" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:50 msgid "print only refs that are merged" msgstr "只列印已經合併的引用" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:51 msgid "print only refs that are not merged" msgstr "只列印沒有合併的引用" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:52 msgid "print only refs which contain the commit" msgstr "只列印包含該提交的引用" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:53 msgid "print only refs which don't contain the commit" msgstr "只列印不包含該提交的引用" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:55 msgid "read reference patterns from stdin" msgstr "從 stdin 讀取引用模式" -#: builtin/for-each-ref.c +#: builtin/for-each-ref.c:56 +msgid "also include HEAD ref and pseudorefs" +msgstr "包含 HEAD 引用和偽引用" + +#: builtin/for-each-ref.c:87 msgid "unknown arguments supplied with --stdin" msgstr "為 --stdin 提供的引數未知" -#: builtin/for-each-repo.c +#: builtin/for-each-repo.c:11 msgid "git for-each-repo --config= [--] " msgstr "git for-each-repo --config= [--] " -#: builtin/for-each-repo.c +#: builtin/for-each-repo.c:40 msgid "config" msgstr "config" -#: builtin/for-each-repo.c +#: builtin/for-each-repo.c:41 msgid "config key storing a list of repository paths" msgstr "儲存版本庫路徑清單的設定鍵" -#: builtin/for-each-repo.c +#: builtin/for-each-repo.c:49 msgid "missing --config=" msgstr "缺少 --config=<設定>" -#: builtin/for-each-repo.c +#: builtin/for-each-repo.c:53 #, c-format msgid "got bad config --config=%s" msgstr "收到無效的組態 --config=%s" -#: builtin/fsck.c +#: builtin/fsck.c:77 builtin/fsck.c:136 builtin/fsck.c:137 msgid "unknown" msgstr "未知" #. TRANSLATORS: e.g. error in tree 01bfda: -#: builtin/fsck.c +#: builtin/fsck.c:86 builtin/fsck.c:108 #, c-format msgid "error in %s %s: %s" msgstr "%s %s 錯誤：%s" #. TRANSLATORS: e.g. warning in tree 01bfda: -#: builtin/fsck.c +#: builtin/fsck.c:102 #, c-format msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c +#: builtin/fsck.c:132 builtin/fsck.c:135 #, c-format msgid "broken link from %7s %s" msgstr "來自 %7s %s 的損壞的連結" -#: builtin/fsck.c +#: builtin/fsck.c:144 msgid "wrong object type in link" msgstr "連結中錯誤的物件類型" -#: builtin/fsck.c +#: builtin/fsck.c:160 #, c-format msgid "" "broken link from %7s %s\n" @@ -7545,186 +7686,187 @@ msgstr "" "損壞的連結來自於 %7s %s\n" " 到 %7s %s" -#: builtin/fsck.c builtin/prune.c connected.c +#: builtin/fsck.c:197 builtin/prune.c:64 connected.c:115 msgid "Checking connectivity" msgstr "正在檢查連通性" -#: builtin/fsck.c +#: builtin/fsck.c:274 #, c-format msgid "missing %s %s" msgstr "缺少 %s %s" -#: builtin/fsck.c +#: builtin/fsck.c:301 #, c-format msgid "unreachable %s %s" msgstr "無法取得 %s %s" -#: builtin/fsck.c +#: builtin/fsck.c:321 #, c-format msgid "dangling %s %s" msgstr "懸空 %s %s" -#: builtin/fsck.c +#: builtin/fsck.c:331 msgid "could not create lost-found" msgstr "不能建立 lost-found" -#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c -#: sequencer.c +#: builtin/fsck.c:338 builtin/gc.c:1941 builtin/rebase.c:211 +#: rebase-interactive.c:122 rerere.c:479 rerere.c:687 sequencer.c:4070 +#: sequencer.c:4096 sequencer.c:6337 #, c-format msgid "could not write '%s'" msgstr "不能寫入 '%s'" -#: builtin/fsck.c +#: builtin/fsck.c:342 #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" -#: builtin/fsck.c +#: builtin/fsck.c:359 #, c-format msgid "Checking %s" msgstr "正在檢查 %s" -#: builtin/fsck.c +#: builtin/fsck.c:397 #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在檢查連通性（%d 個物件）" -#: builtin/fsck.c +#: builtin/fsck.c:416 #, c-format msgid "Checking %s %s" msgstr "正在檢查 %s %s" -#: builtin/fsck.c +#: builtin/fsck.c:421 msgid "broken links" msgstr "損壞的連結" -#: builtin/fsck.c +#: builtin/fsck.c:430 #, c-format msgid "root %s" msgstr "根 %s" -#: builtin/fsck.c +#: builtin/fsck.c:438 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "已標記 %s %s (%s) 於 %s" -#: builtin/fsck.c +#: builtin/fsck.c:464 #, c-format msgid "%s: object corrupt or missing" msgstr "%s：物件損壞或遺失" -#: builtin/fsck.c +#: builtin/fsck.c:489 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s：無效的引用日誌條目 %s" -#: builtin/fsck.c +#: builtin/fsck.c:504 #, c-format msgid "Checking reflog %s->%s" msgstr "正在檢查引用日誌 %s->%s" -#: builtin/fsck.c +#: builtin/fsck.c:537 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s：無效的 sha1 指標 %s" -#: builtin/fsck.c +#: builtin/fsck.c:544 #, c-format msgid "%s: not a commit" msgstr "%s：不是一個提交" -#: builtin/fsck.c +#: builtin/fsck.c:598 msgid "notice: No default references" msgstr "注意：無預設引用" -#: builtin/fsck.c +#: builtin/fsck.c:628 #, c-format msgid "%s: hash-path mismatch, found at: %s" msgstr "%s：雜湊路徑 (hash-path) 不符，找到的位置：%s" -#: builtin/fsck.c +#: builtin/fsck.c:631 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s：物件損壞或遺失：%s" -#: builtin/fsck.c +#: builtin/fsck.c:635 #, c-format msgid "%s: object is of unknown type '%s': %s" msgstr "%s：物件屬於「%s」未知類型：%s" -#: builtin/fsck.c +#: builtin/fsck.c:652 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析物件：%s" -#: builtin/fsck.c +#: builtin/fsck.c:673 #, c-format msgid "bad sha1 file: %s" msgstr "壞的 sha1 檔案：%s" -#: builtin/fsck.c +#: builtin/fsck.c:694 msgid "Checking object directory" msgstr "正在檢查物件目錄" -#: builtin/fsck.c +#: builtin/fsck.c:697 msgid "Checking object directories" msgstr "正在檢查物件目錄" -#: builtin/fsck.c +#: builtin/fsck.c:713 #, c-format msgid "Checking %s link" msgstr "正在檢查 %s 連結" -#: builtin/fsck.c builtin/index-pack.c +#: builtin/fsck.c:718 builtin/index-pack.c:872 #, c-format msgid "invalid %s" msgstr "無效的 %s" -#: builtin/fsck.c +#: builtin/fsck.c:725 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的東西（%s）" -#: builtin/fsck.c +#: builtin/fsck.c:731 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分離開頭指標的指向不存在" -#: builtin/fsck.c +#: builtin/fsck.c:735 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一個尚未誕生的分支（%s）" -#: builtin/fsck.c +#: builtin/fsck.c:747 #, c-format msgid "Checking cache tree of %s" msgstr "正在檢查 %s 的快取樹" -#: builtin/fsck.c +#: builtin/fsck.c:752 #, c-format msgid "%s: invalid sha1 pointer in cache-tree of %s" msgstr "%s：%s 的 cache-tree 中的 sha1 指標無效" -#: builtin/fsck.c +#: builtin/fsck.c:761 msgid "non-tree in cache-tree" msgstr "cache-tree 中非樹狀物件" -#: builtin/fsck.c +#: builtin/fsck.c:792 #, c-format msgid "%s: invalid sha1 pointer in resolve-undo of %s" msgstr "%s：%s 的 resolve-undo 中的 sha1 指標無效" -#: builtin/fsck.c +#: builtin/fsck.c:879 #, c-format msgid "unable to load rev-index for pack '%s'" msgstr "無法讀取 “%s” 封裝的修訂版索引 (rev-index)" -#: builtin/fsck.c +#: builtin/fsck.c:884 #, c-format msgid "invalid rev-index for pack '%s'" msgstr "“%s” 封裝的修訂版索引 (rev-index) 無效" -#: builtin/fsck.c +#: builtin/fsck.c:895 msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" " [--[no-]full] [--strict] [--verbose] [--lost-found]\n" @@ -7736,205 +7878,205 @@ msgstr "" " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" " [--[no-]name-objects] [...]" -#: builtin/fsck.c +#: builtin/fsck.c:904 msgid "show unreachable objects" msgstr "顯示無法取得的物件" -#: builtin/fsck.c +#: builtin/fsck.c:905 msgid "show dangling objects" msgstr "顯示懸空的物件" -#: builtin/fsck.c +#: builtin/fsck.c:906 msgid "report tags" msgstr "報告標籤" -#: builtin/fsck.c +#: builtin/fsck.c:907 msgid "report root nodes" msgstr "報告根節點" -#: builtin/fsck.c +#: builtin/fsck.c:908 msgid "make index objects head nodes" msgstr "將索引亦作為檢查的頭節點" -#: builtin/fsck.c +#: builtin/fsck.c:909 msgid "make reflogs head nodes (default)" msgstr "將引用日誌作為檢查的 HEAD 節點（預設值）" -#: builtin/fsck.c +#: builtin/fsck.c:910 msgid "also consider packs and alternate objects" msgstr "也考慮包和備用物件" -#: builtin/fsck.c +#: builtin/fsck.c:911 msgid "check only connectivity" msgstr "僅檢查連通性" -#: builtin/fsck.c builtin/mktag.c +#: builtin/fsck.c:912 builtin/mktag.c:79 msgid "enable more strict checking" msgstr "啟用更嚴格的檢查" -#: builtin/fsck.c +#: builtin/fsck.c:914 msgid "write dangling objects in .git/lost-found" msgstr "將懸空物件寫入 .git/lost-found 中" -#: builtin/fsck.c builtin/prune.c +#: builtin/fsck.c:915 builtin/prune.c:157 msgid "show progress" msgstr "顯示進度" -#: builtin/fsck.c +#: builtin/fsck.c:916 msgid "show verbose names for reachable objects" msgstr "顯示可以取得物件的詳細名稱" -#: builtin/fsck.c builtin/index-pack.c +#: builtin/fsck.c:977 builtin/index-pack.c:269 msgid "Checking objects" msgstr "正在檢查物件" -#: builtin/fsck.c +#: builtin/fsck.c:1005 #, c-format msgid "%s: object missing" msgstr "%s：物件缺少" -#: builtin/fsck.c +#: builtin/fsck.c:1016 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "無效的參數：期望 sha1，得到 '%s'" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:22 msgid "git fsmonitor--daemon start []" msgstr "git fsmonitor--daemon start []" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:23 msgid "git fsmonitor--daemon run []" msgstr "git fsmonitor--daemon run []" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:48 builtin/fsmonitor--daemon.c:57 #, c-format msgid "value of '%s' out of range: %d" msgstr "「%s」的數值超出範圍：%d" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:67 #, c-format msgid "value of '%s' not bool or int: %d" msgstr "「%s」的數值不是布林值或整數：%d" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:109 #, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon 正在監控「%s」\n" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:114 #, c-format msgid "fsmonitor-daemon is not watching '%s'\n" msgstr "fsmonitor-daemon 未在監控「%s」\n" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:181 #, c-format msgid "could not create fsmonitor cookie '%s'" msgstr "無法建立 fsmonitor cookie「%s」" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:766 #, c-format msgid "fsmonitor: cookie_result '%d' != SEEN" msgstr "fsmonitor：cookie_result '%d' != SEEN" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1215 #, c-format msgid "could not start IPC thread pool on '%s'" msgstr "無法在「%s」啟動 IPC 執行緒集區" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1225 msgid "could not start fsmonitor listener thread" msgstr "無法啟動 fsmonitor 監聽執行緒" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1236 msgid "could not start fsmonitor health thread" msgstr "無法啟動 fsmonitor 健康監聽執行緒" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1371 msgid "could not initialize listener thread" msgstr "無法初始化監聽執行緒" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1376 msgid "could not initialize health thread" msgstr "無法初始化健康監聽執行緒" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1395 #, c-format msgid "could not cd home '%s'" msgstr "無法 cd home '%s'" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1428 builtin/fsmonitor--daemon.c:1484 #, c-format msgid "fsmonitor--daemon is already running '%s'" msgstr "fsmonitor--daemon 已在執行「%s」" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1432 #, c-format msgid "running fsmonitor-daemon in '%s'\n" msgstr "正在「%s」執行 fsmonitor-daemon\n" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1488 #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "正在「%s」啟動 fsmonitor-daemon\n" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1514 msgid "daemon failed to start" msgstr "無法啟動守護程式" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1517 msgid "daemon not online yet" msgstr "守護程式尚未上線" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1520 msgid "daemon terminated" msgstr "守護程式已終止" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1531 msgid "detach from console" msgstr "從主控台分離" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1534 msgid "use ipc worker threads" msgstr "使用 個 IPC 工作執行緒" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1537 msgid "max seconds to wait for background daemon startup" msgstr "要等待背景守護程式啟動的最長秒數" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1551 #, c-format msgid "invalid 'ipc-threads' value (%d)" msgstr "無效的「ipc-threads」數值（%d）" -#: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c +#: builtin/fsmonitor--daemon.c:1583 t/helper/test-cache-tree.c:66 #, c-format msgid "Unhandled subcommand '%s'" msgstr "未處理的子命令「%s」" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c:1596 msgid "fsmonitor--daemon not supported on this platform" msgstr "fsmonitor--daemon 不支援本平台" -#: builtin/gc.c +#: builtin/gc.c:48 msgid "git gc []" msgstr "git gc [<選項>]" -#: builtin/gc.c +#: builtin/gc.c:106 #, c-format msgid "Failed to fstat %s: %s" msgstr "對 %s 呼叫 fstat 失敗：%s" -#: builtin/gc.c +#: builtin/gc.c:142 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "無法解析 '%s' 值 '%s'" -#: builtin/gc.c setup.c +#: builtin/gc.c:557 setup.c:1820 #, c-format msgid "cannot stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: builtin/gc.c +#: builtin/gc.c:573 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7948,302 +8090,303 @@ msgstr "" "\n" "%s" -#: builtin/gc.c +#: builtin/gc.c:628 msgid "prune unreferenced objects" msgstr "清除未引用的物件" -#: builtin/gc.c +#: builtin/gc.c:630 msgid "pack unreferenced objects separately" msgstr "獨立封裝無引用物件" -#: builtin/gc.c builtin/repack.c +#: builtin/gc.c:632 builtin/repack.c:1150 msgid "with --cruft, limit the size of new cruft packs" msgstr "搭配 --cruft，限制新廢棄封裝的大小" -#: builtin/gc.c +#: builtin/gc.c:633 msgid "be more thorough (increased runtime)" msgstr "更徹底（增加執行時間）" -#: builtin/gc.c +#: builtin/gc.c:634 msgid "enable auto-gc mode" msgstr "啟用自動垃圾回收模式" -#: builtin/gc.c +#: builtin/gc.c:637 msgid "force running gc even if there may be another gc running" msgstr "強制執行 gc 即使另外一個 gc 正在執行" -#: builtin/gc.c +#: builtin/gc.c:640 msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外，對所有其它包重新打包" -#: builtin/gc.c +#: builtin/gc.c:656 #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "無法解析 gc.logExpiry 的值 %s" -#: builtin/gc.c +#: builtin/gc.c:667 #, c-format msgid "failed to parse prune expiry value %s" msgstr "解析清除期限值 %s 失敗" -#: builtin/gc.c +#: builtin/gc.c:687 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自動在後台執行版本庫打包以求最佳性能。\n" -#: builtin/gc.c +#: builtin/gc.c:689 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自動打包版本庫以求最佳性能。\n" -#: builtin/gc.c +#: builtin/gc.c:690 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手動維護參見 \"git help gc\"。\n" -#: builtin/gc.c +#: builtin/gc.c:731 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "gc 已在「%s」機器 pid % 執行（如果不是，使用 --force）" -#: builtin/gc.c +#: builtin/gc.c:800 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多無法取得的鬆散物件，執行「git prune」刪除它們。" -#: builtin/gc.c +#: builtin/gc.c:810 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<作業>] [--schedule]" -#: builtin/gc.c +#: builtin/gc.c:820 msgid "--no-schedule is not allowed" msgstr "不允許 --no-schedule" -#: builtin/gc.c +#: builtin/gc.c:825 #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "無法識別的 --schedule 引數 '%s'" -#: builtin/gc.c +#: builtin/gc.c:938 msgid "failed to write commit-graph" msgstr "無法寫入提交圖形" -#: builtin/gc.c +#: builtin/gc.c:968 msgid "failed to prefetch remotes" msgstr "無法預先取得遠端" -#: builtin/gc.c +#: builtin/gc.c:1084 msgid "failed to start 'git pack-objects' process" msgstr "無法啟動 ‘git pack-objects’ 處理程序" -#: builtin/gc.c +#: builtin/gc.c:1101 msgid "failed to finish 'git pack-objects' process" msgstr "無法完成 ‘git pack-objects’ 處理程序" -#: builtin/gc.c +#: builtin/gc.c:1152 msgid "failed to write multi-pack-index" msgstr "無法寫入多包索引" -#: builtin/gc.c +#: builtin/gc.c:1168 msgid "'git multi-pack-index expire' failed" msgstr "'git multi-pack-index expire' 失敗" -#: builtin/gc.c +#: builtin/gc.c:1227 msgid "'git multi-pack-index repack' failed" msgstr "'git multi-pack-index repack' 失敗" -#: builtin/gc.c +#: builtin/gc.c:1236 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "略過增量重新打包工作，因為 core.multiPackIndex 已被停用" -#: builtin/gc.c +#: builtin/gc.c:1340 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "已存在 '%s' 鎖定檔案，略過維護" -#: builtin/gc.c +#: builtin/gc.c:1370 #, c-format msgid "task '%s' failed" msgstr "作業 '%s' 失敗" -#: builtin/gc.c +#: builtin/gc.c:1452 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' 非有效作業" -#: builtin/gc.c +#: builtin/gc.c:1457 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "不能多次選取 '%s' 作業" -#: builtin/gc.c +#: builtin/gc.c:1472 msgid "run tasks based on the state of the repository" msgstr "基於版本庫狀態執行作業" -#: builtin/gc.c +#: builtin/gc.c:1473 msgid "frequency" msgstr "frequency" -#: builtin/gc.c +#: builtin/gc.c:1474 msgid "run tasks based on frequency" msgstr "依據頻率執行工作" -#: builtin/gc.c +#: builtin/gc.c:1477 msgid "do not report progress or other information over stderr" msgstr "不要在 stderr 輸出進度或其他資訊" -#: builtin/gc.c +#: builtin/gc.c:1478 msgid "task" msgstr "作業" -#: builtin/gc.c +#: builtin/gc.c:1479 msgid "run a specific task" msgstr "執行指定作業" -#: builtin/gc.c +#: builtin/gc.c:1496 msgid "use at most one of --auto and --schedule=" msgstr "--auto 和 --schedule=<頻率> 請任選一" -#: builtin/gc.c +#: builtin/gc.c:1572 #, c-format msgid "unable to add '%s' value of '%s'" msgstr "無法為「%2$s」的值加上「%1$s」" -#: builtin/gc.c +#: builtin/gc.c:1592 msgid "return success even if repository was not registered" msgstr "即便版本庫未註冊仍回傳成功狀態" -#: builtin/gc.c +#: builtin/gc.c:1641 #, c-format msgid "unable to unset '%s' value of '%s'" msgstr "無法取消設定「%2$s」的「%1$s」值" -#: builtin/gc.c +#: builtin/gc.c:1644 #, c-format msgid "repository '%s' is not registered" msgstr "版本庫「%s」未註冊" -#: builtin/gc.c +#: builtin/gc.c:1777 #, c-format msgid "failed to expand path '%s'" msgstr "無法展開「%s」路徑" -#: builtin/gc.c +#: builtin/gc.c:1804 builtin/gc.c:1842 msgid "failed to start launchctl" msgstr "無法啟動 launchctl" -#: builtin/gc.c +#: builtin/gc.c:1919 builtin/gc.c:2372 builtin/gc.c:2445 #, c-format msgid "failed to create directories for '%s'" msgstr "無法建立「%s」的目錄" -#: builtin/gc.c +#: builtin/gc.c:1946 #, c-format msgid "failed to bootstrap service %s" msgstr "無法啟動載入 %s 服務" -#: builtin/gc.c +#: builtin/gc.c:2036 msgid "failed to create temp xml file" msgstr "無法建立暫存 XML 檔案" -#: builtin/gc.c +#: builtin/gc.c:2129 msgid "failed to start schtasks" msgstr "無法啟動 schtasks" -#: builtin/gc.c +#: builtin/gc.c:2215 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "無法執行 “crontab -l”；您的系統可能不支援 “cron”" -#: builtin/gc.c +#: builtin/gc.c:2222 msgid "failed to create crontab temporary file" msgstr "無法建立 crontab 暫存檔" -#: builtin/gc.c +#: builtin/gc.c:2227 msgid "failed to open temporary file" msgstr "無法開啟暫存檔" -#: builtin/gc.c +#: builtin/gc.c:2277 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”" -#: builtin/gc.c +#: builtin/gc.c:2282 msgid "'crontab' died" msgstr "“crontab” 結束運作" -#: builtin/gc.c builtin/worktree.c +#: builtin/gc.c:2333 builtin/gc.c:2346 builtin/gc.c:2542 builtin/worktree.c:152 +#: builtin/worktree.c:1299 #, c-format msgid "failed to delete '%s'" msgstr "刪除 '%s' 失敗" -#: builtin/gc.c rerere.c +#: builtin/gc.c:2415 builtin/gc.c:2477 rerere.c:492 #, c-format msgid "failed to flush '%s'" msgstr "排清 '%s' 失敗" -#: builtin/gc.c +#: builtin/gc.c:2518 msgid "failed to start systemctl" msgstr "無法啟動 systemctl" -#: builtin/gc.c +#: builtin/gc.c:2528 msgid "failed to run systemctl" msgstr "無法執行 systemctl" -#: builtin/gc.c +#: builtin/gc.c:2659 #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "無法識別的 --scheduler 引數 '%s'" -#: builtin/gc.c +#: builtin/gc.c:2684 msgid "neither systemd timers nor crontab are available" msgstr "不支援 systemd 計時器或 crontab" -#: builtin/gc.c +#: builtin/gc.c:2699 #, c-format msgid "%s scheduler is not available" msgstr "無法使用 %s 排程器" -#: builtin/gc.c +#: builtin/gc.c:2713 msgid "another process is scheduling background maintenance" msgstr "其他處理程序正在排定背景維護工作" -#: builtin/gc.c +#: builtin/gc.c:2735 msgid "git maintenance start [--scheduler=]" msgstr "git maintenance start [--scheduler=]" -#: builtin/gc.c +#: builtin/gc.c:2744 msgid "scheduler" msgstr "scheduler" -#: builtin/gc.c +#: builtin/gc.c:2745 msgid "scheduler to trigger git maintenance run" msgstr "要觸發 git maintenance run 的排程器" -#: builtin/gc.c +#: builtin/gc.c:2760 msgid "failed to set up maintenance schedule" msgstr "無法設定維護排程" -#: builtin/gc.c +#: builtin/gc.c:2763 msgid "failed to add repo to global config" msgstr "無法將版本庫加至全域設定" -#: builtin/gc.c +#: builtin/gc.c:2785 msgid "git maintenance []" msgstr "git maintenance <子命令> [<選項>]" -#: builtin/grep.c +#: builtin/grep.c:36 msgid "git grep [] [-e] [...] [[--] ...]" msgstr "git grep [<選項>] [-e] <模式> [<版本>...] [[--] <路徑>...]" -#: builtin/grep.c +#: builtin/grep.c:245 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep：無法建立執行緒：%s" -#: builtin/grep.c +#: builtin/grep.c:303 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" @@ -8252,258 +8395,259 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c +#: builtin/grep.c:311 builtin/index-pack.c:1593 builtin/index-pack.c:1799 +#: builtin/pack-objects.c:3271 #, c-format msgid "no threads support, ignoring %s" msgstr "沒有執行緒支援，忽略 %s" -#: builtin/grep.c +#: builtin/grep.c:575 #, c-format -msgid "unable to read tree (%s)" -msgstr "無法讀取樹（%s）" +msgid "unable to read tree %s" +msgstr "無法讀取 %s 樹狀物件" -#: builtin/grep.c +#: builtin/grep.c:723 #, c-format msgid "unable to grep from object of type %s" msgstr "無法抓取來自於 %s 類型的物件" -#: builtin/grep.c +#: builtin/grep.c:803 #, c-format msgid "switch `%c' expects a numerical value" msgstr "開關 `%c' 期望一個數字值" -#: builtin/grep.c +#: builtin/grep.c:909 msgid "search in index instead of in the work tree" msgstr "在索引區搜尋而不是在工作區" -#: builtin/grep.c +#: builtin/grep.c:911 msgid "find in contents not managed by git" msgstr "在未被 git 管理的內容中尋找" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/grep.c +#: builtin/grep.c:913 msgid "search in both tracked and untracked files" msgstr "在追蹤和未追蹤的檔案中搜尋" -#: builtin/grep.c +#: builtin/grep.c:915 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的檔案" -#: builtin/grep.c +#: builtin/grep.c:917 msgid "recursively search in each submodule" msgstr "在每一個子模組中遞迴搜尋" -#: builtin/grep.c +#: builtin/grep.c:920 msgid "show non-matching lines" msgstr "顯示未符合的行" -#: builtin/grep.c +#: builtin/grep.c:922 msgid "case insensitive matching" msgstr "不區分大小寫符合" -#: builtin/grep.c +#: builtin/grep.c:924 msgid "match patterns only at word boundaries" msgstr "只在單詞邊界符合模式" -#: builtin/grep.c +#: builtin/grep.c:926 msgid "process binary files as text" msgstr "把二進位檔案當做文字處理" -#: builtin/grep.c +#: builtin/grep.c:928 msgid "don't match patterns in binary files" msgstr "不在二進位檔案中符合模式" -#: builtin/grep.c +#: builtin/grep.c:931 msgid "process binary files with textconv filters" msgstr "用 textconv 過濾器處理二進位檔案" -#: builtin/grep.c +#: builtin/grep.c:933 msgid "search in subdirectories (default)" msgstr "在子目錄中尋找（預設值）" -#: builtin/grep.c +#: builtin/grep.c:935 msgid "descend at most levels" msgstr "最多向下尋找 層" -#: builtin/grep.c +#: builtin/grep.c:938 msgid "use extended POSIX regular expressions" msgstr "使用延伸的 POSIX 常規表示式" -#: builtin/grep.c +#: builtin/grep.c:941 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 常規表示式（預設值）" -#: builtin/grep.c +#: builtin/grep.c:944 msgid "interpret patterns as fixed strings" msgstr "把模式解析為固定的字串" -#: builtin/grep.c +#: builtin/grep.c:947 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 相容的常規表示式" -#: builtin/grep.c +#: builtin/grep.c:950 msgid "show line numbers" msgstr "顯示行號" -#: builtin/grep.c +#: builtin/grep.c:951 msgid "show column number of first match" msgstr "顯示第一個符合的列號" -#: builtin/grep.c +#: builtin/grep.c:952 msgid "don't show filenames" msgstr "不顯示檔案名" -#: builtin/grep.c +#: builtin/grep.c:953 msgid "show filenames" msgstr "顯示檔案名" -#: builtin/grep.c +#: builtin/grep.c:955 msgid "show filenames relative to top directory" msgstr "顯示相對於頂級目錄的檔案名" -#: builtin/grep.c +#: builtin/grep.c:957 msgid "show only filenames instead of matching lines" msgstr "只顯示檔案名而不顯示符合的行" -#: builtin/grep.c +#: builtin/grep.c:959 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同義" -#: builtin/grep.c +#: builtin/grep.c:962 msgid "show only the names of files without match" msgstr "只顯示未符合的檔案名" -#: builtin/grep.c +#: builtin/grep.c:964 msgid "print NUL after filenames" msgstr "在檔案名後輸出 NUL 字元" -#: builtin/grep.c +#: builtin/grep.c:967 msgid "show only matching parts of a line" msgstr "只顯示行中的符合的部分" -#: builtin/grep.c +#: builtin/grep.c:969 msgid "show the number of matches instead of matching lines" msgstr "顯示總符合行數，而不顯示符合的行" -#: builtin/grep.c +#: builtin/grep.c:970 msgid "highlight matches" msgstr "高亮顯示符合項" -#: builtin/grep.c +#: builtin/grep.c:972 msgid "print empty line between matches from different files" msgstr "在不同檔案的符合項之間列印空行" -#: builtin/grep.c +#: builtin/grep.c:974 msgid "show filename only once above matches from same file" msgstr "只在同一檔案的符合項的上面顯示一次檔案名" -#: builtin/grep.c +#: builtin/grep.c:977 msgid "show context lines before and after matches" msgstr "顯示符合項前後的 行上下文" -#: builtin/grep.c +#: builtin/grep.c:980 msgid "show context lines before matches" msgstr "顯示符合項前 行上下文" -#: builtin/grep.c +#: builtin/grep.c:982 msgid "show context lines after matches" msgstr "顯示符合項後 行上下文" -#: builtin/grep.c +#: builtin/grep.c:984 msgid "use worker threads" msgstr "使用 個工作執行緒" -#: builtin/grep.c +#: builtin/grep.c:985 msgid "shortcut for -C NUM" msgstr "快捷鍵 -C 數字" -#: builtin/grep.c +#: builtin/grep.c:988 msgid "show a line with the function name before matches" msgstr "在符合的前面顯示一行函數名" -#: builtin/grep.c +#: builtin/grep.c:990 msgid "show the surrounding function" msgstr "顯示所在函數的前後內容" -#: builtin/grep.c +#: builtin/grep.c:993 msgid "read patterns from file" msgstr "從檔案讀取模式" -#: builtin/grep.c +#: builtin/grep.c:995 msgid "match " msgstr "符合 <模式>" -#: builtin/grep.c +#: builtin/grep.c:997 msgid "combine patterns specified with -e" msgstr "組合用 -e 參數設定的模式" -#: builtin/grep.c +#: builtin/grep.c:1009 msgid "indicate hit with exit status without output" msgstr "不輸出，而用離開碼標記命中狀態" -#: builtin/grep.c +#: builtin/grep.c:1011 msgid "show only matches from files that match all patterns" msgstr "只顯示符合所有模式的檔案中的符合" -#: builtin/grep.c +#: builtin/grep.c:1014 msgid "pager" msgstr "分頁" -#: builtin/grep.c +#: builtin/grep.c:1014 msgid "show matching files in the pager" msgstr "分頁顯示符合的檔案" -#: builtin/grep.c +#: builtin/grep.c:1018 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允許呼叫 grep(1)（本次組建忽略）" -#: builtin/grep.c +#: builtin/grep.c:1021 msgid "maximum number of results per file" msgstr "每個檔案的最多結果數" -#: builtin/grep.c +#: builtin/grep.c:1091 msgid "no pattern given" msgstr "未提供符合模式" -#: builtin/grep.c +#: builtin/grep.c:1127 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同時使用" -#: builtin/grep.c +#: builtin/grep.c:1135 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c +#: builtin/grep.c:1165 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked 不支援與 --recurse-submodules 一起使用" -#: builtin/grep.c +#: builtin/grep.c:1176 msgid "invalid option combination, ignoring --threads" msgstr "無效的選項組合，忽略 --threads" -#: builtin/grep.c builtin/pack-objects.c +#: builtin/grep.c:1179 builtin/pack-objects.c:4482 msgid "no threads support, ignoring --threads" msgstr "沒有執行緒支援，忽略 --threads" -#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c +#: builtin/grep.c:1182 builtin/index-pack.c:1590 builtin/pack-objects.c:3268 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的執行緒數無效（%d）" -#: builtin/grep.c +#: builtin/grep.c:1216 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 僅用於工作區" -#: builtin/grep.c +#: builtin/grep.c:1249 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用於已追蹤內容" -#: builtin/grep.c +#: builtin/grep.c:1257 msgid "both --cached and trees are given" msgstr "同時給出了 --cached 和樹狀物件" -#: builtin/hash-object.c +#: builtin/hash-object.c:90 msgid "" "git hash-object [-t ] [-w] [--path= | --no-filters]\n" " [--stdin [--literally]] [--] ..." @@ -8511,111 +8655,111 @@ msgstr "" "git hash-object [-t ] [-w] [--path= | --no-filters]\n" " [--stdin [--literally]] [--] ..." -#: builtin/hash-object.c +#: builtin/hash-object.c:92 msgid "git hash-object [-t ] [-w] --stdin-paths [--no-filters]" msgstr "git hash-object [-t ] [-w] --stdin-paths [--no-filters]" -#: builtin/hash-object.c +#: builtin/hash-object.c:105 msgid "object type" msgstr "物件類型" -#: builtin/hash-object.c +#: builtin/hash-object.c:106 msgid "write the object into the object database" msgstr "將物件寫入物件資料庫" -#: builtin/hash-object.c +#: builtin/hash-object.c:108 msgid "read the object from stdin" msgstr "從標準輸入讀取物件" -#: builtin/hash-object.c +#: builtin/hash-object.c:110 msgid "store file as is without filters" msgstr "原樣儲存檔案不使用過濾器" -#: builtin/hash-object.c +#: builtin/hash-object.c:111 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "允許對任意隨機垃圾資料做散列來建立損壞的物件以便除錯 Git" -#: builtin/hash-object.c +#: builtin/hash-object.c:112 msgid "process file as it were from this path" msgstr "處理檔案並假設其來自於此路徑" -#: builtin/help.c +#: builtin/help.c:62 msgid "print all available commands" msgstr "列印所有可用的指令" -#: builtin/help.c +#: builtin/help.c:65 msgid "show external commands in --all" msgstr "在 --all 顯示外部命令" -#: builtin/help.c +#: builtin/help.c:66 msgid "show aliases in --all" msgstr "在 --all 顯示別名" -#: builtin/help.c +#: builtin/help.c:67 msgid "exclude guides" msgstr "排除嚮導" -#: builtin/help.c +#: builtin/help.c:68 msgid "show man page" msgstr "顯示 man 手冊" -#: builtin/help.c +#: builtin/help.c:69 msgid "show manual in web browser" msgstr "在 web 瀏覽器中顯示手冊" -#: builtin/help.c +#: builtin/help.c:71 msgid "show info page" msgstr "顯示 info 手冊" -#: builtin/help.c +#: builtin/help.c:73 msgid "print command description" msgstr "列印指令描述" -#: builtin/help.c +#: builtin/help.c:75 msgid "print list of useful guides" msgstr "顯示有用的指南列表" -#: builtin/help.c +#: builtin/help.c:78 msgid "print list of user-facing repository, command and file interfaces" msgstr "輸出面向使用者的版本庫、命令，和檔案介面清單" -#: builtin/help.c +#: builtin/help.c:81 msgid "print list of file formats, protocols and other developer interfaces" msgstr "輸出檔案格式、通訊協定和其他開發者介面的清單" -#: builtin/help.c +#: builtin/help.c:83 msgid "print all configuration variable names" msgstr "列印所有設定變數名稱" -#: builtin/help.c +#: builtin/help.c:95 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [|]" msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [|]" -#: builtin/help.c +#: builtin/help.c:214 #, c-format msgid "unrecognized help format '%s'" msgstr "無法識別的協助格式 '%s'" -#: builtin/help.c +#: builtin/help.c:240 msgid "Failed to start emacsclient." msgstr "無法啟動 emacsclient。" -#: builtin/help.c +#: builtin/help.c:253 msgid "Failed to parse emacsclient version." msgstr "無法解析 emacsclient 版本。" -#: builtin/help.c +#: builtin/help.c:261 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c +#: builtin/help.c:279 builtin/help.c:301 builtin/help.c:311 builtin/help.c:319 #, c-format msgid "failed to exec '%s'" msgstr "執行 '%s' 失敗" -#: builtin/help.c +#: builtin/help.c:357 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -8624,7 +8768,7 @@ msgstr "" "'%s'：不支援的 man 手冊檢視器的路徑。\n" "請使用 'man.<工具>.cmd'。" -#: builtin/help.c +#: builtin/help.c:369 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -8633,49 +8777,49 @@ msgstr "" "'%s': 支援的 man 手冊檢視器指令。\n" "請使用 'man.<工具>.path'。" -#: builtin/help.c +#: builtin/help.c:487 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 檢視器。" -#: builtin/help.c +#: builtin/help.c:503 msgid "no man viewer handled the request" msgstr "沒有 man 檢視器處理此請求" -#: builtin/help.c +#: builtin/help.c:510 msgid "no info viewer handled the request" msgstr "沒有 info 檢視器處理此請求" -#: builtin/help.c git.c +#: builtin/help.c:571 builtin/help.c:582 git.c:363 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的別名" -#: builtin/help.c git.c +#: builtin/help.c:585 git.c:393 #, c-format msgid "bad alias.%s string: %s" msgstr "壞的 alias.%s 字串：%s" -#: builtin/help.c +#: builtin/help.c:627 #, c-format msgid "the '%s' option doesn't take any non-option arguments" msgstr "「%s」選項不取非選項的引數" -#: builtin/help.c +#: builtin/help.c:647 msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "「--no-[external-commands|aliases]」選項只能與「--all」一起使用" -#: builtin/help.c +#: builtin/help.c:659 builtin/help.c:695 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c +#: builtin/help.c:690 msgid "'git help config' for more information" msgstr "'git help config' 取得更多訊息" -#: builtin/hook.c +#: builtin/hook.c:9 msgid "" "git hook run [--ignore-missing] [--to-stdin=] [-- ]" @@ -8683,544 +8827,578 @@ msgstr "" "git hook run [--ignore-missing] [--to-stdin=] [-- ]" -#: builtin/hook.c +#: builtin/hook.c:29 msgid "silently ignore missing requested " msgstr "靜默忽略不存在而請求的 " -#: builtin/hook.c +#: builtin/hook.c:31 msgid "file to read into hooks' stdin" msgstr "要讀進掛鉤 stdin 的檔案" -#: builtin/index-pack.c +#: builtin/index-pack.c:229 #, c-format msgid "object type mismatch at %s" msgstr "%s 的物件類型不符合" -#: builtin/index-pack.c +#: builtin/index-pack.c:249 #, c-format msgid "did not receive expected object %s" msgstr "未能取得預期的物件 %s" -#: builtin/index-pack.c +#: builtin/index-pack.c:252 #, c-format msgid "object %s: expected type %s, found %s" msgstr "物件 %s：應為類型 %s，卻是 %s" -#: builtin/index-pack.c +#: builtin/index-pack.c:302 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "無法填充 %d 位元組" -#: builtin/index-pack.c +#: builtin/index-pack.c:312 msgid "early EOF" msgstr "過早的檔案結束符（EOF）" -#: builtin/index-pack.c +#: builtin/index-pack.c:313 msgid "read error on input" msgstr "輸入上的讀錯誤" -#: builtin/index-pack.c +#: builtin/index-pack.c:325 msgid "used more bytes than were available" msgstr "用掉了超過可用的位元組" -#: builtin/index-pack.c builtin/pack-objects.c +#: builtin/index-pack.c:332 builtin/pack-objects.c:769 msgid "pack too large for current definition of off_t" msgstr "包太大超過了目前 off_t 的定義" -#: builtin/index-pack.c +#: builtin/index-pack.c:337 #, c-format msgid "pack exceeds maximum allowed size (%s)" msgstr "包超過了最大允許大小 (%s)" -#: builtin/index-pack.c +#: builtin/index-pack.c:370 msgid "pack signature mismatch" msgstr "包簽名不符合" -#: builtin/index-pack.c +#: builtin/index-pack.c:372 #, c-format msgid "pack version % unsupported" msgstr "不支援包版本 %" -#: builtin/index-pack.c +#: builtin/index-pack.c:388 #, c-format msgid "pack has bad object at offset %: %s" msgstr "包中有錯誤的物件位於位移量 %：%s" -#: builtin/index-pack.c +#: builtin/index-pack.c:493 #, c-format msgid "inflate returned %d" msgstr "解壓縮返回 %d" -#: builtin/index-pack.c +#: builtin/index-pack.c:542 msgid "offset value overflow for delta base object" msgstr "位移值覆蓋了 delta 基準物件" -#: builtin/index-pack.c +#: builtin/index-pack.c:550 msgid "delta base offset is out of bound" msgstr "delta 基準位移越界" -#: builtin/index-pack.c +#: builtin/index-pack.c:558 #, c-format msgid "unknown object type %d" msgstr "未知物件類型 %d" -#: builtin/index-pack.c +#: builtin/index-pack.c:589 msgid "cannot pread pack file" msgstr "無法讀取包檔案" -#: builtin/index-pack.c +#: builtin/index-pack.c:591 #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" msgstr[0] "包檔案過早結束，缺少 % 位元組" -#: builtin/index-pack.c +#: builtin/index-pack.c:617 msgid "serious inflate inconsistency" msgstr "解壓縮嚴重的不一致" -#: builtin/index-pack.c +#: builtin/index-pack.c:762 builtin/index-pack.c:768 builtin/index-pack.c:792 +#: builtin/index-pack.c:832 builtin/index-pack.c:842 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "發現 %s 出現 SHA1 衝突！" -#: builtin/index-pack.c builtin/pack-objects.c -#, c-format -msgid "unable to read %s" -msgstr "不能讀 %s" - -#: builtin/index-pack.c +#: builtin/index-pack.c:830 #, c-format msgid "cannot read existing object info %s" msgstr "不能讀取現存物件訊息 %s" -#: builtin/index-pack.c +#: builtin/index-pack.c:839 #, c-format msgid "cannot read existing object %s" msgstr "不能讀取現存物件 %s" -#: builtin/index-pack.c +#: builtin/index-pack.c:853 #, c-format msgid "invalid blob object %s" msgstr "無效的資料物件 %s" -#: builtin/index-pack.c +#: builtin/index-pack.c:856 builtin/index-pack.c:875 msgid "fsck error in packed object" msgstr "對打包物件 fsck 檢查發生錯誤" -#: builtin/index-pack.c +#: builtin/index-pack.c:877 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子物件並非都可以取得" -#: builtin/index-pack.c +#: builtin/index-pack.c:938 builtin/index-pack.c:985 msgid "failed to apply delta" msgstr "套用 delta 失敗" -#: builtin/index-pack.c +#: builtin/index-pack.c:1172 msgid "Receiving objects" msgstr "接收物件中" -#: builtin/index-pack.c +#: builtin/index-pack.c:1172 msgid "Indexing objects" msgstr "索引物件中" -#: builtin/index-pack.c +#: builtin/index-pack.c:1208 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包衝突（SHA1 不符合）" -#: builtin/index-pack.c +#: builtin/index-pack.c:1213 msgid "cannot fstat packfile" msgstr "不能對 packfile 呼叫 fstat" -#: builtin/index-pack.c +#: builtin/index-pack.c:1216 msgid "pack has junk at the end" msgstr "包的結尾有垃圾資料" -#: builtin/index-pack.c +#: builtin/index-pack.c:1228 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的問題" -#: builtin/index-pack.c +#: builtin/index-pack.c:1251 msgid "Resolving deltas" msgstr "處理 delta 中" -#: builtin/index-pack.c builtin/pack-objects.c +#: builtin/index-pack.c:1263 builtin/pack-objects.c:3012 #, c-format msgid "unable to create thread: %s" msgstr "不能建立執行緒：%s" -#: builtin/index-pack.c +#: builtin/index-pack.c:1297 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c +#: builtin/index-pack.c:1303 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 個本機物件" -#: builtin/index-pack.c +#: builtin/index-pack.c:1315 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）" -#: builtin/index-pack.c +#: builtin/index-pack.c:1319 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 個未解決的 delta" -#: builtin/index-pack.c +#: builtin/index-pack.c:1343 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能壓縮附加物件（%d）" -#: builtin/index-pack.c +#: builtin/index-pack.c:1439 #, c-format msgid "local object %s is corrupt" msgstr "本機物件 %s 已損壞" -#: builtin/index-pack.c +#: builtin/index-pack.c:1461 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "packfile 名稱「%s」的結尾不是「.%s」" -#: builtin/index-pack.c +#: builtin/index-pack.c:1485 #, c-format msgid "cannot write %s file '%s'" msgstr "無法寫入 %s 檔案 '%s'" -#: builtin/index-pack.c +#: builtin/index-pack.c:1493 #, c-format msgid "cannot close written %s file '%s'" msgstr "無法關閉已寫入的 %s 檔案 '%s'" -#: builtin/index-pack.c +#: builtin/index-pack.c:1510 #, c-format msgid "unable to rename temporary '*.%s' file to '%s'" msgstr "無法將「*.%s」暫存檔的檔名更改為「%s」" -#: builtin/index-pack.c +#: builtin/index-pack.c:1533 msgid "error while closing pack file" msgstr "關閉包檔案時發生錯誤" -#: builtin/index-pack.c builtin/pack-objects.c +#: builtin/index-pack.c:1584 builtin/pack-objects.c:3279 #, c-format msgid "bad pack.indexVersion=%" msgstr "無效的 pack.indexVersion=%" -#: builtin/index-pack.c +#: builtin/index-pack.c:1654 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "無法開啟現有包檔案 '%s'" -#: builtin/index-pack.c +#: builtin/index-pack.c:1656 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "無法為 %s 開啟包索引檔案" -#: builtin/index-pack.c +#: builtin/index-pack.c:1704 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 個物件" -#: builtin/index-pack.c +#: builtin/index-pack.c:1711 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "鏈長 = %d: %lu 物件" -#: builtin/index-pack.c +#: builtin/index-pack.c:1755 msgid "Cannot come back to cwd" msgstr "無法返回目前工作目錄" -#: builtin/index-pack.c +#: builtin/index-pack.c:1810 builtin/index-pack.c:1813 +#: builtin/index-pack.c:1833 builtin/index-pack.c:1837 #, c-format msgid "bad %s" msgstr "錯誤選項 %s" -#: builtin/index-pack.c builtin/init-db.c setup.c +#: builtin/index-pack.c:1843 builtin/init-db.c:164 setup.c:2172 #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的「%s」雜湊算法" -#: builtin/index-pack.c +#: builtin/index-pack.c:1864 msgid "--stdin requires a git repository" msgstr "--stdin 需要一個 git 版本庫" -#: builtin/index-pack.c +#: builtin/index-pack.c:1881 msgid "--verify with no packfile name given" msgstr "--verify 沒有提供 packfile 名稱參數" -#: builtin/index-pack.c builtin/unpack-objects.c +#: builtin/index-pack.c:1947 builtin/unpack-objects.c:675 msgid "fsck error in pack objects" msgstr "在打包物件中 fsck 檢查發生錯誤" -#: builtin/init-db.c +#: builtin/init-db.c:59 msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" msgstr "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" +" [--ref-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" -#: builtin/init-db.c +#: builtin/init-db.c:92 msgid "permissions" msgstr "權限" -#: builtin/init-db.c +#: builtin/init-db.c:93 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 版本庫是多個使用者之間共享的" -#: builtin/init-db.c +#: builtin/init-db.c:99 msgid "override the name of the initial branch" msgstr "覆蓋初始分支的名稱" -#: builtin/init-db.c builtin/verify-pack.c +#: builtin/init-db.c:100 builtin/verify-pack.c:75 msgid "hash" msgstr "雜湊" -#: builtin/init-db.c builtin/show-index.c builtin/verify-pack.c +#: builtin/init-db.c:101 builtin/show-index.c:25 builtin/verify-pack.c:76 msgid "specify the hash algorithm to use" msgstr "指定要使用的雜湊算法" -#: builtin/init-db.c +#: builtin/init-db.c:141 builtin/init-db.c:146 #, c-format msgid "cannot mkdir %s" msgstr "不能建立目錄 %s" -#: builtin/init-db.c +#: builtin/init-db.c:150 builtin/init-db.c:211 #, c-format msgid "cannot chdir to %s" msgstr "不能切換目錄到 %s" -#: builtin/init-db.c +#: builtin/init-db.c:183 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "不允許 %s（或 --work-tree=<目錄>）而沒有指定 %s（或 --git-dir=<目錄>）" -#: builtin/init-db.c +#: builtin/init-db.c:235 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能存取工作區 '%s'" -#: builtin/init-db.c +#: builtin/init-db.c:240 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir 與純版本庫不相容" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:17 msgid "" "git interpret-trailers [--in-place] [--trim-empty]\n" -" [(--trailer (|)[(=|:)])...]\n" +" [(--trailer (|)[(=|:)])...]\n" " [--parse] [...]" msgstr "" "git interpret-trailers [--in-place] [--trim-empty]\n" -" [(--trailer (|)[(=|:)])...]\n" +" [(--trailer (|)[(=|:)])...]\n" " [--parse] [...]" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:105 wrapper.c:728 +#, c-format +msgid "could not stat %s" +msgstr "不能對 %s 呼叫 stat" + +#: builtin/interpret-trailers.c:107 +#, c-format +msgid "file %s is not a regular file" +msgstr "檔案 %s 不是一個正規檔案" + +#: builtin/interpret-trailers.c:109 +#, c-format +msgid "file %s is not writable by user" +msgstr "檔案 %s 使用者不可寫" + +#: builtin/interpret-trailers.c:121 +msgid "could not open temporary file" +msgstr "不能開啟暫存檔" + +#: builtin/interpret-trailers.c:130 +#, c-format +msgid "could not read input file '%s'" +msgstr "不能讀取輸入檔案 '%s'" + +#: builtin/interpret-trailers.c:133 builtin/mktag.c:92 imap-send.c:1541 +msgid "could not read from stdin" +msgstr "不能自標準輸入讀取" + +#: builtin/interpret-trailers.c:186 +#, c-format +msgid "could not rename temporary file to %s" +msgstr "不能重新命名暫存檔為 %s" + +#: builtin/interpret-trailers.c:197 msgid "edit files in place" msgstr "在原位編輯檔案" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:198 msgid "trim empty trailers" msgstr "刪除空的尾部署名" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:200 msgid "placement" msgstr "placement" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:201 msgid "where to place the new trailer" msgstr "在哪裡放置新的尾部署名" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:203 msgid "action if trailer already exists" msgstr "當尾部署名已經存在時所採取的動作" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:205 msgid "action if trailer is missing" msgstr "當尾部署名缺少時所採取的動作" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:207 msgid "output only the trailers" msgstr "只輸出尾部署名" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:208 msgid "do not apply trailer.* configuration variables" msgstr "不套用 trailer.* 組態變數" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:209 msgid "reformat multiline trailer values as single-line values" msgstr "將多列尾注值 (trailer values) 重新格式化為單列值" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:210 msgid "alias for --only-trailers --only-input --unfold" msgstr "--only-trailers --only-input --unfold 的別名" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:212 msgid "do not treat \"---\" as the end of input" msgstr "不要把 “---” 當作輸入結尾" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:214 msgid "trailer(s) to add" msgstr "要新增的尾部署名" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:225 msgid "--trailer with --only-input does not make sense" msgstr "--trailer 和 --only-input 同時使用沒有意義" -#: builtin/interpret-trailers.c +#: builtin/interpret-trailers.c:235 msgid "no input file given for in-place editing" msgstr "沒有給出要原位編輯的檔案" -#: builtin/log.c +#: builtin/log.c:70 msgid "git log [] [] [[--] ...]" msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]" -#: builtin/log.c +#: builtin/log.c:71 msgid "git show [] ..." msgstr "git show [<選項>] <物件>..." -#: builtin/log.c +#: builtin/log.c:141 #, c-format msgid "invalid --decorate option: %s" msgstr "無效的 --decorate 選項：%s" -#: builtin/log.c diff.c +#: builtin/log.c:249 diff.c:5577 msgid "suppress diff output" msgstr "不顯示差異輸出" -#: builtin/log.c +#: builtin/log.c:250 msgid "show source" msgstr "顯示來源" -#: builtin/log.c +#: builtin/log.c:254 msgid "clear all previously-defined decoration filters" msgstr "清除所有先前定義的裝飾過濾器" -#: builtin/log.c +#: builtin/log.c:258 msgid "only decorate refs that match " msgstr "只修飾與 <模式> 符合的引用" -#: builtin/log.c +#: builtin/log.c:260 msgid "do not decorate refs that match " msgstr "不修飾和 <模式> 符合的引用" -#: builtin/log.c +#: builtin/log.c:261 msgid "decorate options" msgstr "修飾選項" -#: builtin/log.c +#: builtin/log.c:264 msgid "" "trace the evolution of line range , or function : in " "" msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱> 的變化史" -#: builtin/log.c builtin/shortlog.c bundle.c +#: builtin/log.c:284 builtin/log.c:2116 builtin/replay.c:333 +#: builtin/shortlog.c:439 bundle.c:528 #, c-format msgid "unrecognized argument: %s" -msgstr "無法識別的參數：%s" +msgstr "無法識別的引數：%s" -#: builtin/log.c +#: builtin/log.c:287 msgid "-L: cannot be used with pathspec" msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用" -#: builtin/log.c +#: builtin/log.c:393 #, c-format msgid "Final output: %d %s\n" msgstr "最終輸出：%d %s\n" -#: builtin/log.c +#: builtin/log.c:500 msgid "unable to create temporary object directory" msgstr "無法建立暫存物件目錄" -#: builtin/log.c +#: builtin/log.c:680 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 損壞的檔案" -#: builtin/log.c +#: builtin/log.c:695 builtin/log.c:791 #, c-format msgid "could not read object %s" msgstr "不能讀取物件 %s" -#: builtin/log.c +#: builtin/log.c:829 #, c-format msgid "unknown type: %d" msgstr "未知類型：%d" -#: builtin/log.c +#: builtin/log.c:980 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：從描述產生附函的模式無效" -#: builtin/log.c +#: builtin/log.c:988 msgid "format.headers without value" msgstr "format.headers 沒有值" -#: builtin/log.c +#: builtin/log.c:1140 #, c-format msgid "cannot open patch file %s" msgstr "無法開啟修補檔案 %s" -#: builtin/log.c +#: builtin/log.c:1157 msgid "need exactly one range" msgstr "只需要一個範圍" -#: builtin/log.c +#: builtin/log.c:1167 msgid "not a range" msgstr "不是一個範圍" -#: builtin/log.c +#: builtin/log.c:1262 #, c-format msgid "unable to read branch description file '%s'" msgstr "無法讀取分支描述檔 “%s”" -#: builtin/log.c +#: builtin/log.c:1343 msgid "cover letter needs email format" msgstr "附函需要信件位址格式" -#: builtin/log.c +#: builtin/log.c:1349 msgid "failed to create cover-letter file" msgstr "無法建立附函檔案" -#: builtin/log.c +#: builtin/log.c:1440 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c +#: builtin/log.c:1467 msgid "git format-patch [] [ | ]" msgstr "git format-patch [<選項>] [<從> | <版本範圍>]" -#: builtin/log.c +#: builtin/log.c:1522 msgid "two output directories?" msgstr "兩個輸出目錄？" -#: builtin/log.c +#: builtin/log.c:1656 builtin/log.c:2515 builtin/log.c:2517 builtin/log.c:2529 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c builtin/replace.c +#: builtin/log.c:1667 builtin/replace.c:66 builtin/replace.c:218 +#: builtin/replace.c:221 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "無法將 '%s' 解析為一個有效引用" -#: builtin/log.c +#: builtin/log.c:1679 msgid "could not find exact merge base" msgstr "不能找到準確的合併基礎" -#: builtin/log.c +#: builtin/log.c:1689 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -9230,434 +9408,420 @@ msgstr "" "git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n" "參數 --base=<基礎提交> 手動指定一個基礎提交" -#: builtin/log.c +#: builtin/log.c:1714 msgid "failed to find exact merge base" msgstr "無法找到準確的合併基礎" -#: builtin/log.c +#: builtin/log.c:1734 msgid "base commit should be the ancestor of revision list" msgstr "基礎提交應該是版本列表的祖先" -#: builtin/log.c +#: builtin/log.c:1744 msgid "base commit shouldn't be in revision list" msgstr "基礎提交不應該出現在版本列表中" -#: builtin/log.c +#: builtin/log.c:1802 msgid "cannot get patch id" msgstr "無法得到修補檔 id" -#: builtin/log.c +#: builtin/log.c:1865 msgid "failed to infer range-diff origin of current series" msgstr "無法推斷目前系列的 range-diff 起點" -#: builtin/log.c +#: builtin/log.c:1867 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "將 '%s' 當作目前系列的 range-diff 起點" -#: builtin/log.c +#: builtin/log.c:1915 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一個修補檔" -#: builtin/log.c +#: builtin/log.c:1918 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多個修補檔" -#: builtin/log.c +#: builtin/log.c:1922 msgid "print patches to standard out" msgstr "列印修補檔到標準輸出" -#: builtin/log.c +#: builtin/log.c:1924 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c +#: builtin/log.c:1926 msgid "use simple number sequence for output file names" msgstr "使用簡單的數字序列作為輸出檔案名" -#: builtin/log.c +#: builtin/log.c:1927 msgid "sfx" msgstr "後綴" -#: builtin/log.c +#: builtin/log.c:1928 msgid "use instead of '.patch'" msgstr "使用 <後綴> 代替 '.patch'" -#: builtin/log.c +#: builtin/log.c:1930 msgid "start numbering patches at instead of 1" msgstr "修補檔以 開始編號，而不是1" -#: builtin/log.c +#: builtin/log.c:1931 msgid "reroll-count" msgstr "reroll-count" -#: builtin/log.c +#: builtin/log.c:1932 msgid "mark the series as Nth re-roll" msgstr "標記修補檔系列是第幾次重製" -#: builtin/log.c +#: builtin/log.c:1934 msgid "max length of output filename" msgstr "輸出檔名的最大長度" -#: builtin/log.c +#: builtin/log.c:1935 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c +#: builtin/log.c:1937 msgid "cover-from-description-mode" msgstr "從描述產生附函的模式" -#: builtin/log.c +#: builtin/log.c:1938 msgid "generate parts of a cover letter based on a branch's description" msgstr "基於分支描述產生部分附函" -#: builtin/log.c +#: builtin/log.c:1940 msgid "use branch description from file" msgstr "從檔案讀取分支描述並使用" -#: builtin/log.c +#: builtin/log.c:1942 msgid "use [] instead of [PATCH]" msgstr "使用 [<前綴>] 代替 [PATCH]" -#: builtin/log.c +#: builtin/log.c:1945 msgid "store resulting files in " msgstr "把結果檔案儲存在 <目錄>" -#: builtin/log.c +#: builtin/log.c:1948 msgid "don't strip/add [PATCH]" msgstr "不刪除/新增 [PATCH]" -#: builtin/log.c +#: builtin/log.c:1951 msgid "don't output binary diffs" msgstr "不輸出二進位差異" -#: builtin/log.c +#: builtin/log.c:1953 msgid "output all-zero hash in From header" msgstr "在 From 標頭訊息中輸出全為零的雜湊值" -#: builtin/log.c +#: builtin/log.c:1955 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的修補檔" -#: builtin/log.c +#: builtin/log.c:1957 msgid "show patch format instead of default (patch + stat)" msgstr "顯示純修補檔格式而非預設值（修補檔+狀態）" -#: builtin/log.c +#: builtin/log.c:1959 msgid "Messaging" msgstr "信件傳送" -#: builtin/log.c +#: builtin/log.c:1960 msgid "header" msgstr "header" -#: builtin/log.c +#: builtin/log.c:1961 msgid "add email header" msgstr "新增信件頭" -#: builtin/log.c +#: builtin/log.c:1962 builtin/log.c:1963 msgid "email" msgstr "信箱" -#: builtin/log.c +#: builtin/log.c:1962 msgid "add To: header" msgstr "新增收件人" -#: builtin/log.c +#: builtin/log.c:1963 msgid "add Cc: header" msgstr "新增抄送" -#: builtin/log.c +#: builtin/log.c:1964 msgid "ident" msgstr "標記" -#: builtin/log.c +#: builtin/log.c:1965 msgid "set From address to (or committer ident if absent)" msgstr "將 From 位址設定為 <標記>（如若不提供，則用提交者 ID 做為位址）" -#: builtin/log.c +#: builtin/log.c:1967 msgid "message-id" msgstr "信件標記" -#: builtin/log.c +#: builtin/log.c:1968 msgid "make first mail a reply to " msgstr "使第一封信件作為對 <信件標記> 的回覆" -#: builtin/log.c +#: builtin/log.c:1969 builtin/log.c:1972 msgid "boundary" msgstr "邊界" -#: builtin/log.c +#: builtin/log.c:1970 msgid "attach the patch" msgstr "附件方式新增修補檔" -#: builtin/log.c +#: builtin/log.c:1973 msgid "inline the patch" msgstr "內聯顯示修補檔" -#: builtin/log.c +#: builtin/log.c:1977 msgid "enable message threading, styles: shallow, deep" msgstr "啟用信件線索，風格：淺，深" -#: builtin/log.c +#: builtin/log.c:1979 msgid "signature" msgstr "簽名" -#: builtin/log.c +#: builtin/log.c:1980 msgid "add a signature" msgstr "新增一個簽名" -#: builtin/log.c +#: builtin/log.c:1981 msgid "base-commit" msgstr "基礎提交" -#: builtin/log.c +#: builtin/log.c:1982 msgid "add prerequisite tree info to the patch series" msgstr "為修補檔列表新增前置樹訊息" -#: builtin/log.c +#: builtin/log.c:1985 msgid "add a signature from a file" msgstr "從檔案新增一個簽名" -#: builtin/log.c +#: builtin/log.c:1986 msgid "don't print the patch filenames" msgstr "不要列印修補檔檔案名" -#: builtin/log.c +#: builtin/log.c:1988 msgid "show progress while generating patches" msgstr "在生成修補檔時顯示進度" -#: builtin/log.c +#: builtin/log.c:1990 msgid "show changes against in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 的差異" -#: builtin/log.c +#: builtin/log.c:1993 msgid "show changes against in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 的差異" -#: builtin/log.c builtin/range-diff.c +#: builtin/log.c:1995 builtin/range-diff.c:29 msgid "percentage by which creation is weighted" msgstr "建立權重的百分比" -#: builtin/log.c +#: builtin/log.c:1997 msgid "show in-body From: even if identical to the e-mail header" msgstr "顯示內文中的 From：即便和信件標頭的值相同" -#: builtin/log.c +#: builtin/log.c:2094 #, c-format msgid "invalid ident line: %s" msgstr "包含無效的身份標記：%s" -#: builtin/log.c +#: builtin/log.c:2119 msgid "--name-only does not make sense" msgstr "--name-only 無意義" -#: builtin/log.c +#: builtin/log.c:2121 msgid "--name-status does not make sense" msgstr "--name-status 無意義" -#: builtin/log.c +#: builtin/log.c:2123 msgid "--check does not make sense" msgstr "--check 無意義" -#: builtin/log.c +#: builtin/log.c:2125 msgid "--remerge-diff does not make sense" msgstr "--remerge-diff 無意義" -#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c +#: builtin/log.c:2181 builtin/submodule--helper.c:1685 +#: builtin/submodule--helper.c:1735 rerere.c:876 submodule.c:2295 #, c-format msgid "could not create directory '%s'" msgstr "不能建立目錄 '%s'" -#: builtin/log.c +#: builtin/log.c:2268 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c +#: builtin/log.c:2272 msgid "Interdiff:" msgstr "版本間差異：" -#: builtin/log.c +#: builtin/log.c:2273 #, c-format msgid "Interdiff against v%d:" msgstr "對 v%d 的版本差異：" -#: builtin/log.c +#: builtin/log.c:2283 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c +#: builtin/log.c:2291 msgid "Range-diff:" msgstr "範圍差異：" -#: builtin/log.c +#: builtin/log.c:2292 #, c-format msgid "Range-diff against v%d:" msgstr "對 v%d 的範圍差異：" -#: builtin/log.c +#: builtin/log.c:2303 #, c-format msgid "unable to read signature file '%s'" msgstr "無法讀取簽名檔案 '%s'" -#: builtin/log.c +#: builtin/log.c:2341 msgid "Generating patches" msgstr "生成修補檔" -#: builtin/log.c +#: builtin/log.c:2385 msgid "failed to create output files" msgstr "無法建立輸出檔案" -#: builtin/log.c +#: builtin/log.c:2450 msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]" -#: builtin/log.c +#: builtin/log.c:2504 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n" -#: builtin/ls-files.c builtin/ls-tree.c +#: builtin/ls-files.c:251 builtin/ls-tree.c:29 #, c-format msgid "could not get object info about '%s'" msgstr "無法取得「%s」相關的物件資訊" -#: builtin/ls-files.c -#, c-format -msgid "bad ls-files format: element '%s' does not start with '('" -msgstr "ls-files 格式錯誤：“%s” 元素不以 “(” 開頭" - -#: builtin/ls-files.c -#, c-format -msgid "bad ls-files format: element '%s' does not end in ')'" -msgstr "ls-files 格式錯誤：“%s” 元素不以 “)” 結尾" - -#: builtin/ls-files.c -#, c-format -msgid "bad ls-files format: %%%.*s" -msgstr "ls-files 格式錯誤：%%%.*s" - -#: builtin/ls-files.c +#: builtin/ls-files.c:520 msgid "git ls-files [] [...]" msgstr "git ls-files [<選項>] [<檔案>...]" -#: builtin/ls-files.c builtin/merge-tree.c +#: builtin/ls-files.c:574 builtin/merge-tree.c:551 msgid "separate paths with the NUL character" msgstr "用 NUL 字元分隔路徑" -#: builtin/ls-files.c +#: builtin/ls-files.c:576 msgid "identify the file status with tags" msgstr "用標籤標記檔案的狀態" -#: builtin/ls-files.c +#: builtin/ls-files.c:578 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小寫字母表示 '假設未改變的' 檔案" -#: builtin/ls-files.c +#: builtin/ls-files.c:580 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "使用小寫字母表示 'fsmonitor clean' 檔案" -#: builtin/ls-files.c +#: builtin/ls-files.c:582 msgid "show cached files in the output (default)" msgstr "顯示快取的檔案（預設值）" -#: builtin/ls-files.c +#: builtin/ls-files.c:584 msgid "show deleted files in the output" msgstr "顯示已刪除的檔案" -#: builtin/ls-files.c +#: builtin/ls-files.c:586 msgid "show modified files in the output" msgstr "顯示已修改的檔案" -#: builtin/ls-files.c +#: builtin/ls-files.c:588 msgid "show other files in the output" msgstr "顯示其它檔案" -#: builtin/ls-files.c +#: builtin/ls-files.c:590 msgid "show ignored files in the output" msgstr "顯示忽略的檔案" -#: builtin/ls-files.c +#: builtin/ls-files.c:593 msgid "show staged contents' object name in the output" msgstr "顯示暫存區內容的物件名稱" -#: builtin/ls-files.c +#: builtin/ls-files.c:595 msgid "show files on the filesystem that need to be removed" msgstr "顯示檔案系統需要刪除的檔案" -#: builtin/ls-files.c +#: builtin/ls-files.c:597 msgid "show 'other' directories' names only" msgstr "只顯示「其他」目錄的名稱" -#: builtin/ls-files.c +#: builtin/ls-files.c:599 msgid "show line endings of files" msgstr "顯示檔案換行符號格式" -#: builtin/ls-files.c +#: builtin/ls-files.c:601 msgid "don't show empty directories" msgstr "不顯示空目錄" -#: builtin/ls-files.c +#: builtin/ls-files.c:604 msgid "show unmerged files in the output" msgstr "顯示未合併的檔案" -#: builtin/ls-files.c +#: builtin/ls-files.c:606 msgid "show resolve-undo information" msgstr "顯示 resolve-undo 訊息" -#: builtin/ls-files.c +#: builtin/ls-files.c:608 msgid "skip files matching pattern" msgstr "符合排除檔案的模式" -#: builtin/ls-files.c +#: builtin/ls-files.c:611 msgid "read exclude patterns from " msgstr "從 <檔案> 讀取排除模式 (pattern)" -#: builtin/ls-files.c +#: builtin/ls-files.c:614 msgid "read additional per-directory exclude patterns in " msgstr "從 <檔案> 讀取額外的每個目錄的排除模式" -#: builtin/ls-files.c +#: builtin/ls-files.c:616 msgid "add the standard git exclusions" msgstr "新增標準的 git 排除" -#: builtin/ls-files.c +#: builtin/ls-files.c:620 msgid "make the output relative to the project top directory" msgstr "顯示相對於頂級目錄的檔案名" -#: builtin/ls-files.c +#: builtin/ls-files.c:625 msgid "if any is not in the index, treat this as an error" msgstr "如果任何 <檔案> 都不在索引區，視為錯誤" -#: builtin/ls-files.c +#: builtin/ls-files.c:626 builtin/merge-tree.c:566 msgid "tree-ish" msgstr "樹或提交" -#: builtin/ls-files.c +#: builtin/ls-files.c:627 msgid "pretend that paths removed since are still present" msgstr "假裝自從 <樹或提交> 之後刪除的路徑仍然存在" -#: builtin/ls-files.c +#: builtin/ls-files.c:629 msgid "show debugging data" msgstr "顯示除錯資料" -#: builtin/ls-files.c +#: builtin/ls-files.c:631 msgid "suppress duplicate entries" msgstr "不顯示重複項目" -#: builtin/ls-files.c +#: builtin/ls-files.c:633 msgid "show sparse directories in the presence of a sparse index" msgstr "在稀疏索引存在時顯示稀疏目錄" -#: builtin/ls-files.c +#: builtin/ls-files.c:664 msgid "" "--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " "--eol" msgstr "" "--format 不能和 -s、-o、-k、-t、--resolve-undo、--deduplicate、--eol 一起使用" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:12 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=]\n" @@ -9667,200 +9831,185 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url] [--sort=]\n" " [--symref] [ [...]]" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:64 msgid "do not print remote URL" msgstr "不列印遠端 URL" -#: builtin/ls-remote.c builtin/rebase.c +#: builtin/ls-remote.c:65 builtin/ls-remote.c:67 builtin/rebase.c:1151 msgid "exec" msgstr "exec" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:66 builtin/ls-remote.c:68 msgid "path of git-upload-pack on the remote host" msgstr "遠端主機上的 git-upload-pack 路徑" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:70 msgid "limit to tags" msgstr "僅限於標籤" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:71 msgid "limit to heads" msgstr "僅限於分支" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:72 msgid "do not show peeled tags" msgstr "不顯示已解析的標籤" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:74 msgid "take url..insteadOf into account" msgstr "參考 url..insteadOf 設定" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:77 msgid "exit with exit code 2 if no matching refs are found" msgstr "若未找到符合的引用則以離開碼2離開" -#: builtin/ls-remote.c +#: builtin/ls-remote.c:80 msgid "show underlying ref in addition to the object pointed by it" msgstr "除了顯示指向的物件外，顯示指向的引用名" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:19 msgid "git ls-tree [] [...]" msgstr "git ls-tree [<選項>] <樹或提交> [<路徑>...]" -#: builtin/ls-tree.c -#, c-format -msgid "bad ls-tree format: element '%s' does not start with '('" -msgstr "無效的 ls-tree 格式：「%s」元素的開頭不是「(」" - -#: builtin/ls-tree.c -#, c-format -msgid "bad ls-tree format: element '%s' does not end in ')'" -msgstr "無效的 ls-tree 格式：「%s」元素的結尾不是「)」" - -#: builtin/ls-tree.c -#, c-format -msgid "bad ls-tree format: %%%.*s" -msgstr "無效的 ls-tree 格式：%%%.*s" - -#: builtin/ls-tree.c +#: builtin/ls-tree.c:343 msgid "only show trees" msgstr "只顯示樹" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:345 msgid "recurse into subtrees" msgstr "遞迴到子樹" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:347 msgid "show trees when recursing" msgstr "當遞迴時顯示樹" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:350 msgid "terminate entries with NUL byte" msgstr "條目以 NUL 字元終止" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:351 msgid "include object size" msgstr "包括物件大小" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:353 builtin/ls-tree.c:355 msgid "list only filenames" msgstr "只列出檔案名" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:357 msgid "list only objects" msgstr "只列出物件" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:359 msgid "use full path names" msgstr "使用檔案的全路徑" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:361 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "列出整個樹；不僅僅目前目錄（隱含 --full-name）" -#: builtin/ls-tree.c +#: builtin/ls-tree.c:398 msgid "--format can't be combined with other format-altering options" msgstr "--format 不能與其他修改格式的選項結合使用" #. TRANSLATORS: keep <> in "<" mail ">" info. -#: builtin/mailinfo.c +#: builtin/mailinfo.c:15 msgid "git mailinfo [] < mail >info" msgstr "git mailinfo [<選項>] <訊息> <修補檔> < mail >info" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:59 msgid "keep subject" msgstr "保留主旨" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:61 msgid "keep non patch brackets in subject" msgstr "保留主旨中不是 PATCH 的方括號" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:63 msgid "copy Message-ID to the end of commit message" msgstr "複製 Message-ID 至提交說明末尾" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:65 msgid "re-code metadata to i18n.commitEncoding" msgstr "重新將中介資料編碼為 i18n.commitEncoding 的設定值" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:68 msgid "disable charset re-coding of metadata" msgstr "停用中介資料的字元重新編碼功能" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:70 msgid "encoding" msgstr "編碼" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:71 msgid "re-code metadata to this encoding" msgstr "重新將中介資料編碼為這個編碼方式" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:73 msgid "use scissors" msgstr "使用剪刀標記" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:74 msgid "" msgstr "<動作>" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:75 msgid "action when quoted CR is found" msgstr "當找到可列印 CR 字元時所要採取的行為" -#: builtin/mailinfo.c +#: builtin/mailinfo.c:78 msgid "use headers in message's body" msgstr "在訊息內文中使用標頭" -#: builtin/mailsplit.c +#: builtin/mailsplit.c:227 msgid "reading patches from stdin/tty..." msgstr "正在從標準輸入或 tty 讀取修補檔內容……" -#: builtin/mailsplit.c +#: builtin/mailsplit.c:242 #, c-format msgid "empty mbox: '%s'" msgstr "空的 mbox：'%s'" -#: builtin/merge-base.c +#: builtin/merge-base.c:35 msgid "git merge-base [-a | --all] ..." msgstr "git merge-base [-a | --all] <提交> <提交>..." -#: builtin/merge-base.c +#: builtin/merge-base.c:36 msgid "git merge-base [-a | --all] --octopus ..." msgstr "git merge-base [-a | --all] --octopus <提交>..." -#: builtin/merge-base.c +#: builtin/merge-base.c:37 msgid "git merge-base --is-ancestor " msgstr "git merge-base --is-ancestor <提交> <提交>" -#: builtin/merge-base.c +#: builtin/merge-base.c:38 msgid "git merge-base --independent ..." msgstr "git merge-base --independent <提交>..." -#: builtin/merge-base.c +#: builtin/merge-base.c:39 msgid "git merge-base --fork-point []" msgstr "git merge-base --fork-point <引用> [<提交>]" -#: builtin/merge-base.c +#: builtin/merge-base.c:155 msgid "output all common ancestors" msgstr "輸出所有共同的祖先" -#: builtin/merge-base.c +#: builtin/merge-base.c:157 msgid "find ancestors for a single n-way merge" msgstr "尋找一個多路合併的祖先提交" -#: builtin/merge-base.c +#: builtin/merge-base.c:159 msgid "list revs not reachable from others" msgstr "顯示不能被其他存取到的版本" -#: builtin/merge-base.c +#: builtin/merge-base.c:161 msgid "is the first one ancestor of the other?" msgstr "第一個是其他的祖先提交嗎？" -#: builtin/merge-base.c +#: builtin/merge-base.c:163 msgid "find where forked from reflog of " msgstr "根據 <引用> 的引用日誌尋找 <提交> 的衍生處" -#: builtin/merge-file.c +#: builtin/merge-file.c:15 msgid "" "git merge-file [] [-L [-L [-L ]]] " " " @@ -9868,336 +10017,352 @@ msgstr "" "git merge-file [<選項>] [-L <檔案1> [-L <初始> [-L <名字2>]]] <檔案1> <初始文" "件> <檔案2>" -#: builtin/merge-file.c +#: builtin/merge-file.c:50 diff.c:5238 +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" + +#: builtin/merge-file.c:65 msgid "send results to standard output" msgstr "將結果傳送到標準輸出" -#: builtin/merge-file.c +#: builtin/merge-file.c:66 msgid "use object IDs instead of filenames" msgstr "使用物件 ID 取代檔名" -#: builtin/merge-file.c +#: builtin/merge-file.c:67 msgid "use a diff3 based merge" msgstr "使用基於 diff3 的合併" -#: builtin/merge-file.c +#: builtin/merge-file.c:68 msgid "use a zealous diff3 based merge" msgstr "使用基於 zealous diff3 的合併" -#: builtin/merge-file.c +#: builtin/merge-file.c:70 msgid "for conflicts, use our version" msgstr "如果衝突，使用我們的版本" -#: builtin/merge-file.c +#: builtin/merge-file.c:72 msgid "for conflicts, use their version" msgstr "如果衝突，使用他們的版本" -#: builtin/merge-file.c +#: builtin/merge-file.c:74 msgid "for conflicts, use a union version" msgstr "如果衝突，使用聯合版本" -#: builtin/merge-file.c +#: builtin/merge-file.c:76 diff.c:5756 +msgid "" +msgstr "<演算法>" + +#: builtin/merge-file.c:77 diff.c:5757 +msgid "choose a diff algorithm" +msgstr "選擇一個差異演算法" + +#: builtin/merge-file.c:80 msgid "for conflicts, use this marker size" msgstr "如果衝突，使用指定長度的標記" -#: builtin/merge-file.c +#: builtin/merge-file.c:81 msgid "do not warn about conflicts" msgstr "不要警告衝突" -#: builtin/merge-file.c +#: builtin/merge-file.c:83 msgid "set labels for file1/orig-file/file2" msgstr "為 檔案1/初始檔案/檔案2 設定標籤" -#: builtin/merge-file.c +#: builtin/merge-file.c:121 #, c-format msgid "object '%s' does not exist" msgstr "物件 “%s” 不存在" -#: builtin/merge-file.c +#: builtin/merge-file.c:152 msgid "Could not write object file" msgstr "無法寫入物件檔案" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c:48 #, c-format msgid "unknown option %s" msgstr "未知選項 %s" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c:54 #, c-format msgid "could not parse object '%s'" msgstr "不能解析物件 '%s'" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c:58 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "無法處理 %d 條以上的基礎。忽略 %s。" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c:66 msgid "not handling anything other than two heads merge." msgstr "不能處理兩個頭合併之外的任何動作。" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c:75 builtin/merge-recursive.c:77 #, c-format msgid "could not resolve ref '%s'" msgstr "無法解析引用 '%s'" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c:83 #, c-format msgid "Merging %s with %s\n" msgstr "合併 %s 和 %s\n" -#: builtin/merge-tree.c builtin/merge.c +#: builtin/merge-tree.c:447 builtin/merge-tree.c:452 builtin/merge-tree.c:457 +#, c-format +msgid "could not parse as tree '%s'" +msgstr "無法解析為樹狀物件「%s」" + +#: builtin/merge-tree.c:468 builtin/merge-tree.c:473 builtin/merge.c:1208 msgid "not something we can merge" msgstr "不能合併" -#: builtin/merge-tree.c builtin/merge.c +#: builtin/merge-tree.c:483 builtin/merge.c:1540 msgid "refusing to merge unrelated histories" msgstr "拒絕合併無關的歷史" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:489 msgid "failure to merge" msgstr "合併時發生錯誤" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:538 msgid "git merge-tree [--write-tree] [] " msgstr "git merge-tree [--write-tree] [] " -#: builtin/merge-tree.c +#: builtin/merge-tree.c:539 msgid "git merge-tree [--trivial-merge] " msgstr "git merge-tree [--trivial-merge] " -#: builtin/merge-tree.c +#: builtin/merge-tree.c:544 msgid "do a real merge instead of a trivial merge" msgstr "執行真實合併，而非簡易合併" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:547 msgid "do a trivial merge only" msgstr "只執行簡易合併" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:549 msgid "also show informational/conflict messages" msgstr "亦顯示資訊性或衝突訊息" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:554 msgid "list filenames without modes/oids/stages" msgstr "列出檔名，但不附加 modes/oids/stages" -#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +#: builtin/merge-tree.c:558 builtin/merge.c:282 builtin/pull.c:186 msgid "allow merging unrelated histories" msgstr "允許合並不相關的歷史" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:562 msgid "perform multiple merges, one per line of input" msgstr "執行多次合併，一次執行輸入一列" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:567 msgid "specify a merge-base for the merge" msgstr "指定用來合併的合併基底" -#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +#: builtin/merge-tree.c:568 builtin/merge.c:264 builtin/pull.c:178 msgid "option=value" msgstr "option=value" -#: builtin/merge-tree.c builtin/merge.c builtin/pull.c +#: builtin/merge-tree.c:569 builtin/merge.c:265 builtin/pull.c:179 msgid "option for selected merge strategy" msgstr "所選的合併策略的選項" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:582 builtin/merge-tree.c:592 builtin/merge-tree.c:658 msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge 和其他所有選項都不相容" -#: builtin/merge-tree.c builtin/merge.c +#: builtin/merge-tree.c:585 builtin/merge.c:728 #, c-format msgid "unknown strategy option: -X%s" msgstr "未知的策略選項：-X%s" -#: builtin/merge-tree.c -msgid "--merge-base is incompatible with --stdin" -msgstr "--merge-base 與 --stdin 不相容" - -#: builtin/merge-tree.c builtin/notes.c +#: builtin/merge-tree.c:604 builtin/merge-tree.c:620 builtin/notes.c:383 #, c-format msgid "malformed input line: '%s'." msgstr "格式錯誤的輸入行：'%s'。" -#: builtin/merge-tree.c +#: builtin/merge-tree.c:624 #, c-format msgid "merging cannot continue; got unclean result of %d" msgstr "無法繼續合併：從 %d 收到的結果不乾淨" -#: builtin/merge.c +#: builtin/merge.c:63 msgid "git merge [] [...]" msgstr "git merge [<選項>] [<提交>...]" -#: builtin/merge.c +#: builtin/merge.c:128 msgid "switch `m' requires a value" msgstr "開關 `m' 需要一個值" -#: builtin/merge.c +#: builtin/merge.c:151 #, c-format msgid "option `%s' requires a value" msgstr "選項 `%s' 需要一個值" -#: builtin/merge.c +#: builtin/merge.c:203 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合併策略 '%s'。\n" -#: builtin/merge.c +#: builtin/merge.c:204 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c +#: builtin/merge.c:209 #, c-format msgid "Available custom strategies are:" msgstr "可用的自訂策略有：" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:241 builtin/pull.c:136 msgid "do not show a diffstat at the end of the merge" msgstr "在合併的最後不顯示差異統計" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:243 builtin/pull.c:139 msgid "show a diffstat at the end of the merge" msgstr "在合併的最後顯示差異統計" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:244 builtin/pull.c:142 msgid "(synonym to --stat)" msgstr "（和 --stat 同義）" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:246 builtin/pull.c:145 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "在合併提交說明中新增（最多 條）精簡提交記錄" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:249 builtin/pull.c:151 msgid "create a single commit instead of doing a merge" msgstr "建立一個單獨的提交而不是做一次合併" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:251 builtin/pull.c:154 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合併成功，執行一次提交（預設值）" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:253 builtin/pull.c:157 msgid "edit message before committing" msgstr "在提交前編輯提交說明" -#: builtin/merge.c +#: builtin/merge.c:255 msgid "allow fast-forward (default)" msgstr "允許快轉（預設值）" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:257 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "如果不能快轉就放棄合併" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:261 builtin/pull.c:170 msgid "verify that the named commit has a valid GPG signature" msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名" -#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c -#: builtin/revert.c +#: builtin/merge.c:262 builtin/notes.c:888 builtin/pull.c:174 +#: builtin/rebase.c:1164 builtin/revert.c:128 msgid "strategy" msgstr "策略" -#: builtin/merge.c builtin/pull.c +#: builtin/merge.c:263 builtin/pull.c:175 msgid "merge strategy to use" msgstr "要使用的合併策略" -#: builtin/merge.c +#: builtin/merge.c:267 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合併的提交說明（針對非快轉式合併）" -#: builtin/merge.c +#: builtin/merge.c:273 msgid "use instead of the real target" msgstr "使用 <名稱> 而非實際目的地" -#: builtin/merge.c +#: builtin/merge.c:276 msgid "abort the current in-progress merge" msgstr "放棄目前正在進行的合併" # -#: builtin/merge.c +#: builtin/merge.c:278 msgid "--abort but leave index and working tree alone" msgstr "--abort，但是保留索引和工作區" -#: builtin/merge.c +#: builtin/merge.c:280 msgid "continue the current in-progress merge" msgstr "繼續目前正在進行的合併" -#: builtin/merge.c +#: builtin/merge.c:289 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤" -#: builtin/merge.c +#: builtin/merge.c:313 msgid "could not run stash." msgstr "不能執行貯存。" -#: builtin/merge.c +#: builtin/merge.c:318 msgid "stash failed" msgstr "貯存失敗" -#: builtin/merge.c +#: builtin/merge.c:323 #, c-format msgid "not a valid object: %s" msgstr "不是一個有效物件：%s" -#: builtin/merge.c +#: builtin/merge.c:339 builtin/merge.c:351 msgid "read-tree failed" msgstr "讀取樹失敗" # 譯者：請維持前導空格 -#: builtin/merge.c +#: builtin/merge.c:385 msgid "Already up to date. (nothing to squash)" msgstr "已經是最新的。（無需壓縮 (squash)）" -#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c +#: builtin/merge.c:387 merge-ort-wrappers.c:37 merge-recursive.c:3538 msgid "Already up to date." msgstr "已經是最新的。" -#: builtin/merge.c +#: builtin/merge.c:399 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "壓縮提交 -- 未更新 HEAD\n" -#: builtin/merge.c +#: builtin/merge.c:450 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "無合併訊息 -- 未更新 HEAD\n" -#: builtin/merge.c +#: builtin/merge.c:499 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 沒有指向一個提交" -#: builtin/merge.c +#: builtin/merge.c:587 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c builtin/stash.c merge-recursive.c +#: builtin/merge.c:703 builtin/merge.c:902 merge-recursive.c:3896 msgid "Unable to write index." msgstr "不能寫入索引。" -#: builtin/merge.c +#: builtin/merge.c:715 msgid "Not handling anything other than two heads merge." msgstr "未處理兩個頭合併之外的任何動作。" -#: builtin/merge.c t/helper/test-fast-rebase.c +#: builtin/merge.c:750 #, c-format msgid "unable to write %s" msgstr "不能寫 %s" -#: builtin/merge.c +#: builtin/merge.c:802 #, c-format msgid "Could not read from '%s'" msgstr "不能從 '%s' 讀取" -#: builtin/merge.c +#: builtin/merge.c:811 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合並，使用 'git commit' 完成此次合併。\n" -#: builtin/merge.c +#: builtin/merge.c:817 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -10207,84 +10372,84 @@ msgstr "" "合併到主題分支。\n" "\n" -#: builtin/merge.c +#: builtin/merge.c:822 msgid "An empty message aborts the commit.\n" msgstr "空的提交說明會終止提交。\n" -#: builtin/merge.c +#: builtin/merge.c:825 #, c-format msgid "" -"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"Lines starting with '%s' will be ignored, and an empty message aborts\n" "the commit.\n" -msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交。\n" +msgstr "以「%s」開始的列將被忽略，提交說明留空則會終止提交。\n" -#: builtin/merge.c +#: builtin/merge.c:888 msgid "Empty commit message." msgstr "空提交說明。" -#: builtin/merge.c +#: builtin/merge.c:905 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c +#: builtin/merge.c:966 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n" -#: builtin/merge.c +#: builtin/merge.c:1006 msgid "No current branch." msgstr "沒有目前分支。" -#: builtin/merge.c +#: builtin/merge.c:1008 msgid "No remote for the current branch." msgstr "目前分支沒有對應的遠端版本庫。" -#: builtin/merge.c +#: builtin/merge.c:1010 msgid "No default upstream defined for the current branch." msgstr "目前分支沒有定義預設的上游分支。" -#: builtin/merge.c +#: builtin/merge.c:1015 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支" -#: builtin/merge.c +#: builtin/merge.c:1072 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'" -#: builtin/merge.c editor.c read-cache.c wrapper.c +#: builtin/merge.c:1147 editor.c:152 read-cache.c:3118 wrapper.c:685 #, c-format msgid "could not close '%s'" msgstr "不能關閉 '%s'" -#: builtin/merge.c +#: builtin/merge.c:1174 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合併：%s" -#: builtin/merge.c +#: builtin/merge.c:1322 msgid "--abort expects no arguments" msgstr "--abort 不帶參數" -#: builtin/merge.c +#: builtin/merge.c:1326 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c +#: builtin/merge.c:1344 msgid "--quit expects no arguments" msgstr "--quit 不帶參數" -#: builtin/merge.c +#: builtin/merge.c:1357 msgid "--continue expects no arguments" msgstr "--continue 不帶參數" -#: builtin/merge.c +#: builtin/merge.c:1361 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c +#: builtin/merge.c:1377 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10292,7 +10457,7 @@ msgstr "" "您尚未結束您的合併（存在 MERGE_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c +#: builtin/merge.c:1384 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10300,37 +10465,37 @@ msgstr "" "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c +#: builtin/merge.c:1387 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c +#: builtin/merge.c:1419 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交並且 merge.defaultToUpstream 未設定。" -#: builtin/merge.c +#: builtin/merge.c:1436 msgid "Squash commit into empty head not supported yet" msgstr "尚不支援到空分支的壓縮提交" -#: builtin/merge.c +#: builtin/merge.c:1438 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快轉式提交沒有意義" -#: builtin/merge.c +#: builtin/merge.c:1443 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合併" -#: builtin/merge.c +#: builtin/merge.c:1445 msgid "Can merge only exactly one commit into empty head" msgstr "只能將一個提交合並到空分支上" -#: builtin/merge.c +#: builtin/merge.c:1561 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c +#: builtin/merge.c:1610 merge-ort-wrappers.c:17 merge-recursive.c:3778 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -10339,105 +10504,101 @@ msgstr "" "您對下列檔案的本機修改將被合併動作覆蓋：\n" " %s" -#: builtin/merge.c +#: builtin/merge.c:1619 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "嘗試非常小的索引內合併...\n" -#: builtin/merge.c +#: builtin/merge.c:1626 #, c-format msgid "Nope.\n" msgstr "無。\n" -#: builtin/merge.c +#: builtin/merge.c:1689 builtin/merge.c:1757 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "將樹回滾至原始狀態...\n" -#: builtin/merge.c +#: builtin/merge.c:1693 #, c-format msgid "Trying merge strategy %s...\n" msgstr "嘗試合併策略 %s...\n" -#: builtin/merge.c +#: builtin/merge.c:1747 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "沒有合併策略處理此合併。\n" -#: builtin/merge.c +#: builtin/merge.c:1749 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合併失敗。\n" -#: builtin/merge.c +#: builtin/merge.c:1759 #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "使用 %s 策略，準備自行解決。\n" -#: builtin/merge.c +#: builtin/merge.c:1773 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自動合併進展順利，按要求在提交前停止\n" -#: builtin/merge.c +#: builtin/merge.c:1778 #, c-format msgid "When finished, apply stashed changes with `git stash pop`\n" msgstr "完成時，使用 `git stash pop` 套用貯存更改\n" -#: builtin/mktag.c +#: builtin/mktag.c:30 #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "警告：標籤輸入未通過 fsck：%s" -#: builtin/mktag.c +#: builtin/mktag.c:41 #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "錯誤：標籤輸入未通過 fsck：%s" -#: builtin/mktag.c +#: builtin/mktag.c:44 #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" msgstr "%d (FSCK_IGNORE?) 不應觸發這個回呼函式" -#: builtin/mktag.c +#: builtin/mktag.c:60 #, c-format msgid "could not read tagged object '%s'" msgstr "無法讀取有標籤的物件「%s」" -#: builtin/mktag.c +#: builtin/mktag.c:63 #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "「%s」已標為「%s」，但卻是「%s」類型" -#: builtin/mktag.c imap-send.c trailer.c -msgid "could not read from stdin" -msgstr "不能自標準輸入讀取" - -#: builtin/mktag.c +#: builtin/mktag.c:101 msgid "tag on stdin did not pass our strict fsck check" msgstr "stdin 上的標籤未通過我們的嚴格 fsck 檢查" -#: builtin/mktag.c +#: builtin/mktag.c:104 msgid "tag on stdin did not refer to a valid object" msgstr "標準輸入上的標籤指向的不是有效物件" -#: builtin/mktag.c builtin/tag.c +#: builtin/mktag.c:107 builtin/tag.c:269 msgid "unable to write tag file" msgstr "無法寫標籤檔案" -#: builtin/mktree.c +#: builtin/mktree.c:164 msgid "input is NUL terminated" msgstr "輸入以 NUL 字元終止" -#: builtin/mktree.c builtin/write-tree.c +#: builtin/mktree.c:165 builtin/write-tree.c:29 msgid "allow missing objects" msgstr "允許遺失的物件" -#: builtin/mktree.c +#: builtin/mktree.c:166 msgid "allow creation of more than one tree" msgstr "允許建立一個以上的樹" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:13 msgid "" "git multi-pack-index [] write [--preferred-pack=][--refs-" "snapshot=]" @@ -10445,205 +10606,205 @@ msgstr "" "git multi-pack-index [<選項>] write [--preferred-pack=<包>] [--refs-" "snapshot=<路徑>]" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:17 msgid "git multi-pack-index [] verify" msgstr "git multi-pack-index [<選項>] verify" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:20 msgid "git multi-pack-index [] expire" msgstr "git multi-pack-index [<選項>] expire" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:23 msgid "git multi-pack-index [] repack [--batch-size=]" msgstr "git multi-pack-index [<選項>] repack [--batch-size=<大小>]" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:73 msgid "directory" msgstr "目錄" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:74 msgid "object directory containing set of packfile and pack-index pairs" msgstr "包含成對 packfile 和包索引的物件目錄" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:125 msgid "preferred-pack" msgstr "偏好包" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:126 msgid "pack for reuse when computing a multi-pack bitmap" msgstr "計算多包位圖時要重複使用的包" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:127 msgid "write multi-pack bitmap" msgstr "寫入多包位圖" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:132 msgid "write multi-pack index containing only given indexes" msgstr "寫入只包含指定索引的多包索引" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:134 msgid "refs snapshot for selecting bitmap commits" msgstr "用來選取位圖提交的引用快照" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c:236 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中" -#: builtin/mv.c +#: builtin/mv.c:27 msgid "git mv [] ... " msgstr "git mv [<選項>] <來源>... <目的地>" -#: builtin/mv.c +#: builtin/mv.c:99 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "目錄 %s 在索引中並且不是子模組？" -#: builtin/mv.c +#: builtin/mv.c:101 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "請將您的修改暫存到 .gitmodules 中或貯存後再繼續" -#: builtin/mv.c +#: builtin/mv.c:119 #, c-format msgid "%.*s is in index" msgstr "%.*s 在索引中" -#: builtin/mv.c +#: builtin/mv.c:174 msgid "force move/rename even if target exists" msgstr "強制移動/重指令，即使目標存在" -#: builtin/mv.c +#: builtin/mv.c:176 msgid "skip move/rename errors" msgstr "略過移動/重新命名錯誤" -#: builtin/mv.c +#: builtin/mv.c:231 #, c-format msgid "destination '%s' is not a directory" msgstr "目的地「%s」不是目錄" -#: builtin/mv.c +#: builtin/mv.c:259 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "檢查 '%s' 到 '%s' 的重新命名\n" -#: builtin/mv.c +#: builtin/mv.c:276 builtin/mv.c:281 msgid "bad source" msgstr "來源損壞" -#: builtin/mv.c +#: builtin/mv.c:294 builtin/mv.c:364 msgid "destination exists" msgstr "目的地已存在" -#: builtin/mv.c +#: builtin/mv.c:302 msgid "can not move directory into itself" msgstr "不能將目錄移動到自身" -#: builtin/mv.c +#: builtin/mv.c:307 msgid "destination already exists" msgstr "目的地已存在" -#: builtin/mv.c +#: builtin/mv.c:322 msgid "source directory is empty" msgstr "來源目錄空白" -#: builtin/mv.c +#: builtin/mv.c:355 msgid "not under version control" msgstr "不在版本控制之下" -#: builtin/mv.c +#: builtin/mv.c:359 msgid "conflicted" msgstr "衝突" -#: builtin/mv.c +#: builtin/mv.c:372 builtin/mv.c:394 #, c-format msgid "overwriting '%s'" msgstr "覆蓋 '%s'" -#: builtin/mv.c +#: builtin/mv.c:375 msgid "Cannot overwrite" msgstr "不能覆蓋" -#: builtin/mv.c +#: builtin/mv.c:380 msgid "multiple sources for the same target" msgstr "同一目標具有多個來源" -#: builtin/mv.c +#: builtin/mv.c:384 msgid "destination directory does not exist" msgstr "找不到目的地目錄" -#: builtin/mv.c +#: builtin/mv.c:391 msgid "destination exists in the index" msgstr "目的地已存在索引" -#: builtin/mv.c +#: builtin/mv.c:426 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，來源=%s，目的地=%s" -#: builtin/mv.c +#: builtin/mv.c:457 #, c-format msgid "Renaming %s to %s\n" msgstr "重新命名 %s 至 %s\n" -#: builtin/mv.c builtin/remote.c +#: builtin/mv.c:465 builtin/remote.c:827 #, c-format msgid "renaming '%s' failed" msgstr "重新命名 '%s' 失敗" -#: builtin/name-rev.c +#: builtin/name-rev.c:507 msgid "git name-rev [] ..." msgstr "git name-rev [<選項>] <提交>..." -#: builtin/name-rev.c +#: builtin/name-rev.c:508 msgid "git name-rev [] --all" msgstr "git name-rev [<選項>] --all" -#: builtin/name-rev.c +#: builtin/name-rev.c:509 msgid "git name-rev [] --annotate-stdin" msgstr "git name-rev [] --annotate-stdin" -#: builtin/name-rev.c +#: builtin/name-rev.c:567 msgid "print only ref-based names (no object names)" msgstr "只輸出基於引用的名稱 (沒有物件名稱)" -#: builtin/name-rev.c +#: builtin/name-rev.c:568 msgid "only use tags to name the commits" msgstr "只使用標籤來命名提交" -#: builtin/name-rev.c +#: builtin/name-rev.c:570 msgid "only use refs matching " msgstr "只使用和 <模式> 相符合的引用" -#: builtin/name-rev.c +#: builtin/name-rev.c:572 msgid "ignore refs matching " msgstr "忽略和 <模式> 相符合的引用" -#: builtin/name-rev.c +#: builtin/name-rev.c:574 msgid "list all commits reachable from all refs" msgstr "列出可以從所有引用存取的提交" -#: builtin/name-rev.c +#: builtin/name-rev.c:578 msgid "deprecated: use --annotate-stdin instead" -msgstr "已廢棄：請改用 --annotate-stdin" +msgstr "已棄用：請改用 --annotate-stdin" -#: builtin/name-rev.c +#: builtin/name-rev.c:580 msgid "annotate text from stdin" msgstr "註解從標準輸入收到的文字" -#: builtin/name-rev.c +#: builtin/name-rev.c:581 msgid "allow to print `undefined` names (default)" msgstr "允許列印 `未定義` 的名稱（預設值）" -#: builtin/name-rev.c +#: builtin/name-rev.c:585 msgid "dereference tags in the input (internal use)" msgstr "反向解析輸入中的標籤（內部使用）" -#: builtin/notes.c +#: builtin/notes.c:34 msgid "git notes [--ref ] [list []]" msgstr "git notes [--ref <註解引用>] [list [<物件>]]" -#: builtin/notes.c +#: builtin/notes.c:35 msgid "" "git notes [--ref ] add [-f] [--allow-empty] [--[no-]separator|--" "separator=] [--[no-]stripspace] [-m | -F | (-c " @@ -10653,11 +10814,11 @@ msgstr "" "separator=] [--[no-]stripspace] [-m | -F | (-c " "| -C) ] []" -#: builtin/notes.c +#: builtin/notes.c:36 msgid "git notes [--ref ] copy [-f] " msgstr "git notes [--ref <註解引用>] copy [-f] <來源物件> <目標物件>" -#: builtin/notes.c +#: builtin/notes.c:37 msgid "" "git notes [--ref ] append [--allow-empty] [--[no-]separator|--" "separator=] [--[no-]stripspace] [-m | -F | (-c " @@ -10667,131 +10828,128 @@ msgstr "" "separator=] [--[no-]stripspace] [-m | -F | (-c " "| -C) ] []" -#: builtin/notes.c +#: builtin/notes.c:38 msgid "git notes [--ref ] edit [--allow-empty] []" msgstr "git notes [--ref <註解引用>] edit [--allow-empty] [<物件>]" -#: builtin/notes.c +#: builtin/notes.c:39 msgid "git notes [--ref ] show []" msgstr "git notes [--ref <註解引用>] show [<物件>]" -#: builtin/notes.c +#: builtin/notes.c:40 msgid "" "git notes [--ref ] merge [-v | -q] [-s ] " msgstr "git notes [--ref <註解引用>] merge [-v | -q] [-s <策略> ] <註解引用>" -#: builtin/notes.c +#: builtin/notes.c:43 msgid "git notes [--ref ] remove [...]" msgstr "git notes [--ref <註解引用>] remove [<物件>...]" -#: builtin/notes.c +#: builtin/notes.c:44 msgid "git notes [--ref ] prune [-n] [-v]" msgstr "git notes [--ref <註解引用>] prune [-n] [-v]" -#: builtin/notes.c +#: builtin/notes.c:45 msgid "git notes [--ref ] get-ref" msgstr "git notes [--ref <註解引用>] get-ref" -#: builtin/notes.c +#: builtin/notes.c:50 msgid "git notes [list []]" msgstr "git notes [list [<物件>]]" -#: builtin/notes.c +#: builtin/notes.c:55 msgid "git notes add [] []" msgstr "git notes add [<選項>] [<物件>]" -#: builtin/notes.c +#: builtin/notes.c:60 msgid "git notes copy [] " msgstr "git notes copy [<選項>] <來源物件> <目標物件>" -#: builtin/notes.c +#: builtin/notes.c:61 msgid "git notes copy --stdin [ ]..." msgstr "git notes copy --stdin [<來源物件> <目標物件>]..." -#: builtin/notes.c +#: builtin/notes.c:66 msgid "git notes append [] []" msgstr "git notes append [<選項>] [<物件>]" -#: builtin/notes.c +#: builtin/notes.c:71 msgid "git notes edit []" msgstr "git notes edit [<物件>]" -#: builtin/notes.c +#: builtin/notes.c:76 msgid "git notes show []" msgstr "git notes show [<物件>]" -#: builtin/notes.c +#: builtin/notes.c:81 msgid "git notes merge [] " msgstr "git notes merge [<選項>] <註解引用>" -#: builtin/notes.c +#: builtin/notes.c:82 msgid "git notes merge --commit []" msgstr "git notes merge --commit [<選項>]" -#: builtin/notes.c +#: builtin/notes.c:83 msgid "git notes merge --abort []" msgstr "git notes merge --abort [<選項>]" -#: builtin/notes.c +#: builtin/notes.c:88 msgid "git notes remove []" msgstr "git notes remove [<物件>]" -#: builtin/notes.c +#: builtin/notes.c:93 msgid "git notes prune []" msgstr "git notes prune [<選項>]" -#: builtin/notes.c +#: builtin/notes.c:103 msgid "Write/edit the notes for the following object:" msgstr "為下面的物件寫/編輯說明：" -#: builtin/notes.c -#, c-format -msgid "unable to start 'show' for object '%s'" -msgstr "不能為物件 '%s' 開始 'show'" - -#: builtin/notes.c +#: builtin/notes.c:181 msgid "could not read 'show' output" msgstr "不能讀取 'show' 的輸出" -#: builtin/notes.c +#: builtin/notes.c:189 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "無法為物件 '%s' 完成 'show'" -#: builtin/notes.c +#: builtin/notes.c:223 msgid "please supply the note contents using either -m or -F option" msgstr "請透過 -m 或 -F 選項為註解提供內容" -#: builtin/notes.c +#: builtin/notes.c:233 msgid "unable to write note object" msgstr "不能寫註解物件" -#: builtin/notes.c +#: builtin/notes.c:236 #, c-format msgid "the note contents have been left in %s" msgstr "註解內容被留在 %s 中" -#: builtin/notes.c builtin/tag.c +#: builtin/notes.c:300 builtin/tag.c:615 #, c-format msgid "could not open or read '%s'" msgstr "不能開啟或讀取 '%s'" -#: builtin/notes.c +#: builtin/notes.c:321 builtin/notes.c:387 builtin/notes.c:389 +#: builtin/notes.c:457 builtin/notes.c:523 builtin/notes.c:611 +#: builtin/notes.c:616 builtin/notes.c:705 builtin/notes.c:772 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "無法解析 '%s' 為一個有效引用。" -#: builtin/notes.c +#: builtin/notes.c:323 #, c-format msgid "failed to read object '%s'." msgstr "讀取物件 '%s' 失敗。" -#: builtin/notes.c +#: builtin/notes.c:328 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "不能從非資料物件 '%s' 中讀取註解資料。" -#: builtin/notes.c +#: builtin/notes.c:398 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "從 '%s' 複製註解到 '%s' 時失敗" @@ -10799,193 +10957,193 @@ msgstr "從 '%s' 複製註解到 '%s' 時失敗" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c +#: builtin/notes.c:430 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解" -#: builtin/notes.c +#: builtin/notes.c:463 builtin/notes.c:778 #, c-format msgid "no note found for object %s." msgstr "未發現物件 %s 的註解。" -#: builtin/notes.c +#: builtin/notes.c:485 builtin/notes.c:661 msgid "note contents as a string" msgstr "註解內容作為一個字串" -#: builtin/notes.c +#: builtin/notes.c:488 builtin/notes.c:664 msgid "note contents in a file" msgstr "註解內容到一個檔案中" -#: builtin/notes.c +#: builtin/notes.c:491 builtin/notes.c:667 msgid "reuse and edit specified note object" msgstr "重用和編輯指定的註解物件" -#: builtin/notes.c +#: builtin/notes.c:494 builtin/notes.c:670 msgid "reuse specified note object" msgstr "重用指定的註解物件" -#: builtin/notes.c +#: builtin/notes.c:497 builtin/notes.c:673 msgid "allow storing empty note" msgstr "允許儲存空白備註" -#: builtin/notes.c +#: builtin/notes.c:498 builtin/notes.c:581 msgid "replace existing notes" msgstr "取代已存在的註解" -#: builtin/notes.c +#: builtin/notes.c:500 builtin/notes.c:675 msgid "" msgstr "" -#: builtin/notes.c +#: builtin/notes.c:501 builtin/notes.c:676 msgid "insert between paragraphs" msgstr "在段落間插入 " -#: builtin/notes.c +#: builtin/notes.c:504 builtin/notes.c:679 msgid "remove unnecessary whitespace" msgstr "移除不必要的空白字元" -#: builtin/notes.c +#: builtin/notes.c:533 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能新增註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解" -#: builtin/notes.c +#: builtin/notes.c:548 builtin/notes.c:629 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆蓋物件 %s 現存註解\n" -#: builtin/notes.c +#: builtin/notes.c:560 builtin/notes.c:737 builtin/notes.c:1007 #, c-format msgid "Removing note for object %s\n" msgstr "刪除物件 %s 的註解\n" -#: builtin/notes.c +#: builtin/notes.c:582 msgid "read objects from stdin" msgstr "從標準輸入讀取物件" -#: builtin/notes.c +#: builtin/notes.c:584 msgid "load rewriting config for (implies --stdin)" msgstr "重新載入 <命令> 的設定（隱含 --stdin）" -#: builtin/notes.c +#: builtin/notes.c:602 msgid "too few arguments" msgstr "太少參數" -#: builtin/notes.c +#: builtin/notes.c:623 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能複製註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解" -#: builtin/notes.c +#: builtin/notes.c:635 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "來源物件 %s 缺少註解。不能複製。" -#: builtin/notes.c +#: builtin/notes.c:698 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -"子指令 'edit' 的選項 -m/-F/-c/-C 已棄用。\n" -"請換用 'git notes add -f -m/-F/-c/-C'。\n" +"子指令「edit」的選項 -m/-F/-c/-C 已棄用。\n" +"請換用「git notes add -f -m/-F/-c/-C」。\n" -#: builtin/notes.c +#: builtin/notes.c:798 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "刪除引用 NOTES_MERGE_PARTIAL 失敗" -#: builtin/notes.c +#: builtin/notes.c:800 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "刪除引用 NOTES_MERGE_REF 失敗" -#: builtin/notes.c +#: builtin/notes.c:802 msgid "failed to remove 'git notes merge' worktree" msgstr "刪除 'git notes merge' 工作區失敗" -#: builtin/notes.c +#: builtin/notes.c:822 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "讀取引用 NOTES_MERGE_PARTIAL 失敗" -#: builtin/notes.c +#: builtin/notes.c:824 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "無法從 NOTES_MERGE_PARTIAL 中找到提交。" -#: builtin/notes.c +#: builtin/notes.c:826 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "無法從 NOTES_MERGE_PARTIAL 中解析提交。" -#: builtin/notes.c +#: builtin/notes.c:839 msgid "failed to resolve NOTES_MERGE_REF" msgstr "解析 NOTES_MERGE_REF 失敗" -#: builtin/notes.c +#: builtin/notes.c:842 msgid "failed to finalize notes merge" msgstr "無法完成註解合併" -#: builtin/notes.c +#: builtin/notes.c:869 #, c-format msgid "unknown notes merge strategy %s" msgstr "未知的註解合併策略 %s" -#: builtin/notes.c +#: builtin/notes.c:885 msgid "General options" msgstr "通用選項" -#: builtin/notes.c +#: builtin/notes.c:887 msgid "Merge options" msgstr "合併選項" -#: builtin/notes.c +#: builtin/notes.c:889 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的策略解決註解衝突 (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c +#: builtin/notes.c:891 msgid "Committing unmerged notes" msgstr "提交未合併的註解" -#: builtin/notes.c +#: builtin/notes.c:893 msgid "finalize notes merge by committing unmerged notes" msgstr "透過提交未合併的註解來完成註解合併" -#: builtin/notes.c +#: builtin/notes.c:895 msgid "Aborting notes merge resolution" msgstr "中止註解合併的方案" -#: builtin/notes.c +#: builtin/notes.c:897 msgid "abort notes merge" msgstr "中止註解合併" -#: builtin/notes.c +#: builtin/notes.c:908 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "不能混用 --commit、--abort 或 -s/--strategy" -#: builtin/notes.c +#: builtin/notes.c:913 msgid "must specify a notes ref to merge" msgstr "必須指定一個註解引用來合併" -#: builtin/notes.c +#: builtin/notes.c:937 #, c-format msgid "unknown -s/--strategy: %s" msgstr "未知的 -s/--strategy：%s" -#: builtin/notes.c +#: builtin/notes.c:977 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "位於 %2$s 的一個到 %1$s 中的註解合併正在執行中" -#: builtin/notes.c +#: builtin/notes.c:981 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "無法儲存連結到目前的註解引用（%s）" -#: builtin/notes.c +#: builtin/notes.c:983 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10995,55 +11153,55 @@ msgstr "" "自動合併說明失敗。修改 %s 中的衝突並且使用指令 'git notes merge --commit' 提" "交結果，或者使用指令 'git notes merge --abort' 終止合併。\n" -#: builtin/notes.c builtin/tag.c +#: builtin/notes.c:1002 builtin/tag.c:628 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "無法解析 '%s' 為一個有效引用。" -#: builtin/notes.c +#: builtin/notes.c:1005 #, c-format msgid "Object %s has no note\n" msgstr "物件 %s 沒有註解\n" -#: builtin/notes.c +#: builtin/notes.c:1017 msgid "attempt to remove non-existent note is not an error" msgstr "嘗試刪除不存在的註解不是一個錯誤" -#: builtin/notes.c +#: builtin/notes.c:1020 msgid "read object names from the standard input" msgstr "從標準輸入讀取物件名稱" -#: builtin/notes.c builtin/prune.c builtin/worktree.c +#: builtin/notes.c:1059 builtin/prune.c:155 builtin/worktree.c:237 msgid "do not remove, show only" msgstr "不刪除，只顯示" -#: builtin/notes.c +#: builtin/notes.c:1060 msgid "report pruned notes" msgstr "回報剪除的註解" -#: builtin/notes.c +#: builtin/notes.c:1103 msgid "notes-ref" msgstr "註解引用" -#: builtin/notes.c +#: builtin/notes.c:1104 msgid "use notes from " msgstr "從 <註解引用> 使用註解" -#: builtin/notes.c builtin/remote.c parse-options.c +#: builtin/notes.c:1123 builtin/remote.c:1783 parse-options.c:867 #, c-format msgid "unknown subcommand: `%s'" msgstr "未知子指令：「%s」" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:185 msgid "git pack-objects --stdout [] [< | < ]" msgstr "git pack-objects --stdout [<選項>] [< <引用列表> | < <物件列表>]" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:186 msgid "" "git pack-objects [] [< | < ]" msgstr "git pack-objects [<選項>] <前綴名稱> [< <引用列表> | < <物件列表>]" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:585 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " @@ -11051,124 +11209,130 @@ msgid "" msgstr "" "write_reuse_object：無法定位 %1$s，預期在 %3$s 包中的 %2$ 偏移量" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:593 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 錯的包物件 CRC" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:604 #, c-format msgid "corrupt packed object for %s" msgstr "%s 損壞的包物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:735 #, c-format msgid "recursive delta detected for object %s" msgstr "發現物件 %s 遞迴 delta" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:956 #, c-format msgid "ordered %u objects, expected %" msgstr "排序了 %u 個物件，預期 % 個" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:1054 #, c-format msgid "expected object at offset % in pack %s" msgstr "預期 %2$s 包中的偏移 %1$ 有物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:1237 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "停用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:1250 msgid "Writing objects" msgstr "寫入物件中" -#: builtin/pack-objects.c builtin/update-index.c +#: builtin/pack-objects.c:1327 builtin/update-index.c:109 #, c-format msgid "failed to stat %s" msgstr "對 %s 呼叫 stat 失敗" -#: builtin/pack-objects.c object-file.c +#: builtin/pack-objects.c:1335 object-file.c:2187 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上呼叫 utime() 失敗" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:1364 msgid "failed to write bitmap index" msgstr "無法寫入位圖索引" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:1390 #, c-format msgid "wrote % objects while expecting %" msgstr "寫入 % 個物件而預期 % 個" -#: builtin/pack-objects.c builtin/repack.c +#: builtin/pack-objects.c:1640 builtin/repack.c:1236 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "停用 bitmap 寫入，因為一些物件將不會被打包" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2087 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 壓縮中 delta 基準位移越界" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2096 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基準位移越界" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2377 msgid "Counting objects" msgstr "物件計數中" -#: builtin/pack-objects.c pack-bitmap.c +#: builtin/pack-objects.c:2527 pack-bitmap.c:1521 pack-bitmap.c:1527 #, c-format msgid "unable to get size of %s" msgstr "不能得到 %s 的大小" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2542 #, c-format msgid "unable to parse object header of %s" msgstr "無法解析物件 %s 標頭訊息" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2614 builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2642 #, c-format msgid "object %s cannot be read" msgstr "物件 %s 無法讀取" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2617 builtin/pack-objects.c:2646 #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "物件 %s 不一致的物件長度（% vs %）" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2656 msgid "suboptimal pack - out of memory" msgstr "次優（suboptimal）打包 - 記憶體不足" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:2971 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 個執行緒進行壓縮" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3110 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "無法為標籤 %s 壓縮物件" -#: builtin/pack-objects.c commit-graph.c +#: builtin/pack-objects.c:3178 commit-graph.c:1477 #, c-format msgid "unable to get type of object %s" msgstr "無法獲得物件 %s 類型" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3197 msgid "Compressing objects" msgstr "壓縮物件中" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3203 msgid "inconsistency with delta count" msgstr "不一致的差異計數" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3257 +#, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "無效的 pack.allowPackReuse 值：“%s”" + +#: builtin/pack-objects.c:3307 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' " "' (收到 '%s')" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3310 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3347 #, c-format msgid "could not get type of object %s in pack %s" msgstr "無法取得 %2$s 包中 %1$s 物件的類型" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3477 builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3614 #, c-format msgid "could not find pack '%s'" msgstr "找不到「%s」包" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3479 #, c-format msgid "packfile %s cannot be accessed" msgstr "無法存取封包檔案 %s" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3625 builtin/pack-objects.c:3651 msgid "Enumerating cruft objects" msgstr "正在枚舉廢棄物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3657 msgid "unable to add cruft objects" msgstr "無法加入廢棄物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3670 msgid "Traversing cruft objects" msgstr "正在遍歷廢棄物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3755 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -11219,7 +11384,7 @@ msgstr "" "預期邊界物件（edge object）ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3761 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -11228,276 +11393,276 @@ msgstr "" "預期物件 ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c reachable.c +#: builtin/pack-objects.c:3875 reachable.c:292 msgid "could not load cruft pack .mtimes" msgstr "無法載入廢棄封包 .mtimes" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3897 builtin/pack-objects.c:3996 msgid "cannot open pack index" msgstr "無法開啟包檔案索引" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:3906 #, c-format msgid "loose object at %s could not be examined" msgstr "無法檢查 %s 處的鬆散物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4004 msgid "unable to force loose object" msgstr "無法強制鬆散物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4138 #, c-format msgid "not a rev '%s'" msgstr "不是一個版本 '%s'" -#: builtin/pack-objects.c builtin/rev-parse.c +#: builtin/pack-objects.c:4141 builtin/rev-parse.c:1126 #, c-format msgid "bad revision '%s'" msgstr "壞的版本 '%s'" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4169 msgid "unable to add recent objects" msgstr "無法新增最近的物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4237 #, c-format msgid "unsupported index version %s" msgstr "不支援的索引版本 %s" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4241 #, c-format msgid "bad index version '%s'" msgstr "壞的索引版本 '%s'" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4294 msgid "show progress meter during object writing phase" msgstr "在物件寫入階段顯示進度列" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4297 msgid "similar to --all-progress when progress meter is shown" msgstr "顯示進度列時類似 --all-progress" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4298 msgid "[,]" msgstr "<版本>[,<位移>]" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4299 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本來寫包索引檔案" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4302 msgid "maximum size of each output pack file" msgstr "每個輸出包的最大尺寸" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4304 msgid "ignore borrowed objects from alternate object store" msgstr "忽略從備用物件儲存裡借用物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4306 msgid "ignore packed objects" msgstr "忽略包物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4308 msgid "limit pack window by objects" msgstr "限制打包視窗的物件數" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4310 msgid "limit pack window by memory in addition to object limit" msgstr "除物件數量限制外設定打包視窗的記憶體限制" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4312 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允許的 delta 鏈的最大長度" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4314 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4316 msgid "reuse existing objects" msgstr "重用已存在的物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4318 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4320 msgid "use threads when searching for best delta matches" msgstr "使用執行緒查詢最佳 delta 符合" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4322 msgid "do not create an empty pack output" msgstr "不建立空的包輸出" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4324 msgid "read revision arguments from standard input" msgstr "從標準輸入讀取版本號參數" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4326 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4329 msgid "include objects reachable from any reference" msgstr "包括可以從任何引用存取到的物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4332 msgid "include objects referred by reflog entries" msgstr "包括被引用日誌引用到的物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4335 msgid "include objects referred to by the index" msgstr "包括被索引引用到的物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4338 msgid "read packs from stdin" msgstr "從標準輸入中讀取包" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4340 msgid "output pack to stdout" msgstr "輸出包到標準輸出" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4342 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包物件的標籤物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4344 msgid "keep unreachable objects" msgstr "維持無法取得的物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4346 msgid "pack loose unreachable objects" msgstr "打包鬆散的無法取得物件" -#: builtin/pack-objects.c +#: builtin/pack-objects.c:4348 msgid "unpack unreachable objects newer than