From: Yi-Jyun Pan Date: Sun, 19 Apr 2026 13:52:38 +0000 (+0800) Subject: l10n: zh_TW: update translation for Git 2.54 X-Git-Tag: v2.54.0~1^2~1 X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=033775a96786fb45a39b4eebd4d8702fbd1dc4cb;p=thirdparty%2Fgit.git l10n: zh_TW: update translation for Git 2.54 Signed-off-by: Yi-Jyun Pan --- diff --git a/po/zh_TW.po b/po/zh_TW.po index f6fb4b759c..fe31e18096 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -30,8 +30,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2026-01-28 22:23+0800\n" -"PO-Revision-Date: 2026-01-28 22:42+0800\n" +"POT-Creation-Date: 2026-04-19 19:19+0800\n" +"PO-Revision-Date: 2026-04-19 13:40+0000\n" "Last-Translator: Yi-Jyun Pan \n" "Language-Team: Chinese (Traditional Han script) \n" @@ -40,21 +40,18 @@ 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.8\n" +"X-Generator: Weblate 5.16.2\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" -#: add-interactive.c -#, c-format -msgid "%s cannot be negative" -msgstr "%s 不能是負數" - #: add-interactive.c #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c +#: add-interactive.c add-interactive.c builtin/merge.c +#: builtin/rebase.c builtin/rebase.c reset.c sequencer.c +#: sequencer.c sequencer.c msgid "could not read index" msgstr "無法讀取索引" @@ -74,12 +71,14 @@ msgstr "未變更" msgid "Update" msgstr "更新" -#: add-interactive.c +#: add-interactive.c add-interactive.c add-interactive.c #, c-format msgid "could not stage '%s'" msgstr "無法暫存「%s」" -#: add-interactive.c builtin/stash.c reset.c sequencer.c +#: add-interactive.c add-interactive.c builtin/stash.c +#: builtin/stash.c builtin/stash.c builtin/stash.c +#: builtin/stash.c reset.c sequencer.c msgid "could not write index" msgstr "無法寫入索引" @@ -94,7 +93,8 @@ msgstr[0] "已更新 %d 個路徑\n" msgid "note: %s is untracked now.\n" msgstr "註：現已不再追蹤 %s。\n" -#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c +#: add-interactive.c apply.c builtin/checkout.c +#: builtin/reset.c #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "對「%s」路徑執行 make_cache_entry 失敗" @@ -175,7 +175,7 @@ msgstr "檢視 HEAD 及索引之間的差異" msgid "add contents of untracked files to the staged set of changes" msgstr "將未追蹤檔案的內容加入至變更暫存集" -#: add-interactive.c +#: add-interactive.c add-interactive.c msgid "Prompt help:" msgstr "提示說明：" @@ -191,7 +191,7 @@ msgstr "選取範圍中項目" msgid "select multiple ranges" msgstr "選取多個範圍" -#: add-interactive.c +#: add-interactive.c add-interactive.c msgid "select item based on unique prefix" msgstr "根據獨特前綴選取項目" @@ -231,9 +231,11 @@ msgstr "已暫存" 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 apply.c apply.c builtin/am.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 +#: builtin/submodule--helper.c msgid "path" msgstr "路徑" @@ -248,31 +250,31 @@ msgstr "再見。\n" #: add-patch.c #, c-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "暫存模式變更 [y,n,q,a,d%s,?]？ " +msgid "Stage mode change%s [y,n,q,a,d%s,?]? " +msgstr "暫存模式變更%s [y,n,q,a,d%s,?]？ " #: add-patch.c #, c-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? " +msgid "Stage deletion%s [y,n,q,a,d%s,?]? " +msgstr "暫存刪除動作%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Stage addition [y,n,q,a,d%s,?]? " -msgstr "暫存加入動作 [y,n,q,a,d%s,?]? " +msgid "Stage addition%s [y,n,q,a,d%s,?]? " +msgstr "暫存加入動作%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "暫存此區塊 [y,n,q,a,d%s,?]? " +msgid "Stage this hunk%s [y,n,q,a,d%s,?]? " +msgstr "暫存此區塊%s [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "如果修補檔能完全套用，編輯區塊將立即標記為暫存。" -#: add-patch.c +#: add-patch.c add-patch.c msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -288,23 +290,23 @@ msgstr "" #: add-patch.c #, c-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "貯存模式變更 [y,n,q,a,d%s,?]？ " +msgid "Stash mode change%s [y,n,q,a,d%s,?]? " +msgstr "貯存模式變更%s [y,n,q,a,d%s,?]？ " #: add-patch.c #, c-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "貯存刪除動作 [y,n,q,a,d%s,?]? " +msgid "Stash deletion%s [y,n,q,a,d%s,?]? " +msgstr "貯存刪除動作%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Stash addition [y,n,q,a,d%s,?]? " -msgstr "貯存加入動作 [y,n,q,a,d%s,?]? " +msgid "Stash addition%s [y,n,q,a,d%s,?]? " +msgstr "貯存加入動作%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "貯存此區塊 [y,n,q,a,d%s,?]? " +msgid "Stash this hunk%s [y,n,q,a,d%s,?]? " +msgstr "貯存此區塊%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -328,23 +330,23 @@ msgstr "" #: add-patch.c #, c-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]？ " +msgid "Unstage mode change%s [y,n,q,a,d%s,?]? " +msgstr "取消暫存模式變更%s [y,n,q,a,d%s,?]？ " #: add-patch.c #, c-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? " +msgid "Unstage deletion%s [y,n,q,a,d%s,?]? " +msgstr "取消暫存刪除動作%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Unstage addition [y,n,q,a,d%s,?]? " -msgstr "取消暫存加入動作 [y,n,q,a,d%s,?]? " +msgid "Unstage addition%s [y,n,q,a,d%s,?]? " +msgstr "取消暫存加入動作%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? " +msgid "Unstage this hunk%s [y,n,q,a,d%s,?]? " +msgstr "取消暫存此區塊%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -368,25 +370,25 @@ msgstr "" #: add-patch.c #, c-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "將模式變更套用至索引區 [y,n,q,a,d%s,?]？ " +msgid "Apply mode change to index%s [y,n,q,a,d%s,?]? " +msgstr "將模式變更套用至索引區%s [y,n,q,a,d%s,?]？ " #: add-patch.c #, c-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "將刪除動作套用至索引 [y,n,q,a,d%s,?]? " +msgid "Apply deletion to index%s [y,n,q,a,d%s,?]? " +msgstr "將刪除動作套用至索引%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply addition to index [y,n,q,a,d%s,?]? " -msgstr "將加入動作套用至索引 [y,n,q,a,d%s,?]? " +msgid "Apply addition to index%s [y,n,q,a,d%s,?]? " +msgstr "將加入動作套用至索引%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? " +msgid "Apply this hunk to index%s [y,n,q,a,d%s,?]? " +msgstr "將此區塊套用到索引%s [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c add-patch.c add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." @@ -406,33 +408,33 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c +#: add-patch.c add-patch.c #, c-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "從工作區捨棄模式變更 [y,n,q,a,d%s,?]？ " +msgid "Discard mode change from worktree%s [y,n,q,a,d%s,?]? " +msgstr "從工作區捨棄模式變更%s [y,n,q,a,d%s,?]？ " -#: add-patch.c +#: add-patch.c add-patch.c #, c-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "從工作區捨棄刪除動作 [y,n,q,a,d%s,?]? " +msgid "Discard deletion from worktree%s [y,n,q,a,d%s,?]? " +msgstr "從工作區捨棄刪除動作%s [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c add-patch.c #, c-format -msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " -msgstr "從工作區捨棄加入動作 [y,n,q,a,d%s,?]? " +msgid "Discard addition from worktree%s [y,n,q,a,d%s,?]? " +msgstr "從工作區捨棄加入動作%s [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c add-patch.c #, c-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "從工作區捨棄此區塊 [y,n,q,a,d%s,?]? " +msgid "Discard this hunk from worktree%s [y,n,q,a,d%s,?]? " +msgstr "從工作區捨棄此區塊%s [y,n,q,a,d%s,?]? " -#: add-patch.c +#: add-patch.c add-patch.c add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "如果修補檔能完全套用，編輯區塊將立即標記為捨棄。" -#: add-patch.c +#: add-patch.c add-patch.c msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -448,23 +450,23 @@ msgstr "" #: add-patch.c #, c-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "從索引區和工作區捨棄模式變更 [y,n,q,a,d%s,?]？ " +msgid "Discard mode change from index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "從索引區和工作區捨棄模式變更%s [y,n,q,a,d%s,?]？ " #: add-patch.c #, c-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "從索引和工作區捨棄刪除 [y,n,q,a,d%s,?]? " +msgid "Discard deletion from index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "從索引和工作區捨棄刪除動作%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " -msgstr "從索引和工作區捨棄加入動作 [y,n,q,a,d%s,?]? " +msgid "Discard addition from index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "從索引和工作區捨棄加入動作%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "從索引和工作區捨棄此區塊 [y,n,q,a,d%s,?]? " +msgid "Discard this hunk from index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "從索引和工作區捨棄此區塊%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -482,23 +484,23 @@ msgstr "" #: add-patch.c #, c-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "將模式變更套用至索引區和工作區 [y,n,q,a,d%s,?]？ " +msgid "Apply mode change to index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "將模式變更套用至索引區和工作區%s [y,n,q,a,d%s,?]？ " #: add-patch.c #, c-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? " +msgid "Apply deletion to index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "將刪除動作套用到索引和工作區%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " -msgstr "將加入動作套用到索引和工作區 [y,n,q,a,d%s,?]? " +msgid "Apply addition to index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "將加入動作套用到索引和工作區%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? " +msgid "Apply this hunk to index and worktree%s [y,n,q,a,d%s,?]? " +msgstr "將此區塊套用到索引和工作區%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -516,23 +518,23 @@ msgstr "" #: add-patch.c #, c-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "將模式變更套用至工作區 [y,n,q,a,d%s,?]？ " +msgid "Apply mode change to worktree%s [y,n,q,a,d%s,?]? " +msgstr "將模式變更套用至工作區%s [y,n,q,a,d%s,?]？ " #: add-patch.c #, c-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "將刪除動作套用到工作區 [y,n,q,a,d%s,?]? " +msgid "Apply deletion to worktree%s [y,n,q,a,d%s,?]? " +msgstr "將刪除動作套用到工作區%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " -msgstr "將加入動作套用到工作區 [y,n,q,a,d%s,?]? " +msgid "Apply addition to worktree%s [y,n,q,a,d%s,?]? " +msgstr "將加入動作套用到工作區%s [y,n,q,a,d%s,?]? " #: add-patch.c #, c-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? " +msgid "Apply this hunk to worktree%s [y,n,q,a,d%s,?]? " +msgstr "將此區塊套用到工作區%s [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" @@ -548,6 +550,11 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" +#: add-patch.c add-patch.c add-patch.c add-patch.c +#, c-format +msgid "%s cannot be negative" +msgstr "%s 不能是負數" + #: add-patch.c #, c-format msgid "could not parse hunk header '%.*s'" @@ -659,6 +666,7 @@ msgid "Nothing was applied.\n" msgstr "未套用。\n" #: add-patch.c +#, c-format msgid "" "j - go to the next undecided hunk, roll over at the bottom\n" "J - go to the next hunk, roll over at the bottom\n" @@ -670,19 +678,37 @@ msgid "" "e - manually edit the current hunk\n" "p - print the current hunk\n" "P - print the current hunk using the pager\n" +"> - go to the next file, roll over at the bottom\n" +"< - go to the previous file, roll over at the top\n" "? - print help\n" +"HUNKS SUMMARY - Hunks: %d, USE: %d, SKIP: %d\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" "P - 分頁輸出目前區塊\n" +"> - 前往下一個檔案，在最後一個時回到第一個檔案\n" +"< - 前往上一個檔案，在第一個時回到最後一個檔案\n" "? - 顯示說明\n" +"區塊摘要 - 區塊數：%d，選取數：%d，略過數：%d\n" + +#: add-patch.c +msgid "'git apply' failed" +msgstr "「git apply」失敗" + +#: add-patch.c +msgid " (was: y)" +msgstr " （原本是：y）" + +#: add-patch.c +msgid " (was: n)" +msgstr " （原本是：n）" #: add-patch.c #, c-format @@ -690,10 +716,18 @@ msgid "Only one letter is expected, got '%s'" msgstr "預期收到一個字母，卻收到「%s」" #: add-patch.c +msgid "No next file" +msgstr "沒有下一個檔案" + +#: add-patch.c +msgid "No previous file" +msgstr "沒有上一個檔案" + +#: add-patch.c add-patch.c msgid "No other hunk" msgstr "沒有其他區塊" -#: add-patch.c +#: add-patch.c add-patch.c msgid "No other undecided hunk" msgstr "沒有其他未決區塊" @@ -755,10 +789,6 @@ msgstr "對不起，無法編輯這個區塊" msgid "Unknown command '%s' (use '?' for help)" msgstr "未知命令「%s」（使用「?」獲取幫助）" -#: add-patch.c -msgid "'git apply' failed" -msgstr "「git apply」失敗" - #: add-patch.c msgid "No changes." msgstr "沒有變更。" @@ -767,6 +797,30 @@ msgstr "沒有變更。" msgid "Only binary files changed." msgstr "只有二進位檔案變更了。" +#: add-patch.c +#, c-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "暫存模式變更 [y,n,q,a,d%s,?]？ " + +#: add-patch.c +#, c-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? " + +#: add-patch.c +#, c-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "暫存加入動作 [y,n,q,a,d%s,?]? " + +#: add-patch.c +#, c-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "暫存此區塊 [y,n,q,a,d%s,?]? " + +#: add-patch.c +msgid "Revision does not refer to a commit" +msgstr "修訂版指向的不是提交" + #: advice.c #, c-format msgid "" @@ -940,8 +994,11 @@ msgstr "命令列以 \\ 結尾" msgid "unclosed quote" msgstr "未閉合的引號" -#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/refs.c builtin/repo.c builtin/tag.c +#: alias.c builtin/cat-file.c builtin/notes.c builtin/notes.c +#: builtin/notes.c builtin/notes.c builtin/notes.c +#: builtin/notes.c builtin/notes.c builtin/notes.c +#: builtin/notes.c builtin/prune-packed.c builtin/receive-pack.c +#: builtin/refs.c builtin/repo.c builtin/tag.c #: t/helper/test-pkt-line.c msgid "too many arguments" msgstr "引數過多" @@ -956,20 +1013,37 @@ msgstr "無法識別空白字元選項「%s」" 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/clean.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-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c -#: builtin/reset.c builtin/rev-parse.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 archive.c builtin/add.c builtin/add.c +#: builtin/add.c builtin/add.c builtin/branch.c +#: builtin/checkout-index.c builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c +#: builtin/clean.c builtin/clone.c builtin/clone.c +#: builtin/commit.c builtin/commit.c builtin/commit.c +#: builtin/commit.c builtin/commit.c builtin/describe.c +#: builtin/diff-tree.c builtin/difftool.c builtin/fast-export.c +#: builtin/fetch.c builtin/fetch.c builtin/fetch.c +#: builtin/fetch.c builtin/help.c builtin/index-pack.c +#: builtin/init-db.c builtin/log.c builtin/log.c +#: builtin/ls-files.c builtin/merge-base.c builtin/merge-base.c +#: builtin/merge-tree.c builtin/merge.c builtin/merge.c +#: builtin/rebase.c builtin/rebase.c builtin/rebase.c +#: builtin/repack.c builtin/reset.c builtin/reset.c +#: builtin/rev-parse.c builtin/rev-parse.c builtin/rev-parse.c +#: builtin/show-branch.c builtin/show-branch.c builtin/stash.c +#: builtin/stash.c builtin/submodule--helper.c +#: builtin/submodule--helper.c builtin/tag.c builtin/tag.c +#: builtin/worktree.c builtin/worktree.c builtin/worktree.c +#: builtin/worktree.c builtin/worktree.c builtin/worktree.c +#: parse-options.c parse-options.c range-diff.c revision.c +#: revision.c revision.c revision.c revision.c +#: revision.c revision.c revision.c revision.c +#: revision.c revision.c revision.c revision.c +#: revision.c #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "無法同時使用「%s」和「%s」選項" -#: apply.c +#: apply.c apply.c apply.c #, c-format msgid "'%s' outside a repository" msgstr "「%s」在版本庫之外" @@ -994,14 +1068,30 @@ msgstr "regexec 回傳 %d，輸入為：%s" #: apply.c #, c-format -msgid "unable to find filename in patch at line %d" -msgstr "無法在修補檔的第 %d 列找到檔案名稱" +msgid "unable to find filename in patch at %s:%d" +msgstr "無法在修補檔的 %s:%d 處找到檔案名稱" + +#: apply.c +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s at %s:%d" +msgstr "" +"git apply：無效的 git-diff — 應為 /dev/null，但在 %2$s:%3$d 處得到 %1$s" #: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：無效的 git-diff — 應為 /dev/null，但在第 %2$d 列得到 %1$s" +#: apply.c +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename at %s:%d" +msgstr "git apply：無效的 git-diff — %s:%d 處的新檔案名稱不一致" + +#: apply.c +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename at %s:%d" +msgstr "git apply：無效的 git-diff — %s:%d 處的舊檔案名稱不一致" + #: apply.c #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" @@ -1012,11 +1102,21 @@ msgstr "git apply：無效的 git-diff — 第 %d 列的新檔案名稱不一致 msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：無效的 git-diff — 第 %d 列上舊檔案名稱不一致" +#: apply.c +#, c-format +msgid "git apply: bad git-diff - expected /dev/null at %s:%d" +msgstr "git apply：無效的 git-diff — %s:%d 處預期是 /dev/null" + #: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：無效的 git-diff — 第 %d 列處預期是 /dev/null" +#: apply.c +#, c-format +msgid "invalid mode at %s:%d: %s" +msgstr "%s:%d 處包含無效檔案模式：%s" + #: apply.c #, c-format msgid "invalid mode on line %d: %s" @@ -1027,6 +1127,17 @@ msgstr "第 %d 列包含無效檔案模式：%s" msgid "inconsistent header lines %d and %d" msgstr "不一致的檔案標頭（%d 列和 %d 列）" +#: apply.c +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component at %s:%d" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components at %s:%d" +msgstr[0] "" +"移除 %d 個前導路徑部分後，git diff 標頭缺少檔案名稱資訊（位置：%s:%d）" + #: apply.c #, c-format msgid "" @@ -1037,6 +1148,11 @@ msgid_plural "" "components (line %d)" msgstr[0] "移除 %d 個前導路徑部分後，git diff 標頭缺少檔案名稱資訊（第 %d 列）" +#: apply.c +#, c-format +msgid "git diff header lacks filename information at %s:%d" +msgstr "git diff 標頭缺少檔案名稱資訊（位置：%s:%d）" + #: apply.c #, c-format msgid "git diff header lacks filename information (line %d)" @@ -1049,8 +1165,8 @@ msgstr "recount：遇到非預期的列：%.*s" #: apply.c #, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "第 %d 列的修補檔區段沒有標頭：%.*s" +msgid "patch fragment without header at %s:%d: %.*s" +msgstr "%s:%d 處的修補檔區段沒有標頭：%.*s" #: apply.c msgid "new file depends on old contents" @@ -1062,8 +1178,8 @@ msgstr "刪除的檔案仍有內容" #: apply.c #, c-format -msgid "corrupt patch at line %d" -msgstr "修補檔在第 %d 列發現損壞" +msgid "corrupt patch at %s:%d" +msgstr "修補檔在 %s:%d 處發現損壞" #: apply.c #, c-format @@ -1082,18 +1198,18 @@ msgstr "** 警告：檔案 %s 成為空檔案但並未刪除" #: apply.c #, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "二進位修補檔在第 %d 列損壞：%.*s" +msgid "corrupt binary patch at %s:%d: %.*s" +msgstr "二進位修補檔在 %s:%d 處有損壞：%.*s" #: apply.c #, c-format -msgid "unrecognized binary patch at line %d" -msgstr "無法辨識第 %d 列的二進位修補檔" +msgid "unrecognized binary patch at %s:%d" +msgstr "無法辨識 %s:%d 處的二進位修補檔" #: apply.c #, c-format -msgid "patch with only garbage at line %d" -msgstr "修補檔案的第 %d 列只有垃圾資料" +msgid "patch with only garbage at %s:%d" +msgstr "修補檔案的 %s:%d 處只有垃圾資料" #: apply.c #, c-format @@ -1181,7 +1297,8 @@ msgstr "修補失敗：%s:%ld" msgid "cannot checkout %s" msgstr "無法簽出 %s" -#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c +#: apply.c apply.c apply.c midx.c pack-mtimes.c +#: pack-revindex.c setup.c #, c-format msgid "failed to read %s" msgstr "無法讀取 %s" @@ -1191,17 +1308,17 @@ msgstr "無法讀取 %s" msgid "reading from '%s' beyond a symbolic link" msgstr "讀取符號連結背後的「%s」" -#: apply.c +#: apply.c apply.c #, c-format msgid "path %s has been renamed/deleted" msgstr "路徑 %s 已被重新命名或刪除" -#: apply.c +#: apply.c apply.c #, c-format msgid "%s: does not exist in index" msgstr "%s：不在索引中" -#: apply.c +#: apply.c apply.c apply.c #, c-format msgid "%s: does not match index" msgstr "%s：與索引不符" @@ -1215,7 +1332,7 @@ msgstr "版本庫缺少用來進行三方合併，所需要的資料物件。" msgid "Performing three-way merge...\n" msgstr "正在進行三方合併……\n" -#: apply.c +#: apply.c apply.c #, c-format msgid "cannot read the current contents of '%s'" msgstr "無法讀取「%s」目前的內容" @@ -1254,7 +1371,9 @@ msgstr "%s：錯誤類型" msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，預期是 %o" -#: apply.c builtin/fast-import.c read-cache.c +#: apply.c apply.c builtin/fast-import.c +#: builtin/fast-import.c read-cache.c read-cache.c +#: read-cache.c #, c-format msgid "invalid path '%s'" msgstr "路徑「%s」無效" @@ -1279,7 +1398,7 @@ msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符" msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符" -#: apply.c +#: apply.c apply.c #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影響的檔案「%s」在符號連結後" @@ -1339,12 +1458,12 @@ msgstr "無法對剛建立的檔案「%s」執行 stat" msgid "unable to create backing store for newly created file %s" msgstr "無法對剛建立的檔案 %s 建立後端儲存" -#: apply.c +#: apply.c apply.c #, c-format msgid "unable to add cache entry for %s" msgstr "無法為 %s 加入快取項目" -#: apply.c builtin/bisect.c builtin/gc.c +#: apply.c builtin/bisect.c builtin/gc.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "無法寫入「%s」" @@ -1374,7 +1493,7 @@ msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "套用修補檔 %%s，其中 %d 個被拒絕……" -#: apply.c +#: apply.c apply.c apply.c #, c-format msgid "cannot open %s" msgstr "無法開啟 %s" @@ -1407,6 +1526,16 @@ msgstr "輸入沒有有效的修補檔內容（傳入「--allow-empty」允許 msgid "unable to read index file" msgstr "無法讀取索引檔案" +#: apply.c +#, c-format +msgid "option -p expects a non-negative integer, got '%s'" +msgstr "選項 -p 預期是一個非負數整數，但卻得到「%s」" + +#: apply.c +#, c-format +msgid "unable to normalize directory: '%s'" +msgstr "無法標準化目錄：「%s」" + #: apply.c #, c-format msgid "can't open patch '%s': %s" @@ -1418,7 +1547,7 @@ msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 個空白字元誤用" -#: apply.c +#: apply.c apply.c #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1518,8 +1647,9 @@ msgstr "路徑以 NUL 字元分隔" 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 builtin/am.c builtin/am.c +#: builtin/interpret-trailers.c builtin/interpret-trailers.c +#: builtin/pack-objects.c builtin/rebase.c msgid "action" msgstr "動作" @@ -1527,7 +1657,7 @@ msgstr "動作" msgid "detect new or modified lines that have whitespace errors" msgstr "檢查新增和修改的列中間，是否有空白字元誤用" -#: apply.c +#: apply.c apply.c msgid "ignore changes in whitespace when finding context" msgstr "尋找上下文時忽略空白字元變更" @@ -1582,6 +1712,7 @@ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支援的檔案模式：0%o (SHA1：%s)" #: archive-tar.c archive-zip.c builtin/pack-objects.c +#: builtin/pack-objects.c #, c-format msgid "deflate error (%d)" msgstr "壓縮錯誤 (%d)" @@ -1629,7 +1760,9 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote [--exec ] --list" -#: archive.c builtin/fast-import.c builtin/gc.c builtin/notes.c builtin/tag.c +#: archive.c archive.c builtin/fast-import.c +#: builtin/fast-import.c builtin/gc.c builtin/notes.c +#: builtin/tag.c #, c-format msgid "cannot read '%s'" msgstr "無法讀取「%s」" @@ -1639,7 +1772,7 @@ msgstr "無法讀取「%s」" msgid "pathspec '%s' matches files outside the current directory" msgstr "符合路徑規格「%s」的檔案在目前目錄之外" -#: archive.c builtin/add.c builtin/rm.c +#: archive.c builtin/add.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" msgstr "路徑規格「%s」未符合任何檔案" @@ -1705,13 +1838,17 @@ msgstr "前綴" 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 archive.c builtin/blame.c builtin/blame.c +#: builtin/blame.c builtin/commit-tree.c builtin/config.c +#: builtin/fast-export.c builtin/fast-export.c +#: builtin/fast-export.c builtin/gc.c builtin/gc.c +#: builtin/grep.c builtin/hash-object.c builtin/ls-files.c +#: builtin/ls-files.c builtin/notes.c builtin/notes.c +#: builtin/read-tree.c parse-options.h msgid "file" msgstr "file" -#: archive.c +#: archive.c archive.c msgid "add untracked file to archive" msgstr "將未追蹤檔案加進封存" @@ -1731,8 +1868,8 @@ msgstr "讀取工作目錄中的 .gitattributes" 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 builtin/clone.c builtin/fetch.c +#: builtin/pack-objects.c builtin/pack-objects.c builtin/pull.c msgid "time" msgstr "time" @@ -1748,7 +1885,8 @@ msgstr "設定壓縮級別" msgid "list supported archive formats" msgstr "列出支援的封存格式" -#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c +#: archive.c builtin/archive.c builtin/clone.c builtin/clone.c +#: builtin/submodule--helper.c builtin/submodule--helper.c msgid "repo" msgstr "repo" @@ -1756,7 +1894,8 @@ msgstr "repo" msgid "retrieve the archive from remote repository " msgstr "從遠端版本庫 擷取封存檔案" -#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c +#: archive.c builtin/archive.c builtin/difftool.c +#: builtin/notes.c msgid "command" msgstr "command" @@ -1768,10 +1907,18 @@ msgstr "遠端 git-upload-archive 命令的路徑" 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 builtin/add.c builtin/add.c builtin/add.c +#: builtin/add.c builtin/add.c builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c +#: builtin/clone.c builtin/clone.c builtin/commit.c +#: builtin/commit.c builtin/commit.c builtin/fast-export.c +#: builtin/index-pack.c builtin/log.c builtin/reset.c +#: builtin/reset.c builtin/reset.c builtin/reset.c +#: builtin/reset.c builtin/rm.c builtin/stash.c +#: builtin/stash.c builtin/stash.c builtin/stash.c +#: builtin/stash.c builtin/stash.c builtin/stash.c +#: builtin/worktree.c builtin/worktree.c fetch-pack.c +#: http-fetch.c http-fetch.c revision.c #, c-format msgid "the option '%s' requires '%s'" msgstr "「%s」選項需要「%s」" @@ -1850,8 +1997,10 @@ msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE" msgid "unable to stat '%s'" msgstr "無法 stat「%s」" -#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c -#: builtin/pack-objects.c combine-diff.c object-file.c rerere.c +#: bisect.c builtin/cat-file.c builtin/cat-file.c +#: builtin/index-pack.c builtin/notes.c builtin/pack-objects.c +#: builtin/pack-objects.c builtin/pack-objects.c combine-diff.c +#: object-file.c object-file.c rerere.c #, c-format msgid "unable to read %s" msgstr "無法讀取 %s" @@ -1986,9 +2135,14 @@ msgstr "--contents 和 --reverse 不能混用。" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c builtin/bisect.c builtin/commit.c builtin/fast-export.c -#: builtin/log.c builtin/merge.c builtin/pack-objects.c builtin/shortlog.c -#: midx-write.c pack-bitmap.c remote.c sequencer.c submodule.c +#: blame.c builtin/bisect.c builtin/bisect.c +#: builtin/commit.c builtin/fast-export.c builtin/log.c +#: builtin/log.c builtin/log.c builtin/log.c builtin/log.c +#: builtin/merge.c builtin/pack-objects.c builtin/pack-objects.c +#: builtin/pack-objects.c builtin/pack-objects.c +#: builtin/shortlog.c midx-write.c pack-bitmap.c +#: pack-bitmap.c remote.c sequencer.c sequencer.c +#: submodule.c msgid "revision walk setup failed" msgstr "修訂版遍歷設定失敗" @@ -2063,10 +2217,12 @@ msgid "not tracking: ambiguous information for ref '%s'" msgstr "未追蹤：「%s」引用有歧義" # 譯者：為保證在輸出中對齊，注意調整句中空格！ +#. #-#-#-#-# branch.c.po #-#-#-#-# #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. #. +#. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space @@ -2148,7 +2304,8 @@ msgstr "" "並建立兩個分支間的追蹤關係，您可能需要使用 `git push -u`\n" "推送分支並設定和上游的關聯。" -#: branch.c builtin/replace.c +#: branch.c builtin/replace.c builtin/replace.c +#: builtin/replace.c builtin/replace.c #, c-format msgid "not a valid object name: '%s'" msgstr "物件名稱無效：「%s」" @@ -2177,7 +2334,7 @@ msgstr "" "您可以使用「git checkout --no-recurse-submodules %s && git submodule update " "--init」命令嘗試更新子模組" -#: branch.c +#: branch.c branch.c #, c-format msgid "submodule '%s': cannot create branch '%s'" msgstr "「%s」子模組：無法建立「%s」分支" @@ -2227,14 +2384,15 @@ 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/sparse-checkout.c +#: builtin/prune-packed.c builtin/pull.c builtin/push.c +#: builtin/remote.c builtin/rm.c builtin/send-pack.c +#: builtin/sparse-checkout.c 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/refs.c +#: builtin/count-objects.c builtin/fsck.c builtin/log.c +#: builtin/mv.c builtin/read-tree.c builtin/refs.c msgid "be verbose" msgstr "詳細輸出" @@ -2246,6 +2404,11 @@ msgstr "互動式挑選" msgid "select hunks interactively" msgstr "互動式選取區塊" +#: builtin/add.c builtin/checkout.c builtin/reset.c +#: builtin/stash.c builtin/stash.c +msgid "auto advance to the next file when selecting hunks interactively" +msgstr "在互動式選取區塊時自動前往下一個檔案" + #: builtin/add.c msgid "edit current diff and apply" msgstr "編輯目前差異並套用" @@ -2342,8 +2505,10 @@ msgstr "如果您確定想要加入它們，請使用 -f。" msgid "adding files failed" msgstr "加入檔案失敗" -#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c -#: builtin/stash.c +#: builtin/add.c builtin/add.c builtin/checkout.c +#: builtin/checkout.c builtin/commit.c builtin/commit.c +#: builtin/reset.c builtin/reset.c builtin/stash.c +#: builtin/stash.c builtin/stash.c builtin/stash.c #, c-format msgid "'%s' cannot be negative" msgstr "「%s」不能是負數" @@ -2353,8 +2518,8 @@ msgstr "「%s」不能是負數" 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 builtin/checkout.c builtin/commit.c +#: builtin/reset.c builtin/rm.c builtin/stash.c #, c-format msgid "'%s' and pathspec arguments cannot be used together" msgstr "「%s」和路徑規格引數不得同時使用" @@ -2368,15 +2533,19 @@ msgstr "沒有指定，亦未加入檔案。\n" 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 builtin/check-ignore.c builtin/checkout.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 +#: builtin/submodule--helper.c read-cache.c read-cache.c +#: rerere.c rerere.c rerere.c submodule.c 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 builtin/am.c builtin/am.c builtin/checkout.c +#: builtin/checkout.c builtin/clone.c builtin/commit.c +#: builtin/commit.c builtin/commit.c builtin/history.c +#: builtin/stash.c merge.c rerere.c msgid "unable to write new index file" msgstr "無法寫入新的索引檔案" @@ -2385,14 +2554,18 @@ msgstr "無法寫入新的索引檔案" 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 builtin/revert.c diff-merges.c diff.c environment.c -#: gpg-interface.c ls-refs.c parallel-checkout.c sequencer.c setup.c +#: builtin/am.c builtin/am.c builtin/am.c builtin/blame.c +#: builtin/blame.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pack-objects.c builtin/pull.c builtin/pull.c +#: builtin/pull.c builtin/revert.c diff-merges.c diff.c +#: environment.c gpg-interface.c gpg-interface.c ls-refs.c +#: parallel-checkout.c sequencer.c setup.c setup.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "「%s」的值無效：「%s」" #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c +#: sequencer.c sequencer.c sequencer.c trailer.c #, c-format msgid "could not read '%s'" msgstr "無法讀取「%s」" @@ -2401,6 +2574,7 @@ msgstr "無法讀取「%s」" msgid "could not parse author script" msgstr "無法解析作者文稿" +#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c #: builtin/am.c builtin/replace.c commit.c sequencer.c #, c-format msgid "could not parse %s" @@ -2425,12 +2599,14 @@ msgstr "從「%s」複製註解到「%s」失敗" msgid "fseek failed" msgstr "fseek 失敗" -#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c +#: builtin/am.c builtin/am.c builtin/rebase.c sequencer.c +#: wrapper.c wrapper.c #, 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 builtin/rebase.c editor.c sequencer.c +#: wrapper.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "無法開啟「%s」進行寫入" @@ -2448,7 +2624,7 @@ msgstr "一次只能套用一個 StGIT 修補檔序列" msgid "invalid timestamp" msgstr "無效的時間戳" -#: builtin/am.c +#: builtin/am.c builtin/am.c msgid "invalid Date line" msgstr "無效的 Date 列" @@ -2504,7 +2680,8 @@ msgstr "在提交 %s 中缺少作者列" msgid "invalid ident line: %.*s" msgstr "ident 列無效：%.*s" -#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c +#: builtin/am.c builtin/checkout.c builtin/clone.c +#: commit-graph.c #, c-format msgid "unable to parse commit %s" msgstr "無法解析 %s 提交" @@ -2541,11 +2718,12 @@ msgstr "git write-tree 無法寫入樹狀物件" msgid "applying to an empty history" msgstr "正在套用至空白歷史記錄上" -#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c +#: builtin/am.c builtin/commit.c builtin/merge.c +#: builtin/merge.c replay.c sequencer.c msgid "failed to write commit object" msgstr "無法寫入提交物件" -#: builtin/am.c +#: builtin/am.c builtin/am.c #, c-format msgid "cannot resume: %s does not exist." msgstr "無法繼續：%s 不存在。" @@ -2587,7 +2765,7 @@ msgstr "建立空白提交：%.*s" msgid "Patch is empty." msgstr "修補檔空白。" -#: builtin/am.c +#: builtin/am.c builtin/am.c #, c-format msgid "Applying: %.*s" msgstr "套用：%.*s" @@ -2630,12 +2808,13 @@ msgstr "" "您應該對已經解決衝突的每一個檔案執行 `git add`，標記為已經完成。\n" "你可以對「由他們刪除」的檔案，執行 `git rm` 指令。" -#: builtin/am.c builtin/reset.c +#: builtin/am.c builtin/am.c builtin/am.c builtin/reset.c +#: builtin/reset.c #, c-format msgid "Could not parse object '%s'." msgstr "無法解析物件「%s」。" -#: builtin/am.c +#: builtin/am.c builtin/am.c msgid "failed to clean index" msgstr "無法清除索引" @@ -2676,8 +2855,8 @@ msgstr "歷史遺留選項——無作用" 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 builtin/init-db.c builtin/prune-packed.c +#: builtin/repack.c builtin/stash.c msgid "be quiet" msgstr "靜默模式" @@ -2713,21 +2892,30 @@ msgstr "截掉裁切線前的所有內容" msgid "pass it through git-mailinfo" msgstr "透過 git-mailinfo 傳入" +#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c +#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c #: builtin/am.c 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 builtin/commit.c builtin/fmt-merge-msg.c +#: builtin/fmt-merge-msg.c builtin/grep.c builtin/merge.c +#: builtin/pull.c builtin/pull.c builtin/pull.c +#: builtin/rebase.c builtin/repack.c builtin/repack.c +#: builtin/repack.c builtin/show-branch.c builtin/show-ref.c +#: builtin/tag.c parse-options.h parse-options.h +#: parse-options.h msgid "n" msgstr "n" -#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c -#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c -#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c -#: builtin/repo.c builtin/submodule--helper.c builtin/tag.c -#: builtin/verify-tag.c +#: builtin/am.c builtin/branch.c builtin/bugreport.c +#: builtin/cat-file.c builtin/cat-file.c builtin/cat-file.c +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c +#: builtin/init-db.c builtin/ls-files.c builtin/ls-tree.c +#: builtin/refs.c builtin/replace.c builtin/repo.c +#: builtin/repo.c builtin/submodule--helper.c +#: builtin/submodule--helper.c builtin/submodule--helper.c +#: builtin/tag.c builtin/verify-tag.c msgid "format" msgstr "format" @@ -2779,8 +2967,9 @@ msgstr "將作者日期當作提交日期" 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 builtin/commit-tree.c builtin/commit.c +#: builtin/merge.c builtin/pull.c builtin/rebase.c +#: builtin/revert.c builtin/tag.c msgid "key-id" msgstr "key-id" @@ -2871,6 +3060,12 @@ msgstr "一次請求的最小物件數量" msgid "Restrict the missing objects to the current sparse-checkout" msgstr "將缺少的物件限制於目前的稀疏簽出" +#: builtin/backfill.c builtin/diff-pairs.c builtin/log.c +#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c +#, c-format +msgid "unrecognized argument: %s" +msgstr "不認識的引數：%s" + #: builtin/bisect.c msgid "" "git bisect start [--term-(bad|new)= --term-(good|old)=]\n" @@ -3050,7 +3245,7 @@ msgstr "" msgid "could not open '%s' for appending" msgstr "無法開啟「%s」進行附加" -#: builtin/bisect.c +#: builtin/bisect.c builtin/bisect.c msgid "'' is not a valid term" msgstr "「 」不是有效術語" @@ -3104,7 +3299,7 @@ msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數" msgid "'git bisect %s' can take only one argument." msgstr "「git bisect %s」只取一個引數。" -#: builtin/bisect.c +#: builtin/bisect.c builtin/bisect.c #, c-format msgid "Bad rev input: %s" msgstr "rev 輸入格式錯誤：%s" @@ -3215,7 +3410,7 @@ msgstr "git blame [] [] [] [--] " msgid "git annotate [] [] [] [--] " msgstr "git annotate [] [] [] [--] " -#: builtin/blame.c +#: builtin/blame.c builtin/blame.c msgid " are documented in git-rev-list(1)" msgstr " 的文件在 git-rev-list(1)" @@ -3228,7 +3423,7 @@ msgstr "預期是個顏色：%s" msgid "must end with a color" msgstr "結尾必須是一個顏色" -#: builtin/blame.c diff.c merge-ort.c transport.c +#: builtin/blame.c diff.c diff.c merge-ort.c transport.c #, c-format msgid "unknown value for config '%s': %s" msgstr "設定 '%s' 的取值未知：%s" @@ -3261,8 +3456,9 @@ msgstr "不把根提交當作邊界（預設值：off）" 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/blame.c builtin/checkout.c builtin/clone.c +#: builtin/commit-graph.c builtin/commit-graph.c builtin/fetch.c +#: builtin/merge.c builtin/multi-pack-index.c builtin/pull.c #: builtin/push.c builtin/remote.c builtin/send-pack.c msgid "force progress reporting" msgstr "強制顯示進度報告" @@ -3351,7 +3547,7 @@ msgstr "使用來自 的修訂集而不是呼叫 git-rev-list" msgid "use 's contents as the final image" msgstr "將 的內容當成是最終印象" -#: builtin/blame.c +#: builtin/blame.c builtin/blame.c msgid "score" msgstr "score" @@ -3543,12 +3739,12 @@ msgstr "%s 工作區的 HEAD 指標未被更新" msgid "invalid branch name: '%s'" msgstr "分支名稱無效：「%s」" -#: builtin/branch.c +#: builtin/branch.c builtin/branch.c builtin/branch.c #, c-format msgid "no commit on branch '%s' yet" msgstr "分支「%s」尚無提交" -#: builtin/branch.c +#: builtin/branch.c builtin/branch.c #, c-format msgid "no branch named '%s'" msgstr "沒有名為「%s」的分支" @@ -3607,7 +3803,8 @@ msgstr "顯示雜湊值和主旨，若傳入兩次則顯示上游分支" msgid "suppress informational messages" msgstr "不顯示資訊訊息" -#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c +#: builtin/branch.c builtin/checkout.c +#: builtin/submodule--helper.c msgid "set branch tracking configuration" msgstr "設定分支追蹤組態" @@ -3635,11 +3832,11 @@ msgstr "使用彩色輸出" msgid "act on remote-tracking branches" msgstr "作用於遠端追蹤分支" -#: builtin/branch.c +#: builtin/branch.c builtin/branch.c msgid "print only branches that contain the commit" msgstr "只輸出包含此提交的分支" -#: builtin/branch.c +#: builtin/branch.c builtin/branch.c msgid "print only branches that don't contain the commit" msgstr "只輸出不包含此提交的分支" @@ -3711,7 +3908,9 @@ msgstr "只輸出尚未合併的分支" msgid "list branches in columns" msgstr "以行的形式列出分支" -#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c +#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c +#: builtin/notes.c builtin/notes.c builtin/notes.c +#: builtin/tag.c msgid "object" msgstr "object" @@ -3727,8 +3926,8 @@ msgstr "排序和過濾不區分大小寫" 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 builtin/for-each-ref.c builtin/ls-files.c +#: builtin/ls-tree.c builtin/tag.c builtin/verify-tag.c msgid "format to use for the output" msgstr "輸出格式" @@ -3751,7 +3950,7 @@ msgstr "" msgid "--recurse-submodules can only be used to create branches" msgstr "--recurse-submodules 只能用來建立分支" -#: builtin/branch.c +#: builtin/branch.c builtin/branch.c msgid "branch name required" msgstr "必須提供分支名稱" @@ -3789,7 +3988,7 @@ 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 builtin/branch.c #, c-format msgid "no such branch '%s'" msgstr "無「%s」分支" @@ -3887,8 +4086,11 @@ msgstr "" "請檢閱臭蟲報告下方的剩餘部分。\n" "您可刪除任何您不想分享的地方。\n" -#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c -#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c parse-options.h +#: builtin/bugreport.c builtin/commit.c builtin/commit.c +#: builtin/commit.c builtin/fast-export.c builtin/fast-export.c +#: builtin/fast-export.c builtin/fast-export.c +#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c +#: parse-options.h msgid "mode" msgstr "mode" @@ -3966,7 +4168,7 @@ msgstr "需要提供 引數" msgid "do not show progress meter" msgstr "不顯示進度列" -#: builtin/bundle.c builtin/pack-objects.c +#: builtin/bundle.c builtin/bundle.c builtin/pack-objects.c msgid "show progress meter" msgstr "顯示進度列" @@ -4180,7 +4382,8 @@ msgstr "「%s=<%s>」需要「%s」或「%s」" msgid "path|tree-ish" msgstr "path|tree-ish" -#: builtin/cat-file.c +#: builtin/cat-file.c builtin/cat-file.c builtin/cat-file.c +#: builtin/cat-file.c builtin/cat-file.c #, c-format msgid "'%s' requires a batch mode" msgstr "「%s」需要批次處理模式" @@ -4194,7 +4397,7 @@ msgstr "「-%c」與批次處理模式不相容" msgid "batch modes take no arguments" msgstr "批次處理模式不取引數" -#: builtin/cat-file.c +#: builtin/cat-file.c builtin/cat-file.c #, c-format msgid " required with '%s'" msgstr "「%s」需要 " @@ -4247,7 +4450,8 @@ msgstr "" 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 builtin/checkout.c builtin/gc.c +#: builtin/worktree.c msgid "suppress progress reporting" msgstr "不顯示進度報告" @@ -4311,8 +4515,10 @@ msgstr "未指定聯絡地址" msgid "git checkout--worker []" msgstr "git checkout--worker []" -#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c +#: builtin/checkout--worker.c builtin/checkout-index.c +#: builtin/column.c builtin/column.c builtin/submodule--helper.c #: builtin/submodule--helper.c builtin/worktree.c +#: builtin/worktree.c msgid "string" msgstr "string" @@ -4364,28 +4570,12 @@ msgstr "將內容寫入暫存檔" msgid "copy out the files from named stage" msgstr "從指定暫存區中拷出檔案" -#: builtin/checkout.c -msgid "git checkout [] " -msgstr "git checkout [] " - -#: builtin/checkout.c -msgid "git checkout [] [] -- ..." -msgstr "git checkout [] [] -- ..." - -#: builtin/checkout.c -msgid "git switch [] []" -msgstr "git switch [] []" - -#: builtin/checkout.c -msgid "git restore [] [--source=] ..." -msgstr "git restore [] [--source=] ..." - -#: builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c #, c-format msgid "path '%s' does not have our version" msgstr "「%s」路徑沒有我們的版本" -#: builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c #, c-format msgid "path '%s' does not have their version" msgstr "「%s」路徑沒有他們的版本" @@ -4428,6 +4618,7 @@ msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "已從索引區更新 %d 個路徑" +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c #: builtin/checkout.c #, c-format msgid "'%s' cannot be used with updating paths" @@ -4448,7 +4639,7 @@ msgstr "「%s」或「%s」皆未指定" msgid "'%s' must be used when '%s' is not specified" msgstr "未指定「%2$s」時，必須使用「%1$s」" -#: builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "「%s」或「%s」不能與 %s 同時使用" @@ -4458,13 +4649,16 @@ msgstr "「%s」或「%s」不能與 %s 同時使用" msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree" msgstr "「%s」、「%s」或「%s」不能在簽出樹狀物件時使用" -#: builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c #, c-format msgid "path '%s' is unmerged" msgstr "路徑「%s」未合併" -#: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c -#: merge-ort.c reset.c sequencer.c tree-walk.c +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c +#: builtin/grep.c builtin/grep.c builtin/grep.c +#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c +#: builtin/reset.c merge-ort.c reset.c sequencer.c +#: sequencer.c tree-walk.c #, c-format msgid "unable to read tree (%s)" msgstr "無法讀取樹狀物件（%s）" @@ -4491,7 +4685,7 @@ msgstr "無法對「%s」執行 reflog 動作：%s\n" msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c builtin/clone.c +#: builtin/checkout.c builtin/clone.c builtin/clone.c msgid "unable to update HEAD" msgstr "無法更新 HEAD" @@ -4510,7 +4704,7 @@ msgstr "已經位於「%s」\n" msgid "Switched to and reset branch '%s'\n" msgstr "已切換並重設分支「%s」\n" -#: builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c #, c-format msgid "Switched to a new branch '%s'\n" msgstr "已切換至新分支「%s」\n" @@ -4573,7 +4767,7 @@ msgstr "在修訂版遍歷時遇到內部錯誤" msgid "Previous HEAD position was" msgstr "之前的 HEAD 指標位置在" -#: builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c msgid "You are on a branch yet to be born" msgstr "您正位於一個尚未初始化的分支" @@ -4587,11 +4781,12 @@ msgstr "" "請使用 --（和可選的 --no-guess）來消除歧義" #: builtin/checkout.c +#, c-format 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" "\n" -" git checkout --track origin/\n" +" git %s --track origin/\n" "\n" "If you'd like to always have checkouts of an ambiguous prefer\n" "one remote, e.g. the 'origin' remote, consider setting\n" @@ -4600,7 +4795,7 @@ msgstr "" "如果您想要簽出遠端追蹤分支，例如「origin」，\n" "您可以使用 --track 選項寫出全名：\n" "\n" -" git checkout --track origin/\n" +" git %s --track origin/\n" "\n" "如果您平時比較想要使用模糊的簡短分支名稱 ，\n" "而不太想寫如「origin」的遠端版本庫名稱，\n" @@ -4620,12 +4815,12 @@ msgstr "預期只有一個引用" msgid "only one reference expected, %d given." msgstr "預期只有一個引用，卻提供了 %d 個。" -#: builtin/checkout.c builtin/worktree.c +#: builtin/checkout.c builtin/worktree.c builtin/worktree.c #, c-format msgid "invalid reference: %s" msgstr "無效引用：%s" -#: builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c #, c-format msgid "reference is not a tree: %s" msgstr "引用不是樹狀物件：%s" @@ -4640,7 +4835,7 @@ msgstr "預期收到分支，卻收到標籤「%s」" msgid "a branch is expected, got remote branch '%s'" msgstr "預期收到分支，卻收到遠端分支「%s」" -#: builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c #, c-format msgid "a branch is expected, got '%s'" msgstr "預期收到分支，卻收到「%s」" @@ -4703,7 +4898,7 @@ msgstr "在進行二分搜尋時切換分支" msgid "paths cannot be used with switching branches" msgstr "切換分支時不能指定路徑" -#: builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c #, c-format msgid "'%s' cannot be used with switching branches" msgstr "切換分支時不能指定「%s」" @@ -4713,7 +4908,8 @@ msgstr "切換分支時不能指定「%s」" msgid "'%s' needs the paths to check out" msgstr "「%s」需要指定要簽出的路徑" -#: builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c builtin/checkout.c #, c-format msgid "'%s' cannot be used with '%s'" msgstr "「%s」不能與「%s」同時使用" @@ -4741,7 +4937,8 @@ msgstr "未知的衝突輸出風格「%s」" msgid "perform a 3-way merge with the new branch" msgstr "和新分支進行三方合併" -#: builtin/checkout.c builtin/log.c builtin/range-diff.c parse-options.h +#: builtin/checkout.c builtin/log.c builtin/range-diff.c +#: parse-options.h msgid "style" msgstr "style" @@ -4785,6 +4982,22 @@ msgstr "簽出未合併檔案的他方版本" msgid "do not limit pathspecs to sparse entries only" msgstr "不將路徑規格限制為僅稀疏項目" +#: builtin/checkout.c +msgid "git checkout [] " +msgstr "git checkout [] " + +#: builtin/checkout.c +msgid "git checkout [] [] -- ..." +msgstr "git checkout [] [] -- ..." + +#: builtin/checkout.c +msgid "git switch [] []" +msgstr "git switch [] []" + +#: builtin/checkout.c +msgid "git restore [] [--source=] ..." +msgstr "git restore [] [--source=] ..." + #: builtin/checkout.c #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" @@ -4829,8 +5042,12 @@ msgstr "" msgid "you must specify path(s) to restore" msgstr "您必須指定要還原的路徑" -#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c +#: builtin/checkout.c builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c builtin/clone.c builtin/remote.c +#: builtin/remote.c builtin/replay.c builtin/replay.c +#: builtin/replay.c builtin/submodule--helper.c #: builtin/submodule--helper.c builtin/worktree.c +#: builtin/worktree.c msgid "branch" msgstr "branch" @@ -5038,9 +5255,11 @@ msgstr "互動式清除" msgid "remove whole directories" msgstr "移除整個目錄" -#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c -#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c -#: pack-refs.c ref-filter.h +#: builtin/clean.c builtin/config.c builtin/config.c +#: builtin/config.c builtin/describe.c builtin/describe.c +#: builtin/grep.c builtin/log.c builtin/log.c +#: builtin/ls-files.c builtin/name-rev.c builtin/name-rev.c +#: builtin/show-ref.c pack-refs.c pack-refs.c ref-filter.h msgid "pattern" msgstr "pattern" @@ -5065,7 +5284,8 @@ msgstr "clean.requireForce 是 true 且未給定 -f 選項：拒絕清理" 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 builtin/diff.c builtin/rm.c grep.c +#: setup.c #, c-format msgid "failed to stat '%s'" msgstr "對「%s」呼叫 stat 失敗" @@ -5176,7 +5396,7 @@ msgstr "不要拓製淺層版本庫" msgid "don't create a checkout" msgstr "不要建立簽出" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c builtin/clone.c builtin/init-db.c msgid "create a bare repository" msgstr "建立裸版本庫" @@ -5216,17 +5436,21 @@ msgstr "模板目錄" msgid "directory from which templates will be used" msgstr "將被使用的模板目錄" -#: builtin/clone.c builtin/submodule--helper.c +#: builtin/clone.c builtin/clone.c builtin/submodule--helper.c +#: builtin/submodule--helper.c builtin/submodule--helper.c msgid "reference repository" msgstr "引用版本庫" #: builtin/clone.c builtin/submodule--helper.c +#: builtin/submodule--helper.c 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/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 +#: t/helper/test-simple-ipc.c msgid "name" msgstr "name" @@ -5267,6 +5491,7 @@ msgid "deepen history of shallow clone, excluding ref" msgstr "取得更多淺層拓製的過往歷史記錄，除了特定修訂版" #: builtin/clone.c builtin/submodule--helper.c +#: builtin/submodule--helper.c msgid "clone only one branch, HEAD or --branch" msgstr "只拓製一個分支、HEAD 或 --branch" @@ -5287,6 +5512,7 @@ msgid "separate git dir from working tree" msgstr "git 目錄和工作區分離" #: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c +#: builtin/submodule--helper.c builtin/submodule--helper.c msgid "specify the reference format to use" msgstr "指定要使用的引用格式" @@ -5298,13 +5524,13 @@ msgstr "key=value" 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 builtin/fetch.c builtin/ls-remote.c +#: builtin/pull.c builtin/push.c builtin/send-pack.c 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 builtin/fetch.c builtin/ls-remote.c +#: builtin/pull.c builtin/push.c builtin/send-pack.c msgid "option to transmit" msgstr "傳輸選項" @@ -5340,8 +5566,9 @@ msgstr "太多參數。" msgid "You must specify a repository to clone." msgstr "您必須指定要拓製的版本庫。" -#: builtin/clone.c builtin/init-db.c builtin/refs.c builtin/submodule--helper.c -#: setup.c +#: builtin/clone.c builtin/init-db.c builtin/refs.c +#: builtin/submodule--helper.c builtin/submodule--helper.c +#: builtin/submodule--helper.c setup.c setup.c #, c-format msgid "unknown ref storage format '%s'" msgstr "未知的引用儲存格式「%s」" @@ -5371,7 +5598,8 @@ msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。" msgid "working tree '%s' already exists." msgstr "工作區 '%s' 已經存在。" -#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c +#: builtin/clone.c builtin/clone.c builtin/difftool.c +#: builtin/log.c builtin/worktree.c builtin/worktree.c #, c-format msgid "could not create leading directories of '%s'" msgstr "無法為「%s」建立前導目錄" @@ -5397,7 +5625,7 @@ msgid "" "able" msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容" -#: builtin/clone.c builtin/remote.c +#: builtin/clone.c builtin/remote.c builtin/remote.c #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一個有效的遠端名稱" @@ -5418,7 +5646,7 @@ msgstr "本機拓製會忽略 --shallow-exclude。請改用 file:// 協定。" msgid "--filter is ignored in local clones; use file:// instead." msgstr "本機拓製會忽略 --filter。請改用 file:// 協定。" -#: builtin/clone.c fetch-pack.c +#: builtin/clone.c fetch-pack.c fetch-pack.c msgid "source repository is shallow, reject to clone." msgstr "來源版本庫是淺版本庫 (shallow)。拒絕拓製。" @@ -5434,7 +5662,7 @@ msgstr "--local 被忽略" msgid "cannot clone from filtered bundle" msgstr "無法從過濾後的套件包拓製" -#: builtin/clone.c +#: builtin/clone.c builtin/clone.c msgid "failed to initialize the repo, skipping bundle URI" msgstr "無法初始化版本庫，略過套件包 URI" @@ -5447,7 +5675,7 @@ msgstr "無法從套件包 URL「%s」抓取物件" msgid "failed to fetch advertised bundles" msgstr "無法抓取公佈的套件包" -#: builtin/clone.c +#: builtin/clone.c builtin/clone.c msgid "remote transport reported error" msgstr "遠端傳輸回報錯誤" @@ -5473,7 +5701,7 @@ msgstr "git column [<選項>]" msgid "lookup config vars" msgstr "尋找設定變數" -#: builtin/column.c +#: builtin/column.c builtin/column.c msgid "layout to use" msgstr "要使用的配置" @@ -5524,8 +5752,8 @@ msgstr "" "[no-]progress]\n" " " -#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c builtin/log.c -#: builtin/repack.c +#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c +#: builtin/log.c builtin/repack.c builtin/repack.c msgid "dir" msgstr "目錄" @@ -5562,7 +5790,7 @@ msgstr "非期望的非十六進位物件 ID：%s" msgid "invalid object: %s" msgstr "物件無效：%s" -#: builtin/commit-graph.c parse-options-cb.c +#: builtin/commit-graph.c parse-options-cb.c parse-options-cb.c #, c-format msgid "option `%s' expects a numerical value" msgstr "選項 `%s' 期望一個數字值" @@ -5632,7 +5860,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重複的父提交 %s" -#: builtin/commit-tree.c builtin/log.c +#: builtin/commit-tree.c builtin/commit-tree.c builtin/log.c #, c-format msgid "not a valid object name %s" msgstr "不是一個有效的物件名 %s" @@ -5655,8 +5883,9 @@ msgstr "父提交" 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 builtin/commit.c builtin/merge.c +#: builtin/notes.c builtin/notes.c builtin/stash.c +#: builtin/tag.c msgid "message" msgstr "訊息" @@ -5668,8 +5897,8 @@ msgstr "提交說明" 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 builtin/commit.c builtin/merge.c +#: builtin/pull.c builtin/revert.c msgid "GPG sign commit" msgstr "GPG 提交簽名" @@ -5832,7 +6061,7 @@ msgid "" "in the current commit message" msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: builtin/commit.c +#: builtin/commit.c builtin/commit.c builtin/commit.c #, c-format msgid "could not lookup commit '%s'" msgstr "無法查詢提交「%s」" @@ -5856,7 +6085,7 @@ msgstr "無法讀取日誌檔案「%s」" msgid "options '%s' and '%s:%s' cannot be used together" msgstr "「%s」和「%s:%s」選項不得同時使用" -#: builtin/commit.c +#: builtin/commit.c builtin/commit.c msgid "could not read SQUASH_MSG" msgstr "無法讀取 SQUASH_MSG" @@ -5864,7 +6093,8 @@ msgstr "無法讀取 SQUASH_MSG" msgid "could not read MERGE_MSG" msgstr "無法讀取 MERGE_MSG" -#: builtin/commit.c bundle.c rerere.c sequencer.c +#: builtin/commit.c builtin/history.c builtin/submodule--helper.c +#: bundle.c rerere.c rerere.c sequencer.c sequencer.c #, c-format msgid "could not open '%s'" msgstr "無法開啟「%s」" @@ -5963,7 +6193,7 @@ msgstr "無法讀取索引" #: builtin/commit.c builtin/tag.c msgid "unable to pass trailers to --trailers" -msgstr "無法將尾部署名傳遞至 --trailers" +msgstr "無法將結尾資訊傳遞至 --trailers" #: builtin/commit.c msgid "Error building trees" @@ -5984,28 +6214,28 @@ msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者 msgid "Invalid ignored mode '%s'" msgstr "無效的忽略模式 '%s'" -#: builtin/commit.c +#: builtin/commit.c builtin/commit.c #, c-format msgid "Invalid untracked files mode '%s'" msgstr "無效的未追蹤檔案參數 '%s'" #: builtin/commit.c msgid "You are in the middle of a merge -- cannot reword." -msgstr "正在合併中——不能重新輸入。" +msgstr "正在合併中——不能改寫說明。" #: builtin/commit.c msgid "You are in the middle of a cherry-pick -- cannot reword." -msgstr "正在揀選中——不能重新輸入。" +msgstr "正在揀選中——不能改寫說明。" #: builtin/commit.c #, c-format msgid "reword option of '%s' and path '%s' cannot be used together" -msgstr "「%s」的改寫選項和「%s」路徑不得同時使用" +msgstr "「%s」的改寫說明選項和「%s」路徑不得同時使用" #: builtin/commit.c #, c-format msgid "reword option of '%s' and '%s' cannot be used together" -msgstr "「%s」的改寫選項和「%s」不得同時使用" +msgstr "「%s」的改寫說明選項和「%s」不得同時使用" #: builtin/commit.c msgid "You have nothing to amend." @@ -6037,11 +6267,11 @@ msgstr "未知選項：--fixup=%s:%s" msgid "paths '%s ...' with -a does not make sense" msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: builtin/commit.c +#: builtin/commit.c builtin/commit.c msgid "show status concisely" msgstr "以簡潔的格式顯示狀態" -#: builtin/commit.c +#: builtin/commit.c builtin/commit.c msgid "show branch information" msgstr "顯示分支訊息" @@ -6049,7 +6279,7 @@ msgstr "顯示分支訊息" msgid "show stash information" msgstr "顯示貯存區訊息" -#: builtin/commit.c +#: builtin/commit.c builtin/commit.c msgid "compute full ahead/behind values" msgstr "計算完整的領先/落後值" @@ -6057,19 +6287,20 @@ msgstr "計算完整的領先/落後值" msgid "version" msgstr "版本" -#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c +#: builtin/commit.c builtin/commit.c builtin/fetch.c +#: builtin/push.c builtin/worktree.c msgid "machine-readable output" msgstr "機器可讀的輸出" -#: builtin/commit.c +#: builtin/commit.c builtin/commit.c msgid "show status in long format (default)" msgstr "以長格式顯示狀態（預設值）" -#: builtin/commit.c +#: builtin/commit.c builtin/commit.c msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c +#: builtin/commit.c builtin/commit.c msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）" @@ -6140,7 +6371,8 @@ msgstr "日期" msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c parse-options.h ref-filter.h +#: builtin/commit.c builtin/commit.c builtin/commit.c +#: parse-options.h ref-filter.h msgid "commit" msgstr "提交" @@ -6172,16 +6404,17 @@ msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" 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/tag.c +#: builtin/commit.c builtin/interpret-trailers.c builtin/rebase.c +#: builtin/tag.c msgid "trailer" -msgstr "尾部署名" +msgstr "結尾資訊" -#: builtin/commit.c builtin/tag.c +#: builtin/commit.c builtin/rebase.c builtin/tag.c msgid "add custom trailer(s)" -msgstr "加入自訂尾部署名" +msgstr "加入自訂結尾資訊" -#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c -#: builtin/revert.c +#: builtin/commit.c builtin/log.c builtin/merge.c +#: builtin/pull.c builtin/revert.c msgid "add a Signed-off-by trailer" msgstr "在結尾加入 Signed-off-by" @@ -6245,7 +6478,7 @@ msgstr "允許一個空提交" msgid "ok to record a change with an empty message" msgstr "允許空的提交說明" -#: builtin/commit.c sequencer.c +#: builtin/commit.c sequencer.c sequencer.c msgid "could not parse HEAD commit" msgstr "無法解析 HEAD 提交" @@ -6263,7 +6496,7 @@ msgstr "無法讀取 MERGE_MODE" msgid "could not read commit message: %s" msgstr "無法讀取提交說明：%s" -#: builtin/commit.c +#: builtin/commit.c builtin/history.c #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "終止提交因為提交說明為空。\n" @@ -6287,7 +6520,7 @@ msgstr "" "版本庫已更新，但無法寫入新的索引檔案。請檢查磁碟是否\n" "已滿或磁碟配額已耗盡，然後執行「git restore --staged :/」復原。" -#: builtin/config.c +#: builtin/config.c builtin/config.c msgid "git config list [] [] [--includes]" msgstr "git config list [<檔案選項>] [<顯示選項>] [--includes]" @@ -6309,7 +6542,7 @@ msgstr "" "git config set [] [--type=] [--all] [--value=] " "[--fixed-value] " -#: builtin/config.c +#: builtin/config.c builtin/config.c msgid "" "git config unset [] [--all] [--value=] [--fixed-value] " "" @@ -6317,15 +6550,15 @@ msgstr "" "git config unset [] [--all] [--value=] [--fixed-value] " "" -#: builtin/config.c +#: builtin/config.c builtin/config.c msgid "git config rename-section [] " msgstr "git config rename-section [<檔案選項>] <舊名稱> <新名稱>" -#: builtin/config.c +#: builtin/config.c builtin/config.c msgid "git config remove-section [] " msgstr "git config remove-section [<檔案選項>] <名稱>" -#: builtin/config.c +#: builtin/config.c builtin/config.c msgid "git config edit []" msgstr "git config edit [<檔案選項>]" @@ -6371,7 +6604,7 @@ msgstr "使用版本庫級設定檔案" msgid "use per-worktree config file" msgstr "使用工作區級別的設定檔案" -#: builtin/config.c builtin/gc.c +#: builtin/config.c builtin/gc.c builtin/gc.c msgid "use given config file" msgstr "使用指定的設定檔案" @@ -6488,7 +6721,7 @@ msgstr "無法解析顏色 '%s'" msgid "unable to parse default color value" msgstr "無法解析預設顏色值" -#: builtin/config.c +#: builtin/config.c builtin/config.c msgid "not in a git directory" msgstr "不在 git 版本庫中" @@ -6531,7 +6764,7 @@ msgstr "--blob 只能在一個版本庫內使用" msgid "--worktree can only be used inside a git repository" msgstr "--worktree 只能在 git 版本庫中使用" -#: builtin/config.c builtin/gc.c +#: builtin/config.c builtin/gc.c builtin/gc.c msgid "$HOME not set" msgstr "$HOME 未設定" @@ -6544,20 +6777,21 @@ msgstr "" "不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴充部分。\n" "詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節" +#: builtin/config.c builtin/config.c builtin/config.c #: builtin/config.c msgid "Other" msgstr "其他" -#: builtin/config.c +#: builtin/config.c builtin/config.c builtin/config.c msgid "respect include directives on lookup" msgstr "查詢時引用 include 指令遞迴尋找" -#: builtin/config.c +#: builtin/config.c builtin/config.c #, c-format msgid "unable to read config file '%s'" msgstr "無法讀取設定檔案 '%s'" -#: builtin/config.c +#: builtin/config.c builtin/config.c msgid "error processing config file(s)" msgstr "處理設定檔案發生錯誤" @@ -6573,10 +6807,11 @@ msgstr "回傳有多項值之組態選項的所有值" msgid "interpret the name as a regular expression" msgstr "將名稱當作常規表示式解讀" -#: builtin/config.c +#: builtin/config.c builtin/config.c msgid "show config with values matching the pattern" msgstr "顯示值符合模式的組態" +#: builtin/config.c builtin/config.c builtin/config.c #: builtin/config.c msgid "use string equality when comparing values to value pattern" msgstr "使用字串相等比較值和模式" @@ -6589,6 +6824,7 @@ msgstr "URL" msgid "show config matching the given URL" msgstr "顯示符合提供 URL 的組態" +#: builtin/config.c builtin/config.c builtin/config.c #: builtin/config.c msgid "value" msgstr "取值" @@ -6597,7 +6833,7 @@ msgstr "取值" msgid "use default value when missing entry" msgstr "未指定參數時所使用的預設值" -#: builtin/config.c +#: builtin/config.c builtin/config.c builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value 僅套用至 'value-pattern'" @@ -6609,7 +6845,7 @@ msgstr "--default= 無法和 --all 或 --url= 一起使用" msgid "--url= cannot be used with --all, --regexp or --value" msgstr "--url= 無法和 --all、--regexp、--value 一起使用" -#: builtin/config.c +#: builtin/config.c builtin/config.c msgid "Filter" msgstr "過濾器" @@ -6617,7 +6853,7 @@ msgstr "過濾器" msgid "replace multi-valued config option with new value" msgstr "以新值取代有多項值的組態選項" -#: builtin/config.c +#: builtin/config.c builtin/config.c msgid "human-readable comment string (# will be prepended as needed)" msgstr "人類可讀的備註字串（將按需插入 # 至前方）" @@ -6650,6 +6886,7 @@ msgstr "取消設定所有多值組態選項" msgid "unset multi-valued config options with matching values" msgstr "取消設定其值相符的多值組態選項" +#: builtin/config.c builtin/config.c builtin/config.c #: builtin/config.c #, c-format msgid "no such section: %s" @@ -6788,11 +7025,12 @@ msgstr "" msgid "print debugging messages to stderr" msgstr "除錯訊息輸出到標準錯誤" +#: builtin/credential-cache--daemon.c #: builtin/credential-cache--daemon.c msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援" -#: builtin/credential-cache.c +#: builtin/credential-cache.c builtin/credential-cache.c msgid "credential-cache unavailable; no unix socket support" msgstr "credential-cache 無法使用；缺少 unix socket 支援" @@ -6951,7 +7189,7 @@ msgstr "不考慮符合 <模式> 的標籤" msgid "show abbreviated commit object as fallback" msgstr "顯示簡寫的提交號作為後備" -#: builtin/describe.c +#: builtin/describe.c builtin/describe.c msgid "mark" msgstr "標記" @@ -6967,10 +7205,10 @@ msgstr "對於損壞的工作區，追加 <標記>（預設值：」-broken\"） msgid "No names found, cannot describe anything." msgstr "沒有發現名稱，無法描述任何東西。" -#: builtin/describe.c +#: builtin/describe.c builtin/describe.c #, c-format msgid "option '%s' and commit-ishes cannot be used together" -msgstr "「%s」選項和提交號不得同時使用" +msgstr "「%s」選項和提交指示元不得同時使用" #: builtin/diagnose.c msgid "" @@ -7006,12 +7244,6 @@ msgstr "無法解析物件 ID：%s" msgid "git diff-pairs -z []" msgstr "git diff-pairs -z []" -#: builtin/diff-pairs.c builtin/log.c builtin/replay.c builtin/shortlog.c -#: bundle.c -#, c-format -msgid "unrecognized argument: %s" -msgstr "不認識的引數：%s" - #: builtin/diff-pairs.c msgid "working without -z is not supported" msgstr "不支援在無 -z 的情況下運作" @@ -7073,7 +7305,8 @@ msgstr "無效選項：%s" msgid "%s...%s: no merge base" msgstr "%s...%s: 無合併基底" -#: builtin/diff.c setup.c +#: builtin/diff.c setup.c setup.c setup.c setup.c +#: setup.c msgid "cannot come back to cwd" msgstr "無法返回目前工作目錄" @@ -7137,7 +7370,7 @@ msgstr "兩個檔案都被修改：'%s' 和 '%s'。" msgid "working tree file has been left." msgstr "工作區檔案被留了下來。" -#: builtin/difftool.c sequencer.c +#: builtin/difftool.c sequencer.c sequencer.c sequencer.c #, c-format msgid "could not copy '%s' to '%s'" msgstr "無法將「%s」複製至「%s」" @@ -7229,7 +7462,7 @@ msgstr "標籤之物件濾除者的模式未知：%s" msgid "unknown reencoding mode: %s" msgstr "重新編碼的模式未知：%s" -#: builtin/fast-export.c +#: builtin/fast-export.c builtin/fast-export.c #, c-format msgid "could not read blob %s" msgstr "無法讀取資料物件 %s" @@ -7249,7 +7482,7 @@ msgstr "無法寫入資料物件「%s」" msgid "unexpected comparison status '%c' for %s, %s" msgstr "%2$s、%3$s 有非預期的比較狀態「%1$c」" -#: builtin/fast-export.c +#: builtin/fast-export.c builtin/fast-export.c msgid "none" msgstr "無" @@ -7286,14 +7519,6 @@ msgstr "去除提交 %s 的簽章" msgid "encountered signed commit %s; use --signed-commits= to handle it" msgstr "發現已簽署的提交 %s；使用 --signed-commits= 來處理" -#: builtin/fast-export.c -msgid "" -"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" -"commits=" -msgstr "" -"「strip-if-invalid」不是搭配 --signed-commits= 使用 git fast-export 的" -"有效模式" - #: builtin/fast-export.c #, c-format msgid "" @@ -7323,14 +7548,6 @@ msgstr "去除標籤 %s 的簽章" msgid "encountered signed tag %s; use --signed-tags= to handle it" msgstr "發現已簽署的標籤 %s；使用 --signed-tags= 來處理" -#: builtin/fast-export.c -msgid "" -"'strip-if-invalid' is not a valid mode for git fast-export with --signed-" -"tags=" -msgstr "" -"「strip-if-invalid」不是搭配 --signed-tags= 使用 git fast-export 的有效" -"模式" - #: builtin/fast-export.c #, c-format msgid "" @@ -7367,12 +7584,14 @@ msgstr "無法為寫入開啟標記檔案 %s。" msgid "unable to write marks file %s." msgstr "無法寫入標記檔案 %s。" -#: builtin/fast-export.c builtin/fast-import.c +#: builtin/fast-export.c builtin/fast-export.c +#: builtin/fast-import.c builtin/fast-import.c #, c-format msgid "corrupt mark line: %s" msgstr "損壞的標記列：%s" -#: builtin/fast-export.c builtin/fast-import.c fetch-pack.c +#: builtin/fast-export.c builtin/fast-import.c +#: builtin/fast-import.c fetch-pack.c fetch-pack.c #, c-format msgid "object not found: %s" msgstr "物件未找到：%s" @@ -7545,7 +7764,7 @@ msgstr "非預期的壓縮失敗：%d" msgid "not a tree: %s" msgstr "非樹狀物件：%s" -#: builtin/fast-import.c +#: builtin/fast-import.c builtin/fast-import.c #, c-format msgid "can't load tree %s" msgstr "無法載入樹狀物件 %s" @@ -7559,7 +7778,7 @@ msgstr "%s 中有損壞的模式" msgid "root cannot be a non-directory" msgstr "根不能不是目錄" -#: builtin/fast-import.c +#: builtin/fast-import.c builtin/fast-import.c msgid "empty path component found in input" msgstr "輸入中有空的路徑部分" @@ -7582,8 +7801,8 @@ msgstr "分支 %s 缺少提交。" msgid "not updating %s (new tip %s does not contain %s)" msgstr "沒有更新 %s（提示：%s 不包含 %s）" -#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c -#: sequencer.c +#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c +#: midx-write.c sequencer.c #, c-format msgid "unable to create leading directories of %s" msgstr "不能為 %s 建立先導目錄" @@ -7642,7 +7861,7 @@ msgstr "身分字串中缺少 >：%s" msgid "missing space after > in ident string: %s" msgstr "身分字串的 > 後面缺少空格：%s" -#: builtin/fast-import.c +#: builtin/fast-import.c builtin/fast-import.c #, c-format msgid "invalid raw date \"%s\" in ident: %s" msgstr "身分中有無效的原始日期「%s」：%s" @@ -7702,17 +7921,18 @@ msgstr "%s 後有垃圾：%s" msgid "missing space after %s: %s" msgstr "%s 後缺少空格：%s" -#: builtin/fast-import.c +#: builtin/fast-import.c builtin/fast-import.c #, c-format msgid "corrupt mode: %s" msgstr "損壞的模式：%s" -#: builtin/fast-import.c +#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c builtin/fast-import.c #, c-format msgid "invalid dataref: %s" msgstr "無效的資料引用：%s" -#: builtin/fast-import.c +#: builtin/fast-import.c builtin/fast-import.c #, c-format msgid "missing space after SHA1: %s" msgstr "SHA1 值後缺少空格：%s" @@ -7755,22 +7975,25 @@ msgstr "分支中沒有路徑 %s" msgid "can't add a note on empty branch." msgstr "不能在空分支上附加註記。" +#: builtin/fast-import.c builtin/fast-import.c #: builtin/fast-import.c #, c-format msgid "mark :% not a commit" msgstr "標記 :% 不是提交" +#: builtin/fast-import.c builtin/fast-import.c #: builtin/fast-import.c #, c-format msgid "not a valid commit: %s" msgstr "不是有效的提交：%s" -#: builtin/fast-import.c +#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c builtin/fast-import.c #, c-format msgid "invalid ref name or SHA1 expression: %s" msgstr "無效的引用名稱或 SHA1 表示式：%s" -#: builtin/fast-import.c +#: builtin/fast-import.c builtin/fast-import.c #, c-format msgid "not a blob (actually a %s): %s" msgstr "不是資料物件（而是 %s）：%s" @@ -7822,7 +8045,8 @@ msgstr "找到多個 %s 簽章，忽略多餘的簽章" msgid "parse_one_signature() returned unknown hash algo" msgstr "parse_one_signature() 回傳了未知的雜湊演算法" -#: builtin/fast-import.c builtin/fsck.c +#: builtin/fast-import.c builtin/fsck.c builtin/fsck.c +#: builtin/fsck.c msgid "unknown" msgstr "未知" @@ -7853,6 +8077,45 @@ msgstr "" "正在去除提交的無效簽章\n" " 據稱由 %s 所簽" +#: builtin/fast-import.c +#, c-format +msgid "" +"replacing invalid signature for commit '%.100s...'\n" +" allegedly by %s" +msgstr "" +"正在取代提交「%.100s...」的無效簽章\n" +" 據稱由 %s 所簽" + +#: builtin/fast-import.c +#, c-format +msgid "" +"replacing invalid signature for commit '%.*s'\n" +" allegedly by %s" +msgstr "" +"正在取代提交「%.*s」的無效簽章\n" +" 據稱由 %s 所簽" + +#: builtin/fast-import.c +#, c-format +msgid "" +"replacing invalid signature for commit\n" +" allegedly by %s" +msgstr "" +"正在取代提交的無效簽章\n" +" 據稱由 %s 所簽" + +#: builtin/fast-import.c builtin/fast-import.c +msgid "aborting due to invalid signature" +msgstr "因為簽章無效而中止" + +#: builtin/fast-import.c +msgid "signing commits in interoperability mode is unsupported" +msgstr "不支援在互通模式下簽署提交" + +#: builtin/fast-import.c +msgid "failed to sign commit object" +msgstr "無法簽署提交物件" + #: builtin/fast-import.c msgid "expected committer but didn't get one" msgstr "預期有提交者，卻沒收到" @@ -7869,6 +8132,10 @@ msgstr "去除提交簽章" msgid "importing a commit signature verbatim" msgstr "按原樣匯入提交簽章" +#: builtin/fast-import.c +msgid "failed to sign tag object" +msgstr "無法簽署標籤物件" + #: builtin/fast-import.c #, c-format msgid "importing a tag signature verbatim for tag '%s'" @@ -7883,14 +8150,6 @@ msgstr "去除標籤「%s」的簽章" msgid "encountered signed tag; use --signed-tags= to handle it" msgstr "發現已簽署的標籤；使用 --signed-tags= 來處理" -#: builtin/fast-import.c -msgid "" -"'strip-if-invalid' is not a valid mode for git fast-import with --signed-" -"tags=" -msgstr "" -"「strip-if-invalid」不是搭配 --signed-tags= 使用 git fast-import 的有效" -"模式" - #: builtin/fast-import.c #, c-format msgid "expected 'from' command, got '%s'" @@ -7924,6 +8183,7 @@ msgstr "物件 %s 是 %s，但預期是資料物件。" msgid "not a mark: %s" msgstr "不是標記：%s" +#: builtin/fast-import.c builtin/fast-import.c #: builtin/fast-import.c #, c-format msgid "unknown mark: %s" @@ -8118,7 +8378,7 @@ msgstr "找不到物件 %s" msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c +#: builtin/fetch.c builtin/fetch.c builtin/fetch.c msgid "[rejected]" msgstr "[已拒絕]" @@ -8130,6 +8390,7 @@ msgstr "無法抓取至已簽出分支" msgid "[tag update]" msgstr "[標籤更新]" +#: builtin/fetch.c builtin/fetch.c builtin/fetch.c #: builtin/fetch.c msgid "unable to update local ref" msgstr "不能更新本機引用" @@ -8158,7 +8419,8 @@ msgstr "強制更新" msgid "non-fast-forward" msgstr "非快轉" -#: builtin/fetch.c builtin/grep.c sequencer.c +#: builtin/fetch.c builtin/fetch.c builtin/grep.c +#: sequencer.c #, c-format msgid "cannot open '%s'" msgstr "不能開啟 '%s'" @@ -8314,12 +8576,12 @@ msgstr "" "找不到來源分支。\n" "您得使用 --set-upstream 選項明確指定一個分支" -#: builtin/fetch.c +#: builtin/fetch.c builtin/fetch.c #, c-format msgid "Fetching %s\n" msgstr "正在取得 %s\n" -#: builtin/fetch.c +#: builtin/fetch.c builtin/fetch.c #, c-format msgid "could not fetch %s" msgstr "無法取得 %s" @@ -8394,7 +8656,7 @@ msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除遠端不存在的本機標籤，並且取代變更標籤" # 譯者：可選值，不能翻譯 -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c builtin/fetch.c builtin/pull.c msgid "on-demand" msgstr "on-demand" @@ -8414,7 +8676,8 @@ msgstr "保持下載包" msgid "allow updating of HEAD ref" msgstr "允許更新 HEAD 引用" -#: builtin/fetch.c builtin/pull.c +#: builtin/fetch.c builtin/fetch.c builtin/pull.c +#: builtin/pull.c msgid "deepen history of shallow clone" msgstr "取得淺拓製的更多過去歷史記錄" @@ -8452,7 +8715,8 @@ msgstr "引用映射" msgid "specify fetch refmap" msgstr "指定取得動作的引用映射" -#: builtin/fetch.c builtin/pull.c builtin/rebase.c builtin/replay.c +#: builtin/fetch.c builtin/pull.c builtin/rebase.c +#: builtin/replay.c msgid "revision" msgstr "revision" @@ -8464,7 +8728,7 @@ msgstr "報告我們只擁有從該物件開始可以取得的物件" msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "不取得 packfile，而是輸出協商的祖先提交" -#: builtin/fetch.c +#: builtin/fetch.c builtin/fetch.c msgid "run 'maintenance --auto' after fetching" msgstr "取得 (fetch) 後執行 'maintenance --auto'" @@ -8667,7 +8931,7 @@ msgid "got bad config --config=%s" msgstr "收到無效的組態 --config=%s" #. TRANSLATORS: e.g. error in tree 01bfda: -#: builtin/fsck.c +#: builtin/fsck.c builtin/fsck.c #, c-format msgid "error in %s %s: %s" msgstr "%s %s 錯誤：%s" @@ -8678,7 +8942,7 @@ msgstr "%s %s 錯誤：%s" msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c +#: builtin/fsck.c builtin/fsck.c #, c-format msgid "broken link from %7s %s" msgstr "來自 %7s %s 的損壞的連結" @@ -8719,7 +8983,8 @@ msgstr "懸空 %s %s" msgid "could not create lost-found" msgstr "無法建立 lost-found" -#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c +#: builtin/fsck.c builtin/gc.c builtin/rebase.c +#: rebase-interactive.c rerere.c rerere.c sequencer.c #: sequencer.c #, c-format msgid "could not write '%s'" @@ -8850,7 +9115,7 @@ msgstr "無法讀取「%s」封裝的修訂版索引 (rev-index)" msgid "invalid rev-index for pack '%s'" msgstr "「%s」封裝的修訂版索引 (rev-index) 無效" -#: builtin/fsck.c +#: builtin/fsck.c builtin/fsck.c msgid "Checking ref database" msgstr "正在檢查引用資料庫" @@ -8930,7 +9195,7 @@ msgstr "git fsmonitor--daemon start []" msgid "git fsmonitor--daemon run []" msgstr "git fsmonitor--daemon run []" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" msgstr "「%s」的數值超出範圍：%d" @@ -8986,7 +9251,7 @@ msgstr "無法初始化健康檢查執行緒" msgid "could not cd home '%s'" msgstr "無法 cd home '%s'" -#: builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor--daemon is already running '%s'" msgstr "fsmonitor--daemon 已在執行「%s」" @@ -9225,7 +9490,7 @@ msgstr "'%s' 非有效作業" msgid "task '%s' cannot be selected multiple times" msgstr "不能多次選取 '%s' 作業" -#: builtin/gc.c +#: builtin/gc.c builtin/gc.c msgid "run tasks based on the state of the repository" msgstr "基於版本庫狀態執行作業" @@ -9245,7 +9510,7 @@ msgstr "依據頻率執行工作" msgid "do not report progress or other information over stderr" msgstr "不要在 stderr 輸出進度或其他資訊" -#: builtin/gc.c +#: builtin/gc.c builtin/gc.c msgid "task" msgstr "作業" @@ -9277,11 +9542,11 @@ msgstr "版本庫「%s」未註冊" msgid "failed to expand path '%s'" msgstr "無法展開「%s」路徑" -#: builtin/gc.c +#: builtin/gc.c builtin/gc.c msgid "failed to start launchctl" msgstr "無法啟動 launchctl" -#: builtin/gc.c +#: builtin/gc.c builtin/gc.c builtin/gc.c #, c-format msgid "failed to create directories for '%s'" msgstr "無法建立「%s」的目錄" @@ -9319,12 +9584,13 @@ msgstr "無法執行「crontab」；您的系統可能不支援「cron」" msgid "'crontab' died" msgstr "「crontab」結束運作" -#: builtin/gc.c builtin/worktree.c +#: builtin/gc.c builtin/gc.c builtin/gc.c builtin/worktree.c +#: builtin/worktree.c #, c-format msgid "failed to delete '%s'" msgstr "刪除 '%s' 失敗" -#: builtin/gc.c rerere.c +#: builtin/gc.c builtin/gc.c rerere.c #, c-format msgid "failed to flush '%s'" msgstr "排清 '%s' 失敗" @@ -9415,11 +9681,13 @@ msgstr "grep：無法建立執行緒：%s" msgid "invalid number of threads specified (%d) for %s" msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" +#. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c +#: builtin/grep.c builtin/index-pack.c builtin/index-pack.c +#: builtin/pack-objects.c #, c-format msgid "no threads support, ignoring %s" msgstr "沒有執行緒支援，忽略 %s" @@ -9777,7 +10045,7 @@ msgstr "無法解析 emacsclient 版本。" msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c +#: builtin/help.c builtin/help.c builtin/help.c builtin/help.c #, c-format msgid "failed to exec '%s'" msgstr "執行 '%s' 失敗" @@ -9813,7 +10081,7 @@ msgstr "沒有 man 檢視器處理此請求" msgid "no info viewer handled the request" msgstr "沒有 info 檢視器處理此請求" -#: builtin/help.c git.c +#: builtin/help.c builtin/help.c git.c #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的別名" @@ -9833,7 +10101,7 @@ 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 builtin/help.c #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" @@ -9842,13 +10110,195 @@ msgstr "用法：%s%s" msgid "'git help config' for more information" msgstr "'git help config' 取得更多訊息" +#: builtin/history.c +msgid "git history reword [--dry-run] [--update-refs=(branches|head)]" +msgstr "" +"git history reword [--dry-run] [--update-refs=(branches|head)]" + +#: builtin/history.c +msgid "" +"git history split [--dry-run] [--update-refs=(branches|head)] [--] " +"[...]" +msgstr "" +"git history split [--dry-run] [--update-refs=(branches|head)] [--] " +"[...]" + +#: builtin/history.c +#, c-format +msgid "" +"Please enter the commit message for the %s changes. Lines starting\n" +"with '%s' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"請輸入描述 %s 變更的提交訊息。開頭是「%s」的列\n" +"皆會忽略。提交訊息空白則取消本次提交作業。\n" + +#: builtin/history.c +#, c-format +msgid "Aborting commit as launching the editor failed.\n" +msgstr "中止提交，因為無法開啟編輯器。\n" + +#: builtin/history.c builtin/history.c +#, c-format +msgid "unable to parse parent commit %s" +msgstr "無法解析上級提交 %s" + +#: builtin/history.c +#, c-format +msgid "%s expects one of 'branches' or 'head'" +msgstr "%s 預期是「branches」或「head」之一" + +#: builtin/history.c replay.c +msgid "error preparing revisions" +msgstr "無法準備修訂集" + +#: builtin/history.c replay.c +msgid "replaying merge commits is not supported yet!" +msgstr "尚不支援重放合併提交！" + +#: builtin/history.c +msgid "cannot look up HEAD" +msgstr "無法查詢 HEAD" + +#: builtin/history.c +msgid "cannot determine descendance" +msgstr "無法判定繼承關係" + +#: builtin/history.c +msgid "" +"rewritten commit must be an ancestor of HEAD when using --update-refs=head" +msgstr "使用 --update-refs=head 時，重寫後的提交必須是 HEAD 的祖先" + +#: builtin/history.c builtin/replay.c +#, c-format +msgid "failed to begin ref transaction: %s" +msgstr "無法開始引用事務：%s" + +#: builtin/history.c builtin/history.c builtin/replay.c +#, c-format +msgid "failed to update ref '%s': %s" +msgstr "無法更新「%s」引用：%s" + +#: builtin/history.c builtin/replay.c +#, c-format +msgid "failed to commit ref transaction: %s" +msgstr "無法提交引用事務：%s" + +#: builtin/history.c +msgid "control which refs should be updated" +msgstr "控制要更新的引用" + +#: builtin/history.c builtin/history.c +msgid "perform a dry-run without updating any refs" +msgstr "進行測試執行，不更新任何引用" + +#: builtin/history.c +msgid "command expects a single revision" +msgstr "命令預期只有一個修訂版" + +#: builtin/history.c builtin/history.c +#, c-format +msgid "commit cannot be found: %s" +msgstr "找不到提交：%s" + +#: builtin/history.c +msgid "failed writing reworded commit" +msgstr "無法寫入改寫說明後的提交" + +#: builtin/history.c builtin/history.c +msgid "failed replaying descendants" +msgstr "重放後代失敗" + +#: builtin/history.c +msgid "unable to populate index with tree" +msgstr "無法以樹狀物件填入索引" + +#: builtin/history.c +msgid "unable to acquire index lock" +msgstr "無法取得索引鎖" + +#: builtin/history.c +msgid "failed reading temporary index" +msgstr "無法讀取暫存索引" + +#: builtin/history.c +msgid "failed split tree" +msgstr "無法拆分樹狀物件" + +#: builtin/history.c +msgid "split commit is empty" +msgstr "拆出的提交是空白的" + +#: builtin/history.c +msgid "split commit tree matches original commit" +msgstr "拆分提交的樹狀物件和原始提交相同" + +#: builtin/history.c +msgid "failed writing first commit" +msgstr "無法寫入第一個提交" + +#: builtin/history.c +msgid "failed writing second commit" +msgstr "無法寫入第二個提交" + +#: builtin/history.c +msgid "control ref update behavior" +msgstr "控制引用的更新行為" + +#: builtin/history.c +msgid "command expects a committish" +msgstr "命令預期有一個提交指示元" + +#: builtin/history.c +msgid "cannot split up merge commit" +msgstr "無法拆分合併提交" + +#: builtin/hook.c +msgid "" +"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" +"stdin=] [-- ]" +msgstr "" +"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" +"stdin=] [-- ]" + +#: builtin/hook.c +msgid "" +"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] " +msgstr "" +"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] " + +#: builtin/hook.c +msgid "use NUL as line terminator" +msgstr "使用 NUL 作為列終止符" + #: builtin/hook.c +msgid "show the config scope that defined each hook" +msgstr "顯示定義每個掛鉤的組態範圍" + +#: builtin/hook.c builtin/hook.c +msgid "allow running a hook with a non-native hook name" +msgstr "允許執行非原生名稱的掛鉤" + +#: builtin/hook.c +msgid "you must specify a hook event name to list" +msgstr "您必須指定要列出的掛鉤事件名稱" + +#: builtin/hook.c builtin/hook.c +#, c-format msgid "" -"git hook run [--ignore-missing] [--to-stdin=] [-- ]" +"unknown hook event '%s';\n" +"use --allow-unknown-hook-name to allow non-native hook names" msgstr "" -"git hook run [--ignore-missing] [--to-stdin=] [-- ]" +"未知的掛鉤事件「%s」，\n" +"請使用 --allow-unknown-hook-name 以允許指定非原生的掛鉤名稱" + +#: builtin/hook.c +#, c-format +msgid "no hooks found for event '%s'" +msgstr "找不到事件「%s」的掛鉤" + +#: builtin/hook.c +msgid "hook from hookdir" +msgstr "來自 hookdir 的掛鉤" #: builtin/hook.c msgid "silently ignore missing requested " @@ -9946,7 +10396,8 @@ msgstr[0] "包檔案過早結束，缺少 % 位元組" msgid "serious inflate inconsistency" msgstr "解壓縮嚴重的不一致" -#: builtin/index-pack.c +#: builtin/index-pack.c builtin/index-pack.c builtin/index-pack.c +#: builtin/index-pack.c builtin/index-pack.c #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "發現 %s 出現 SHA1 衝突！" @@ -9966,7 +10417,7 @@ msgstr "不能讀取現存物件 %s" msgid "invalid blob object %s" msgstr "無效的資料物件 %s" -#: builtin/index-pack.c +#: builtin/index-pack.c builtin/index-pack.c msgid "fsck error in packed object" msgstr "對打包物件 fsck 檢查發生錯誤" @@ -9980,7 +10431,7 @@ msgstr "無效的 %s" msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子物件並非都可以取得" -#: builtin/index-pack.c +#: builtin/index-pack.c builtin/index-pack.c msgid "failed to apply delta" msgstr "套用 delta 失敗" @@ -10013,6 +10464,7 @@ msgid "Resolving deltas" msgstr "處理 delta 中" #: builtin/index-pack.c builtin/pack-objects.c +#: builtin/pack-objects.c #, c-format msgid "unable to create thread: %s" msgstr "不能建立執行緒：%s" @@ -10030,7 +10482,7 @@ msgstr[0] "完成 %d 個本機物件" #: builtin/index-pack.c #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）" +msgstr "%s 的尾部總和檢查碼與預期不符（磁碟損壞？）" #: builtin/index-pack.c #, c-format @@ -10124,12 +10576,12 @@ msgstr "無法返回目前工作目錄" msgid "bad --pack_header: %s" msgstr "無效的 --pack_header：%s" -#: builtin/index-pack.c +#: builtin/index-pack.c builtin/index-pack.c #, c-format msgid "bad %s" msgstr "錯誤選項 %s" -#: builtin/index-pack.c builtin/init-db.c setup.c +#: builtin/index-pack.c builtin/init-db.c setup.c setup.c #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的「%s」雜湊算法" @@ -10188,12 +10640,12 @@ msgstr "雜湊" msgid "specify the hash algorithm to use" msgstr "指定要使用的雜湊算法" -#: builtin/init-db.c +#: builtin/init-db.c builtin/init-db.c #, c-format msgid "cannot mkdir %s" msgstr "不能建立目錄 %s" -#: builtin/init-db.c +#: builtin/init-db.c builtin/init-db.c #, c-format msgid "cannot chdir to %s" msgstr "不能切換目錄到 %s" @@ -10224,25 +10676,6 @@ msgstr "" " [(--trailer (|)[(=|:)])...]\n" " [--parse] [...]" -#: builtin/interpret-trailers.c wrapper.c -#, c-format -msgid "could not stat %s" -msgstr "無法 stat %s" - -#: builtin/interpret-trailers.c -#, c-format -msgid "file %s is not a regular file" -msgstr "檔案 %s 不是一個正規檔案" - -#: builtin/interpret-trailers.c -#, c-format -msgid "file %s is not writable by user" -msgstr "檔案 %s 使用者不可寫" - -#: builtin/interpret-trailers.c -msgid "could not open temporary file" -msgstr "無法開啟暫存檔" - #: builtin/interpret-trailers.c #, c-format msgid "could not read input file '%s'" @@ -10254,6 +10687,11 @@ msgstr "無法從標準輸入讀取" #: builtin/interpret-trailers.c #, c-format +msgid "could not write to temporary file '%s'" +msgstr "無法寫入暫存檔案「%s」" + +#: builtin/interpret-trailers.c trailer.c +#, c-format msgid "could not rename temporary file to %s" msgstr "無法將暫存檔重新命名為 %s" @@ -10263,7 +10701,7 @@ msgstr "在原位編輯檔案" #: builtin/interpret-trailers.c msgid "trim empty trailers" -msgstr "刪除空的尾部署名" +msgstr "刪除空的結尾資訊" #: builtin/interpret-trailers.c msgid "placement" @@ -10271,27 +10709,27 @@ msgstr "placement" #: builtin/interpret-trailers.c msgid "where to place the new trailer" -msgstr "在哪裡放置新的尾部署名" +msgstr "放置新結尾資訊的位置" #: builtin/interpret-trailers.c msgid "action if trailer already exists" -msgstr "當尾部署名已經存在時所採取的動作" +msgstr "當結尾資訊已經存在時應採取的動作" #: builtin/interpret-trailers.c msgid "action if trailer is missing" -msgstr "當尾部署名缺少時所採取的動作" +msgstr "當結尾資訊缺少時應採取的動作" #: builtin/interpret-trailers.c msgid "output only the trailers" -msgstr "只輸出尾部署名" +msgstr "只輸出結尾資訊" #: builtin/interpret-trailers.c -msgid "do not apply trailer.* configuration variables" -msgstr "不套用 trailer.* 組態變數" +msgid "do not apply trailer. configuration variables" +msgstr "不要套用 trailer. 組態變數" #: builtin/interpret-trailers.c msgid "reformat multiline trailer values as single-line values" -msgstr "將多列尾注值 (trailer values) 重新格式化為單列值" +msgstr "將多列結尾資訊值重新格式化為單列值" #: builtin/interpret-trailers.c msgid "alias for --only-trailers --only-input --unfold" @@ -10303,7 +10741,7 @@ msgstr "不要把「---」當作輸入結尾" #: builtin/interpret-trailers.c msgid "trailer(s) to add" -msgstr "要新增的尾部署名" +msgstr "要加入的結尾資訊" #: builtin/interpret-trailers.c msgid "--trailer with --only-input does not make sense" @@ -10314,25 +10752,26 @@ msgid "no input file given for in-place editing" msgstr "沒有給出要原位編輯的檔案" #: builtin/last-modified.c -msgid "last-modified can only operate on one tree at a time" -msgstr "last-modified 一次只能操作一個樹狀物件" +msgid "last-modified can only operate on one commit at a time" +msgstr "last-modified 一次只能操作一個提交" #: builtin/last-modified.c #, c-format -msgid "unknown last-modified argument: %s" -msgstr "未知的 last-modified 引數：%s" +msgid "revision argument '%s' is a %s, not a commit-ish" +msgstr "修訂版本引數「%s」是 %s，而非提交指示元" #: builtin/last-modified.c -msgid "unable to setup last-modified" -msgstr "無法設定 last-modified" +#, c-format +msgid "unknown last-modified argument: %s" +msgstr "未知的 last-modified 引數：%s" #: builtin/last-modified.c msgid "" -"git last-modified [--recursive] [--show-trees] [] [[--] " -"...]" +"git last-modified [--recursive] [--show-trees] [--max-depth=] [-z]\n" +" [] [[--] ...]" msgstr "" -"git last-modified [--recursive] [--show-trees] [] [[--] " -"...]" +"git last-modified [--recursive] [--show-trees] [--max-depth=] [-z]\n" +" [] [[--] ...]" #: builtin/last-modified.c builtin/ls-tree.c msgid "recurse into subtrees" @@ -10342,6 +10781,14 @@ msgstr "遞迴到子樹" msgid "show tree entries when recursing into subtrees" msgstr "遞迴子樹時顯示樹狀物件項目" +#: builtin/last-modified.c diff.c +msgid "maximum tree depth to recurse" +msgstr "樹狀物件的遞迴最大深度" + +#: builtin/last-modified.c +msgid "lines are separated with NUL character" +msgstr "列以 NUL 字元分隔" + #: builtin/log.c msgid "git log [] [] [[--] ...]" msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]" @@ -10410,7 +10857,7 @@ msgstr "" msgid "git show %s: bad file" msgstr "git show %s: 損壞的檔案" -#: builtin/log.c +#: builtin/log.c builtin/log.c #, c-format msgid "could not read object %s" msgstr "無法讀取物件 %s" @@ -10429,6 +10876,20 @@ msgstr "%s：從描述產生附函的模式無效" msgid "format.headers without value" msgstr "format.headers 沒有值" +#: builtin/log.c config.c +#, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "「%2$s」的「%1$s」布林設定值無效" + +#: builtin/log.c +#, c-format +msgid "" +"'%s' used to accept any value and treat that as 'true'.\n" +"Now it only accepts boolean values, like what '%s' does.\n" +msgstr "" +"「%s」過去接受任何值，並將其視為「true」。\n" +"現在它只接受布林值，符合「%s」的行為。\n" + #: builtin/log.c #, c-format msgid "cannot open patch file %s" @@ -10455,6 +10916,11 @@ msgstr "附函需要信件位址格式" msgid "failed to create cover-letter file" msgstr "無法建立附函檔案" +#: builtin/log.c +#, c-format +msgid "'%s' is not a valid format string" +msgstr "「%s」不是有效的格式字串" + #: builtin/log.c #, c-format msgid "insane in-reply-to: %s" @@ -10468,12 +10934,13 @@ msgstr "git format-patch [<選項>] [<從> | <版本範圍>]" msgid "two output directories?" msgstr "兩個輸出目錄？" -#: builtin/log.c +#: builtin/log.c builtin/log.c builtin/log.c builtin/log.c #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c builtin/replace.c +#: builtin/log.c builtin/replace.c builtin/replace.c +#: builtin/replace.c #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "無法將 '%s' 解析為一個有效引用" @@ -10533,6 +11000,14 @@ msgstr "列印修補檔到標準輸出" msgid "generate a cover letter" msgstr "生成一封附函" +#: builtin/log.c +msgid "format-spec" +msgstr "format-spec" + +#: builtin/log.c +msgid "format spec used for the commit list in the cover letter" +msgstr "用於附函中提交列表的格式規格" + #: builtin/log.c msgid "use simple number sequence for output file names" msgstr "使用簡單的數字序列作為輸出檔案名" @@ -10621,7 +11096,7 @@ msgstr "header" msgid "add email header" msgstr "新增信件頭" -#: builtin/log.c +#: builtin/log.c builtin/log.c msgid "email" msgstr "信箱" @@ -10649,7 +11124,7 @@ msgstr "信件標記" msgid "make first mail a reply to " msgstr "使第一封信件作為對 <信件標記> 的回覆" -#: builtin/log.c +#: builtin/log.c builtin/log.c msgid "boundary" msgstr "邊界" @@ -10730,7 +11205,8 @@ msgstr "--check 無意義" msgid "--remerge-diff does not make sense" msgstr "--remerge-diff 無意義" -#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c +#: builtin/log.c builtin/submodule--helper.c +#: builtin/submodule--helper.c rerere.c submodule.c #, c-format msgid "could not create directory '%s'" msgstr "無法建立「%s」目錄" @@ -10922,11 +11398,11 @@ msgstr "" msgid "do not print remote URL" msgstr "不列印遠端 URL" -#: builtin/ls-remote.c builtin/rebase.c +#: builtin/ls-remote.c builtin/ls-remote.c builtin/rebase.c msgid "exec" msgstr "exec" -#: builtin/ls-remote.c +#: builtin/ls-remote.c builtin/ls-remote.c msgid "path of git-upload-pack on the remote host" msgstr "遠端主機上的 git-upload-pack 路徑" @@ -10978,7 +11454,7 @@ msgstr "條目以 NUL 字元終止" msgid "include object size" msgstr "包括物件大小" -#: builtin/ls-tree.c +#: builtin/ls-tree.c builtin/ls-tree.c msgid "list only filenames" msgstr "只列出檔案名" @@ -11156,7 +11632,7 @@ msgstr[0] "無法處理 %d 條以上的基礎。忽略 %s。" msgid "not handling anything other than two heads merge." msgstr "不能處理兩個頭合併之外的任何動作。" -#: builtin/merge-recursive.c +#: builtin/merge-recursive.c builtin/merge-recursive.c #, c-format msgid "could not resolve ref '%s'" msgstr "無法解析引用「%s」" @@ -11166,12 +11642,12 @@ msgstr "無法解析引用「%s」" msgid "Merging %s with %s\n" msgstr "合併 %s 和 %s\n" -#: builtin/merge-tree.c +#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c #, c-format msgid "could not parse as tree '%s'" msgstr "無法解析為樹狀物件「%s」" -#: builtin/merge-tree.c builtin/merge.c +#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge.c msgid "not something we can merge" msgstr "不能合併" @@ -11231,7 +11707,7 @@ msgstr "option=value" msgid "option for selected merge strategy" msgstr "所選的合併策略的選項" -#: builtin/merge-tree.c +#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge 和其他所有選項都不相容" @@ -11240,7 +11716,7 @@ msgstr "--trivial-merge 和其他所有選項都不相容" msgid "unknown strategy option: -X%s" msgstr "未知的策略選項：-X%s" -#: builtin/merge-tree.c builtin/notes.c +#: builtin/merge-tree.c builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." msgstr "格式錯誤的輸入行：'%s'。" @@ -11317,8 +11793,8 @@ msgstr "如果不能快轉就放棄合併" 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 builtin/notes.c builtin/pull.c +#: builtin/rebase.c builtin/revert.c msgid "strategy" msgstr "策略" @@ -11359,7 +11835,7 @@ msgstr "無法執行貯存。" msgid "stash failed" msgstr "貯存失敗" -#: builtin/merge.c +#: builtin/merge.c builtin/merge.c msgid "read-tree failed" msgstr "讀取樹失敗" @@ -11392,7 +11868,7 @@ msgstr "'%s' 沒有指向一個提交" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c merge-ort-wrappers.c +#: builtin/merge.c builtin/merge.c merge-ort-wrappers.c msgid "Unable to write index." msgstr "不能寫入索引。" @@ -11567,7 +12043,7 @@ msgstr "嘗試非常小的索引內合併...\n" msgid "Nope.\n" msgstr "無。\n" -#: builtin/merge.c +#: builtin/merge.c builtin/merge.c #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "將樹回滾至原始狀態...\n" @@ -11648,11 +12124,21 @@ msgstr "允許建立一個以上的樹" #: builtin/multi-pack-index.c msgid "" -"git multi-pack-index [] write [--preferred-pack=][--refs-" -"snapshot=]" +"git multi-pack-index [] write [--preferred-pack=]\n" +" [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" +" [--refs-snapshot=]" +msgstr "" +"git multi-pack-index [] write [--preferred-pack=]\n" +" [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" +" [--refs-snapshot=]" + +#: builtin/multi-pack-index.c +msgid "" +"git multi-pack-index [] compact [--[no-]incremental]\n" +" [--[no-]bitmap] " msgstr "" -"git multi-pack-index [<選項>] write [--preferred-pack=<包>] [--refs-" -"snapshot=<路徑>]" +"git multi-pack-index [] compact [--[no-]incremental]\n" +" [--[no-]bitmap] " #: builtin/multi-pack-index.c msgid "git multi-pack-index [] verify" @@ -11682,11 +12168,11 @@ msgstr "偏好包" msgid "pack for reuse when computing a multi-pack bitmap" msgstr "計算多包位圖時要重複使用的包" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c builtin/multi-pack-index.c msgid "write multi-pack bitmap" msgstr "寫入多包位圖" -#: builtin/multi-pack-index.c +#: builtin/multi-pack-index.c builtin/multi-pack-index.c msgid "write a new incremental MIDX" msgstr "寫入新的增量 MIDX" @@ -11698,6 +12184,20 @@ msgstr "寫入只包含指定索引的多包索引" msgid "refs snapshot for selecting bitmap commits" msgstr "用來選取位圖提交的引用快照" +#: builtin/multi-pack-index.c builtin/multi-pack-index.c +#, c-format +msgid "could not find MIDX: %s" +msgstr "找不到 MIDX：%s" + +#: builtin/multi-pack-index.c +msgid "MIDX compaction endpoints must be unique" +msgstr "MIDX 壓縮端點必須唯一" + +#: builtin/multi-pack-index.c +#, c-format +msgid "MIDX %s must be an ancestor of %s" +msgstr "MIDX %s 必須是 %s 的祖先" + #: builtin/multi-pack-index.c msgid "" "during repack, collect pack-files of smaller size into a batch that is " @@ -11744,11 +12244,11 @@ msgstr "目的地「%s」不是目錄" msgid "Checking rename of '%s' to '%s'\n" msgstr "檢查 '%s' 到 '%s' 的重新命名\n" -#: builtin/mv.c +#: builtin/mv.c builtin/mv.c msgid "bad source" msgstr "來源損壞" -#: builtin/mv.c +#: builtin/mv.c builtin/mv.c msgid "destination exists" msgstr "目的地已存在" @@ -11772,7 +12272,7 @@ msgstr "不在版本控制之下" msgid "conflicted" msgstr "衝突" -#: builtin/mv.c +#: builtin/mv.c builtin/mv.c #, c-format msgid "overwriting '%s'" msgstr "覆蓋 '%s'" @@ -11993,7 +12493,9 @@ msgstr "註解內容被留在 %s 中" msgid "could not open or read '%s'" msgstr "無法開啟或讀取「%s」" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c builtin/notes.c +#: builtin/notes.c builtin/notes.c builtin/notes.c +#: builtin/notes.c builtin/notes.c builtin/notes.c #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "無法解析 '%s' 為一個有效引用。" @@ -12021,48 +12523,48 @@ msgstr "將註解從「%s」複製至「%s」失敗" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c #, c-format msgid "no note found for object %s." msgstr "未發現物件 %s 的註解。" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c msgid "note contents as a string" msgstr "註解內容作為一個字串" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c msgid "note contents in a file" msgstr "註解內容到一個檔案中" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c msgid "reuse and edit specified note object" msgstr "重用和編輯指定的註解物件" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c msgid "edit note message in editor" msgstr "在編輯器中編輯備註訊息" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c msgid "reuse specified note object" msgstr "重用指定的註解物件" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c msgid "allow storing empty note" msgstr "允許儲存空白備註" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c msgid "replace existing notes" msgstr "取代已存在的註解" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c msgid "" msgstr "" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c msgid "insert between paragraphs" msgstr "在段落間插入 " -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c msgid "remove unnecessary whitespace" msgstr "移除不必要的空白字元" @@ -12073,12 +12575,12 @@ msgid "" "existing notes" msgstr "不能新增註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆蓋物件 %s 現存註解\n" -#: builtin/notes.c +#: builtin/notes.c builtin/notes.c builtin/notes.c #, c-format msgid "Removing note for object %s\n" msgstr "刪除物件 %s 的註解\n" @@ -12364,7 +12866,7 @@ msgstr "%s 的 delta 基準位移越界" msgid "Counting objects" msgstr "正在計算物件數量" -#: builtin/pack-objects.c pack-bitmap.c +#: builtin/pack-objects.c pack-bitmap.c pack-bitmap.c #, c-format msgid "unable to get size of %s" msgstr "不能得到 %s 的大小" @@ -12374,12 +12876,13 @@ msgstr "不能得到 %s 的大小" msgid "unable to parse object header of %s" msgstr "無法解析物件 %s 標頭訊息" +#: builtin/pack-objects.c builtin/pack-objects.c #: builtin/pack-objects.c #, c-format msgid "object %s cannot be read" msgstr "物件 %s 無法讀取" -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/pack-objects.c #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "物件 %s 不一致的物件長度（% vs %）" @@ -12403,7 +12906,7 @@ msgstr "無法為標籤 %s 壓縮物件" msgid "unable to get type of object %s" msgstr "無法獲得物件 %s 類型" -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/pack-objects.c msgid "Compressing objects by path" msgstr "正在根據路徑壓縮物件" @@ -12446,22 +12949,22 @@ msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s') msgid "could not get type of object %s in pack %s" msgstr "無法取得 %2$s 包中 %1$s 物件的類型" -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/pack-objects.c #, c-format -msgid "packfile %s is a promisor but --exclude-promisor-objects was given" -msgstr "封包檔案 %s 是承諾者，但是指定了 --exclude-promisor-objects" +msgid "could not find pack '%s'" +msgstr "找不到「%s」包" #: builtin/pack-objects.c #, c-format -msgid "could not find pack '%s'" -msgstr "找不到「%s」包" +msgid "packfile %s is a promisor but --exclude-promisor-objects was given" +msgstr "封包檔案 %s 是承諾者，但是指定了 --exclude-promisor-objects" #: builtin/pack-objects.c #, c-format msgid "packfile %s cannot be accessed" msgstr "無法存取封包檔案 %s" -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/pack-objects.c msgid "Enumerating cruft objects" msgstr "正在枚舉無用物件" @@ -12491,11 +12994,7 @@ msgstr "" "預期物件 ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c reachable.c -msgid "could not load cruft pack .mtimes" -msgstr "無法載入無用包 .mtimes" - -#: builtin/pack-objects.c +#: builtin/pack-objects.c builtin/pack-objects.c msgid "cannot open pack index" msgstr "無法開啟包檔案索引" @@ -12848,23 +13347,24 @@ msgstr "" msgid "You are not currently on a branch." msgstr "您目前不在一個分支上。" -#: builtin/pull.c +#: builtin/pull.c builtin/pull.c msgid "Please specify which branch you want to rebase against." msgstr "請指定您要重定基底到哪一個分支。" -#: builtin/pull.c +#: builtin/pull.c builtin/pull.c msgid "Please specify which branch you want to merge with." msgstr "請指定您要合併哪一個分支。" -#: builtin/pull.c +#: builtin/pull.c builtin/pull.c msgid "See git-pull(1) for details." msgstr "詳見 git-pull(1)。" -#: builtin/pull.c builtin/rebase.c +#: builtin/pull.c builtin/pull.c builtin/pull.c +#: builtin/rebase.c msgid "" msgstr "<遠端>" -#: builtin/pull.c scalar.c +#: builtin/pull.c builtin/pull.c builtin/pull.c scalar.c msgid "" msgstr "<分支>" @@ -13271,7 +13771,8 @@ msgstr "控制子模組的遞迴推送" msgid "use thin pack" msgstr "使用精簡打包" -#: builtin/push.c builtin/send-pack.c +#: builtin/push.c builtin/push.c builtin/send-pack.c +#: builtin/send-pack.c msgid "receive pack program" msgstr "接收包程式" @@ -13366,7 +13867,7 @@ msgstr "使用簡單差異顏色" msgid "notes" msgstr "註解" -#: builtin/range-diff.c +#: builtin/range-diff.c builtin/range-diff.c builtin/range-diff.c msgid "passed to 'git log'" msgstr "傳遞給 'git log'" @@ -13386,12 +13887,12 @@ msgstr "只發出跟第一個範圍相關的輸出" msgid "only emit output related to the second range" msgstr "只發出跟第二個範圍相關的輸出" -#: builtin/range-diff.c +#: builtin/range-diff.c builtin/range-diff.c builtin/range-diff.c #, c-format msgid "not a revision: '%s'" msgstr "非修訂版：「%s」" -#: builtin/range-diff.c +#: builtin/range-diff.c builtin/range-diff.c #, c-format msgid "not a commit range: '%s'" msgstr "不是提交範圍：「%s」" @@ -13545,7 +14046,8 @@ msgstr "無效的原始 head：'%s'" msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "忽略無效的 allow_rerere_autoupdate：'%s'" -#: builtin/rebase.c builtin/rm.c sequencer.c +#: builtin/rebase.c builtin/rebase.c builtin/rebase.c +#: builtin/rm.c sequencer.c sequencer.c #, c-format msgid "could not remove '%s'" msgstr "無法刪除「%s」" @@ -13578,6 +14080,7 @@ msgstr "未知的 rebase-merges 模式：%s" msgid "could not switch to %s" msgstr "無法切換到 %s" +#: builtin/rebase.c builtin/rebase.c builtin/rebase.c #: builtin/rebase.c msgid "apply options and merge options cannot be used together" msgstr "套用選項與合併選項不得同時使用" @@ -13680,7 +14183,7 @@ msgstr "忽略製作日期而使用日前日期" msgid "synonym of --reset-author-date" msgstr "和 --reset-author-date 同義" -#: builtin/rebase.c +#: builtin/rebase.c builtin/rebase.c msgid "passed to 'git apply'" msgstr "傳遞給 'git apply'" @@ -13688,7 +14191,7 @@ msgstr "傳遞給 'git apply'" msgid "ignore changes in whitespace" msgstr "忽略空白字元中的變更" -#: builtin/rebase.c +#: builtin/rebase.c builtin/rebase.c msgid "cherry-pick all commits, even if unchanged" msgstr "揀選所有提交，即使未修改" @@ -14067,7 +14570,7 @@ msgstr "" " [--dry-run | -n] [--verbose] [--all [--single-worktree] | " "...]" -#: builtin/reflog.c +#: builtin/reflog.c builtin/reflog.c #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "傳入「--%s」的時間戳「%s」無效" @@ -14077,24 +14580,24 @@ msgstr "傳入「--%s」的時間戳「%s」無效" msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受參數：'%s'" -#: builtin/reflog.c +#: builtin/reflog.c builtin/reflog.c msgid "do not actually prune any entries" msgstr "不實際剪除任何項目" -#: builtin/reflog.c +#: builtin/reflog.c builtin/reflog.c msgid "" "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it" msgstr "將舊的 SHA1 重寫為現在比它早的新 SHA1" -#: builtin/reflog.c +#: builtin/reflog.c builtin/reflog.c msgid "update the reference to the value of the top reflog entry" msgstr "更新引用至首個引用日誌項目的值" -#: builtin/reflog.c +#: builtin/reflog.c builtin/reflog.c msgid "print extra information on screen" msgstr "在螢幕上輸出額外資訊" -#: builtin/reflog.c +#: builtin/reflog.c builtin/reflog.c msgid "timestamp" msgstr "時間戳" @@ -14125,7 +14628,7 @@ msgstr "限制只處理目前工作區的引用日誌" msgid "Marking reachable objects..." msgstr "正在標記可以取得物件..." -#: builtin/reflog.c +#: builtin/reflog.c builtin/reflog.c #, c-format msgid "reflog could not be found: '%s'" msgstr "找不到引用日誌：「%s」" @@ -14260,15 +14763,15 @@ msgstr "" "git remote add [-t <分支>] [-m ] [-f] [--tags | --no-tags] [--" "mirror=] <名稱> <位址>" -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c msgid "git remote rename [--[no-]progress] " msgstr "git remote rename [--[no-]progress] " -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c msgid "git remote remove " msgstr "git remote remove <名稱>" -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c msgid "git remote set-head (-a | --auto | -d | --delete | )" msgstr "git remote set-head <名稱> (-a | --auto | -d | --delete | <分支>)" @@ -14289,19 +14792,19 @@ msgstr "git remote [-v | --verbose] update [-p | --prune] [(<組> | <遠端>)... msgid "git remote set-branches [--add] ..." msgstr "git remote set-branches [--add] <名稱> <分支>..." -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c msgid "git remote get-url [--push] [--all] " msgstr "git remote get-url [--push] [--all] <名稱>" -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c msgid "git remote set-url [--push] []" msgstr "git remote set-url [--push] <名稱> <新的位址> [<舊的位址>]" -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c msgid "git remote set-url --add " msgstr "git remote set-url --add <名稱> <新的位址>" -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c msgid "git remote set-url --delete " msgstr "git remote set-url --delete <名稱> <位址>" @@ -14394,7 +14897,7 @@ msgstr "指定一個 master 分支並使用 --mirror 選項沒有意義" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義" -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c #, c-format msgid "remote %s already exists." msgstr "遠端 %s 已經存在。" @@ -14404,7 +14907,8 @@ msgstr "遠端 %s 已經存在。" msgid "Could not setup master '%s'" msgstr "無法配置 master「%s」" -#: builtin/remote.c trailer.c +#: builtin/remote.c builtin/remote.c trailer.c trailer.c +#: trailer.c #, c-format msgid "more than one %s" msgstr "多於一個 %s" @@ -14419,7 +14923,7 @@ msgstr "branch.%s.rebase=%s 未處理。假設成 'true'" msgid "Could not get fetch map for refspec %s" msgstr "無法取得引用規格 %s 的 fetch 映射" -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c msgid "(matching)" msgstr "（符合）" @@ -14432,7 +14936,8 @@ msgstr "（刪除）" msgid "could not set '%s'" msgstr "無法設定「%s」" -#: builtin/remote.c config.c +#: builtin/remote.c builtin/remote.c builtin/remote.c +#: config.c #, c-format msgid "could not unset '%s'" msgstr "無法取消設定「%s」" @@ -14464,7 +14969,7 @@ msgstr "" "\n" "若是這種情況，你可以先將遠端改為不同的名稱來解決這個問題。\n" -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c builtin/remote.c #, c-format msgid "No such remote: '%s'" msgstr "沒有此遠端版本庫：'%s'" @@ -14627,7 +15132,7 @@ msgstr " 取得位址：%s" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c #, c-format msgid " Push URL: %s" msgstr " 推送位址：%s" @@ -14636,7 +15141,7 @@ msgstr " 推送位址：%s" msgid "(no URL)" msgstr "(無 URL)" -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c builtin/remote.c #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" @@ -14663,7 +15168,7 @@ msgid_plural " Remote branches:%s" msgstr[0] " 遠端分支：%s" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c msgid " (status not queried)" msgstr " （狀態未查詢）" @@ -14764,7 +15269,7 @@ msgstr " * [已剪除] %s" msgid "prune remotes after fetching" msgstr "抓取後剪除遠端" -#: builtin/remote.c +#: builtin/remote.c builtin/remote.c builtin/remote.c #, c-format msgid "No such remote '%s'" msgstr "沒有此遠端 '%s'" @@ -14849,7 +15354,7 @@ msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件" msgid "same as -a, pack unreachable cruft objects separately" msgstr "和 -a 相同，會獨立封裝無法存取的無用物件" -#: builtin/repack.c +#: builtin/repack.c builtin/repack.c msgid "approxidate" msgstr "近似日期" @@ -15201,60 +15706,48 @@ msgstr "只能為 -l 提供一個模式" #: builtin/replay.c #, c-format -msgid "'%s' is not a valid commit-ish for %s" -msgstr "「%s」不是 %s 有效的提交指示元" - -#: builtin/replay.c -msgid "need some commits to replay" -msgstr "需要一些提交才能重放" - -#: builtin/replay.c -msgid "all positive revisions given must be references" -msgstr "提供的所有正向修訂集必須為引用" - -#: builtin/replay.c -msgid "argument to --advance must be a reference" -msgstr "傳入 --advance 的引數必須為引用" +msgid "invalid %s value: '%s'" +msgstr "無效的 %s 值：「%s」" #: builtin/replay.c msgid "" -"cannot advance target with multiple sources because ordering would be ill-" -"defined" -msgstr "無法用多個來源演進目的地，以免無法確定排序" +"(EXPERIMENTAL!) git replay ([--contained] --onto= | --" +"advance= | --revert=)\n" +"[--ref=] [--ref-action=] " +msgstr "" +"（實驗功能！）git replay ([--contained] --onto= | --" +"advance= | --revert=)\n" +"[--ref=] [--ref-action=] " #: builtin/replay.c -#, c-format -msgid "invalid %s value: '%s'" -msgstr "無效的 %s 值：「%s」" +msgid "update all branches that point at commits in " +msgstr "更新所有指向 範圍中提交的分支" #: builtin/replay.c -msgid "" -"(EXPERIMENTAL!) git replay ([--contained] --onto | --advance " -") [--ref-action[=]] " -msgstr "" -"(實驗性功能!) git replay ([--contained] --onto | --advance " -") [--ref-action[=]] " +msgid "replay onto given commit" +msgstr "重放到指定提交" #: builtin/replay.c msgid "make replay advance given branch" msgstr "在指定分支上進行重放演進" #: builtin/replay.c -msgid "replay onto given commit" -msgstr "重放到指定提交" +msgid "revert commits onto given branch" +msgstr "將提交還原至指定的分支" #: builtin/replay.c -msgid "update all branches that point at commits in " -msgstr "更新所有指向 範圍中提交的分支" +msgid "reference to update with result" +msgstr "要以結果更新的引用" #: builtin/replay.c msgid "control ref update behavior (update|print)" msgstr "控制引用的更新行為（update|print）" #: builtin/replay.c -msgid "option --onto or --advance is mandatory" -msgstr "必須傳入 --onto 或 --advance 選項" +msgid "exactly one of --onto, --advance, or --revert is required" +msgstr "--onto、--advance 或 --revert 必須三選一" +#: builtin/replay.c builtin/replay.c builtin/replay.c #: builtin/replay.c #, c-format msgid "" @@ -15262,48 +15755,25 @@ msgid "" "will be forced" msgstr "將覆寫部分修訂版遍歷選項，強制使用「struct rev_info」的「%s」位元" -#: builtin/replay.c -#, c-format -msgid "failed to begin ref transaction: %s" -msgstr "無法開始引用事務：%s" - -#: builtin/replay.c -msgid "error preparing revisions" -msgstr "無法準備修訂集" - -#: builtin/replay.c -msgid "replaying down from root commit is not supported yet!" -msgstr "尚不支援從根提交重放！" - -#: builtin/replay.c -msgid "replaying merge commits is not supported yet!" -msgstr "尚不支援重放合併提交！" - -#: builtin/replay.c -#, c-format -msgid "failed to update ref '%s': %s" -msgstr "無法更新「%s」引用：%s" - -#: builtin/replay.c -#, c-format -msgid "failed to commit ref transaction: %s" -msgstr "無法提交引用事務：%s" - #: builtin/repo.c #, c-format msgid "key '%s' not found" msgstr "找不到「%s」鍵" +#: builtin/repo.c +msgid "--keys can only be used with --format=lines or --format=nul" +msgstr "--keys 只能與 --format=lines 或 --format=nul 一起使用" + #: builtin/repo.c #, c-format msgid "invalid format '%s'" msgstr "「%s」格式無效" -#: builtin/repo.c +#: builtin/repo.c builtin/repo.c msgid "output format" msgstr "輸出格式" -#: builtin/repo.c +#: builtin/repo.c builtin/repo.c msgid "synonym for --format=nul" msgstr "和 --format=nul 同義" @@ -15311,6 +15781,14 @@ msgstr "和 --format=nul 同義" msgid "print all keys/values" msgstr "輸出所有鍵值對" +#: builtin/repo.c +msgid "show keys" +msgstr "顯示設定鍵" + +#: builtin/repo.c +msgid "--keys cannot be used with a or --all" +msgstr "--keys 不能與 或 --all 一起使用" + #: builtin/repo.c msgid "unsupported output format" msgstr "不支援的輸出格式" @@ -15323,7 +15801,7 @@ msgstr "--all 和 不能同時使用" msgid "References" msgstr "引用" -#: builtin/repo.c +#: builtin/repo.c builtin/repo.c msgid "Count" msgstr "總數" @@ -15331,6 +15809,7 @@ msgstr "總數" msgid "Branches" msgstr "分支" +#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c #: builtin/repo.c msgid "Tags" msgstr "標籤" @@ -15347,15 +15826,15 @@ msgstr "其他" msgid "Reachable objects" msgstr "可到達物件" -#: builtin/repo.c +#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c msgid "Commits" msgstr "提交" -#: builtin/repo.c +#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c msgid "Trees" msgstr "樹狀物件" -#: builtin/repo.c +#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c msgid "Blobs" msgstr "資料物件" @@ -15367,6 +15846,22 @@ msgstr "未壓縮大小" msgid "Disk size" msgstr "磁碟大小" +#: builtin/repo.c +msgid "Largest objects" +msgstr "最大的物件" + +#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c +msgid "Maximum size" +msgstr "最大大小" + +#: builtin/repo.c +msgid "Maximum parents" +msgstr "最大父提交數" + +#: builtin/repo.c +msgid "Maximum entries" +msgstr "最大項目數" + #: builtin/repo.c msgid "Repository structure" msgstr "版本庫結構" @@ -15461,7 +15956,8 @@ msgstr "HEAD 現在位於 %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合併過程中不能做%s重設動作。" -#: builtin/reset.c builtin/stash.c +#: builtin/reset.c builtin/stash.c builtin/stash.c +#: builtin/stash.c msgid "be quiet, only report errors" msgstr "安靜模式，只報告錯誤" @@ -15477,7 +15973,7 @@ msgstr "重設 HEAD 和索引" msgid "reset only HEAD" msgstr "只重設 HEAD" -#: builtin/reset.c +#: builtin/reset.c builtin/reset.c msgid "reset HEAD, index and working tree" msgstr "重設 HEAD、索引和工作區" @@ -15801,7 +16297,7 @@ msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "下列檔案有暫存在索引的變更：" -#: builtin/rm.c +#: builtin/rm.c builtin/rm.c msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -15898,7 +16394,7 @@ msgstr "git log --pretty=short | git shortlog [<選項>]" msgid "using multiple --group options with stdin is not supported" msgstr "不支援在標準輸入使用多個 --group 選項" -#: builtin/shortlog.c +#: builtin/shortlog.c builtin/shortlog.c #, c-format msgid "using %s with stdin is not supported" msgstr "不支援對 %s 使用 stdin" @@ -16080,6 +16576,55 @@ msgstr "雜湊算法" msgid "Unknown hash algorithm" msgstr "未知的雜湊算法" +#: builtin/show-index.c +msgid "assuming SHA-1; use --object-format to override" +msgstr "假設使用 SHA-1，使用 --object-format 可以覆寫" + +#: builtin/show-index.c +msgid "unable to read header" +msgstr "無法讀取標頭" + +#: builtin/show-index.c +msgid "unknown index version" +msgstr "未知的索引版本" + +#: builtin/show-index.c builtin/show-index.c +msgid "unable to read index" +msgstr "無法讀取索引" + +#: builtin/show-index.c +msgid "corrupt index file" +msgstr "索引檔案損壞" + +#: builtin/show-index.c +#, c-format +msgid "unable to read entry %u/%u" +msgstr "無法讀取項目 %u/%u" + +#: builtin/show-index.c +#, c-format +msgid "unable to read sha1 %u/%u" +msgstr "無法讀取 sha1 %u/%u" + +#: builtin/show-index.c +#, c-format +msgid "unable to read crc %u/%u" +msgstr "無法讀取 crc %u/%u" + +#: builtin/show-index.c +#, c-format +msgid "unable to read 32b offset %u/%u" +msgstr "無法讀取 32 位元偏移 %u/%u" + +#: builtin/show-index.c +msgid "inconsistent 64b offset index" +msgstr "64 位元偏移索引不一致" + +#: builtin/show-index.c +#, c-format +msgid "unable to read 64b offset %u" +msgstr "無法讀取 64 位元偏移 %u" + #: builtin/show-ref.c msgid "" "git show-ref [--head] [-d | --dereference]\n" @@ -16124,7 +16669,7 @@ msgstr "檢查引用是否存在但不解析" msgid "stricter reference checking, requires exact ref path" msgstr "更嚴格的引用檢測，需要精確的引用路徑" -#: builtin/show-ref.c +#: builtin/show-ref.c builtin/show-ref.c msgid "show the HEAD reference, even if it would be filtered out" msgstr "顯示 HEAD 引用，即使被過濾掉" @@ -16189,10 +16734,12 @@ msgstr "無法初始化工作區組態" msgid "failed to modify sparse-index config" msgstr "無法修改稀疏索引設定" +#: builtin/sparse-checkout.c builtin/sparse-checkout.c #: builtin/sparse-checkout.c msgid "initialize the sparse-checkout in cone mode" msgstr "以 cone 模式初始化稀疏簽出" +#: builtin/sparse-checkout.c builtin/sparse-checkout.c #: builtin/sparse-checkout.c msgid "toggle the use of a sparse index" msgstr "切換是否使用稀疏索引" @@ -16207,11 +16754,12 @@ msgstr "無法開啟「%s」" msgid "could not normalize path %s" msgstr "無法標準化路徑 %s" -#: builtin/sparse-checkout.c +#: builtin/sparse-checkout.c builtin/sparse-checkout.c #, c-format msgid "unable to unquote C-style string '%s'" msgstr "無法去掉 '%s' C 樣式字串的引號" +#: builtin/sparse-checkout.c builtin/sparse-checkout.c #: builtin/sparse-checkout.c msgid "unable to load existing sparse-checkout patterns" msgstr "無法載入現存的稀疏簽出樣式" @@ -16262,12 +16810,12 @@ msgstr "" msgid "git sparse-checkout add [--skip-checks] (--stdin | )" msgstr "git sparse-checkout add [--skip-checks] (--stdin | )" -#: builtin/sparse-checkout.c +#: builtin/sparse-checkout.c builtin/sparse-checkout.c msgid "" "skip some sanity checks on the given paths that might give false positives" msgstr "在可能給出誤判結果的指定目錄，略過某些完整性檢查" -#: builtin/sparse-checkout.c +#: builtin/sparse-checkout.c builtin/sparse-checkout.c msgid "read patterns from standard in" msgstr "從標準輸入讀取樣式" @@ -16377,19 +16925,19 @@ msgstr "git stash store [(-m | --message) ] [-q | --quiet] " #: builtin/stash.c msgid "" -"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " "| --quiet]\n" " [-u | --include-untracked] [-a | --all] [(-m | --message) " "]\n" " [--pathspec-from-file= [--pathspec-file-nul]]\n" -" [--] [...]]" +" [--] [...]" msgstr "" -"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " "| --quiet]\n" " [-u | --include-untracked] [-a | --all] [(-m | --message) " "]\n" " [--pathspec-from-file= [--pathspec-file-nul]]\n" -" [--] [...]]" +" [--] [...]" #: builtin/stash.c msgid "" @@ -16477,7 +17025,7 @@ msgstr "索引未從貯存中復原。" msgid "could not restore untracked files from stash" msgstr "無法從貯存條目中復原未追蹤檔案" -#: builtin/stash.c +#: builtin/stash.c builtin/stash.c msgid "attempt to recreate the index" msgstr "嘗試重建索引" @@ -16520,12 +17068,12 @@ msgstr "在貯存區包含未追蹤檔案" msgid "only show untracked files in the stash" msgstr "只在貯存區顯示未追蹤檔案" -#: builtin/stash.c +#: builtin/stash.c builtin/stash.c #, c-format msgid "Cannot update %s with %s" msgstr "無法用 %2$s 更新 %1$s" -#: builtin/stash.c +#: builtin/stash.c builtin/stash.c builtin/stash.c msgid "stash message" msgstr "貯存說明" @@ -16553,7 +17101,7 @@ msgstr "無法儲存目前索引狀態" msgid "Cannot save the untracked files" msgstr "無法儲存未追蹤檔案" -#: builtin/stash.c +#: builtin/stash.c builtin/stash.c msgid "Cannot save the current worktree state" msgstr "無法儲存目前工作區狀態" @@ -16598,30 +17146,31 @@ msgstr "儲存工作目錄和索引狀態 %s" msgid "Cannot remove worktree changes" msgstr "無法刪除工作區變更" -#: builtin/stash.c +#: builtin/stash.c builtin/stash.c msgid "keep index" msgstr "保持索引" -#: builtin/stash.c +#: builtin/stash.c builtin/stash.c msgid "stash staged changes only" msgstr "只貯存暫存變更" -#: builtin/stash.c +#: builtin/stash.c builtin/stash.c msgid "stash in patch mode" msgstr "以修補檔模式貯存" -#: builtin/stash.c +#: builtin/stash.c builtin/stash.c msgid "quiet mode" msgstr "靜默模式" -#: builtin/stash.c +#: builtin/stash.c builtin/stash.c msgid "include untracked files in stash" msgstr "貯存中包含未追蹤檔案" -#: builtin/stash.c +#: builtin/stash.c builtin/stash.c msgid "include ignore files" msgstr "包含忽略的檔案" +#: builtin/stash.c builtin/stash.c builtin/stash.c #: builtin/stash.c #, c-format msgid "cannot parse commit %s" @@ -16666,7 +17215,7 @@ msgstr "找到 %s 貯存提交，裡面缺少預期的前綴" msgid "cannot parse parents of commit: %s" msgstr "無法解析提交的父物件：%s" -#: builtin/stash.c +#: builtin/stash.c builtin/stash.c builtin/stash.c #, c-format msgid "%s does not look like a stash commit" msgstr "%s 似乎不是貯存提交" @@ -16717,11 +17266,16 @@ msgid "" "authoritative upstream." msgstr "找不到「%s」組態設定。假定這個版本庫是其自身的官方上游。" -#: builtin/submodule--helper.c +#: builtin/submodule--helper.c builtin/submodule--helper.c #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "無法取得子模組「%s」的版本庫控制代碼" +#: builtin/submodule--helper.c +msgid "git submodule--helper get-default-remote " +msgstr "git submodule--helper get-default-remote " + +#: builtin/submodule--helper.c builtin/submodule--helper.c #: builtin/submodule--helper.c #, c-format msgid "No url found for submodule path '%s' in .gitmodules" @@ -16755,6 +17309,7 @@ msgstr "" msgid "suppress output of entering each submodule command" msgstr "隱藏每個子模組進入命令的輸出" +#: builtin/submodule--helper.c builtin/submodule--helper.c #: builtin/submodule--helper.c msgid "recurse into nested submodules" msgstr "遞迴進入嵌套子模組中" @@ -16763,6 +17318,17 @@ msgstr "遞迴進入嵌套子模組中" msgid "git submodule foreach [--quiet] [--recursive] [--] " msgstr "git submodule foreach [--quiet] [--recursive] [--] " +#: builtin/submodule--helper.c +#, c-format +msgid "" +"failed to set a valid default config for 'submodule.%s.gitdir'. Please " +"ensure it is set, for example by running something like: 'git config " +"submodule.%s.gitdir .git/modules/%s'" +msgstr "" +"無法為「submodule.%s.gitdir」設定有效的預設組態。請確定是否設定完成，舉例來" +"說，可以執行類似這樣的命令進行設定：「git config submodule.%s.gitdir .git/" +"modules/%s」" + #: builtin/submodule--helper.c #, c-format msgid "Failed to register url for submodule path '%s'" @@ -16791,6 +17357,7 @@ msgstr "隱藏初始化子模組的輸出" msgid "git submodule init [] []" msgstr "git submodule init [] []" +#: builtin/submodule--helper.c builtin/submodule--helper.c #: builtin/submodule--helper.c #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" @@ -16801,12 +17368,12 @@ msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射" msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "無法解析子模組「%s」的 HEAD 引用" -#: builtin/submodule--helper.c +#: builtin/submodule--helper.c builtin/submodule--helper.c #, c-format msgid "failed to recurse into submodule '%s'" msgstr "遞迴子模組 '%s' 失敗" -#: builtin/submodule--helper.c +#: builtin/submodule--helper.c builtin/submodule--helper.c msgid "suppress submodule status output" msgstr "隱藏子模組的狀態輸出" @@ -16869,6 +17436,30 @@ msgstr "git submodule summary [] [] [--] []" msgid "could not fetch a revision for HEAD" msgstr "無法取得 HEAD 的修訂版" +#: builtin/submodule--helper.c +msgid "git submodule--helper gitdir " +msgstr "git submodule--helper gitdir " + +#: builtin/submodule--helper.c +msgid "" +"could not set core.repositoryformatversion to 1.\n" +"Please set it for migration to work, for example:\n" +"git config core.repositoryformatversion 1" +msgstr "" +"無法將 core.repositoryformatversion 設定為 1。\n" +"請設定以便進行遷移，例如：\n" +"git config core.repositoryformatversion 1" + +#: builtin/submodule--helper.c +msgid "" +"could not enable submodulePathConfig extension. It is required\n" +"for migration to work. Please enable it in the root repo:\n" +"git config extensions.submodulePathConfig true" +msgstr "" +"無法啟用 submodulePathConfig 擴充功能。\n" +"遷移需要這個功能才能運作，請在根版本庫中啟用：\n" +"git config extensions.submodulePathConfig true" + #: builtin/submodule--helper.c #, c-format msgid "Synchronizing submodule url for '%s'\n" @@ -16962,7 +17553,7 @@ msgstr "" msgid "could not get a repository handle for gitdir '%s'" msgstr "無法取得 gitdir「%s」的版本庫控制代碼" -#: builtin/submodule--helper.c +#: builtin/submodule--helper.c builtin/submodule--helper.c #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模組 '%s' 不能新增版本庫備選：%s" @@ -16977,11 +17568,7 @@ msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'" msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能識別 submodule.alternateLocation 的取值 '%s'" -#: builtin/submodule--helper.c submodule.c -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "拒絕在其他子模組的 git 目錄中建立/使用「%s」" - +#: builtin/submodule--helper.c builtin/submodule--helper.c #: builtin/submodule--helper.c #, c-format msgid "directory not empty: '%s'" @@ -16992,6 +17579,15 @@ msgstr "目錄不是空的：「%s」" msgid "clone of '%s' into submodule path '%s' failed" msgstr "無法拓製「%s」到子模組路徑「%s」" +#: builtin/submodule--helper.c submodule.c +#, c-format +msgid "" +"refusing to create/use '%s' in another submodule's git dir. Enabling " +"extensions.submodulePathConfig should fix this." +msgstr "" +"拒絕在另一個子模組的 git 目錄中建立或使用「%s」。啟用 " +"extensions.submodulePathConfig 應當可以修正此問題。" + #: builtin/submodule--helper.c #, c-format msgid "could not get submodule directory for '%s'" @@ -17013,10 +17609,11 @@ msgstr "新子模組的名稱" msgid "url where to clone the submodule from" msgstr "拓製子模組的 url 位址" -#: builtin/submodule--helper.c +#: builtin/submodule--helper.c builtin/submodule--helper.c msgid "depth for shallow clones" msgstr "淺拓製的深度" +#: builtin/submodule--helper.c builtin/submodule--helper.c #: builtin/submodule--helper.c msgid "force cloning progress" msgstr "強制顯示拓製進度" @@ -17263,7 +17860,7 @@ msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) " msgid "--branch or --default required" msgstr "需要 --branch 或 --default" -#: builtin/submodule--helper.c +#: builtin/submodule--helper.c builtin/submodule--helper.c msgid "print only error messages" msgstr "只輸出錯誤訊息" @@ -17328,7 +17925,7 @@ msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n" msgid "unable to checkout submodule '%s'" msgstr "無法簽出「%s」子模組" -#: builtin/submodule--helper.c +#: builtin/submodule--helper.c builtin/submodule--helper.c msgid "please make sure that the .gitmodules file is in the working tree" msgstr "請確認 .gitmodules 檔案在工作區裡" @@ -17337,6 +17934,7 @@ msgstr "請確認 .gitmodules 檔案在工作區裡" msgid "Failed to add submodule '%s'" msgstr "無法加入子模組「%s」" +#: builtin/submodule--helper.c builtin/submodule--helper.c #: builtin/submodule--helper.c #, c-format msgid "Failed to register submodule '%s'" @@ -17530,7 +18128,7 @@ msgstr "壞的物件類型。" msgid "no tag message?" msgstr "無標籤說明？" -#: builtin/tag.c +#: builtin/tag.c builtin/tag.c #, c-format msgid "The tag message has been left in %s\n" msgstr "標籤說明被保留在 %s\n" @@ -17591,11 +18189,11 @@ msgstr "標籤列表選項" msgid "show tag list in columns" msgstr "以列的方式顯示標籤列表" -#: builtin/tag.c +#: builtin/tag.c builtin/tag.c msgid "print only tags that contain the commit" msgstr "只列印包含該提交的標籤" -#: builtin/tag.c +#: builtin/tag.c builtin/tag.c msgid "print only tags that don't contain the commit" msgstr "只列印不包含該提交的標籤" @@ -17671,7 +18269,7 @@ msgstr "建立目錄 %s 失敗" msgid "failed to delete file %s" msgstr "刪除檔案 %s 失敗" -#: builtin/update-index.c +#: builtin/update-index.c builtin/update-index.c #, c-format msgid "failed to delete directory %s" msgstr "刪除目錄 %s 失敗" @@ -18089,8 +18687,8 @@ msgid "report pruned working trees" msgstr "報告剪除的工作區" #: builtin/worktree.c -msgid "expire working trees older than