l10n: zh_TW.po: update Git 2.53 translation
Co-authored-by: Lumynous <lumynou5.tw@gmail.com> Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
Yi-Jyun Pan committed
Jan 28, 2026 at 22:45 UTC
b47610d61d3b55888c790a8d2a191afec83ba05e
1 file changed
+348
-720
po/zh_TW.po
+348
-720
@@ -19,9 +19,9 @@
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, 2024, 2025.
22
+# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023, 2024, 2025, 2026.
23
# Kaiyang Wu <self@origincode.me>, 2022.
24
-# Lumynous <lumynou5.tw@gmail.com>, 2023, 2024, 2025.
24
+# Lumynous <lumynou5.tw@gmail.com>, 2023, 2024, 2025, 2026.
25
# Kisaragi Hiu <mail@kisaragi-hiu.com>, 2024.
26
# Ngoo Ka-iu <willy04wu69@gmail.com>, 2024.
27
# Nightfeather Chen <slat@nightfeather.me>, 2024.
@@ -30,9 +30,9 @@ msgid ""
30
msgstr ""
31
"Project-Id-Version: Git\n"
32
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
33
-"POT-Creation-Date: 2025-11-12 20:14+0800\n"
34
-"PO-Revision-Date: 2025-11-15 10:02+0000\n"
35
-"Last-Translator: Lumynous <lumynou5.tw@gmail.com>\n"
33
+"POT-Creation-Date: 2026-01-28 22:23+0800\n"
34
+"PO-Revision-Date: 2026-01-28 22:42+0800\n"
35
+"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
36
"Language-Team: Chinese (Traditional Han script) <https://weblate.slat.org/"
37
"projects/git-po/git-cli/zh_Hant/>\n"
38
"Language: zh_TW\n"
@@ -40,9 +40,9 @@ msgstr ""
40
"Content-Type: text/plain; charset=UTF-8\n"
41
"Content-Transfer-Encoding: 8bit\n"
42
"Plural-Forms: nplurals=1; plural=0;\n"
43
-"X-Generator: Weblate 5.13.2\n"
44
-"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | "
45
-"https://zhconvert.org\n"
43
+"X-Generator: Poedit 3.8\n"
44
+"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
45
+"zhconvert.org\n"
46
47
#: add-interactive.c
48
#, c-format
@@ -962,9 +962,9 @@ msgstr "無法辨識空白字元忽略選項「%s」"
962
#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
963
#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
964
#: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c
965
-#: builtin/replay.c builtin/reset.c builtin/rev-parse.c builtin/show-branch.c
966
-#: builtin/stash.c builtin/submodule--helper.c builtin/tag.c builtin/worktree.c
967
-#: parse-options.c range-diff.c revision.c
965
+#: builtin/reset.c builtin/rev-parse.c builtin/show-branch.c builtin/stash.c
966
+#: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c
967
+#: range-diff.c revision.c
968
#, c-format
969
msgid "options '%s' and '%s' cannot be used together"
970
msgstr "無法同時使用「%s」和「%s」選項"
@@ -2106,8 +2106,8 @@ msgid "'%s' is not a valid branch name"
2106
msgstr "「%s」不是有效的分支名稱"
2107
2108
#: branch.c builtin/branch.c
2109
-msgid "See `man git check-ref-format`"
2110
-msgstr "請參閱「man git check-ref-format」"
2109
+msgid "See 'git help check-ref-format'"
2110
+msgstr "請參閱「git help check-ref-format」"
2111
2112
#: branch.c
2113
#, c-format
@@ -3228,6 +3228,18 @@ msgstr "預期是個顏色：%s"
3228
msgid "must end with a color"
3229
msgstr "結尾必須是一個顏色"
3230
3231
+#: builtin/blame.c diff.c merge-ort.c transport.c
3232
+#, c-format
3233
+msgid "unknown value for config '%s': %s"
3234
+msgstr "設定 '%s' 的取值未知：%s"
3235
+
3236
+#: builtin/blame.c builtin/merge-file.c diff.c
3237
+msgid ""
3238
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3239
+"\"histogram\""
3240
+msgstr ""
3241
+"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3242
+
3243
#: builtin/blame.c
3244
#, c-format
3245
msgid "cannot find revision %s to ignore"
@@ -3299,6 +3311,14 @@ msgstr "顯示作者信箱而非名稱（預設值：off）"
3311
msgid "ignore whitespace differences"
3312
msgstr "忽略空白差異"
3313
3314
+#: builtin/blame.c builtin/merge-file.c diff.c
3315
+msgid "<algorithm>"
3316
+msgstr "<演算法>"
3317
+
3318
+#: builtin/blame.c builtin/merge-file.c diff.c
3319
+msgid "choose a diff algorithm"
3320
+msgstr "選擇一個差異演算法"
3321
+
3322
#: builtin/blame.c builtin/clone.c builtin/log.c
3323
msgid "rev"
3324
msgstr "rev"
@@ -3320,8 +3340,8 @@ msgid "color lines by age"
3340
msgstr "根據時間著色"
3341
3342
#: builtin/blame.c
3323
-msgid "spend extra cycles to find better match"
3324
-msgstr "循環更多次來找到更佳符合項目"
3343
+msgid "spend extra cycles to find a better match"
3344
+msgstr "多跑幾輪來找到更符合的項目"
3345
3346
#: builtin/blame.c
3347
msgid "use revisions from <file> instead of calling git-rev-list"
@@ -3868,7 +3888,7 @@ msgstr ""
3888
"您可刪除任何您不想分享的地方。\n"
3889
3890
#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c
3871
-#: builtin/pack-objects.c builtin/rebase.c parse-options.h
3891
+#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c parse-options.h
3892
msgid "mode"
3893
msgstr "mode"
3894
@@ -4779,10 +4799,10 @@ msgstr "--track 需要分支名稱"
4799
msgid "missing branch name; try -%c"
4800
msgstr "缺少分支名稱；請嘗試 -%c"
4801
4782
-#: builtin/checkout.c
4802
+#: builtin/checkout.c sequencer.c
4803
#, c-format
4784
-msgid "could not resolve %s"
4785
-msgstr "無法解析 %s"
4804
+msgid "could not resolve '%s'"
4805
+msgstr "無法解析「%s」"
4806
4807
#: builtin/checkout.c
4808
msgid "invalid path specification"
@@ -6617,10 +6637,18 @@ msgstr "--append 無法和 --value=<模式> 一起使用"
6637
#, c-format
6638
msgid ""
6639
"cannot overwrite multiple values with a single value\n"
6620
-" Use a regexp, --add or --replace-all to change %s."
6640
+" Use --value=<pattern>, --append or --all to change %s."
6641
msgstr ""
6642
"無法用一個值覆蓋多個值\n"
6623
-" 使用一個常規表示式、--add 或 --replace-all 來修改 %s。"
6643
+" 使用 --value=<pattern>、--append 或 --all 來變更 %s。"
6644
+
6645
+#: builtin/config.c
6646
+msgid "unset all multi-valued config options"
6647
+msgstr "取消設定所有多值組態選項"
6648
+
6649
+#: builtin/config.c
6650
+msgid "unset multi-valued config options with matching values"
6651
+msgstr "取消設定其值相符的多值組態選項"
6652
6653
#: builtin/config.c
6654
#, c-format
@@ -6730,6 +6758,15 @@ msgstr "--default 僅適用於 --get"
6758
msgid "--comment is only applicable to add/set/replace operations"
6759
msgstr "--comment 只能用於加入、設定和取代動作"
6760
6761
+#: builtin/config.c
6762
+#, c-format
6763
+msgid ""
6764
+"cannot overwrite multiple values with a single value\n"
6765
+" Use a regexp, --add or --replace-all to change %s."
6766
+msgstr ""
6767
+"無法用一個值覆蓋多個值\n"
6768
+" 使用一個常規表示式、--add 或 --replace-all 來修改 %s。"
6769
+
6770
#: builtin/count-objects.c
6771
msgid "print sizes in human readable format"
6772
msgstr "以使用者可讀的格式顯示大小"
@@ -7234,11 +7271,6 @@ msgid ""
7271
msgstr ""
7272
"發現提交特定的編碼 %.*s 在 %s 提交當中；使用 --reencode=[yes|no] 來處理"
7273
7237
-#: builtin/fast-export.c
7238
-#, c-format
7239
-msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it"
7240
-msgstr "發現已簽署的提交 %s；使用 --signed-commits=<mode> 來處理"
7241
-
7274
#: builtin/fast-export.c
7275
#, c-format
7276
msgid "exporting %<PRIuMAX> signature(s) for commit %s"
@@ -7249,6 +7281,19 @@ msgstr "匯出提交 %2$s 的 %1$<PRIuMAX> 個簽章"
7281
msgid "stripping signature(s) from commit %s"
7282
msgstr "去除提交 %s 的簽章"
7283
7284
+#: builtin/fast-export.c
7285
+#, c-format
7286
+msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it"
7287
+msgstr "發現已簽署的提交 %s；使用 --signed-commits=<mode> 來處理"
7288
+
7289
+#: builtin/fast-export.c
7290
+msgid ""
7291
+"'strip-if-invalid' is not a valid mode for git fast-export with --signed-"
7292
+"commits=<mode>"
7293
+msgstr ""
7294
+"「strip-if-invalid」不是搭配 --signed-commits=<mode> 使用 git fast-export 的"
7295
+"有效模式"
7296
+
7297
#: builtin/fast-export.c
7298
#, c-format
7299
msgid ""
@@ -7263,11 +7308,6 @@ msgstr ""
7308
msgid "could not read tag %s"
7309
msgstr "無法讀取標籤 %s"
7310
7266
-#: builtin/fast-export.c
7267
-#, c-format
7268
-msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it"
7269
-msgstr "發現已簽署的標籤 %s；使用 --signed-tags=<mode> 來處理"
7270
-
7311
#: builtin/fast-export.c
7312
#, c-format
7313
msgid "exporting signed tag %s"
@@ -7278,6 +7318,19 @@ msgstr "匯出已簽署的標籤 %s"
7318
msgid "stripping signature from tag %s"
7319
msgstr "去除標籤 %s 的簽章"
7320
7321
+#: builtin/fast-export.c
7322
+#, c-format
7323
+msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it"
7324
+msgstr "發現已簽署的標籤 %s；使用 --signed-tags=<mode> 來處理"
7325
+
7326
+#: builtin/fast-export.c
7327
+msgid ""
7328
+"'strip-if-invalid' is not a valid mode for git fast-export with --signed-"
7329
+"tags=<mode>"
7330
+msgstr ""
7331
+"「strip-if-invalid」不是搭配 --signed-tags=<mode> 使用 git fast-export 的有效"
7332
+"模式"
7333
+
7334
#: builtin/fast-export.c
7335
#, c-format
7336
msgid ""
@@ -7769,6 +7822,37 @@ msgstr "找到多個 %s 簽章，忽略多餘的簽章"
7822
msgid "parse_one_signature() returned unknown hash algo"
7823
msgstr "parse_one_signature() 回傳了未知的雜湊演算法"
7824
7825
+#: builtin/fast-import.c builtin/fsck.c
7826
+msgid "unknown"
7827
+msgstr "未知"
7828
+
7829
+#: builtin/fast-import.c
7830
+#, c-format
7831
+msgid ""
7832
+"stripping invalid signature for commit '%.100s...'\n"
7833
+" allegedly by %s"
7834
+msgstr ""
7835
+"正在去除提交「%.100s...」的無效簽章\n"
7836
+" 據稱由 %s 所簽"
7837
+
7838
+#: builtin/fast-import.c
7839
+#, c-format
7840
+msgid ""
7841
+"stripping invalid signature for commit '%.*s'\n"
7842
+" allegedly by %s"
7843
+msgstr ""
7844
+"正在去除去除「%.*s..」的無效簽章\n"
7845
+" 據稱由 %s 所簽"
7846
+
7847
+#: builtin/fast-import.c
7848
+#, c-format
7849
+msgid ""
7850
+"stripping invalid signature for commit\n"
7851
+" allegedly by %s"
7852
+msgstr ""
7853
+"正在去除提交的無效簽章\n"
7854
+" 據稱由 %s 所簽"
7855
+
7856
#: builtin/fast-import.c
7857
msgid "expected committer but didn't get one"
7858
msgstr "預期有提交者，卻沒收到"
@@ -7785,10 +7869,6 @@ msgstr "去除提交簽章"
7869
msgid "importing a commit signature verbatim"
7870
msgstr "按原樣匯入提交簽章"
7871
7788
-#: builtin/fast-import.c
7789
-msgid "encountered signed tag; use --signed-tags=<mode> to handle it"
7790
-msgstr "發現已簽署的標籤；使用 --signed-tags=<mode> 來處理"
7791
-
7872
#: builtin/fast-import.c
7873
#, c-format
7874
msgid "importing a tag signature verbatim for tag '%s'"
@@ -7799,6 +7879,18 @@ msgstr "按原樣匯入標籤「%s」的簽章"
7879
msgid "stripping a tag signature for tag '%s'"
7880
msgstr "去除標籤「%s」的簽章"
7881
7882
+#: builtin/fast-import.c
7883
+msgid "encountered signed tag; use --signed-tags=<mode> to handle it"
7884
+msgstr "發現已簽署的標籤；使用 --signed-tags=<mode> 來處理"
7885
+
7886
+#: builtin/fast-import.c
7887
+msgid ""
7888
+"'strip-if-invalid' is not a valid mode for git fast-import with --signed-"
7889
+"tags=<mode>"
7890
+msgstr ""
7891
+"「strip-if-invalid」不是搭配 --signed-tags=<mode> 使用 git fast-import 的有效"
7892
+"模式"
7893
+
7894
#: builtin/fast-import.c
7895
#, c-format
7896
msgid "expected 'from' command, got '%s'"
@@ -7997,8 +8089,8 @@ msgid "git fetch [<options>] <group>"
8089
msgstr "git fetch [<選項>] <組>"
8090
8091
#: builtin/fetch.c
8000
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
8001
-msgstr "git fetch --multiple [<選項>] [(<版本庫> | <組>)...]"
8092
+msgid "git fetch --multiple [<options>] [(<repository>|<group>)...]"
8093
+msgstr "git fetch --multiple [<options>] [(<repository>|<group>)...]"
8094
8095
#: builtin/fetch.c
8096
msgid "git fetch --all [<options>]"
@@ -8574,10 +8666,6 @@ msgstr "缺少 --config=<設定>"
8666
msgid "got bad config --config=%s"
8667
msgstr "收到無效的組態 --config=%s"
8668
8577
-#: builtin/fsck.c
8578
-msgid "unknown"
8579
-msgstr "未知"
8580
-
8669
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
8670
#: builtin/fsck.c
8671
#, c-format
@@ -8696,6 +8784,11 @@ msgstr "%s：無效的 sha1 指標 %s"
8784
msgid "%s: not a commit"
8785
msgstr "%s：不是一個提交"
8786
8787
+#: builtin/fsck.c
8788
+#, c-format
8789
+msgid "invalid parameter: expected sha1, got '%s'"
8790
+msgstr "無效的參數：期望 sha1，得到 '%s'"
8791
+
8792
#: builtin/fsck.c
8793
msgid "notice: No default references"
8794
msgstr "注意：無預設引用"
@@ -8728,31 +8821,6 @@ msgstr "正在檢查物件目錄"
8821
msgid "Checking object directories"
8822
msgstr "正在檢查物件目錄"
8823
8731
-#: builtin/fsck.c
8732
-#, c-format
8733
-msgid "Checking %s link"
8734
-msgstr "正在檢查 %s 連結"
8735
-
8736
-#: builtin/fsck.c builtin/index-pack.c
8737
-#, c-format
8738
-msgid "invalid %s"
8739
-msgstr "無效的 %s"
8740
-
8741
-#: builtin/fsck.c
8742
-#, c-format
8743
-msgid "%s points to something strange (%s)"
8744
-msgstr "%s 指向奇怪的東西（%s）"
8745
-
8746
-#: builtin/fsck.c
8747
-#, c-format
8748
-msgid "%s: detached HEAD points at nothing"
8749
-msgstr "%s：分離開頭指標的指向不存在"
8750
-
8751
-#: builtin/fsck.c
8752
-#, c-format
8753
-msgid "notice: %s points to an unborn branch (%s)"
8754
-msgstr "注意：%s 指向一個尚未誕生的分支（%s）"
8755
-
8824
#: builtin/fsck.c
8825
#, c-format
8826
msgid "Checking cache tree of %s"
@@ -8854,16 +8922,6 @@ msgstr "正在檢查資料庫一致性"
8922
msgid "Checking objects"
8923
msgstr "正在檢查物件"
8924
8857
-#: builtin/fsck.c
8858
-#, c-format
8859
-msgid "%s: object missing"
8860
-msgstr "%s：物件缺少"
8861
-
8862
-#: builtin/fsck.c
8863
-#, c-format
8864
-msgid "invalid parameter: expected sha1, got '%s'"
8865
-msgstr "無效的參數：期望 sha1，得到 '%s'"
8866
-
8925
#: builtin/fsmonitor--daemon.c
8926
msgid "git fsmonitor--daemon start [<options>]"
8927
msgstr "git fsmonitor--daemon start [<options>]"
@@ -9335,6 +9393,10 @@ msgstr "無法設定維護排程"
9393
msgid "failed to add repo to global config"
9394
msgstr "無法將版本庫加至全域設定"
9395
9396
+#: builtin/gc.c
9397
+msgid "check a specific task"
9398
+msgstr "檢查指定作業"
9399
+
9400
#: builtin/gc.c
9401
msgid "git maintenance <subcommand> [<options>]"
9402
msgstr "git maintenance <子命令> [<選項>]"
@@ -9908,6 +9970,11 @@ msgstr "無效的資料物件 %s"
9970
msgid "fsck error in packed object"
9971
msgstr "對打包物件 fsck 檢查發生錯誤"
9972
9973
+#: builtin/index-pack.c
9974
+#, c-format
9975
+msgid "invalid %s"
9976
+msgstr "無效的 %s"
9977
+
9978
#: builtin/index-pack.c
9979
#, c-format
9980
msgid "Not all child objects of %s are reachable"
@@ -10079,6 +10146,10 @@ msgstr "--stdin 需要一個 git 版本庫"
10146
msgid "--verify with no packfile name given"
10147
msgstr "--verify 沒有提供 packfile 名稱參數"
10148
10149
+#: builtin/index-pack.c
10150
+msgid "cannot perform queued object checks outside of a repository"
10151
+msgstr "無法在版本庫外執行排入佇列的物件檢查"
10152
+
10153
#: builtin/index-pack.c builtin/unpack-objects.c
10154
msgid "fsck error in pack objects"
10155
msgstr "在打包物件中 fsck 檢查發生錯誤"
@@ -11033,13 +11104,6 @@ msgstr ""
11104
"git merge-file [<選項>] [-L <檔案1> [-L <初始> [-L <名字2>]]] <檔案1> <初始文"
11105
"件> <檔案2>"
11106
11036
-#: builtin/merge-file.c diff.c
11037
-msgid ""
11038
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
11039
-"\"histogram\""
11040
-msgstr ""
11041
-"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
11042
-
11107
#: builtin/merge-file.c
11108
msgid "send results to standard output"
11109
msgstr "將結果傳送到標準輸出"
@@ -11056,14 +11120,6 @@ msgstr "使用基於 diff3 的合併"
11120
msgid "use a zealous diff3 based merge"
11121
msgstr "使用基於 zealous diff3 的合併"
11122
11059
-#: builtin/merge-file.c diff.c
11060
-msgid "<algorithm>"
11061
-msgstr "<演算法>"
11062
-
11063
-#: builtin/merge-file.c diff.c
11064
-msgid "choose a diff algorithm"
11065
-msgstr "選擇一個差異演算法"
11066
-
11123
#: builtin/merge-file.c
11124
msgid "for conflicts, use this marker size"
11125
msgstr "如果衝突，使用指定長度的標記"
@@ -12390,6 +12446,11 @@ msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')
12446
msgid "could not get type of object %s in pack %s"
12447
msgstr "無法取得 %2$s 包中 %1$s 物件的類型"
12448
12449
+#: builtin/pack-objects.c
12450
+#, c-format
12451
+msgid "packfile %s is a promisor but --exclude-promisor-objects was given"
12452
+msgstr "封包檔案 %s 是承諾者，但是指定了 --exclude-promisor-objects"
12453
+
12454
#: builtin/pack-objects.c
12455
#, c-format
12456
msgid "could not find pack '%s'"
@@ -12721,12 +12782,12 @@ msgid "git patch-id [--stable | --unstable | --verbatim]"
12782
msgstr "git patch-id [--stable | --unstable | --verbatim]"
12783
12784
#: builtin/patch-id.c
12724
-msgid "use the unstable patch-id algorithm"
12725
-msgstr "使用不穩定的 patch-id 演算法"
12785
+msgid "use the unstable patch ID algorithm"
12786
+msgstr "使用不穩定的修補檔 ID 演算法"
12787
12788
#: builtin/patch-id.c
12728
-msgid "use the stable patch-id algorithm"
12729
-msgstr "使用穩定的 patch-id 演算法"
12789
+msgid "use the stable patch ID algorithm"
12790
+msgstr "使用穩定的修補檔 ID 演算法"
12791
12792
#: builtin/patch-id.c
12793
msgid "don't strip whitespace from the patch"
@@ -12756,50 +12817,6 @@ msgstr "不能在珍品版本庫中執行剪除動作"
12817
msgid "git pull [<options>] [<repository> [<refspec>...]]"
12818
msgstr "git pull [<選項>] [<版本庫> [<引用規格>...]]"
12819
12759
-#: builtin/pull.c
12760
-msgid "control for recursive fetching of submodules"
12761
-msgstr "控制子模組的遞迴取得"
12762
-
12763
-#: builtin/pull.c
12764
-msgid "Options related to merging"
12765
-msgstr "和合併相關的選項"
12766
-
12767
-#: builtin/pull.c
12768
-msgid "incorporate changes by rebasing rather than merging"
12769
-msgstr "使用重定基底動作取代合併動作以套用修改"
12770
-
12771
-#: builtin/pull.c builtin/revert.c
12772
-msgid "allow fast-forward"
12773
-msgstr "允許快轉式"
12774
-
12775
-#: builtin/pull.c
12776
-msgid "control use of pre-merge-commit and commit-msg hooks"
12777
-msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用"
12778
-
12779
-#: builtin/pull.c parse-options.h
12780
-msgid "automatically stash/stash pop before and after"
12781
-msgstr "在動作前後執行自動貯存和彈出貯存"
12782
-
12783
-#: builtin/pull.c
12784
-msgid "Options related to fetching"
12785
-msgstr "和取得相關的參數"
12786
-
12787
-#: builtin/pull.c
12788
-msgid "force overwrite of local branch"
12789
-msgstr "強制覆蓋本機分支"
12790
-
12791
-#: builtin/pull.c
12792
-msgid "number of submodules pulled in parallel"
12793
-msgstr "並行拉取的子模組數量"
12794
-
12795
-#: builtin/pull.c parse-options.h
12796
-msgid "use IPv4 addresses only"
12797
-msgstr "只使用 IPv4 位址"
12798
-
12799
-#: builtin/pull.c parse-options.h
12800
-msgid "use IPv6 addresses only"
12801
-msgstr "只使用 IPv6 位址"
12802
-
12820
#: builtin/pull.c
12821
msgid ""
12822
"There is no candidate for rebasing against among the refs that you just "
@@ -12912,6 +12929,50 @@ msgstr ""
12929
"pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n"
12930
"設定的預設值。\n"
12931
12932
+#: builtin/pull.c
12933
+msgid "control for recursive fetching of submodules"
12934
+msgstr "控制子模組的遞迴取得"
12935
+
12936
+#: builtin/pull.c
12937
+msgid "Options related to merging"
12938
+msgstr "和合併相關的選項"
12939
+
12940
+#: builtin/pull.c
12941
+msgid "incorporate changes by rebasing rather than merging"
12942
+msgstr "使用重定基底動作取代合併動作以套用修改"
12943
+
12944
+#: builtin/pull.c builtin/revert.c
12945
+msgid "allow fast-forward"
12946
+msgstr "允許快轉式"
12947
+
12948
+#: builtin/pull.c
12949
+msgid "control use of pre-merge-commit and commit-msg hooks"
12950
+msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用"
12951
+
12952
+#: builtin/pull.c parse-options.h
12953
+msgid "automatically stash/stash pop before and after"
12954
+msgstr "在動作前後執行自動貯存和彈出貯存"
12955
+
12956
+#: builtin/pull.c
12957
+msgid "Options related to fetching"
12958
+msgstr "和取得相關的參數"
12959
+
12960
+#: builtin/pull.c
12961
+msgid "force overwrite of local branch"
12962
+msgstr "強制覆蓋本機分支"
12963
+
12964
+#: builtin/pull.c
12965
+msgid "number of submodules pulled in parallel"
12966
+msgstr "並行拉取的子模組數量"
12967
+
12968
+#: builtin/pull.c parse-options.h
12969
+msgid "use IPv4 addresses only"
12970
+msgstr "只使用 IPv4 位址"
12971
+
12972
+#: builtin/pull.c parse-options.h
12973
+msgid "use IPv6 addresses only"
12974
+msgstr "只使用 IPv6 位址"
12975
+
12976
#: builtin/pull.c
12977
msgid "Updating an unborn branch with changes added to the index."
12978
msgstr "更新尚未誕生的分支，變更新增至索引。"
@@ -15138,6 +15199,11 @@ msgstr "--convert-graft-file 不需要引數"
15199
msgid "only one pattern can be given with -l"
15200
msgstr "只能為 -l 提供一個模式"
15201
15202
+#: builtin/replay.c
15203
+#, c-format
15204
+msgid "'%s' is not a valid commit-ish for %s"
15205
+msgstr "「%s」不是 %s 有效的提交指示元"
15206
+
15207
#: builtin/replay.c
15208
msgid "need some commits to replay"
15209
msgstr "需要一些提交才能重放"
@@ -15157,27 +15223,17 @@ msgid ""
15223
msgstr "無法用多個來源演進目的地，以免無法確定排序"
15224
15225
#: builtin/replay.c
15160
-msgid ""
15161
-"cannot implicitly determine whether this is an --advance or --onto operation"
15162
-msgstr "無法假設這是 --advance 還是 --onto 動作"
15163
-
15164
-#: builtin/replay.c
15165
-msgid ""
15166
-"cannot advance target with multiple source branches because ordering would "
15167
-"be ill-defined"
15168
-msgstr "無法由多個來源分支演進目的地，以免無法確定排序"
15169
-
15170
-#: builtin/replay.c
15171
-msgid "cannot implicitly determine correct base for --onto"
15172
-msgstr "無法假設 --onto 的正確基底"
15226
+#, c-format
15227
+msgid "invalid %s value: '%s'"
15228
+msgstr "無效的 %s 值：「%s」"
15229
15230
#: builtin/replay.c
15231
msgid ""
15232
"(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance "
15177
-"<branch>) <revision-range>..."
15233
+"<branch>) [--ref-action[=<mode>]] <revision-range>"
15234
msgstr ""
15179
-"（實驗性功能！）git replay ([--contained] --onto <newbase> | --advance "
15180
-"<branch>) <revision-range>..."
15235
+"(實驗性功能!) git replay ([--contained] --onto <newbase> | --advance "
15236
+"<branch>) [--ref-action[=<mode>]] <revision-range>"
15237
15238
#: builtin/replay.c
15239
msgid "make replay advance given branch"
@@ -15188,8 +15244,12 @@ msgid "replay onto given commit"
15244
msgstr "重放到指定提交"
15245
15246
#: builtin/replay.c
15191
-msgid "advance all branches contained in revision-range"
15192
-msgstr "演進所有包含在 revision-range 中的分支"
15247
+msgid "update all branches that point at commits in <revision-range>"
15248
+msgstr "更新所有指向 <revision-range> 範圍中提交的分支"
15249
+
15250
+#: builtin/replay.c
15251
+msgid "control ref update behavior (update|print)"
15252
+msgstr "控制引用的更新行為（update|print）"
15253
15254
#: builtin/replay.c
15255
msgid "option --onto or --advance is mandatory"
@@ -15202,18 +15262,33 @@ msgid ""
15262
"will be forced"
15263
msgstr "將覆寫部分修訂版遍歷選項，強制使用「struct rev_info」的「%s」位元"
15264
15265
+#: builtin/replay.c
15266
+#, c-format
15267
+msgid "failed to begin ref transaction: %s"
15268
+msgstr "無法開始引用事務：%s"
15269
+
15270
#: builtin/replay.c
15271
msgid "error preparing revisions"
15272
msgstr "無法準備修訂集"
15273
15274
#: builtin/replay.c
15210
-msgid "replaying down to root commit is not supported yet!"
15211
-msgstr "尚不支援重放到根提交！"
15275
+msgid "replaying down from root commit is not supported yet!"
15276
+msgstr "尚不支援從根提交重放！"
15277
15278
#: builtin/replay.c
15279
msgid "replaying merge commits is not supported yet!"
15280
msgstr "尚不支援重放合併提交！"
15281
15282
+#: builtin/replay.c
15283
+#, c-format
15284
+msgid "failed to update ref '%s': %s"
15285
+msgstr "無法更新「%s」引用：%s"
15286
+
15287
+#: builtin/replay.c
15288
+#, c-format
15289
+msgid "failed to commit ref transaction: %s"
15290
+msgstr "無法提交引用事務：%s"
15291
+
15292
#: builtin/repo.c
15293
#, c-format
15294
msgid "key '%s' not found"
@@ -15232,10 +15307,18 @@ msgstr "輸出格式"
15307
msgid "synonym for --format=nul"
15308
msgstr "和 --format=nul 同義"
15309
15310
+#: builtin/repo.c
15311
+msgid "print all keys/values"
15312
+msgstr "輸出所有鍵值對"
15313
+
15314
#: builtin/repo.c
15315
msgid "unsupported output format"
15316
msgstr "不支援的輸出格式"
15317
15318
+#: builtin/repo.c
15319
+msgid "--all and <key> cannot be used together"
15320
+msgstr "--all 和 <key> 不能同時使用"
15321
+
15322
#: builtin/repo.c
15323
msgid "References"
15324
msgstr "引用"
@@ -15276,6 +15359,14 @@ msgstr "樹狀物件"
15359
msgid "Blobs"
15360
msgstr "資料物件"
15361
15362
+#: builtin/repo.c
15363
+msgid "Inflated size"
15364
+msgstr "未壓縮大小"
15365
+
15366
+#: builtin/repo.c
15367
+msgid "Disk size"
15368
+msgstr "磁碟大小"
15369
+
15370
#: builtin/repo.c
15371
msgid "Repository structure"
15372
msgstr "版本庫結構"
@@ -17261,7 +17352,7 @@ msgstr "「%s」已在索引中"
17352
msgid "'%s' already exists in the index and is not a submodule"
17353
msgstr "「%s」已在索引中，且不是子模組"
17354
17264
-#: builtin/submodule--helper.c read-cache.c
17355
+#: builtin/submodule--helper.c object-file.c
17356
#, c-format
17357
msgid "'%s' does not have a commit checked out"
17358
msgstr "'%s' 沒有簽出一個提交"
@@ -18313,6 +18404,11 @@ msgstr "無法解析套件包清單鍵 %s 的值「%s」"
18404
msgid "bundle list at '%s' has no mode"
18405
msgstr "位於「%s」的套件包清單沒有模式"
18406
18407
+#: bundle-uri.c
18408
+#, c-format
18409
+msgid "bundle list at '%s': bundle '%s' has no uri"
18410
+msgstr "套件包清單，位於「%s」：「%s」套件包沒有 URI"
18411
+
18412
#: bundle-uri.c
18413
msgid "failed to create temporary file"
18414
msgstr "無法建立暫存檔"
@@ -18340,6 +18436,11 @@ msgstr "不認識從 URI「%s」取回的套件包模式"
18436
msgid "exceeded bundle URI recursion limit (%d)"
18437
msgstr "超出套件包 URI 遞迴限制 (%d)"
18438
18439
+#: bundle-uri.c
18440
+#, c-format
18441
+msgid "bundle '%s' has no uri"
18442
+msgstr "「%s」套件包沒有 URI"
18443
+
18444
#: bundle-uri.c
18445
#, c-format
18446
msgid "failed to download bundle from URI '%s'"
@@ -18982,8 +19083,8 @@ msgid "Reuse recorded resolution of conflicted merges"
19083
msgstr "重用衝突合併的解決方案記錄"
19084
19085
#: command-list.h
18985
-msgid "Reset current HEAD to the specified state"
18986
-msgstr "重設目前 HEAD 到指定狀態"
19086
+msgid "Set `HEAD` or the index to a known state"
19087
+msgstr "將 `HEAD` 或索引設為已知狀態"
19088
19089
#: command-list.h
19090
msgid "Restore working tree files"
@@ -20821,11 +20922,6 @@ msgstr "color-moved-ws：allow-indentation-change 不能與其他空白字元模
20922
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
20923
msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"
20924
20824
-#: diff.c merge-ort.c transport.c
20825
-#, c-format
20826
-msgid "unknown value for config '%s': %s"
20827
-msgstr "設定 '%s' 的取值未知：%s"
20828
-
20925
#: diff.c
20926
#, c-format
20927
msgid ""
@@ -23387,6 +23483,10 @@ msgstr "索引 %s 時讀入不完整"
23483
msgid "%s: failed to insert into database"
23484
msgstr "%s：插入資料庫失敗"
23485
23486
+#: object-file.c
23487
+msgid "cannot add a submodule of a different hash algorithm"
23488
+msgstr "無法加入使用不同雜湊演算法的子模組"
23489
+
23490
#: object-file.c
23491
#, c-format
23492
msgid "%s: unsupported file type"
@@ -25116,6 +25216,11 @@ msgstr "本命令拒絕 atom %%(%.*s)"
25216
msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
25217
msgstr "--format=%.*s 無法和 --python、--shell、--tcl 一起使用"
25218
25219
+#: ref-filter.c
25220
+#, c-format
25221
+msgid "parse_object_buffer failed on %s for %s"
25222
+msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"
25223
+
25224
#: ref-filter.c
25225
msgid "failed to run 'describe'"
25226
msgstr "無法執行「describe」"
@@ -25154,11 +25259,6 @@ msgstr "（無分支）"
25259
msgid "missing object %s for %s"
25260
msgstr "缺少 %2$s 的物件 %1$s"
25261
25157
-#: ref-filter.c
25158
-#, c-format
25159
-msgid "parse_object_buffer failed on %s for %s"
25160
-msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"
25161
-
25262
#: ref-filter.c
25263
#, c-format
25264
msgid "malformed object at '%s'"
@@ -25510,6 +25610,21 @@ msgstr "找不到引用名稱 %s"
25610
msgid "refname %s is a symbolic ref, copying it is not supported"
25611
msgstr "引用名稱 %s 是符號引用，不支援複製"
25612
25613
+#: refs/reftable-backend.c
25614
+#, c-format
25615
+msgid "reftable stack for worktree '%s' is broken"
25616
+msgstr "「%s」工作區的 reftable 堆疊已經損壞"
25617
+
25618
+#: refs/reftable-backend.c
25619
+#, c-format
25620
+msgid "could not create iterator for worktree '%s'"
25621
+msgstr "無法建立「%s」工作區的迭代器"
25622
+
25623
+#: refs/reftable-backend.c
25624
+#, c-format
25625
+msgid "could not read record for worktree '%s'"
25626
+msgstr "無法讀取「%s」工作區的記錄"
25627
+
25628
#: refspec.c
25629
#, c-format
25630
msgid "pattern '%s' has no '*'"
@@ -26009,6 +26124,10 @@ msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。"
26124
msgid "could not finish pack-objects to repack promisor objects"
26125
msgstr "無法結束 pack-objects 來重新打包 promisor 物件"
26126
26127
+#: repack-promisor.c
26128
+msgid "could not start pack-objects to repack promisor packs"
26129
+msgstr "無法開始 pack-objects 來重新打包 promisor 封包"
26130
+
26131
#: repack.c
26132
#, c-format
26133
msgid "pack prefix %s does not begin with objdir %s"
@@ -27220,11 +27339,6 @@ msgstr ""
27339
msgid "illegal label name: '%.*s'"
27340
msgstr "非法的標籤名稱：'%.*s'"
27341
27223
-#: sequencer.c
27224
-#, c-format
27225
-msgid "could not resolve '%s'"
27226
-msgstr "無法解析「%s」"
27227
-
27342
#: sequencer.c
27343
msgid "writing fake root commit"
27344
msgstr "寫偽根提交"
@@ -27799,55 +27913,81 @@ msgstr "無效的 %s 格式：「%s」元素的結尾不是「)」"
27913
msgid "bad %s format: %%%.*s"
27914
msgstr "無效的 %s 格式：%%%.*s"
27915
27802
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
27916
#: strbuf.c
27917
#, c-format
27805
-msgid "%u.%2.2u GiB"
27806
-msgstr "%u.%2.2u GiB"
27918
+msgid "%u.%2.2u"
27919
+msgstr "%u.%2.2u"
27920
27808
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
27921
+#. TRANSLATORS: SI decimal prefix symbol for 10^9
27922
#: strbuf.c
27810
-#, c-format
27811
-msgid "%u.%2.2u GiB/s"
27812
-msgstr "%u.%2.2u GiB/s"
27923
+msgid "G"
27924
+msgstr "G"
27925
27814
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
27926
+#. TRANSLATORS: SI decimal prefix symbol for 10^6
27927
#: strbuf.c
27816
-#, c-format
27817
-msgid "%u.%2.2u MiB"
27818
-msgstr "%u.%2.2u MiB"
27928
+msgid "M"
27929
+msgstr "M"
27930
27820
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
27931
+#. TRANSLATORS: SI decimal prefix symbol for 10^3
27932
#: strbuf.c
27822
-#, c-format
27823
-msgid "%u.%2.2u MiB/s"
27824
-msgstr "%u.%2.2u MiB/s"
27933
+msgid "k"
27934
+msgstr "k"
27935
27826
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
27936
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second and gibibyte
27937
#: strbuf.c
27828
-#, c-format
27829
-msgid "%u.%2.2u KiB"
27830
-msgstr "%u.%2.2u KiB"
27938
+msgid "GiB/s"
27939
+msgstr "GiB/秒"
27940
27832
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
27941
#: strbuf.c
27834
-#, c-format
27835
-msgid "%u.%2.2u KiB/s"
27836
-msgstr "%u.%2.2u KiB/s"
27942
+msgid "GiB"
27943
+msgstr "GiB"
27944
27838
-#. TRANSLATORS: IEC 80000-13:2008 byte
27945
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second and mebibyte
27946
#: strbuf.c
27840
-#, c-format
27841
-msgid "%u byte"
27842
-msgid_plural "%u bytes"
27843
-msgstr[0] "%u 位元組"
27947
+msgid "MiB/s"
27948
+msgstr "MiB/秒"
27949
+
27950
+#: strbuf.c
27951
+msgid "MiB"
27952
+msgstr "MiB"
27953
+
27954
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second and kibibyte
27955
+#: strbuf.c
27956
+msgid "KiB/s"
27957
+msgstr "KiB/秒"
27958
+
27959
+#: strbuf.c
27960
+msgid "KiB"
27961
+msgstr "KiB"
27962
+
27963
+#. TRANSLATORS: IEC 80000-13:2008 byte/second and byte
27964
+#: strbuf.c
27965
+msgid "B/s"
27966
+msgstr "B/秒"
27967
+
27968
+#: strbuf.c
27969
+msgid "B"
27970
+msgstr "B"
27971
27972
#. TRANSLATORS: IEC 80000-13:2008 byte/second
27973
#: strbuf.c
27974
+msgid "byte/s"
27975
+msgid_plural "bytes/s"
27976
+msgstr[0] "位元組/秒"
27977
+
27978
+#. TRANSLATORS: IEC 80000-13:2008 byte
27979
+#: strbuf.c
27980
+msgid "byte"
27981
+msgid_plural "bytes"
27982
+msgstr[0] "位元組"
27983
+
27984
+#. TRANSLATORS: The first argument is the number string. The second
27985
+#. argument is the unit string (i.e. "12.34 MiB/s").
27986
+#.
27987
+#: strbuf.c
27988
#, c-format
27848
-msgid "%u byte/s"
27849
-msgid_plural "%u bytes/s"
27850
-msgstr[0] "%u 位元組/秒"
27989
+msgid "%s %s"
27990
+msgstr "%s %s"
27991
27992
#: submodule-config.c
27993
#, c-format
@@ -28202,10 +28342,6 @@ msgstr "位元組數"
28342
msgid "number of requests per thread"
28343
msgstr "每個執行緒的請求數"
28344
28205
-#: t/helper/test-simple-ipc.c
28206
-msgid "byte"
28207
-msgstr "位元組"
28208
-
28345
#: t/helper/test-simple-ipc.c
28346
msgid "ballast character"
28347
msgstr "穩定 (ballast) 字元"
@@ -30123,511 +30259,3 @@ msgstr "略過具有備份後綴「%2$s」的 %1$s。\n"
30259
#, perl-format
30260
msgid "Do you really want to send %s? [y|N]: "
30261
msgstr "您真的要傳送 %s？[y|N]： "
30126
-
30127
-#~ msgid "No previous hunk"
30128
-#~ msgstr "沒有上一個區塊"
30129
-
30130
-#~ msgid "No next hunk"
30131
-#~ msgstr "沒有下一個區塊"
30132
-
30133
-#~ msgid "git for-each-ref [<options>] [<pattern>]"
30134
-#~ msgstr "git for-each-ref [<選項>] [<模式>]"
30135
-
30136
-#~ msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
30137
-#~ msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
30138
-
30139
-#~ msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
30140
-#~ msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
30141
-
30142
-#~ msgid "git for-each-ref [--start-after <marker>]"
30143
-#~ msgstr "git for-each-ref [--start-after <marker>]"
30144
-
30145
-#~ msgid ""
30146
-#~ "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--"
30147
-#~ "exclude <pattern>]"
30148
-#~ msgstr ""
30149
-#~ "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--"
30150
-#~ "exclude <pattern>]"
30151
-
30152
-#, c-format
30153
-#~ msgid "deleting '%s' failed"
30154
-#~ msgstr "刪除 '%s' 失敗"
30155
-
30156
-#, c-format
30157
-#~ msgid "creating '%s' failed"
30158
-#~ msgstr "建立 '%s' 失敗"
30159
-
30160
-#, c-format
30161
-#~ msgid "could not open index for %s"
30162
-#~ msgstr "無法開啟 %s 的索引"
30163
-
30164
-#~ msgid "cannot handle pushes this big"
30165
-#~ msgstr "不能處理這麼大的推送"
30166
-
30167
-#, c-format
30168
-#~ msgid ""
30169
-#~ "'%s' is nominated for removal.\n"
30170
-#~ "If you still use this command, please add an extra\n"
30171
-#~ "option, '--i-still-use-this', on the command line\n"
30172
-#~ "and let us know you still use it by sending an e-mail\n"
30173
-#~ "to <git@vger.kernel.org>. Thanks.\n"
30174
-#~ msgstr ""
30175
-#~ "「%s」命令已被提名移除。\n"
30176
-#~ "如果您仍在使用該命令，請多加上「--i-still-use-this」\n"
30177
-#~ "選項，然後寄封電子郵件到 <git@vger.kernel.org>，\n"
30178
-#~ "讓我們知道您還在使用，謝謝。\n"
30179
-
30180
-#~ msgid "start-after"
30181
-#~ msgstr "start-after"
30182
-
30183
-#~ msgid "compact-summary"
30184
-#~ msgstr "精要摘要 (compact-summary)"
30185
-
30186
-# 譯者：請維持前導空格
30187
-#, c-format
30188
-#~ msgid " (%s will become dangling)"
30189
-#~ msgstr " （%s 將成為懸空狀態）"
30190
-
30191
-# 譯者：請維持前導空格
30192
-#, c-format
30193
-#~ msgid " (%s has become dangling)"
30194
-#~ msgstr " （%s 已成為懸空狀態）"
30195
-
30196
-#~ msgid "use at most one of --auto and --schedule=<frequency>"
30197
-#~ msgstr "--auto 和 --schedule=<頻率> 請任選一"
30198
-
30199
-#, c-format
30200
-#~ msgid "Final output: %d %s\n"
30201
-#~ msgstr "最終輸出：%d %s\n"
30202
-
30203
-#, c-format
30204
-#~ msgid "%d (FSCK_IGNORE?) should never trigger this callback"
30205
-#~ msgstr "%d (FSCK_IGNORE?) 不應觸發這個回呼函式"
30206
-
30207
-#~ msgid ""
30208
-#~ "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
30209
-#~ msgstr "git pack-objects --stdout [<選項>] [< <引用列表> | < <物件列表>]"
30210
-
30211
-#~ msgid ""
30212
-#~ "git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
30213
-#~ msgstr "git pack-objects [<選項>] <前綴名稱> [< <引用列表> | < <物件列表>]"
30214
-
30215
-#~ msgid "cannot use --stdin-packs with --cruft"
30216
-#~ msgstr "無法將 --stdin-packs 與 --cruft 組合使用"
30217
-
30218
-#, c-format
30219
-#~ msgid "unreachable: invalid reference: %s"
30220
-#~ msgstr "不可達：無效引用：%s"
30221
-
30222
-#~ msgid "trying to write commit not in index"
30223
-#~ msgstr "嘗試寫入不在索引的提交"
30224
-
30225
-#~ msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
30226
-#~ msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>"
30227
-
30228
-#~ msgid "allow -s and -t to work with broken/corrupt objects"
30229
-#~ msgstr "允許 -s 和 -t 對損壞的物件生效"
30230
-
30231
-#, c-format
30232
-#~ msgid "%s: object is of unknown type '%s': %s"
30233
-#~ msgstr "%s：物件屬於「%s」未知類型：%s"
30234
-
30235
-#~ msgid "(bad commit)\n"
30236
-#~ msgstr "（壞提交）\n"
30237
-
30238
-#, c-format
30239
-#~ msgid "add_cacheinfo failed for path '%s'; merge aborting."
30240
-#~ msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。"
30241
-
30242
-#, c-format
30243
-#~ msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
30244
-#~ msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。"
30245
-
30246
-#, c-format
30247
-#~ msgid "failed to create path '%s'%s"
30248
-#~ msgstr "建立路徑 '%s'%s 失敗"
30249
-
30250
-#, c-format
30251
-#~ msgid "Removing %s to make room for subdirectory\n"
30252
-#~ msgstr "刪除 %s 以便為子目錄留出空間\n"
30253
-
30254
-#~ msgid ": perhaps a D/F conflict?"
30255
-#~ msgstr "：可能是一個目錄/檔案衝突？"
30256
-
30257
-#, c-format
30258
-#~ msgid "refusing to lose untracked file at '%s'"
30259
-#~ msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"
30260
-
30261
-#, c-format
30262
-#~ msgid "blob expected for %s '%s'"
30263
-#~ msgstr "%s '%s' 應為資料物件"
30264
-
30265
-#, c-format
30266
-#~ msgid "failed to open '%s': %s"
30267
-#~ msgstr "開啟 '%s' 失敗：%s"
30268
-
30269
-#, c-format
30270
-#~ msgid "failed to symlink '%s': %s"
30271
-#~ msgstr "建立符號連結 '%s' 失敗：%s"
30272
-
30273
-#, c-format
30274
-#~ msgid "do not know what to do with %06o %s '%s'"
30275
-#~ msgstr "不知道如何處理 %06o %s '%s'"
30276
-
30277
-#, c-format
30278
-#~ msgid "Failed to merge submodule %s (repository corrupt)"
30279
-#~ msgstr "無法合併子模組 %s （版本庫損壞）"
30280
-
30281
-#, c-format
30282
-#~ msgid "Fast-forwarding submodule %s to the following commit:"
30283
-#~ msgstr "子模組 %s 快轉到如下提交："
30284
-
30285
-#, c-format
30286
-#~ msgid "Fast-forwarding submodule %s"
30287
-#~ msgstr "快轉子模組 %s"
30288
-
30289
-#, c-format
30290
-#~ msgid "Failed to merge submodule %s (merge following commits not found)"
30291
-#~ msgstr "無法合併子模組 %s （找不到合併跟隨的提交）"
30292
-
30293
-#, c-format
30294
-#~ msgid "Failed to merge submodule %s (not fast-forward)"
30295
-#~ msgstr "無法合併子模組 %s（非快轉）"
30296
-
30297
-#~ msgid "Found a possible merge resolution for the submodule:\n"
30298
-#~ msgstr "找到子模組的一個可能的合併方案：\n"
30299
-
30300
-#, c-format
30301
-#~ msgid ""
30302
-#~ "If this is correct simply add it to the index for example\n"
30303
-#~ "by using:\n"
30304
-#~ "\n"
30305
-#~ " git update-index --cacheinfo 160000 %s \"%s\"\n"
30306
-#~ "\n"
30307
-#~ "which will accept this suggestion.\n"
30308
-#~ msgstr ""
30309
-#~ "正確的話，就能直接加進索引，例如執行下述命令：\n"
30310
-#~ "\n"
30311
-#~ " git update-index --cacheinfo 160000 %s \"%s\"\n"
30312
-#~ "\n"
30313
-#~ "接受本建議。\n"
30314
-
30315
-#, c-format
30316
-#~ msgid "Failed to merge submodule %s (multiple merges found)"
30317
-#~ msgstr "無法合併子模組 %s （發現多個合併）"
30318
-
30319
-#~ msgid "failed to execute internal merge"
30320
-#~ msgstr "無法執行內部合併"
30321
-
30322
-#, c-format
30323
-#~ msgid "unable to add %s to database"
30324
-#~ msgstr "無法將 %s 加進資料庫"
30325
-
30326
-#, c-format
30327
-#~ msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
30328
-#~ msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。"
30329
-
30330
-#, c-format
30331
-#~ msgid ""
30332
-#~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "
30333
-#~ "left in tree."
30334
-#~ msgstr ""
30335
-#~ "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s "
30336
-#~ "版本被保留。"
30337
-
30338
-#, c-format
30339
-#~ msgid ""
30340
-#~ "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of "
30341
-#~ "%s left in tree."
30342
-#~ msgstr ""
30343
-#~ "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s "
30344
-#~ "的 %7$s 版本被保留。"
30345
-
30346
-#, c-format
30347
-#~ msgid ""
30348
-#~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "
30349
-#~ "left in tree at %s."
30350
-#~ msgstr ""
30351
-#~ "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s "
30352
-#~ "版本保留在 %8$s 中。"
30353
-
30354
-#, c-format
30355
-#~ msgid ""
30356
-#~ "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of "
30357
-#~ "%s left in tree at %s."
30358
-#~ msgstr ""
30359
-#~ "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s "
30360
-#~ "的 %7$s 版本保留在 %9$s 中。"
30361
-
30362
-#~ msgid "rename"
30363
-#~ msgstr "重新命名"
30364
-
30365
-#~ msgid "renamed"
30366
-#~ msgstr "已重新命名"
30367
-
30368
-#, c-format
30369
-#~ msgid "Refusing to lose dirty file at %s"
30370
-#~ msgstr "拒絕遺失髒檔案 '%s'"
30371
-
30372
-#, c-format
30373
-#~ msgid "Refusing to lose untracked file at %s, even though it's in the way."
30374
-#~ msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。"
30375
-
30376
-#, c-format
30377
-#~ msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
30378
-#~ msgstr ""
30379
-#~ "衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"
30380
-
30381
-#, c-format
30382
-#~ msgid "%s is a directory in %s adding as %s instead"
30383
-#~ msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增"
30384
-
30385
-#, c-format
30386
-#~ msgid "Refusing to lose untracked file at %s; adding as %s instead"
30387
-#~ msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s"
30388
-
30389
-#, c-format
30390
-#~ msgid ""
30391
-#~ "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
30392
-#~ "\"%s\"->\"%s\" in \"%s\"%s"
30393
-#~ msgstr ""
30394
-#~ "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，"
30395
-#~ "在分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s"
30396
-
30397
-#~ msgid " (left unresolved)"
30398
-#~ msgstr " （留下未解決）"
30399
-
30400
-#, c-format
30401
-#~ msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
30402
-#~ msgstr ""
30403
-#~ "衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命"
30404
-#~ "名 %4$s->%5$s"
30405
-
30406
-#, c-format
30407
-#~ msgid ""
30408
-#~ "CONFLICT (directory rename split): Unclear where to place %s because "
30409
-#~ "directory %s was renamed to multiple other directories, with no "
30410
-#~ "destination getting a majority of the files."
30411
-#~ msgstr ""
30412
-#~ "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名"
30413
-#~ "到多個其它目錄，沒有目錄包含大部分檔案。"
30414
-
30415
-#, c-format
30416
-#~ msgid ""
30417
-#~ "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
30418
-#~ "%s->%s in %s"
30419
-#~ msgstr ""
30420
-#~ "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重"
30421
-#~ "新命名目錄 %4$s->%5$s"
30422
-
30423
-#, c-format
30424
-#~ msgid "object %s is not a blob"
30425
-#~ msgstr "物件 %s 不是一個資料物件"
30426
-
30427
-#~ msgid "modify"
30428
-#~ msgstr "修改"
30429
-
30430
-#~ msgid "modified"
30431
-#~ msgstr "修改"
30432
-
30433
-#, c-format
30434
-#~ msgid "Skipped %s (merged same as existing)"
30435
-#~ msgstr "略過 %s（已經做過相同合併）"
30436
-
30437
-#, c-format
30438
-#~ msgid "Adding as %s instead"
30439
-#~ msgstr "而是以 %s 為名新增"
30440
-
30441
-#, c-format
30442
-#~ msgid "Removing %s"
30443
-#~ msgstr "刪除 %s"
30444
-
30445
-#~ msgid "file/directory"
30446
-#~ msgstr "檔案/目錄"
30447
-
30448
-#~ msgid "directory/file"
30449
-#~ msgstr "目錄/檔案"
30450
-
30451
-#, c-format
30452
-#~ msgid ""
30453
-#~ "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
30454
-#~ msgstr ""
30455
-#~ "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s"
30456
-
30457
-#, c-format
30458
-#~ msgid "Adding %s"
30459
-#~ msgstr "新增 %s"
30460
-
30461
-#, c-format
30462
-#~ msgid "CONFLICT (add/add): Merge conflict in %s"
30463
-#~ msgstr "衝突（add/add）：合併衝突於 %s"
30464
-
30465
-#, c-format
30466
-#~ msgid "merging of trees %s and %s failed"
30467
-#~ msgstr "無法合併樹 %s 和 %s"
30468
-
30469
-#~ msgid "Merging:"
30470
-#~ msgstr "合併："
30471
-
30472
-#, c-format
30473
-#~ msgid "found %u common ancestor:"
30474
-#~ msgid_plural "found %u common ancestors:"
30475
-#~ msgstr[0] "發現 %u 個共同祖先："
30476
-
30477
-#~ msgid "merge returned no commit"
30478
-#~ msgstr "合併未返回提交"
30479
-
30480
-#~ msgid "cannot write incremental MIDX with bitmap"
30481
-#~ msgstr "無法寫入有位圖的增量 MIDX"
30482
-
30483
-#, c-format
30484
-#~ msgid "Could not find remote branch %s to clone."
30485
-#~ msgstr "找不到要複製的遠端分支 %s。"
30486
-
30487
-#, c-format
30488
-#~ msgid "merging cannot continue; got unclean result of %d"
30489
-#~ msgstr "無法繼續合併：從 %d 收到的結果不乾淨"
30490
-
30491
-#~ msgid "--onto and --advance are incompatible"
30492
-#~ msgstr "--onto 和 --advance 不相容"
30493
-
30494
-#, c-format
30495
-#~ msgid "key '%s' of pattern had no '*'"
30496
-#~ msgstr "模式的鍵 '%s' 沒有 '*'"
30497
-
30498
-#, c-format
30499
-#~ msgid "preferred pack (%s) is invalid"
30500
-#~ msgstr "偏好的封包 (%s) 無效"
30501
-
30502
-#, c-format
30503
-#~ msgid ""
30504
-#~ "more than %i tags found; listed %i most recent\n"
30505
-#~ "gave up search at %s\n"
30506
-#~ msgstr ""
30507
-#~ "發現多於 %i 個標籤，列出最近的 %i 個\n"
30508
-#~ "在 %s 放棄搜尋\n"
30509
-
30510
-#~ msgid "Public key pinning not supported with cURL < 7.39.0"
30511
-#~ msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.39.0"
30512
-
30513
-#~ msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
30514
-#~ msgstr "不支援 CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0"
30515
-
30516
-#~ msgid "revision walk setup failed\n"
30517
-#~ msgstr "修訂版遍歷設定失敗\n"
30518
-
30519
-#, c-format
30520
-#~ msgid "unable to parse contact: %s"
30521
-#~ msgstr "無法解析聯絡地址：%s"
30522
-
30523
-#~ msgid ""
30524
-#~ "the add.interactive.useBuiltin setting has been removed!\n"
30525
-#~ "See its entry in 'git help config' for details."
30526
-#~ msgstr ""
30527
-#~ "add.interactive.useBuiltin 設定已被移除！\n"
30528
-#~ "深入了解請參閱 “git help config” 中的對應條目。"
30529
-
30530
-#~ msgid "git archive: Remote with no URL"
30531
-#~ msgstr "git archive: 未提供遠端 URL"
30532
-
30533
-#~ msgid "only one action at a time"
30534
-#~ msgstr "一次只能有一個動作"
30535
-
30536
-#~ msgid "use [RFC PATCH] instead of [PATCH]"
30537
-#~ msgstr "使用 [RFC PATCH] 代替 [PATCH]"
30538
-
30539
-#, c-format
30540
-#~ msgid "remote '%s' has no configured URL"
30541
-#~ msgstr "“%s” 遠端未設定 URL"
30542
-
30543
-#, c-format
30544
-#~ msgid "truncating .rej filename to %.*s.rej"
30545
-#~ msgstr "正在將 .rej 檔案名稱截短為 %.*s.rej"
30546
-
30547
-#~ msgid ""
30548
-#~ "Use -f if you really want to add them.\n"
30549
-#~ "Turn this message off by running\n"
30550
-#~ "\"git config advice.addIgnoredFile false\""
30551
-#~ msgstr ""
30552
-#~ "若您真的想加入，請傳入 -f。\n"
30553
-#~ "如要關閉此訊息，請執行\n"
30554
-#~ "“git config advice.addIgnoredFile false”"
30555
-
30556
-#~ msgid ""
30557
-#~ "Maybe you wanted to say 'git add .'?\n"
30558
-#~ "Turn this message off by running\n"
30559
-#~ "\"git config advice.addEmptyPathspec false\""
30560
-#~ msgstr ""
30561
-#~ "可能您想做 “git add .”？\n"
30562
-#~ "如要關閉此訊息，請執行\n"
30563
-#~ "“git config advice.addEmptyPathspec false”"
30564
-
30565
-#~ msgid ""
30566
-#~ "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
30567
-#~ "refusing to clean"
30568
-#~ msgstr ""
30569
-#~ "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動"
30570
-#~ "作"
30571
-
30572
-#, c-format
30573
-#~ msgid "bad ls-files format: element '%s' does not start with '('"
30574
-#~ msgstr "ls-files 格式錯誤：“%s” 元素不以 “(” 開頭"
30575
-
30576
-#, c-format
30577
-#~ msgid "bad ls-files format: element '%s' does not end in ')'"
30578
-#~ msgstr "ls-files 格式錯誤：“%s” 元素不以 “)” 結尾"
30579
-
30580
-#, c-format
30581
-#~ msgid "bad ls-files format: %%%.*s"
30582
-#~ msgstr "ls-files 格式錯誤：%%%.*s"
30583
-
30584
-#~ msgid "keep redundant, empty commits"
30585
-#~ msgstr "保持多餘的、空的提交"
30586
-
30587
-#~ msgid "core.commentChar should only be one ASCII character"
30588
-#~ msgstr "core.commentChar 應該是一個 ASCII 字元"
30589
-
30590
-#~ msgid ""
30591
-#~ "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-"
30592
-#~ "exclude"
30593
-#~ msgstr ""
30594
-#~ "--bundle-uri 與 --depth、--shallow-since 和 --shallow-exclude 不相容"
30595
-
30596
-#~ msgid "--merge-base is incompatible with --stdin"
30597
-#~ msgstr "--merge-base 與 --stdin 不相容"
30598
-
30599
-#~ msgid ""
30600
-#~ "apply options are incompatible with rebase.autoSquash. Consider adding --"
30601
-#~ "no-autosquash"
30602
-#~ msgstr "apply 選項與 rebase.autoSquash 不相容。請考慮加上 --no-autosquash"
30603
-
30604
-#~ msgid "--exclude-hidden cannot be used together with --branches"
30605
-#~ msgstr "--exclude-hidden 無法與 --branches 同時使用"
30606
-
30607
-#~ msgid "--exclude-hidden cannot be used together with --tags"
30608
-#~ msgstr "--exclude-hidden 無法與 --tags 同時使用"
30609
-
30610
-#~ msgid "--exclude-hidden cannot be used together with --remotes"
30611
-#~ msgstr "--exclude-hidden 無法與 --remotes 同時使用"
30612
-
30613
-#, c-format
30614
-#~ msgid "only one of '%s', '%s' or '%s' can be given"
30615
-#~ msgstr "只能傳入 “%s”、“%s” 或 “%s”"
30616
-
30617
-#, c-format
30618
-#~ msgid "'%s' and '%s' cannot be used together"
30619
-#~ msgstr "無法同時使用 “%s” 和 “%s”"
30620
-
30621
-#, c-format
30622
-#~ msgid "options '%s', and '%s' cannot be used together"
30623
-#~ msgstr "無法同時使用 “%s” 和 “%s” 選項"
30624
-
30625
-#~ msgid "<commit-ish>"
30626
-#~ msgstr "<提交指示元>"
30627
-
30628
-#, c-format
30629
-#~ msgid "%s is incompatible with %s"
30630
-#~ msgstr "%s 與 %s 不相容"
30631
-
30632
-#~ msgid "unhandled options"
30633
-#~ msgstr "未處理選項"