diff options
Diffstat (limited to 'po/zh_TW.po')
| -rw-r--r-- | po/zh_TW.po | 1413 |
1 files changed, 928 insertions, 485 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po index f777a0596f..f554381a7a 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -19,15 +19,16 @@ # - Yichao Yu <yyc1992 AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> # -# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023. +# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023, 2024. # Kaiyang Wu <self@origincode.me>, 2022. -# lumynou5 <lumynou5.tw@gmail.com>, 2023. +# lumynou5 <lumynou5.tw@gmail.com>, 2023, 2024. +# Kisaragi Hiu <mail@kisaragi-hiu.com>, 2024. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2023-11-19 22:29+0800\n" -"PO-Revision-Date: 2023-11-19 23:34+0800\n" +"POT-Creation-Date: 2024-04-28 18:52+0800\n" +"PO-Revision-Date: 2024-04-28 18:44+0800\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-" "po/git-cli/zh_Hant/>\n" @@ -36,7 +37,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.4.1\n" +"X-Generator: Poedit 3.4.2\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" @@ -601,12 +602,12 @@ msgid "" "---\n" "To remove '%c' lines, make them ' ' lines (context).\n" "To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" +"Lines starting with %s will be removed.\n" msgstr "" "---\n" -"要刪除 “%c” 開頭的列，請將列首（上下文）改成空白。\n" -"要刪除 “%c” 開頭的列，請直接刪除。\n" -"開頭是 %c 的列將會被移除。\n" +"要刪除「%c」開頭的列，請將列首（上下文）改成空白。\n" +"要刪除「%c」開頭的列，請直接刪除。\n" +"開頭是 %s 的列將會被移除。\n" #: add-patch.c msgid "" @@ -659,16 +660,18 @@ msgid "" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" +"p - print the current hunk\n" "? - print help\n" msgstr "" -"j - 維持此區塊未決狀態，檢視下一個未決定區塊\n" -"J - 維持此區塊未決狀態，檢視下一個區塊\n" -"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n" -"K - 維持此區塊未決狀態，檢視上一個區塊\n" +"j - 維持此區塊未決定狀態，檢視下一個未決定區塊\n" +"J - 維持此區塊未決定狀態，檢視下一個區塊\n" +"k - 維持此區塊未決定狀態，檢視上一個未決定區塊\n" +"K - 維持此區塊未決定狀態，檢視上一個區塊\n" "g - 選擇要跳轉至的區塊\n" "/ - 尋找符合提供之常規表示式的區塊\n" "s - 分割目前區塊為更小的區塊\n" "e - 手動編輯目前區塊\n" +"p - 輸出目前區塊\n" "? - 顯示說明\n" #: add-patch.c @@ -747,8 +750,8 @@ msgstr "" #: advice.c #, c-format -msgid "%shint: %.*s%s\n" -msgstr "%s提示：%.*s%s\n" +msgid "%shint:%s%.*s%s\n" +msgstr "%s提示：%s%.*s%s\n" #: advice.c msgid "Cherry-picking is not possible because you have unmerged files." @@ -910,7 +913,7 @@ msgid "unclosed quote" msgstr "未閉合的引號" #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c -#: builtin/receive-pack.c builtin/tag.c +#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "引數過多" @@ -925,12 +928,13 @@ msgid "unrecognized whitespace ignore option '%s'" msgstr "空白字元忽略選項 “%s” 無法識別" #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c -#: builtin/checkout.c builtin/clone.c builtin/commit.c builtin/describe.c -#: builtin/diff-tree.c builtin/difftool.c builtin/fast-export.c builtin/fetch.c -#: builtin/help.c builtin/index-pack.c builtin/init-db.c builtin/log.c -#: builtin/ls-files.c builtin/merge-base.c builtin/merge.c -#: builtin/pack-objects.c builtin/push.c builtin/rebase.c builtin/repack.c -#: builtin/reset.c builtin/rev-list.c builtin/show-branch.c builtin/stash.c +#: builtin/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/pack-objects.c builtin/rebase.c +#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.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 #, c-format @@ -1240,12 +1244,12 @@ msgstr "%s：已存在於工作區中" #: apply.c #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "%2$s 的新模式 (%1$o) 和舊模式 (%3$o) 不符" +msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符" #: apply.c #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "%2$s 的新模式 (%1$o) 和 %4$s 的舊模式 (%3$o) 不符" +msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符" #: apply.c #, c-format @@ -1344,11 +1348,6 @@ msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕……" #: apply.c #, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "正在將 .rej 檔案名稱截短為 %.*s.rej" - -#: apply.c -#, c-format msgid "cannot open %s" msgstr "無法開啟 %s" @@ -1734,6 +1733,11 @@ msgstr "非預期選項 --output" #: archive.c #, c-format +msgid "extra command line parameter '%s'" +msgstr "多出命令列參數 “%s”" + +#: archive.c +#, c-format msgid "Unknown archive format '%s'" msgstr "封存格式 “%s” 未知" @@ -1788,6 +1792,17 @@ msgstr "忽略過大的 gitattributes 資料物件 “%s”" msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE" +#: attr.c read-cache.c +#, c-format +msgid "unable to stat '%s'" +msgstr "無法對 %s 執行 stat" + +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c +#: builtin/pack-objects.c combine-diff.c rerere.c +#, c-format +msgid "unable to read %s" +msgstr "不能讀 %s" + #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" @@ -1867,6 +1882,11 @@ msgstr "需要一個 %s 修訂版" msgid "could not create file '%s'" msgstr "無法建立 “%s” 檔案" +#: bisect.c builtin/notes.c +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "不能為物件 '%s' 開始 'show'" + #: bisect.c builtin/merge.c #, c-format msgid "could not read file '%s'" @@ -1914,8 +1934,8 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" #: blame.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c -#: sequencer.c submodule.c +#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c +#: remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "修訂版遍歷設定失敗" @@ -1990,10 +2010,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 @@ -2032,6 +2054,10 @@ msgstr "" msgid "'%s' is not a valid branch name" msgstr "“%s” 不是有效的分支名稱" +#: branch.c builtin/branch.c +msgid "See `man git check-ref-format`" +msgstr "請參閱「man git check-ref-format」" + #: branch.c #, c-format msgid "a branch named '%s' already exists" @@ -2266,14 +2292,8 @@ msgid "adding embedded git repository: %s" msgstr "正在加入嵌入式 git 版本庫：%s" #: builtin/add.c -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" -msgstr "" -"若您真的想加入，請傳入 -f。\n" -"如要關閉此訊息，請執行\n" -"“git config advice.addIgnoredFile false”" +msgid "Use -f if you really want to add them." +msgstr "如果您確定想要加入他們，請使用「-f」。" #: builtin/add.c msgid "adding files failed" @@ -2296,14 +2316,8 @@ msgid "Nothing specified, nothing added.\n" msgstr "沒有指定，亦未加入檔案。\n" #: builtin/add.c -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" -msgstr "" -"可能您想做 “git add .”？\n" -"如要關閉此訊息，請執行\n" -"“git config advice.addEmptyPathspec false”" +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 @@ -2323,8 +2337,8 @@ msgid "bad action '%s' for '%s'" msgstr "“%s” 動作對 “%s” 無效" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c -#: sequencer.c setup.c +#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c +#: ls-refs.c parallel-checkout.c sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "“%s” 的值無效：“%s”" @@ -2408,18 +2422,19 @@ msgstr "無法切割修補檔。" #: builtin/am.c #, c-format -msgid "When you have resolved this problem, run \"%s --continue\"." -msgstr "解決此問題後，請執行 “%s --continue”。" +msgid "When you have resolved this problem, run \"%s --continue\".\n" +msgstr "解決此問題後，請執行「%s --continue」。\n" #: builtin/am.c #, c-format -msgid "If you prefer to skip this patch, run \"%s --skip\" instead." -msgstr "若要略過此修補，請改執行 “%s --skip”。" +msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n" +msgstr "若要略過此修補，請改執行「%s --skip」。\n" #: builtin/am.c #, c-format -msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." -msgstr "若要將空白修補檔錄入為空白提交，請執行 “%s --allow-empty”。" +msgid "" +"To record the empty patch as an empty commit, run \"%s --allow-empty\".\n" +msgstr "若要將空白修補檔錄入為空白提交，請執行「%s --allow-empty」。\n" #: builtin/am.c #, c-format @@ -2477,8 +2492,7 @@ msgstr "git write-tree 無法寫入樹狀物件" msgid "applying to an empty history" msgstr "正在套用至空白歷史記錄上" -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c -#: t/helper/test-fast-rebase.c +#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c msgid "failed to write commit object" msgstr "無法寫入提交物件" @@ -2661,8 +2675,9 @@ msgid "n" msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c -#: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c -#: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c +#: builtin/verify-tag.c msgid "format" msgstr "format" @@ -3357,12 +3372,13 @@ msgstr "無法查詢 “%s” 指向的提交物件" #: builtin/branch.c #, c-format -msgid "" -"the branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'" -msgstr "" -"分支 “%s” 沒有完全合併。\n" -"如果確定要刪除它，請執行 “git branch -D %s”" +msgid "the branch '%s' is not fully merged" +msgstr "分支 “%s” 沒有完全合併" + +#: builtin/branch.c +#, c-format +msgid "If you are sure you want to delete it, run 'git branch -D %s'" +msgstr "如果確定要刪除它，請執行 “git branch -D %s”" #: builtin/branch.c msgid "update of config-file failed" @@ -3485,11 +3501,11 @@ msgstr "分支已拷貝，但無法更新組態檔案" msgid "" "Please edit the description for the branch\n" " %s\n" -"Lines starting with '%c' will be stripped.\n" +"Lines starting with '%s' will be stripped.\n" msgstr "" "請編輯下述分支的描述\n" " %s\n" -"開頭是 “%c” 的列將被刪除。\n" +"開頭是「%s」的列將被刪除。\n" #: builtin/branch.c msgid "Generic options" @@ -3745,10 +3761,12 @@ msgstr "不是在 git 版本庫執行 — 沒有可顯示的掛鉤\n" #: builtin/bugreport.c msgid "" -"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +"git bugreport [(-o | --output-directory) <path>]\n" +" [(-s | --suffix) <format> | --no-suffix]\n" " [--diagnose[=<mode>]]" msgstr "" -"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +"git bugreport [(-o | --output-directory) <path>]\n" +" [(-s | --suffix) <format> | --no-suffix]\n" " [--diagnose[=<mode>]]" #: builtin/bugreport.c @@ -4348,6 +4366,12 @@ msgstr "“%s”、“%s” 或 “%s” 無法在簽出樹狀物件時使用" 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 +#, c-format +msgid "unable to read tree (%s)" +msgstr "無法讀取樹（%s）" + #: builtin/checkout.c msgid "you need to resolve your current index first" msgstr "您需要先解決目前索引區的衝突" @@ -4370,7 +4394,7 @@ msgstr "無法對 “%s” 執行 reflog 動作：%s\n" msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c +#: builtin/checkout.c builtin/clone.c msgid "unable to update HEAD" msgstr "無法更新 HEAD" @@ -4607,6 +4631,11 @@ msgid "missing branch or commit argument" msgstr "缺少分支或提交引數" #: builtin/checkout.c +#, c-format +msgid "unknown conflict style '%s'" +msgstr "未知的衝突輸出風格「%s」" + +#: builtin/checkout.c msgid "perform a 3-way merge with the new branch" msgstr "和新分支進行三方合併" @@ -4631,8 +4660,8 @@ msgid "new-branch" msgstr "new-branch" #: builtin/checkout.c -msgid "new unparented branch" -msgstr "新的，沒有父提交的分支" +msgid "new unborn branch" +msgstr "新的未誕生分支" #: builtin/checkout.c builtin/merge.c msgid "update ignored files (default)" @@ -4699,7 +4728,7 @@ msgstr "" msgid "you must specify path(s) to restore" msgstr "您必須指定要還原的路徑" -#: builtin/checkout.c builtin/clone.c builtin/remote.c +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c #: builtin/submodule--helper.c builtin/worktree.c msgid "branch" msgstr "branch" @@ -4927,22 +4956,8 @@ msgid "remove only ignored files" msgstr "只移除忽略的檔案" #: builtin/clean.c -msgid "" -"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " -"clean" -msgstr "" -"clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" - -#: builtin/clean.c -msgid "" -"clean.requireForce defaults to true and neither -i, -n, nor -f given; " -"refusing to clean" -msgstr "" -"clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" - -#: builtin/clean.c -msgid "-x and -X cannot be used together" -msgstr "-x 和 -X 不能同時使用" +msgid "clean.requireForce is true and -f not given: refusing to clean" +msgstr "clean.requireForce 是 true 且未給定 -f 選項：拒絕清理" #: builtin/clone.c msgid "git clone [<options>] [--] <repo> [<dir>]" @@ -4961,8 +4976,8 @@ msgid "create a bare repository" msgstr "建立裸版本庫" #: builtin/clone.c -msgid "create a mirror repository (implies bare)" -msgstr "建立鏡像版本庫（亦即裸版本庫）" +msgid "create a mirror repository (implies --bare)" +msgstr "建立鏡像版本庫（隱含 --bare）" #: builtin/clone.c msgid "to clone from a local repository" @@ -5035,6 +5050,7 @@ msgid "create a shallow clone since a specific time" msgstr "建立從指定時間到現在的淺層複製" #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c +#: builtin/replay.c msgid "revision" msgstr "revision" @@ -5062,6 +5078,10 @@ msgstr "gitdir" msgid "separate git dir from working tree" msgstr "git 目錄和工作區分離" +#: builtin/clone.c builtin/init-db.c +msgid "specify the reference format to use" +msgstr "指定要使用的引用格式" + #: builtin/clone.c msgid "key=value" msgstr "key=value" @@ -5211,11 +5231,10 @@ msgstr "太多參數。" msgid "You must specify a repository to clone." msgstr "您必須指定要複製的版本庫。" -#: builtin/clone.c -msgid "" -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" -"exclude" -msgstr "--bundle-uri 與 --depth、--shallow-since 和 --shallow-exclude 不相容" +#: builtin/clone.c builtin/init-db.c setup.c +#, c-format +msgid "unknown ref storage format '%s'" +msgstr "未知的引用儲存格式 “%s”" #: builtin/clone.c #, c-format @@ -5360,6 +5379,11 @@ msgid "padding space between columns" msgstr "兩直行之間的填充空間" #: builtin/column.c +#, c-format +msgid "%s must be non-negative" +msgstr "%s 不得為負數" + +#: builtin/column.c msgid "--command must be the first argument" msgstr "--command 必須是第一個參數" @@ -5376,14 +5400,14 @@ msgid "" "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters <n>] [--" "[no-]progress]\n" -" <split options>" +" <split-options>" msgstr "" "git commit-graph write [--object-dir <dir>] [--append]\n" " [--split[=<strategy>]] [--reachable | --stdin-packs | " "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters <n>] [--" "[no-]progress]\n" -" <split options>" +" <split-options>" #: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c msgid "dir" @@ -5692,7 +5716,7 @@ msgid "" "in the current commit message" msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: builtin/commit.c builtin/merge-tree.c +#: builtin/commit.c #, c-format msgid "could not lookup commit '%s'" msgstr "無法查詢提交 “%s”" @@ -5727,7 +5751,7 @@ msgstr "不能讀取 MERGE_MSG" #: builtin/commit.c bundle.c rerere.c sequencer.c #, c-format msgid "could not open '%s'" -msgstr "不能開啟 '%s'" +msgstr "無法開啟「%s」" #: builtin/commit.c msgid "could not write commit template" @@ -5737,38 +5761,38 @@ msgstr "不能寫提交範本" #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored.\n" +"with '%s' will be ignored.\n" msgstr "" "請輸入描述您變更的提交訊息。\n" -"開頭是「%c」的行皆會忽略。\n" +"開頭是「%s」的列皆會忽略。\n" #: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored, and an empty message aborts the commit.\n" +"with '%s' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"請輸入描述您變更的提交訊息。開頭是「%c」\n" -"的行皆會忽略。提交訊息空白則取消本次提交作業。\n" +"請輸入描述您變更的提交訊息。開頭是「%s」的列\n" +"皆會忽略。提交訊息空白則取消本次提交作業。\n" #: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be kept; you may remove them yourself if you want to.\n" +"with '%s' will be kept; you may remove them yourself if you want to.\n" msgstr "" -"請輸入描述您變更的提交訊息。會保留開頭是「%c」\n" -"的行，但也可以自己移除掉這些行。\n" +"請輸入描述您變更的提交訊息。會保留開頭是「%s」\n" +"的列，但也可以自己移除掉這些列。\n" #: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be kept; you may remove them yourself if you want to.\n" +"with '%s' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" "請輸入描述您變更的提交訊息。會保留開頭是\n" -"「%c」的行，但也可以自己移除掉這些行。\n" +"「%s」的列，但也可以自己移除掉這些列。\n" "提交訊息空白則取消本次提交作業。\n" #: builtin/commit.c @@ -6000,7 +6024,7 @@ msgstr "日期" msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h +#: builtin/commit.c parse-options.h ref-filter.h msgid "commit" msgstr "提交" @@ -6327,6 +6351,10 @@ msgid "with --get, use default value when missing entry" msgstr "使用 --get 但未指定參數時所使用的預設值" #: builtin/config.c +msgid "human-readable comment string (# will be prepended as needed)" +msgstr "人類可讀的備註字串（將按需插入 # 至前方）" + +#: builtin/config.c #, c-format msgid "wrong number of arguments, should be %d" msgstr "錯誤的參數個數，應該為 %d 個" @@ -6439,6 +6467,10 @@ msgid "--default is only applicable to --get" msgstr "--default 僅適用於 --get" #: builtin/config.c +msgid "--comment is only applicable to add/set/replace operations" +msgstr "--comment 只能用於加入、設定和取代動作" + +#: builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value 僅套用至 'value-pattern'" @@ -7007,7 +7039,7 @@ msgstr "來自 %.*s\n" #: builtin/fetch.c #, c-format msgid "object %s not found" -msgstr "物件 %s 未發現" +msgstr "找不到物件 %s" #: builtin/fetch.c msgid "[up to date]" @@ -7487,6 +7519,10 @@ msgid "read reference patterns from stdin" msgstr "從 stdin 讀取引用模式" #: builtin/for-each-ref.c +msgid "also include HEAD ref and pseudorefs" +msgstr "包含 HEAD 引用和偽引用" + +#: builtin/for-each-ref.c msgid "unknown arguments supplied with --stdin" msgstr "為 --stdin 提供的引數未知" @@ -8248,6 +8284,7 @@ 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 @@ -8259,8 +8296,8 @@ msgstr "沒有執行緒支援，忽略 %s" #: builtin/grep.c #, c-format -msgid "unable to read tree (%s)" -msgstr "無法讀取樹（%s）" +msgid "unable to read tree %s" +msgstr "無法讀取 %s 樹狀物件" #: builtin/grep.c #, c-format @@ -8784,11 +8821,6 @@ msgstr "解壓縮嚴重的不一致" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "發現 %s 出現 SHA1 衝突！" -#: builtin/index-pack.c builtin/pack-objects.c -#, c-format -msgid "unable to read %s" -msgstr "不能讀 %s" - #: builtin/index-pack.c #, c-format msgid "cannot read existing object info %s" @@ -8962,11 +8994,13 @@ msgstr "在打包物件中 fsck 檢查發生錯誤" msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" " [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [--ref-format=<format>]\n" " [-b <branch-name> | --initial-branch=<branch-name>]\n" " [--shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" " [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [--ref-format=<format>]\n" " [-b <branch-name> | --initial-branch=<branch-name>]\n" " [--shared[=<permissions>]] [<directory>]" @@ -9019,13 +9053,46 @@ msgstr "--separate-git-dir 與純版本庫不相容" #: builtin/interpret-trailers.c msgid "" "git interpret-trailers [--in-place] [--trim-empty]\n" -" [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...]\n" +" [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n" " [--parse] [<file>...]" msgstr "" "git interpret-trailers [--in-place] [--trim-empty]\n" -" [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...]\n" +" [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n" " [--parse] [<file>...]" +#: builtin/interpret-trailers.c wrapper.c +#, c-format +msgid "could not stat %s" +msgstr "不能對 %s 呼叫 stat" + +#: 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'" +msgstr "不能讀取輸入檔案 '%s'" + +#: builtin/interpret-trailers.c builtin/mktag.c imap-send.c +msgid "could not read from stdin" +msgstr "不能自標準輸入讀取" + +#: builtin/interpret-trailers.c +#, c-format +msgid "could not rename temporary file to %s" +msgstr "不能重新命名暫存檔為 %s" + #: builtin/interpret-trailers.c msgid "edit files in place" msgstr "在原位編輯檔案" @@ -9125,10 +9192,10 @@ msgid "" "<file>" msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱> 的變化史" -#: builtin/log.c builtin/shortlog.c bundle.c +#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c #, c-format msgid "unrecognized argument: %s" -msgstr "無法識別的參數：%s" +msgstr "無法識別的引數：%s" #: builtin/log.c msgid "-L<range>:<file> cannot be used with pathspec" @@ -9524,21 +9591,6 @@ msgid "could not get object info about '%s'" msgstr "無法取得「%s」相關的物件資訊" #: builtin/ls-files.c -#, c-format -msgid "bad ls-files format: element '%s' does not start with '('" -msgstr "ls-files 格式錯誤：“%s” 元素不以 “(” 開頭" - -#: builtin/ls-files.c -#, c-format -msgid "bad ls-files format: element '%s' does not end in ')'" -msgstr "ls-files 格式錯誤：“%s” 元素不以 “)” 結尾" - -#: builtin/ls-files.c -#, c-format -msgid "bad ls-files format: %%%.*s" -msgstr "ls-files 格式錯誤：%%%.*s" - -#: builtin/ls-files.c msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<選項>] [<檔案>...]" @@ -9630,7 +9682,7 @@ msgstr "顯示相對於頂級目錄的檔案名" msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <檔案> 都不在索引區，視為錯誤" -#: builtin/ls-files.c +#: builtin/ls-files.c builtin/merge-tree.c msgid "tree-ish" msgstr "樹或提交" @@ -9708,21 +9760,6 @@ msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<選項>] <樹或提交> [<路徑>...]" #: builtin/ls-tree.c -#, c-format -msgid "bad ls-tree format: element '%s' does not start with '('" -msgstr "無效的 ls-tree 格式：「%s」元素的開頭不是「(」" - -#: builtin/ls-tree.c -#, c-format -msgid "bad ls-tree format: element '%s' does not end in ')'" -msgstr "無效的 ls-tree 格式：「%s」元素的結尾不是「)」" - -#: builtin/ls-tree.c -#, c-format -msgid "bad ls-tree format: %%%.*s" -msgstr "無效的 ls-tree 格式：%%%.*s" - -#: builtin/ls-tree.c msgid "only show trees" msgstr "只顯示樹" @@ -9868,6 +9905,13 @@ msgstr "" "git merge-file [<選項>] [-L <檔案1> [-L <初始> [-L <名字2>]]] <檔案1> <初始文" "件> <檔案2>" +#: builtin/merge-file.c diff.c +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" + #: builtin/merge-file.c msgid "send results to standard output" msgstr "將結果傳送到標準輸出" @@ -9896,6 +9940,14 @@ msgstr "如果衝突，使用他們的版本" msgid "for conflicts, use a union version" msgstr "如果衝突，使用聯合版本" +#: builtin/merge-file.c diff.c +msgid "<algorithm>" +msgstr "<演算法>" + +#: builtin/merge-file.c diff.c +msgid "choose a diff algorithm" +msgstr "選擇一個差異演算法" + #: builtin/merge-file.c msgid "for conflicts, use this marker size" msgstr "如果衝突，使用指定長度的標記" @@ -9947,6 +9999,11 @@ msgstr "無法解析引用 '%s'" msgid "Merging %s with %s\n" msgstr "合併 %s 和 %s\n" +#: builtin/merge-tree.c +#, c-format +msgid "could not parse as tree '%s'" +msgstr "無法解析為樹狀物件「%s」" + #: builtin/merge-tree.c builtin/merge.c msgid "not something we can merge" msgstr "不能合併" @@ -10012,10 +10069,6 @@ msgstr "--trivial-merge 和其他所有選項都不相容" msgid "unknown strategy option: -X%s" msgstr "未知的策略選項：-X%s" -#: builtin/merge-tree.c -msgid "--merge-base is incompatible with --stdin" -msgstr "--merge-base 與 --stdin 不相容" - #: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." @@ -10174,7 +10227,7 @@ msgstr "'%s' 沒有指向一個提交" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c builtin/stash.c merge-recursive.c +#: builtin/merge.c merge-recursive.c msgid "Unable to write index." msgstr "不能寫入索引。" @@ -10182,7 +10235,7 @@ msgstr "不能寫入索引。" msgid "Not handling anything other than two heads merge." msgstr "未處理兩個頭合併之外的任何動作。" -#: builtin/merge.c t/helper/test-fast-rebase.c +#: builtin/merge.c #, c-format msgid "unable to write %s" msgstr "不能寫 %s" @@ -10214,9 +10267,9 @@ msgstr "空的提交說明會終止提交。\n" #: builtin/merge.c #, c-format msgid "" -"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"Lines starting with '%s' will be ignored, and an empty message aborts\n" "the commit.\n" -msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交。\n" +msgstr "以「%s」開始的列將被忽略，提交說明留空則會終止提交。\n" #: builtin/merge.c msgid "Empty commit message." @@ -10409,10 +10462,6 @@ msgstr "無法讀取有標籤的物件「%s」" msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "「%s」已標為「%s」，但卻是「%s」類型" -#: builtin/mktag.c imap-send.c trailer.c -msgid "could not read from stdin" -msgstr "不能自標準輸入讀取" - #: builtin/mktag.c msgid "tag on stdin did not pass our strict fsck check" msgstr "stdin 上的標籤未通過我們的嚴格 fsck 檢查" @@ -10625,7 +10674,7 @@ msgstr "列出可以從所有引用存取的提交" #: builtin/name-rev.c msgid "deprecated: use --annotate-stdin instead" -msgstr "已廢棄：請改用 --annotate-stdin" +msgstr "已棄用：請改用 --annotate-stdin" #: builtin/name-rev.c msgid "annotate text from stdin" @@ -10745,11 +10794,6 @@ msgid "Write/edit the notes for the following object:" msgstr "為下面的物件寫/編輯說明：" #: builtin/notes.c -#, c-format -msgid "unable to start 'show' for object '%s'" -msgstr "不能為物件 '%s' 開始 'show'" - -#: builtin/notes.c msgid "could not read 'show' output" msgstr "不能讀取 'show' 的輸出" @@ -10892,8 +10936,8 @@ msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -"子指令 'edit' 的選項 -m/-F/-c/-C 已棄用。\n" -"請換用 'git notes add -f -m/-F/-c/-C'。\n" +"子指令「edit」的選項 -m/-F/-c/-C 已棄用。\n" +"請換用「git notes add -f -m/-F/-c/-C」。\n" #: builtin/notes.c msgid "failed to delete ref NOTES_MERGE_PARTIAL" @@ -11170,12 +11214,17 @@ msgstr "不一致的差異計數" #: builtin/pack-objects.c #, c-format +msgid "invalid pack.allowPackReuse value: '%s'" +msgstr "無效的 pack.allowPackReuse 值：“%s”" + +#: builtin/pack-objects.c +#, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" "hash> <uri>' (got '%s')" msgstr "" -"uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> " -"<uri>' (收到 '%s')" +"uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> <uri>' " +"(收到 '%s')" #: builtin/pack-objects.c #, c-format @@ -11492,10 +11541,10 @@ msgstr "枚舉物件" #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" +"reused %<PRIu32> (from %<PRIuMAX>)" msgstr "" "總共 %<PRIu32> (差異 %<PRIu32>)，復用 %<PRIu32> (差異 %<PRIu32>)，重用包 " -"%<PRIu32>" +"%<PRIu32> (總共 %<PRIuMAX>)" #: builtin/pack-redundant.c msgid "" @@ -11517,10 +11566,10 @@ msgstr "傳入 --i-still-use-this 前拒絕執行" #: builtin/pack-refs.c msgid "" -"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude " +"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " "<pattern>]" msgstr "" -"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude " +"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " "<pattern>]" #: builtin/pack-refs.c @@ -11532,6 +11581,10 @@ msgid "prune loose refs (default)" msgstr "剪除鬆散引用（預設值）" #: builtin/pack-refs.c +msgid "auto-pack refs as needed" +msgstr "按需自動封裝引用" + +#: builtin/pack-refs.c msgid "references to include" msgstr "要包含的引用" @@ -12295,19 +12348,6 @@ msgid "could not remove '%s'" msgstr "無法刪除 '%s'" #: builtin/rebase.c -msgid "" -"Resolve all conflicts manually, mark them as resolved with\n" -"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" -"You can instead skip this commit: run \"git rebase --skip\".\n" -"To abort and get back to the state before \"git rebase\", run \"git rebase --" -"abort\"." -msgstr "" -"手動解決所有衝突，執行 \"git add/rm <衝突的檔案>\" 標記\n" -"衝突已解決，然後執行 \"git rebase --continue\"。您也可以執行\n" -"\"git rebase --skip\" 指令略過這個提交。如果想要終止執行並回到\n" -"\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。" - -#: builtin/rebase.c #, c-format msgid "" "\n" @@ -12340,11 +12380,15 @@ msgid "apply options and merge options cannot be used together" msgstr "套用選項與合併選項不得同時使用" #: builtin/rebase.c +msgid "--empty=ask is deprecated; use '--empty=stop' instead." +msgstr "--empty=ask 已棄用。請改用「--empty=stop」。" + +#: builtin/rebase.c #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " -"\"ask\"." -msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。" +"\"stop\"." +msgstr "無法識別空類型「%s」；有效的數值有「drop」、「keep」跟「stop」。" #: builtin/rebase.c msgid "" @@ -12486,7 +12530,7 @@ msgstr "讓使用者編輯要重定基底的提交列表" msgid "(REMOVED) was: try to recreate merges instead of ignoring them" msgstr "（已移除）曾為：嘗試重新建立，而非忽略合併" -#: builtin/rebase.c +#: builtin/rebase.c builtin/revert.c msgid "how to handle commits that become empty" msgstr "處理空白提交的方式" @@ -12567,14 +12611,14 @@ msgstr "" "請改用 “merges”" #: builtin/rebase.c -msgid "No rebase in progress?" -msgstr "沒有正在進行的重定基底？" +msgid "no rebase in progress" +msgstr "沒有進行中的重定基底流程" #: builtin/rebase.c msgid "The --edit-todo action can only be used during interactive rebase." msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。" -#: builtin/rebase.c t/helper/test-fast-rebase.c +#: builtin/rebase.c msgid "Cannot read HEAD" msgstr "不能讀取 HEAD" @@ -12620,12 +12664,6 @@ msgstr "開關 `C' 期望一個數字值" #: builtin/rebase.c msgid "" -"apply options are incompatible with rebase.autoSquash. Consider adding --no-" -"autosquash" -msgstr "apply 選項與 rebase.autoSquash 不相容。請考慮加上 --no-autosquash" - -#: builtin/rebase.c -msgid "" "apply options are incompatible with rebase.rebaseMerges. Consider adding --" "no-rebase-merges" msgstr "apply 選項與 rebase.rebaseMerges 不相容。請考慮加上 --no-rebase-merges" @@ -12791,6 +12829,10 @@ msgid "git reflog [show] [<log-options>] [<ref>]" msgstr "git reflog [show] [<log-options>] [<ref>]" #: builtin/reflog.c +msgid "git reflog list" +msgstr "git reflog list" + +#: builtin/reflog.c msgid "" "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" " [--rewrite] [--updateref] [--stale-fix]\n" @@ -12819,6 +12861,11 @@ msgstr "git reflog exists <引用>" msgid "invalid timestamp '%s' given to '--%s'" msgstr "傳入「--%s」的時間戳「%s」無效" +#: builtin/reflog.c sequencer.c +#, c-format +msgid "%s does not accept arguments: '%s'" +msgstr "%s 不接受參數：'%s'" + #: builtin/reflog.c msgid "do not actually prune any entries" msgstr "不實際剪除任何項目" @@ -12973,13 +13020,13 @@ msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -"--mirror 選項危險且過時，請使用 --mirror=fetch\n" +"--mirror 選項危險且已棄用，請使用 --mirror=fetch\n" "\t 或 --mirror=push" #: builtin/remote.c #, c-format -msgid "unknown mirror argument: %s" -msgstr "未知的鏡像參數：%s" +msgid "unknown --mirror argument: %s" +msgstr "未知的 --mirror 引數：%s" #: builtin/remote.c msgid "fetch the remote branches" @@ -13109,7 +13156,7 @@ msgid "" msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" -msgstr[0] "注意：ref/remotes 層級之外的一個分支未被移除。要刪除它，使用：" +msgstr[0] "注意：refs/remotes/ 層級之外的一個分支未被移除。要刪除它，使用：" #: builtin/remote.c #, c-format @@ -13429,6 +13476,10 @@ msgid "could not start pack-objects to repack promisor objects" msgstr "無法開始 pack-objects 來重新打包 promisor 物件" #: builtin/repack.c +msgid "failed to feed promisor objects to pack-objects" +msgstr "無法將承諾者物件喂給 pack-objects" + +#: builtin/repack.c msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。" @@ -13838,6 +13889,86 @@ msgstr "--convert-graft-file 不帶參數" msgid "only one pattern can be given with -l" msgstr "只能為 -l 提供一個模式" +#: builtin/replay.c +msgid "need some commits to replay" +msgstr "需要一些提交才能重放" + +#: builtin/replay.c +msgid "--onto and --advance are incompatible" +msgstr "--onto 和 --advance 不相容" + +#: 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 的引數必須為引用" + +#: builtin/replay.c +msgid "" +"cannot advance target with multiple sources because ordering would be ill-" +"defined" +msgstr "無法用多個來源演進目的地，以免無法確定排序" + +#: builtin/replay.c +msgid "" +"cannot implicitly determine whether this is an --advance or --onto operation" +msgstr "無法假設這是 --advance 還是 --onto 動作" + +#: builtin/replay.c +msgid "" +"cannot advance target with multiple source branches because ordering would " +"be ill-defined" +msgstr "無法由多個來源分支演進目的地，以免無法確定排序" + +#: builtin/replay.c +msgid "cannot implicitly determine correct base for --onto" +msgstr "無法假設 --onto 的正確基底" + +#: builtin/replay.c +msgid "" +"(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance " +"<branch>) <revision-range>..." +msgstr "" +"（實驗性功能！）git replay ([--contained] --onto <newbase> | --advance " +"<branch>) <revision-range>..." + +#: builtin/replay.c +msgid "make replay advance given branch" +msgstr "在指定分支上進行重放演進" + +#: builtin/replay.c +msgid "replay onto given commit" +msgstr "重放到指定提交" + +#: builtin/replay.c +msgid "advance all branches contained in revision-range" +msgstr "演進所有包含在 revision-range 中的分支" + +#: builtin/replay.c +msgid "option --onto or --advance is mandatory" +msgstr "必須傳入 --onto 或 --advance 選項" + +#: builtin/replay.c +#, c-format +msgid "" +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' " +"will be forced" +msgstr "將覆寫部分修訂版遍歷選項，強制使用 “struct rev_info” 的 “%s” 位元" + +#: builtin/replay.c +msgid "error preparing revisions" +msgstr "無法準備修訂集" + +#: builtin/replay.c +msgid "replaying down to root commit is not supported yet!" +msgstr "尚不支援重放到根提交！" + +#: builtin/replay.c +msgid "replaying merge commits is not supported yet!" +msgstr "尚不支援重放合併提交！" + #: builtin/rerere.c msgid "" "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" @@ -13850,7 +13981,7 @@ msgstr "在索引中註冊乾淨的解決方案" #: builtin/rerere.c msgid "'git rerere forget' without paths is deprecated" -msgstr "沒有路徑的 'git rerere forget' 已經過時" +msgstr "沒有路徑的「git rerere forget」已經棄用" #: builtin/rerere.c #, c-format @@ -13960,7 +14091,7 @@ msgstr "無法將 '%s' 解析為一個有效的樹狀物件。" #: builtin/reset.c msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." -msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。" +msgstr "--mixed 帶路徑已棄用，請改用「git reset -- <路徑>」。" # 譯者：漢字之間無空格，故刪除%s前後空格 #: builtin/reset.c @@ -14096,22 +14227,19 @@ msgid "--prefix requires an argument" msgstr "--prefix 需要 1 個引數" #: builtin/rev-parse.c +msgid "no object format specified" +msgstr "未指定物件格式" + +#: builtin/rev-parse.c +#, c-format +msgid "unsupported object format: %s" +msgstr "不支援的物件格式：%s" + +#: builtin/rev-parse.c #, c-format msgid "unknown mode for --abbrev-ref: %s" msgstr "--abbrev-ref 的模式未知：%s" -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --branches" -msgstr "--exclude-hidden 無法與 --branches 同時使用" - -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --tags" -msgstr "--exclude-hidden 無法與 --tags 同時使用" - -#: builtin/rev-parse.c revision.c -msgid "--exclude-hidden cannot be used together with --remotes" -msgstr "--exclude-hidden 無法與 --remotes 同時使用" - #: builtin/rev-parse.c setup.c msgid "this operation must be run in a work tree" msgstr "該動作必須在一個工作區中執行" @@ -14212,8 +14340,8 @@ msgid "allow commits with empty messages" msgstr "允許提交說明為空" #: builtin/revert.c -msgid "keep redundant, empty commits" -msgstr "保持多餘的、空的提交" +msgid "deprecated: use --empty=keep instead" +msgstr "已棄用：請改用 --empty=keep" #: builtin/revert.c msgid "use the 'reference' format to refer to commits" @@ -14610,11 +14738,6 @@ msgstr "不列印結果到標準輸出（例如與 --verify 參數共用）" msgid "show refs from stdin that aren't in local repository" msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用" -#: builtin/show-ref.c -#, c-format -msgid "only one of '%s', '%s' or '%s' can be given" -msgstr "只能傳入 “%s”、“%s” 或 “%s”" - #: builtin/sparse-checkout.c msgid "" "git sparse-checkout (init | list | set | add | reapply | disable | check-" @@ -14663,7 +14786,7 @@ msgstr "以 cone 模式初始化稀疏簽出" msgid "toggle the use of a sparse index" msgstr "切換是否使用稀疏索引" -#: builtin/sparse-checkout.c commit-graph.c midx.c sequencer.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 建立先導目錄" @@ -15829,12 +15952,12 @@ msgid "" "\n" "Write a message for tag:\n" " %s\n" -"Lines starting with '%c' will be ignored.\n" +"Lines starting with '%s' will be ignored.\n" msgstr "" "\n" -"輸入一個標籤說明：\n" +"為標籤輸入說明訊息：\n" " %s\n" -"以 '%c' 開頭的行將被忽略。\n" +"以「%s」開頭的列將被忽略。\n" #: builtin/tag.c #, c-format @@ -15842,13 +15965,13 @@ msgid "" "\n" "Write a message for tag:\n" " %s\n" -"Lines starting with '%c' will be kept; you may remove them yourself if you " +"Lines starting with '%s' will be kept; you may remove them yourself if you " "want to.\n" msgstr "" "\n" -"輸入一個標籤說明：\n" +"為標籤輸入說明訊息：\n" " %s\n" -"以 '%c' 開頭的行將被保留，如果您願意也可以刪除它們。\n" +"以「%s」開頭的列將被保留；需要的話您可以自己刪除。\n" #: builtin/tag.c msgid "unable to sign the tag" @@ -15957,6 +16080,10 @@ msgid "print only tags of the object" msgstr "只列印指向該物件的標籤" #: builtin/tag.c +msgid "could not start 'git column'" +msgstr "無法啟動 “git column”" + +#: builtin/tag.c #, c-format msgid "the '%s' option is only allowed in list mode" msgstr "「%s」選項只能在列表顯示模式使用" @@ -16259,12 +16386,12 @@ msgid "fsmonitor disabled" msgstr "fsmonitor 被停用" #: builtin/update-ref.c -msgid "git update-ref [<options>] -d <refname> [<old-val>]" -msgstr "git update-ref [<選項>] -d <引用名> [<舊值>]" +msgid "git update-ref [<options>] -d <refname> [<old-oid>]" +msgstr "git update-ref [<options>] -d <refname> [<old-oid>]" #: builtin/update-ref.c -msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" -msgstr "git update-ref [<選項>] <引用名> <新值> [<舊值>]" +msgid "git update-ref [<options>] <refname> <new-oid> [<old-oid>]" +msgstr "git update-ref [<options>] <refname> <new-oid> [<old-oid>]" #: builtin/update-ref.c msgid "git update-ref [<options>] --stdin [-z]" @@ -16389,14 +16516,14 @@ msgstr "沒有可能的來源分支，推測為 “--orphan”" #: builtin/worktree.c #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan -b %s %s\n" msgstr "" "如果您是想要在這個版本庫建立一個工作區，裡面包含一個\n" -"孤立分支（即沒有提交的分支），可以使用 --orphan 達到\n" +"未誕生分支（即沒有提交的分支），可以使用 --orphan 達到\n" "這個效果：\n" "\n" " git worktree add --orphan -b %s %s\n" @@ -16404,14 +16531,14 @@ msgstr "" #: builtin/worktree.c #, c-format msgid "" -"If you meant to create a worktree containing a new orphan branch\n" +"If you meant to create a worktree containing a new unborn branch\n" "(branch with no commits) for this repository, you can do so\n" "using the --orphan flag:\n" "\n" " git worktree add --orphan %s\n" msgstr "" "如果您是想要在這個版本庫建立一個工作區，裡面包含一個\n" -"孤立分支（即沒有提交的分支），可以使用 --orphan 達到\n" +"未誕生分支（即沒有提交的分支），可以使用 --orphan 達到\n" "這個效果：\n" "\n" " git worktree add --orphan %s\n" @@ -16483,6 +16610,11 @@ msgstr "正在初始化" #: builtin/worktree.c #, c-format +msgid "could not find created worktree '%s'" +msgstr "找不到建立的工作區「%s」" + +#: builtin/worktree.c +#, c-format msgid "Preparing worktree (new branch '%s')" msgstr "準備工作區（新分支 '%s'）" @@ -16526,11 +16658,6 @@ msgstr "" "故停止。使用 “add -f” 先覆蓋或抓取遠端" #: builtin/worktree.c -#, c-format -msgid "'%s' and '%s' cannot be used together" -msgstr "無法同時使用 “%s” 和 “%s”" - -#: builtin/worktree.c msgid "checkout <branch> even if already checked out in other worktree" msgstr "簽出 <分支>，即使已經被簽出到其它工作區" @@ -16543,8 +16670,8 @@ msgid "create or reset a branch" msgstr "建立或重設一個分支" #: builtin/worktree.c -msgid "create unborn/orphaned branch" -msgstr "建立尚無內容（孤立）的分支" +msgid "create unborn branch" +msgstr "建立未誕生分支" #: builtin/worktree.c msgid "populate the new working tree" @@ -16573,12 +16700,8 @@ msgstr "「%s」、「%s」和「%s」選項不得同時使用" #: builtin/worktree.c #, c-format -msgid "options '%s', and '%s' cannot be used together" -msgstr "無法同時使用 “%s” 和 “%s” 選項" - -#: builtin/worktree.c -msgid "<commit-ish>" -msgstr "<提交指示元>" +msgid "option '%s' and commit-ish cannot be used together" +msgstr "「%s」選項和提交編號不得同時使用" #: builtin/worktree.c msgid "added with --lock" @@ -16816,7 +16939,7 @@ msgstr "無法識別的套件包雜湊演算法：%s" #: bundle.c #, c-format msgid "unknown capability '%s'" -msgstr "未知功能 '%s'" +msgstr "未知功能「%s」" #: bundle.c #, c-format @@ -16826,7 +16949,7 @@ msgstr "“%s” 不像是一個 v2 或 v3 版本的套件包檔案" #: bundle.c #, c-format msgid "unrecognized header: %s%s (%d)" -msgstr "無法識別的包頭：%s%s (%d)" +msgstr "無法識別的標頭：%s%s (%d)" #: bundle.c msgid "Repository lacks these prerequisite commits:" @@ -16874,7 +16997,7 @@ msgstr "無法複製套件包描述元" #: bundle.c msgid "Could not spawn pack-objects" -msgstr "不能生成 pack-objects 進程" +msgstr "無法 spawn pack-objects 處理程序" #: bundle.c msgid "pack-objects died" @@ -16883,7 +17006,7 @@ msgstr "pack-objects 終止" #: bundle.c #, c-format msgid "ref '%s' is excluded by the rev-list options" -msgstr "引用 '%s' 被 rev-list 選項排除" +msgstr "引用「%s」被 rev-list 選項排除" #: bundle.c #, c-format @@ -16902,7 +17025,7 @@ msgstr "不能建立空套件包。" #: bundle.c #, c-format msgid "cannot create '%s'" -msgstr "不能建立 '%s'" +msgstr "無法建立「%s」" #: bundle.c msgid "index-pack died" @@ -16910,7 +17033,7 @@ msgstr "index-pack 終止" #: chunk-format.c msgid "terminating chunk id appears earlier than expected" -msgstr "終止區塊 id 出現的時間早於預期" +msgstr "終止區塊 ID 比預期還早出現" #: chunk-format.c #, c-format @@ -17367,6 +17490,10 @@ msgid "Create, list, delete refs to replace objects" msgstr "建立、列出、刪除物件取代引用" #: command-list.h +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too" +msgstr "實驗性功能：在新的基底重放提交，亦支援裸版本庫" + +#: command-list.h msgid "Generates a summary of pending changes" msgstr "生成待定更改的摘要" @@ -17684,6 +17811,37 @@ msgid "commit-graph file is too small" msgstr "提交圖形檔案太小" #: commit-graph.c +msgid "commit-graph oid fanout chunk is wrong size" +msgstr "提交圖形 OID 扇出區塊大小有誤" + +#: commit-graph.c +msgid "commit-graph fanout values out of order" +msgstr "提交圖形扇出的數值失序" + +#: commit-graph.c +msgid "commit-graph OID lookup chunk is the wrong size" +msgstr "提交圖形 OID 查詢區塊的大小有誤" + +#: commit-graph.c +msgid "commit-graph commit data chunk is wrong size" +msgstr "提交圖形的提交資料區塊大小有誤" + +#: commit-graph.c +msgid "commit-graph generations chunk is wrong size" +msgstr "提交圖形的世代區塊大小有誤" + +#: commit-graph.c +msgid "commit-graph changed-path index chunk is too small" +msgstr "提交圖形的更動路徑索引區塊過小" + +#: commit-graph.c +#, c-format +msgid "" +"ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-" +"graph file" +msgstr "忽略提交圖形檔案中過小的更動路徑區塊 (%<PRIuMAX> < %<PRIuMAX>)" + +#: commit-graph.c #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交圖形簽名 %X 和簽名 %X 不符合" @@ -17701,7 +17859,19 @@ msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合" #: commit-graph.c #, c-format msgid "commit-graph file is too small to hold %u chunks" -msgstr "commit-graph 檔案不夠放置 %u 個區塊" +msgstr "提交圖形檔案不夠放置 %u 個區塊" + +#: commit-graph.c +msgid "commit-graph required OID fanout chunk missing or corrupted" +msgstr "提交圖形需要的 OID 扇出區塊遺失或損壞" + +#: commit-graph.c +msgid "commit-graph required OID lookup chunk missing or corrupted" +msgstr "提交圖形需要的 OID 查詢區塊遺失或損壞" + +#: commit-graph.c +msgid "commit-graph required commit data chunk missing or corrupted" +msgstr "提交圖形需要的提交資料區塊遺失或損壞" #: commit-graph.c msgid "commit-graph has no base graphs chunk" @@ -17721,9 +17891,13 @@ msgid "commit count in base graph too high: %<PRIuMAX>" msgstr "基礎圖 (base graph) 中的提交數過多：%<PRIuMAX>" #: commit-graph.c +msgid "commit-graph chain file too small" +msgstr "提交圖形鏈檔案過小" + +#: commit-graph.c #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值" +msgstr "無效的提交圖形鏈：「%s」列不是雜湊值" #: commit-graph.c msgid "unable to find all commit-graph files" @@ -17747,6 +17921,10 @@ msgid "commit-graph overflow generation data is too small" msgstr "提交圖形的溢出世代資料過小" #: commit-graph.c +msgid "commit-graph extra-edges pointer out of bounds" +msgstr "提交圖形的延伸邊界指針超出範圍" + +#: commit-graph.c msgid "Loading known commits in commit graph" msgstr "正在載入提交圖中的已知提交" @@ -17920,6 +18098,11 @@ msgstr "提交圖形中包含 0 和非 0 兩個世代號（例如 “%s” 和 msgid "Verifying commits in commit graph" msgstr "正在驗證提交圖中的提交" +#: commit-reach.c sequencer.c +#, c-format +msgid "could not parse commit %s" +msgstr "不能解析提交 %s" + #: commit.c #, c-format msgid "%s %s is not a commit!" @@ -17936,14 +18119,14 @@ msgid "" "Turn this message off by running\n" "\"git config advice.graftFileDeprecated false\"" msgstr "" -"對 <GIT_DIR>/info/grafts 的支援已被棄用，並將在\n" -"未來的Git版本中被移除。\n" +"對 <GIT_DIR>/info/grafts 的支援已棄用，並將在\n" +"未來的 Git 版本中被移除。\n" "\n" -"請使用 \"git replace --convert-graft-file\" 將\n" +"請使用「git replace --convert-graft-file」將\n" "grafts 轉換為取代引用。\n" "\n" -"設定 \"git config advice.graftFileDeprecated false\"\n" -"可關閉本消息" +"設定「git config advice.graftFileDeprecated false」\n" +"可以將本訊息關閉" #: commit.c #, c-format @@ -18447,8 +18630,14 @@ msgid "bad zlib compression level %d" msgstr "錯誤的 zlib 壓縮級別 %d" #: config.c -msgid "core.commentChar should only be one ASCII character" -msgstr "core.commentChar 應該是一個 ASCII 字元" +#, c-format +msgid "%s cannot contain newline" +msgstr "%s 不能包含換行符號" + +#: config.c +#, c-format +msgid "%s must have at least one character" +msgstr "%s 得有至少 1 個字元" #: config.c #, c-format @@ -18457,7 +18646,7 @@ msgstr "忽略未知的 core.fsyncMethod 值「%s」" #: config.c msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" -msgstr "core.fsyncObjectFiles 已被取代。請改用 core.fsync" +msgstr "core.fsyncObjectFiles 已棄用。請改用 core.fsync" #: config.c #, c-format @@ -18538,6 +18727,11 @@ msgstr "寫入新的設定檔案 %s 失敗" #: config.c #, c-format +msgid "no multi-line comment allowed: '%s'" +msgstr "不允許多列備註：「%s」" + +#: config.c +#, c-format msgid "could not lock config file %s" msgstr "不能鎖定設定檔案 %s" @@ -19120,6 +19314,11 @@ msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模 msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "設定變數 'diff.submodule' 未知的取值：'%s'" +#: diff.c transport.c +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "設定 '%s' 的取值未知：%s" + #: diff.c #, c-format msgid "" @@ -19214,13 +19413,6 @@ msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的無效模式 '%s'" #: diff.c -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" - -#: diff.c #, c-format msgid "invalid argument to %s" msgstr "%s 的參數無效" @@ -19277,8 +19469,8 @@ msgid "output only the last line of --stat" msgstr "只輸出 --stat 的最後一行" #: diff.c -msgid "<param1,param2>..." -msgstr "<參數1,參數2>..." +msgid "<param1>,<param2>..." +msgstr "<param1>,<param2>..." #: diff.c msgid "" @@ -19290,8 +19482,8 @@ msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同義" #: diff.c -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "是 --dirstat=files,param1,param2... 的同義詞" +msgid "synonym for --dirstat=files,<param1>,<param2>..." +msgstr "是 --dirstat=files,<param1>,<param2>... 的同義詞" #: diff.c msgid "warn if changes introduce conflict markers or whitespace errors" @@ -19514,14 +19706,6 @@ msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 演算法生成差異" #: diff.c -msgid "<algorithm>" -msgstr "<演算法>" - -#: diff.c -msgid "choose a diff algorithm" -msgstr "選擇一個差異演算法" - -#: diff.c msgid "<text>" msgstr "<文字>" @@ -20710,6 +20894,16 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "不能建立 '%s.lock'：%s" +#: loose.c +#, c-format +msgid "could not write loose object index %s" +msgstr "無法寫入鬆散物件索引 %s" + +#: loose.c +#, c-format +msgid "failed to write loose object index %s\n" +msgstr "寫入鬆散物件索引 %s 失敗\n" + #: ls-refs.c #, c-format msgid "unexpected line: '%s'" @@ -20723,6 +20917,11 @@ msgstr "在 ls-refs 引數之後應該有一個 flush 包" msgid "quoted CRLF detected" msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF" +#: mem-pool.c strbuf.c wrapper.c +#, c-format +msgid "unable to format message: %s" +msgstr "無法格式化訊息：%s" + #: merge-ort.c merge-recursive.c #, c-format msgid "Failed to merge submodule %s (not checked out)" @@ -20740,6 +20939,11 @@ msgstr "無法合併子模組 %s（提交不存在）" #: merge-ort.c merge-recursive.c #, c-format +msgid "Failed to merge submodule %s (repository corrupt)" +msgstr "無法合併子模組 %s （版本庫損壞）" + +#: merge-ort.c merge-recursive.c +#, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "無法合併子模組 %s （提交未跟隨合併基礎）" @@ -20940,7 +21144,7 @@ msgstr "" #. conflict in a submodule. The first argument is the submodule #. name, and the second argument is the abbreviated id of the #. commit that needs to be merged. For example: -#. - go to submodule (mysubmodule), and either merge commit abc1234" +#. - go to submodule (mysubmodule), and either merge commit abc1234" #. #: merge-ort.c #, c-format @@ -21050,7 +21254,7 @@ msgstr "快轉子模組 %s" #: merge-recursive.c #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" -msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）" +msgstr "無法合併子模組 %s （找不到合併跟隨的提交）" #: merge-recursive.c #, c-format @@ -21270,11 +21474,115 @@ msgstr "不能解析物件 '%s'" msgid "failed to read the cache" msgstr "讀取快取失敗" +#: midx-write.c +#, c-format +msgid "failed to add packfile '%s'" +msgstr "新增 packfile '%s' 失敗" + +#: midx-write.c +#, c-format +msgid "failed to open pack-index '%s'" +msgstr "開啟包索引 '%s' 失敗" + +#: midx-write.c +#, c-format +msgid "failed to locate object %d in packfile" +msgstr "在 packfile 中定位物件 %d 失敗" + +#: midx-write.c +msgid "cannot store reverse index file" +msgstr "無法儲存倒排索引檔案" + +#: midx-write.c +#, c-format +msgid "could not parse line: %s" +msgstr "無法解析橫列：%s" + +#: midx-write.c +#, c-format +msgid "malformed line: %s" +msgstr "橫列格式錯誤：%s" + +#: midx-write.c +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "忽略現有的多包索引：總和檢查碼不符" + +#: midx-write.c +msgid "could not load pack" +msgstr "無法載入包" + +#: midx-write.c +#, c-format +msgid "could not open index for %s" +msgstr "無法開啟 %s 的索引" + +#: midx-write.c +msgid "Adding packfiles to multi-pack-index" +msgstr "正在新增 packfile 至多包索引" + +#: midx-write.c +#, c-format +msgid "unknown preferred pack: '%s'" +msgstr "未知偏好包：「%s」" + +#: midx-write.c +#, c-format +msgid "cannot select preferred pack %s with no objects" +msgstr "無法選取偏好，沒有物件的 %s 包" + +#: midx-write.c +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "沒有看到要捨棄的 packfile %s" + +#: midx-write.c +#, c-format +msgid "preferred pack '%s' is expired" +msgstr "偏好包「%s」已經過期" + +#: midx-write.c +msgid "no pack files to index." +msgstr "沒有要索引的 pack 檔案。" + +#: midx-write.c +msgid "refusing to write multi-pack .bitmap without any objects" +msgstr "拒絕寫入無任何物件的多包 .bitmap" + +#: midx-write.c +msgid "could not write multi-pack bitmap" +msgstr "無法寫入多包位圖" + +#: midx-write.c +msgid "could not write multi-pack-index" +msgstr "無法寫入多包索引" + +#: midx-write.c +msgid "Counting referenced objects" +msgstr "正在計算引用物件" + +#: midx-write.c +msgid "Finding and deleting unreferenced packfiles" +msgstr "正在尋找並刪除沒有引用的 packfile" + +#: midx-write.c +msgid "could not start pack-objects" +msgstr "不能開始 pack-objects" + +#: midx-write.c +msgid "could not finish pack-objects" +msgstr "不能結束 pack-objects" + #: midx.c msgid "multi-pack-index OID fanout is of the wrong size" msgstr "多包索引的物件 ID fanout 大小錯誤" #: midx.c +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" +msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" + +#: midx.c msgid "multi-pack-index OID lookup chunk is the wrong size" msgstr "多包索引 OID 查詢區塊的大小有誤" @@ -21333,94 +21641,21 @@ msgid "bad pack-int-id: %u (%u total packs)" msgstr "錯的 pack-int-id：%u（共有 %u 個包）" #: midx.c -msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" -msgstr "多包索引儲存一個64位位移，但是 off_t 太小" - -#: midx.c -msgid "multi-pack-index large offset out of bounds" -msgstr "多包索引的最大偏移超出邊界" - -#: midx.c -#, c-format -msgid "failed to add packfile '%s'" -msgstr "新增 packfile '%s' 失敗" - -#: midx.c -#, c-format -msgid "failed to open pack-index '%s'" -msgstr "開啟包索引 '%s' 失敗" - -#: midx.c -#, c-format -msgid "failed to locate object %d in packfile" -msgstr "在 packfile 中定位物件 %d 失敗" - -#: midx.c -msgid "cannot store reverse index file" -msgstr "無法儲存倒排索引檔案" - -#: midx.c -#, c-format -msgid "could not parse line: %s" -msgstr "無法解析橫列：%s" - -#: midx.c -#, c-format -msgid "malformed line: %s" -msgstr "橫列格式錯誤：%s" - -#: midx.c -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "忽略現有的多包索引：總和檢查碼不符" - -#: midx.c -msgid "could not load pack" -msgstr "無法載入包" - -#: midx.c -#, c-format -msgid "could not open index for %s" -msgstr "無法開啟 %s 的索引" - -#: midx.c -msgid "Adding packfiles to multi-pack-index" -msgstr "正在新增 packfile 至多包索引" - -#: midx.c -#, c-format -msgid "unknown preferred pack: '%s'" -msgstr "未知偏好包：「%s」" - -#: midx.c -#, c-format -msgid "cannot select preferred pack %s with no objects" -msgstr "無法選取偏好，沒有物件的 %s 包" - -#: midx.c -#, c-format -msgid "did not see pack-file %s to drop" -msgstr "沒有看到要捨棄的 packfile %s" +msgid "MIDX does not contain the BTMP chunk" +msgstr "MIDX 未包含 BTMP 區塊" #: midx.c #, c-format -msgid "preferred pack '%s' is expired" -msgstr "偏好包「%s」已經過期" - -#: midx.c -msgid "no pack files to index." -msgstr "沒有要索引的 pack 檔案。" - -#: midx.c -msgid "refusing to write multi-pack .bitmap without any objects" -msgstr "拒絕寫入無任何物件的多包 .bitmap" +msgid "could not load bitmapped pack %<PRIu32>" +msgstr "無法載入位圖化 (bitmapped) 的封裝 %<PRIu32>" #: midx.c -msgid "could not write multi-pack bitmap" -msgstr "無法寫入多包位圖" +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" +msgstr "多包索引儲存一個64位位移，但是 off_t 太小" #: midx.c -msgid "could not write multi-pack-index" -msgstr "無法寫入多包索引" +msgid "multi-pack-index large offset out of bounds" +msgstr "多包索引的最大偏移超出邊界" #: midx.c #, c-format @@ -21440,12 +21675,6 @@ msgid "Looking for referenced packfiles" msgstr "正在尋找引用的 packfile" #: midx.c -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" - -#: midx.c msgid "the midx contains no oid" msgstr "midx 沒有 oid" @@ -21481,22 +21710,6 @@ msgstr "為 packfile %s 載入包索引失敗" msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>" -#: midx.c -msgid "Counting referenced objects" -msgstr "正在計算引用物件" - -#: midx.c -msgid "Finding and deleting unreferenced packfiles" -msgstr "正在尋找並刪除沒有引用的 packfile" - -#: midx.c -msgid "could not start pack-objects" -msgstr "不能開始 pack-objects" - -#: midx.c -msgid "could not finish pack-objects" -msgstr "不能結束 pack-objects" - #: name-hash.c #, c-format msgid "unable to create lazy_dir thread: %s" @@ -21551,6 +21764,30 @@ msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解" msgid "Bad %s value: '%s'" msgstr "壞的 %s 值：'%s'" +#: object-file-convert.c +msgid "failed to decode tree entry" +msgstr "無法解碼樹狀物件項目" + +#: object-file-convert.c +#, c-format +msgid "failed to map tree entry for %s" +msgstr "無法為 %s 映射樹狀物件項目" + +#: object-file-convert.c +#, c-format +msgid "bad %s in commit" +msgstr "提交中有無效的 %s" + +#: object-file-convert.c +#, c-format +msgid "unable to map %s %s in commit object" +msgstr "無法在提交物件中映射 %s %s" + +#: object-file-convert.c +#, c-format +msgid "Failed to convert object from %s to %s" +msgstr "無法將物件從 %s 轉換為 %s" + #: object-file.c #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" @@ -21679,6 +21916,11 @@ msgstr "打包物件 %s（儲存在 %s）已損壞" #: object-file.c #, c-format +msgid "missing mapping of %s to %s" +msgstr "缺少 %s 到 %s 的映射" + +#: object-file.c +#, c-format msgid "unable to write file %s" msgstr "無法寫檔案 %s" @@ -21746,6 +21988,11 @@ msgstr "不能讀取物件 %s" #: object-file.c #, c-format +msgid "cannot map object %s to %s" +msgstr "無法將物件 %s 映射到 %s" + +#: object-file.c +#, c-format msgid "object fails fsck: %s" msgstr "物件 fsck 失敗：%s" @@ -21820,7 +22067,7 @@ msgstr "%s [無效物件]" #. TRANSLATORS: This is a line of ambiguous commit #. object output. E.g.: #. * -#. "deadbeef commit 2021-01-01 - Some Commit Message" +#. "deadbeef commit 2021-01-01 - Some Commit Message" #. #: object-name.c #, c-format @@ -21830,7 +22077,7 @@ msgstr "%s 提交 %s - %s" #. TRANSLATORS: This is a line of ambiguous #. tag object output. E.g.: #. * -#. "deadbeef tag 2022-01-01 - Some Tag Message" +#. "deadbeef tag 2022-01-01 - Some Tag Message" #. * #. The second argument is the YYYY-MM-DD found #. in the tag. @@ -21847,7 +22094,7 @@ msgstr "%s 標籤 %s - %s" #. tag object output where we couldn't parse #. the tag itself. E.g.: #. * -#. "deadbeef [bad tag, could not parse it]" +#. "deadbeef [bad tag, could not parse it]" #. #: object-name.c #, c-format @@ -22075,6 +22322,10 @@ msgstr "多包位圖缺少需要的反向索引" msgid "could not open pack %s" msgstr "無法開啟封包 %s" +#: pack-bitmap.c t/helper/test-read-midx.c +msgid "could not determine MIDX preferred pack" +msgstr "無法確定 MIDX 偏好的封裝" + #: pack-bitmap.c #, c-format msgid "preferred pack (%s) is invalid" @@ -22100,6 +22351,15 @@ msgstr "ewah 位圖損壞：提交 “%s” 之位圖的標頭遭截斷" #: pack-bitmap.c #, c-format +msgid "unable to load pack: '%s', disabling pack-reuse" +msgstr "無法載入「%s」封裝，停用 pack-reuse" + +#: pack-bitmap.c +msgid "unable to compute preferred pack, disabling pack-reuse" +msgstr "無法計算偏好封裝，停用 pack-reuse" + +#: pack-bitmap.c +#, c-format msgid "object '%s' not found in type bitmaps" msgstr "在類型位圖中，找不到「%s」物件" @@ -22213,6 +22473,10 @@ msgstr "%<PRIu64> 位置的修訂版索引 (rev-index) 無效：%<PRIu32> != %<P msgid "multi-pack-index reverse-index chunk is the wrong size" msgstr "多包索引的反向索引區塊大小有誤" +#: pack-revindex.c +msgid "could not determine preferred pack" +msgstr "無法確定偏好封裝" + #: pack-write.c msgid "cannot both write and verify reverse index" msgstr "無法同時寫入和驗證倒排索引" @@ -22293,11 +22557,6 @@ msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴" #: parse-options.c #, c-format -msgid "%s is incompatible with %s" -msgstr "%s 與 %s 不相容" - -#: parse-options.c -#, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）" @@ -22472,7 +22731,7 @@ msgstr "路徑規格包含無效的神奇前綴" #: pathspec.c #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'" +msgstr "有無效的神奇前綴「%.*s」出現在路徑規格「%s」中" #: pathspec.c #, c-format @@ -22687,11 +22946,6 @@ msgstr "無法在索引中新增 '%s'" #: read-cache.c #, c-format -msgid "unable to stat '%s'" -msgstr "無法對 %s 執行 stat" - -#: read-cache.c -#, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起來既是檔案又是目錄" @@ -23364,21 +23618,94 @@ msgstr "'%s' 已存在，無法建立 '%s'" msgid "cannot process '%s' and '%s' at the same time" msgstr "無法同時處理 '%s' 和 '%s'" -#: refs/files-backend.c -#, c-format -msgid "could not remove reference %s" -msgstr "無法刪除引用 %s" - -#: refs/files-backend.c refs/packed-backend.c +#: refs.c #, c-format msgid "could not delete reference %s: %s" msgstr "無法刪除引用 %s：%s" -#: refs/files-backend.c refs/packed-backend.c +#: refs.c #, c-format msgid "could not delete references: %s" msgstr "無法刪除引用：%s" +#: refs/reftable-backend.c +#, c-format +msgid "refname is dangerous: %s" +msgstr "此引用名稱是危險的：%s" + +#: refs/reftable-backend.c +#, c-format +msgid "trying to write ref '%s' with nonexistent object %s" +msgstr "嘗試以不存在的物件 %s 寫入引用「%s」" + +#: refs/reftable-backend.c +#, c-format +msgid "trying to write non-commit object %s to branch '%s'" +msgstr "嘗試將非提交物件 %s 寫入分支「%s」" + +#: refs/reftable-backend.c +#, c-format +msgid "" +"multiple updates for 'HEAD' (including one via its referent '%s') are not " +"allowed" +msgstr "不允許對「HEAD」進行多次更新（包含透過其「%s」引用進行的更新）" + +#: refs/reftable-backend.c +#, c-format +msgid "cannot lock ref '%s': unable to resolve reference '%s'" +msgstr "無法鎖定引用「%s」：無法解析引用「%s」" + +#: refs/reftable-backend.c +#, c-format +msgid "cannot lock ref '%s': error reading reference" +msgstr "無法鎖定引用「%s」：無法讀取引用" + +#: refs/reftable-backend.c +#, c-format +msgid "" +"multiple updates for '%s' (including one via symref '%s') are not allowed" +msgstr "不允許對「%s」進行多次更新（包含透過「%s」符號引用進行的更新）" + +#: refs/reftable-backend.c +#, c-format +msgid "cannot lock ref '%s': reference already exists" +msgstr "無法鎖定引用「%s」：引用已經存在" + +#: refs/reftable-backend.c +#, c-format +msgid "cannot lock ref '%s': reference is missing but expected %s" +msgstr "無法鎖定引用「%s」：缺少引用但預期的是 %s" + +#: refs/reftable-backend.c +#, c-format +msgid "cannot lock ref '%s': is at %s but expected %s" +msgstr "無法鎖定引用「%s」：位於 %s 但預期的是 %s" + +#: refs/reftable-backend.c +#, c-format +msgid "reftable: transaction prepare: %s" +msgstr "引用表：準備事務：%s" + +#: refs/reftable-backend.c +#, c-format +msgid "reftable: transaction failure: %s" +msgstr "引用表：事務失敗：%s" + +#: refs/reftable-backend.c +#, c-format +msgid "unable to compact stack: %s" +msgstr "無法壓縮堆疊：%s" + +#: refs/reftable-backend.c +#, c-format +msgid "refname %s not found" +msgstr "找不到引用名稱 %s" + +#: refs/reftable-backend.c +#, c-format +msgid "refname %s is a symbolic ref, copying it is not supported" +msgstr "引用名稱 %s 是符號引用，不支援複製" + #: refspec.c #, c-format msgid "invalid refspec '%s'" @@ -23391,6 +23718,11 @@ msgstr "在 push-option 取值中無效的引號：'%s'" #: remote-curl.c #, c-format +msgid "unknown value for object-format: %s" +msgstr "未知的 object-format 值：%s" + +#: remote-curl.c +#, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？" @@ -23925,8 +24257,21 @@ msgstr "resolve-undo 不存在的「%s」記錄" #: revision.c #, c-format -msgid "could not get commit for ancestry-path argument %s" -msgstr "無法取得 ancestry-path 引數 %s 的提交" +msgid "%s exists but is a symbolic ref" +msgstr "%s 存在但屬於符號連結" + +#: revision.c +msgid "" +"--merge requires one of the pseudorefs MERGE_HEAD, CHERRY_PICK_HEAD, " +"REVERT_HEAD or REBASE_HEAD" +msgstr "" +"--merge 需要其中一種偽引用 MERGE_HEAD、CHERRY_PICK_HEAD、REVERT_HEAD 或 " +"REBASE_HEAD" + +#: revision.c +#, c-format +msgid "could not get commit for --ancestry-path argument %s" +msgstr "無法取得 --ancestry-path 引數 %s 的提交" #: revision.c msgid "--unpacked=<packfile> no longer supported" @@ -24287,6 +24632,19 @@ msgstr "未知動作：%d" #: sequencer.c msgid "" +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." +msgstr "" +"手動解決所有衝突，執行 \"git add/rm <衝突的檔案>\" 標記\n" +"衝突已解決，然後執行 \"git rebase --continue\"。您也可以執行\n" +"\"git rebase --skip\" 指令略過這個提交。如果想要終止執行並回到\n" +"\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。" + +#: sequencer.c +msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" @@ -24532,18 +24890,13 @@ msgstr "無效的作者身分 '%s'" msgid "corrupt author: missing date information" msgstr "作者資訊損壞：缺少日期資訊" -#: sequencer.c t/helper/test-fast-rebase.c +#: sequencer.c #, c-format msgid "could not update %s" msgstr "不能更新 %s" #: sequencer.c #, c-format -msgid "could not parse commit %s" -msgstr "不能解析提交 %s" - -#: sequencer.c -#, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" @@ -24674,11 +25027,6 @@ msgstr "無效的命令 “%.*s”" #: sequencer.c #, c-format -msgid "%s does not accept arguments: '%s'" -msgstr "%s 不接受參數：'%s'" - -#: sequencer.c -#, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的參數" @@ -25024,6 +25372,10 @@ msgid "Autostash exists; creating a new stash entry." msgstr "已有自動貯存；建立新貯存項目。" #: sequencer.c +msgid "autostash reference is a symref" +msgstr "autostash 引用是符號引用" + +#: sequencer.c msgid "could not detach HEAD" msgstr "不能分離開頭指標" @@ -25225,6 +25577,11 @@ msgstr "無法使用無效設定來建立工作區" #: setup.c #, c-format +msgid "'%s' already specified as '%s'" +msgstr "「%s」已經指定為「%s」" + +#: setup.c +#, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 版本庫版本 <= %d，卻得到 %d" @@ -25397,6 +25754,11 @@ msgstr "無效的初始分支名稱：'%s'" #: setup.c #, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: 忽略 --initial-branch=%s" + +#: setup.c +#, c-format msgid "unable to handle file type %d" msgstr "不能處理 %d 類型的檔案" @@ -25410,14 +25772,14 @@ msgid "attempt to reinitialize repository with different hash" msgstr "嘗試以不同的雜湊值重新初始化版本庫" #: setup.c -#, c-format -msgid "%s already exists" -msgstr "%s 已經存在" +msgid "" +"attempt to reinitialize repository with different reference storage format" +msgstr "嘗試以不同的引用儲存格式重新初始化版本庫" #: setup.c #, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-init: 忽略 --initial-branch=%s" +msgid "%s already exists" +msgstr "%s 已經存在" #: setup.c #, c-format @@ -25448,6 +25810,24 @@ msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）" msgid "cannot use split index with a sparse index" msgstr "無法在稀疏索引使用索引分割" +#. TRANSLATORS: The first %s is a command like "ls-tree". +#: strbuf.c +#, c-format +msgid "bad %s format: element '%s' does not start with '('" +msgstr "無效的 %s 格式：「%s」元素的開頭不是「(」" + +#. TRANSLATORS: The first %s is a command like "ls-tree". +#: strbuf.c +#, c-format +msgid "bad %s format: element '%s' does not end in ')'" +msgstr "無效的 %s 格式：「%s」元素的結尾不是「)」" + +#. TRANSLATORS: %s is a command like "ls-tree". +#: strbuf.c +#, c-format +msgid "bad %s format: %%%.*s" +msgstr "無效的 %s 格式：%%%.*s" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte #: strbuf.c #, c-format @@ -25733,14 +26113,6 @@ msgstr "每次迭代前清除快取樹狀物件" msgid "number of entries in the cache tree to invalidate (default 0)" msgstr "在快取樹狀物件中，要使失效的項目數量（預設值為 0）" -#: t/helper/test-fast-rebase.c -msgid "unhandled options" -msgstr "未處理選項" - -#: t/helper/test-fast-rebase.c -msgid "error preparing revisions" -msgstr "準備修訂版本時發生錯誤" - #: t/helper/test-reach.c #, c-format msgid "commit %s is not marked reachable" @@ -25845,35 +26217,6 @@ msgstr "鍵 '%2$s' 的未知取值 '%1$s'" msgid "empty trailer token in trailer '%.*s'" msgstr "簽名 '%.*s' 的鍵為空" -#: trailer.c -#, c-format -msgid "could not read input file '%s'" -msgstr "不能讀取輸入檔案 '%s'" - -#: trailer.c wrapper.c -#, c-format -msgid "could not stat %s" -msgstr "不能對 %s 呼叫 stat" - -#: trailer.c -#, c-format -msgid "file %s is not a regular file" -msgstr "檔案 %s 不是一個正規檔案" - -#: trailer.c -#, c-format -msgid "file %s is not writable by user" -msgstr "檔案 %s 使用者不可寫" - -#: trailer.c -msgid "could not open temporary file" -msgstr "不能開啟暫存檔" - -#: trailer.c -#, c-format -msgid "could not rename temporary file to %s" -msgstr "不能重新命名暫存檔為 %s" - #: transport-helper.c msgid "full write to remote helper failed" msgstr "完整寫入遠端協助工具失敗" @@ -25934,10 +26277,6 @@ msgstr "協定不支援設定遠端服務路徑" msgid "invalid remote service path" msgstr "無效的遠端服務路徑" -#: transport-helper.c transport.c -msgid "operation not supported by protocol" -msgstr "協定不支援該動作" - #: transport-helper.c #, c-format msgid "can't connect to subservice %s" @@ -25997,8 +26336,8 @@ msgstr "remote-heper 不支援 push，需要引用規格" #: transport-helper.c #, c-format -msgid "helper %s does not support 'force'" -msgstr "協助工具 %s 不支援 'force'" +msgid "helper %s does not support '--force'" +msgstr "協助工具 %s 不支援「--force」" #: transport-helper.c msgid "couldn't run fast-export" @@ -26103,11 +26442,6 @@ msgstr "協定 v2 的支援尚未實現" #: transport.c #, c-format -msgid "unknown value for config '%s': %s" -msgstr "設定 '%s' 的取值未知：%s" - -#: transport.c -#, c-format msgid "transport '%s' not allowed" msgstr "傳輸 '%s' 不允許" @@ -26165,6 +26499,10 @@ msgstr "通訊協定不支援 bundle-uri 動作" msgid "could not retrieve server-advertised bundle-uri list" msgstr "無法取得伺服器公佈的 bundle-uri 清單" +#: transport.c +msgid "operation not supported by protocol" +msgstr "協定不支援該動作" + #: tree-walk.c msgid "too-short tree object" msgstr "太短的樹狀物件" @@ -26474,6 +26812,11 @@ msgid "invalid '..' path segment" msgstr "無效的 '..' 路徑區塊" #: usage.c +#, c-format +msgid "error: unable to format message: %s\n" +msgstr "錯誤：無法格式化訊息：%s\n" + +#: usage.c msgid "usage: " msgstr "用法: " @@ -27193,6 +27536,11 @@ msgstr "另外，您的索引中包含未提交的變更。" msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的變更。" +#: xdiff-interface.c +#, c-format +msgid "unknown style '%s' given for '%s'" +msgstr "給予「%2$s」的「%1$s」樣式未知" + #: git-merge-octopus.sh git-merge-resolve.sh msgid "" "Error: Your local changes to the following files would be overwritten by " @@ -27649,3 +27997,98 @@ msgstr "略過 %s 含備份後綴 '%s'。\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要傳送 %s？[y|N]： " + +#, c-format +#~ msgid "truncating .rej filename to %.*s.rej" +#~ msgstr "正在將 .rej 檔案名稱截短為 %.*s.rej" + +#~ msgid "" +#~ "Use -f if you really want to add them.\n" +#~ "Turn this message off by running\n" +#~ "\"git config advice.addIgnoredFile false\"" +#~ msgstr "" +#~ "若您真的想加入，請傳入 -f。\n" +#~ "如要關閉此訊息，請執行\n" +#~ "“git config advice.addIgnoredFile false”" + +#~ msgid "" +#~ "Maybe you wanted to say 'git add .'?\n" +#~ "Turn this message off by running\n" +#~ "\"git config advice.addEmptyPathspec false\"" +#~ msgstr "" +#~ "可能您想做 “git add .”？\n" +#~ "如要關閉此訊息，請執行\n" +#~ "“git config advice.addEmptyPathspec false”" + +#~ msgid "" +#~ "clean.requireForce defaults to true and neither -i, -n, nor -f given; " +#~ "refusing to clean" +#~ msgstr "" +#~ "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動" +#~ "作" + +#, c-format +#~ msgid "bad ls-files format: element '%s' does not start with '('" +#~ msgstr "ls-files 格式錯誤：“%s” 元素不以 “(” 開頭" + +#, c-format +#~ msgid "bad ls-files format: element '%s' does not end in ')'" +#~ msgstr "ls-files 格式錯誤：“%s” 元素不以 “)” 結尾" + +#, c-format +#~ msgid "bad ls-files format: %%%.*s" +#~ msgstr "ls-files 格式錯誤：%%%.*s" + +#~ msgid "keep redundant, empty commits" +#~ msgstr "保持多餘的、空的提交" + +#~ msgid "core.commentChar should only be one ASCII character" +#~ msgstr "core.commentChar 應該是一個 ASCII 字元" + +#~ msgid "-x and -X cannot be used together" +#~ msgstr "-x 和 -X 不能同時使用" + +#~ msgid "" +#~ "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" +#~ "exclude" +#~ msgstr "" +#~ "--bundle-uri 與 --depth、--shallow-since 和 --shallow-exclude 不相容" + +#~ msgid "--merge-base is incompatible with --stdin" +#~ msgstr "--merge-base 與 --stdin 不相容" + +#~ msgid "" +#~ "apply options are incompatible with rebase.autoSquash. Consider adding --" +#~ "no-autosquash" +#~ msgstr "apply 選項與 rebase.autoSquash 不相容。請考慮加上 --no-autosquash" + +#~ msgid "--exclude-hidden cannot be used together with --branches" +#~ msgstr "--exclude-hidden 無法與 --branches 同時使用" + +#~ msgid "--exclude-hidden cannot be used together with --tags" +#~ msgstr "--exclude-hidden 無法與 --tags 同時使用" + +#~ msgid "--exclude-hidden cannot be used together with --remotes" +#~ msgstr "--exclude-hidden 無法與 --remotes 同時使用" + +#, c-format +#~ msgid "only one of '%s', '%s' or '%s' can be given" +#~ msgstr "只能傳入 “%s”、“%s” 或 “%s”" + +#, c-format +#~ msgid "'%s' and '%s' cannot be used together" +#~ msgstr "無法同時使用 “%s” 和 “%s”" + +#, c-format +#~ msgid "options '%s', and '%s' cannot be used together" +#~ msgstr "無法同時使用 “%s” 和 “%s” 選項" + +#~ msgid "<commit-ish>" +#~ msgstr "<提交指示元>" + +#, c-format +#~ msgid "%s is incompatible with %s" +#~ msgstr "%s 與 %s 不相容" + +#~ msgid "unhandled options" +#~ msgstr "未處理選項" |