@matheusbsbs / matheus-bagliano / commits / ef7ba0e1f2

l10n: zh-TW: Git 2.45

Co-Authored-By: Lumynous <lumynou5.tw@gmail.com> Co-Authored-By: Kisaragi Hiu <mail@kisaragi-hiu.com> Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>

Yi-Jyun Pan committed Apr 28, 2024 at 18:46 UTC ef7ba0e1f25e7cb1f2f1f7763914fac843bda33e
1 file changed +579 -331
po/zh_TW.po
+579 -331
@@ -22,12 +22,13 @@
22 # Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023, 2024.
23 # Kaiyang Wu <self@origincode.me>, 2022.
24 # lumynou5 <lumynou5.tw@gmail.com>, 2023, 2024.
25 +# Kisaragi Hiu <mail@kisaragi-hiu.com>, 2024.
26 msgid ""
27 msgstr ""
28 "Project-Id-Version: Git\n"
29 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
29 -"POT-Creation-Date: 2024-02-18 20:48+0800\n"
30 -"PO-Revision-Date: 2024-02-18 20:50+0800\n"
30 +"POT-Creation-Date: 2024-04-28 18:52+0800\n"
31 +"PO-Revision-Date: 2024-04-28 18:44+0800\n"
32 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
33 "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
34 "po/git-cli/zh_Hant/>\n"
@@ -601,12 +602,12 @@ msgid ""
602 "---\n"
603 "To remove '%c' lines, make them ' ' lines (context).\n"
604 "To remove '%c' lines, delete them.\n"
604 -"Lines starting with %c will be removed.\n"
605 +"Lines starting with %s will be removed.\n"
606 msgstr ""
607 "---\n"
607 -"要刪除 “%c” 開頭的列，請將列首（上下文）改成空白。\n"
608 -"要刪除 “%c” 開頭的列，請直接刪除。\n"
609 -"開頭是 %c 的列將會被移除。\n"
608 +"要刪除「%c」開頭的列，請將列首（上下文）改成空白。\n"
609 +"要刪除「%c」開頭的列，請直接刪除。\n"
610 +"開頭是 %s 的列將會被移除。\n"
611
612 #: add-patch.c
613 msgid ""
@@ -659,16 +660,18 @@ msgid ""
660 "/ - search for a hunk matching the given regex\n"
661 "s - split the current hunk into smaller hunks\n"
662 "e - manually edit the current hunk\n"
663 +"p - print the current hunk\n"
664 "? - print help\n"
665 msgstr ""
664 -"j - 維持此區塊未決狀態，檢視下一個未決定區塊\n"
665 -"J - 維持此區塊未決狀態，檢視下一個區塊\n"
666 -"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n"
667 -"K - 維持此區塊未決狀態，檢視上一個區塊\n"
666 +"j - 維持此區塊未決定狀態，檢視下一個未決定區塊\n"
667 +"J - 維持此區塊未決定狀態，檢視下一個區塊\n"
668 +"k - 維持此區塊未決定狀態，檢視上一個未決定區塊\n"
669 +"K - 維持此區塊未決定狀態，檢視上一個區塊\n"
670 "g - 選擇要跳轉至的區塊\n"
671 "/ - 尋找符合提供之常規表示式的區塊\n"
672 "s - 分割目前區塊為更小的區塊\n"
673 "e - 手動編輯目前區塊\n"
674 +"p - 輸出目前區塊\n"
675 "? - 顯示說明\n"
676
677 #: add-patch.c
@@ -747,8 +750,8 @@ msgstr ""
750
751 #: advice.c
752 #, c-format
750 -msgid "%shint: %.*s%s\n"
751 -msgstr "%s提示：%.*s%s\n"
753 +msgid "%shint:%s%.*s%s\n"
754 +msgstr "%s提示：%s%.*s%s\n"
755
756 #: advice.c
757 msgid "Cherry-picking is not possible because you have unmerged files."
@@ -1343,11 +1346,6 @@ msgid "Applying patch %%s with %d reject..."
1346 msgid_plural "Applying patch %%s with %d rejects..."
1347 msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕……"
1348
1346 -#: apply.c
1347 -#, c-format
1348 -msgid "truncating .rej filename to %.*s.rej"
1349 -msgstr "正在將 .rej 檔案名稱截短為 %.*s.rej"
1350 -
1349 #: apply.c
1350 #, c-format
1351 msgid "cannot open %s"
@@ -1884,6 +1882,11 @@ msgstr "需要一個 %s 修訂版"
1882 msgid "could not create file '%s'"
1883 msgstr "無法建立 “%s” 檔案"
1884
1885 +#: bisect.c builtin/notes.c
1886 +#, c-format
1887 +msgid "unable to start 'show' for object '%s'"
1888 +msgstr "不能為物件 '%s' 開始 'show'"
1889 +
1890 #: bisect.c builtin/merge.c
1891 #, c-format
1892 msgid "could not read file '%s'"
@@ -1931,8 +1934,8 @@ msgid "--reverse and --first-parent together require specified latest commit"
1934 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1935
1936 #: blame.c builtin/commit.c builtin/log.c builtin/merge.c
1934 -#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c
1935 -#: sequencer.c submodule.c
1937 +#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c
1938 +#: remote.c sequencer.c submodule.c
1939 msgid "revision walk setup failed"
1940 msgstr "修訂版遍歷設定失敗"
1941
@@ -2007,10 +2010,12 @@ msgid "not tracking: ambiguous information for ref '%s'"
2010 msgstr "未追蹤：“%s” 引用有歧義"
2011
2012 # 譯者：為保證在輸出中對齊，注意調整句中空格！
2013 +#. #-#-#-#-# branch.c.po #-#-#-#-#
2014 #. TRANSLATORS: This is a line listing a remote with duplicate
2015 #. refspecs in the advice message below. For RTL languages you'll
2016 #. probably want to swap the "%s" and leading " " space around.
2017 #.
2018 +#. #-#-#-#-# object-name.c.po #-#-#-#-#
2019 #. TRANSLATORS: This is line item of ambiguous object output
2020 #. from describe_ambiguous_object() above. For RTL languages
2021 #. you'll probably want to swap the "%s" and leading " " space
@@ -2049,6 +2054,10 @@ msgstr ""
2054 msgid "'%s' is not a valid branch name"
2055 msgstr "“%s” 不是有效的分支名稱"
2056
2057 +#: branch.c builtin/branch.c
2058 +msgid "See `man git check-ref-format`"
2059 +msgstr "請參閱「man git check-ref-format」"
2060 +
2061 #: branch.c
2062 #, c-format
2063 msgid "a branch named '%s' already exists"
@@ -2283,14 +2292,8 @@ msgid "adding embedded git repository: %s"
2292 msgstr "正在加入嵌入式 git 版本庫：%s"
2293
2294 #: builtin/add.c
2286 -msgid ""
2287 -"Use -f if you really want to add them.\n"
2288 -"Turn this message off by running\n"
2289 -"\"git config advice.addIgnoredFile false\""
2290 -msgstr ""
2291 -"若您真的想加入，請傳入 -f。\n"
2292 -"如要關閉此訊息，請執行\n"
2293 -"“git config advice.addIgnoredFile false”"
2295 +msgid "Use -f if you really want to add them."
2296 +msgstr "如果您確定想要加入他們，請使用「-f」。"
2297
2298 #: builtin/add.c
2299 msgid "adding files failed"
@@ -2313,14 +2316,8 @@ msgid "Nothing specified, nothing added.\n"
2316 msgstr "沒有指定，亦未加入檔案。\n"
2317
2318 #: builtin/add.c
2316 -msgid ""
2317 -"Maybe you wanted to say 'git add .'?\n"
2318 -"Turn this message off by running\n"
2319 -"\"git config advice.addEmptyPathspec false\""
2320 -msgstr ""
2321 -"可能您想做 “git add .”？\n"
2322 -"如要關閉此訊息，請執行\n"
2323 -"“git config advice.addEmptyPathspec false”"
2319 +msgid "Maybe you wanted to say 'git add .'?"
2320 +msgstr "也許您想要執行的是「git add .」？"
2321
2322 #: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c
2323 #: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c
@@ -2340,8 +2337,8 @@ msgid "bad action '%s' for '%s'"
2337 msgstr "“%s” 動作對 “%s” 無效"
2338
2339 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
2343 -#: builtin/pull.c config.c diff-merges.c gpg-interface.c ls-refs.c
2344 -#: parallel-checkout.c sequencer.c setup.c
2340 +#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c
2341 +#: ls-refs.c parallel-checkout.c sequencer.c setup.c
2342 #, c-format
2343 msgid "invalid value for '%s': '%s'"
2344 msgstr "“%s” 的值無效：“%s”"
@@ -2425,18 +2422,19 @@ msgstr "無法切割修補檔。"
2422
2423 #: builtin/am.c
2424 #, c-format
2428 -msgid "When you have resolved this problem, run \"%s --continue\"."
2429 -msgstr "解決此問題後，請執行 “%s --continue”。"
2425 +msgid "When you have resolved this problem, run \"%s --continue\".\n"
2426 +msgstr "解決此問題後，請執行「%s --continue」。\n"
2427
2428 #: builtin/am.c
2429 #, c-format
2433 -msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2434 -msgstr "若要略過此修補，請改執行 “%s --skip”。"
2430 +msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n"
2431 +msgstr "若要略過此修補，請改執行「%s --skip」。\n"
2432
2433 #: builtin/am.c
2434 #, c-format
2438 -msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
2439 -msgstr "若要將空白修補檔錄入為空白提交，請執行 “%s --allow-empty”。"
2435 +msgid ""
2436 +"To record the empty patch as an empty commit, run \"%s --allow-empty\".\n"
2437 +msgstr "若要將空白修補檔錄入為空白提交，請執行「%s --allow-empty」。\n"
2438
2439 #: builtin/am.c
2440 #, c-format
@@ -3503,11 +3501,11 @@ msgstr "分支已拷貝，但無法更新組態檔案"
3501 msgid ""
3502 "Please edit the description for the branch\n"
3503 " %s\n"
3506 -"Lines starting with '%c' will be stripped.\n"
3504 +"Lines starting with '%s' will be stripped.\n"
3505 msgstr ""
3506 "請編輯下述分支的描述\n"
3507 " %s\n"
3510 -"開頭是 “%c” 的列將被刪除。\n"
3508 +"開頭是「%s」的列將被刪除。\n"
3509
3510 #: builtin/branch.c
3511 msgid "Generic options"
@@ -3763,10 +3761,12 @@ msgstr "不是在 git 版本庫執行 — 沒有可顯示的掛鉤\n"
3761
3762 #: builtin/bugreport.c
3763 msgid ""
3766 -"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"
3764 +"git bugreport [(-o | --output-directory) <path>]\n"
3765 +" [(-s | --suffix) <format> | --no-suffix]\n"
3766 " [--diagnose[=<mode>]]"
3767 msgstr ""
3769 -"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"
3768 +"git bugreport [(-o | --output-directory) <path>]\n"
3769 +" [(-s | --suffix) <format> | --no-suffix]\n"
3770 " [--diagnose[=<mode>]]"
3771
3772 #: builtin/bugreport.c
@@ -4366,6 +4366,12 @@ msgstr "“%s”、“%s” 或 “%s” 無法在簽出樹狀物件時使用"
4366 msgid "path '%s' is unmerged"
4367 msgstr "路徑 “%s” 未合併"
4368
4369 +#: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c
4370 +#: merge-ort.c reset.c sequencer.c tree-walk.c
4371 +#, c-format
4372 +msgid "unable to read tree (%s)"
4373 +msgstr "無法讀取樹（%s）"
4374 +
4375 #: builtin/checkout.c
4376 msgid "you need to resolve your current index first"
4377 msgstr "您需要先解決目前索引區的衝突"
@@ -4624,6 +4630,11 @@ msgstr "無法將分支切換至非提交項目 “%s”"
4630 msgid "missing branch or commit argument"
4631 msgstr "缺少分支或提交引數"
4632
4633 +#: builtin/checkout.c
4634 +#, c-format
4635 +msgid "unknown conflict style '%s'"
4636 +msgstr "未知的衝突輸出風格「%s」"
4637 +
4638 #: builtin/checkout.c
4639 msgid "perform a 3-way merge with the new branch"
4640 msgstr "和新分支進行三方合併"
@@ -4945,18 +4956,8 @@ msgid "remove only ignored files"
4956 msgstr "只移除忽略的檔案"
4957
4958 #: builtin/clean.c
4948 -msgid ""
4949 -"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
4950 -"clean"
4951 -msgstr ""
4952 -"clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"
4953 -
4954 -#: builtin/clean.c
4955 -msgid ""
4956 -"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
4957 -"refusing to clean"
4958 -msgstr ""
4959 -"clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"
4959 +msgid "clean.requireForce is true and -f not given: refusing to clean"
4960 +msgstr "clean.requireForce 是 true 且未給定 -f 選項：拒絕清理"
4961
4962 #: builtin/clone.c
4963 msgid "git clone [<options>] [--] <repo> [<dir>]"
@@ -4975,8 +4976,8 @@ msgid "create a bare repository"
4976 msgstr "建立裸版本庫"
4977
4978 #: builtin/clone.c
4978 -msgid "create a mirror repository (implies bare)"
4979 -msgstr "建立鏡像版本庫（亦即裸版本庫）"
4979 +msgid "create a mirror repository (implies --bare)"
4980 +msgstr "建立鏡像版本庫（隱含 --bare）"
4981
4982 #: builtin/clone.c
4983 msgid "to clone from a local repository"
@@ -5377,6 +5378,11 @@ msgstr "右邊框的填充空間"
5378 msgid "padding space between columns"
5379 msgstr "兩直行之間的填充空間"
5380
5381 +#: builtin/column.c
5382 +#, c-format
5383 +msgid "%s must be non-negative"
5384 +msgstr "%s 不得為負數"
5385 +
5386 #: builtin/column.c
5387 msgid "--command must be the first argument"
5388 msgstr "--command 必須是第一個參數"
@@ -5710,7 +5716,7 @@ msgid ""
5716 "in the current commit message"
5717 msgstr "無法選擇一個未被目前提交說明使用的備註字元"
5718
5713 -#: builtin/commit.c builtin/merge-tree.c
5719 +#: builtin/commit.c
5720 #, c-format
5721 msgid "could not lookup commit '%s'"
5722 msgstr "無法查詢提交 “%s”"
@@ -5745,7 +5751,7 @@ msgstr "不能讀取 MERGE_MSG"
5751 #: builtin/commit.c bundle.c rerere.c sequencer.c
5752 #, c-format
5753 msgid "could not open '%s'"
5748 -msgstr "不能開啟 '%s'"
5754 +msgstr "無法開啟「%s」"
5755
5756 #: builtin/commit.c
5757 msgid "could not write commit template"
@@ -5755,38 +5761,38 @@ msgstr "不能寫提交範本"
5761 #, c-format
5762 msgid ""
5763 "Please enter the commit message for your changes. Lines starting\n"
5758 -"with '%c' will be ignored.\n"
5764 +"with '%s' will be ignored.\n"
5765 msgstr ""
5766 "請輸入描述您變更的提交訊息。\n"
5761 -"開頭是「%c」的行皆會忽略。\n"
5767 +"開頭是「%s」的列皆會忽略。\n"
5768
5769 #: builtin/commit.c
5770 #, c-format
5771 msgid ""
5772 "Please enter the commit message for your changes. Lines starting\n"
5767 -"with '%c' will be ignored, and an empty message aborts the commit.\n"
5773 +"with '%s' will be ignored, and an empty message aborts the commit.\n"
5774 msgstr ""
5769 -"請輸入描述您變更的提交訊息。開頭是「%c」\n"
5770 -"的行皆會忽略。提交訊息空白則取消本次提交作業。\n"
5775 +"請輸入描述您變更的提交訊息。開頭是「%s」的列\n"
5776 +"皆會忽略。提交訊息空白則取消本次提交作業。\n"
5777
5778 #: builtin/commit.c
5779 #, c-format
5780 msgid ""
5781 "Please enter the commit message for your changes. Lines starting\n"
5776 -"with '%c' will be kept; you may remove them yourself if you want to.\n"
5782 +"with '%s' will be kept; you may remove them yourself if you want to.\n"
5783 msgstr ""
5778 -"請輸入描述您變更的提交訊息。會保留開頭是「%c」\n"
5779 -"的行，但也可以自己移除掉這些行。\n"
5784 +"請輸入描述您變更的提交訊息。會保留開頭是「%s」\n"
5785 +"的列，但也可以自己移除掉這些列。\n"
5786
5787 #: builtin/commit.c
5788 #, c-format
5789 msgid ""
5790 "Please enter the commit message for your changes. Lines starting\n"
5785 -"with '%c' will be kept; you may remove them yourself if you want to.\n"
5791 +"with '%s' will be kept; you may remove them yourself if you want to.\n"
5792 "An empty message aborts the commit.\n"
5793 msgstr ""
5794 "請輸入描述您變更的提交訊息。會保留開頭是\n"
5789 -"「%c」的行，但也可以自己移除掉這些行。\n"
5795 +"「%s」的列，但也可以自己移除掉這些列。\n"
5796 "提交訊息空白則取消本次提交作業。\n"
5797
5798 #: builtin/commit.c
@@ -6018,7 +6024,7 @@ msgstr "日期"
6024 msgid "override date for commit"
6025 msgstr "提交時覆蓋日期"
6026
6021 -#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h
6027 +#: builtin/commit.c parse-options.h ref-filter.h
6028 msgid "commit"
6029 msgstr "提交"
6030
@@ -6344,6 +6350,10 @@ msgstr "取值"
6350 msgid "with --get, use default value when missing entry"
6351 msgstr "使用 --get 但未指定參數時所使用的預設值"
6352
6353 +#: builtin/config.c
6354 +msgid "human-readable comment string (# will be prepended as needed)"
6355 +msgstr "人類可讀的備註字串（將按需插入 # 至前方）"
6356 +
6357 #: builtin/config.c
6358 #, c-format
6359 msgid "wrong number of arguments, should be %d"
@@ -6456,6 +6466,10 @@ msgstr "--show-origin 僅適用於 --get、--get-all、--get-regexp 和 --list"
6466 msgid "--default is only applicable to --get"
6467 msgstr "--default 僅適用於 --get"
6468
6469 +#: builtin/config.c
6470 +msgid "--comment is only applicable to add/set/replace operations"
6471 +msgstr "--comment 只能用於加入、設定和取代動作"
6472 +
6473 #: builtin/config.c
6474 msgid "--fixed-value only applies with 'value-pattern'"
6475 msgstr "--fixed-value 僅套用至 'value-pattern'"
@@ -7025,7 +7039,7 @@ msgstr "來自 %.*s\n"
7039 #: builtin/fetch.c
7040 #, c-format
7041 msgid "object %s not found"
7028 -msgstr "物件 %s 未發現"
7042 +msgstr "找不到物件 %s"
7043
7044 #: builtin/fetch.c
7045 msgid "[up to date]"
@@ -7504,6 +7518,10 @@ msgstr "只列印不包含該提交的引用"
7518 msgid "read reference patterns from stdin"
7519 msgstr "從 stdin 讀取引用模式"
7520
7521 +#: builtin/for-each-ref.c
7522 +msgid "also include HEAD ref and pseudorefs"
7523 +msgstr "包含 HEAD 引用和偽引用"
7524 +
7525 #: builtin/for-each-ref.c
7526 msgid "unknown arguments supplied with --stdin"
7527 msgstr "為 --stdin 提供的引數未知"
@@ -8266,6 +8284,7 @@ msgstr "grep：無法建立執行緒：%s"
8284 msgid "invalid number of threads specified (%d) for %s"
8285 msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
8286
8287 +#. #-#-#-#-# grep.c.po #-#-#-#-#
8288 #. TRANSLATORS: %s is the configuration
8289 #. variable for tweaking threads, currently
8290 #. grep.threads
@@ -8275,11 +8294,6 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
8294 msgid "no threads support, ignoring %s"
8295 msgstr "沒有執行緒支援，忽略 %s"
8296
8278 -#: builtin/grep.c
8279 -#, c-format
8280 -msgid "unable to read tree (%s)"
8281 -msgstr "無法讀取樹（%s）"
8282 -
8297 #: builtin/grep.c
8298 #, c-format
8299 msgid "unable to read tree %s"
@@ -9039,13 +9053,46 @@ msgstr "--separate-git-dir 與純版本庫不相容"
9053 #: builtin/interpret-trailers.c
9054 msgid ""
9055 "git interpret-trailers [--in-place] [--trim-empty]\n"
9042 -" [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...]\n"
9056 +" [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n"
9057 " [--parse] [<file>...]"
9058 msgstr ""
9059 "git interpret-trailers [--in-place] [--trim-empty]\n"
9046 -" [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...]\n"
9060 +" [(--trailer (<key>|<key-alias>)[(=|:)<value>])...]\n"
9061 " [--parse] [<file>...]"
9062
9063 +#: builtin/interpret-trailers.c wrapper.c
9064 +#, c-format
9065 +msgid "could not stat %s"
9066 +msgstr "不能對 %s 呼叫 stat"
9067 +
9068 +#: builtin/interpret-trailers.c
9069 +#, c-format
9070 +msgid "file %s is not a regular file"
9071 +msgstr "檔案 %s 不是一個正規檔案"
9072 +
9073 +#: builtin/interpret-trailers.c
9074 +#, c-format
9075 +msgid "file %s is not writable by user"
9076 +msgstr "檔案 %s 使用者不可寫"
9077 +
9078 +#: builtin/interpret-trailers.c
9079 +msgid "could not open temporary file"
9080 +msgstr "不能開啟暫存檔"
9081 +
9082 +#: builtin/interpret-trailers.c
9083 +#, c-format
9084 +msgid "could not read input file '%s'"
9085 +msgstr "不能讀取輸入檔案 '%s'"
9086 +
9087 +#: builtin/interpret-trailers.c builtin/mktag.c imap-send.c
9088 +msgid "could not read from stdin"
9089 +msgstr "不能自標準輸入讀取"
9090 +
9091 +#: builtin/interpret-trailers.c
9092 +#, c-format
9093 +msgid "could not rename temporary file to %s"
9094 +msgstr "不能重新命名暫存檔為 %s"
9095 +
9096 #: builtin/interpret-trailers.c
9097 msgid "edit files in place"
9098 msgstr "在原位編輯檔案"
@@ -9148,7 +9195,7 @@ msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱
9195 #: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c
9196 #, c-format
9197 msgid "unrecognized argument: %s"
9151 -msgstr "無法識別的參數：%s"
9198 +msgstr "無法識別的引數：%s"
9199
9200 #: builtin/log.c
9201 msgid "-L<range>:<file> cannot be used with pathspec"
@@ -9543,21 +9590,6 @@ msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n"
9590 msgid "could not get object info about '%s'"
9591 msgstr "無法取得「%s」相關的物件資訊"
9592
9546 -#: builtin/ls-files.c
9547 -#, c-format
9548 -msgid "bad ls-files format: element '%s' does not start with '('"
9549 -msgstr "ls-files 格式錯誤：“%s” 元素不以 “(” 開頭"
9550 -
9551 -#: builtin/ls-files.c
9552 -#, c-format
9553 -msgid "bad ls-files format: element '%s' does not end in ')'"
9554 -msgstr "ls-files 格式錯誤：“%s” 元素不以 “)” 結尾"
9555 -
9556 -#: builtin/ls-files.c
9557 -#, c-format
9558 -msgid "bad ls-files format: %%%.*s"
9559 -msgstr "ls-files 格式錯誤：%%%.*s"
9560 -
9593 #: builtin/ls-files.c
9594 msgid "git ls-files [<options>] [<file>...]"
9595 msgstr "git ls-files [<選項>] [<檔案>...]"
@@ -9650,7 +9682,7 @@ msgstr "顯示相對於頂級目錄的檔案名"
9682 msgid "if any <file> is not in the index, treat this as an error"
9683 msgstr "如果任何 <檔案> 都不在索引區，視為錯誤"
9684
9653 -#: builtin/ls-files.c
9685 +#: builtin/ls-files.c builtin/merge-tree.c
9686 msgid "tree-ish"
9687 msgstr "樹或提交"
9688
@@ -9727,21 +9759,6 @@ msgstr "除了顯示指向的物件外，顯示指向的引用名"
9759 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
9760 msgstr "git ls-tree [<選項>] <樹或提交> [<路徑>...]"
9761
9730 -#: builtin/ls-tree.c
9731 -#, c-format
9732 -msgid "bad ls-tree format: element '%s' does not start with '('"
9733 -msgstr "無效的 ls-tree 格式：「%s」元素的開頭不是「(」"
9734 -
9735 -#: builtin/ls-tree.c
9736 -#, c-format
9737 -msgid "bad ls-tree format: element '%s' does not end in ')'"
9738 -msgstr "無效的 ls-tree 格式：「%s」元素的結尾不是「)」"
9739 -
9740 -#: builtin/ls-tree.c
9741 -#, c-format
9742 -msgid "bad ls-tree format: %%%.*s"
9743 -msgstr "無效的 ls-tree 格式：%%%.*s"
9744 -
9762 #: builtin/ls-tree.c
9763 msgid "only show trees"
9764 msgstr "只顯示樹"
@@ -9982,6 +9999,11 @@ msgstr "無法解析引用 '%s'"
9999 msgid "Merging %s with %s\n"
10000 msgstr "合併 %s 和 %s\n"
10001
10002 +#: builtin/merge-tree.c
10003 +#, c-format
10004 +msgid "could not parse as tree '%s'"
10005 +msgstr "無法解析為樹狀物件「%s」"
10006 +
10007 #: builtin/merge-tree.c builtin/merge.c
10008 msgid "not something we can merge"
10009 msgstr "不能合併"
@@ -10245,9 +10267,9 @@ msgstr "空的提交說明會終止提交。\n"
10267 #: builtin/merge.c
10268 #, c-format
10269 msgid ""
10248 -"Lines starting with '%c' will be ignored, and an empty message aborts\n"
10270 +"Lines starting with '%s' will be ignored, and an empty message aborts\n"
10271 "the commit.\n"
10250 -msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交。\n"
10272 +msgstr "以「%s」開始的列將被忽略，提交說明留空則會終止提交。\n"
10273
10274 #: builtin/merge.c
10275 msgid "Empty commit message."
@@ -10440,10 +10462,6 @@ msgstr "無法讀取有標籤的物件「%s」"
10462 msgid "object '%s' tagged as '%s', but is a '%s' type"
10463 msgstr "「%s」已標為「%s」，但卻是「%s」類型"
10464
10443 -#: builtin/mktag.c imap-send.c trailer.c
10444 -msgid "could not read from stdin"
10445 -msgstr "不能自標準輸入讀取"
10446 -
10465 #: builtin/mktag.c
10466 msgid "tag on stdin did not pass our strict fsck check"
10467 msgstr "stdin 上的標籤未通過我們的嚴格 fsck 檢查"
@@ -10656,7 +10674,7 @@ msgstr "列出可以從所有引用存取的提交"
10674
10675 #: builtin/name-rev.c
10676 msgid "deprecated: use --annotate-stdin instead"
10659 -msgstr "已廢棄：請改用 --annotate-stdin"
10677 +msgstr "已棄用：請改用 --annotate-stdin"
10678
10679 #: builtin/name-rev.c
10680 msgid "annotate text from stdin"
@@ -10775,11 +10793,6 @@ msgstr "git notes prune [<選項>]"
10793 msgid "Write/edit the notes for the following object:"
10794 msgstr "為下面的物件寫/編輯說明："
10795
10778 -#: builtin/notes.c
10779 -#, c-format
10780 -msgid "unable to start 'show' for object '%s'"
10781 -msgstr "不能為物件 '%s' 開始 'show'"
10782 -
10796 #: builtin/notes.c
10797 msgid "could not read 'show' output"
10798 msgstr "不能讀取 'show' 的輸出"
@@ -10923,8 +10936,8 @@ msgid ""
10936 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
10937 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
10938 msgstr ""
10926 -"子指令 'edit' 的選項 -m/-F/-c/-C 已棄用。\n"
10927 -"請換用 'git notes add -f -m/-F/-c/-C'。\n"
10939 +"子指令「edit」的選項 -m/-F/-c/-C 已棄用。\n"
10940 +"請換用「git notes add -f -m/-F/-c/-C」。\n"
10941
10942 #: builtin/notes.c
10943 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
@@ -11210,8 +11223,8 @@ msgid ""
11223 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
11224 "hash> <uri>' (got '%s')"
11225 msgstr ""
11213 -"uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> "
11214 -"<uri>' (收到 '%s')"
11226 +"uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> <uri>' "
11227 +"(收到 '%s')"
11228
11229 #: builtin/pack-objects.c
11230 #, c-format
@@ -11553,10 +11566,10 @@ msgstr "傳入 --i-still-use-this 前拒絕執行"
11566
11567 #: builtin/pack-refs.c
11568 msgid ""
11556 -"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
11569 +"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
11570 "<pattern>]"
11571 msgstr ""
11559 -"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "
11572 +"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
11573 "<pattern>]"
11574
11575 #: builtin/pack-refs.c
@@ -11567,6 +11580,10 @@ msgstr "打包一切"
11580 msgid "prune loose refs (default)"
11581 msgstr "剪除鬆散引用（預設值）"
11582
11583 +#: builtin/pack-refs.c
11584 +msgid "auto-pack refs as needed"
11585 +msgstr "按需自動封裝引用"
11586 +
11587 #: builtin/pack-refs.c
11588 msgid "references to include"
11589 msgstr "要包含的引用"
@@ -12330,19 +12347,6 @@ msgstr "忽略無效的 allow_rerere_autoupdate：'%s'"
12347 msgid "could not remove '%s'"
12348 msgstr "無法刪除 '%s'"
12349
12333 -#: builtin/rebase.c
12334 -msgid ""
12335 -"Resolve all conflicts manually, mark them as resolved with\n"
12336 -"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
12337 -"You can instead skip this commit: run \"git rebase --skip\".\n"
12338 -"To abort and get back to the state before \"git rebase\", run \"git rebase --"
12339 -"abort\"."
12340 -msgstr ""
12341 -"手動解決所有衝突，執行 \"git add/rm <衝突的檔案>\" 標記\n"
12342 -"衝突已解決，然後執行 \"git rebase --continue\"。您也可以執行\n"
12343 -"\"git rebase --skip\" 指令略過這個提交。如果想要終止執行並回到\n"
12344 -"\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。"
12345 -
12350 #: builtin/rebase.c
12351 #, c-format
12352 msgid ""
@@ -12375,12 +12379,16 @@ msgstr "無法切換到 %s"
12379 msgid "apply options and merge options cannot be used together"
12380 msgstr "套用選項與合併選項不得同時使用"
12381
12382 +#: builtin/rebase.c
12383 +msgid "--empty=ask is deprecated; use '--empty=stop' instead."
12384 +msgstr "--empty=ask 已棄用。請改用「--empty=stop」。"
12385 +
12386 #: builtin/rebase.c
12387 #, c-format
12388 msgid ""
12389 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
12382 -"\"ask\"."
12383 -msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。"
12390 +"\"stop\"."
12391 +msgstr "無法識別空類型「%s」；有效的數值有「drop」、「keep」跟「stop」。"
12392
12393 #: builtin/rebase.c
12394 msgid ""
@@ -12522,7 +12530,7 @@ msgstr "讓使用者編輯要重定基底的提交列表"
12530 msgid "(REMOVED) was: try to recreate merges instead of ignoring them"
12531 msgstr "（已移除）曾為：嘗試重新建立，而非忽略合併"
12532
12525 -#: builtin/rebase.c
12533 +#: builtin/rebase.c builtin/revert.c
12534 msgid "how to handle commits that become empty"
12535 msgstr "處理空白提交的方式"
12536
@@ -12603,8 +12611,8 @@ msgstr ""
12611 "請改用 “merges”"
12612
12613 #: builtin/rebase.c
12606 -msgid "No rebase in progress?"
12607 -msgstr "沒有正在進行的重定基底？"
12614 +msgid "no rebase in progress"
12615 +msgstr "沒有進行中的重定基底流程"
12616
12617 #: builtin/rebase.c
12618 msgid "The --edit-todo action can only be used during interactive rebase."
@@ -12820,6 +12828,10 @@ msgstr "您必須指定目錄"
12828 msgid "git reflog [show] [<log-options>] [<ref>]"
12829 msgstr "git reflog [show] [<log-options>] [<ref>]"
12830
12831 +#: builtin/reflog.c
12832 +msgid "git reflog list"
12833 +msgstr "git reflog list"
12834 +
12835 #: builtin/reflog.c
12836 msgid ""
12837 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
@@ -12849,6 +12861,11 @@ msgstr "git reflog exists <引用>"
12861 msgid "invalid timestamp '%s' given to '--%s'"
12862 msgstr "傳入「--%s」的時間戳「%s」無效"
12863
12864 +#: builtin/reflog.c sequencer.c
12865 +#, c-format
12866 +msgid "%s does not accept arguments: '%s'"
12867 +msgstr "%s 不接受參數：'%s'"
12868 +
12869 #: builtin/reflog.c
12870 msgid "do not actually prune any entries"
12871 msgstr "不實際剪除任何項目"
@@ -13003,13 +13020,13 @@ msgid ""
13020 "--mirror is dangerous and deprecated; please\n"
13021 "\t use --mirror=fetch or --mirror=push instead"
13022 msgstr ""
13006 -"--mirror 選項危險且過時，請使用 --mirror=fetch\n"
13023 +"--mirror 選項危險且已棄用，請使用 --mirror=fetch\n"
13024 "\t 或 --mirror=push"
13025
13026 #: builtin/remote.c
13027 #, c-format
13011 -msgid "unknown mirror argument: %s"
13012 -msgstr "未知的鏡像參數：%s"
13028 +msgid "unknown --mirror argument: %s"
13029 +msgstr "未知的 --mirror 引數：%s"
13030
13031 #: builtin/remote.c
13032 msgid "fetch the remote branches"
@@ -13458,6 +13475,10 @@ msgstr ""
13475 msgid "could not start pack-objects to repack promisor objects"
13476 msgstr "無法開始 pack-objects 來重新打包 promisor 物件"
13477
13478 +#: builtin/repack.c
13479 +msgid "failed to feed promisor objects to pack-objects"
13480 +msgstr "無法將承諾者物件喂給 pack-objects"
13481 +
13482 #: builtin/repack.c
13483 msgid "repack: Expecting full hex object ID lines only from pack-objects."
13484 msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。"
@@ -13960,7 +13981,7 @@ msgstr "在索引中註冊乾淨的解決方案"
13981
13982 #: builtin/rerere.c
13983 msgid "'git rerere forget' without paths is deprecated"
13963 -msgstr "沒有路徑的 'git rerere forget' 已經過時"
13984 +msgstr "沒有路徑的「git rerere forget」已經棄用"
13985
13986 #: builtin/rerere.c
13987 #, c-format
@@ -14070,7 +14091,7 @@ msgstr "無法將 '%s' 解析為一個有效的樹狀物件。"
14091
14092 #: builtin/reset.c
14093 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
14073 -msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。"
14094 +msgstr "--mixed 帶路徑已棄用，請改用「git reset -- <路徑>」。"
14095
14096 # 譯者：漢字之間無空格，故刪除%s前後空格
14097 #: builtin/reset.c
@@ -14205,6 +14226,15 @@ msgstr "--default 需要 1 個引數"
14226 msgid "--prefix requires an argument"
14227 msgstr "--prefix 需要 1 個引數"
14228
14229 +#: builtin/rev-parse.c
14230 +msgid "no object format specified"
14231 +msgstr "未指定物件格式"
14232 +
14233 +#: builtin/rev-parse.c
14234 +#, c-format
14235 +msgid "unsupported object format: %s"
14236 +msgstr "不支援的物件格式：%s"
14237 +
14238 #: builtin/rev-parse.c
14239 #, c-format
14240 msgid "unknown mode for --abbrev-ref: %s"
@@ -14310,8 +14340,8 @@ msgid "allow commits with empty messages"
14340 msgstr "允許提交說明為空"
14341
14342 #: builtin/revert.c
14313 -msgid "keep redundant, empty commits"
14314 -msgstr "保持多餘的、空的提交"
14343 +msgid "deprecated: use --empty=keep instead"
14344 +msgstr "已棄用：請改用 --empty=keep"
14345
14346 #: builtin/revert.c
14347 msgid "use the 'reference' format to refer to commits"
@@ -14756,7 +14786,7 @@ msgstr "以 cone 模式初始化稀疏簽出"
14786 msgid "toggle the use of a sparse index"
14787 msgstr "切換是否使用稀疏索引"
14788
14759 -#: builtin/sparse-checkout.c commit-graph.c midx.c sequencer.c
14789 +#: builtin/sparse-checkout.c commit-graph.c midx-write.c sequencer.c
14790 #, c-format
14791 msgid "unable to create leading directories of %s"
14792 msgstr "不能為 %s 建立先導目錄"
@@ -15922,12 +15952,12 @@ msgid ""
15952 "\n"
15953 "Write a message for tag:\n"
15954 " %s\n"
15925 -"Lines starting with '%c' will be ignored.\n"
15955 +"Lines starting with '%s' will be ignored.\n"
15956 msgstr ""
15957 "\n"
15928 -"輸入一個標籤說明：\n"
15958 +"為標籤輸入說明訊息：\n"
15959 " %s\n"
15930 -"以 '%c' 開頭的行將被忽略。\n"
15960 +"以「%s」開頭的列將被忽略。\n"
15961
15962 #: builtin/tag.c
15963 #, c-format
@@ -15935,13 +15965,13 @@ msgid ""
15965 "\n"
15966 "Write a message for tag:\n"
15967 " %s\n"
15938 -"Lines starting with '%c' will be kept; you may remove them yourself if you "
15968 +"Lines starting with '%s' will be kept; you may remove them yourself if you "
15969 "want to.\n"
15970 msgstr ""
15971 "\n"
15942 -"輸入一個標籤說明：\n"
15972 +"為標籤輸入說明訊息：\n"
15973 " %s\n"
15944 -"以 '%c' 開頭的行將被保留，如果您願意也可以刪除它們。\n"
15974 +"以「%s」開頭的列將被保留；需要的話您可以自己刪除。\n"
15975
15976 #: builtin/tag.c
15977 msgid "unable to sign the tag"
@@ -16049,6 +16079,10 @@ msgstr "只列印尚未合併的標籤"
16079 msgid "print only tags of the object"
16080 msgstr "只列印指向該物件的標籤"
16081
16082 +#: builtin/tag.c
16083 +msgid "could not start 'git column'"
16084 +msgstr "無法啟動 “git column”"
16085 +
16086 #: builtin/tag.c
16087 #, c-format
16088 msgid "the '%s' option is only allowed in list mode"
@@ -16352,12 +16386,12 @@ msgid "fsmonitor disabled"
16386 msgstr "fsmonitor 被停用"
16387
16388 #: builtin/update-ref.c
16355 -msgid "git update-ref [<options>] -d <refname> [<old-val>]"
16356 -msgstr "git update-ref [<選項>] -d <引用名> [<舊值>]"
16389 +msgid "git update-ref [<options>] -d <refname> [<old-oid>]"
16390 +msgstr "git update-ref [<options>] -d <refname> [<old-oid>]"
16391
16392 #: builtin/update-ref.c
16359 -msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
16360 -msgstr "git update-ref [<選項>] <引用名> <新值> [<舊值>]"
16393 +msgid "git update-ref [<options>] <refname> <new-oid> [<old-oid>]"
16394 +msgstr "git update-ref [<options>] <refname> <new-oid> [<old-oid>]"
16395
16396 #: builtin/update-ref.c
16397 msgid "git update-ref [<options>] --stdin [-z]"
@@ -16667,7 +16701,7 @@ msgstr "「%s」、「%s」和「%s」選項不得同時使用"
16701 #: builtin/worktree.c
16702 #, c-format
16703 msgid "option '%s' and commit-ish cannot be used together"
16670 -msgstr "“%s” 選項和提交號不得同時使用"
16704 +msgstr "「%s」選項和提交編號不得同時使用"
16705
16706 #: builtin/worktree.c
16707 msgid "added with --lock"
@@ -16905,7 +16939,7 @@ msgstr "無法識別的套件包雜湊演算法：%s"
16939 #: bundle.c
16940 #, c-format
16941 msgid "unknown capability '%s'"
16908 -msgstr "未知功能 '%s'"
16942 +msgstr "未知功能「%s」"
16943
16944 #: bundle.c
16945 #, c-format
@@ -16915,7 +16949,7 @@ msgstr "“%s” 不像是一個 v2 或 v3 版本的套件包檔案"
16949 #: bundle.c
16950 #, c-format
16951 msgid "unrecognized header: %s%s (%d)"
16918 -msgstr "無法識別的包頭：%s%s (%d)"
16952 +msgstr "無法識別的標頭：%s%s (%d)"
16953
16954 #: bundle.c
16955 msgid "Repository lacks these prerequisite commits:"
@@ -16963,7 +16997,7 @@ msgstr "無法複製套件包描述元"
16997
16998 #: bundle.c
16999 msgid "Could not spawn pack-objects"
16966 -msgstr "不能生成 pack-objects 進程"
17000 +msgstr "無法 spawn pack-objects 處理程序"
17001
17002 #: bundle.c
17003 msgid "pack-objects died"
@@ -16972,7 +17006,7 @@ msgstr "pack-objects 終止"
17006 #: bundle.c
17007 #, c-format
17008 msgid "ref '%s' is excluded by the rev-list options"
16975 -msgstr "引用 '%s' 被 rev-list 選項排除"
17009 +msgstr "引用「%s」被 rev-list 選項排除"
17010
17011 #: bundle.c
17012 #, c-format
@@ -16991,7 +17025,7 @@ msgstr "不能建立空套件包。"
17025 #: bundle.c
17026 #, c-format
17027 msgid "cannot create '%s'"
16994 -msgstr "不能建立 '%s'"
17028 +msgstr "無法建立「%s」"
17029
17030 #: bundle.c
17031 msgid "index-pack died"
@@ -16999,7 +17033,7 @@ msgstr "index-pack 終止"
17033
17034 #: chunk-format.c
17035 msgid "terminating chunk id appears earlier than expected"
17002 -msgstr "終止區塊 id 出現的時間早於預期"
17036 +msgstr "終止區塊 ID 比預期還早出現"
17037
17038 #: chunk-format.c
17039 #, c-format
@@ -18064,6 +18098,11 @@ msgstr "提交圖形中包含 0 和非 0 兩個世代號（例如 “%s” 和
18098 msgid "Verifying commits in commit graph"
18099 msgstr "正在驗證提交圖中的提交"
18100
18101 +#: commit-reach.c sequencer.c
18102 +#, c-format
18103 +msgid "could not parse commit %s"
18104 +msgstr "不能解析提交 %s"
18105 +
18106 #: commit.c
18107 #, c-format
18108 msgid "%s %s is not a commit!"
@@ -18080,14 +18119,14 @@ msgid ""
18119 "Turn this message off by running\n"
18120 "\"git config advice.graftFileDeprecated false\""
18121 msgstr ""
18083 -"對 <GIT_DIR>/info/grafts 的支援已被棄用，並將在\n"
18084 -"未來的Git版本中被移除。\n"
18122 +"對 <GIT_DIR>/info/grafts 的支援已棄用，並將在\n"
18123 +"未來的 Git 版本中被移除。\n"
18124 "\n"
18086 -"請使用 \"git replace --convert-graft-file\" 將\n"
18125 +"請使用「git replace --convert-graft-file」將\n"
18126 "grafts 轉換為取代引用。\n"
18127 "\n"
18089 -"設定 \"git config advice.graftFileDeprecated false\"\n"
18090 -"可關閉本消息"
18128 +"設定「git config advice.graftFileDeprecated false」\n"
18129 +"可以將本訊息關閉"
18130
18131 #: commit.c
18132 #, c-format
@@ -18591,8 +18630,14 @@ msgid "bad zlib compression level %d"
18630 msgstr "錯誤的 zlib 壓縮級別 %d"
18631
18632 #: config.c
18594 -msgid "core.commentChar should only be one ASCII character"
18595 -msgstr "core.commentChar 應該是一個 ASCII 字元"
18633 +#, c-format
18634 +msgid "%s cannot contain newline"
18635 +msgstr "%s 不能包含換行符號"
18636 +
18637 +#: config.c
18638 +#, c-format
18639 +msgid "%s must have at least one character"
18640 +msgstr "%s 得有至少 1 個字元"
18641
18642 #: config.c
18643 #, c-format
@@ -18601,7 +18646,7 @@ msgstr "忽略未知的 core.fsyncMethod 值「%s」"
18646
18647 #: config.c
18648 msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
18604 -msgstr "core.fsyncObjectFiles 已被取代。請改用 core.fsync"
18649 +msgstr "core.fsyncObjectFiles 已棄用。請改用 core.fsync"
18650
18651 #: config.c
18652 #, c-format
@@ -18680,6 +18725,11 @@ msgstr "%s 有多個取值"
18725 msgid "failed to write new configuration file %s"
18726 msgstr "寫入新的設定檔案 %s 失敗"
18727
18728 +#: config.c
18729 +#, c-format
18730 +msgid "no multi-line comment allowed: '%s'"
18731 +msgstr "不允許多列備註：「%s」"
18732 +
18733 #: config.c
18734 #, c-format
18735 msgid "could not lock config file %s"
@@ -19419,7 +19469,6 @@ msgid "output only the last line of --stat"
19469 msgstr "只輸出 --stat 的最後一行"
19470
19471 #: diff.c
19422 -#| msgid "<param1,param2>..."
19472 msgid "<param1>,<param2>..."
19473 msgstr "<param1>,<param2>..."
19474
@@ -20845,6 +20894,16 @@ msgstr ""
20894 msgid "Unable to create '%s.lock': %s"
20895 msgstr "不能建立 '%s.lock'：%s"
20896
20897 +#: loose.c
20898 +#, c-format
20899 +msgid "could not write loose object index %s"
20900 +msgstr "無法寫入鬆散物件索引 %s"
20901 +
20902 +#: loose.c
20903 +#, c-format
20904 +msgid "failed to write loose object index %s\n"
20905 +msgstr "寫入鬆散物件索引 %s 失敗\n"
20906 +
20907 #: ls-refs.c
20908 #, c-format
20909 msgid "unexpected line: '%s'"
@@ -20858,6 +20917,11 @@ msgstr "在 ls-refs 引數之後應該有一個 flush 包"
20917 msgid "quoted CRLF detected"
20918 msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"
20919
20920 +#: mem-pool.c strbuf.c wrapper.c
20921 +#, c-format
20922 +msgid "unable to format message: %s"
20923 +msgstr "無法格式化訊息：%s"
20924 +
20925 #: merge-ort.c merge-recursive.c
20926 #, c-format
20927 msgid "Failed to merge submodule %s (not checked out)"
@@ -20873,6 +20937,11 @@ msgstr "無法合併 %s 子模組（沒有合併基底）"
20937 msgid "Failed to merge submodule %s (commits not present)"
20938 msgstr "無法合併子模組 %s（提交不存在）"
20939
20940 +#: merge-ort.c merge-recursive.c
20941 +#, c-format
20942 +msgid "Failed to merge submodule %s (repository corrupt)"
20943 +msgstr "無法合併子模組 %s （版本庫損壞）"
20944 +
20945 #: merge-ort.c merge-recursive.c
20946 #, c-format
20947 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
@@ -21185,7 +21254,7 @@ msgstr "快轉子模組 %s"
21254 #: merge-recursive.c
21255 #, c-format
21256 msgid "Failed to merge submodule %s (merge following commits not found)"
21188 -msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）"
21257 +msgstr "無法合併子模組 %s （找不到合併跟隨的提交）"
21258
21259 #: merge-recursive.c
21260 #, c-format
@@ -21405,6 +21474,104 @@ msgstr "不能解析物件 '%s'"
21474 msgid "failed to read the cache"
21475 msgstr "讀取快取失敗"
21476
21477 +#: midx-write.c
21478 +#, c-format
21479 +msgid "failed to add packfile '%s'"
21480 +msgstr "新增 packfile '%s' 失敗"
21481 +
21482 +#: midx-write.c
21483 +#, c-format
21484 +msgid "failed to open pack-index '%s'"
21485 +msgstr "開啟包索引 '%s' 失敗"
21486 +
21487 +#: midx-write.c
21488 +#, c-format
21489 +msgid "failed to locate object %d in packfile"
21490 +msgstr "在 packfile 中定位物件 %d 失敗"
21491 +
21492 +#: midx-write.c
21493 +msgid "cannot store reverse index file"
21494 +msgstr "無法儲存倒排索引檔案"
21495 +
21496 +#: midx-write.c
21497 +#, c-format
21498 +msgid "could not parse line: %s"
21499 +msgstr "無法解析橫列：%s"
21500 +
21501 +#: midx-write.c
21502 +#, c-format
21503 +msgid "malformed line: %s"
21504 +msgstr "橫列格式錯誤：%s"
21505 +
21506 +#: midx-write.c
21507 +msgid "ignoring existing multi-pack-index; checksum mismatch"
21508 +msgstr "忽略現有的多包索引：總和檢查碼不符"
21509 +
21510 +#: midx-write.c
21511 +msgid "could not load pack"
21512 +msgstr "無法載入包"
21513 +
21514 +#: midx-write.c
21515 +#, c-format
21516 +msgid "could not open index for %s"
21517 +msgstr "無法開啟 %s 的索引"
21518 +
21519 +#: midx-write.c
21520 +msgid "Adding packfiles to multi-pack-index"
21521 +msgstr "正在新增 packfile 至多包索引"
21522 +
21523 +#: midx-write.c
21524 +#, c-format
21525 +msgid "unknown preferred pack: '%s'"
21526 +msgstr "未知偏好包：「%s」"
21527 +
21528 +#: midx-write.c
21529 +#, c-format
21530 +msgid "cannot select preferred pack %s with no objects"
21531 +msgstr "無法選取偏好，沒有物件的 %s 包"
21532 +
21533 +#: midx-write.c
21534 +#, c-format
21535 +msgid "did not see pack-file %s to drop"
21536 +msgstr "沒有看到要捨棄的 packfile %s"
21537 +
21538 +#: midx-write.c
21539 +#, c-format
21540 +msgid "preferred pack '%s' is expired"
21541 +msgstr "偏好包「%s」已經過期"
21542 +
21543 +#: midx-write.c
21544 +msgid "no pack files to index."
21545 +msgstr "沒有要索引的 pack 檔案。"
21546 +
21547 +#: midx-write.c
21548 +msgid "refusing to write multi-pack .bitmap without any objects"
21549 +msgstr "拒絕寫入無任何物件的多包 .bitmap"
21550 +
21551 +#: midx-write.c
21552 +msgid "could not write multi-pack bitmap"
21553 +msgstr "無法寫入多包位圖"
21554 +
21555 +#: midx-write.c
21556 +msgid "could not write multi-pack-index"
21557 +msgstr "無法寫入多包索引"
21558 +
21559 +#: midx-write.c
21560 +msgid "Counting referenced objects"
21561 +msgstr "正在計算引用物件"
21562 +
21563 +#: midx-write.c
21564 +msgid "Finding and deleting unreferenced packfiles"
21565 +msgstr "正在尋找並刪除沒有引用的 packfile"
21566 +
21567 +#: midx-write.c
21568 +msgid "could not start pack-objects"
21569 +msgstr "不能開始 pack-objects"
21570 +
21571 +#: midx-write.c
21572 +msgid "could not finish pack-objects"
21573 +msgstr "不能結束 pack-objects"
21574 +
21575 #: midx.c
21576 msgid "multi-pack-index OID fanout is of the wrong size"
21577 msgstr "多包索引的物件 ID fanout 大小錯誤"
@@ -21490,88 +21657,6 @@ msgstr "多包索引儲存一個64位位移，但是 off_t 太小"
21657 msgid "multi-pack-index large offset out of bounds"
21658 msgstr "多包索引的最大偏移超出邊界"
21659
21493 -#: midx.c
21494 -#, c-format
21495 -msgid "failed to add packfile '%s'"
21496 -msgstr "新增 packfile '%s' 失敗"
21497 -
21498 -#: midx.c
21499 -#, c-format
21500 -msgid "failed to open pack-index '%s'"
21501 -msgstr "開啟包索引 '%s' 失敗"
21502 -
21503 -#: midx.c
21504 -#, c-format
21505 -msgid "failed to locate object %d in packfile"
21506 -msgstr "在 packfile 中定位物件 %d 失敗"
21507 -
21508 -#: midx.c
21509 -msgid "cannot store reverse index file"
21510 -msgstr "無法儲存倒排索引檔案"
21511 -
21512 -#: midx.c
21513 -#, c-format
21514 -msgid "could not parse line: %s"
21515 -msgstr "無法解析橫列：%s"
21516 -
21517 -#: midx.c
21518 -#, c-format
21519 -msgid "malformed line: %s"
21520 -msgstr "橫列格式錯誤：%s"
21521 -
21522 -#: midx.c
21523 -msgid "ignoring existing multi-pack-index; checksum mismatch"
21524 -msgstr "忽略現有的多包索引：總和檢查碼不符"
21525 -
21526 -#: midx.c
21527 -msgid "could not load pack"
21528 -msgstr "無法載入包"
21529 -
21530 -#: midx.c
21531 -#, c-format
21532 -msgid "could not open index for %s"
21533 -msgstr "無法開啟 %s 的索引"
21534 -
21535 -#: midx.c
21536 -msgid "Adding packfiles to multi-pack-index"
21537 -msgstr "正在新增 packfile 至多包索引"
21538 -
21539 -#: midx.c
21540 -#, c-format
21541 -msgid "unknown preferred pack: '%s'"
21542 -msgstr "未知偏好包：「%s」"
21543 -
21544 -#: midx.c
21545 -#, c-format
21546 -msgid "cannot select preferred pack %s with no objects"
21547 -msgstr "無法選取偏好，沒有物件的 %s 包"
21548 -
21549 -#: midx.c
21550 -#, c-format
21551 -msgid "did not see pack-file %s to drop"
21552 -msgstr "沒有看到要捨棄的 packfile %s"
21553 -
21554 -#: midx.c
21555 -#, c-format
21556 -msgid "preferred pack '%s' is expired"
21557 -msgstr "偏好包「%s」已經過期"
21558 -
21559 -#: midx.c
21560 -msgid "no pack files to index."
21561 -msgstr "沒有要索引的 pack 檔案。"
21562 -
21563 -#: midx.c
21564 -msgid "refusing to write multi-pack .bitmap without any objects"
21565 -msgstr "拒絕寫入無任何物件的多包 .bitmap"
21566 -
21567 -#: midx.c
21568 -msgid "could not write multi-pack bitmap"
21569 -msgstr "無法寫入多包位圖"
21570 -
21571 -#: midx.c
21572 -msgid "could not write multi-pack-index"
21573 -msgstr "無法寫入多包索引"
21574 -
21660 #: midx.c
21661 #, c-format
21662 msgid "failed to clear multi-pack-index at %s"
@@ -21625,22 +21710,6 @@ msgstr "為 packfile %s 載入包索引失敗"
21710 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
21711 msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"
21712
21628 -#: midx.c
21629 -msgid "Counting referenced objects"
21630 -msgstr "正在計算引用物件"
21631 -
21632 -#: midx.c
21633 -msgid "Finding and deleting unreferenced packfiles"
21634 -msgstr "正在尋找並刪除沒有引用的 packfile"
21635 -
21636 -#: midx.c
21637 -msgid "could not start pack-objects"
21638 -msgstr "不能開始 pack-objects"
21639 -
21640 -#: midx.c
21641 -msgid "could not finish pack-objects"
21642 -msgstr "不能結束 pack-objects"
21643 -
21713 #: name-hash.c
21714 #, c-format
21715 msgid "unable to create lazy_dir thread: %s"
@@ -21695,6 +21764,30 @@ msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解"
21764 msgid "Bad %s value: '%s'"
21765 msgstr "壞的 %s 值：'%s'"
21766
21767 +#: object-file-convert.c
21768 +msgid "failed to decode tree entry"
21769 +msgstr "無法解碼樹狀物件項目"
21770 +
21771 +#: object-file-convert.c
21772 +#, c-format
21773 +msgid "failed to map tree entry for %s"
21774 +msgstr "無法為 %s 映射樹狀物件項目"
21775 +
21776 +#: object-file-convert.c
21777 +#, c-format
21778 +msgid "bad %s in commit"
21779 +msgstr "提交中有無效的 %s"
21780 +
21781 +#: object-file-convert.c
21782 +#, c-format
21783 +msgid "unable to map %s %s in commit object"
21784 +msgstr "無法在提交物件中映射 %s %s"
21785 +
21786 +#: object-file-convert.c
21787 +#, c-format
21788 +msgid "Failed to convert object from %s to %s"
21789 +msgstr "無法將物件從 %s 轉換為 %s"
21790 +
21791 #: object-file.c
21792 #, c-format
21793 msgid "object directory %s does not exist; check .git/objects/info/alternates"
@@ -21821,6 +21914,11 @@ msgstr "找不到 %2$s 的替代 %1$s"
21914 msgid "packed object %s (stored in %s) is corrupt"
21915 msgstr "打包物件 %s（儲存在 %s）已損壞"
21916
21917 +#: object-file.c
21918 +#, c-format
21919 +msgid "missing mapping of %s to %s"
21920 +msgstr "缺少 %s 到 %s 的映射"
21921 +
21922 #: object-file.c
21923 #, c-format
21924 msgid "unable to write file %s"
@@ -21888,6 +21986,11 @@ msgstr "無法建立 %s 目錄"
21986 msgid "cannot read object for %s"
21987 msgstr "不能讀取物件 %s"
21988
21989 +#: object-file.c
21990 +#, c-format
21991 +msgid "cannot map object %s to %s"
21992 +msgstr "無法將物件 %s 映射到 %s"
21993 +
21994 #: object-file.c
21995 #, c-format
21996 msgid "object fails fsck: %s"
@@ -22251,6 +22354,10 @@ msgstr "ewah 位圖損壞：提交 “%s” 之位圖的標頭遭截斷"
22354 msgid "unable to load pack: '%s', disabling pack-reuse"
22355 msgstr "無法載入「%s」封裝，停用 pack-reuse"
22356
22357 +#: pack-bitmap.c
22358 +msgid "unable to compute preferred pack, disabling pack-reuse"
22359 +msgstr "無法計算偏好封裝，停用 pack-reuse"
22360 +
22361 #: pack-bitmap.c
22362 #, c-format
22363 msgid "object '%s' not found in type bitmaps"
@@ -22624,7 +22731,7 @@ msgstr "路徑規格包含無效的神奇前綴"
22731 #: pathspec.c
22732 #, c-format
22733 msgid "Invalid pathspec magic '%.*s' in '%s'"
22627 -msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'"
22734 +msgstr "有無效的神奇前綴「%.*s」出現在路徑規格「%s」中"
22735
22736 #: pathspec.c
22737 #, c-format
@@ -23521,6 +23628,84 @@ msgstr "無法刪除引用 %s：%s"
23628 msgid "could not delete references: %s"
23629 msgstr "無法刪除引用：%s"
23630
23631 +#: refs/reftable-backend.c
23632 +#, c-format
23633 +msgid "refname is dangerous: %s"
23634 +msgstr "此引用名稱是危險的：%s"
23635 +
23636 +#: refs/reftable-backend.c
23637 +#, c-format
23638 +msgid "trying to write ref '%s' with nonexistent object %s"
23639 +msgstr "嘗試以不存在的物件 %s 寫入引用「%s」"
23640 +
23641 +#: refs/reftable-backend.c
23642 +#, c-format
23643 +msgid "trying to write non-commit object %s to branch '%s'"
23644 +msgstr "嘗試將非提交物件 %s 寫入分支「%s」"
23645 +
23646 +#: refs/reftable-backend.c
23647 +#, c-format
23648 +msgid ""
23649 +"multiple updates for 'HEAD' (including one via its referent '%s') are not "
23650 +"allowed"
23651 +msgstr "不允許對「HEAD」進行多次更新（包含透過其「%s」引用進行的更新）"
23652 +
23653 +#: refs/reftable-backend.c
23654 +#, c-format
23655 +msgid "cannot lock ref '%s': unable to resolve reference '%s'"
23656 +msgstr "無法鎖定引用「%s」：無法解析引用「%s」"
23657 +
23658 +#: refs/reftable-backend.c
23659 +#, c-format
23660 +msgid "cannot lock ref '%s': error reading reference"
23661 +msgstr "無法鎖定引用「%s」：無法讀取引用"
23662 +
23663 +#: refs/reftable-backend.c
23664 +#, c-format
23665 +msgid ""
23666 +"multiple updates for '%s' (including one via symref '%s') are not allowed"
23667 +msgstr "不允許對「%s」進行多次更新（包含透過「%s」符號引用進行的更新）"
23668 +
23669 +#: refs/reftable-backend.c
23670 +#, c-format
23671 +msgid "cannot lock ref '%s': reference already exists"
23672 +msgstr "無法鎖定引用「%s」：引用已經存在"
23673 +
23674 +#: refs/reftable-backend.c
23675 +#, c-format
23676 +msgid "cannot lock ref '%s': reference is missing but expected %s"
23677 +msgstr "無法鎖定引用「%s」：缺少引用但預期的是 %s"
23678 +
23679 +#: refs/reftable-backend.c
23680 +#, c-format
23681 +msgid "cannot lock ref '%s': is at %s but expected %s"
23682 +msgstr "無法鎖定引用「%s」：位於 %s 但預期的是 %s"
23683 +
23684 +#: refs/reftable-backend.c
23685 +#, c-format
23686 +msgid "reftable: transaction prepare: %s"
23687 +msgstr "引用表：準備事務：%s"
23688 +
23689 +#: refs/reftable-backend.c
23690 +#, c-format
23691 +msgid "reftable: transaction failure: %s"
23692 +msgstr "引用表：事務失敗：%s"
23693 +
23694 +#: refs/reftable-backend.c
23695 +#, c-format
23696 +msgid "unable to compact stack: %s"
23697 +msgstr "無法壓縮堆疊：%s"
23698 +
23699 +#: refs/reftable-backend.c
23700 +#, c-format
23701 +msgid "refname %s not found"
23702 +msgstr "找不到引用名稱 %s"
23703 +
23704 +#: refs/reftable-backend.c
23705 +#, c-format
23706 +msgid "refname %s is a symbolic ref, copying it is not supported"
23707 +msgstr "引用名稱 %s 是符號引用，不支援複製"
23708 +
23709 #: refspec.c
23710 #, c-format
23711 msgid "invalid refspec '%s'"
@@ -23531,6 +23716,11 @@ msgstr "無效的引用規格：「%s」"
23716 msgid "invalid quoting in push-option value: '%s'"
23717 msgstr "在 push-option 取值中無效的引號：'%s'"
23718
23719 +#: remote-curl.c
23720 +#, c-format
23721 +msgid "unknown value for object-format: %s"
23722 +msgstr "未知的 object-format 值：%s"
23723 +
23724 #: remote-curl.c
23725 #, c-format
23726 msgid "%sinfo/refs not valid: is this a git repository?"
@@ -24067,8 +24257,21 @@ msgstr "resolve-undo 不存在的「%s」記錄"
24257
24258 #: revision.c
24259 #, c-format
24070 -msgid "could not get commit for ancestry-path argument %s"
24071 -msgstr "無法取得 ancestry-path 引數 %s 的提交"
24260 +msgid "%s exists but is a symbolic ref"
24261 +msgstr "%s 存在但屬於符號連結"
24262 +
24263 +#: revision.c
24264 +msgid ""
24265 +"--merge requires one of the pseudorefs MERGE_HEAD, CHERRY_PICK_HEAD, "
24266 +"REVERT_HEAD or REBASE_HEAD"
24267 +msgstr ""
24268 +"--merge 需要其中一種偽引用 MERGE_HEAD、CHERRY_PICK_HEAD、REVERT_HEAD 或 "
24269 +"REBASE_HEAD"
24270 +
24271 +#: revision.c
24272 +#, c-format
24273 +msgid "could not get commit for --ancestry-path argument %s"
24274 +msgstr "無法取得 --ancestry-path 引數 %s 的提交"
24275
24276 #: revision.c
24277 msgid "--unpacked=<packfile> no longer supported"
@@ -24427,6 +24630,19 @@ msgstr "重定基底"
24630 msgid "unknown action: %d"
24631 msgstr "未知動作：%d"
24632
24633 +#: sequencer.c
24634 +msgid ""
24635 +"Resolve all conflicts manually, mark them as resolved with\n"
24636 +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
24637 +"You can instead skip this commit: run \"git rebase --skip\".\n"
24638 +"To abort and get back to the state before \"git rebase\", run \"git rebase --"
24639 +"abort\"."
24640 +msgstr ""
24641 +"手動解決所有衝突，執行 \"git add/rm <衝突的檔案>\" 標記\n"
24642 +"衝突已解決，然後執行 \"git rebase --continue\"。您也可以執行\n"
24643 +"\"git rebase --skip\" 指令略過這個提交。如果想要終止執行並回到\n"
24644 +"\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。"
24645 +
24646 #: sequencer.c
24647 msgid ""
24648 "after resolving the conflicts, mark the corrected paths\n"
@@ -24679,11 +24895,6 @@ msgstr "作者資訊損壞：缺少日期資訊"
24895 msgid "could not update %s"
24896 msgstr "不能更新 %s"
24897
24682 -#: sequencer.c
24683 -#, c-format
24684 -msgid "could not parse commit %s"
24685 -msgstr "不能解析提交 %s"
24686 -
24898 #: sequencer.c
24899 #, c-format
24900 msgid "could not parse parent commit %s"
@@ -24814,11 +25025,6 @@ msgstr "update-ref 需要完全限定的引用名稱，比如：refs/heads/%s"
25025 msgid "invalid command '%.*s'"
25026 msgstr "無效的命令 “%.*s”"
25027
24817 -#: sequencer.c
24818 -#, c-format
24819 -msgid "%s does not accept arguments: '%s'"
24820 -msgstr "%s 不接受參數：'%s'"
24821 -
25028 #: sequencer.c
25029 #, c-format
25030 msgid "missing arguments for %s"
@@ -25369,6 +25575,11 @@ msgstr ""
25575 msgid "unable to set up work tree using invalid config"
25576 msgstr "無法使用無效設定來建立工作區"
25577
25578 +#: setup.c
25579 +#, c-format
25580 +msgid "'%s' already specified as '%s'"
25581 +msgstr "「%s」已經指定為「%s」"
25582 +
25583 #: setup.c
25584 #, c-format
25585 msgid "Expected git repo version <= %d, found %d"
@@ -25599,6 +25810,24 @@ msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）"
25810 msgid "cannot use split index with a sparse index"
25811 msgstr "無法在稀疏索引使用索引分割"
25812
25813 +#. TRANSLATORS: The first %s is a command like "ls-tree".
25814 +#: strbuf.c
25815 +#, c-format
25816 +msgid "bad %s format: element '%s' does not start with '('"
25817 +msgstr "無效的 %s 格式：「%s」元素的開頭不是「(」"
25818 +
25819 +#. TRANSLATORS: The first %s is a command like "ls-tree".
25820 +#: strbuf.c
25821 +#, c-format
25822 +msgid "bad %s format: element '%s' does not end in ')'"
25823 +msgstr "無效的 %s 格式：「%s」元素的結尾不是「)」"
25824 +
25825 +#. TRANSLATORS: %s is a command like "ls-tree".
25826 +#: strbuf.c
25827 +#, c-format
25828 +msgid "bad %s format: %%%.*s"
25829 +msgstr "無效的 %s 格式：%%%.*s"
25830 +
25831 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
25832 #: strbuf.c
25833 #, c-format
@@ -25988,35 +26217,6 @@ msgstr "鍵 '%2$s' 的未知取值 '%1$s'"
26217 msgid "empty trailer token in trailer '%.*s'"
26218 msgstr "簽名 '%.*s' 的鍵為空"
26219
25991 -#: trailer.c
25992 -#, c-format
25993 -msgid "could not read input file '%s'"
25994 -msgstr "不能讀取輸入檔案 '%s'"
25995 -
25996 -#: trailer.c wrapper.c
25997 -#, c-format
25998 -msgid "could not stat %s"
25999 -msgstr "不能對 %s 呼叫 stat"
26000 -
26001 -#: trailer.c
26002 -#, c-format
26003 -msgid "file %s is not a regular file"
26004 -msgstr "檔案 %s 不是一個正規檔案"
26005 -
26006 -#: trailer.c
26007 -#, c-format
26008 -msgid "file %s is not writable by user"
26009 -msgstr "檔案 %s 使用者不可寫"
26010 -
26011 -#: trailer.c
26012 -msgid "could not open temporary file"
26013 -msgstr "不能開啟暫存檔"
26014 -
26015 -#: trailer.c
26016 -#, c-format
26017 -msgid "could not rename temporary file to %s"
26018 -msgstr "不能重新命名暫存檔為 %s"
26019 -
26220 #: transport-helper.c
26221 msgid "full write to remote helper failed"
26222 msgstr "完整寫入遠端協助工具失敗"
@@ -26136,8 +26336,8 @@ msgstr "remote-heper 不支援 push，需要引用規格"
26336
26337 #: transport-helper.c
26338 #, c-format
26139 -msgid "helper %s does not support 'force'"
26140 -msgstr "協助工具 %s 不支援 'force'"
26339 +msgid "helper %s does not support '--force'"
26340 +msgstr "協助工具 %s 不支援「--force」"
26341
26342 #: transport-helper.c
26343 msgid "couldn't run fast-export"
@@ -26611,6 +26811,11 @@ msgstr "無效的埠號"
26811 msgid "invalid '..' path segment"
26812 msgstr "無效的 '..' 路徑區塊"
26813
26814 +#: usage.c
26815 +#, c-format
26816 +msgid "error: unable to format message: %s\n"
26817 +msgstr "錯誤：無法格式化訊息：%s\n"
26818 +
26819 #: usage.c
26820 msgid "usage: "
26821 msgstr "用法: "
@@ -27793,6 +27998,53 @@ msgstr "略過 %s 含備份後綴 '%s'。\n"
27998 msgid "Do you really want to send %s? [y|N]: "
27999 msgstr "您真的要傳送 %s？[y|N]： "
28000
28001 +#, c-format
28002 +#~ msgid "truncating .rej filename to %.*s.rej"
28003 +#~ msgstr "正在將 .rej 檔案名稱截短為 %.*s.rej"
28004 +
28005 +#~ msgid ""
28006 +#~ "Use -f if you really want to add them.\n"
28007 +#~ "Turn this message off by running\n"
28008 +#~ "\"git config advice.addIgnoredFile false\""
28009 +#~ msgstr ""
28010 +#~ "若您真的想加入，請傳入 -f。\n"
28011 +#~ "如要關閉此訊息，請執行\n"
28012 +#~ "“git config advice.addIgnoredFile false”"
28013 +
28014 +#~ msgid ""
28015 +#~ "Maybe you wanted to say 'git add .'?\n"
28016 +#~ "Turn this message off by running\n"
28017 +#~ "\"git config advice.addEmptyPathspec false\""
28018 +#~ msgstr ""
28019 +#~ "可能您想做 “git add .”？\n"
28020 +#~ "如要關閉此訊息，請執行\n"
28021 +#~ "“git config advice.addEmptyPathspec false”"
28022 +
28023 +#~ msgid ""
28024 +#~ "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
28025 +#~ "refusing to clean"
28026 +#~ msgstr ""
28027 +#~ "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動"
28028 +#~ "作"
28029 +
28030 +#, c-format
28031 +#~ msgid "bad ls-files format: element '%s' does not start with '('"
28032 +#~ msgstr "ls-files 格式錯誤：“%s” 元素不以 “(” 開頭"
28033 +
28034 +#, c-format
28035 +#~ msgid "bad ls-files format: element '%s' does not end in ')'"
28036 +#~ msgstr "ls-files 格式錯誤：“%s” 元素不以 “)” 結尾"
28037 +
28038 +#, c-format
28039 +#~ msgid "bad ls-files format: %%%.*s"
28040 +#~ msgstr "ls-files 格式錯誤：%%%.*s"
28041 +
28042 +#~ msgid "keep redundant, empty commits"
28043 +#~ msgstr "保持多餘的、空的提交"
28044 +
28045 +#~ msgid "core.commentChar should only be one ASCII character"
28046 +#~ msgstr "core.commentChar 應該是一個 ASCII 字元"
28047 +
28048 #~ msgid "-x and -X cannot be used together"
28049 #~ msgstr "-x 和 -X 不能同時使用"
28050
@@ -27838,9 +28090,5 @@ msgstr "您真的要傳送 %s？[y|N]： "
28090 #~ msgid "%s is incompatible with %s"
28091 #~ msgstr "%s 與 %s 不相容"
28092
27841 -#, c-format
27842 -#~ msgid "could not remove reference %s"
27843 -#~ msgstr "無法刪除引用 %s"
27844 -
28093 #~ msgid "unhandled options"
28094 #~ msgstr "未處理選項"