@matheusbsbs / matheus-bagliano / commits / 5590ee9132

l10n: zh_TW: Git 2.51

Co-authored-by: Lumynous <lumynou5.tw@gmail.com> Co-authored-by: hms5232 <hms5232@hhming.moe> Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>

Yi-Jyun Pan committed Aug 9, 2025 at 10:46 UTC 5590ee913274f9c11e879e464e2ecba3efdd66e6
1 file changed +617 -393
po/zh_TW.po
+617 -393
@@ -19,22 +19,22 @@
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.
22 +# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023, 2024, 2025.
23 # Kaiyang Wu <self@origincode.me>, 2022.
24 -# Lumynous <lumynou5.tw@gmail.com>, 2023, 2024.
24 +# Lumynous <lumynou5.tw@gmail.com>, 2023, 2024, 2025.
25 # Kisaragi Hiu <mail@kisaragi-hiu.com>, 2024.
26 # Ngoo Ka-iu <willy04wu69@gmail.com>, 2024.
27 # Nightfeather Chen <slat@nightfeather.me>, 2024.
28 -# hms5232 <hms5232@hhming.moe>, 2024.
28 +# hms5232 <hms5232@hhming.moe>, 2024, 2025.
29 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-06-12 22:09+0800\n"
34 -"PO-Revision-Date: 2025-06-12 22:25+0800\n"
35 -"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
36 -"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
37 -"po/git-cli/zh_Hant/>\n"
33 +"POT-Creation-Date: 2025-08-16 12:10+0800\n"
34 +"PO-Revision-Date: 2025-08-16 12:11+0800\n"
35 +"Last-Translator: hms5232 <hms5232@hhming.moe>\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"
39 "MIME-Version: 1.0\n"
40 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,6 +44,11 @@ msgstr ""
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
49 +msgid "%s cannot be negative"
50 +msgstr "%s 不能是負數"
51 +
52 #: add-interactive.c
53 #, c-format
54 msgid "Huh (%s)?"
@@ -131,12 +136,12 @@ msgstr "忽略未合併項目：%s"
136 #: add-interactive.c
137 #, c-format
138 msgid "Only binary files changed.\n"
134 -msgstr "只有二進位檔案更動了。\n"
139 +msgstr "只有二進位檔案變更了。\n"
140
141 #: add-interactive.c
142 #, c-format
143 msgid "No changes.\n"
139 -msgstr "沒有更動。\n"
144 +msgstr "沒有變更。\n"
145
146 #: add-interactive.c
147 msgid "Patch update"
@@ -148,15 +153,15 @@ msgstr "檢閱差異"
153
154 #: add-interactive.c
155 msgid "show paths with changes"
151 -msgstr "顯示有更動的路徑"
156 +msgstr "顯示有變更的路徑"
157
158 #: add-interactive.c
159 msgid "add working tree state to the staged set of changes"
155 -msgstr "將工作區狀態加入至暫存更動集"
160 +msgstr "將工作區狀態加入至暫存變更暫存集"
161
162 #: add-interactive.c
163 msgid "revert staged set of changes back to the HEAD version"
159 -msgstr "將暫存的更動集還原回 HEAD 版本"
164 +msgstr "將變更暫存集還原至 HEAD 版本"
165
166 #: add-interactive.c
167 msgid "pick hunks and update selectively"
@@ -168,7 +173,7 @@ msgstr "檢視 HEAD 及索引之間的差異"
173
174 #: add-interactive.c
175 msgid "add contents of untracked files to the staged set of changes"
171 -msgstr "將未追蹤檔案的內容加入至更動暫存集"
176 +msgstr "將未追蹤檔案的內容加入至變更暫存集"
177
178 #: add-interactive.c
179 msgid "Prompt help:"
@@ -244,7 +249,7 @@ msgstr "再見。\n"
249 #: add-patch.c
250 #, c-format
251 msgid "Stage mode change [y,n,q,a,d%s,?]? "
247 -msgstr "暫存模式更動 [y,n,q,a,d%s,?]? "
252 +msgstr "暫存模式變更 [y,n,q,a,d%s,?]？ "
253
254 #: add-patch.c
255 #, c-format
@@ -284,7 +289,7 @@ msgstr ""
289 #: add-patch.c
290 #, c-format
291 msgid "Stash mode change [y,n,q,a,d%s,?]? "
287 -msgstr "貯存模式更動 [y,n,q,a,d%s,?]? "
292 +msgstr "貯存模式變更 [y,n,q,a,d%s,?]？ "
293
294 #: add-patch.c
295 #, c-format
@@ -324,7 +329,7 @@ msgstr ""
329 #: add-patch.c
330 #, c-format
331 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
327 -msgstr "取消暫存模式更動 [y,n,q,a,d%s,?]? "
332 +msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]？ "
333
334 #: add-patch.c
335 #, c-format
@@ -364,7 +369,7 @@ msgstr ""
369 #: add-patch.c
370 #, c-format
371 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
367 -msgstr "將模式更動套用到索引 [y,n,q,a,d%s,?]? "
372 +msgstr "將模式變更套用至索引區 [y,n,q,a,d%s,?]？ "
373
374 #: add-patch.c
375 #, c-format
@@ -404,7 +409,7 @@ msgstr ""
409 #: add-patch.c
410 #, c-format
411 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
407 -msgstr "從工作區捨棄模式更動 [y,n,q,a,d%s,?]? "
412 +msgstr "從工作區捨棄模式變更 [y,n,q,a,d%s,?]？ "
413
414 #: add-patch.c
415 #, c-format
@@ -444,7 +449,7 @@ msgstr ""
449 #: add-patch.c
450 #, c-format
451 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
447 -msgstr "從索引和工作區捨棄模式更動 [y,n,q,a,d%s,?]? "
452 +msgstr "從索引區和工作區捨棄模式變更 [y,n,q,a,d%s,?]？ "
453
454 #: add-patch.c
455 #, c-format
@@ -478,7 +483,7 @@ msgstr ""
483 #: add-patch.c
484 #, c-format
485 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
481 -msgstr "將模式更動套用到索引和工作區 [y,n,q,a,d%s,?]? "
486 +msgstr "將模式變更套用至索引區和工作區 [y,n,q,a,d%s,?]？ "
487
488 #: add-patch.c
489 #, c-format
@@ -512,7 +517,7 @@ msgstr ""
517 #: add-patch.c
518 #, c-format
519 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
515 -msgstr "將模式更動套用到工作區 [y,n,q,a,d%s,?]? "
520 +msgstr "將模式變更套用至工作區 [y,n,q,a,d%s,?]？ "
521
522 #: add-patch.c
523 #, c-format
@@ -608,9 +613,9 @@ msgid ""
613 "Lines starting with %s will be removed.\n"
614 msgstr ""
615 "---\n"
611 -"要刪除「%c」開頭的列，請將列首（上下文）改成空白。\n"
612 -"要刪除「%c」開頭的列，請直接刪除。\n"
613 -"開頭是 %s 的列將會被移除。\n"
616 +"要移除「%c」開頭的列，請將列首（上下文）改成空白。\n"
617 +"要移除「%c」開頭的列，請直接刪除。\n"
618 +"開頭是 %s 的列會被移除。\n"
619
620 #: add-patch.c
621 msgid ""
@@ -754,11 +759,11 @@ msgstr "「git apply」失敗"
759
760 #: add-patch.c
761 msgid "No changes."
757 -msgstr "沒有更動。"
762 +msgstr "沒有變更。"
763
764 #: add-patch.c
765 msgid "Only binary files changed."
761 -msgstr "只有二進位檔案更動了。"
766 +msgstr "只有二進位檔案變更了。"
767
768 #: advice.c
769 #, c-format
@@ -816,7 +821,7 @@ msgstr "合併尚未結束（有 MERGE_HEAD）。"
821
822 #: advice.c
823 msgid "Please, commit your changes before merging."
819 -msgstr "請在合併前先提交您的更動。"
824 +msgstr "請在合併前先提交您的變更。"
825
826 #: advice.c
827 msgid "Exiting because of unfinished merge."
@@ -912,8 +917,8 @@ msgid ""
917 "sparse-checkout definition but are not sparse due to local\n"
918 "modifications.\n"
919 msgstr ""
915 -"以下路徑已經移到稀疏簽出定義之外的地方，\n"
916 -"但因為有本機更動，因此路徑不是稀疏的。\n"
920 +"以下路徑已移動至稀疏簽出定義以外的位置，\n"
921 +"但因本機修改而不是稀疏的。\n"
922
923 #: advice.c
924 msgid ""
@@ -941,22 +946,22 @@ msgstr "引數過多"
946 #: apply.c
947 #, c-format
948 msgid "unrecognized whitespace option '%s'"
944 -msgstr "空白字元選項「%s」不認識"
949 +msgstr "無法識別空白字元選項「%s」"
950
951 #: apply.c
952 #, c-format
953 msgid "unrecognized whitespace ignore option '%s'"
949 -msgstr "空白字元忽略選項「%s」不認識"
954 +msgstr "無法辨識空白字元忽略選項「%s」"
955
956 #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c
957 #: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c
958 #: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
959 #: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
960 #: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
956 -#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c
957 -#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-parse.c
958 -#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c
959 -#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c
961 +#: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c
962 +#: builtin/replay.c builtin/reset.c builtin/rev-parse.c builtin/show-branch.c
963 +#: builtin/stash.c builtin/submodule--helper.c builtin/tag.c builtin/worktree.c
964 +#: parse-options.c range-diff.c revision.c
965 #, c-format
966 msgid "options '%s' and '%s' cannot be used together"
967 msgstr "無法同時使用「%s」和「%s」選項"
@@ -1080,7 +1085,7 @@ msgstr "二進位修補檔在第 %d 列損壞：%.*s"
1085 #: apply.c
1086 #, c-format
1087 msgid "unrecognized binary patch at line %d"
1083 -msgstr "第 %d 列的二進位修補檔不認識"
1088 +msgstr "無法辨識第 %d 列的二進位修補檔"
1089
1090 #: apply.c
1091 #, c-format
@@ -1294,7 +1299,7 @@ msgstr "%s 子模組缺少 sha1 資訊或沒有幫助"
1299 #: apply.c
1300 #, c-format
1301 msgid "mode change for %s, which is not in current HEAD"
1297 -msgstr "%s 的模式有更動，但其不在目前 HEAD 中"
1302 +msgstr "有 %s 的模式變更，但其不在目前的 HEAD 中"
1303
1304 #: apply.c
1305 #, c-format
@@ -1428,11 +1433,11 @@ msgstr "無法寫入新索引檔案"
1433
1434 #: apply.c
1435 msgid "don't apply changes matching the given path"
1431 -msgstr "不要套用符合提供路徑的更動"
1436 +msgstr "不套用符合提供路徑的變更"
1437
1438 #: apply.c
1439 msgid "apply changes matching the given path"
1435 -msgstr "套用符合提供路徑的更動"
1440 +msgstr "套用符合提供路徑的變更"
1441
1442 #: apply.c builtin/am.c
1443 msgid "num"
@@ -1488,15 +1493,15 @@ msgstr "嘗試三方合併，若失敗則回到正常修補模式"
1493
1494 #: apply.c builtin/merge-file.c
1495 msgid "for conflicts, use our version"
1491 -msgstr "如果衝突，使用我們的版本"
1496 +msgstr "如有衝突，使用我方版本"
1497
1498 #: apply.c builtin/merge-file.c
1499 msgid "for conflicts, use their version"
1495 -msgstr "如果衝突，使用他們的版本"
1500 +msgstr "如有衝突，使用他方版本"
1501
1502 #: apply.c builtin/merge-file.c
1503 msgid "for conflicts, use a union version"
1499 -msgstr "如果衝突，使用聯合版本"
1504 +msgstr "如有衝突，使用聯集版本"
1505
1506 #: apply.c
1507 msgid "build a temporary index based on embedded index information"
@@ -1521,7 +1526,7 @@ msgstr "檢查新增和修改的列中間，是否有空白字元誤用"
1526
1527 #: apply.c
1528 msgid "ignore changes in whitespace when finding context"
1524 -msgstr "尋找上下文時忽略空白字元更動"
1529 +msgstr "尋找上下文時忽略空白字元變更"
1530
1531 #: apply.c
1532 msgid "apply the patch in reverse"
@@ -1831,7 +1836,7 @@ msgstr "忽略過大的 gitattributes 資料物件「%s」"
1836
1837 #: attr.c
1838 msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo"
1834 -msgstr "沒有版本庫無法使用 --attr-source 或 GIT_ATTR_SOURCE"
1839 +msgstr "沒有版本庫不能使用 --attr-source 或 GIT_ATTR_SOURCE"
1840
1841 #: attr.c
1842 msgid "bad --attr-source or GIT_ATTR_SOURCE"
@@ -1840,7 +1845,7 @@ msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE"
1845 #: attr.c read-cache.c refs/packed-backend.c
1846 #, c-format
1847 msgid "unable to stat '%s'"
1843 -msgstr "無法統計「%s」"
1848 +msgstr "無法 stat「%s」"
1849
1850 #: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c
1851 #: builtin/pack-objects.c combine-diff.c object-file.c rerere.c
@@ -1930,7 +1935,7 @@ msgstr "無法建立「%s」檔案"
1935 #: bisect.c builtin/notes.c
1936 #, c-format
1937 msgid "unable to start 'show' for object '%s'"
1933 -msgstr "無法為物件「%s」開始「show」"
1938 +msgstr "無法對物件「%s」執行「show」"
1939
1940 #: bisect.c builtin/merge.c
1941 #, c-format
@@ -2190,7 +2195,7 @@ msgstr "無法 chmod %cx '%s'"
2195
2196 #: builtin/add.c
2197 msgid "Unstaged changes after refreshing the index:"
2193 -msgstr "重新整理索引之後，尚未被暫存的更動："
2198 +msgstr "重新整理索引之後未暫存的變更："
2199
2200 #: builtin/add.c
2201 msgid "could not read the index"
@@ -2203,7 +2208,7 @@ msgstr "編輯修補檔失敗"
2208 #: builtin/add.c read-cache.c
2209 #, c-format
2210 msgid "could not stat '%s'"
2206 -msgstr "無法統計「%s」"
2211 +msgstr "無法 stat「%s」"
2212
2213 #: builtin/add.c
2214 msgid "empty patch. aborted"
@@ -2260,7 +2265,7 @@ msgstr "只記錄「路徑稍後會再加入」"
2265
2266 #: builtin/add.c
2267 msgid "add changes from all tracked and untracked files"
2263 -msgstr "從所有已追蹤和未追蹤檔案加入更動"
2268 +msgstr "加入所有已追蹤和未追蹤檔案的變更"
2269
2270 #: builtin/add.c
2271 msgid "ignore paths removed in the working tree (same as --no-all)"
@@ -2334,6 +2339,12 @@ msgstr "如果您確定想要加入它們，請使用 -f。"
2339 msgid "adding files failed"
2340 msgstr "加入檔案失敗"
2341
2342 +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
2343 +#: builtin/stash.c
2344 +#, c-format
2345 +msgid "'%s' cannot be negative"
2346 +msgstr "「%s」不能是負數"
2347 +
2348 #: builtin/add.c
2349 #, c-format
2350 msgid "--chmod param '%s' must be either -x or +x"
@@ -2372,7 +2383,7 @@ msgid "bad action '%s' for '%s'"
2383 msgstr "「%s」動作對「%s」無效"
2384
2385 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
2375 -#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c
2386 +#: builtin/pull.c builtin/revert.c diff-merges.c environment.c gpg-interface.c
2387 #: ls-refs.c parallel-checkout.c sequencer.c setup.c
2388 #, c-format
2389 msgid "invalid value for '%s': '%s'"
@@ -2463,7 +2474,7 @@ msgstr "解決此問題後，請執行「%s --continue」。\n"
2474 #: builtin/am.c
2475 #, c-format
2476 msgid "If you prefer to skip this patch, run \"%s --skip\" instead.\n"
2466 -msgstr "若要略過此修補，請改執行「%s --skip」。\n"
2477 +msgstr "若要略過此修補檔，請改執行「%s --skip」。\n"
2478
2479 #: builtin/am.c
2480 #, c-format
@@ -2517,7 +2528,7 @@ msgstr "正在回復到修補基礎處，並進行三方合併……"
2528
2529 #: builtin/am.c
2530 msgid "Failed to merge in the changes."
2520 -msgstr "無法合併更動。"
2531 +msgstr "合併變更失敗。"
2532
2533 #: builtin/am.c builtin/merge.c sequencer.c
2534 msgid "git write-tree failed to write a tree"
@@ -2952,7 +2963,7 @@ msgstr "無法開啟檔案「%s」"
2963 #: builtin/bisect.c
2964 #, c-format
2965 msgid "Invalid command: you're currently in a %s/%s bisect"
2955 -msgstr "命令無效：您正處於二分搜尋 %s/%s 的狀態"
2966 +msgstr "命令無效：您正處於採用 %s/%s 術語的二分搜尋"
2967
2968 #: builtin/bisect.c
2969 #, c-format
@@ -3036,7 +3047,7 @@ msgstr "「 」不是有效術語"
3047 #: builtin/bisect.c
3048 #, c-format
3049 msgid "unrecognized option: '%s'"
3039 -msgstr "不認識選項：「%s」"
3050 +msgstr "無法辨識選項：「%s」"
3051
3052 #: builtin/bisect.c
3053 #, c-format
@@ -3129,7 +3140,7 @@ msgstr "好的修訂版回傳偽造的錯誤碼 %d"
3140 #: builtin/bisect.c
3141 #, c-format
3142 msgid "bisect run failed: exit code %d from %s is < 0 or >= 128"
3132 -msgstr "二分搜尋執行失敗：%2$s 回傳的結束代碼 %1$d 小於 0 或大於 128"
3143 +msgstr "二分搜尋執行失敗：%2$s 的結束代碼 %1$d 小於 0 或大於 128"
3144
3145 #: builtin/bisect.c
3146 #, c-format
@@ -3316,11 +3327,11 @@ msgstr "score"
3327
3328 #: builtin/blame.c
3329 msgid "find line copies within and across files"
3319 -msgstr "找到檔案內及跨檔案的列拷貝動作"
3330 +msgstr "尋找檔案內及跨檔案拷貝的列"
3331
3332 #: builtin/blame.c
3333 msgid "find line movements within and across files"
3323 -msgstr "找到檔案內及跨檔案的列移動動作"
3334 +msgstr "尋找檔案內及跨檔案移動的列"
3335
3336 #: builtin/blame.c
3337 msgid "range"
@@ -3399,7 +3410,7 @@ msgid ""
3410 "deleting branch '%s' that has been merged to\n"
3411 " '%s', but not yet merged to HEAD"
3412 msgstr ""
3402 -"將要刪除的分支「%s」已經被合併到\n"
3413 +"要刪除的分支「%s」已經被合併到\n"
3414 " 「%s」，但尚未合併到 HEAD"
3415
3416 # 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長
@@ -3475,7 +3486,7 @@ msgstr "無法解析格式化字串"
3486
3487 #: builtin/branch.c
3488 msgid "could not resolve HEAD"
3478 -msgstr "無法解析 HEAD"
3489 +msgstr "無法解析 HEAD 指標"
3490
3491 #: builtin/branch.c
3492 #, c-format
@@ -3514,34 +3525,34 @@ msgstr "沒有名為「%s」的分支"
3525
3526 #: builtin/branch.c
3527 msgid "branch rename failed"
3517 -msgstr "分支重新命名失敗"
3528 +msgstr "重新命名分支失敗"
3529
3530 #: builtin/branch.c
3531 msgid "branch copy failed"
3521 -msgstr "分支拷貝失敗"
3532 +msgstr "拷貝分支失敗"
3533
3534 #: builtin/branch.c
3535 #, c-format
3536 msgid "created a copy of a misnamed branch '%s'"
3526 -msgstr "已為誤命名的分支「%s」建立拷貝"
3537 +msgstr "已為誤命名的分支「%s」建立複本"
3538
3539 #: builtin/branch.c
3540 #, c-format
3541 msgid "renamed a misnamed branch '%s' away"
3531 -msgstr "已更改誤命名的分支「%s」的名稱"
3542 +msgstr "已將誤命名的分支「%s」重新命名"
3543
3544 #: builtin/branch.c
3545 #, c-format
3546 msgid "branch renamed to %s, but HEAD is not updated"
3536 -msgstr "分支已重新命名為 %s，但 HEAD 指標尚未更新"
3547 +msgstr "分支已重新命名為 %s，但 HEAD 指標並未更新"
3548
3549 #: builtin/branch.c
3550 msgid "branch is renamed, but update of config-file failed"
3540 -msgstr "分支已重新命名，但無法更新組態檔案"
3551 +msgstr "分支已重新命名，但組態檔案更新失敗"
3552
3553 #: builtin/branch.c
3554 msgid "branch is copied, but update of config-file failed"
3544 -msgstr "分支已拷貝，但無法更新組態檔案"
3555 +msgstr "分支已拷貝，但組態檔案更新失敗"
3556
3557 #: builtin/branch.c
3558 #, c-format
@@ -3550,9 +3561,9 @@ msgid ""
3561 " %s\n"
3562 "Lines starting with '%s' will be stripped.\n"
3563 msgstr ""
3553 -"請編輯下述分支的描述\n"
3564 +"請編輯以下分支的描述\n"
3565 " %s\n"
3555 -"開頭是「%s」的列將被刪除。\n"
3566 +"開頭是「%s」的列將被濾除。\n"
3567
3568 #: builtin/branch.c
3569 msgid "Generic options"
@@ -3628,7 +3639,7 @@ msgstr "即使目標已存在，仍移動或重新命名分支"
3639
3640 #: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
3641 msgid "do not output a newline after empty formatted refs"
3631 -msgstr "在格式化結果為空的引用之後，不要輸出換列符號"
3642 +msgstr "在格式化為空字串的引用之後不輸出換列符號"
3643
3644 #: builtin/branch.c
3645 msgid "copy a branch and its reflog"
@@ -3724,11 +3735,11 @@ msgstr "無法編輯超過一個分支的描述"
3735
3736 #: builtin/branch.c
3737 msgid "cannot copy the current branch while not on any"
3727 -msgstr "不在任何分支上，無法拷貝目前分支"
3738 +msgstr "不在任何分支上，不能拷貝目前分支"
3739
3740 #: builtin/branch.c
3741 msgid "cannot rename the current branch while not on any"
3731 -msgstr "不在任何分支上，無法重新命名目前分支"
3742 +msgstr "不在任何分支上，不能重新命名目前分支"
3743
3744 #: builtin/branch.c
3745 msgid "too many branches for a copy operation"
@@ -3746,7 +3757,7 @@ msgstr "要設定新上游的引數太多"
3757 #, c-format
3758 msgid ""
3759 "could not set upstream of HEAD to %s when it does not point to any branch"
3749 -msgstr "無法將 HEAD 的上游設為 %s：其未指向任何分支"
3760 +msgstr "HEAD 不指向任何分支時無法將其上游設為 %s"
3761
3762 #: builtin/branch.c
3763 #, c-format
@@ -3764,7 +3775,7 @@ msgstr "要取消設定上游的引數太多"
3775
3776 #: builtin/branch.c
3777 msgid "could not unset upstream of HEAD when it does not point to any branch"
3767 -msgstr "無法取消設定 HEAD 的上游：其未指向任何分支"
3778 +msgstr "HEAD 不指向任何分支時無法取消設定其上游"
3779
3780 #: builtin/branch.c
3781 #, c-format
@@ -3777,7 +3788,7 @@ msgid ""
3788 "Did you mean to use: -a|-r --list <pattern>?"
3789 msgstr ""
3790 "「git branch」的 -a 和 -r 選項不取分支名稱。\n"
3780 -"您是想使用：-a|-r --list <pattern> 嗎？"
3791 +"您是想使用：-a|-r --list <模式> 嗎？"
3792
3793 #: builtin/branch.c
3794 msgid ""
@@ -3846,8 +3857,8 @@ msgstr ""
3857 "請檢閱臭蟲報告下方的剩餘部分。\n"
3858 "您可刪除任何您不想分享的地方。\n"
3859
3849 -#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c
3850 -#: parse-options.h
3860 +#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c
3861 +#: builtin/pack-objects.c builtin/rebase.c parse-options.h
3862 msgid "mode"
3863 msgstr "mode"
3864
@@ -4003,7 +4014,6 @@ msgid "git cat-file <type> <object>"
4014 msgstr "git cat-file <type> <object>"
4015
4016 #: builtin/cat-file.c
4006 -#| msgid "git cat-file (-e | -p) <object>"
4017 msgid "git cat-file (-e | -p | -t | -s) <object>"
4018 msgstr "git cat-file (-e | -p | -t | -s) <object>"
4019
@@ -4124,7 +4134,7 @@ msgstr "請在 (--textconv | --filters) 使用 <path>，而非「batch」"
4134
4135 #: builtin/cat-file.c
4136 msgid "objects filter only supported in batch mode"
4127 -msgstr "物件過濾器僅支援批次模式"
4137 +msgstr "僅批次模式支援物件過濾器"
4138
4139 #: builtin/cat-file.c
4140 #, c-format
@@ -4205,7 +4215,7 @@ msgstr "<tree-ish>"
4215
4216 #: builtin/check-attr.c
4217 msgid "which tree-ish to check attributes at"
4208 -msgstr "要用哪一個樹狀物件檢查屬性"
4218 +msgstr "要檢查屬性的樹狀物件指示元"
4219
4220 #: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c
4221 msgid "suppress progress reporting"
@@ -4253,7 +4263,7 @@ msgstr "亦從 stdin 讀取聯絡地址"
4263
4264 #: builtin/check-mailmap.c
4265 msgid "read additional mailmap entries from file"
4256 -msgstr "從檔案讀取其他 mailmap 項目"
4266 +msgstr "從檔案讀取額外 mailmap 項目"
4267
4268 #: builtin/check-mailmap.c
4269 msgid "blob"
@@ -4411,12 +4421,12 @@ msgstr "未指定「%2$s」時，必須使用「%1$s」"
4421 #: builtin/checkout.c
4422 #, c-format
4423 msgid "'%s' or '%s' cannot be used with %s"
4414 -msgstr "「%s」或「%s」無法與 %s 一起使用"
4424 +msgstr "「%s」或「%s」不能與 %s 同時使用"
4425
4426 #: builtin/checkout.c
4427 #, c-format
4428 msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree"
4419 -msgstr "「%s」、「%s」或「%s」無法在簽出樹狀物件時使用"
4429 +msgstr "「%s」、「%s」或「%s」不能在簽出樹狀物件時使用"
4430
4431 #: builtin/checkout.c
4432 #, c-format
@@ -4427,7 +4437,7 @@ msgstr "路徑「%s」未合併"
4437 #: merge-ort.c reset.c sequencer.c tree-walk.c
4438 #, c-format
4439 msgid "unable to read tree (%s)"
4430 -msgstr "無法讀取樹（%s）"
4440 +msgstr "無法讀取樹狀物件（%s）"
4441
4442 #: builtin/checkout.c
4443 msgid "you need to resolve your current index first"
@@ -4439,7 +4449,7 @@ msgid ""
4449 "cannot continue with staged changes in the following files:\n"
4450 "%s"
4451 msgstr ""
4442 -"無法繼續，下列檔案有暫存的更動：\n"
4452 +"無法繼續，下列檔案有暫存的變更：\n"
4453 "%s"
4454
4455 #: builtin/checkout.c
@@ -4620,53 +4630,53 @@ msgid ""
4630 "cannot switch branch while merging\n"
4631 "Consider \"git merge --quit\" or \"git worktree add\"."
4632 msgstr ""
4623 -"無法在合併時切換分支\n"
4624 -"請試試「git merge --quit」或「git worktree add」。"
4633 +"不能在合併時切換分支\n"
4634 +"請考慮使用「git merge --quit」或「git worktree add」。"
4635
4636 #: builtin/checkout.c
4637 msgid ""
4638 "cannot switch branch in the middle of an am session\n"
4639 "Consider \"git am --quit\" or \"git worktree add\"."
4640 msgstr ""
4631 -"無法在 am 工作階段期間時切換分支\n"
4632 -"請試試「git am --quit」或「git worktree add」。"
4641 +"不能在 am 工作階段中切換分支\n"
4642 +"請考慮使用「git am --quit」或「git worktree add」。"
4643
4644 #: builtin/checkout.c
4645 msgid ""
4646 "cannot switch branch while rebasing\n"
4647 "Consider \"git rebase --quit\" or \"git worktree add\"."
4648 msgstr ""
4639 -"無法在重定基底時切換分支\n"
4640 -"請試試「git rebase --quit」或「git worktree add」。"
4649 +"不能在重定基底時切換分支\n"
4650 +"請考慮使用「git rebase --quit」或「git worktree add」。"
4651
4652 #: builtin/checkout.c
4653 msgid ""
4654 "cannot switch branch while cherry-picking\n"
4655 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
4656 msgstr ""
4647 -"無法在揀選時切換分支\n"
4648 -"請試試「git cherry-pick --quit」或「git worktree add」。"
4657 +"不能在揀選時切換分支\n"
4658 +"請考慮使用「git cherry-pick --quit」或「git worktree add」。"
4659
4660 #: builtin/checkout.c
4661 msgid ""
4662 "cannot switch branch while reverting\n"
4663 "Consider \"git revert --quit\" or \"git worktree add\"."
4664 msgstr ""
4655 -"無法在還原時切換分支\n"
4656 -"請試試「git revert --quit」或「git worktree add」。"
4665 +"不能在還原時切換分支\n"
4666 +"請考慮使用「git revert --quit」或「git worktree add」。"
4667
4668 #: builtin/checkout.c
4669 msgid "you are switching branch while bisecting"
4660 -msgstr "您在進行二分搜尋時切換分支"
4670 +msgstr "在進行二分搜尋時切換分支"
4671
4672 #: builtin/checkout.c
4673 msgid "paths cannot be used with switching branches"
4664 -msgstr "路徑不能與切換分支同時使用"
4674 +msgstr "切換分支時不能指定路徑"
4675
4676 #: builtin/checkout.c
4677 #, c-format
4678 msgid "'%s' cannot be used with switching branches"
4669 -msgstr "「%s」不能與切換分支同時使用"
4679 +msgstr "切換分支時不能指定「%s」"
4680
4681 #: builtin/checkout.c
4682 #, c-format
@@ -4681,12 +4691,12 @@ msgstr "「%s」不能與「%s」同時使用"
4691 #: builtin/checkout.c
4692 #, c-format
4693 msgid "'%s' cannot take <start-point>"
4684 -msgstr "「%s」不取 <start-point>"
4694 +msgstr "「%s」不能與 <start-point> 同時使用"
4695
4696 #: builtin/checkout.c
4697 #, c-format
4698 msgid "Cannot switch branch to a non-commit '%s'"
4689 -msgstr "無法將分支切換至非提交項目「%s」"
4699 +msgstr "不能將分支切換至非提交的「%s」"
4700
4701 #: builtin/checkout.c
4702 msgid "missing branch or commit argument"
@@ -4711,7 +4721,7 @@ msgstr "衝突輸出風格（merge、diff3 或 zdiff3）"
4721
4722 #: builtin/checkout.c builtin/worktree.c
4723 msgid "detach HEAD at named commit"
4714 -msgstr "自指定提交分離 HEAD 指標"
4724 +msgstr "使 HEAD 指標在指定提交分離"
4725
4726 #: builtin/checkout.c
4727 msgid "force checkout (throw away local modifications)"
@@ -4731,24 +4741,24 @@ msgstr "更新忽略的檔案（預設值）"
4741
4742 #: builtin/checkout.c
4743 msgid "do not check if another worktree is using this branch"
4734 -msgstr "不檢查其他工作區是否正在使用此分支"
4744 +msgstr "不檢查是否有其他工作區在使用此分支"
4745
4746 #: builtin/checkout.c
4747 msgid "checkout our version for unmerged files"
4738 -msgstr "對尚未合併的檔案簽出我們的版本"
4748 +msgstr "簽出未合併檔案的我方版本"
4749
4750 #: builtin/checkout.c
4751 msgid "checkout their version for unmerged files"
4742 -msgstr "對尚未合併的檔案簽出他們的版本"
4752 +msgstr "簽出未合併檔案的他方版本"
4753
4754 #: builtin/checkout.c
4755 msgid "do not limit pathspecs to sparse entries only"
4746 -msgstr "對路徑規格不做稀疏簽出的限制"
4756 +msgstr "不將路徑規格限制為僅稀疏項目"
4757
4758 #: builtin/checkout.c
4759 #, c-format
4760 msgid "options '-%c', '-%c', and '%s' cannot be used together"
4751 -msgstr "「-%c」、「-%c」和「%s」選項不得同時使用"
4761 +msgstr "「-%c」、「-%c」和「%s」選項不能同時使用"
4762
4763 #: builtin/checkout.c
4764 msgid "--track needs a branch name"
@@ -4757,7 +4767,7 @@ msgstr "--track 需要分支名稱"
4767 #: builtin/checkout.c
4768 #, c-format
4769 msgid "missing branch name; try -%c"
4760 -msgstr "缺少分支名稱，請嘗試 -%c"
4770 +msgstr "缺少分支名稱；請嘗試 -%c"
4771
4772 #: builtin/checkout.c
4773 #, c-format
@@ -4766,25 +4776,24 @@ msgstr "無法解析 %s"
4776
4777 #: builtin/checkout.c
4778 msgid "invalid path specification"
4769 -msgstr "無效的路徑規格"
4779 +msgstr "路徑規格無效"
4780
4781 #: builtin/checkout.c
4782 #, c-format
4783 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
4774 -msgstr "「%s」不是提交，因此不能以這為基礎建立「%s」分支"
4784 +msgstr "「%s」不是提交，不能建立以其為基底的分支「%s」"
4785
4786 #: builtin/checkout.c
4787 #, c-format
4788 msgid "git checkout: --detach does not take a path argument '%s'"
4779 -msgstr "git checkout：--detach 不取路徑引數「%s」"
4789 +msgstr "git checkout: --detach 不取路徑引數「%s」"
4790
4791 #: builtin/checkout.c
4792 msgid ""
4793 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4794 "checking out of the index."
4795 msgstr ""
4786 -"git checkout：在從索引簽出時，--ours/--theirs、--force\n"
4787 -"和 --merge 不相容。"
4796 +"git checkout: 從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。"
4797
4798 #: builtin/checkout.c
4799 msgid "you must specify path(s) to restore"
@@ -4809,7 +4818,7 @@ msgstr "為新分支建立引用日誌"
4818
4819 #: builtin/checkout.c
4820 msgid "second guess 'git checkout <no-such-branch>' (default)"
4812 -msgstr "二次猜測「git checkout <無此分支>」（預設值）"
4821 +msgstr "接著猜測「git checkout <不存在的分支>」（預設值）"
4822
4823 #: builtin/checkout.c
4824 msgid "use overlay mode (default)"
@@ -5074,7 +5083,7 @@ msgstr "建立連結「%s」失敗"
5083 #: builtin/clone.c
5084 #, c-format
5085 msgid "failed to copy file to '%s'"
5077 -msgstr "複製檔案至「%s」失敗"
5086 +msgstr "拷貝檔案至「%s」失敗"
5087
5088 #: builtin/clone.c refs/files-backend.c
5089 #, c-format
@@ -6255,25 +6264,27 @@ msgstr "git config list [<檔案選項>] [<顯示選項>] [--includes]"
6264 #: builtin/config.c
6265 msgid ""
6266 "git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
6258 -"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
6267 +"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
6268 +"url=<url>] <name>"
6269 msgstr ""
6260 -"git config get [<檔案選項>] [<顯示選項>] [--includes] [--all] [--regexp] [--"
6261 -"value=<值>] [--fixed-value] [--default=<預設值>] <名稱>"
6270 +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
6271 +"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
6272 +"url=<url>] <name>"
6273
6274 #: builtin/config.c
6275 msgid ""
6265 -"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
6266 -"fixed-value] <name> <value>"
6276 +"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
6277 +"[--fixed-value] <name> <value>"
6278 msgstr ""
6268 -"git config set [<檔案選項>] [--type=<類型>] [--all] [--value=<值>] [--fixed-"
6269 -"value] <名稱> <值>"
6279 +"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
6280 +"[--fixed-value] <name> <value>"
6281
6282 #: builtin/config.c
6283 msgid ""
6273 -"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
6284 +"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
6285 "<name>"
6286 msgstr ""
6276 -"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
6287 +"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
6288 "<name>"
6289
6290 #: builtin/config.c
@@ -6295,19 +6306,20 @@ msgstr "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"
6306 #: builtin/config.c
6307 msgid ""
6308 "git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
6298 -"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
6309 +"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
6310 "<name>"
6311 msgstr ""
6301 -"git config get [<檔案選項>] [<顯示選項>] [--includes] [--all] [--regexp=<常規"
6302 -"表示式>] [--value=<值>] [--fixed-value] [--default=<預設值>] <名稱>"
6312 +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
6313 +"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
6314 +"<name>"
6315
6316 #: builtin/config.c
6317 msgid ""
6318 "git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
6307 -"[--value=<value>] [--fixed-value] <name> <value>"
6319 +"[--value=<pattern>] [--fixed-value] <name> <value>"
6320 msgstr ""
6309 -"git config set [<檔案選項>] [--type=<類型>] [--comment=<備註>] [--all] [--"
6310 -"value=<值>] [--fixed-value] <名稱> <值>"
6321 +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
6322 +"[--value=<pattern>] [--fixed-value] <name> <value>"
6323
6324 #: builtin/config.c
6325 msgid "Config file location"
@@ -6934,7 +6946,6 @@ msgid "unable to parse object id: %s"
6946 msgstr "無法解析物件 ID：%s"
6947
6948 #: builtin/diff-pairs.c
6937 -#| msgid "git repack [<options>]"
6949 msgid "git diff-pairs -z [<diff-options>]"
6950 msgstr "git diff-pairs -z [<diff-options>]"
6951
@@ -6975,7 +6986,7 @@ msgstr "讀取目的地路徑時遇到 EOF"
6986 #: builtin/diff-pairs.c
6987 #, c-format
6988 msgid "unable to parse rename/copy score: %s"
6978 -msgstr "無法解析重新命名/複製分數：%s"
6989 +msgstr "無法解析重新命名/拷貝分數：%s"
6990
6991 #: builtin/diff-pairs.c
6992 #, c-format
@@ -7068,7 +7079,7 @@ msgstr "工作區檔案被留了下來。"
7079 #: builtin/difftool.c sequencer.c
7080 #, c-format
7081 msgid "could not copy '%s' to '%s'"
7071 -msgstr "無法將「%s」複製到「%s」"
7082 +msgstr "無法將「%s」拷貝至「%s」"
7083
7084 #: builtin/difftool.c
7085 #, c-format
@@ -7378,27 +7389,6 @@ msgstr "%s 未傳送所有必需的物件"
7389 msgid "rejected %s because shallow roots are not allowed to be updated"
7390 msgstr "已拒絕 %s，不允許更新淺複製"
7391
7381 -#: builtin/fetch.c
7382 -#, c-format
7383 -msgid ""
7384 -"some local refs could not be updated; try running\n"
7385 -" 'git remote prune %s' to remove any old, conflicting branches"
7386 -msgstr ""
7387 -"一些本機引用不能被更新；嘗試執行\n"
7388 -" 'git remote prune %s' 來刪除舊的、有衝突的分支"
7389 -
7390 -# 譯者：請維持前導空格
7391 -#: builtin/fetch.c
7392 -#, c-format
7393 -msgid " (%s will become dangling)"
7394 -msgstr " （%s 將成為懸空狀態）"
7395 -
7396 -# 譯者：請維持前導空格
7397 -#: builtin/fetch.c
7398 -#, c-format
7399 -msgid " (%s has become dangling)"
7400 -msgstr " （%s 已成為懸空狀態）"
7401 -
7392 #: builtin/fetch.c
7393 msgid "[deleted]"
7394 msgstr "[已刪除]"
@@ -7422,7 +7412,7 @@ msgstr "選項「%s」的值「%s」對 %s 無效"
7412 msgid "option \"%s\" is ignored for %s"
7413 msgstr "選項「%s」被 %s 忽略"
7414
7425 -#: builtin/fetch.c object-store.c
7415 +#: builtin/fetch.c odb.c
7416 #, c-format
7417 msgid "%s is not a valid object"
7418 msgstr "%s 不是一個有效的物件"
@@ -7441,12 +7431,26 @@ msgid ""
7431 "'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
7432 "will disable the warning until the remote changes HEAD to something else."
7433 msgstr ""
7444 -"執行「git remote set-head %s %s」來跟進此差異，或者\n"
7434 +"執行「git remote set-head %s %s」來追蹤此差異，或者\n"
7435 "如果您不想看到這則訊息，請將「remote.%s.followRemoteHEAD」組態選項\n"
7436 "設定成別的值。更具體些來說，執行\n"
7437 "「git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s」\n"
7438 "會停用這個警告，直到遠端將 HEAD 改為指向其他東西。"
7439
7440 +#: builtin/fetch.c
7441 +#, c-format
7442 +msgid ""
7443 +"some local refs could not be updated; try running\n"
7444 +" 'git remote prune %s' to remove any old, conflicting branches"
7445 +msgstr ""
7446 +"一些本機引用不能被更新；嘗試執行\n"
7447 +" 'git remote prune %s' 來刪除舊的、有衝突的分支"
7448 +
7449 +#: builtin/fetch.c
7450 +#, c-format
7451 +msgid "fetching ref %s failed: %s"
7452 +msgstr "取回 %s 引用失敗：%s"
7453 +
7454 #: builtin/fetch.c
7455 msgid "multiple branches detected, incompatible with --set-upstream"
7456 msgstr "檢測到多分支，和 --set-upstream 不相容"
@@ -7746,6 +7750,10 @@ msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
7750 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
7751 msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
7752
7753 +#: builtin/for-each-ref.c
7754 +msgid "git for-each-ref [--start-after <marker>]"
7755 +msgstr "git for-each-ref [--start-after <marker>]"
7756 +
7757 #: builtin/for-each-ref.c
7758 msgid "quote placeholders suitably for shells"
7759 msgstr "引用占位符適用於 shells"
@@ -7766,6 +7774,14 @@ msgstr "引用占位符適用於 Tcl"
7774 msgid "show only <n> matched refs"
7775 msgstr "只顯示 <n> 個符合的引用"
7776
7777 +#: builtin/for-each-ref.c
7778 +msgid "marker"
7779 +msgstr "標記點"
7780 +
7781 +#: builtin/for-each-ref.c
7782 +msgid "start iteration after the provided marker"
7783 +msgstr "在指定標記點後開始迭代"
7784 +
7785 #: builtin/for-each-ref.c builtin/tag.c
7786 msgid "respect format colors"
7787 msgstr "遵照格式中的顏色輸出"
@@ -7798,10 +7814,18 @@ msgstr "從 stdin 讀取引用模式"
7814 msgid "also include HEAD ref and pseudorefs"
7815 msgstr "包含 HEAD 引用和偽引用"
7816
7817 +#: builtin/for-each-ref.c
7818 +msgid "cannot use --start-after with custom sort options"
7819 +msgstr "無法將 --start-after 和自訂排序選項結合使用"
7820 +
7821 #: builtin/for-each-ref.c
7822 msgid "unknown arguments supplied with --stdin"
7823 msgstr "為 --stdin 提供的引數未知"
7824
7825 +#: builtin/for-each-ref.c
7826 +msgid "cannot use --start-after with patterns"
7827 +msgstr "--start-after 無法搭配 pattern 使用"
7828 +
7829 #: builtin/for-each-repo.c
7830 msgid "git for-each-repo --config=<config> [--] <arguments>"
7831 msgstr "git for-each-repo --config=<config> [--] <arguments>"
@@ -8040,11 +8064,6 @@ msgid "Checking ref database"
8064 msgstr "正在檢查引用資料庫"
8065
8066 #: builtin/fsck.c
8043 -#| msgid ""
8044 -#| "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
8045 -#| " [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
8046 -#| " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
8047 -#| " [--[no-]name-objects] [<object>...]"
8067 msgid ""
8068 "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
8069 " [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
@@ -8308,6 +8327,10 @@ msgstr "除了最大的包之外，對所有其它包重新打包"
8327 msgid "pack prefix to store a pack containing pruned objects"
8328 msgstr "將前綴打包並儲存為包含已剪除物件的包"
8329
8330 +#: builtin/gc.c
8331 +msgid "skip maintenance tasks typically done in the foreground"
8332 +msgstr "略過通常在前景完成的維護作業"
8333 +
8334 #: builtin/gc.c
8335 #, c-format
8336 msgid "failed to parse gc.logExpiry value %s"
@@ -8394,13 +8417,13 @@ msgstr "略過增量重新打包工作，因為 core.multiPackIndex 已被停用
8417
8418 #: builtin/gc.c
8419 #, c-format
8397 -msgid "lock file '%s' exists, skipping maintenance"
8398 -msgstr "已存在 '%s' 鎖定檔案，略過維護"
8420 +msgid "task '%s' failed"
8421 +msgstr "作業 '%s' 失敗"
8422
8423 #: builtin/gc.c
8424 #, c-format
8402 -msgid "task '%s' failed"
8403 -msgstr "作業 '%s' 失敗"
8425 +msgid "lock file '%s' exists, skipping maintenance"
8426 +msgstr "已存在 '%s' 鎖定檔案，略過維護"
8427
8428 #: builtin/gc.c
8429 #, c-format
@@ -8440,10 +8463,6 @@ msgstr "作業"
8463 msgid "run a specific task"
8464 msgstr "執行指定作業"
8465
8443 -#: builtin/gc.c
8444 -msgid "use at most one of --auto and --schedule=<frequency>"
8445 -msgstr "--auto 和 --schedule=<頻率> 請任選一"
8446 -
8466 #: builtin/gc.c
8467 #, c-format
8468 msgid "unable to add '%s' value of '%s'"
@@ -9287,7 +9306,7 @@ msgstr "無法啟動 pack-objects 來重新打包本機連結"
9306
9307 #: builtin/index-pack.c
9308 msgid "failed to feed local object to pack-objects"
9290 -msgstr "無法將本機物件喂給 pack-objects"
9309 +msgstr "無法將本機物件餵給 pack-objects"
9310
9311 #: builtin/index-pack.c
9312 msgid "index-pack: Expecting full hex object ID lines only from pack-objects."
@@ -9538,11 +9557,6 @@ msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱
9557 msgid "-L<range>:<file> cannot be used with pathspec"
9558 msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用"
9559
9541 -#: builtin/log.c
9542 -#, c-format
9543 -msgid "Final output: %d %s\n"
9544 -msgstr "最終輸出：%d %s\n"
9545 -
9560 #: builtin/log.c
9561 #, c-format
9562 msgid "git show %s: bad file"
@@ -10155,7 +10169,7 @@ msgstr "保留主旨中不是 PATCH 的方括號"
10169
10170 #: builtin/mailinfo.c
10171 msgid "copy Message-ID to the end of commit message"
10158 -msgstr "複製 Message-ID 至提交說明末尾"
10172 +msgstr "拷貝 Message-ID 至提交說明末尾"
10173
10174 #: builtin/mailinfo.c
10175 msgid "re-code metadata to i18n.commitEncoding"
@@ -10447,6 +10461,10 @@ msgstr "在合併的最後顯示差異統計"
10461 msgid "(synonym to --stat)"
10462 msgstr "（和 --stat 同義）"
10463
10464 +#: builtin/merge.c builtin/pull.c
10465 +msgid "show a compact-summary at the end of the merge"
10466 +msgstr "在合併結尾顯示精要摘要 (compact-summary)"
10467 +
10468 #: builtin/merge.c builtin/pull.c
10469 msgid "add (at most <n>) entries from shortlog to merge commit message"
10470 msgstr "在合併提交說明中新增（最多 <n> 條）精簡提交記錄"
@@ -10775,11 +10793,6 @@ msgstr "警告：標籤輸入未通過 fsck：%s"
10793 msgid "error: tag input does not pass fsck: %s"
10794 msgstr "錯誤：標籤輸入未通過 fsck：%s"
10795
10778 -#: builtin/mktag.c
10779 -#, c-format
10780 -msgid "%d (FSCK_IGNORE?) should never trigger this callback"
10781 -msgstr "%d (FSCK_IGNORE?) 不應觸發這個回呼函式"
10782 -
10796 #: builtin/mktag.c
10797 #, c-format
10798 msgid "could not read tagged object '%s'"
@@ -10873,12 +10886,10 @@ msgid ""
10886 msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中"
10887
10888 #: builtin/mv.c
10876 -#| msgid "git mv [<options>] <source>... <destination>"
10889 msgid "git mv [-v] [-f] [-n] [-k] <source> <destination>"
10890 msgstr "git mv [-v] [-f] [-n] [-k] <source> <destination>"
10891
10892 #: builtin/mv.c
10881 -#| msgid "git mv [<options>] <source>... <destination>"
10893 msgid "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"
10894 msgstr "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"
10895
@@ -11047,7 +11058,7 @@ msgstr ""
11058
11059 #: builtin/notes.c
11060 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
11050 -msgstr "git notes [--ref <註解引用>] copy [-f] <來源物件> <目標物件>"
11061 +msgstr "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
11062
11063 #: builtin/notes.c
11064 msgid ""
@@ -11094,11 +11105,11 @@ msgstr "git notes add [<選項>] [<物件>]"
11105
11106 #: builtin/notes.c
11107 msgid "git notes copy [<options>] <from-object> <to-object>"
11097 -msgstr "git notes copy [<選項>] <來源物件> <目標物件>"
11108 +msgstr "git notes copy [<options>] <from-object> <to-object>"
11109
11110 #: builtin/notes.c
11111 msgid "git notes copy --stdin [<from-object> <to-object>]..."
11101 -msgstr "git notes copy --stdin [<來源物件> <目標物件>]..."
11112 +msgstr "git notes copy --stdin [<from-object> <to-object>]..."
11113
11114 #: builtin/notes.c
11115 msgid "git notes append [<options>] [<object>]"
@@ -11181,7 +11192,7 @@ msgstr "不能從非資料物件 '%s' 中讀取註解資料。"
11192 #: builtin/notes.c
11193 #, c-format
11194 msgid "failed to copy notes from '%s' to '%s'"
11184 -msgstr "從 '%s' 複製註解到 '%s' 時失敗"
11195 +msgstr "將註解從「%s」拷貝至「%s」失敗"
11196
11197 #. TRANSLATORS: the first %s will be replaced by a git
11198 #. notes command: 'add', 'merge', 'remove', etc.
@@ -11270,12 +11281,12 @@ msgstr "太少參數"
11281 msgid ""
11282 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
11283 "existing notes"
11273 -msgstr "不能複製註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解"
11284 +msgstr "無法拷貝註解。物件 %s 已有註解。使用「-f」覆寫現有的註解"
11285
11286 #: builtin/notes.c
11287 #, c-format
11288 msgid "missing notes on source object %s. Cannot copy."
11278 -msgstr "來源物件 %s 缺少註解。不能複製。"
11289 +msgstr "來源物件 %s 缺少註解。無法拷貝。"
11290
11291 #: builtin/notes.c
11292 #, c-format
@@ -11425,14 +11436,27 @@ msgstr "從 <註解引用> 使用註解"
11436 msgid "unknown subcommand: `%s'"
11437 msgstr "未知子指令：「%s」"
11438
11428 -#: builtin/pack-objects.c
11429 -msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
11430 -msgstr "git pack-objects --stdout [<選項>] [< <引用列表> | < <物件列表>]"
11431 -
11439 #: builtin/pack-objects.c
11440 msgid ""
11434 -"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
11435 -msgstr "git pack-objects [<選項>] <前綴名稱> [< <引用列表> | < <物件列表>]"
11441 +"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
11442 +"implied]\n"
11443 +" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
11444 +" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
11445 +" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
11446 +" [--cruft] [--cruft-expiration=<time>]\n"
11447 +" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
11448 +" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
11449 +" [--name-hash-version=<n>] [--path-walk] < <object-list>"
11450 +msgstr ""
11451 +"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
11452 +"implied]\n"
11453 +" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
11454 +" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
11455 +" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
11456 +" [--cruft] [--cruft-expiration=<time>]\n"
11457 +" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
11458 +" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
11459 +" [--name-hash-version=<n>] [--path-walk] < <object-list>"
11460
11461 #: builtin/pack-objects.c
11462 #, c-format
@@ -11560,6 +11584,16 @@ msgstr "無法為標籤 %s 壓縮物件"
11584 msgid "unable to get type of object %s"
11585 msgstr "無法獲得物件 %s 類型"
11586
11587 +#: builtin/pack-objects.c
11588 +msgid "Compressing objects by path"
11589 +msgstr "正在根據路徑壓縮物件"
11590 +
11591 +#: builtin/pack-objects.c
11592 +#, c-format
11593 +msgid "Path-based delta compression using up to %d thread"
11594 +msgid_plural "Path-based delta compression using up to %d threads"
11595 +msgstr[0] "使用最多 %d 個執行緒進行路徑式差異壓縮"
11596 +
11597 #: builtin/pack-objects.c
11598 msgid "Compressing objects"
11599 msgstr "壓縮物件中"
@@ -11650,6 +11684,10 @@ msgstr "無法檢查 %s 處的鬆散物件"
11684 msgid "unable to force loose object"
11685 msgstr "無法強制鬆散物件"
11686
11687 +#: builtin/pack-objects.c
11688 +msgid "failed to pack objects via path-walk"
11689 +msgstr "無法使用 path-walk 封裝物件"
11690 +
11691 #: builtin/pack-objects.c
11692 #, c-format
11693 msgid "not a rev '%s'"
@@ -11794,6 +11832,10 @@ msgstr "使用稀疏可以取得性演算法"
11832 msgid "create thin packs"
11833 msgstr "建立精簡包"
11834
11835 +#: builtin/pack-objects.c
11836 +msgid "use the path-walk API to walk objects when possible"
11837 +msgstr "可行時使用 path-walk API 走訪物件"
11838 +
11839 #: builtin/pack-objects.c
11840 msgid "create packs suitable for shallow fetches"
11841 msgstr "建立適合淺複製版本庫取得的包"
@@ -11864,7 +11906,12 @@ msgstr "增量鏈深度 %d 太深了，強制為 %d"
11906 msgid "pack.deltaCacheLimit is too high, forcing %d"
11907 msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d"
11908
11867 -#: builtin/pack-objects.c config.c
11909 +#: builtin/pack-objects.c
11910 +#, c-format
11911 +msgid "cannot use %s with %s"
11912 +msgstr "無法將 %s 與 %s 一起使用"
11913 +
11914 +#: builtin/pack-objects.c environment.c
11915 #, c-format
11916 msgid "bad pack compression level %d"
11917 msgstr "錯誤的打包壓縮級別 %d"
@@ -11881,10 +11928,6 @@ msgstr "最小的包檔案大小是 1 MiB"
11928 msgid "--thin cannot be used to build an indexable pack"
11929 msgstr "--thin 不能用於建立一個可索引包"
11930
11884 -#: builtin/pack-objects.c
11885 -msgid "cannot use --filter with --stdin-packs"
11886 -msgstr "無法將 --filter 及 --stdin-packs 結合使用"
11887 -
11931 #: builtin/pack-objects.c
11932 msgid "cannot use internal rev list with --stdin-packs"
11933 msgstr "無法將內部版本清單與 --stdin-packs 結合使用"
@@ -11893,10 +11936,6 @@ msgstr "無法將內部版本清單與 --stdin-packs 結合使用"
11936 msgid "cannot use internal rev list with --cruft"
11937 msgstr "無法透過 --cruft 使用內部修訂清單"
11938
11896 -#: builtin/pack-objects.c
11897 -msgid "cannot use --stdin-packs with --cruft"
11898 -msgstr "無法將 --stdin-packs 與 --cruft 組合使用"
11899 -
11939 #: builtin/pack-objects.c
11940 msgid "Enumerating objects"
11941 msgstr "枚舉物件"
@@ -11910,24 +11949,6 @@ msgstr ""
11949 "總共 %<PRIu32> (差異 %<PRIu32>)，復用 %<PRIu32> (差異 %<PRIu32>)，重用包 "
11950 "%<PRIu32> (總共 %<PRIuMAX>)"
11951
11913 -#: builtin/pack-redundant.c
11914 -msgid ""
11915 -"'git pack-redundant' is nominated for removal.\n"
11916 -"If you still use this command, please add an extra\n"
11917 -"option, '--i-still-use-this', on the command line\n"
11918 -"and let us know you still use it by sending an e-mail\n"
11919 -"to <git@vger.kernel.org>. Thanks.\n"
11920 -msgstr ""
11921 -"「git pack-redundant」已被提名準備移除。\n"
11922 -"如果您仍在使用這條命令，請在命令列多加一個選項\n"
11923 -"「--i-still-use-this」，然後寄封電子信到\n"
11924 -"<git@vger.kernel.org> 讓我們知道您還在使用。\n"
11925 -"感謝。\n"
11926 -
11927 -#: builtin/pack-redundant.c
11928 -msgid "refusing to run without --i-still-use-this"
11929 -msgstr "傳入 --i-still-use-this 前拒絕執行"
11930 -
11952 #: builtin/pack-refs.c
11953 msgid ""
11954 "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
@@ -13450,6 +13471,16 @@ msgstr ""
13471 msgid "unknown --mirror argument: %s"
13472 msgstr "未知的 --mirror 引數：%s"
13473
13474 +#: builtin/remote.c
13475 +#, c-format
13476 +msgid "remote name '%s' is a subset of existing remote '%s'"
13477 +msgstr "名為「%s」的遠端是「%s」現有遠端的子集"
13478 +
13479 +#: builtin/remote.c
13480 +#, c-format
13481 +msgid "remote name '%s' is a superset of existing remote '%s'"
13482 +msgstr "名為「%s」的遠端是「%s」現有遠端的超集"
13483 +
13484 #: builtin/remote.c
13485 msgid "fetch the remote branches"
13486 msgstr "抓取遠端的分支"
@@ -13812,18 +13843,6 @@ msgstr "不是一個有效引用：%s"
13843 msgid "Could not set up %s"
13844 msgstr "無法配置 %s"
13845
13815 -# 譯者：請維持前導空格
13816 -#: builtin/remote.c
13817 -#, c-format
13818 -msgid " %s will become dangling!"
13819 -msgstr " %s 將成為懸空狀態！"
13820 -
13821 -# 譯者：請維持前導空格
13822 -#: builtin/remote.c
13823 -#, c-format
13824 -msgid " %s has become dangling!"
13825 -msgstr " %s 已成為懸空狀態！"
13826 -
13846 #: builtin/remote.c
13847 #, c-format
13848 msgid "Pruning %s"
@@ -13907,11 +13926,11 @@ msgstr "詳細輸出；必須置於子指令之前"
13926 msgid ""
13927 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
13928 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
13910 -"[--write-midx] [--name-hash-version=<n>]"
13929 +"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
13930 msgstr ""
13931 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
13932 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
13914 -"[--write-midx] [--name-hash-version=<n>]"
13933 +"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
13934
13935 #: builtin/repack.c
13936 msgid ""
@@ -14012,6 +14031,10 @@ msgid ""
14031 "specify the name hash version to use for grouping similar objects by path"
14032 msgstr "指定要用來以路徑為相似物件分組的名稱雜湊版本"
14033
14034 +#: builtin/repack.c
14035 +msgid "pass --path-walk to git-pack-objects"
14036 +msgstr "將 --path-walk 傳遞給 git-pack-objects"
14037 +
14038 #: builtin/repack.c
14039 msgid "do not run git-update-server-info"
14040 msgstr "不執行 git-update-server-info"
@@ -15428,20 +15451,28 @@ msgstr ""
15451 msgid "git stash create [<message>]"
15452 msgstr "git stash create [<message>]"
15453
15454 +#: builtin/stash.c
15455 +msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
15456 +msgstr "git stash export (--print | --to-ref <ref>) [<stash>...]"
15457 +
15458 +#: builtin/stash.c
15459 +msgid "git stash import <commit>"
15460 +msgstr "git stash import <commit>"
15461 +
15462 #: builtin/stash.c
15463 #, c-format
15464 msgid "'%s' is not a stash-like commit"
15465 msgstr "'%s' 不像是一個貯存提交"
15466
15467 +#: builtin/stash.c
15468 +msgid "No stash entries found."
15469 +msgstr "未發現貯存條目。"
15470 +
15471 #: builtin/stash.c
15472 #, c-format
15473 msgid "Too many revisions specified:%s"
15474 msgstr "指定了太多的版本：%s"
15475
15441 -#: builtin/stash.c
15442 -msgid "No stash entries found."
15443 -msgstr "未發現貯存條目。"
15444 -
15476 #: builtin/stash.c
15477 #, c-format
15478 msgid "%s is not a valid reference"
@@ -15637,6 +15668,86 @@ msgstr "貯存中包含未追蹤檔案"
15668 msgid "include ignore files"
15669 msgstr "包含忽略的檔案"
15670
15671 +#: builtin/stash.c
15672 +#, c-format
15673 +msgid "cannot parse commit %s"
15674 +msgstr "無法解析提交 %s"
15675 +
15676 +#: builtin/stash.c
15677 +#, c-format
15678 +msgid "invalid author or committer for %s"
15679 +msgstr "%s 的作者或提交者無效"
15680 +
15681 +#: builtin/stash.c
15682 +msgid "could not write commit"
15683 +msgstr "無法寫入提交"
15684 +
15685 +#: builtin/stash.c
15686 +#, c-format
15687 +msgid "not a valid revision: %s"
15688 +msgstr "不是有效的修訂版：%s"
15689 +
15690 +#: builtin/stash.c
15691 +#, c-format
15692 +msgid "not a commit: %s"
15693 +msgstr "不是提交：%s"
15694 +
15695 +#: builtin/stash.c
15696 +#, c-format
15697 +msgid "%s is not a valid exported stash commit"
15698 +msgstr "%s 不是有效的匯出貯存提交"
15699 +
15700 +#: builtin/stash.c
15701 +#, c-format
15702 +msgid "found root commit %s with invalid data"
15703 +msgstr "找到 %s 根提交，內有無效資料"
15704 +
15705 +#: builtin/stash.c
15706 +#, c-format
15707 +msgid "found stash commit %s without expected prefix"
15708 +msgstr "找到 %s 貯存提交，裡面缺少預期的前綴"
15709 +
15710 +#: builtin/stash.c
15711 +#, c-format
15712 +msgid "cannot parse parents of commit: %s"
15713 +msgstr "無法解析提交的父物件：%s"
15714 +
15715 +#: builtin/stash.c
15716 +#, c-format
15717 +msgid "%s does not look like a stash commit"
15718 +msgstr "%s 似乎不是貯存提交"
15719 +
15720 +#: builtin/stash.c
15721 +#, c-format
15722 +msgid "cannot read commit buffer for %s"
15723 +msgstr "無法讀取 %s 的提交緩衝區"
15724 +
15725 +#: builtin/stash.c
15726 +#, c-format
15727 +msgid "cannot save the stash for %s"
15728 +msgstr "無法儲存 %s 的貯存"
15729 +
15730 +#: builtin/stash.c
15731 +msgid "unable to write base commit"
15732 +msgstr "無法寫入基礎提交"
15733 +
15734 +#: builtin/stash.c
15735 +#, c-format
15736 +msgid "unable to find stash entry %s"
15737 +msgstr "找不到貯存項目 %s"
15738 +
15739 +#: builtin/stash.c
15740 +msgid "print the object ID instead of writing it to a ref"
15741 +msgstr "輸出物件 ID 而非將其寫入引用"
15742 +
15743 +#: builtin/stash.c
15744 +msgid "save the data to the given ref"
15745 +msgstr "將資料存入指定引用"
15746 +
15747 +#: builtin/stash.c
15748 +msgid "exactly one of --print and --to-ref is required"
15749 +msgstr "需要指定 --print 或 --to-ref 其中一個"
15750 +
15751 #: builtin/stripspace.c
15752 msgid "skip and remove all lines starting with comment character"
15753 msgstr "略過和移除所有的備註行"
@@ -15647,21 +15758,16 @@ msgstr "為每一行的行首新增備註符和空格"
15758
15759 #: builtin/submodule--helper.c
15760 #, c-format
15650 -msgid "Expecting a full ref name, got %s"
15651 -msgstr "期望一個完整的引用名稱，卻得到 %s"
15761 +msgid ""
15762 +"could not look up configuration '%s'. Assuming this repository is its own "
15763 +"authoritative upstream."
15764 +msgstr "找不到「%s」組態設定。假定這個版本庫是其自身的官方上游。"
15765
15766 #: builtin/submodule--helper.c
15767 #, c-format
15768 msgid "could not get a repository handle for submodule '%s'"
15769 msgstr "無法取得子模組「%s」的版本庫控制代碼"
15770
15658 -#: builtin/submodule--helper.c
15659 -#, c-format
15660 -msgid ""
15661 -"could not look up configuration '%s'. Assuming this repository is its own "
15662 -"authoritative upstream."
15663 -msgstr "找不到「%s」組態設定。假定這個版本庫是其自身的官方上游。"
15664 -
15771 #: builtin/submodule--helper.c
15772 #, c-format
15773 msgid "No url found for submodule path '%s' in .gitmodules"
@@ -15920,7 +16026,7 @@ msgstr "不能識別 submodule.alternateLocation 的取值 '%s'"
16026 #: builtin/submodule--helper.c submodule.c
16027 #, c-format
16028 msgid "refusing to create/use '%s' in another submodule's git dir"
15923 -msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」"
16029 +msgstr "拒絕在其他子模組的 git 目錄中建立/使用「%s」"
16030
16031 #: builtin/submodule--helper.c
16032 #, c-format
@@ -16078,6 +16184,11 @@ msgid ""
16184 "the superproject is not on any branch"
16185 msgstr "子模組（%s）的分支設定為繼承上級專案的分支，但是上級專案不在任何分支上"
16186
16187 +#: builtin/submodule--helper.c
16188 +#, c-format
16189 +msgid "Expecting a full ref name, got %s"
16190 +msgstr "期望一個完整的引用名稱，卻得到 %s"
16191 +
16192 #: builtin/submodule--helper.c
16193 #, c-format
16194 msgid "Unable to find current revision in submodule path '%s'"
@@ -16323,6 +16434,11 @@ msgstr "只能在工作區的頂級目錄中使用相對路徑"
16434 msgid "repo URL: '%s' must be absolute or begin with ./|../"
16435 msgstr "版本庫 URL：「%s」必須是絕對路徑，或開頭是 ./|../"
16436
16437 +#: builtin/submodule--helper.c
16438 +#, c-format
16439 +msgid "submodule name '%s' already used for path '%s'"
16440 +msgstr "「%s」子模組名稱已被「%s」路徑使用"
16441 +
16442 #: builtin/submodule--helper.c
16443 #, c-format
16444 msgid "'%s' is not a valid submodule name"
@@ -16856,7 +16972,6 @@ msgid "git update-ref [<options>] <refname> <new-oid> [<old-oid>]"
16972 msgstr "git update-ref [<options>] <refname> <new-oid> [<old-oid>]"
16973
16974 #: builtin/update-ref.c
16859 -#| msgid "git update-ref [<options>] --stdin [-z]"
16975 msgid "git update-ref [<options>] --stdin [-z] [--batch-updates]"
16976 msgstr "git update-ref [<options>] --stdin [-z] [--batch-updates]"
16977
@@ -17054,12 +17169,12 @@ msgstr ""
17169 #: builtin/worktree.c
17170 #, c-format
17171 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
17057 -msgstr "無法將「%s」複製到「%s」；稀疏簽出可能無法正常運作"
17172 +msgstr "將「%s」拷貝至「%s」失敗；稀疏簽出可能無法正常運作"
17173
17174 #: builtin/worktree.c
17175 #, c-format
17176 msgid "failed to copy worktree config from '%s' to '%s'"
17062 -msgstr "無法將工作區組態從「%s」複製到「%s」"
17177 +msgstr "將工作區組態從「%s」拷貝至「%s」失敗"
17178
17179 #: builtin/worktree.c
17180 #, c-format
@@ -17095,11 +17210,6 @@ msgstr "準備工作區（重設分支 '%s'，之前為 %s）"
17210 msgid "Preparing worktree (checking out '%s')"
17211 msgstr "準備工作區（簽出 '%s'）"
17212
17098 -#: builtin/worktree.c
17099 -#, c-format
17100 -msgid "unreachable: invalid reference: %s"
17101 -msgstr "不可達：無效引用：%s"
17102 -
17213 #: builtin/worktree.c
17214 #, c-format
17215 msgid "Preparing worktree (detached HEAD %s)"
@@ -17629,7 +17739,7 @@ msgstr "切換分支或復原工作區檔案"
17739
17740 #: command-list.h
17741 msgid "Copy files from the index to the working tree"
17632 -msgstr "從索引複製檔案到工作區"
17742 +msgstr "從索引區拷貝檔案至工作區"
17743
17744 #: command-list.h
17745 msgid "Find commits yet to be applied to upstream"
@@ -18804,7 +18914,7 @@ msgstr "[GLE %ld] 無法取得「%ls」的通訊協定資訊"
18914 #: compat/mingw.c
18915 #, c-format
18916 msgid "failed to copy SID (%ld)"
18807 -msgstr "無法複製 SID (%ld)"
18917 +msgstr "拷貝 SID 失敗（%ld）"
18918
18919 #: compat/mingw.c
18920 #, c-format
@@ -19111,16 +19221,6 @@ msgstr "命令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
19221 msgid "bad numeric config value '%s' for '%s' in %s: %s"
19222 msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
19223
19114 -#: config.c
19115 -#, c-format
19116 -msgid "invalid value for variable %s"
19117 -msgstr "%s 變數的值無效"
19118 -
19119 -#: config.c
19120 -#, c-format
19121 -msgid "ignoring unknown core.fsync component '%s'"
19122 -msgstr "忽略未知的 core.fsync 元件「%s」"
19123 -
19224 #: config.c
19225 #, c-format
19226 msgid "bad boolean config value '%s' for '%s'"
@@ -19136,54 +19236,6 @@ msgstr "無法展開使用者目錄於：’%s’"
19236 msgid "'%s' for '%s' is not a valid timestamp"
19237 msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳"
19238
19139 -#: config.c
19140 -#, c-format
19141 -msgid "abbrev length out of range: %d"
19142 -msgstr "縮寫長度超出範圍：%d"
19143 -
19144 -#: config.c
19145 -#, c-format
19146 -msgid "bad zlib compression level %d"
19147 -msgstr "錯誤的 zlib 壓縮級別 %d"
19148 -
19149 -#: config.c
19150 -#, c-format
19151 -msgid "%s cannot contain newline"
19152 -msgstr "%s 不能包含換行符號"
19153 -
19154 -#: config.c
19155 -#, c-format
19156 -msgid "%s must have at least one character"
19157 -msgstr "%s 得有至少 1 個字元"
19158 -
19159 -#: config.c
19160 -#, c-format
19161 -msgid "ignoring unknown core.fsyncMethod value '%s'"
19162 -msgstr "忽略未知的 core.fsyncMethod 值「%s」"
19163 -
19164 -#: config.c
19165 -msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
19166 -msgstr "core.fsyncObjectFiles 已棄用。請改用 core.fsync"
19167 -
19168 -#: config.c
19169 -#, c-format
19170 -msgid "invalid mode for object creation: %s"
19171 -msgstr "無效的物件建立模式：%s"
19172 -
19173 -#: config.c
19174 -#, c-format
19175 -msgid "malformed value for %s"
19176 -msgstr "%s 的取值格式錯誤"
19177 -
19178 -#: config.c
19179 -#, c-format
19180 -msgid "malformed value for %s: %s"
19181 -msgstr "%s 的取值格式錯誤：%s"
19182 -
19183 -#: config.c
19184 -msgid "must be one of nothing, matching, simple, upstream or current"
19185 -msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
19186 -
19239 #: config.c
19240 #, c-format
19241 msgid "unable to load config blob object '%s'"
@@ -19509,7 +19561,7 @@ msgstr "%s 中的 CRLF 將被 LF 取代"
19561 msgid ""
19562 "in the working copy of '%s', CRLF will be replaced by LF the next time Git "
19563 "touches it"
19512 -msgstr "在「%s」的工作複本中，下次 Git 接觸到時會用 LF 取代 CRLF"
19564 +msgstr "下次 Git 存取「%s」的工作複本時會以 LF 取代 CRLF"
19565
19566 #: convert.c
19567 #, c-format
@@ -19521,7 +19573,7 @@ msgstr "檔案 %s 中的 LF 將被 CRLF 取代"
19573 msgid ""
19574 "in the working copy of '%s', LF will be replaced by CRLF the next time Git "
19575 "touches it"
19524 -msgstr "在「%s」的工作複本中，下次 Git 接觸到時會用 CRLF 取代 LF"
19576 +msgstr "下次 Git 存取「%s」的工作複本時會以 CRLF 取代 LF"
19577
19578 #: convert.c
19579 #, c-format
@@ -19797,8 +19849,8 @@ msgid "cannot compare a named pipe to a directory"
19849 msgstr "無法比對命名管線 (pipe) 和目錄"
19850
19851 #: diff-no-index.c
19800 -msgid "git diff --no-index [<options>] <path> <path>"
19801 -msgstr "git diff --no-index [<選項>] <路徑> <路徑>"
19852 +msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
19853 +msgstr "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
19854
19855 #: diff-no-index.c
19856 msgid ""
@@ -19806,6 +19858,12 @@ msgid ""
19858 "tree"
19859 msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"
19860
19861 +#: diff-no-index.c
19862 +msgid ""
19863 +"Limiting comparison with pathspecs is only supported if both paths are "
19864 +"directories."
19865 +msgstr "只當兩個路徑都是目錄時，才支援使用路徑規格限制比較項目。"
19866 +
19867 # 譯者：請維持前導空格
19868 #: diff.c
19869 #, c-format
@@ -19984,7 +20042,7 @@ msgstr "生成修補檔"
20042 msgid "<n>"
20043 msgstr "<n>"
20044
19987 -#: diff.c
20045 +#: diff.c parse-options.h
20046 msgid "generate diffs with <n> lines context"
20047 msgstr "生成含 <n> 行上下文的差異"
20048
@@ -20131,7 +20189,7 @@ msgstr "不顯示任何來源和目的地前綴"
20189 msgid "use default prefixes a/ and b/"
20190 msgstr "使用預設的前置名稱 a/ 和 b/"
20191
20134 -#: diff.c
20192 +#: diff.c parse-options.h
20193 msgid "show context between diff hunks up to the specified number of lines"
20194 msgstr "顯示指定行數的差異區塊間的上下文"
20195
@@ -20173,11 +20231,11 @@ msgstr "省略刪除變更的差異輸出"
20231
20232 #: diff.c
20233 msgid "detect copies"
20176 -msgstr "檢測複製"
20234 +msgstr "檢測拷貝"
20235
20236 #: diff.c
20237 msgid "use unmodified files as source to find copies"
20180 -msgstr "使用未修改的檔案做為發現拷貝的來源"
20238 +msgstr "使用未修改的檔案作為尋找拷貝的來源"
20239
20240 #: diff.c
20241 msgid "disable rename detection"
@@ -20195,7 +20253,7 @@ msgstr "繼續列出檔案重新命名以外的歷史記錄"
20253 msgid ""
20254 "prevent rename/copy detection if the number of rename/copy targets exceeds "
20255 "given limit"
20198 -msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"
20256 +msgstr "如果重新命名/拷貝的目標數量超出提供的限度，則防止檢測重新命名/拷貝"
20257
20258 #: diff.c
20259 msgid "Diff algorithm options"
@@ -20405,7 +20463,7 @@ msgstr "因為檔案太多，已略過詳細重新命名偵測。"
20463
20464 #: diff.c
20465 msgid "only found copies from modified paths due to too many files."
20408 -msgstr "因為檔案太多，只在修改的路徑中尋找複製。"
20466 +msgstr "因為檔案太多，只在有修改的路徑中尋找了複本。"
20467
20468 #: diff.c
20469 #, c-format
@@ -20516,6 +20574,64 @@ msgstr "無法 stat 檔案「%s」"
20574 msgid "bad git namespace path \"%s\""
20575 msgstr "錯誤的 git 名字空間路徑 \"%s\""
20576
20577 +#: environment.c
20578 +#, c-format
20579 +msgid "invalid value for variable %s"
20580 +msgstr "%s 變數的值無效"
20581 +
20582 +#: environment.c
20583 +#, c-format
20584 +msgid "ignoring unknown core.fsync component '%s'"
20585 +msgstr "忽略未知的 core.fsync 元件「%s」"
20586 +
20587 +#: environment.c
20588 +#, c-format
20589 +msgid "abbrev length out of range: %d"
20590 +msgstr "縮寫長度超出範圍：%d"
20591 +
20592 +#: environment.c
20593 +#, c-format
20594 +msgid "bad zlib compression level %d"
20595 +msgstr "錯誤的 zlib 壓縮級別 %d"
20596 +
20597 +#: environment.c
20598 +#, c-format
20599 +msgid "%s cannot contain newline"
20600 +msgstr "%s 不能包含換行符號"
20601 +
20602 +#: environment.c
20603 +#, c-format
20604 +msgid "%s must have at least one character"
20605 +msgstr "%s 得有至少 1 個字元"
20606 +
20607 +#: environment.c
20608 +#, c-format
20609 +msgid "ignoring unknown core.fsyncMethod value '%s'"
20610 +msgstr "忽略未知的 core.fsyncMethod 值「%s」"
20611 +
20612 +#: environment.c
20613 +msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
20614 +msgstr "core.fsyncObjectFiles 已棄用。請改用 core.fsync"
20615 +
20616 +#: environment.c
20617 +#, c-format
20618 +msgid "invalid mode for object creation: %s"
20619 +msgstr "無效的物件建立模式：%s"
20620 +
20621 +#: environment.c
20622 +#, c-format
20623 +msgid "malformed value for %s"
20624 +msgstr "%s 的取值格式錯誤"
20625 +
20626 +#: environment.c
20627 +#, c-format
20628 +msgid "malformed value for %s: %s"
20629 +msgstr "%s 的取值格式錯誤：%s"
20630 +
20631 +#: environment.c
20632 +msgid "must be one of nothing, matching, simple, upstream or current"
20633 +msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
20634 +
20635 #: exec-cmd.c
20636 #, c-format
20637 msgid "too many args to run %s"
@@ -21372,6 +21488,35 @@ msgstr "不允許空的姓名（對於 <%s>）"
21488 msgid "name consists only of disallowed characters: %s"
21489 msgstr "姓名中僅包含停用字元：%s"
21490
21491 +#: imap-send.c
21492 +msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
21493 +msgstr ""
21494 +"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
21495 +
21496 +#: imap-send.c
21497 +msgid "no IMAP host specified"
21498 +msgstr "沒有指定 IMAP 主機"
21499 +
21500 +#: imap-send.c
21501 +msgid ""
21502 +"set the IMAP host with 'git config imap.host <host>'.\n"
21503 +"(e.g., 'git config imap.host imaps://imap.example.com')"
21504 +msgstr ""
21505 +"使用「git config imap.host <主機>」來設定 IMAP 主機。\n"
21506 +"（比如「git config imap.host imaps://imap.example.com」）"
21507 +
21508 +#: imap-send.c
21509 +msgid "no IMAP folder specified"
21510 +msgstr "沒有指定 IMAP 資料夾"
21511 +
21512 +#: imap-send.c
21513 +msgid ""
21514 +"set the target folder with 'git config imap.folder <folder>'.\n"
21515 +"(e.g., 'git config imap.folder Drafts')"
21516 +msgstr ""
21517 +"使用「git config imap.folder <資料夾>」指定目的地資料夾。\n"
21518 +"（比如「git config imap.folder Drafts」）"
21519 +
21520 #: list-objects-filter-options.c
21521 msgid "expected 'tree:<depth>'"
21522 msgstr "期望 'tree:<深度>'"
@@ -22511,113 +22656,113 @@ msgstr "需要指定 <object>:<path>，卻只指定 <object>「%s」"
22656 msgid "invalid object name '%.*s'."
22657 msgstr "'%.*s' 物件名稱無效。"
22658
22514 -#: object-store.c
22659 +#: object.c
22660 +#, c-format
22661 +msgid "invalid object type \"%s\""
22662 +msgstr "無效的物件類型 \"%s\""
22663 +
22664 +#: object.c
22665 +#, c-format
22666 +msgid "object %s is a %s, not a %s"
22667 +msgstr "物件 %s 是一個 %s，不是一個 %s"
22668 +
22669 +#: object.c
22670 +#, c-format
22671 +msgid "object %s has unknown type id %d"
22672 +msgstr "物件 %s 有未知的類型 id %d"
22673 +
22674 +#: object.c
22675 +#, c-format
22676 +msgid "unable to parse object: %s"
22677 +msgstr "不能解析物件：%s"
22678 +
22679 +#: object.c
22680 +#, c-format
22681 +msgid "hash mismatch %s"
22682 +msgstr "雜湊值與 %s 不符合"
22683 +
22684 +#: odb.c
22685 #, c-format
22686 msgid "object directory %s does not exist; check .git/objects/info/alternates"
22687 msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"
22688
22519 -#: object-store.c
22689 +#: odb.c
22690 #, c-format
22691 msgid "unable to normalize alternate object path: %s"
22692 msgstr "無法規範化備用物件路徑：%s"
22693
22524 -#: object-store.c
22694 +#: odb.c
22695 #, c-format
22696 msgid "%s: ignoring alternate object stores, nesting too deep"
22697 msgstr "%s：忽略備用物件庫，嵌套太深"
22698
22529 -#: object-store.c
22699 +#: odb.c
22700 msgid "unable to fdopen alternates lockfile"
22701 msgstr "無法 fdopen 取代鎖檔案"
22702
22533 -#: object-store.c
22703 +#: odb.c
22704 msgid "unable to read alternates file"
22705 msgstr "無法讀取替代檔案"
22706
22537 -#: object-store.c
22707 +#: odb.c
22708 msgid "unable to move new alternates file into place"
22709 msgstr "無法將新的替代檔案移動到位"
22710
22541 -#: object-store.c
22711 +#: odb.c
22712 #, c-format
22713 msgid "path '%s' does not exist"
22714 msgstr "路徑 '%s' 不存在"
22715
22546 -#: object-store.c
22716 +#: odb.c
22717 #, c-format
22718 msgid "reference repository '%s' as a linked checkout is not supported yet."
22719 msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。"
22720
22551 -#: object-store.c
22721 +#: odb.c
22722 #, c-format
22723 msgid "reference repository '%s' is not a local repository."
22724 msgstr "引用版本庫 '%s' 不是一個本機版本庫。"
22725
22556 -#: object-store.c
22726 +#: odb.c
22727 #, c-format
22728 msgid "reference repository '%s' is shallow"
22729 msgstr "引用版本庫 '%s' 是一個淺複製"
22730
22561 -#: object-store.c
22731 +#: odb.c
22732 #, c-format
22733 msgid "reference repository '%s' is grafted"
22734 msgstr "引用版本庫 '%s' 已被移植"
22735
22566 -#: object-store.c
22736 +#: odb.c
22737 #, c-format
22738 msgid "could not find object directory matching %s"
22739 msgstr "找不到符合 %s 的物件目錄"
22740
22571 -#: object-store.c
22741 +#: odb.c
22742 #, c-format
22743 msgid "invalid line while parsing alternate refs: %s"
22744 msgstr "解析備用引用時無效的行：%s"
22745
22576 -#: object-store.c
22746 +#: odb.c
22747 #, c-format
22748 msgid "replacement %s not found for %s"
22749 msgstr "找不到 %2$s 的替代 %1$s"
22750
22581 -#: object-store.c
22751 +#: odb.c
22752 #, c-format
22753 msgid "packed object %s (stored in %s) is corrupt"
22754 msgstr "打包物件 %s（儲存在 %s）已損壞"
22755
22586 -#: object-store.c
22756 +#: odb.c
22757 #, c-format
22758 msgid "missing mapping of %s to %s"
22759 msgstr "缺少 %s 到 %s 的映射"
22760
22591 -#: object-store.c
22761 +#: odb.c
22762 #, c-format
22763 msgid "%s is not a valid '%s' object"
22764 msgstr "%s 不是一個有效的 '%s' 物件"
22765
22596 -#: object.c
22597 -#, c-format
22598 -msgid "invalid object type \"%s\""
22599 -msgstr "無效的物件類型 \"%s\""
22600 -
22601 -#: object.c
22602 -#, c-format
22603 -msgid "object %s is a %s, not a %s"
22604 -msgstr "物件 %s 是一個 %s，不是一個 %s"
22605 -
22606 -#: object.c
22607 -#, c-format
22608 -msgid "object %s has unknown type id %d"
22609 -msgstr "物件 %s 有未知的類型 id %d"
22610 -
22611 -#: object.c
22612 -#, c-format
22613 -msgid "unable to parse object: %s"
22614 -msgstr "不能解析物件：%s"
22615 -
22616 -#: object.c
22617 -#, c-format
22618 -msgid "hash mismatch %s"
22619 -msgstr "雜湊值與 %s 不符合"
22620 -
22766 #: pack-bitmap-write.c
22767 #, c-format
22768 msgid "duplicate entry when writing bitmap index: %s"
@@ -22632,10 +22777,6 @@ msgstr "嘗試儲存未選取的提交：「%s」"
22777 msgid "too many pseudo-merges"
22778 msgstr "偽合併過多"
22779
22635 -#: pack-bitmap-write.c
22636 -msgid "trying to write commit not in index"
22637 -msgstr "嘗試寫入不在索引的提交"
22638 -
22780 #: pack-bitmap.c
22781 msgid "failed to load bitmap index (corrupted?)"
22782 msgstr "無法載入位圖索引（損壞？）"
@@ -22938,6 +23079,11 @@ msgstr "%s 不取值"
23079 msgid "%s isn't available"
23080 msgstr "%s 不可用"
23081
23082 +#: parse-options.c
23083 +#, c-format
23084 +msgid "value for %s exceeds %<PRIdMAX>"
23085 +msgstr "%s 的值超過 %<PRIdMAX>"
23086 +
23087 #: parse-options.c
23088 #, c-format
23089 msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
@@ -24091,6 +24237,18 @@ msgstr "沒有 '%s' 的引用日誌"
24237 msgid "%s does not point to a valid object!"
24238 msgstr "%s 沒有指向一個有效的物件！"
24239
24240 +# 譯者：請維持前導空格
24241 +#: refs.c
24242 +#, c-format
24243 +msgid "%s%s will become dangling after %s is deleted\n"
24244 +msgstr "在刪除 %3$s 之後，%1$s%2$s 將進入懸空狀態\n"
24245 +
24246 +# 譯者：請維持前導空格
24247 +#: refs.c
24248 +#, c-format
24249 +msgid "%s%s has become dangling after %s was deleted\n"
24250 +msgstr "在刪除 %3$s 後，%1$s%2$s 已經是懸空狀態\n"
24251 +
24252 #: refs.c
24253 #, c-format
24254 msgid ""
@@ -24324,7 +24482,7 @@ msgstr "找不到引用名稱 %s"
24482 #: refs/reftable-backend.c
24483 #, c-format
24484 msgid "refname %s is a symbolic ref, copying it is not supported"
24327 -msgstr "引用名稱 %s 是符號引用，不支援複製"
24485 +msgstr "引用名稱 %s 是象徵式引用，不支援拷貝"
24486
24487 #: refspec.c
24488 #, c-format
@@ -25047,9 +25205,6 @@ msgid "specify if background maintenance should be enabled"
25205 msgstr "指定是否要啟用背景維護模式"
25206
25207 #: scalar.c
25050 -#| msgid ""
25051 -#| "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
25052 -#| "\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]"
25208 msgid ""
25209 "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
25210 "\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]"
@@ -25104,7 +25259,6 @@ msgid "`scalar list` does not take arguments"
25259 msgstr "`scalar list` 未取引數"
25260
25261 #: scalar.c
25107 -#| msgid "scalar register [<enlistment>]"
25262 msgid "scalar register [--[no-]maintenance] [<enlistment>]"
25263 msgstr "scalar register [--[no-]maintenance] [<enlistment>]"
25264
@@ -25113,7 +25267,6 @@ msgid "reconfigure all registered enlistments"
25267 msgstr "重新設定所有註冊的編列名單"
25268
25269 #: scalar.c
25116 -#| msgid "enable/disable untracked cache"
25270 msgid "(enable|disable|keep)"
25271 msgstr "(enable|disable|keep)"
25272
@@ -25122,7 +25275,6 @@ msgid "signal how to adjust background maintenance"
25275 msgstr "指示調整背景維護模式的方式"
25276
25277 #: scalar.c
25125 -#| msgid "scalar reconfigure [--all | <enlistment>]"
25278 msgid ""
25279 "scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
25280 "<enlistment>]"
@@ -25137,7 +25289,7 @@ msgstr "--all 或 <enlistment> 但不能傳入兩者"
25289 #: scalar.c
25290 #, c-format
25291 msgid "unknown mode for --maintenance option: %s"
25140 -msgstr "--maintenance 選項的值無效：%s"
25292 +msgstr "提供的 --maintenance 模式無效：%s"
25293
25294 #: scalar.c
25295 #, c-format
@@ -25534,7 +25686,7 @@ msgstr "建立提交後，不能解析 HEAD"
25686
25687 #: sequencer.c
25688 msgid "detached HEAD"
25537 -msgstr "分離 HEAD"
25689 +msgstr "分離 HEAD 指標"
25690
25691 # 譯者：中文字串拼接，可刪除前導空格
25692 #: sequencer.c
@@ -26460,7 +26612,7 @@ msgstr "不能自 '%s' 到 '%s' 建立符號連結"
26612 #: setup.c
26613 #, c-format
26614 msgid "cannot copy '%s' to '%s'"
26463 -msgstr "不能複製 '%s' 至 '%s'"
26615 +msgstr "無法將「%s」拷貝至「%s」"
26616
26617 #: setup.c
26618 #, c-format
@@ -26475,7 +26627,7 @@ msgstr "沒有在 %s 中找到範本"
26627 #: setup.c
26628 #, c-format
26629 msgid "not copying templates from '%s': %s"
26478 -msgstr "沒有從 '%s' 複製範本：%s"
26630 +msgstr "未從「%s」拷貝範本：%s"
26631
26632 #: setup.c
26633 #, c-format
@@ -26876,9 +27028,13 @@ msgstr "切換是否包含樹狀物件"
27028 msgid "toggle pruning of uninteresting paths"
27029 msgstr "切換是否剪除不重要路徑"
27030
27031 +#: t/helper/test-path-walk.c
27032 +msgid "toggle aggressive edge walk"
27033 +msgstr "切換是否更激進地走訪邊"
27034 +
27035 #: t/helper/test-path-walk.c
27036 msgid "read a pattern list over stdin"
26881 -msgstr "從標準輸入讀取模式清單"
27037 +msgstr "從 stdin 讀取模式清單"
27038
27039 #: t/helper/test-reach.c
27040 #, c-format
@@ -27184,7 +27340,7 @@ msgstr "%s 執行緒等待失敗：%s"
27340 #: transport-helper.c
27341 #, c-format
27342 msgid "can't start thread for copying data: %s"
27187 -msgstr "不能啟動執行緒來複製資料：%s"
27343 +msgstr "無法啟動執行緒來拷貝資料: %s"
27344
27345 #: transport-helper.c
27346 #, c-format
@@ -27198,7 +27354,7 @@ msgstr "%s 進程失敗"
27354
27355 #: transport-helper.c
27356 msgid "can't start thread for copying data"
27201 -msgstr "不能啟動執行緒來複製資料"
27357 +msgstr "無法啟動執行緒來拷貝資料"
27358
27359 #: transport.c
27360 #, c-format
@@ -27627,6 +27783,24 @@ msgstr "錯誤: "
27783 msgid "warning: "
27784 msgstr "警告: "
27785
27786 +#: usage.c
27787 +#, c-format
27788 +msgid ""
27789 +"'%s' is nominated for removal.\n"
27790 +"If you still use this command, please add an extra\n"
27791 +"option, '--i-still-use-this', on the command line\n"
27792 +"and let us know you still use it by sending an e-mail\n"
27793 +"to <git@vger.kernel.org>. Thanks.\n"
27794 +msgstr ""
27795 +"「%s」命令已被提名移除。\n"
27796 +"如果您仍在使用該命令，請多加上「--i-still-use-this」\n"
27797 +"選項，然後寄封電子郵件到 <git@vger.kernel.org>，\n"
27798 +"讓我們知道您還在使用，謝謝。\n"
27799 +
27800 +#: usage.c
27801 +msgid "refusing to run without --i-still-use-this"
27802 +msgstr "傳入 --i-still-use-this 前拒絕執行"
27803 +
27804 #: version.c
27805 #, c-format
27806 msgid "uname() failed with error '%s' (%d)\n"
@@ -27674,7 +27848,7 @@ msgstr ".git 檔案不正確"
27848
27849 #: worktree.c
27850 msgid ".git file absolute/relative path mismatch"
27677 -msgstr ".git 檔案的絕對或相對路徑不一致"
27851 +msgstr ".git 檔案的絕對/相對路徑不一致"
27852
27853 #: worktree.c
27854 msgid "not a valid path"
@@ -27698,7 +27872,7 @@ msgstr "無法讀取 gitdir"
27872
27873 #: worktree.c
27874 msgid "gitdir absolute/relative path mismatch"
27701 -msgstr "gitdir 的絕對或相對路徑不一致"
27875 +msgstr "gitdir 的絕對/相對路徑不一致"
27876
27877 #: worktree.c
27878 msgid "gitdir incorrect"
@@ -28307,7 +28481,7 @@ msgstr "提交為空，但是存在尚未追蹤的檔案\n"
28481 #: wt-status.c
28482 #, c-format
28483 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
28310 -msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n"
28484 +msgstr "沒有東西提交（建立/拷貝檔案並使用「git add」追蹤之）\n"
28485
28486 #: wt-status.c
28487 #, c-format
@@ -28688,7 +28862,7 @@ msgstr "傳送這封信件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
28862
28863 #: git-send-email.perl
28864 msgid "Send this email reply required"
28691 -msgstr "傳送要求的信件回復"
28865 +msgstr "傳送要求的信件回覆"
28866
28867 #: git-send-email.perl
28868 msgid "The required SMTP server is not properly defined."
@@ -28773,6 +28947,11 @@ msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n"
28947 msgid "(body) Adding cc: %s from line '%s'\n"
28948 msgstr "(body) 新增 cc: %s 自行 '%s'\n"
28949
28950 +#: git-send-email.perl
28951 +#, perl-format
28952 +msgid "error: invalid SMTP port '%s'\n"
28953 +msgstr "錯誤：SMTP 連線埠「%s」無效\n"
28954 +
28955 #: git-send-email.perl
28956 #, perl-format
28957 msgid "(%s) Could not execute '%s'"
@@ -28815,7 +28994,7 @@ msgstr ""
28994 #: git-send-email.perl
28995 #, perl-format
28996 msgid "unable to open %s: %s\n"
28818 -msgstr "不能開啟 %s：%s\n"
28997 +msgstr "無法開啟 %s: %s\n"
28998
28999 #: git-send-email.perl
29000 #, perl-format
@@ -28829,7 +29008,7 @@ msgstr ""
29008 #: git-send-email.perl
29009 #, perl-format
29010 msgid "Skipping %s with backup suffix '%s'.\n"
28832 -msgstr "略過 %s 含備份後綴 '%s'。\n"
29011 +msgstr "略過具有備份後綴「%2$s」的 %1$s。\n"
29012
29013 #. TRANSLATORS: please keep "[y|N]" as is.
29014 #: git-send-email.perl
@@ -28837,6 +29016,51 @@ msgstr "略過 %s 含備份後綴 '%s'。\n"
29016 msgid "Do you really want to send %s? [y|N]: "
29017 msgstr "您真的要傳送 %s？[y|N]： "
29018
29019 +#~ msgid "start-after"
29020 +#~ msgstr "start-after"
29021 +
29022 +#~ msgid "compact-summary"
29023 +#~ msgstr "精要摘要 (compact-summary)"
29024 +
29025 +# 譯者：請維持前導空格
29026 +#, c-format
29027 +#~ msgid " (%s will become dangling)"
29028 +#~ msgstr " （%s 將成為懸空狀態）"
29029 +
29030 +# 譯者：請維持前導空格
29031 +#, c-format
29032 +#~ msgid " (%s has become dangling)"
29033 +#~ msgstr " （%s 已成為懸空狀態）"
29034 +
29035 +#~ msgid "use at most one of --auto and --schedule=<frequency>"
29036 +#~ msgstr "--auto 和 --schedule=<頻率> 請任選一"
29037 +
29038 +#, c-format
29039 +#~ msgid "Final output: %d %s\n"
29040 +#~ msgstr "最終輸出：%d %s\n"
29041 +
29042 +#, c-format
29043 +#~ msgid "%d (FSCK_IGNORE?) should never trigger this callback"
29044 +#~ msgstr "%d (FSCK_IGNORE?) 不應觸發這個回呼函式"
29045 +
29046 +#~ msgid ""
29047 +#~ "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
29048 +#~ msgstr "git pack-objects --stdout [<選項>] [< <引用列表> | < <物件列表>]"
29049 +
29050 +#~ msgid ""
29051 +#~ "git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
29052 +#~ msgstr "git pack-objects [<選項>] <前綴名稱> [< <引用列表> | < <物件列表>]"
29053 +
29054 +#~ msgid "cannot use --stdin-packs with --cruft"
29055 +#~ msgstr "無法將 --stdin-packs 與 --cruft 組合使用"
29056 +
29057 +#, c-format
29058 +#~ msgid "unreachable: invalid reference: %s"
29059 +#~ msgstr "不可達：無效引用：%s"
29060 +
29061 +#~ msgid "trying to write commit not in index"
29062 +#~ msgstr "嘗試寫入不在索引的提交"
29063 +
29064 #~ msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
29065 #~ msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>"
29066