@matheusbsbs / matheus-bagliano / commits / 5fdd5b989c

l10n: zh_TW: Git 2.44

Co-Authored-By: lumynou5 <lumynou5.tw@gmail.com> Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>

Yi-Jyun Pan committed Feb 18, 2024 at 20:53 UTC 5fdd5b989cbe5096d44e89861a92b2dd47c279d9
1 file changed +363 -168
po/zh_TW.po
+363 -168
@@ -19,15 +19,15 @@
19 # - Yichao Yu <yyc1992 AT gmail.com>
20 # - Zhuang Ya <zhuangya AT me.com>
21 #
22 -# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023.
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.
24 +# lumynou5 <lumynou5.tw@gmail.com>, 2023, 2024.
25 msgid ""
26 msgstr ""
27 "Project-Id-Version: Git\n"
28 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
29 -"POT-Creation-Date: 2023-11-19 22:29+0800\n"
30 -"PO-Revision-Date: 2023-11-19 23:34+0800\n"
29 +"POT-Creation-Date: 2024-02-18 20:48+0800\n"
30 +"PO-Revision-Date: 2024-02-18 20:50+0800\n"
31 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
32 "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
33 "po/git-cli/zh_Hant/>\n"
@@ -36,7 +36,7 @@ msgstr ""
36 "Content-Type: text/plain; charset=UTF-8\n"
37 "Content-Transfer-Encoding: 8bit\n"
38 "Plural-Forms: nplurals=1; plural=0;\n"
39 -"X-Generator: Poedit 3.4.1\n"
39 +"X-Generator: Poedit 3.4.2\n"
40 "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
41 "zhconvert.org\n"
42
@@ -910,7 +910,7 @@ msgid "unclosed quote"
910 msgstr "未閉合的引號"
911
912 #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
913 -#: builtin/receive-pack.c builtin/tag.c
913 +#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c
914 msgid "too many arguments"
915 msgstr "引數過多"
916
@@ -925,12 +925,13 @@ msgid "unrecognized whitespace ignore option '%s'"
925 msgstr "空白字元忽略選項 “%s” 無法識別"
926
927 #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c
928 -#: builtin/checkout.c builtin/clone.c builtin/commit.c builtin/describe.c
929 -#: builtin/diff-tree.c builtin/difftool.c builtin/fast-export.c builtin/fetch.c
930 -#: builtin/help.c builtin/index-pack.c builtin/init-db.c builtin/log.c
931 -#: builtin/ls-files.c builtin/merge-base.c builtin/merge.c
932 -#: builtin/pack-objects.c builtin/push.c builtin/rebase.c builtin/repack.c
933 -#: builtin/reset.c builtin/rev-list.c builtin/show-branch.c builtin/stash.c
928 +#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c
929 +#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
930 +#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
931 +#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
932 +#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c
933 +#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.c
934 +#: builtin/rev-parse.c builtin/show-branch.c builtin/stash.c
935 #: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c
936 #: range-diff.c revision.c
937 #, c-format
@@ -1240,12 +1241,12 @@ msgstr "%s：已存在於工作區中"
1241 #: apply.c
1242 #, c-format
1243 msgid "new mode (%o) of %s does not match old mode (%o)"
1243 -msgstr "%2$s 的新模式 (%1$o) 和舊模式 (%3$o) 不符"
1244 +msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符"
1245
1246 #: apply.c
1247 #, c-format
1248 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1248 -msgstr "%2$s 的新模式 (%1$o) 和 %4$s 的舊模式 (%3$o) 不符"
1249 +msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符"
1250
1251 #: apply.c
1252 #, c-format
@@ -1732,6 +1733,11 @@ msgstr "“%s” 選項需要 “%s”"
1733 msgid "Unexpected option --output"
1734 msgstr "非預期選項 --output"
1735
1736 +#: archive.c
1737 +#, c-format
1738 +msgid "extra command line parameter '%s'"
1739 +msgstr "多出命令列參數 “%s”"
1740 +
1741 #: archive.c
1742 #, c-format
1743 msgid "Unknown archive format '%s'"
@@ -1788,6 +1794,17 @@ msgstr "忽略過大的 gitattributes 資料物件 “%s”"
1794 msgid "bad --attr-source or GIT_ATTR_SOURCE"
1795 msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE"
1796
1797 +#: attr.c read-cache.c
1798 +#, c-format
1799 +msgid "unable to stat '%s'"
1800 +msgstr "無法對 %s 執行 stat"
1801 +
1802 +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c
1803 +#: builtin/pack-objects.c combine-diff.c rerere.c
1804 +#, c-format
1805 +msgid "unable to read %s"
1806 +msgstr "不能讀 %s"
1807 +
1808 #: bisect.c
1809 #, c-format
1810 msgid "Badly quoted content in file '%s': %s"
@@ -2323,8 +2340,8 @@ msgid "bad action '%s' for '%s'"
2340 msgstr "“%s” 動作對 “%s” 無效"
2341
2342 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
2326 -#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c
2327 -#: sequencer.c setup.c
2343 +#: builtin/pull.c config.c diff-merges.c gpg-interface.c ls-refs.c
2344 +#: parallel-checkout.c sequencer.c setup.c
2345 #, c-format
2346 msgid "invalid value for '%s': '%s'"
2347 msgstr "“%s” 的值無效：“%s”"
@@ -2477,8 +2494,7 @@ msgstr "git write-tree 無法寫入樹狀物件"
2494 msgid "applying to an empty history"
2495 msgstr "正在套用至空白歷史記錄上"
2496
2480 -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
2481 -#: t/helper/test-fast-rebase.c
2497 +#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c
2498 msgid "failed to write commit object"
2499 msgstr "無法寫入提交物件"
2500
@@ -2661,8 +2677,9 @@ msgid "n"
2677 msgstr "n"
2678
2679 #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
2664 -#: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c
2665 -#: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c
2680 +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c
2681 +#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
2682 +#: builtin/verify-tag.c
2683 msgid "format"
2684 msgstr "format"
2685
@@ -3357,12 +3374,13 @@ msgstr "無法查詢 “%s” 指向的提交物件"
3374
3375 #: builtin/branch.c
3376 #, c-format
3360 -msgid ""
3361 -"the branch '%s' is not fully merged.\n"
3362 -"If you are sure you want to delete it, run 'git branch -D %s'"
3363 -msgstr ""
3364 -"分支 “%s” 沒有完全合併。\n"
3365 -"如果確定要刪除它，請執行 “git branch -D %s”"
3377 +msgid "the branch '%s' is not fully merged"
3378 +msgstr "分支 “%s” 沒有完全合併"
3379 +
3380 +#: builtin/branch.c
3381 +#, c-format
3382 +msgid "If you are sure you want to delete it, run 'git branch -D %s'"
3383 +msgstr "如果確定要刪除它，請執行 “git branch -D %s”"
3384
3385 #: builtin/branch.c
3386 msgid "update of config-file failed"
@@ -4370,7 +4388,7 @@ msgstr "無法對 “%s” 執行 reflog 動作：%s\n"
4388 msgid "HEAD is now at"
4389 msgstr "HEAD 目前位於"
4390
4373 -#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c
4391 +#: builtin/checkout.c builtin/clone.c
4392 msgid "unable to update HEAD"
4393 msgstr "無法更新 HEAD"
4394
@@ -4631,8 +4649,8 @@ msgid "new-branch"
4649 msgstr "new-branch"
4650
4651 #: builtin/checkout.c
4634 -msgid "new unparented branch"
4635 -msgstr "新的，沒有父提交的分支"
4652 +msgid "new unborn branch"
4653 +msgstr "新的未誕生分支"
4654
4655 #: builtin/checkout.c builtin/merge.c
4656 msgid "update ignored files (default)"
@@ -4699,7 +4717,7 @@ msgstr ""
4717 msgid "you must specify path(s) to restore"
4718 msgstr "您必須指定要還原的路徑"
4719
4702 -#: builtin/checkout.c builtin/clone.c builtin/remote.c
4720 +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c
4721 #: builtin/submodule--helper.c builtin/worktree.c
4722 msgid "branch"
4723 msgstr "branch"
@@ -4940,10 +4958,6 @@ msgid ""
4958 msgstr ""
4959 "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作"
4960
4943 -#: builtin/clean.c
4944 -msgid "-x and -X cannot be used together"
4945 -msgstr "-x 和 -X 不能同時使用"
4946 -
4961 #: builtin/clone.c
4962 msgid "git clone [<options>] [--] <repo> [<dir>]"
4963 msgstr "git clone [<options>] [--] <repo> [<dir>]"
@@ -5035,6 +5049,7 @@ msgid "create a shallow clone since a specific time"
5049 msgstr "建立從指定時間到現在的淺層複製"
5050
5051 #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c
5052 +#: builtin/replay.c
5053 msgid "revision"
5054 msgstr "revision"
5055
@@ -5062,6 +5077,10 @@ msgstr "gitdir"
5077 msgid "separate git dir from working tree"
5078 msgstr "git 目錄和工作區分離"
5079
5080 +#: builtin/clone.c builtin/init-db.c
5081 +msgid "specify the reference format to use"
5082 +msgstr "指定要使用的引用格式"
5083 +
5084 #: builtin/clone.c
5085 msgid "key=value"
5086 msgstr "key=value"
@@ -5211,11 +5230,10 @@ msgstr "太多參數。"
5230 msgid "You must specify a repository to clone."
5231 msgstr "您必須指定要複製的版本庫。"
5232
5214 -#: builtin/clone.c
5215 -msgid ""
5216 -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-"
5217 -"exclude"
5218 -msgstr "--bundle-uri 與 --depth、--shallow-since 和 --shallow-exclude 不相容"
5233 +#: builtin/clone.c builtin/init-db.c setup.c
5234 +#, c-format
5235 +msgid "unknown ref storage format '%s'"
5236 +msgstr "未知的引用儲存格式 “%s”"
5237
5238 #: builtin/clone.c
5239 #, c-format
@@ -5376,14 +5394,14 @@ msgid ""
5394 "--stdin-commits]\n"
5395 " [--changed-paths] [--[no-]max-new-filters <n>] [--"
5396 "[no-]progress]\n"
5379 -" <split options>"
5397 +" <split-options>"
5398 msgstr ""
5399 "git commit-graph write [--object-dir <dir>] [--append]\n"
5400 " [--split[=<strategy>]] [--reachable | --stdin-packs | "
5401 "--stdin-commits]\n"
5402 " [--changed-paths] [--[no-]max-new-filters <n>] [--"
5403 "[no-]progress]\n"
5386 -" <split options>"
5404 +" <split-options>"
5405
5406 #: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c
5407 msgid "dir"
@@ -8262,6 +8280,11 @@ msgstr "沒有執行緒支援，忽略 %s"
8280 msgid "unable to read tree (%s)"
8281 msgstr "無法讀取樹（%s）"
8282
8283 +#: builtin/grep.c
8284 +#, c-format
8285 +msgid "unable to read tree %s"
8286 +msgstr "無法讀取 %s 樹狀物件"
8287 +
8288 #: builtin/grep.c
8289 #, c-format
8290 msgid "unable to grep from object of type %s"
@@ -8784,11 +8807,6 @@ msgstr "解壓縮嚴重的不一致"
8807 msgid "SHA1 COLLISION FOUND WITH %s !"
8808 msgstr "發現 %s 出現 SHA1 衝突！"
8809
8787 -#: builtin/index-pack.c builtin/pack-objects.c
8788 -#, c-format
8789 -msgid "unable to read %s"
8790 -msgstr "不能讀 %s"
8791 -
8810 #: builtin/index-pack.c
8811 #, c-format
8812 msgid "cannot read existing object info %s"
@@ -8962,11 +8980,13 @@ msgstr "在打包物件中 fsck 檢查發生錯誤"
8980 msgid ""
8981 "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
8982 " [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
8983 +" [--ref-format=<format>]\n"
8984 " [-b <branch-name> | --initial-branch=<branch-name>]\n"
8985 " [--shared[=<permissions>]] [<directory>]"
8986 msgstr ""
8987 "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
8988 " [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
8989 +" [--ref-format=<format>]\n"
8990 " [-b <branch-name> | --initial-branch=<branch-name>]\n"
8991 " [--shared[=<permissions>]] [<directory>]"
8992
@@ -9125,7 +9145,7 @@ msgid ""
9145 "<file>"
9146 msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱> 的變化史"
9147
9128 -#: builtin/log.c builtin/shortlog.c bundle.c
9148 +#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c
9149 #, c-format
9150 msgid "unrecognized argument: %s"
9151 msgstr "無法識別的參數：%s"
@@ -9868,6 +9888,13 @@ msgstr ""
9888 "git merge-file [<選項>] [-L <檔案1> [-L <初始> [-L <名字2>]]] <檔案1> <初始文"
9889 "件> <檔案2>"
9890
9891 +#: builtin/merge-file.c diff.c
9892 +msgid ""
9893 +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
9894 +"\"histogram\""
9895 +msgstr ""
9896 +"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
9897 +
9898 #: builtin/merge-file.c
9899 msgid "send results to standard output"
9900 msgstr "將結果傳送到標準輸出"
@@ -9896,6 +9923,14 @@ msgstr "如果衝突，使用他們的版本"
9923 msgid "for conflicts, use a union version"
9924 msgstr "如果衝突，使用聯合版本"
9925
9926 +#: builtin/merge-file.c diff.c
9927 +msgid "<algorithm>"
9928 +msgstr "<演算法>"
9929 +
9930 +#: builtin/merge-file.c diff.c
9931 +msgid "choose a diff algorithm"
9932 +msgstr "選擇一個差異演算法"
9933 +
9934 #: builtin/merge-file.c
9935 msgid "for conflicts, use this marker size"
9936 msgstr "如果衝突，使用指定長度的標記"
@@ -10012,10 +10047,6 @@ msgstr "--trivial-merge 和其他所有選項都不相容"
10047 msgid "unknown strategy option: -X%s"
10048 msgstr "未知的策略選項：-X%s"
10049
10015 -#: builtin/merge-tree.c
10016 -msgid "--merge-base is incompatible with --stdin"
10017 -msgstr "--merge-base 與 --stdin 不相容"
10018 -
10050 #: builtin/merge-tree.c builtin/notes.c
10051 #, c-format
10052 msgid "malformed input line: '%s'."
@@ -10174,7 +10205,7 @@ msgstr "'%s' 沒有指向一個提交"
10205 msgid "Bad branch.%s.mergeoptions string: %s"
10206 msgstr "壞的 branch.%s.mergeoptions 字串：%s"
10207
10177 -#: builtin/merge.c builtin/stash.c merge-recursive.c
10208 +#: builtin/merge.c merge-recursive.c
10209 msgid "Unable to write index."
10210 msgstr "不能寫入索引。"
10211
@@ -10182,7 +10213,7 @@ msgstr "不能寫入索引。"
10213 msgid "Not handling anything other than two heads merge."
10214 msgstr "未處理兩個頭合併之外的任何動作。"
10215
10185 -#: builtin/merge.c t/helper/test-fast-rebase.c
10216 +#: builtin/merge.c
10217 #, c-format
10218 msgid "unable to write %s"
10219 msgstr "不能寫 %s"
@@ -11168,6 +11199,11 @@ msgstr "壓縮物件中"
11199 msgid "inconsistency with delta count"
11200 msgstr "不一致的差異計數"
11201
11202 +#: builtin/pack-objects.c
11203 +#, c-format
11204 +msgid "invalid pack.allowPackReuse value: '%s'"
11205 +msgstr "無效的 pack.allowPackReuse 值：“%s”"
11206 +
11207 #: builtin/pack-objects.c
11208 #, c-format
11209 msgid ""
@@ -11492,10 +11528,10 @@ msgstr "枚舉物件"
11528 #, c-format
11529 msgid ""
11530 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
11495 -"reused %<PRIu32>"
11531 +"reused %<PRIu32> (from %<PRIuMAX>)"
11532 msgstr ""
11533 "總共 %<PRIu32> (差異 %<PRIu32>)，復用 %<PRIu32> (差異 %<PRIu32>)，重用包 "
11498 -"%<PRIu32>"
11534 +"%<PRIu32> (總共 %<PRIuMAX>)"
11535
11536 #: builtin/pack-redundant.c
11537 msgid ""
@@ -12574,7 +12610,7 @@ msgstr "沒有正在進行的重定基底？"
12610 msgid "The --edit-todo action can only be used during interactive rebase."
12611 msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。"
12612
12577 -#: builtin/rebase.c t/helper/test-fast-rebase.c
12613 +#: builtin/rebase.c
12614 msgid "Cannot read HEAD"
12615 msgstr "不能讀取 HEAD"
12616
@@ -12618,12 +12654,6 @@ msgstr ""
12654 msgid "switch `C' expects a numerical value"
12655 msgstr "開關 `C' 期望一個數字值"
12656
12621 -#: builtin/rebase.c
12622 -msgid ""
12623 -"apply options are incompatible with rebase.autoSquash. Consider adding --no-"
12624 -"autosquash"
12625 -msgstr "apply 選項與 rebase.autoSquash 不相容。請考慮加上 --no-autosquash"
12626 -
12657 #: builtin/rebase.c
12658 msgid ""
12659 "apply options are incompatible with rebase.rebaseMerges. Consider adding --"
@@ -13109,7 +13139,7 @@ msgid ""
13139 msgid_plural ""
13140 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
13141 "to delete them, use:"
13112 -msgstr[0] "注意：ref/remotes 層級之外的一個分支未被移除。要刪除它，使用："
13142 +msgstr[0] "注意：refs/remotes/ 層級之外的一個分支未被移除。要刪除它，使用："
13143
13144 #: builtin/remote.c
13145 #, c-format
@@ -13838,6 +13868,86 @@ msgstr "--convert-graft-file 不帶參數"
13868 msgid "only one pattern can be given with -l"
13869 msgstr "只能為 -l 提供一個模式"
13870
13871 +#: builtin/replay.c
13872 +msgid "need some commits to replay"
13873 +msgstr "需要一些提交才能重放"
13874 +
13875 +#: builtin/replay.c
13876 +msgid "--onto and --advance are incompatible"
13877 +msgstr "--onto 和 --advance 不相容"
13878 +
13879 +#: builtin/replay.c
13880 +msgid "all positive revisions given must be references"
13881 +msgstr "提供的所有正向修訂集必須為引用"
13882 +
13883 +#: builtin/replay.c
13884 +msgid "argument to --advance must be a reference"
13885 +msgstr "傳入 --advance 的引數必須為引用"
13886 +
13887 +#: builtin/replay.c
13888 +msgid ""
13889 +"cannot advance target with multiple sources because ordering would be ill-"
13890 +"defined"
13891 +msgstr "無法用多個來源演進目的地，以免無法確定排序"
13892 +
13893 +#: builtin/replay.c
13894 +msgid ""
13895 +"cannot implicitly determine whether this is an --advance or --onto operation"
13896 +msgstr "無法假設這是 --advance 還是 --onto 動作"
13897 +
13898 +#: builtin/replay.c
13899 +msgid ""
13900 +"cannot advance target with multiple source branches because ordering would "
13901 +"be ill-defined"
13902 +msgstr "無法由多個來源分支演進目的地，以免無法確定排序"
13903 +
13904 +#: builtin/replay.c
13905 +msgid "cannot implicitly determine correct base for --onto"
13906 +msgstr "無法假設 --onto 的正確基底"
13907 +
13908 +#: builtin/replay.c
13909 +msgid ""
13910 +"(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance "
13911 +"<branch>) <revision-range>..."
13912 +msgstr ""
13913 +"（實驗性功能！）git replay ([--contained] --onto <newbase> | --advance "
13914 +"<branch>) <revision-range>..."
13915 +
13916 +#: builtin/replay.c
13917 +msgid "make replay advance given branch"
13918 +msgstr "在指定分支上進行重放演進"
13919 +
13920 +#: builtin/replay.c
13921 +msgid "replay onto given commit"
13922 +msgstr "重放到指定提交"
13923 +
13924 +#: builtin/replay.c
13925 +msgid "advance all branches contained in revision-range"
13926 +msgstr "演進所有包含在 revision-range 中的分支"
13927 +
13928 +#: builtin/replay.c
13929 +msgid "option --onto or --advance is mandatory"
13930 +msgstr "必須傳入 --onto 或 --advance 選項"
13931 +
13932 +#: builtin/replay.c
13933 +#, c-format
13934 +msgid ""
13935 +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' "
13936 +"will be forced"
13937 +msgstr "將覆寫部分修訂版遍歷選項，強制使用 “struct rev_info” 的 “%s” 位元"
13938 +
13939 +#: builtin/replay.c
13940 +msgid "error preparing revisions"
13941 +msgstr "無法準備修訂集"
13942 +
13943 +#: builtin/replay.c
13944 +msgid "replaying down to root commit is not supported yet!"
13945 +msgstr "尚不支援重放到根提交！"
13946 +
13947 +#: builtin/replay.c
13948 +msgid "replaying merge commits is not supported yet!"
13949 +msgstr "尚不支援重放合併提交！"
13950 +
13951 #: builtin/rerere.c
13952 msgid ""
13953 "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"
@@ -14100,18 +14210,6 @@ msgstr "--prefix 需要 1 個引數"
14210 msgid "unknown mode for --abbrev-ref: %s"
14211 msgstr "--abbrev-ref 的模式未知：%s"
14212
14103 -#: builtin/rev-parse.c revision.c
14104 -msgid "--exclude-hidden cannot be used together with --branches"
14105 -msgstr "--exclude-hidden 無法與 --branches 同時使用"
14106 -
14107 -#: builtin/rev-parse.c revision.c
14108 -msgid "--exclude-hidden cannot be used together with --tags"
14109 -msgstr "--exclude-hidden 無法與 --tags 同時使用"
14110 -
14111 -#: builtin/rev-parse.c revision.c
14112 -msgid "--exclude-hidden cannot be used together with --remotes"
14113 -msgstr "--exclude-hidden 無法與 --remotes 同時使用"
14114 -
14213 #: builtin/rev-parse.c setup.c
14214 msgid "this operation must be run in a work tree"
14215 msgstr "該動作必須在一個工作區中執行"
@@ -14610,11 +14708,6 @@ msgstr "不列印結果到標準輸出（例如與 --verify 參數共用）"
14708 msgid "show refs from stdin that aren't in local repository"
14709 msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用"
14710
14613 -#: builtin/show-ref.c
14614 -#, c-format
14615 -msgid "only one of '%s', '%s' or '%s' can be given"
14616 -msgstr "只能傳入 “%s”、“%s” 或 “%s”"
14617 -
14711 #: builtin/sparse-checkout.c
14712 msgid ""
14713 "git sparse-checkout (init | list | set | add | reapply | disable | check-"
@@ -16389,14 +16482,14 @@ msgstr "沒有可能的來源分支，推測為 “--orphan”"
16482 #: builtin/worktree.c
16483 #, c-format
16484 msgid ""
16392 -"If you meant to create a worktree containing a new orphan branch\n"
16485 +"If you meant to create a worktree containing a new unborn branch\n"
16486 "(branch with no commits) for this repository, you can do so\n"
16487 "using the --orphan flag:\n"
16488 "\n"
16489 " git worktree add --orphan -b %s %s\n"
16490 msgstr ""
16491 "如果您是想要在這個版本庫建立一個工作區，裡面包含一個\n"
16399 -"孤立分支（即沒有提交的分支），可以使用 --orphan 達到\n"
16492 +"未誕生分支（即沒有提交的分支），可以使用 --orphan 達到\n"
16493 "這個效果：\n"
16494 "\n"
16495 " git worktree add --orphan -b %s %s\n"
@@ -16404,14 +16497,14 @@ msgstr ""
16497 #: builtin/worktree.c
16498 #, c-format
16499 msgid ""
16407 -"If you meant to create a worktree containing a new orphan branch\n"
16500 +"If you meant to create a worktree containing a new unborn branch\n"
16501 "(branch with no commits) for this repository, you can do so\n"
16502 "using the --orphan flag:\n"
16503 "\n"
16504 " git worktree add --orphan %s\n"
16505 msgstr ""
16506 "如果您是想要在這個版本庫建立一個工作區，裡面包含一個\n"
16414 -"孤立分支（即沒有提交的分支），可以使用 --orphan 達到\n"
16507 +"未誕生分支（即沒有提交的分支），可以使用 --orphan 達到\n"
16508 "這個效果：\n"
16509 "\n"
16510 " git worktree add --orphan %s\n"
@@ -16481,6 +16574,11 @@ msgstr "不能建立目錄 '%s'"
16574 msgid "initializing"
16575 msgstr "正在初始化"
16576
16577 +#: builtin/worktree.c
16578 +#, c-format
16579 +msgid "could not find created worktree '%s'"
16580 +msgstr "找不到建立的工作區「%s」"
16581 +
16582 #: builtin/worktree.c
16583 #, c-format
16584 msgid "Preparing worktree (new branch '%s')"
@@ -16525,11 +16623,6 @@ msgstr ""
16623 "即使有提供一個遠端，卻不存在本機或遠端引用，\n"
16624 "故停止。使用 “add -f” 先覆蓋或抓取遠端"
16625
16528 -#: builtin/worktree.c
16529 -#, c-format
16530 -msgid "'%s' and '%s' cannot be used together"
16531 -msgstr "無法同時使用 “%s” 和 “%s”"
16532 -
16626 #: builtin/worktree.c
16627 msgid "checkout <branch> even if already checked out in other worktree"
16628 msgstr "簽出 <分支>，即使已經被簽出到其它工作區"
@@ -16543,8 +16636,8 @@ msgid "create or reset a branch"
16636 msgstr "建立或重設一個分支"
16637
16638 #: builtin/worktree.c
16546 -msgid "create unborn/orphaned branch"
16547 -msgstr "建立尚無內容（孤立）的分支"
16639 +msgid "create unborn branch"
16640 +msgstr "建立未誕生分支"
16641
16642 #: builtin/worktree.c
16643 msgid "populate the new working tree"
@@ -16573,12 +16666,8 @@ msgstr "「%s」、「%s」和「%s」選項不得同時使用"
16666
16667 #: builtin/worktree.c
16668 #, c-format
16576 -msgid "options '%s', and '%s' cannot be used together"
16577 -msgstr "無法同時使用 “%s” 和 “%s” 選項"
16578 -
16579 -#: builtin/worktree.c
16580 -msgid "<commit-ish>"
16581 -msgstr "<提交指示元>"
16669 +msgid "option '%s' and commit-ish cannot be used together"
16670 +msgstr "“%s” 選項和提交號不得同時使用"
16671
16672 #: builtin/worktree.c
16673 msgid "added with --lock"
@@ -17366,6 +17455,10 @@ msgstr "打包版本庫中未打包物件"
17455 msgid "Create, list, delete refs to replace objects"
17456 msgstr "建立、列出、刪除物件取代引用"
17457
17458 +#: command-list.h
17459 +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too"
17460 +msgstr "實驗性功能：在新的基底重放提交，亦支援裸版本庫"
17461 +
17462 #: command-list.h
17463 msgid "Generates a summary of pending changes"
17464 msgstr "生成待定更改的摘要"
@@ -17683,6 +17776,37 @@ msgstr "用來管理大型 Git 版本庫的工具"
17776 msgid "commit-graph file is too small"
17777 msgstr "提交圖形檔案太小"
17778
17779 +#: commit-graph.c
17780 +msgid "commit-graph oid fanout chunk is wrong size"
17781 +msgstr "提交圖形 OID 扇出區塊大小有誤"
17782 +
17783 +#: commit-graph.c
17784 +msgid "commit-graph fanout values out of order"
17785 +msgstr "提交圖形扇出的數值失序"
17786 +
17787 +#: commit-graph.c
17788 +msgid "commit-graph OID lookup chunk is the wrong size"
17789 +msgstr "提交圖形 OID 查詢區塊的大小有誤"
17790 +
17791 +#: commit-graph.c
17792 +msgid "commit-graph commit data chunk is wrong size"
17793 +msgstr "提交圖形的提交資料區塊大小有誤"
17794 +
17795 +#: commit-graph.c
17796 +msgid "commit-graph generations chunk is wrong size"
17797 +msgstr "提交圖形的世代區塊大小有誤"
17798 +
17799 +#: commit-graph.c
17800 +msgid "commit-graph changed-path index chunk is too small"
17801 +msgstr "提交圖形的更動路徑索引區塊過小"
17802 +
17803 +#: commit-graph.c
17804 +#, c-format
17805 +msgid ""
17806 +"ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-"
17807 +"graph file"
17808 +msgstr "忽略提交圖形檔案中過小的更動路徑區塊 (%<PRIuMAX> < %<PRIuMAX>)"
17809 +
17810 #: commit-graph.c
17811 #, c-format
17812 msgid "commit-graph signature %X does not match signature %X"
@@ -17701,7 +17825,19 @@ msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"
17825 #: commit-graph.c
17826 #, c-format
17827 msgid "commit-graph file is too small to hold %u chunks"
17704 -msgstr "commit-graph 檔案不夠放置 %u 個區塊"
17828 +msgstr "提交圖形檔案不夠放置 %u 個區塊"
17829 +
17830 +#: commit-graph.c
17831 +msgid "commit-graph required OID fanout chunk missing or corrupted"
17832 +msgstr "提交圖形需要的 OID 扇出區塊遺失或損壞"
17833 +
17834 +#: commit-graph.c
17835 +msgid "commit-graph required OID lookup chunk missing or corrupted"
17836 +msgstr "提交圖形需要的 OID 查詢區塊遺失或損壞"
17837 +
17838 +#: commit-graph.c
17839 +msgid "commit-graph required commit data chunk missing or corrupted"
17840 +msgstr "提交圖形需要的提交資料區塊遺失或損壞"
17841
17842 #: commit-graph.c
17843 msgid "commit-graph has no base graphs chunk"
@@ -17720,10 +17856,14 @@ msgstr "提交圖形鏈不符合"
17856 msgid "commit count in base graph too high: %<PRIuMAX>"
17857 msgstr "基礎圖 (base graph) 中的提交數過多：%<PRIuMAX>"
17858
17859 +#: commit-graph.c
17860 +msgid "commit-graph chain file too small"
17861 +msgstr "提交圖形鏈檔案過小"
17862 +
17863 #: commit-graph.c
17864 #, c-format
17865 msgid "invalid commit-graph chain: line '%s' not a hash"
17726 -msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"
17866 +msgstr "無效的提交圖形鏈：「%s」列不是雜湊值"
17867
17868 #: commit-graph.c
17869 msgid "unable to find all commit-graph files"
@@ -17746,6 +17886,10 @@ msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料"
17886 msgid "commit-graph overflow generation data is too small"
17887 msgstr "提交圖形的溢出世代資料過小"
17888
17889 +#: commit-graph.c
17890 +msgid "commit-graph extra-edges pointer out of bounds"
17891 +msgstr "提交圖形的延伸邊界指針超出範圍"
17892 +
17893 #: commit-graph.c
17894 msgid "Loading known commits in commit graph"
17895 msgstr "正在載入提交圖中的已知提交"
@@ -19120,6 +19264,11 @@ msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模
19264 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
19265 msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"
19266
19267 +#: diff.c transport.c
19268 +#, c-format
19269 +msgid "unknown value for config '%s': %s"
19270 +msgstr "設定 '%s' 的取值未知：%s"
19271 +
19272 #: diff.c
19273 #, c-format
19274 msgid ""
@@ -19213,13 +19362,6 @@ msgstr "壞的 --color-moved 參數：%s"
19362 msgid "invalid mode '%s' in --color-moved-ws"
19363 msgstr "--color-moved-ws 中的無效模式 '%s'"
19364
19216 -#: diff.c
19217 -msgid ""
19218 -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
19219 -"\"histogram\""
19220 -msgstr ""
19221 -"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
19222 -
19365 #: diff.c
19366 #, c-format
19367 msgid "invalid argument to %s"
@@ -19277,8 +19419,9 @@ msgid "output only the last line of --stat"
19419 msgstr "只輸出 --stat 的最後一行"
19420
19421 #: diff.c
19280 -msgid "<param1,param2>..."
19281 -msgstr "<參數1,參數2>..."
19422 +#| msgid "<param1,param2>..."
19423 +msgid "<param1>,<param2>..."
19424 +msgstr "<param1>,<param2>..."
19425
19426 #: diff.c
19427 msgid ""
@@ -19290,8 +19433,8 @@ msgid "synonym for --dirstat=cumulative"
19433 msgstr "和 --dirstat=cumulative 同義"
19434
19435 #: diff.c
19293 -msgid "synonym for --dirstat=files,param1,param2..."
19294 -msgstr "是 --dirstat=files,param1,param2... 的同義詞"
19436 +msgid "synonym for --dirstat=files,<param1>,<param2>..."
19437 +msgstr "是 --dirstat=files,<param1>,<param2>... 的同義詞"
19438
19439 #: diff.c
19440 msgid "warn if changes introduce conflict markers or whitespace errors"
@@ -19513,14 +19656,6 @@ msgstr "使用 \"patience diff\" 演算法生成差異"
19656 msgid "generate diff using the \"histogram diff\" algorithm"
19657 msgstr "使用 \"histogram diff\" 演算法生成差異"
19658
19516 -#: diff.c
19517 -msgid "<algorithm>"
19518 -msgstr "<演算法>"
19519 -
19520 -#: diff.c
19521 -msgid "choose a diff algorithm"
19522 -msgstr "選擇一個差異演算法"
19523 -
19659 #: diff.c
19660 msgid "<text>"
19661 msgstr "<文字>"
@@ -20940,7 +21075,7 @@ msgstr ""
21075 #. conflict in a submodule. The first argument is the submodule
21076 #. name, and the second argument is the abbreviated id of the
21077 #. commit that needs to be merged. For example:
20943 -#. - go to submodule (mysubmodule), and either merge commit abc1234"
21078 +#. - go to submodule (mysubmodule), and either merge commit abc1234"
21079 #.
21080 #: merge-ort.c
21081 #, c-format
@@ -21274,6 +21409,12 @@ msgstr "讀取快取失敗"
21409 msgid "multi-pack-index OID fanout is of the wrong size"
21410 msgstr "多包索引的物件 ID fanout 大小錯誤"
21411
21412 +#: midx.c
21413 +#, c-format
21414 +msgid ""
21415 +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
21416 +msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
21417 +
21418 #: midx.c
21419 msgid "multi-pack-index OID lookup chunk is the wrong size"
21420 msgstr "多包索引 OID 查詢區塊的大小有誤"
@@ -21332,6 +21473,15 @@ msgstr "多包索引包名無序：'%s' 在 '%s' 之前"
21473 msgid "bad pack-int-id: %u (%u total packs)"
21474 msgstr "錯的 pack-int-id：%u（共有 %u 個包）"
21475
21476 +#: midx.c
21477 +msgid "MIDX does not contain the BTMP chunk"
21478 +msgstr "MIDX 未包含 BTMP 區塊"
21479 +
21480 +#: midx.c
21481 +#, c-format
21482 +msgid "could not load bitmapped pack %<PRIu32>"
21483 +msgstr "無法載入位圖化 (bitmapped) 的封裝 %<PRIu32>"
21484 +
21485 #: midx.c
21486 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
21487 msgstr "多包索引儲存一個64位位移，但是 off_t 太小"
@@ -21439,12 +21589,6 @@ msgstr "總和檢查碼不正確"
21589 msgid "Looking for referenced packfiles"
21590 msgstr "正在尋找引用的 packfile"
21591
21442 -#: midx.c
21443 -#, c-format
21444 -msgid ""
21445 -"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
21446 -msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
21447 -
21592 #: midx.c
21593 msgid "the midx contains no oid"
21594 msgstr "midx 沒有 oid"
@@ -21820,7 +21964,7 @@ msgstr "%s [無效物件]"
21964 #. TRANSLATORS: This is a line of ambiguous commit
21965 #. object output. E.g.:
21966 #. *
21823 -#. "deadbeef commit 2021-01-01 - Some Commit Message"
21967 +#. "deadbeef commit 2021-01-01 - Some Commit Message"
21968 #.
21969 #: object-name.c
21970 #, c-format
@@ -21830,7 +21974,7 @@ msgstr "%s 提交 %s - %s"
21974 #. TRANSLATORS: This is a line of ambiguous
21975 #. tag object output. E.g.:
21976 #. *
21833 -#. "deadbeef tag 2022-01-01 - Some Tag Message"
21977 +#. "deadbeef tag 2022-01-01 - Some Tag Message"
21978 #. *
21979 #. The second argument is the YYYY-MM-DD found
21980 #. in the tag.
@@ -21847,7 +21991,7 @@ msgstr "%s 標籤 %s - %s"
21991 #. tag object output where we couldn't parse
21992 #. the tag itself. E.g.:
21993 #. *
21850 -#. "deadbeef [bad tag, could not parse it]"
21994 +#. "deadbeef [bad tag, could not parse it]"
21995 #.
21996 #: object-name.c
21997 #, c-format
@@ -22075,6 +22219,10 @@ msgstr "多包位圖缺少需要的反向索引"
22219 msgid "could not open pack %s"
22220 msgstr "無法開啟封包 %s"
22221
22222 +#: pack-bitmap.c t/helper/test-read-midx.c
22223 +msgid "could not determine MIDX preferred pack"
22224 +msgstr "無法確定 MIDX 偏好的封裝"
22225 +
22226 #: pack-bitmap.c
22227 #, c-format
22228 msgid "preferred pack (%s) is invalid"
@@ -22098,6 +22246,11 @@ msgstr "位圖查詢表損壞：提交索引 %u 超出範圍"
22246 msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\""
22247 msgstr "ewah 位圖損壞：提交 “%s” 之位圖的標頭遭截斷"
22248
22249 +#: pack-bitmap.c
22250 +#, c-format
22251 +msgid "unable to load pack: '%s', disabling pack-reuse"
22252 +msgstr "無法載入「%s」封裝，停用 pack-reuse"
22253 +
22254 #: pack-bitmap.c
22255 #, c-format
22256 msgid "object '%s' not found in type bitmaps"
@@ -22213,6 +22366,10 @@ msgstr "%<PRIu64> 位置的修訂版索引 (rev-index) 無效：%<PRIu32> != %<P
22366 msgid "multi-pack-index reverse-index chunk is the wrong size"
22367 msgstr "多包索引的反向索引區塊大小有誤"
22368
22369 +#: pack-revindex.c
22370 +msgid "could not determine preferred pack"
22371 +msgstr "無法確定偏好封裝"
22372 +
22373 #: pack-write.c
22374 msgid "cannot both write and verify reverse index"
22375 msgstr "無法同時寫入和驗證倒排索引"
@@ -22291,11 +22448,6 @@ msgstr "%s 不可用"
22448 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
22449 msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴"
22450
22294 -#: parse-options.c
22295 -#, c-format
22296 -msgid "%s is incompatible with %s"
22297 -msgstr "%s 與 %s 不相容"
22298 -
22451 #: parse-options.c
22452 #, c-format
22453 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
@@ -22685,11 +22837,6 @@ msgstr "無法索引檔案 '%s'"
22837 msgid "unable to add '%s' to index"
22838 msgstr "無法在索引中新增 '%s'"
22839
22688 -#: read-cache.c
22689 -#, c-format
22690 -msgid "unable to stat '%s'"
22691 -msgstr "無法對 %s 執行 stat"
22692 -
22840 #: read-cache.c
22841 #, c-format
22842 msgid "'%s' appears as both a file and as a directory"
@@ -23364,17 +23511,12 @@ msgstr "'%s' 已存在，無法建立 '%s'"
23511 msgid "cannot process '%s' and '%s' at the same time"
23512 msgstr "無法同時處理 '%s' 和 '%s'"
23513
23367 -#: refs/files-backend.c
23368 -#, c-format
23369 -msgid "could not remove reference %s"
23370 -msgstr "無法刪除引用 %s"
23371 -
23372 -#: refs/files-backend.c refs/packed-backend.c
23514 +#: refs.c
23515 #, c-format
23516 msgid "could not delete reference %s: %s"
23517 msgstr "無法刪除引用 %s：%s"
23518
23377 -#: refs/files-backend.c refs/packed-backend.c
23519 +#: refs.c
23520 #, c-format
23521 msgid "could not delete references: %s"
23522 msgstr "無法刪除引用：%s"
@@ -24532,7 +24674,7 @@ msgstr "無效的作者身分 '%s'"
24674 msgid "corrupt author: missing date information"
24675 msgstr "作者資訊損壞：缺少日期資訊"
24676
24535 -#: sequencer.c t/helper/test-fast-rebase.c
24677 +#: sequencer.c
24678 #, c-format
24679 msgid "could not update %s"
24680 msgstr "不能更新 %s"
@@ -25023,6 +25165,10 @@ msgstr "因套用自動貯存而導致衝突。"
25165 msgid "Autostash exists; creating a new stash entry."
25166 msgstr "已有自動貯存；建立新貯存項目。"
25167
25168 +#: sequencer.c
25169 +msgid "autostash reference is a symref"
25170 +msgstr "autostash 引用是符號引用"
25171 +
25172 #: sequencer.c
25173 msgid "could not detach HEAD"
25174 msgstr "不能分離開頭指標"
@@ -25395,6 +25541,11 @@ msgstr "沒有從 '%s' 複製範本：%s"
25541 msgid "invalid initial branch name: '%s'"
25542 msgstr "無效的初始分支名稱：'%s'"
25543
25544 +#: setup.c
25545 +#, c-format
25546 +msgid "re-init: ignored --initial-branch=%s"
25547 +msgstr "re-init: 忽略 --initial-branch=%s"
25548 +
25549 #: setup.c
25550 #, c-format
25551 msgid "unable to handle file type %d"
@@ -25410,14 +25561,14 @@ msgid "attempt to reinitialize repository with different hash"
25561 msgstr "嘗試以不同的雜湊值重新初始化版本庫"
25562
25563 #: setup.c
25413 -#, c-format
25414 -msgid "%s already exists"
25415 -msgstr "%s 已經存在"
25564 +msgid ""
25565 +"attempt to reinitialize repository with different reference storage format"
25566 +msgstr "嘗試以不同的引用儲存格式重新初始化版本庫"
25567
25568 #: setup.c
25569 #, c-format
25419 -msgid "re-init: ignored --initial-branch=%s"
25420 -msgstr "re-init: 忽略 --initial-branch=%s"
25570 +msgid "%s already exists"
25571 +msgstr "%s 已經存在"
25572
25573 #: setup.c
25574 #, c-format
@@ -25733,14 +25884,6 @@ msgstr "每次迭代前清除快取樹狀物件"
25884 msgid "number of entries in the cache tree to invalidate (default 0)"
25885 msgstr "在快取樹狀物件中，要使失效的項目數量（預設值為 0）"
25886
25736 -#: t/helper/test-fast-rebase.c
25737 -msgid "unhandled options"
25738 -msgstr "未處理選項"
25739 -
25740 -#: t/helper/test-fast-rebase.c
25741 -msgid "error preparing revisions"
25742 -msgstr "準備修訂版本時發生錯誤"
25743 -
25887 #: t/helper/test-reach.c
25888 #, c-format
25889 msgid "commit %s is not marked reachable"
@@ -25934,10 +26077,6 @@ msgstr "協定不支援設定遠端服務路徑"
26077 msgid "invalid remote service path"
26078 msgstr "無效的遠端服務路徑"
26079
25937 -#: transport-helper.c transport.c
25938 -msgid "operation not supported by protocol"
25939 -msgstr "協定不支援該動作"
25940 -
26080 #: transport-helper.c
26081 #, c-format
26082 msgid "can't connect to subservice %s"
@@ -26101,11 +26240,6 @@ msgstr "不能解析 transport.color.* 設定"
26240 msgid "support for protocol v2 not implemented yet"
26241 msgstr "協定 v2 的支援尚未實現"
26242
26104 -#: transport.c
26105 -#, c-format
26106 -msgid "unknown value for config '%s': %s"
26107 -msgstr "設定 '%s' 的取值未知：%s"
26108 -
26243 #: transport.c
26244 #, c-format
26245 msgid "transport '%s' not allowed"
@@ -26165,6 +26299,10 @@ msgstr "通訊協定不支援 bundle-uri 動作"
26299 msgid "could not retrieve server-advertised bundle-uri list"
26300 msgstr "無法取得伺服器公佈的 bundle-uri 清單"
26301
26302 +#: transport.c
26303 +msgid "operation not supported by protocol"
26304 +msgstr "協定不支援該動作"
26305 +
26306 #: tree-walk.c
26307 msgid "too-short tree object"
26308 msgstr "太短的樹狀物件"
@@ -27193,6 +27331,11 @@ msgstr "另外，您的索引中包含未提交的變更。"
27331 msgid "cannot %s: Your index contains uncommitted changes."
27332 msgstr "不能%s：您的索引中包含未提交的變更。"
27333
27334 +#: xdiff-interface.c
27335 +#, c-format
27336 +msgid "unknown style '%s' given for '%s'"
27337 +msgstr "給予「%2$s」的「%1$s」樣式未知"
27338 +
27339 #: git-merge-octopus.sh git-merge-resolve.sh
27340 msgid ""
27341 "Error: Your local changes to the following files would be overwritten by "
@@ -27649,3 +27792,55 @@ msgstr "略過 %s 含備份後綴 '%s'。\n"
27792 #, perl-format
27793 msgid "Do you really want to send %s? [y|N]: "
27794 msgstr "您真的要傳送 %s？[y|N]： "
27795 +
27796 +#~ msgid "-x and -X cannot be used together"
27797 +#~ msgstr "-x 和 -X 不能同時使用"
27798 +
27799 +#~ msgid ""
27800 +#~ "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-"
27801 +#~ "exclude"
27802 +#~ msgstr ""
27803 +#~ "--bundle-uri 與 --depth、--shallow-since 和 --shallow-exclude 不相容"
27804 +
27805 +#~ msgid "--merge-base is incompatible with --stdin"
27806 +#~ msgstr "--merge-base 與 --stdin 不相容"
27807 +
27808 +#~ msgid ""
27809 +#~ "apply options are incompatible with rebase.autoSquash. Consider adding --"
27810 +#~ "no-autosquash"
27811 +#~ msgstr "apply 選項與 rebase.autoSquash 不相容。請考慮加上 --no-autosquash"
27812 +
27813 +#~ msgid "--exclude-hidden cannot be used together with --branches"
27814 +#~ msgstr "--exclude-hidden 無法與 --branches 同時使用"
27815 +
27816 +#~ msgid "--exclude-hidden cannot be used together with --tags"
27817 +#~ msgstr "--exclude-hidden 無法與 --tags 同時使用"
27818 +
27819 +#~ msgid "--exclude-hidden cannot be used together with --remotes"
27820 +#~ msgstr "--exclude-hidden 無法與 --remotes 同時使用"
27821 +
27822 +#, c-format
27823 +#~ msgid "only one of '%s', '%s' or '%s' can be given"
27824 +#~ msgstr "只能傳入 “%s”、“%s” 或 “%s”"
27825 +
27826 +#, c-format
27827 +#~ msgid "'%s' and '%s' cannot be used together"
27828 +#~ msgstr "無法同時使用 “%s” 和 “%s”"
27829 +
27830 +#, c-format
27831 +#~ msgid "options '%s', and '%s' cannot be used together"
27832 +#~ msgstr "無法同時使用 “%s” 和 “%s” 選項"
27833 +
27834 +#~ msgid "<commit-ish>"
27835 +#~ msgstr "<提交指示元>"
27836 +
27837 +#, c-format
27838 +#~ msgid "%s is incompatible with %s"
27839 +#~ msgstr "%s 與 %s 不相容"
27840 +
27841 +#, c-format
27842 +#~ msgid "could not remove reference %s"
27843 +#~ msgstr "無法刪除引用 %s"
27844 +
27845 +#~ msgid "unhandled options"
27846 +#~ msgstr "未處理選項"