@matheusbsbs / matheus-bagliano / commits / c35d202dcd

l10n: zh_TW.po: update Git 2.52 translation

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

Yi-Jyun Pan committed Nov 13, 2025 at 22:47 UTC c35d202dcdfb86b799a911ba0898d6a93210fcbd
1 file changed +1570 -417
po/zh_TW.po
+1570 -417
@@ -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-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"
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"
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: Poedit 3.6\n"
44 -"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
45 -"zhconvert.org\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"
46
47 #: add-interactive.c
48 #, c-format
@@ -660,26 +660,28 @@ msgstr "未套用。\n"
660
661 #: add-patch.c
662 msgid ""
663 -"j - leave this hunk undecided, see next undecided hunk\n"
664 -"J - leave this hunk undecided, see next hunk\n"
665 -"k - leave this hunk undecided, see previous undecided hunk\n"
666 -"K - leave this hunk undecided, see previous hunk\n"
663 +"j - go to the next undecided hunk, roll over at the bottom\n"
664 +"J - go to the next hunk, roll over at the bottom\n"
665 +"k - go to the previous undecided hunk, roll over at the top\n"
666 +"K - go to the previous hunk, roll over at the top\n"
667 "g - select a hunk to go to\n"
668 "/ - search for a hunk matching the given regex\n"
669 "s - split the current hunk into smaller hunks\n"
670 "e - manually edit the current hunk\n"
671 -"p - print the current hunk, 'P' to use the pager\n"
671 +"p - print the current hunk\n"
672 +"P - print the current hunk using the pager\n"
673 "? - print help\n"
674 msgstr ""
674 -"j - 維持此區塊未決定狀態，檢視下一個未決定區塊\n"
675 -"J - 維持此區塊未決定狀態，檢視下一個區塊\n"
676 -"k - 維持此區塊未決定狀態，檢視上一個未決定區塊\n"
677 -"K - 維持此區塊未決定狀態，檢視上一個區塊\n"
675 +"j - 前往下一個未決區塊，在結尾時回到開頭\n"
676 +"J - 前往下一個區塊，在結尾時回到開頭\n"
677 +"k - 前往上一個未決區塊，在開頭時回到結尾\n"
678 +"K - 前往上一個區塊，在開頭時回到結尾\n"
679 "g - 選擇要跳轉至的區塊\n"
680 "/ - 尋找符合提供之常規表示式的區塊\n"
681 "s - 分割目前區塊為更小的區塊\n"
682 "e - 手動編輯目前區塊\n"
682 -"p - 輸出目前區塊，「P」分頁顯示\n"
683 +"p - 輸出目前區塊\n"
684 +"P - 分頁輸出目前區塊\n"
685 "? - 顯示說明\n"
686
687 #: add-patch.c
@@ -688,16 +690,16 @@ msgid "Only one letter is expected, got '%s'"
690 msgstr "預期收到一個字母，卻收到「%s」"
691
692 #: add-patch.c
691 -msgid "No previous hunk"
692 -msgstr "沒有上一個區塊"
693 +msgid "No other hunk"
694 +msgstr "沒有其他區塊"
695
696 #: add-patch.c
695 -msgid "No next hunk"
696 -msgstr "沒有下一個區塊"
697 +msgid "No other undecided hunk"
698 +msgstr "沒有其他未決區塊"
699
700 #: add-patch.c
701 msgid "No other hunks to goto"
700 -msgstr "沒有其它可以跳轉的區塊"
702 +msgstr "沒有其他可以跳轉的區塊"
703
704 #: add-patch.c
705 msgid "go to which hunk (<ret> to see more)? "
@@ -720,7 +722,7 @@ msgstr[0] "對不起，只有 %d 個可用區塊。"
722
723 #: add-patch.c
724 msgid "No other hunks to search"
723 -msgstr "沒有其它可以尋找的區塊"
725 +msgstr "沒有其他可以尋找的區塊"
726
727 #: add-patch.c
728 msgid "search for regex? "
@@ -939,7 +941,8 @@ msgid "unclosed quote"
941 msgstr "未閉合的引號"
942
943 #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
942 -#: builtin/receive-pack.c builtin/refs.c builtin/tag.c t/helper/test-pkt-line.c
944 +#: builtin/receive-pack.c builtin/refs.c builtin/repo.c builtin/tag.c
945 +#: t/helper/test-pkt-line.c
946 msgid "too many arguments"
947 msgstr "引數過多"
948
@@ -1251,7 +1254,7 @@ msgstr "%s：錯誤類型"
1254 msgid "%s has type %o, expected %o"
1255 msgstr "%s 的類型是 %o，預期是 %o"
1256
1254 -#: apply.c read-cache.c
1257 +#: apply.c builtin/fast-import.c read-cache.c
1258 #, c-format
1259 msgid "invalid path '%s'"
1260 msgstr "路徑「%s」無效"
@@ -1626,7 +1629,7 @@ msgstr ""
1629 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1630 msgstr "git archive --remote <repo> [--exec <cmd>] --list"
1631
1629 -#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c
1632 +#: archive.c builtin/fast-import.c builtin/gc.c builtin/notes.c builtin/tag.c
1633 #, c-format
1634 msgid "cannot read '%s'"
1635 msgstr "無法讀取「%s」"
@@ -1983,9 +1986,9 @@ msgstr "--contents 和 --reverse 不能混用。"
1986 msgid "--reverse and --first-parent together require specified latest commit"
1987 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1988
1986 -#: blame.c builtin/bisect.c builtin/commit.c builtin/log.c builtin/merge.c
1987 -#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c
1988 -#: remote.c sequencer.c submodule.c
1989 +#: blame.c builtin/bisect.c builtin/commit.c builtin/fast-export.c
1990 +#: builtin/log.c builtin/merge.c builtin/pack-objects.c builtin/shortlog.c
1991 +#: midx-write.c pack-bitmap.c remote.c sequencer.c submodule.c
1992 msgid "revision walk setup failed"
1993 msgstr "修訂版遍歷設定失敗"
1994
@@ -2225,7 +2228,7 @@ msgstr "下列路徑根據其中一個 .gitignore 檔案而被忽略：\n"
2228
2229 #: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c
2230 #: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c
2228 -#: builtin/rm.c builtin/send-pack.c
2231 +#: builtin/rm.c builtin/send-pack.c builtin/sparse-checkout.c
2232 msgid "dry run"
2233 msgstr "測試執行"
2234
@@ -2313,7 +2316,7 @@ msgid ""
2316 "See \"git help submodule\" for more information."
2317 msgstr ""
2318 "您在目前的版本庫中加進另一個 Git 版本庫。\n"
2316 -"複製外層的版本庫，將不包含嵌入版本庫的內容，\n"
2319 +"拓製外層的版本庫，將不包含嵌入版本庫的內容，\n"
2320 "並且不包含取得此版本庫的方式。\n"
2321 "如果您要加入子模組，請使用：\n"
2322 "\n"
@@ -2383,8 +2386,8 @@ msgid "bad action '%s' for '%s'"
2386 msgstr "「%s」動作對「%s」無效"
2387
2388 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.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
2389 +#: builtin/pull.c builtin/revert.c diff-merges.c diff.c environment.c
2390 +#: gpg-interface.c ls-refs.c parallel-checkout.c sequencer.c setup.c
2391 #, c-format
2392 msgid "invalid value for '%s': '%s'"
2393 msgstr "「%s」的值無效：「%s」"
@@ -2416,7 +2419,7 @@ msgstr "格式錯誤的輸入列：「%s」。"
2419 #: builtin/am.c
2420 #, c-format
2421 msgid "Failed to copy notes from '%s' to '%s'"
2419 -msgstr "從「%s」拷貝註解到「%s」失敗"
2422 +msgstr "從「%s」複製註解到「%s」失敗"
2423
2424 #: builtin/am.c
2425 msgid "fseek failed"
@@ -2613,7 +2616,7 @@ msgid ""
2616 "already introduced the same changes; you might want to skip this patch."
2617 msgstr ""
2618 "沒有變更：是否忘記執行「git add」？\n"
2616 -"如果沒有其他要新增到暫存區的，則很可能是其它提交\n"
2619 +"如果沒有其他要新增到暫存區的，則很可能是其他提交\n"
2620 "已經引入了相同的變更。您也許想要略過這個修補檔。"
2621
2622 #: builtin/am.c
@@ -2723,7 +2726,8 @@ msgstr "n"
2726 #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
2727 #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c
2728 #: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c
2726 -#: builtin/submodule--helper.c builtin/tag.c builtin/verify-tag.c
2729 +#: builtin/repo.c builtin/submodule--helper.c builtin/tag.c
2730 +#: builtin/verify-tag.c
2731 msgid "format"
2732 msgstr "format"
2733
@@ -2869,15 +2873,21 @@ msgstr "將缺少的物件限制於目前的稀疏簽出"
2873
2874 #: builtin/bisect.c
2875 msgid ""
2872 -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-"
2873 -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"
2876 +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
2877 +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
2878 +"[<pathspec>...]"
2879 msgstr ""
2875 -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-"
2876 -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"
2880 +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
2881 +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
2882 +"[<pathspec>...]"
2883
2884 #: builtin/bisect.c
2879 -msgid "git bisect (good|bad) [<rev>...]"
2880 -msgstr "git bisect (good|bad) [<rev>...]"
2885 +msgid "git bisect (bad|new|<term-new>) [<rev>]"
2886 +msgstr "git bisect (bad|new|<term-new>) [<rev>]"
2887 +
2888 +#: builtin/bisect.c
2889 +msgid "git bisect (good|old|<term-old>) [<rev>...]"
2890 +msgstr "git bisect (good|old|<term-old>) [<rev>...]"
2891
2892 #: builtin/bisect.c
2893 msgid "git bisect skip [(<rev>|<range>)...]"
@@ -3327,7 +3337,7 @@ msgstr "score"
3337
3338 #: builtin/blame.c
3339 msgid "find line copies within and across files"
3330 -msgstr "尋找檔案內及跨檔案拷貝的列"
3340 +msgstr "尋找檔案內及跨檔案複製的列"
3341
3342 #: builtin/blame.c
3343 msgid "find line movements within and across files"
@@ -3529,7 +3539,7 @@ msgstr "重新命名分支失敗"
3539
3540 #: builtin/branch.c
3541 msgid "branch copy failed"
3532 -msgstr "拷貝分支失敗"
3542 +msgstr "複製分支失敗"
3543
3544 #: builtin/branch.c
3545 #, c-format
@@ -3552,7 +3562,7 @@ msgstr "分支已重新命名，但組態檔案更新失敗"
3562
3563 #: builtin/branch.c
3564 msgid "branch is copied, but update of config-file failed"
3555 -msgstr "分支已拷貝，但組態檔案更新失敗"
3565 +msgstr "分支已複製，但組態檔案更新失敗"
3566
3567 #: builtin/branch.c
3568 #, c-format
@@ -3643,11 +3653,11 @@ msgstr "在格式化為空字串的引用之後不輸出換列符號"
3653
3654 #: builtin/branch.c
3655 msgid "copy a branch and its reflog"
3646 -msgstr "拷貝分支及其引用日誌"
3656 +msgstr "複製分支及其引用日誌"
3657
3658 #: builtin/branch.c
3659 msgid "copy a branch, even if target exists"
3650 -msgstr "即使目標已存在仍拷貝分支"
3660 +msgstr "即使目標已存在仍複製分支"
3661
3662 #: builtin/branch.c
3663 msgid "list branch names"
@@ -3735,7 +3745,7 @@ msgstr "無法編輯超過一個分支的描述"
3745
3746 #: builtin/branch.c
3747 msgid "cannot copy the current branch while not on any"
3738 -msgstr "不在任何分支上，不能拷貝目前分支"
3748 +msgstr "不在任何分支上，不能複製目前分支"
3749
3750 #: builtin/branch.c
3751 msgid "cannot rename the current branch while not on any"
@@ -3743,7 +3753,7 @@ msgstr "不在任何分支上，不能重新命名目前分支"
3753
3754 #: builtin/branch.c
3755 msgid "too many branches for a copy operation"
3746 -msgstr "要進行拷貝動作的分支太多"
3756 +msgstr "要進行複製動作的分支太多"
3757
3758 #: builtin/branch.c
3759 msgid "too many arguments for a rename operation"
@@ -4265,7 +4275,7 @@ msgstr "亦從 stdin 讀取聯絡地址"
4275 msgid "read additional mailmap entries from file"
4276 msgstr "從檔案讀取額外 mailmap 項目"
4277
4268 -#: builtin/check-mailmap.c
4278 +#: builtin/check-mailmap.c builtin/fast-import.c
4279 msgid "blob"
4280 msgstr "資料物件"
4281
@@ -4494,7 +4504,7 @@ msgstr "已切換至分支「%s」\n"
4504 #: builtin/checkout.c
4505 #, c-format
4506 msgid " ... and %d more.\n"
4497 -msgstr " …… 及其它 %d 個。\n"
4507 +msgstr " …… 及其他 %d 個。\n"
4508
4509 #: builtin/checkout.c
4510 #, c-format
@@ -4868,12 +4878,12 @@ msgstr ""
4878 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
4879 "[<pathspec>...]"
4880
4871 -#: builtin/clean.c
4881 +#: builtin/clean.c builtin/sparse-checkout.c
4882 #, c-format
4883 msgid "Removing %s\n"
4884 msgstr "正在刪除 %s\n"
4885
4876 -#: builtin/clean.c
4886 +#: builtin/clean.c builtin/sparse-checkout.c
4887 #, c-format
4888 msgid "Would remove %s\n"
4889 msgstr "將會刪除 %s\n"
@@ -4996,7 +5006,7 @@ msgstr "沒有要清理的檔案，離開。"
5006 msgid "do not print names of files removed"
5007 msgstr "不輸出移除的檔案的名稱"
5008
4999 -#: builtin/clean.c
5009 +#: builtin/clean.c builtin/sparse-checkout.c
5010 msgid "force"
5011 msgstr "force"
5012
@@ -5009,8 +5019,8 @@ msgid "remove whole directories"
5019 msgstr "移除整個目錄"
5020
5021 #: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c
5012 -#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c
5013 -#: builtin/show-ref.c ref-filter.h
5022 +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
5023 +#: pack-refs.c ref-filter.h
5024 msgid "pattern"
5025 msgstr "pattern"
5026
@@ -5048,7 +5058,7 @@ msgstr "%s 存在且不是目錄"
5058 #: builtin/clone.c
5059 #, c-format
5060 msgid "'%s' is a symlink, refusing to clone with --local"
5051 -msgstr "「%s」是符號連結，故不能使用 --local 複製"
5061 +msgstr "「%s」是符號連結，故不能使用 --local 拓製"
5062
5063 #: builtin/clone.c
5064 #, c-format
@@ -5058,7 +5068,7 @@ msgstr "無法在「%s」上啟動迭代器"
5068 #: builtin/clone.c
5069 #, c-format
5070 msgid "symlink '%s' exists, refusing to clone with --local"
5061 -msgstr "符號連結「%s」已存在，拒絕使用 --local 複製"
5071 +msgstr "符號連結「%s」已存在，拒絕使用 --local 拓製"
5072
5073 #: builtin/clone.c compat/precompose_utf8.c
5074 #, c-format
@@ -5083,7 +5093,7 @@ msgstr "建立連結「%s」失敗"
5093 #: builtin/clone.c
5094 #, c-format
5095 msgid "failed to copy file to '%s'"
5086 -msgstr "拷貝檔案至「%s」失敗"
5096 +msgstr "複製檔案至「%s」失敗"
5097
5098 #: builtin/clone.c refs/files-backend.c
5099 #, c-format
@@ -5101,7 +5111,7 @@ msgid ""
5111 "You can inspect what was checked out with 'git status'\n"
5112 "and retry with 'git restore --source=HEAD :/'\n"
5113 msgstr ""
5104 -"複製成功，但是簽出失敗。\n"
5114 +"拓製成功，但是簽出失敗。\n"
5115 "您可以透過「git status」檢查哪些已被簽出，然後使用指令\n"
5116 "「git restore --source=HEAD :/」重試\n"
5117
@@ -5140,7 +5150,7 @@ msgstr "無法刪除暫存 alternates 檔案"
5150
5151 #: builtin/clone.c
5152 msgid "don't clone shallow repository"
5143 -msgstr "不要複製淺層版本庫"
5153 +msgstr "不要拓製淺層版本庫"
5154
5155 #: builtin/clone.c
5156 msgid "don't create a checkout"
@@ -5156,11 +5166,11 @@ msgstr "建立鏡像版本庫（隱含 --bare）"
5166
5167 #: builtin/clone.c
5168 msgid "to clone from a local repository"
5159 -msgstr "從本機版本庫複製"
5169 +msgstr "從本機版本庫拓製"
5170
5171 #: builtin/clone.c
5172 msgid "don't use local hardlinks, always copy"
5163 -msgstr "不使用本機硬連結，始終拷貝"
5173 +msgstr "不使用本機硬連結，始終複製"
5174
5175 #: builtin/clone.c
5176 msgid "setup as shared repository"
@@ -5172,11 +5182,11 @@ msgstr "路徑規格"
5182
5183 #: builtin/clone.c
5184 msgid "initialize submodules in the clone"
5175 -msgstr "在複製時初始化子模組"
5185 +msgstr "在拓製時初始化子模組"
5186
5187 #: builtin/clone.c
5188 msgid "number of submodules cloned in parallel"
5179 -msgstr "平行複製的子模組數量"
5189 +msgstr "平行拓製的子模組數量"
5190
5191 #: builtin/clone.c builtin/init-db.c
5192 msgid "template-directory"
@@ -5192,7 +5202,7 @@ msgstr "引用版本庫"
5202
5203 #: builtin/clone.c builtin/submodule--helper.c
5204 msgid "use --reference only while cloning"
5195 -msgstr "僅在複製時使用 --reference"
5205 +msgstr "僅在拓製時使用 --reference"
5206
5207 #: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c
5208 #: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c
@@ -5210,7 +5220,7 @@ msgstr "簽出 <branch> 而不是遠端 HEAD"
5220
5221 #: builtin/clone.c
5222 msgid "clone single revision <rev> and check out"
5213 -msgstr "複製單個修訂版 <rev> 並簽出"
5223 +msgstr "拓製單個修訂版 <rev> 並簽出"
5224
5225 #: builtin/clone.c
5226 msgid "path to git-upload-pack on the remote"
@@ -5222,11 +5232,11 @@ msgstr "depth"
5232
5233 #: builtin/clone.c
5234 msgid "create a shallow clone of that depth"
5225 -msgstr "建立指定深度的淺層複製"
5235 +msgstr "建立指定深度的淺層拓製"
5236
5237 #: builtin/clone.c
5238 msgid "create a shallow clone since a specific time"
5229 -msgstr "建立從指定時間到現在的淺層複製"
5239 +msgstr "建立從指定時間到現在的淺層拓製"
5240
5241 #: builtin/clone.c builtin/fetch.c builtin/pull.c
5242 msgid "ref"
@@ -5234,19 +5244,19 @@ msgstr "ref"
5244
5245 #: builtin/clone.c builtin/fetch.c builtin/pull.c
5246 msgid "deepen history of shallow clone, excluding ref"
5237 -msgstr "取得更多淺層複製的過往歷史記錄，除了特定修訂版"
5247 +msgstr "取得更多淺層拓製的過往歷史記錄，除了特定修訂版"
5248
5249 #: builtin/clone.c builtin/submodule--helper.c
5250 msgid "clone only one branch, HEAD or --branch"
5241 -msgstr "只複製一個分支、HEAD 或 --branch"
5251 +msgstr "只拓製一個分支、HEAD 或 --branch"
5252
5253 #: builtin/clone.c
5254 msgid "clone tags, and make later fetches not to follow them"
5245 -msgstr "複製標籤，並使後續抓取不要追蹤這些標籤"
5255 +msgstr "拓製標籤，並使後續抓取不要追蹤這些標籤"
5256
5257 #: builtin/clone.c
5258 msgid "any cloned submodules will be shallow"
5249 -msgstr "子模組將以淺下載模式複製"
5259 +msgstr "子模組將以淺下載模式拓製"
5260
5261 #: builtin/clone.c builtin/init-db.c
5262 msgid "gitdir"
@@ -5280,11 +5290,11 @@ msgstr "傳輸選項"
5290
5291 #: builtin/clone.c
5292 msgid "apply partial clone filters to submodules"
5283 -msgstr "將部分複製過濾器套用至子模組"
5293 +msgstr "將部分拓製過濾器套用至子模組"
5294
5295 #: builtin/clone.c
5296 msgid "any cloned submodules will use their remote-tracking branch"
5287 -msgstr "任何複製的子模組都將使用它們的遠端追蹤分支"
5297 +msgstr "任何拓製的子模組都將使用它們的遠端追蹤分支"
5298
5299 #: builtin/clone.c
5300 msgid "initialize sparse-checkout file to include only files at root"
@@ -5308,7 +5318,7 @@ msgstr "太多參數。"
5318
5319 #: builtin/clone.c scalar.c
5320 msgid "You must specify a repository to clone."
5311 -msgstr "您必須指定要複製的版本庫。"
5321 +msgstr "您必須指定要拓製的版本庫。"
5322
5323 #: builtin/clone.c builtin/init-db.c builtin/refs.c builtin/submodule--helper.c
5324 #: setup.c
@@ -5354,12 +5364,12 @@ msgstr "無法建立工作區目錄「%s」"
5364 #: builtin/clone.c
5365 #, c-format
5366 msgid "Cloning into bare repository '%s'...\n"
5357 -msgstr "複製到純版本庫 '%s'...\n"
5367 +msgstr "拓製到純版本庫 '%s'...\n"
5368
5369 #: builtin/clone.c
5370 #, c-format
5371 msgid "Cloning into '%s'...\n"
5362 -msgstr "正複製到 '%s'...\n"
5372 +msgstr "正拓製到 '%s'...\n"
5373
5374 #: builtin/clone.c
5375 msgid ""
@@ -5374,27 +5384,27 @@ msgstr "'%s' 不是一個有效的遠端名稱"
5384
5385 #: builtin/clone.c
5386 msgid "--depth is ignored in local clones; use file:// instead."
5377 -msgstr "本機複製會忽略 --depth。請改用 file:// 通訊協定。"
5387 +msgstr "本機拓製會忽略 --depth。請改用 file:// 通訊協定。"
5388
5389 #: builtin/clone.c
5390 msgid "--shallow-since is ignored in local clones; use file:// instead."
5381 -msgstr "本機複製會忽略 --shallow-since。請改用 file:// 協定。"
5391 +msgstr "本機拓製會忽略 --shallow-since。請改用 file:// 協定。"
5392
5393 #: builtin/clone.c
5394 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
5385 -msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// 協定。"
5395 +msgstr "本機拓製會忽略 --shallow-exclude。請改用 file:// 協定。"
5396
5397 #: builtin/clone.c
5398 msgid "--filter is ignored in local clones; use file:// instead."
5389 -msgstr "本機複製會忽略 --filter。請改用 file:// 協定。"
5399 +msgstr "本機拓製會忽略 --filter。請改用 file:// 協定。"
5400
5401 #: builtin/clone.c fetch-pack.c
5402 msgid "source repository is shallow, reject to clone."
5393 -msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。"
5403 +msgstr "來源版本庫是淺版本庫 (shallow)。拒絕拓製。"
5404
5405 #: builtin/clone.c
5406 msgid "source repository is shallow, ignoring --local"
5397 -msgstr "來源版本庫是淺複製，忽略 --local"
5407 +msgstr "來源版本庫是淺拓製，忽略 --local"
5408
5409 #: builtin/clone.c
5410 msgid "--local is ignored"
@@ -5402,7 +5412,7 @@ msgstr "--local 被忽略"
5412
5413 #: builtin/clone.c
5414 msgid "cannot clone from filtered bundle"
5405 -msgstr "無法從過濾後的套件包複製"
5415 +msgstr "無法從過濾後的套件包拓製"
5416
5417 #: builtin/clone.c
5418 msgid "failed to initialize the repo, skipping bundle URI"
@@ -5433,7 +5443,7 @@ msgstr "上游 %2$s 上找不到遠端修訂版 %1$s"
5443
5444 #: builtin/clone.c
5445 msgid "You appear to have cloned an empty repository."
5436 -msgstr "您複製的版本庫似乎是空的。"
5446 +msgstr "您拓製的版本庫似乎是空的。"
5447
5448 #: builtin/column.c
5449 msgid "git column [<options>]"
@@ -6516,7 +6526,7 @@ msgstr ""
6526
6527 #: builtin/config.c
6528 msgid "Other"
6519 -msgstr "其它"
6529 +msgstr "其他"
6530
6531 #: builtin/config.c
6532 msgid "respect include directives on lookup"
@@ -6835,6 +6845,16 @@ msgstr "已遍歷 %lu 個提交\n"
6845 msgid "found %i tags; gave up search at %s\n"
6846 msgstr "找到 %i 個標籤；在 %s 放棄搜尋\n"
6847
6848 +#: builtin/describe.c
6849 +#, c-format
6850 +msgid "cannot search for blob '%s' on an unborn branch"
6851 +msgstr "不能在未誕生的分支上搜尋資料物件「%s」"
6852 +
6853 +#: builtin/describe.c
6854 +#, c-format
6855 +msgid "blob '%s' not reachable from HEAD"
6856 +msgstr "從 HEAD 無法到達資料物件「%s」"
6857 +
6858 #: builtin/describe.c
6859 #, c-format
6860 msgid "describe %s\n"
@@ -6986,7 +7006,7 @@ msgstr "讀取目的地路徑時遇到 EOF"
7006 #: builtin/diff-pairs.c
7007 #, c-format
7008 msgid "unable to parse rename/copy score: %s"
6989 -msgstr "無法解析重新命名/拷貝分數：%s"
7009 +msgstr "無法解析重新命名/複製的相似度：%s"
7010
7011 #: builtin/diff-pairs.c
7012 #, c-format
@@ -7016,6 +7036,10 @@ msgstr "無效選項：%s"
7036 msgid "%s...%s: no merge base"
7037 msgstr "%s...%s: 無合併基底"
7038
7039 +#: builtin/diff.c setup.c
7040 +msgid "cannot come back to cwd"
7041 +msgstr "無法返回目前工作目錄"
7042 +
7043 #: builtin/diff.c
7044 msgid "Not a git repository"
7045 msgstr "不是一個 git 版本庫"
@@ -7079,7 +7103,7 @@ msgstr "工作區檔案被留了下來。"
7103 #: builtin/difftool.c sequencer.c
7104 #, c-format
7105 msgid "could not copy '%s' to '%s'"
7082 -msgstr "無法將「%s」拷貝至「%s」"
7106 +msgstr "無法將「%s」複製至「%s」"
7107
7108 #: builtin/difftool.c
7109 #, c-format
@@ -7154,8 +7178,161 @@ msgid "git fast-export [<rev-list-opts>]"
7178 msgstr "git fast-export [<rev-list-opts>]"
7179
7180 #: builtin/fast-export.c
7157 -msgid "Error: Cannot export nested tags unless --mark-tags is specified."
7158 -msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。"
7181 +#, c-format
7182 +msgid "unknown %s mode: %s"
7183 +msgstr "%s 的模式未知：%s"
7184 +
7185 +#: builtin/fast-export.c
7186 +#, c-format
7187 +msgid "unknown tag-of-filtered mode: %s"
7188 +msgstr "標籤之物件濾除者的模式未知：%s"
7189 +
7190 +#: builtin/fast-export.c
7191 +#, c-format
7192 +msgid "unknown reencoding mode: %s"
7193 +msgstr "重新編碼的模式未知：%s"
7194 +
7195 +#: builtin/fast-export.c
7196 +#, c-format
7197 +msgid "could not read blob %s"
7198 +msgstr "無法讀取資料物件 %s"
7199 +
7200 +#: builtin/fast-export.c
7201 +#, c-format
7202 +msgid "oid mismatch in blob %s"
7203 +msgstr "資料物件 %s 中的物件 ID 不符"
7204 +
7205 +#: builtin/fast-export.c
7206 +#, c-format
7207 +msgid "could not write blob '%s'"
7208 +msgstr "無法寫入資料物件「%s」"
7209 +
7210 +#: builtin/fast-export.c
7211 +#, c-format
7212 +msgid "unexpected comparison status '%c' for %s, %s"
7213 +msgstr "%2$s、%3$s 有非預期的比較狀態「%1$c」"
7214 +
7215 +#: builtin/fast-export.c
7216 +msgid "none"
7217 +msgstr "無"
7218 +
7219 +#: builtin/fast-export.c
7220 +#, c-format
7221 +msgid "could not find author in commit %s"
7222 +msgstr "無法從提交 %s 中找到作者"
7223 +
7224 +#: builtin/fast-export.c
7225 +#, c-format
7226 +msgid "could not find committer in commit %s"
7227 +msgstr "無法從提交 %s 中找到提交者"
7228 +
7229 +#: builtin/fast-export.c
7230 +#, c-format
7231 +msgid ""
7232 +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|"
7233 +"no] to handle it"
7234 +msgstr ""
7235 +"發現提交特定的編碼 %.*s 在 %s 提交當中；使用 --reencode=[yes|no] 來處理"
7236 +
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 +
7242 +#: builtin/fast-export.c
7243 +#, c-format
7244 +msgid "exporting %<PRIuMAX> signature(s) for commit %s"
7245 +msgstr "匯出提交 %2$s 的 %1$<PRIuMAX> 個簽章"
7246 +
7247 +#: builtin/fast-export.c
7248 +#, c-format
7249 +msgid "stripping signature(s) from commit %s"
7250 +msgstr "去除提交 %s 的簽章"
7251 +
7252 +#: builtin/fast-export.c
7253 +#, c-format
7254 +msgid ""
7255 +"omitting tag %s,\n"
7256 +"since tags of trees (or tags of tags of trees, etc.) are not supported."
7257 +msgstr ""
7258 +"省略標籤 %s，\n"
7259 +"不支援樹狀物件的標籤（或樹狀物件的標籤的標籤等）。"
7260 +
7261 +#: builtin/fast-export.c
7262 +#, c-format
7263 +msgid "could not read tag %s"
7264 +msgstr "無法讀取標籤 %s"
7265 +
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 +
7271 +#: builtin/fast-export.c
7272 +#, c-format
7273 +msgid "exporting signed tag %s"
7274 +msgstr "匯出已簽署的標籤 %s"
7275 +
7276 +#: builtin/fast-export.c
7277 +#, c-format
7278 +msgid "stripping signature from tag %s"
7279 +msgstr "去除標籤 %s 的簽章"
7280 +
7281 +#: builtin/fast-export.c
7282 +#, c-format
7283 +msgid ""
7284 +"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle "
7285 +"it"
7286 +msgstr "標籤 %s 在不支援的物件上；使用 --tag-of-filtered-object=<mode> 來處理"
7287 +
7288 +#: builtin/fast-export.c
7289 +msgid "cannot export nested tags unless --mark-tags is specified."
7290 +msgstr "除非指定 --mark-tags，否則不能匯出巢狀標籤。"
7291 +
7292 +#: builtin/fast-export.c
7293 +#, c-format
7294 +msgid "tag %s points nowhere?"
7295 +msgstr "標籤 %s 不指向任何東西？"
7296 +
7297 +#: builtin/fast-export.c
7298 +#, c-format
7299 +msgid "%s: unexpected object of type %s, skipping."
7300 +msgstr "%s：非預期 %s 類型的物件，跳過。"
7301 +
7302 +#: builtin/fast-export.c
7303 +#, c-format
7304 +msgid "tag points to object of unexpected type %s, skipping."
7305 +msgstr "標籤指向非預期類型 %s 的物件，跳過。"
7306 +
7307 +#: builtin/fast-export.c
7308 +#, c-format
7309 +msgid "unable to open marks file %s for writing."
7310 +msgstr "無法為寫入開啟標記檔案 %s。"
7311 +
7312 +#: builtin/fast-export.c
7313 +#, c-format
7314 +msgid "unable to write marks file %s."
7315 +msgstr "無法寫入標記檔案 %s。"
7316 +
7317 +#: builtin/fast-export.c builtin/fast-import.c
7318 +#, c-format
7319 +msgid "corrupt mark line: %s"
7320 +msgstr "損壞的標記列：%s"
7321 +
7322 +#: builtin/fast-export.c builtin/fast-import.c fetch-pack.c
7323 +#, c-format
7324 +msgid "object not found: %s"
7325 +msgstr "物件未找到：%s"
7326 +
7327 +#: builtin/fast-export.c
7328 +#, c-format
7329 +msgid "not a commit? can't happen: %s"
7330 +msgstr "不是提交？不能發生：%s"
7331 +
7332 +#: builtin/fast-export.c
7333 +#, c-format
7334 +msgid "object %s already has a mark"
7335 +msgstr "物件 %s 已有標記"
7336
7337 #: builtin/fast-export.c
7338 msgid "--anonymize-map token cannot be empty"
@@ -7243,33 +7420,569 @@ msgstr "為包含標記 ID 的標籤打上標記"
7420
7421 #: builtin/fast-import.c
7422 #, c-format
7246 -msgid "Missing from marks for submodule '%s'"
7247 -msgstr "「%s」子模組缺少 from 標記"
7423 +msgid "can't write crash report %s"
7424 +msgstr "無法寫入 %s 當機報告"
7425 +
7426 +#: builtin/fast-import.c
7427 +#, c-format
7428 +msgid "fast-import: dumping crash report to %s\n"
7429 +msgstr "fast-import：傾印崩潰報告至 %s\n"
7430 +
7431 +#: builtin/fast-import.c
7432 +#, c-format
7433 +msgid "mark :%<PRIuMAX> not declared"
7434 +msgstr "未宣告標記 :%<PRIuMAX>"
7435 +
7436 +#: builtin/fast-import.c
7437 +#, c-format
7438 +msgid "invalid attempt to create duplicate branch: %s"
7439 +msgstr "建立重複分支的嘗試無效：%s"
7440 +
7441 +#: builtin/fast-import.c
7442 +#, c-format
7443 +msgid "branch name doesn't conform to Git standards: %s"
7444 +msgstr "分支名稱不符 Git 標準：%s"
7445 +
7446 +#: builtin/fast-import.c
7447 +msgid "internal consistency error creating the index"
7448 +msgstr "建立索引時發生內部一致性錯誤"
7449 +
7450 +#: builtin/fast-import.c
7451 +msgid "cannot create keep file"
7452 +msgstr "無法建立保留檔案"
7453 +
7454 +#: builtin/fast-import.c
7455 +msgid "failed to write keep file"
7456 +msgstr "無法寫入保留檔案"
7457 +
7458 +#: builtin/fast-import.c
7459 +msgid "cannot store pack file"
7460 +msgstr "無法儲存包檔案"
7461 +
7462 +#: builtin/fast-import.c
7463 +msgid "cannot store index file"
7464 +msgstr "無法儲存索引檔案"
7465 +
7466 +#: builtin/fast-import.c
7467 +#, c-format
7468 +msgid "failed seeking to start of '%s'"
7469 +msgstr "探尋 %s 的開頭失敗"
7470 +
7471 +#: builtin/fast-import.c
7472 +#, c-format
7473 +msgid "core Git rejected index %s"
7474 +msgstr "核心 Git 拒絕索引 %s"
7475 +
7476 +#: builtin/fast-import.c
7477 +msgid "cannot truncate pack to skip duplicate"
7478 +msgstr "無法截斷包來跳過重複項目"
7479 +
7480 +#: builtin/fast-import.c
7481 +#, c-format
7482 +msgid "EOF in data (%<PRIuMAX> bytes remaining)"
7483 +msgstr "資料中有 EOF（剩餘 %<PRIuMAX> 個位元組）"
7484 +
7485 +#: builtin/fast-import.c
7486 +#, c-format
7487 +msgid "unexpected deflate failure: %d"
7488 +msgstr "非預期的壓縮失敗：%d"
7489 +
7490 +#: builtin/fast-import.c
7491 +#, c-format
7492 +msgid "not a tree: %s"
7493 +msgstr "非樹狀物件：%s"
7494 +
7495 +#: builtin/fast-import.c
7496 +#, c-format
7497 +msgid "can't load tree %s"
7498 +msgstr "無法載入樹狀物件 %s"
7499 +
7500 +#: builtin/fast-import.c
7501 +#, c-format
7502 +msgid "corrupt mode in %s"
7503 +msgstr "%s 中有損壞的模式"
7504 +
7505 +#: builtin/fast-import.c
7506 +msgid "root cannot be a non-directory"
7507 +msgstr "根不能不是目錄"
7508 +
7509 +#: builtin/fast-import.c
7510 +msgid "empty path component found in input"
7511 +msgstr "輸入中有空的路徑部分"
7512 +
7513 +#: builtin/fast-import.c
7514 +msgid "non-directories cannot have subtrees"
7515 +msgstr "非目錄者不能有子樹"
7516 +
7517 +#: builtin/fast-import.c
7518 +#, c-format
7519 +msgid "dropping %s since it would point to itself (i.e. to %s)"
7520 +msgstr "捨棄 %s，因其指向自身（即指向 %s）"
7521 +
7522 +#: builtin/fast-import.c
7523 +#, c-format
7524 +msgid "branch %s is missing commits."
7525 +msgstr "分支 %s 缺少提交。"
7526 +
7527 +#: builtin/fast-import.c
7528 +#, c-format
7529 +msgid "not updating %s (new tip %s does not contain %s)"
7530 +msgstr "沒有更新 %s（提示：%s 不包含 %s）"
7531 +
7532 +#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c
7533 +#: sequencer.c
7534 +#, c-format
7535 +msgid "unable to create leading directories of %s"
7536 +msgstr "不能為 %s 建立先導目錄"
7537 +
7538 +#: builtin/fast-import.c
7539 +#, c-format
7540 +msgid "unable to write marks file %s"
7541 +msgstr "無法寫入標記檔案 %s"
7542 +
7543 +#: builtin/fast-import.c
7544 +#, c-format
7545 +msgid "unable to write marks file %s: %s"
7546 +msgstr "無法寫入標記檔案 %s：%s"
7547 +
7548 +#: builtin/fast-import.c object-file.c
7549 +#, c-format
7550 +msgid "unable to write file %s"
7551 +msgstr "無法寫檔案 %s"
7552 +
7553 +#: builtin/fast-import.c
7554 +#, c-format
7555 +msgid "expected 'data n' command, found: %s"
7556 +msgstr "預期「data n」命令，卻找到：%s"
7557 +
7558 +#: builtin/fast-import.c
7559 +#, c-format
7560 +msgid "EOF in data (terminator '%s' not found)"
7561 +msgstr "資料中有 EOF（未找到終止子「%s」）"
7562 +
7563 +#: builtin/fast-import.c
7564 +msgid "data is too large to use in this context"
7565 +msgstr "要用於此上下文的資料太大"
7566 +
7567 +#: builtin/fast-import.c
7568 +#, c-format
7569 +msgid "EOF in data (%lu bytes remaining)"
7570 +msgstr "資料中有 EOF（剩餘 %lu 個位元組）"
7571 +
7572 +#: builtin/fast-import.c
7573 +#, c-format
7574 +msgid "missing < in ident string: %s"
7575 +msgstr "身分字串中缺少 <：%s"
7576 +
7577 +#: builtin/fast-import.c
7578 +#, c-format
7579 +msgid "missing space before < in ident string: %s"
7580 +msgstr "身分字串的 < 前面缺少空格：%s"
7581 +
7582 +#: builtin/fast-import.c
7583 +#, c-format
7584 +msgid "missing > in ident string: %s"
7585 +msgstr "身分字串中缺少 >：%s"
7586 +
7587 +#: builtin/fast-import.c
7588 +#, c-format
7589 +msgid "missing space after > in ident string: %s"
7590 +msgstr "身分字串的 > 後面缺少空格：%s"
7591 +
7592 +#: builtin/fast-import.c
7593 +#, c-format
7594 +msgid "invalid raw date \"%s\" in ident: %s"
7595 +msgstr "身分中有無效的原始日期「%s」：%s"
7596 +
7597 +#: builtin/fast-import.c
7598 +#, c-format
7599 +msgid "invalid rfc2822 date \"%s\" in ident: %s"
7600 +msgstr "身分中有無效的 RFC2822 日期「%s」：%s"
7601 +
7602 +#: builtin/fast-import.c
7603 +#, c-format
7604 +msgid "date in ident must be 'now': %s"
7605 +msgstr "身分中的日期必須是「now」：%s"
7606 +
7607 +#: builtin/fast-import.c
7608 +#, c-format
7609 +msgid "too large fanout (%u)"
7610 +msgstr "扇出值太大（%u）"
7611 +
7612 +#: builtin/fast-import.c
7613 +#, c-format
7614 +msgid "failed to remove path %s"
7615 +msgstr "無法移除路徑 %s"
7616
7617 #: builtin/fast-import.c
7618 #, c-format
7251 -msgid "Missing to marks for submodule '%s'"
7252 -msgstr "「%s」子模組缺少 to 標記"
7619 +msgid "no value after ':' in mark: %s"
7620 +msgstr "標記的「:」後沒有值：%s"
7621
7622 #: builtin/fast-import.c
7623 #, c-format
7256 -msgid "Expected 'mark' command, got %s"
7257 -msgstr "預期 'mark' 指令，得到 %s"
7624 +msgid "garbage after mark: %s"
7625 +msgstr "標記後有垃圾：%s"
7626
7627 #: builtin/fast-import.c
7628 #, c-format
7261 -msgid "Expected 'to' command, got %s"
7262 -msgstr "預期 'to' 指令，得到 %s"
7629 +msgid "missing space after mark: %s"
7630 +msgstr "標記後缺少空格：%s"
7631
7632 #: builtin/fast-import.c
7265 -msgid "Expected format name:filename for submodule rewrite option"
7266 -msgstr "期望子模組 rewrite 選項的格式是 name:filename"
7633 +#, c-format
7634 +msgid "invalid %s: %s"
7635 +msgstr "無效 %s：%s"
7636 +
7637 +#: builtin/fast-import.c
7638 +#, c-format
7639 +msgid "NUL in %s: %s"
7640 +msgstr "%s 中有 NUL：%s"
7641 +
7642 +#: builtin/fast-import.c
7643 +#, c-format
7644 +msgid "garbage after %s: %s"
7645 +msgstr "%s 後有垃圾：%s"
7646 +
7647 +#: builtin/fast-import.c
7648 +#, c-format
7649 +msgid "missing space after %s: %s"
7650 +msgstr "%s 後缺少空格：%s"
7651 +
7652 +#: builtin/fast-import.c
7653 +#, c-format
7654 +msgid "corrupt mode: %s"
7655 +msgstr "損壞的模式：%s"
7656 +
7657 +#: builtin/fast-import.c
7658 +#, c-format
7659 +msgid "invalid dataref: %s"
7660 +msgstr "無效的資料引用：%s"
7661 +
7662 +#: builtin/fast-import.c
7663 +#, c-format
7664 +msgid "missing space after SHA1: %s"
7665 +msgstr "SHA1 值後缺少空格：%s"
7666 +
7667 +#: builtin/fast-import.c
7668 +#, c-format
7669 +msgid "Git links cannot be specified 'inline': %s"
7670 +msgstr "Git 連結不能指定「inline」：%s"
7671 +
7672 +#: builtin/fast-import.c
7673 +#, c-format
7674 +msgid "not a commit (actually a %s): %s"
7675 +msgstr "不是提交（而是 %s）：%s"
7676 +
7677 +#: builtin/fast-import.c
7678 +#, c-format
7679 +msgid "directories cannot be specified 'inline': %s"
7680 +msgstr "目錄不能指定「inline」：%s"
7681 +
7682 +#: builtin/fast-import.c
7683 +#, c-format
7684 +msgid "%s not found: %s"
7685 +msgstr "找不到 %s：%s"
7686 +
7687 +#: builtin/fast-import.c
7688 +msgid "tree"
7689 +msgstr "樹狀物件"
7690 +
7691 +#: builtin/fast-import.c
7692 +#, c-format
7693 +msgid "not a %s (actually a %s): %s"
7694 +msgstr "不是 %s（而是 %s）：%s"
7695 +
7696 +#: builtin/fast-import.c
7697 +#, c-format
7698 +msgid "path %s not in branch"
7699 +msgstr "分支中沒有路徑 %s"
7700 +
7701 +#: builtin/fast-import.c
7702 +msgid "can't add a note on empty branch."
7703 +msgstr "不能在空分支上附加註記。"
7704 +
7705 +#: builtin/fast-import.c
7706 +#, c-format
7707 +msgid "mark :%<PRIuMAX> not a commit"
7708 +msgstr "標記 :%<PRIuMAX> 不是提交"
7709 +
7710 +#: builtin/fast-import.c
7711 +#, c-format
7712 +msgid "not a valid commit: %s"
7713 +msgstr "不是有效的提交：%s"
7714 +
7715 +#: builtin/fast-import.c
7716 +#, c-format
7717 +msgid "invalid ref name or SHA1 expression: %s"
7718 +msgstr "無效的引用名稱或 SHA1 表示式：%s"
7719 +
7720 +#: builtin/fast-import.c
7721 +#, c-format
7722 +msgid "not a blob (actually a %s): %s"
7723 +msgstr "不是資料物件（而是 %s）：%s"
7724 +
7725 +#: builtin/fast-import.c
7726 +#, c-format
7727 +msgid "blob not found: %s"
7728 +msgstr "找不到資料物件：%s"
7729 +
7730 +#: builtin/fast-import.c
7731 +#, c-format
7732 +msgid "the commit %s is corrupt"
7733 +msgstr "提交 %s 損壞"
7734 +
7735 +#: builtin/fast-import.c
7736 +#, c-format
7737 +msgid "can't create a branch from itself: %s"
7738 +msgstr "不能從分支自身建立分支：%s"
7739 +
7740 +#: builtin/fast-import.c
7741 +#, c-format
7742 +msgid ""
7743 +"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig "
7744 +"%s'"
7745 +msgstr ""
7746 +"預期 gpgsig 格式：「gpgsig <hash-algo> <signature-format>」，卻收到「gpgsig "
7747 +"%s」"
7748 +
7749 +#: builtin/fast-import.c
7750 +#, c-format
7751 +msgid "unknown git hash algorithm in gpgsig: '%s'"
7752 +msgstr "gpgsig 中有未知的 Git 雜湊演算法：「%s」"
7753 +
7754 +#: builtin/fast-import.c
7755 +#, c-format
7756 +msgid "invalid signature format in gpgsig: '%s'"
7757 +msgstr "gpgsig 中有無效的簽章格式：「%s」"
7758 +
7759 +#: builtin/fast-import.c
7760 +msgid "'unknown' signature format in gpgsig"
7761 +msgstr "gpgsig 中有「unknown」簽章格式"
7762 +
7763 +#: builtin/fast-import.c
7764 +#, c-format
7765 +msgid "multiple %s signatures found, ignoring additional signature"
7766 +msgstr "找到多個 %s 簽章，忽略多餘的簽章"
7767 +
7768 +#: builtin/fast-import.c
7769 +msgid "parse_one_signature() returned unknown hash algo"
7770 +msgstr "parse_one_signature() 回傳了未知的雜湊演算法"
7771 +
7772 +#: builtin/fast-import.c
7773 +msgid "expected committer but didn't get one"
7774 +msgstr "預期有提交者，卻沒收到"
7775 +
7776 +#: builtin/fast-import.c
7777 +msgid "encountered signed commit; use --signed-commits=<mode> to handle it"
7778 +msgstr "發現已簽署的提交；使用 --signed-commits=<mode> 來處理"
7779 +
7780 +#: builtin/fast-import.c
7781 +msgid "stripping a commit signature"
7782 +msgstr "去除提交簽章"
7783 +
7784 +#: builtin/fast-import.c
7785 +msgid "importing a commit signature verbatim"
7786 +msgstr "按原樣匯入提交簽章"
7787 +
7788 +#: builtin/fast-import.c
7789 +msgid "encountered signed tag; use --signed-tags=<mode> to handle it"
7790 +msgstr "發現已簽署的標籤；使用 --signed-tags=<mode> 來處理"
7791 +
7792 +#: builtin/fast-import.c
7793 +#, c-format
7794 +msgid "importing a tag signature verbatim for tag '%s'"
7795 +msgstr "按原樣匯入標籤「%s」的簽章"
7796 +
7797 +#: builtin/fast-import.c
7798 +#, c-format
7799 +msgid "stripping a tag signature for tag '%s'"
7800 +msgstr "去除標籤「%s」的簽章"
7801 +
7802 +#: builtin/fast-import.c
7803 +#, c-format
7804 +msgid "expected 'from' command, got '%s'"
7805 +msgstr "預期「from」命令，卻收到「%s」"
7806 +
7807 +#: builtin/fast-import.c
7808 +msgid "can't tag an empty branch."
7809 +msgstr "空分支上不能有標籤。"
7810 +
7811 +#: builtin/fast-import.c builtin/merge.c
7812 +#, c-format
7813 +msgid "not a valid object: %s"
7814 +msgstr "不是一個有效物件：%s"
7815 +
7816 +#: builtin/fast-import.c
7817 +msgid "write to frontend failed"
7818 +msgstr "寫入前端失敗"
7819 +
7820 +#: builtin/fast-import.c
7821 +#, c-format
7822 +msgid "can't read object %s"
7823 +msgstr "無法讀取物件 %s"
7824 +
7825 +#: builtin/fast-import.c
7826 +#, c-format
7827 +msgid "object %s is a %s but a blob was expected."
7828 +msgstr "物件 %s 是 %s，但預期是資料物件。"
7829 +
7830 +#: builtin/fast-import.c
7831 +#, c-format
7832 +msgid "not a mark: %s"
7833 +msgstr "不是標記：%s"
7834 +
7835 +#: builtin/fast-import.c
7836 +#, c-format
7837 +msgid "unknown mark: %s"
7838 +msgstr "未知標記：%s"
7839 +
7840 +#: builtin/fast-import.c
7841 +#, c-format
7842 +msgid "garbage after SHA1: %s"
7843 +msgstr "SHA1 值後有垃圾：%s"
7844 +
7845 +#: builtin/fast-import.c
7846 +#, c-format
7847 +msgid "not a tree-ish: %s"
7848 +msgstr "不是樹狀物件指示元：%s"
7849 +
7850 +#: builtin/fast-import.c
7851 +#, c-format
7852 +msgid "can't load object %s"
7853 +msgstr "無法載入物件 %s"
7854 +
7855 +#: builtin/fast-import.c
7856 +#, c-format
7857 +msgid "invalid SHA1 in tag: %s"
7858 +msgstr "標籤中有無效的 SHA1 值：%s"
7859 +
7860 +#: builtin/fast-import.c
7861 +#, c-format
7862 +msgid "invalid SHA1 in commit: %s"
7863 +msgstr "提交中有無效的 SHA1 值：%s"
7864 +
7865 +#: builtin/fast-import.c
7866 +#, c-format
7867 +msgid "missing from marks for submodule '%s'"
7868 +msgstr "子模組「%s」缺少 from 標記"
7869 +
7870 +#: builtin/fast-import.c
7871 +#, c-format
7872 +msgid "missing to marks for submodule '%s'"
7873 +msgstr "子模組「%s」缺少 to 標記"
7874 +
7875 +#: builtin/fast-import.c
7876 +#, c-format
7877 +msgid "missing space after tree-ish: %s"
7878 +msgstr "樹狀物件指示元後缺少空格：%s"
7879 +
7880 +#: builtin/fast-import.c
7881 +#, c-format
7882 +msgid "not in a commit: %s"
7883 +msgstr "不在提交中：%s"
7884 +
7885 +#: builtin/fast-import.c
7886 +#, c-format
7887 +msgid "expected 'mark' command, got %s"
7888 +msgstr "預期「mark」命令，卻收到 %s"
7889 +
7890 +#: builtin/fast-import.c
7891 +#, c-format
7892 +msgid "expected 'to' command, got %s"
7893 +msgstr "預期「to」命令，卻收到 %s"
7894 +
7895 +#: builtin/fast-import.c
7896 +msgid "only one import-marks command allowed per stream"
7897 +msgstr "每個流僅限一個 import-marks 命令"
7898 +
7899 +#: builtin/fast-import.c
7900 +#, c-format
7901 +msgid "unknown --date-format argument %s"
7902 +msgstr "未知的 --date-format 引數 %s"
7903 +
7904 +#: builtin/fast-import.c
7905 +#, c-format
7906 +msgid "%s: argument must be a non-negative integer"
7907 +msgstr "%s：引數必須是非負整數"
7908 +
7909 +#: builtin/fast-import.c
7910 +#, c-format
7911 +msgid "--depth cannot exceed %u"
7912 +msgstr "--depth 不能超過 %u"
7913 +
7914 +#: builtin/fast-import.c
7915 +#, c-format
7916 +msgid "--cat-blob-fd cannot exceed %d"
7917 +msgstr "--cat-blob-fd 不能超過 %d"
7918 +
7919 +#: builtin/fast-import.c
7920 +msgid "expected format name:filename for submodule rewrite option"
7921 +msgstr "子模組 rewrite 選項預期格式 name:filename"
7922 +
7923 +#: builtin/fast-import.c
7924 +#, c-format
7925 +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
7926 +msgstr "max-pack-size 現在的單位是位元組，假定 --max-pack-size=%lum"
7927 +
7928 +#: builtin/fast-import.c
7929 +msgid "minimum max-pack-size is 1 MiB"
7930 +msgstr "max-pack-size 的最小值是 1 MiB"
7931 +
7932 +#: builtin/fast-import.c
7933 +#, c-format
7934 +msgid "unknown --signed-commits mode '%s'"
7935 +msgstr "未知的 --signed-commits 模式「%s」"
7936 +
7937 +#: builtin/fast-import.c
7938 +#, c-format
7939 +msgid "unknown --signed-tags mode '%s'"
7940 +msgstr "未知的 --signed-tags 模式「%s」"
7941
7942 #: builtin/fast-import.c
7943 #, c-format
7944 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
7945 msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能"
7946
7947 +#: builtin/fast-import.c
7948 +#, c-format
7949 +msgid "got feature command '%s' after data command"
7950 +msgstr "在資料命令後收到功能命令「%s」"
7951 +
7952 +#: builtin/fast-import.c
7953 +#, c-format
7954 +msgid "this version of fast-import does not support feature %s."
7955 +msgstr "此版本的 fast-import 不支援功能 %s。"
7956 +
7957 +#: builtin/fast-import.c
7958 +#, c-format
7959 +msgid "got option command '%s' after data command"
7960 +msgstr "在資料命令後收到選項命令「%s」"
7961 +
7962 +#: builtin/fast-import.c
7963 +#, c-format
7964 +msgid "this version of fast-import does not support option: %s"
7965 +msgstr "此版本的 fast-import 不支援選項：%s"
7966 +
7967 +#: builtin/fast-import.c builtin/merge-recursive.c
7968 +#, c-format
7969 +msgid "unknown option %s"
7970 +msgstr "未知選項 %s"
7971 +
7972 +#: builtin/fast-import.c
7973 +#, c-format
7974 +msgid "unknown option --%s"
7975 +msgstr "未知選項 --%s"
7976 +
7977 +#: builtin/fast-import.c
7978 +#, c-format
7979 +msgid "unsupported command: %s"
7980 +msgstr "不支援的命令：%s"
7981 +
7982 +#: builtin/fast-import.c
7983 +msgid "stream ends early"
7984 +msgstr "流提早結束"
7985 +
7986 #: builtin/fetch-pack.c
7987 #, c-format
7988 msgid "Lockfile created but not reported: %s"
@@ -7387,7 +8100,7 @@ msgstr "%s 未傳送所有必需的物件"
8100 #: builtin/fetch.c
8101 #, c-format
8102 msgid "rejected %s because shallow roots are not allowed to be updated"
7390 -msgstr "已拒絕 %s，不允許更新淺複製"
8103 +msgstr "已拒絕 %s，不允許更新淺拓製"
8104
8105 #: builtin/fetch.c
8106 msgid "[deleted]"
@@ -7437,6 +8150,32 @@ msgstr ""
8150 "「git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s」\n"
8151 "會停用這個警告，直到遠端將 HEAD 改為指向其他東西。"
8152
8153 +#: builtin/fetch.c
8154 +msgid ""
8155 +"You're on a case-insensitive filesystem, and the remote you are\n"
8156 +"trying to fetch from has references that only differ in casing. It\n"
8157 +"is impossible to store such references with the 'files' backend. You\n"
8158 +"can either accept this as-is, in which case you won't be able to\n"
8159 +"store all remote references on disk. Or you can alternatively\n"
8160 +"migrate your repository to use the 'reftable' backend with the\n"
8161 +"following command:\n"
8162 +"\n"
8163 +" git refs migrate --ref-format=reftable\n"
8164 +"\n"
8165 +"Please keep in mind that not all implementations of Git support this\n"
8166 +"new format yet. So if you use tools other than Git to access this\n"
8167 +"repository it may not be an option to migrate to reftables.\n"
8168 +msgstr ""
8169 +"檔案系統不區分大小寫，但嘗試抓取的遠端上有引用只差在大小寫，不可能\n"
8170 +"以「file」後端儲存這些引用。你可以按原樣接受，這表示你不能在硬碟上儲存\n"
8171 +"所有遠端引用；抑或你可以令版本庫改為使用「reftable」後端，透過執行以下\n"
8172 +"命令：\n"
8173 +"\n"
8174 +" git refs migrate --ref-format=reftable\n"
8175 +"\n"
8176 +"請注意並非所有 Git 實作都支援這個新格式。因此若你還使用 Git 之外的工具\n"
8177 +"來存取此版本庫，遷移至 reftable 可能不是個好選擇。\n"
8178 +
8179 #: builtin/fetch.c
8180 #, c-format
8181 msgid ""
@@ -7585,11 +8324,11 @@ msgstr "允許更新 HEAD 引用"
8324
8325 #: builtin/fetch.c builtin/pull.c
8326 msgid "deepen history of shallow clone"
7588 -msgstr "取得淺複製的更多過去歷史記錄"
8327 +msgstr "取得淺拓製的更多過去歷史記錄"
8328
8329 #: builtin/fetch.c builtin/pull.c
8330 msgid "deepen history of shallow repository based on time"
7592 -msgstr "基於時間來深化淺複製的歷史"
8331 +msgstr "根據時間深化淺層版本庫的歷史記錄"
8332
8333 #: builtin/fetch.c builtin/pull.c
8334 msgid "convert to a complete repository"
@@ -7712,7 +8451,7 @@ msgstr "git fmt-merge-msg [-m <說明>] [--log[=<n>] | --no-log] [--file <檔案
8451
8452 #: builtin/fmt-merge-msg.c
8453 msgid "populate log with at most <n> entries from shortlog"
7715 -msgstr "向提交說明中最多複製指定條目（合併而來的提交）的簡短說明"
8454 +msgstr "向提交說明中最多拓製指定條目（合併而來的提交）的簡短說明"
8455
8456 #: builtin/fmt-merge-msg.c
8457 msgid "alias for --log (deprecated)"
@@ -7732,27 +8471,7 @@ msgstr "使用 <名稱> 而非實際目的地分支"
8471
8472 #: builtin/fmt-merge-msg.c
8473 msgid "file to read from"
7735 -msgstr "從檔案中讀取"
7736 -
7737 -#: builtin/for-each-ref.c
7738 -msgid "git for-each-ref [<options>] [<pattern>]"
7739 -msgstr "git for-each-ref [<選項>] [<模式>]"
7740 -
7741 -#: builtin/for-each-ref.c
7742 -msgid "git for-each-ref [--points-at <object>]"
7743 -msgstr "git for-each-ref [--points-at <物件>]"
7744 -
7745 -#: builtin/for-each-ref.c
7746 -msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
7747 -msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
7748 -
7749 -#: builtin/for-each-ref.c
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>]"
8474 +msgstr "從檔案中讀取"
8475
8476 #: builtin/for-each-ref.c
8477 msgid "quote placeholders suitably for shells"
@@ -7826,6 +8545,10 @@ msgstr "為 --stdin 提供的引數未知"
8545 msgid "cannot use --start-after with patterns"
8546 msgstr "--start-after 無法搭配 pattern 使用"
8547
8548 +#: builtin/for-each-ref.c
8549 +msgid "git for-each-ref "
8550 +msgstr "git for-each-ref "
8551 +
8552 #: builtin/for-each-repo.c
8553 msgid "git for-each-repo --config=<config> [--] <arguments>"
8554 msgstr "git for-each-repo --config=<config> [--] <arguments>"
@@ -8115,7 +8838,7 @@ msgstr "啟用更嚴格的檢查"
8838 msgid "write dangling objects in .git/lost-found"
8839 msgstr "將懸空物件寫入 .git/lost-found 中"
8840
8118 -#: builtin/fsck.c builtin/prune.c
8841 +#: builtin/fsck.c builtin/prune.c builtin/repo.c
8842 msgid "show progress"
8843 msgstr "顯示進度"
8844
@@ -8321,7 +9044,7 @@ msgstr "強制執行 gc 即使另外一個 gc 正在執行"
9044
9045 #: builtin/gc.c
9046 msgid "repack all other packs except the largest pack"
8324 -msgstr "除了最大的包之外，對所有其它包重新打包"
9047 +msgstr "除了最大的包之外，對所有其他包重新打包"
9048
9049 #: builtin/gc.c builtin/repack.c
9050 msgid "pack prefix to store a pack containing pruned objects"
@@ -8415,6 +9138,10 @@ msgid ""
9138 "skipping incremental-repack task because core.multiPackIndex is disabled"
9139 msgstr "略過增量重新打包工作，因為 core.multiPackIndex 已被停用"
9140
9141 +#: builtin/gc.c
9142 +msgid "failed to perform geometric repack"
9143 +msgstr "無法進行幾何重新封裝"
9144 +
9145 #: builtin/gc.c
9146 #, c-format
9147 msgid "task '%s' failed"
@@ -8425,6 +9152,11 @@ msgstr "作業 '%s' 失敗"
9152 msgid "lock file '%s' exists, skipping maintenance"
9153 msgstr "已存在 '%s' 鎖定檔案，略過維護"
9154
9155 +#: builtin/gc.c
9156 +#, c-format
9157 +msgid "unknown maintenance strategy: '%s'"
9158 +msgstr "未知的維護策略：「%s」"
9159 +
9160 #: builtin/gc.c
9161 #, c-format
9162 msgid "'%s' is not a valid task"
@@ -9510,6 +10242,35 @@ msgstr "--trailer 和 --only-input 同時使用沒有意義"
10242 msgid "no input file given for in-place editing"
10243 msgstr "沒有給出要原位編輯的檔案"
10244
10245 +#: builtin/last-modified.c
10246 +msgid "last-modified can only operate on one tree at a time"
10247 +msgstr "last-modified 一次只能操作一個樹狀物件"
10248 +
10249 +#: builtin/last-modified.c
10250 +#, c-format
10251 +msgid "unknown last-modified argument: %s"
10252 +msgstr "未知的 last-modified 引數：%s"
10253 +
10254 +#: builtin/last-modified.c
10255 +msgid "unable to setup last-modified"
10256 +msgstr "無法設定 last-modified"
10257 +
10258 +#: builtin/last-modified.c
10259 +msgid ""
10260 +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] "
10261 +"<path>...]"
10262 +msgstr ""
10263 +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] "
10264 +"<path>...]"
10265 +
10266 +#: builtin/last-modified.c builtin/ls-tree.c
10267 +msgid "recurse into subtrees"
10268 +msgstr "遞迴到子樹"
10269 +
10270 +#: builtin/last-modified.c
10271 +msgid "show tree entries when recursing into subtrees"
10272 +msgstr "遞迴子樹時顯示樹狀物件項目"
10273 +
10274 #: builtin/log.c
10275 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
10276 msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]"
@@ -9557,6 +10318,22 @@ msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱
10318 msgid "-L<range>:<file> cannot be used with pathspec"
10319 msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用"
10320
10321 +#: builtin/log.c
10322 +msgid ""
10323 +"\n"
10324 +"hint: You can replace 'git whatchanged <opts>' with:\n"
10325 +"hint:\tgit log <opts> --raw --no-merges\n"
10326 +"hint: Or make an alias:\n"
10327 +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n"
10328 +"\n"
10329 +msgstr ""
10330 +"\n"
10331 +"提示：你可以將「git whatchanged <opts>」替換為：\n"
10332 +"提示：\tgit log <opts> --raw --no-merges\n"
10333 +"提示：或設定一個別名：\n"
10334 +"提示：\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n"
10335 +"\n"
10336 +
10337 #: builtin/log.c
10338 #, c-format
10339 msgid "git show %s: bad file"
@@ -9975,7 +10752,7 @@ msgstr "顯示已修改的檔案"
10752
10753 #: builtin/ls-files.c
10754 msgid "show other files in the output"
9978 -msgstr "顯示其它檔案"
10755 +msgstr "顯示其他檔案"
10756
10757 #: builtin/ls-files.c
10758 msgid "show ignored files in the output"
@@ -10118,10 +10895,6 @@ msgstr "git ls-tree [<選項>] <樹或提交> [<路徑>...]"
10895 msgid "only show trees"
10896 msgstr "只顯示樹"
10897
10121 -#: builtin/ls-tree.c
10122 -msgid "recurse into subtrees"
10123 -msgstr "遞迴到子樹"
10124 -
10898 #: builtin/ls-tree.c
10899 msgid "show trees when recursing"
10900 msgstr "當遞迴時顯示樹"
@@ -10169,7 +10942,7 @@ msgstr "保留主旨中不是 PATCH 的方括號"
10942
10943 #: builtin/mailinfo.c
10944 msgid "copy Message-ID to the end of commit message"
10172 -msgstr "拷貝 Message-ID 至提交說明末尾"
10945 +msgstr "複製 Message-ID 至提交說明末尾"
10946
10947 #: builtin/mailinfo.c
10948 msgid "re-code metadata to i18n.commitEncoding"
@@ -10312,11 +11085,6 @@ msgstr "物件「%s」不存在"
11085 msgid "Could not write object file"
11086 msgstr "無法寫入物件檔案"
11087
10315 -#: builtin/merge-recursive.c
10316 -#, c-format
10317 -msgid "unknown option %s"
10318 -msgstr "未知選項 %s"
10319 -
11088 #: builtin/merge-recursive.c
11089 #, c-format
11090 msgid "could not parse object '%s'"
@@ -10535,11 +11303,6 @@ msgstr "無法執行貯存。"
11303 msgid "stash failed"
11304 msgstr "貯存失敗"
11305
10538 -#: builtin/merge.c
10539 -#, c-format
10540 -msgid "not a valid object: %s"
10541 -msgstr "不是一個有效物件：%s"
10542 -
11306 #: builtin/merge.c
11307 msgid "read-tree failed"
11308 msgstr "讀取樹失敗"
@@ -10989,7 +11752,7 @@ msgstr "無法同時移動「%s」和其上層目錄「%s」"
11752 msgid "Renaming %s to %s\n"
11753 msgstr "重新命名 %s 至 %s\n"
11754
10992 -#: builtin/mv.c builtin/remote.c
11755 +#: builtin/mv.c
11756 #, c-format
11757 msgid "renaming '%s' failed"
11758 msgstr "重新命名 '%s' 失敗"
@@ -11192,7 +11955,7 @@ msgstr "不能從非資料物件 '%s' 中讀取註解資料。"
11955 #: builtin/notes.c
11956 #, c-format
11957 msgid "failed to copy notes from '%s' to '%s'"
11195 -msgstr "將註解從「%s」拷貝至「%s」失敗"
11958 +msgstr "將註解從「%s」複製至「%s」失敗"
11959
11960 #. TRANSLATORS: the first %s will be replaced by a git
11961 #. notes command: 'add', 'merge', 'remove', etc.
@@ -11281,12 +12044,12 @@ msgstr "太少參數"
12044 msgid ""
12045 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
12046 "existing notes"
11284 -msgstr "無法拷貝註解。物件 %s 已有註解。使用「-f」覆寫現有的註解"
12047 +msgstr "無法複製註解。物件 %s 已有註解。使用「-f」覆寫現有的註解"
12048
12049 #: builtin/notes.c
12050 #, c-format
12051 msgid "missing notes on source object %s. Cannot copy."
11289 -msgstr "來源物件 %s 缺少註解。無法拷貝。"
12052 +msgstr "來源物件 %s 缺少註解。無法複製。"
12053
12054 #: builtin/notes.c
12055 #, c-format
@@ -11541,7 +12304,7 @@ msgstr "%s 壓縮中 delta 基準位移越界"
12304 msgid "delta base offset out of bound for %s"
12305 msgstr "%s 的 delta 基準位移越界"
12306
11544 -#: builtin/pack-objects.c
12307 +#: builtin/pack-objects.c builtin/repo.c
12308 msgid "Counting objects"
12309 msgstr "正在計算物件數量"
12310
@@ -11838,7 +12601,7 @@ msgstr "可行時使用 path-walk API 走訪物件"
12601
12602 #: builtin/pack-objects.c
12603 msgid "create packs suitable for shallow fetches"
11841 -msgstr "建立適合淺複製版本庫取得的包"
12604 +msgstr "建立適合淺拓製版本庫取得的包"
12605
12606 #: builtin/pack-objects.c
12607 msgid "ignore packs that have companion .keep file"
@@ -11854,7 +12617,7 @@ msgstr "打包壓縮級別"
12617
12618 #: builtin/pack-objects.c
12619 msgid "do not hide commits by grafts"
11857 -msgstr "顯示被移植隱藏的提交"
12620 +msgstr "不要因嫁接隱藏提交"
12621
12622 #: builtin/pack-objects.c
12623 msgid "use a bitmap index if available to speed up counting objects"
@@ -11950,32 +12713,8 @@ msgstr ""
12713 "%<PRIu32> (總共 %<PRIuMAX>)"
12714
12715 #: builtin/pack-refs.c
11953 -msgid ""
11954 -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
11955 -"<pattern>]"
11956 -msgstr ""
11957 -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
11958 -"<pattern>]"
11959 -
11960 -#: builtin/pack-refs.c
11961 -msgid "pack everything"
11962 -msgstr "打包一切"
11963 -
11964 -#: builtin/pack-refs.c
11965 -msgid "prune loose refs (default)"
11966 -msgstr "剪除鬆散引用（預設值）"
11967 -
11968 -#: builtin/pack-refs.c
11969 -msgid "auto-pack refs as needed"
11970 -msgstr "按需自動封裝引用"
11971 -
11972 -#: builtin/pack-refs.c
11973 -msgid "references to include"
11974 -msgstr "要包含的引用"
11975 -
11976 -#: builtin/pack-refs.c
11977 -msgid "references to exclude"
11978 -msgstr "要排除的引用"
12716 +msgid "git pack-refs "
12717 +msgstr "git pack-refs "
12718
12719 #: builtin/patch-id.c
12720 msgid "git patch-id [--stable | --unstable | --verbatim]"
@@ -12553,6 +13292,11 @@ msgstr "git range-diff [<選項>] <old-tip>...<new-tip>"
13292 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
13293 msgstr "git range-diff [<選項>] <base> <old-tip> <new-tip>"
13294
13295 +#: builtin/range-diff.c
13296 +#, c-format
13297 +msgid "invalid max-memory value: %s"
13298 +msgstr "無效的 max-memory 值：%s"
13299 +
13300 #: builtin/range-diff.c
13301 msgid "use simple diff colors"
13302 msgstr "使用簡單差異顏色"
@@ -12565,6 +13309,14 @@ msgstr "註解"
13309 msgid "passed to 'git log'"
13310 msgstr "傳遞給 'git log'"
13311
13312 +#: builtin/range-diff.c
13313 +msgid "size"
13314 +msgstr "大小"
13315 +
13316 +#: builtin/range-diff.c
13317 +msgid "maximum memory for cost matrix (default 4G)"
13318 +msgstr "成本矩陣的最大記憶體（預設值 4G）"
13319 +
13320 #: builtin/range-diff.c
13321 msgid "only emit output related to the first range"
13322 msgstr "只發出跟第一個範圍相關的輸出"
@@ -13223,16 +13975,12 @@ msgid "git reflog list"
13975 msgstr "git reflog list"
13976
13977 #: builtin/reflog.c
13226 -msgid ""
13227 -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
13228 -" [--rewrite] [--updateref] [--stale-fix]\n"
13229 -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
13230 -"<refs>...]"
13231 -msgstr ""
13232 -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
13233 -" [--rewrite] [--updateref] [--stale-fix]\n"
13234 -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
13235 -"<refs>...]"
13978 +msgid "git reflog exists <ref>"
13979 +msgstr "git reflog exists <引用>"
13980 +
13981 +#: builtin/reflog.c
13982 +msgid "git reflog write <ref> <old-oid> <new-oid> <message>"
13983 +msgstr "git reflog write <ref> <old-oid> <new-oid> <message>"
13984
13985 #: builtin/reflog.c
13986 msgid ""
@@ -13242,14 +13990,22 @@ msgstr ""
13990 "git reflog delete [--rewrite] [--updateref]\n"
13991 " [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
13992
13245 -#: builtin/reflog.c
13246 -msgid "git reflog exists <ref>"
13247 -msgstr "git reflog exists <引用>"
13248 -
13993 #: builtin/reflog.c
13994 msgid "git reflog drop [--all [--single-worktree] | <refs>...]"
13995 msgstr "git reflog drop [--all [--single-worktree] | <refs>...]"
13996
13997 +#: builtin/reflog.c
13998 +msgid ""
13999 +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
14000 +" [--rewrite] [--updateref] [--stale-fix]\n"
14001 +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
14002 +"<refs>...]"
14003 +msgstr ""
14004 +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
14005 +" [--rewrite] [--updateref] [--stale-fix]\n"
14006 +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
14007 +"<refs>...]"
14008 +
14009 #: builtin/reflog.c
14010 #, c-format
14011 msgid "invalid timestamp '%s' given to '--%s'"
@@ -13334,6 +14090,46 @@ msgstr "只捨棄目前工作目錄的引用日誌"
14090 msgid "references specified along with --all"
14091 msgstr "同時指定參照和 --all 引數"
14092
14093 +#: builtin/reflog.c
14094 +#, c-format
14095 +msgid "invalid reference name: %s"
14096 +msgstr "無效的引用名稱：%s"
14097 +
14098 +#: builtin/reflog.c
14099 +#, c-format
14100 +msgid "invalid old object ID: '%s'"
14101 +msgstr "無效的舊物件 ID：「%s」"
14102 +
14103 +#: builtin/reflog.c
14104 +#, c-format
14105 +msgid "old object '%s' does not exist"
14106 +msgstr "舊物件「%s」不存在"
14107 +
14108 +#: builtin/reflog.c
14109 +#, c-format
14110 +msgid "invalid new object ID: '%s'"
14111 +msgstr "無效的新物件 ID：「%s」"
14112 +
14113 +#: builtin/reflog.c
14114 +#, c-format
14115 +msgid "new object '%s' does not exist"
14116 +msgstr "新物件「%s」不存在"
14117 +
14118 +#: builtin/reflog.c
14119 +#, c-format
14120 +msgid "cannot start transaction: %s"
14121 +msgstr "無法開始事務：%s"
14122 +
14123 +#: builtin/reflog.c
14124 +#, c-format
14125 +msgid "cannot queue reflog update: %s"
14126 +msgstr "無法排入引用日誌更新：%s"
14127 +
14128 +#: builtin/reflog.c
14129 +#, c-format
14130 +msgid "cannot commit reflog update: %s"
14131 +msgstr "無法提交引用日誌更新：%s"
14132 +
14133 #: builtin/refs.c
14134 msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
14135 msgstr "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
@@ -13342,6 +14138,14 @@ msgstr "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
14138 msgid "git refs verify [--strict] [--verbose]"
14139 msgstr "git refs verify [--strict] [--verbose]"
14140
14141 +#: builtin/refs.c
14142 +msgid "git refs exists <ref>"
14143 +msgstr "git refs exists <ref>"
14144 +
14145 +#: builtin/refs.c
14146 +msgid "git refs optimize "
14147 +msgstr "git refs optimize "
14148 +
14149 #: builtin/refs.c
14150 msgid "specify the reference format to convert to"
14151 msgstr "指定要轉換成的引用格式"
@@ -13371,6 +14175,22 @@ msgstr "啟用嚴格檢查"
14175 msgid "'git refs verify' takes no arguments"
14176 msgstr "「git refs verify」不接受引數"
14177
14178 +#: builtin/refs.c
14179 +msgid "git refs list "
14180 +msgstr "git refs list "
14181 +
14182 +#: builtin/refs.c
14183 +msgid "'git refs exists' requires a reference"
14184 +msgstr "「git refs exists」需要指定引用"
14185 +
14186 +#: builtin/refs.c builtin/show-ref.c
14187 +msgid "reference does not exist"
14188 +msgstr "引用不存在"
14189 +
14190 +#: builtin/refs.c builtin/show-ref.c
14191 +msgid "failed to look up reference"
14192 +msgstr "無法查詢引用"
14193 +
14194 #: builtin/remote.c
14195 msgid ""
14196 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
@@ -13567,6 +14387,22 @@ msgstr ""
14387 "\t%s:%d\n"
14388 "現命名成不存在的遠端分支 '%s'"
14389
14390 +#: builtin/remote.c
14391 +msgid ""
14392 +"The remote you are trying to rename has conflicting references in the\n"
14393 +"new target refspec. This is most likely caused by you trying to nest\n"
14394 +"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n"
14395 +"or by unnesting a remote, e.g. the other way round.\n"
14396 +"\n"
14397 +"If that is the case, you can address this by first renaming the\n"
14398 +"remote to a different name.\n"
14399 +msgstr ""
14400 +"你嘗試重新命名的遠端在新的目標引用規格中有衝突的引用。這很可能是因為你\n"
14401 +"嘗試令遠端與自身形成巢狀，例如將「parent」重新命名為「parent/child」，\n"
14402 +"或是反向操作令其不再是巢狀。\n"
14403 +"\n"
14404 +"若是這種情況，你可以先將遠端改為不同的名稱來解決這個問題。\n"
14405 +
14406 #: builtin/remote.c
14407 #, c-format
14408 msgid "No such remote: '%s'"
@@ -13577,6 +14413,15 @@ msgstr "沒有此遠端版本庫：'%s'"
14413 msgid "Could not rename config section '%s' to '%s'"
14414 msgstr "無法將組態的「%s」區段重新命名為「%s」"
14415
14416 +#: builtin/remote.c
14417 +msgid "Renaming remote references"
14418 +msgstr "正在重新命名遠端引用"
14419 +
14420 +#: builtin/remote.c
14421 +#, c-format
14422 +msgid "queueing remote ref renames failed: %s"
14423 +msgstr "無法排入遠端引用的重新命名作業：%s"
14424 +
14425 #: builtin/remote.c
14426 #, c-format
14427 msgid ""
@@ -13588,19 +14433,10 @@ msgstr ""
14433 "\t%s\n"
14434 "\t如果必要請手動更新設定。"
14435
13591 -#: builtin/remote.c
13592 -msgid "Renaming remote references"
13593 -msgstr "正在重新命名遠端引用"
13594 -
13595 -#: builtin/remote.c
13596 -#, c-format
13597 -msgid "deleting '%s' failed"
13598 -msgstr "刪除 '%s' 失敗"
13599 -
14436 #: builtin/remote.c
14437 #, c-format
13602 -msgid "creating '%s' failed"
13603 -msgstr "建立 '%s' 失敗"
14438 +msgid "renaming remote refs failed: %s"
14439 +msgstr "無法重新命名遠端引用：%s"
14440
14441 #: builtin/remote.c
14442 msgid ""
@@ -13940,56 +14776,6 @@ msgstr ""
14776 "增量 repack 和 bitmap 索引不相容。請使用 --no-write-bitmap-index\n"
14777 "或停用 pack.writeBitmaps 設定。"
14778
13943 -#: builtin/repack.c
13944 -msgid "could not start pack-objects to repack promisor objects"
13945 -msgstr "無法開始 pack-objects 來重新打包 promisor 物件"
13946 -
13947 -#: builtin/repack.c
13948 -msgid "failed to feed promisor objects to pack-objects"
13949 -msgstr "無法將承諾者物件喂給 pack-objects"
13950 -
13951 -#: builtin/repack.c
13952 -msgid "repack: Expecting full hex object ID lines only from pack-objects."
13953 -msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。"
13954 -
13955 -#: builtin/repack.c
13956 -msgid "could not finish pack-objects to repack promisor objects"
13957 -msgstr "無法結束 pack-objects 來重新打包 promisor 物件"
13958 -
13959 -#: builtin/repack.c
13960 -#, c-format
13961 -msgid "cannot open index for %s"
13962 -msgstr "無法開啟 %s 的索引"
13963 -
13964 -#: builtin/repack.c
13965 -#, c-format
13966 -msgid "pack %s too large to consider in geometric progression"
13967 -msgstr "%s 包太大，以致不能在等比數列中考慮"
13968 -
13969 -#: builtin/repack.c
13970 -#, c-format
13971 -msgid "pack %s too large to roll up"
13972 -msgstr "%s 包太大，以致不能縮合"
13973 -
13974 -#: builtin/repack.c
13975 -#, c-format
13976 -msgid "could not open tempfile %s for writing"
13977 -msgstr "無法開啟暫存檔 %s 進行寫入"
13978 -
13979 -#: builtin/repack.c
13980 -msgid "could not close refs snapshot tempfile"
13981 -msgstr "無法關閉 refs 的快照暫存檔"
13982 -
13983 -#: builtin/repack.c
13984 -#, c-format
13985 -msgid "could not remove stale bitmap: %s"
13986 -msgstr "無法移除過時位圖：%s"
13987 -
13988 -#: builtin/repack.c
13989 -#, c-format
13990 -msgid "pack prefix %s does not begin with objdir %s"
13991 -msgstr "封包前綴 %s 不以 objdir %s 開頭"
13992 -
14779 #: builtin/repack.c
14780 msgid "pack everything in a single pack"
14781 msgstr "所有內容打包到一個包檔案中"
@@ -14116,21 +14902,6 @@ msgstr "「%s」選項只能與「%s」一起使用"
14902 msgid "Nothing new to pack."
14903 msgstr "沒有新的要打包。"
14904
14119 -#: builtin/repack.c
14120 -#, c-format
14121 -msgid "renaming pack to '%s' failed"
14122 -msgstr "無法將包重新命名為「%s」"
14123 -
14124 -#: builtin/repack.c
14125 -#, c-format
14126 -msgid "pack-objects did not write a '%s' file for pack %s-%s"
14127 -msgstr "pack-objects 沒有為 %2$s-%3$s 套件包寫入「%1$s」檔案"
14128 -
14129 -#: builtin/repack.c sequencer.c
14130 -#, c-format
14131 -msgid "could not unlink: %s"
14132 -msgstr "無法刪除：%s"
14133 -
14905 #: builtin/replace.c
14906 msgid "git replace [-f] <object> <replacement>"
14907 msgstr "git replace [-f] <物件> <取代物>"
@@ -14264,7 +15035,7 @@ msgstr "提交 '%s' 中含有格式錯誤的合併標籤"
15035 msgid ""
15036 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
15037 "instead of --graft"
14267 -msgstr "原始提交 '%s' 包含已經捨棄的合併標籤 '%s'，使用 --edit 代替 --graft"
15038 +msgstr "原始提交「%s」包含已經捨棄的合併標籤「%s」，使用 --edit 代替 --graft"
15039
15040 #: builtin/replace.c
15041 #, c-format
@@ -14283,7 +15054,7 @@ msgstr "無法寫入下列項目的替代提交：「%s」"
15054 #: builtin/replace.c
15055 #, c-format
15056 msgid "graft for '%s' unnecessary"
14286 -msgstr "對 '%s' 移植沒有必要"
15057 +msgstr "沒有必要嫁接「%s」"
15058
15059 #: builtin/replace.c
15060 #, c-format
@@ -14296,7 +15067,7 @@ msgid ""
15067 "could not convert the following graft(s):\n"
15068 "%s"
15069 msgstr ""
14299 -"無法轉換下列移植：\n"
15070 +"無法轉換下列嫁接：\n"
15071 "%s"
15072
15073 #: builtin/replace.c
@@ -14317,7 +15088,7 @@ msgstr "修改一個提交的父提交"
15088
15089 #: builtin/replace.c
15090 msgid "convert existing graft file"
14320 -msgstr "轉換現存的移植檔案"
15091 +msgstr "轉換現有的嫁接檔案"
15092
15093 #: builtin/replace.c
15094 msgid "replace the ref if it exists"
@@ -14361,7 +15132,7 @@ msgstr "-g 需要至少一個參數"
15132
15133 #: builtin/replace.c
15134 msgid "--convert-graft-file takes no argument"
14364 -msgstr "--convert-graft-file 不帶參數"
15135 +msgstr "--convert-graft-file 不需要引數"
15136
15137 #: builtin/replace.c
15138 msgid "only one pattern can be given with -l"
@@ -14443,6 +15214,80 @@ msgstr "尚不支援重放到根提交！"
15214 msgid "replaying merge commits is not supported yet!"
15215 msgstr "尚不支援重放合併提交！"
15216
15217 +#: builtin/repo.c
15218 +#, c-format
15219 +msgid "key '%s' not found"
15220 +msgstr "找不到「%s」鍵"
15221 +
15222 +#: builtin/repo.c
15223 +#, c-format
15224 +msgid "invalid format '%s'"
15225 +msgstr "「%s」格式無效"
15226 +
15227 +#: builtin/repo.c
15228 +msgid "output format"
15229 +msgstr "輸出格式"
15230 +
15231 +#: builtin/repo.c
15232 +msgid "synonym for --format=nul"
15233 +msgstr "和 --format=nul 同義"
15234 +
15235 +#: builtin/repo.c
15236 +msgid "unsupported output format"
15237 +msgstr "不支援的輸出格式"
15238 +
15239 +#: builtin/repo.c
15240 +msgid "References"
15241 +msgstr "引用"
15242 +
15243 +#: builtin/repo.c
15244 +msgid "Count"
15245 +msgstr "總數"
15246 +
15247 +#: builtin/repo.c
15248 +msgid "Branches"
15249 +msgstr "分支"
15250 +
15251 +#: builtin/repo.c
15252 +msgid "Tags"
15253 +msgstr "標籤"
15254 +
15255 +#: builtin/repo.c
15256 +msgid "Remotes"
15257 +msgstr "遠端"
15258 +
15259 +#: builtin/repo.c
15260 +msgid "Others"
15261 +msgstr "其他"
15262 +
15263 +#: builtin/repo.c
15264 +msgid "Reachable objects"
15265 +msgstr "可到達物件"
15266 +
15267 +#: builtin/repo.c
15268 +msgid "Commits"
15269 +msgstr "提交"
15270 +
15271 +#: builtin/repo.c
15272 +msgid "Trees"
15273 +msgstr "樹狀物件"
15274 +
15275 +#: builtin/repo.c
15276 +msgid "Blobs"
15277 +msgstr "資料物件"
15278 +
15279 +#: builtin/repo.c
15280 +msgid "Repository structure"
15281 +msgstr "版本庫結構"
15282 +
15283 +#: builtin/repo.c
15284 +msgid "Value"
15285 +msgstr "值"
15286 +
15287 +#: builtin/repo.c
15288 +msgid "Counting references"
15289 +msgstr "正在計算引用數量"
15290 +
15291 #: builtin/rerere.c
15292 msgid ""
15293 "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"
@@ -15170,15 +16015,7 @@ msgstr "git show-ref --exclude-existing[=<模式>]"
16015
16016 #: builtin/show-ref.c
16017 msgid "git show-ref --exists <ref>"
15173 -msgstr "git show-ref --exists <ref>"
15174 -
15175 -#: builtin/show-ref.c
15176 -msgid "reference does not exist"
15177 -msgstr "引用不存在"
15178 -
15179 -#: builtin/show-ref.c
15180 -msgid "failed to look up reference"
15181 -msgstr "無法查詢引用"
16018 +msgstr "git show-ref --exists <ref>"
16019
16020 #: builtin/show-ref.c
16021 msgid "only show tags (can be combined with --branches)"
@@ -15219,10 +16056,10 @@ msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用"
16056 #: builtin/sparse-checkout.c
16057 msgid ""
16058 "git sparse-checkout (init | list | set | add | reapply | disable | check-"
15222 -"rules) [<options>]"
16059 +"rules | clean) [<options>]"
16060 msgstr ""
16061 "git sparse-checkout (init | list | set | add | reapply | disable | check-"
15225 -"rules) [<options>]"
16062 +"rules | clean) [<options>]"
16063
16064 #: builtin/sparse-checkout.c
16065 msgid "this worktree is not sparse"
@@ -15269,11 +16106,6 @@ msgstr "以 cone 模式初始化稀疏簽出"
16106 msgid "toggle the use of a sparse index"
16107 msgstr "切換是否使用稀疏索引"
16108
15272 -#: builtin/sparse-checkout.c commit-graph.c midx-write.c sequencer.c
15273 -#, c-format
15274 -msgid "unable to create leading directories of %s"
15275 -msgstr "不能為 %s 建立先導目錄"
15276 -
16109 #: builtin/sparse-checkout.c
16110 #, c-format
16111 msgid "failed to open '%s'"
@@ -15364,6 +16196,37 @@ msgstr ""
16196 msgid "must be in a sparse-checkout to reapply sparsity patterns"
16197 msgstr "必須在稀疏提交才能重新套用稀疏樣式 (sparsity pattern)"
16198
16199 +#: builtin/sparse-checkout.c
16200 +msgid "report each affected file, not just directories"
16201 +msgstr "不只回報目錄，還回報每個受影響的檔案"
16202 +
16203 +#: builtin/sparse-checkout.c
16204 +msgid "must be in a sparse-checkout to clean directories"
16205 +msgstr "必須處於稀疏提交，才能清理目錄"
16206 +
16207 +#: builtin/sparse-checkout.c
16208 +msgid "must be in a cone-mode sparse-checkout to clean directories"
16209 +msgstr "必須處於 cone 模式的稀疏提交，才能清理目錄"
16210 +
16211 +#: builtin/sparse-checkout.c
16212 +msgid "for safety, refusing to clean without one of --force or --dry-run"
16213 +msgstr "為避免意外發生，只允許在傳入 --force 或 --dry-run 時清理"
16214 +
16215 +#: builtin/sparse-checkout.c
16216 +msgid "failed to read index"
16217 +msgstr "無法讀取索引"
16218 +
16219 +#: builtin/sparse-checkout.c
16220 +msgid ""
16221 +"failed to convert index to a sparse index; resolve merge conflicts and try "
16222 +"again"
16223 +msgstr "無法將索引轉換成稀疏索引，請解決合併衝突後重試"
16224 +
16225 +#: builtin/sparse-checkout.c
16226 +#, c-format
16227 +msgid "failed to remove '%s'"
16228 +msgstr "無法移除「%s」"
16229 +
16230 #: builtin/sparse-checkout.c
16231 msgid "error while refreshing working directory"
16232 msgstr "重新整理工作目錄時發生錯誤"
@@ -15999,9 +16862,9 @@ msgid ""
16862 "'--reference-if-able' instead of '--reference'."
16863 msgstr ""
16864 "從上級專案的備用版本庫計算得出的備用版本庫無效。\n"
16002 -"這種情況下，請設定 submodule.alternateErrorStrategy 為 'info'\n"
16003 -"以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n"
16004 -"而非 '--reference' 複製。"
16865 +"這種情況下，請設定 submodule.alternateErrorStrategy 為「info」\n"
16866 +"以允許 Git 不用備用版本庫拓製，亦可使用等效的「--reference-if-able」\n"
16867 +"而非「--reference」拓製。"
16868
16869 #: builtin/submodule--helper.c
16870 #, c-format
@@ -16036,7 +16899,7 @@ msgstr "目錄不是空的：「%s」"
16899 #: builtin/submodule--helper.c
16900 #, c-format
16901 msgid "clone of '%s' into submodule path '%s' failed"
16039 -msgstr "無法複製 '%s' 到子模組路徑 '%s'"
16902 +msgstr "無法拓製「%s」到子模組路徑「%s」"
16903
16904 #: builtin/submodule--helper.c
16905 #, c-format
@@ -16049,7 +16912,7 @@ msgstr "相對路徑的替代錨記（anchor）"
16912
16913 #: builtin/submodule--helper.c
16914 msgid "where the new submodule will be cloned to"
16052 -msgstr "新的子模組將要複製的路徑"
16915 +msgstr "新的子模組將要拓製的路徑"
16916
16917 #: builtin/submodule--helper.c
16918 msgid "name of the new submodule"
@@ -16057,19 +16920,19 @@ msgstr "新子模組的名稱"
16920
16921 #: builtin/submodule--helper.c
16922 msgid "url where to clone the submodule from"
16060 -msgstr "複製子模組的 url 位址"
16923 +msgstr "拓製子模組的 url 位址"
16924
16925 #: builtin/submodule--helper.c
16926 msgid "depth for shallow clones"
16064 -msgstr "淺複製的深度"
16927 +msgstr "淺拓製的深度"
16928
16929 #: builtin/submodule--helper.c
16930 msgid "force cloning progress"
16068 -msgstr "強制顯示複製進度"
16931 +msgstr "強制顯示拓製進度"
16932
16933 #: builtin/submodule--helper.c
16934 msgid "disallow cloning into non-empty directory"
16072 -msgstr "不允許複製至非空白目錄"
16935 +msgstr "不允許拓製至非空白目錄"
16936
16937 #: builtin/submodule--helper.c
16938 msgid ""
@@ -16108,17 +16971,17 @@ msgstr "略過子模組 '%s'"
16971 #: builtin/submodule--helper.c
16972 #, c-format
16973 msgid "cannot clone submodule '%s' without a URL"
16111 -msgstr "無法在沒有網址的情況下複製「%s」子模組"
16974 +msgstr "無法在沒有網址的情況下拓製「%s」子模組"
16975
16976 #: builtin/submodule--helper.c
16977 #, c-format
16978 msgid "Failed to clone '%s'. Retry scheduled"
16116 -msgstr "複製 '%s' 失敗。已排程重試作業"
16979 +msgstr "拓製「%s」失敗。已排程重試作業"
16980
16981 #: builtin/submodule--helper.c
16982 #, c-format
16983 msgid "Failed to clone '%s' a second time, aborting"
16121 -msgstr "第二次嘗試複製 '%s' 失敗，中止作業"
16984 +msgstr "第二次嘗試拓製「%s」失敗，中止作業"
16985
16986 #: builtin/submodule--helper.c
16987 #, c-format
@@ -16243,7 +17106,7 @@ msgstr "使用「rebase」更新策略"
17106
17107 #: builtin/submodule--helper.c
17108 msgid "create a shallow clone truncated to the specified number of revisions"
16246 -msgstr "建立一個縮減至指定版本數的淺複製"
17109 +msgstr "建立一個縮減至指定版本數的淺拓製"
17110
17111 #: builtin/submodule--helper.c
17112 msgid "parallel jobs"
@@ -16251,15 +17114,15 @@ msgstr "並行任務"
17114
17115 #: builtin/submodule--helper.c
17116 msgid "whether the initial clone should follow the shallow recommendation"
16254 -msgstr "初始複製是否應該遵循建議的淺複製選項"
17117 +msgstr "初始拓製是否應該遵循建議的淺拓製選項"
17118
17119 #: builtin/submodule--helper.c
17120 msgid "don't print cloning progress"
16258 -msgstr "不要輸出複製進度"
17121 +msgstr "不要輸出拓製進度"
17122
17123 #: builtin/submodule--helper.c
17124 msgid "disallow cloning into non-empty directory, implies --init"
16262 -msgstr "不允許複製進非空白目錄，隱含 --init"
17125 +msgstr "不允許拓製進非空白目錄，隱含 --init"
17126
17127 #: builtin/submodule--helper.c
17128 msgid ""
@@ -16359,10 +17222,10 @@ msgid ""
17222 "or you are unsure what this means choose another name with the '--name' "
17223 "option."
17224 msgstr ""
16362 -"如果您想要直接使用這個本機 git 目錄，而非重新複製自\n"
17225 +"如果您想要直接使用這個本機 git 目錄，而非重新拓製自\n"
17226 " %s\n"
16364 -"請使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n"
16365 -"假如您不太懂意思，請使用 '--name' 選項輸入其他名稱。"
17227 +"請使用「--force」選項。如果本機 git 目錄不是正確的版本庫，\n"
17228 +"或者是您不太懂意思，請使用「--name」選項輸入其他名稱。"
17229
17230 #: builtin/submodule--helper.c
17231 #, c-format
@@ -17169,12 +18032,12 @@ msgstr ""
18032 #: builtin/worktree.c
18033 #, c-format
18034 msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
17172 -msgstr "將「%s」拷貝至「%s」失敗；稀疏簽出可能無法正常運作"
18035 +msgstr "將「%s」複製至「%s」失敗；稀疏簽出可能無法正常運作"
18036
18037 #: builtin/worktree.c
18038 #, c-format
18039 msgid "failed to copy worktree config from '%s' to '%s'"
17177 -msgstr "將工作區組態從「%s」拷貝至「%s」失敗"
18040 +msgstr "將工作區組態從「%s」複製至「%s」失敗"
18041
18042 #: builtin/worktree.c
18043 #, c-format
@@ -17236,7 +18099,7 @@ msgstr ""
18099
18100 #: builtin/worktree.c
18101 msgid "checkout <branch> even if already checked out in other worktree"
17239 -msgstr "簽出 <分支>，即使已經被簽出到其它工作區"
18102 +msgstr "簽出 <分支>，即使已經被簽出到其他工作區"
18103
18104 #: builtin/worktree.c
18105 msgid "create a new branch"
@@ -17440,10 +18303,6 @@ msgstr "將 <前綴> 子目錄內容寫到一個樹狀物件"
18303 msgid "only useful for debugging"
18304 msgstr "只對除錯有用"
18305
17443 -#: bulk-checkin.c
17444 -msgid "core.fsyncMethod = batch is unsupported on this platform"
17445 -msgstr "core.fsyncMethod = batch 不支援本平台"
17446 -
18306 #: bundle-uri.c
18307 #, c-format
18308 msgid "could not parse bundle list key %s with value '%s'"
@@ -17570,7 +18429,7 @@ msgstr "本套件包使用此過濾器：%s"
18429
18430 #: bundle.c
18431 msgid "unable to dup bundle descriptor"
17573 -msgstr "無法複製套件包描述元"
18432 +msgstr "無法拓製套件包描述元"
18433
18434 #: bundle.c
18435 msgid "Could not spawn pack-objects"
@@ -17611,7 +18470,7 @@ msgstr "index-pack 終止"
18470 #: cache-tree.c
18471 #, c-format
18472 msgid "directory '%s' is present in index, but not sparse"
17614 -msgstr "「%s」目錄已經在索引裡面，但不在稀疏簽出當中。"
18473 +msgstr "「%s」目錄已經在索引裡面，但不在稀疏簽出當中"
18474
18475 #: cache-tree.c unpack-trees.c
18476 msgid "corrupted cache-tree has entries not present in index"
@@ -17691,7 +18550,7 @@ msgstr "基於命名過的樹建立檔案封存"
18550
18551 #: command-list.h
18552 msgid "Download missing objects in a partial clone"
17694 -msgstr "在部分複製中下載缺少的物件"
18553 +msgstr "在部分拓製中下載缺少的物件"
18554
18555 #: command-list.h
18556 msgid "Use binary search to find the commit that introduced a bug"
@@ -17739,7 +18598,7 @@ msgstr "切換分支或復原工作區檔案"
18598
18599 #: command-list.h
18600 msgid "Copy files from the index to the working tree"
17742 -msgstr "從索引區拷貝檔案至工作區"
18601 +msgstr "從索引區複製檔案至工作區"
18602
18603 #: command-list.h
18604 msgid "Find commits yet to be applied to upstream"
@@ -17759,7 +18618,7 @@ msgstr "從工作區中刪除未追蹤檔案"
18618
18619 #: command-list.h
18620 msgid "Clone a repository into a new directory"
17762 -msgstr "複製版本庫至新目錄"
18621 +msgstr "拓製版本庫至新目錄"
18622
18623 #: command-list.h
18624 msgid "Display data in columns"
@@ -17945,6 +18804,10 @@ msgstr "在 gitweb 中即時瀏覽您的工作版本庫"
18804 msgid "Add or parse structured information in commit messages"
18805 msgstr "新增或解析提交說明中的結構化訊息"
18806
18807 +#: command-list.h
18808 +msgid "EXPERIMENTAL: Show when files were last modified"
18809 +msgstr "實驗性功能：顯示檔案最後修改的時間"
18810 +
18811 #: command-list.h
18812 msgid "Show commit logs"
18813 msgstr "顯示提交日誌"
@@ -18106,6 +18969,10 @@ msgstr "建立、列出、刪除物件取代引用"
18969 msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too"
18970 msgstr "實驗性功能：在新的基底重放提交，亦支援裸版本庫"
18971
18972 +#: command-list.h
18973 +msgid "Retrieve information about the repository"
18974 +msgstr "取得儲存庫的資訊"
18975 +
18976 #: command-list.h
18977 msgid "Generates a summary of pending changes"
18978 msgstr "生成待定更改的摘要"
@@ -18216,8 +19083,8 @@ msgid "Read, modify and delete symbolic refs"
19083 msgstr "讀取、修改和刪除符號引用"
19084
19085 #: command-list.h
18219 -msgid "Create, list, delete or verify a tag object signed with GPG"
18220 -msgstr "建立、列出、刪除或驗證一個 GPG 簽名的標籤物件"
19086 +msgid "Create, list, delete or verify tags"
19087 +msgstr "建立、列出、刪除或驗證標籤"
19088
19089 #: command-list.h
19090 msgid "Creates a temporary file with a blob's contents"
@@ -18746,13 +19613,13 @@ msgid ""
19613 "Turn this message off by running\n"
19614 "\"git config set advice.graftFileDeprecated false\""
19615 msgstr ""
18749 -"對 <GIT_DIR>/info/grafts 的支援已棄用，並將在\n"
18750 -"未來的 Git 版本中被移除。\n"
19616 +"<GIT_DIR>/info/grafts 已棄用，\n"
19617 +"並將在未來的 Git 版本中移除。\n"
19618 "\n"
18752 -"請使用「git replace --convert-graft-file」將\n"
18753 -"grafts 轉換為取代引用。\n"
19619 +"請使用「git replace --convert-graft-file」來\n"
19620 +"將嫁接轉換為取代引用。\n"
19621 "\n"
18755 -"設定「git config set advice.graftFileDeprecated false」\n"
19622 +"執行「git config set advice.graftFileDeprecated false」\n"
19623 "可以關閉此訊息"
19624
19625 #: commit.c
@@ -18914,7 +19781,7 @@ msgstr "[GLE %ld] 無法取得「%ls」的通訊協定資訊"
19781 #: compat/mingw.c
19782 #, c-format
19783 msgid "failed to copy SID (%ld)"
18917 -msgstr "拷貝 SID 失敗（%ld）"
19784 +msgstr "複製 SID 失敗（%ld）"
19785
19786 #: compat/mingw.c
19787 #, c-format
@@ -19255,6 +20122,48 @@ msgstr "不能解析設定物件 '%s'"
20122 msgid "unable to parse command-line config"
20123 msgstr "無法解析命令列中的設定"
20124
20125 +#: config.c
20126 +#, c-format
20127 +msgid ""
20128 +"\n"
20129 +"To use the default comment string (#) please run\n"
20130 +"\n"
20131 +"%s"
20132 +msgstr ""
20133 +"\n"
20134 +"如果要使用預設的備註字串 (#)，請執行\n"
20135 +"\n"
20136 +"%s"
20137 +
20138 +#: config.c
20139 +msgid "<comment string>"
20140 +msgstr "<comment string>"
20141 +
20142 +#: config.c
20143 +#, c-format
20144 +msgid ""
20145 +"\n"
20146 +"To set a custom comment string please run\n"
20147 +"\n"
20148 +"%s\n"
20149 +"where '%s' is the string you wish to use.\n"
20150 +msgstr ""
20151 +"\n"
20152 +"如果要設定自訂的備註字串，請執行\n"
20153 +"\n"
20154 +"%s\n"
20155 +"其中「%s」是您想使用的字串。\n"
20156 +
20157 +#: config.c
20158 +#, c-format
20159 +msgid "Support for '%s=auto' has been removed in Git 3.0"
20160 +msgstr "「%s=auto」的支援，已經在 Git 3.0 中移除"
20161 +
20162 +#: config.c
20163 +#, c-format
20164 +msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0"
20165 +msgstr "「%s=auto」已經棄用，將在 Git 3.0 中移除"
20166 +
20167 #: config.c
20168 msgid "unknown error occurred while reading the configuration files"
20169 msgstr "在讀取設定檔案時遇到未知錯誤"
@@ -19395,11 +20304,11 @@ msgstr "協定錯誤：意外的 capabilities^{}"
20304 #: connect.c
20305 #, c-format
20306 msgid "protocol error: expected shallow sha-1, got '%s'"
19398 -msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'"
20307 +msgstr "協定錯誤：預期淺拓製 sha-1，卻得到 '%s'"
20308
20309 #: connect.c
20310 msgid "repository on the other end cannot be shallow"
19402 -msgstr "另一端的版本庫不能是淺複製版本庫"
20311 +msgstr "另一端的版本庫不能是淺拓製版本庫"
20312
20313 #: connect.c
20314 msgid "invalid packet"
@@ -19813,7 +20722,7 @@ msgstr "略過「%s」，其非檔案或目錄"
20722
20723 #: diagnose.c
20724 msgid "could not duplicate stdout"
19816 -msgstr "無法複製 stdout"
20725 +msgstr "無法再製 stdout"
20726
20727 #: diagnose.c
20728 #, c-format
@@ -19824,6 +20733,14 @@ msgstr "無法將「%s」路徑加入封存工具中"
20733 msgid "failed to write archive"
20734 msgstr "無法寫入封存"
20735
20736 +#: diff-lib.c
20737 +msgid "max-depth is not supported for worktree diffs"
20738 +msgstr "不支援在工作區差異比較中使用 max-depth 選項"
20739 +
20740 +#: diff-lib.c
20741 +msgid "max-depth is not supported for index diffs"
20742 +msgstr "不支援在索引差異比較中使用 max-depth 選項"
20743 +
20744 #: diff-lib.c
20745 msgid "--merge-base does not work with ranges"
20746 msgstr "--merge-base 跟範圍無法搭配運作"
@@ -19897,7 +20814,7 @@ msgstr ""
20814 msgid ""
20815 "color-moved-ws: allow-indentation-change cannot be combined with other "
20816 "whitespace modes"
19900 -msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用"
20817 +msgstr "color-moved-ws：allow-indentation-change 不能與其他空白字元模式共用"
20818
20819 #: diff.c
20820 #, c-format
@@ -20231,11 +21148,11 @@ msgstr "省略刪除變更的差異輸出"
21148
21149 #: diff.c
21150 msgid "detect copies"
20234 -msgstr "檢測拷貝"
21151 +msgstr "檢測複製"
21152
21153 #: diff.c
21154 msgid "use unmodified files as source to find copies"
20238 -msgstr "使用未修改的檔案作為尋找拷貝的來源"
21155 +msgstr "使用未修改的檔案作為尋找複製的來源"
21156
21157 #: diff.c
21158 msgid "disable rename detection"
@@ -20253,7 +21170,7 @@ msgstr "繼續列出檔案重新命名以外的歷史記錄"
21170 msgid ""
21171 "prevent rename/copy detection if the number of rename/copy targets exceeds "
21172 "given limit"
20256 -msgstr "如果重新命名/拷貝的目標數量超出提供的限度，則防止檢測重新命名/拷貝"
21173 +msgstr "如果重新命名/複製的目標數量超出提供的限度，則防止檢測重新命名/複製"
21174
21175 #: diff.c
21176 msgid "Diff algorithm options"
@@ -20337,7 +21254,7 @@ msgstr "在 --color-moved 下如何忽略空白字元"
21254
21255 #: diff.c
21256 msgid "Other diff options"
20340 -msgstr "其它差異選項"
21257 +msgstr "其他差異選項"
21258
21259 #: diff.c
21260 msgid "when run from subdir, exclude changes outside and show relative paths"
@@ -20449,6 +21366,14 @@ msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
21366 msgid "select files by diff type"
21367 msgstr "透過差異類型選擇檔案"
21368
21369 +#: diff.c
21370 +msgid "<depth>"
21371 +msgstr "<depth>"
21372 +
21373 +#: diff.c
21374 +msgid "maximum tree depth to recurse"
21375 +msgstr "樹狀物件的遞迴最大深度"
21376 +
21377 #: diff.c
21378 msgid "<file>"
21379 msgstr "<檔案>"
@@ -20660,7 +21585,7 @@ msgstr "git fetch-pack：應為 shallow 列表"
21585
21586 #: fetch-pack.c
21587 msgid "git fetch-pack: expected a flush packet after shallow list"
20663 -msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"
21588 +msgstr "git fetch-pack：在淺拓製列表之後期望一個 flush 包"
21589
21590 #: fetch-pack.c
21591 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
@@ -20689,11 +21614,6 @@ msgstr "無效的 shallow 訊息：%s"
21614 msgid "invalid unshallow line: %s"
21615 msgstr "無效的 unshallow 訊息：%s"
21616
20692 -#: fetch-pack.c
20693 -#, c-format
20694 -msgid "object not found: %s"
20695 -msgstr "物件未找到：%s"
20696 -
21617 #: fetch-pack.c
21618 #, c-format
21619 msgid "error in object: %s"
@@ -20863,7 +21783,7 @@ msgstr "預期在沒有「%s」後不傳送其他區段"
21783 #: fetch-pack.c
21784 #, c-format
21785 msgid "error processing shallow info: %d"
20866 -msgstr "處理淺複製訊息發生錯誤：%d"
21786 +msgstr "處理淺拓製訊息發生錯誤：%d"
21787
21788 #: fetch-pack.c
21789 #, c-format
@@ -21039,6 +21959,11 @@ msgstr "%s 的空別名"
21959 msgid "recursive alias: %s"
21960 msgstr "遞迴的別名：%s"
21961
21962 +#: git.c
21963 +#, c-format
21964 +msgid "alias loop detected: expansion of '%s' does not terminate:%s"
21965 +msgstr "偵測到別名循環：展開後的「%s」無窮無盡：%s"
21966 +
21967 #: git.c
21968 msgid "write failure on standard output"
21969 msgstr "在標準輸出寫入失敗"
@@ -21051,11 +21976,6 @@ msgstr "到標準輸出的未知寫入錯誤"
21976 msgid "close failed on standard output"
21977 msgstr "標準輸出關閉失敗"
21978
21054 -#: git.c
21055 -#, c-format
21056 -msgid "alias loop detected: expansion of '%s' does not terminate:%s"
21057 -msgstr "偵測到別名循環：展開後的「%s」無窮無盡：%s"
21058 -
21979 #: git.c
21980 #, c-format
21981 msgid "cannot handle %s as a builtin"
@@ -21118,11 +22038,21 @@ msgstr "簽名「%s」損壞或者不相容"
22038 msgid "failed to get the ssh fingerprint for key '%s'"
22039 msgstr "無法取得「%s」金鑰的 SSH 指紋"
22040
22041 +#: gpg-interface.c
22042 +#, c-format
22043 +msgid "failed to get the ssh fingerprint for key %s"
22044 +msgstr "無法取得 %s 金鑰的 SSH 指紋"
22045 +
22046 #: gpg-interface.c
22047 msgid ""
22048 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
22049 msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一"
22050
22051 +#: gpg-interface.c
22052 +#, c-format
22053 +msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s"
22054 +msgstr "編譯期的 gpg.ssh.defaultKeyCommand 格式有誤：%s"
22055 +
22056 #: gpg-interface.c
22057 #, c-format
22058 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
@@ -21224,7 +22154,7 @@ msgstr "輔助指令/詢問者"
22154
22155 #: help.c
22156 msgid "Interacting with Others"
21227 -msgstr "與其它系統互動"
22157 +msgstr "與其他系統互動"
22158
22159 #: help.c
22160 msgid "Low-level Commands / Manipulators"
@@ -21426,6 +22356,12 @@ msgstr ""
22356 " 請求：%s\n"
22357 " 重定向：%s"
22358
22359 +#: http.h
22360 +#, c-format
22361 +msgid ""
22362 +"number too large to represent as curl_off_t on this platform: %<PRIuMAX>"
22363 +msgstr "數字過大，無法表示為這個平台上的 curl_off_t：%<PRIuMAX>"
22364 +
22365 #: ident.c
22366 msgid "Author identity unknown\n"
22367 msgstr "作者身分未知\n"
@@ -21550,7 +22486,7 @@ msgstr "不能混用多種過濾規格"
22486
22487 #: list-objects-filter-options.c
22488 msgid "unable to upgrade repository format to support partial clone"
21553 -msgstr "無法升級版本庫格式，以支援部分複製"
22489 +msgstr "無法升級版本庫格式，以支援部分拓製"
22490
22491 #: list-objects-filter-options.h
22492 msgid "args"
@@ -21907,7 +22843,7 @@ msgstr ""
22843 " git add %s\n"
22844 "\n"
22845 " 來記錄上述的合併或更新\n"
21910 -" - 解決上級專案中的其它衝突\n"
22846 +" - 解決上級專案中的其他衝突\n"
22847 " - 在上級專案中，提交產生之索引資訊\n"
22848
22849 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
@@ -21955,11 +22891,6 @@ msgstr "橫列格式錯誤：%s"
22891 msgid "could not load pack"
22892 msgstr "無法載入包"
22893
21958 -#: midx-write.c
21959 -#, c-format
21960 -msgid "could not open index for %s"
21961 -msgstr "無法開啟 %s 的索引"
21962 -
22894 #: midx-write.c
22895 #, c-format
22896 msgid "unable to link '%s' to '%s'"
@@ -21988,6 +22919,11 @@ msgstr "正在新增 packfile 至多包索引"
22919 msgid "unknown preferred pack: '%s'"
22920 msgstr "未知偏好包：「%s」"
22921
22922 +#: midx-write.c
22923 +#, c-format
22924 +msgid "failed to open preferred pack %s"
22925 +msgstr "無法開啟偏好的包 %s"
22926 +
22927 #: midx-write.c
22928 #, c-format
22929 msgid "cannot select preferred pack %s with no objects"
@@ -22019,6 +22955,10 @@ msgstr "無法建立暫時的 MIDX 層"
22955 msgid "could not write multi-pack bitmap"
22956 msgstr "無法寫入多包位圖"
22957
22958 +#: midx-write.c
22959 +msgid "too many multi-pack-indexes"
22960 +msgstr "太多多包索引"
22961 +
22962 #: midx-write.c
22963 msgid "unable to open multi-pack-index chain file"
22964 msgstr "無法開啟多封裝索引鏈檔案"
@@ -22347,11 +23287,6 @@ msgstr "不能開啟 %s"
23287 msgid "files '%s' and '%s' differ in contents"
23288 msgstr "「%s」和「%s」檔案內容不同"
23289
22350 -#: object-file.c
22351 -#, c-format
22352 -msgid "unable to write file %s"
22353 -msgstr "無法寫檔案 %s"
22354 -
23290 #: object-file.c
23291 #, c-format
23292 msgid "unable to write repeatedly vanishing file %s"
@@ -22362,6 +23297,10 @@ msgstr "無法寫入重複消失的檔案 %s"
23297 msgid "unable to set permission to '%s'"
23298 msgstr "無法為 '%s' 設定權限"
23299
23300 +#: object-file.c
23301 +msgid "core.fsyncMethod = batch is unsupported on this platform"
23302 +msgstr "core.fsyncMethod = batch 不支援本平台"
23303 +
23304 #: object-file.c
23305 msgid "error when closing loose object file"
23306 msgstr "關閉鬆散物件檔案時發生錯誤"
@@ -22716,22 +23655,22 @@ msgstr "路徑 '%s' 不存在"
23655 #: odb.c
23656 #, c-format
23657 msgid "reference repository '%s' as a linked checkout is not supported yet."
22719 -msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。"
23658 +msgstr "尚不支援將引用版本庫「%s」作為一個連結簽出。"
23659
23660 #: odb.c
23661 #, c-format
23662 msgid "reference repository '%s' is not a local repository."
22724 -msgstr "引用版本庫 '%s' 不是一個本機版本庫。"
23663 +msgstr "引用版本庫「%s」不是一個本機版本庫。"
23664
23665 #: odb.c
23666 #, c-format
23667 msgid "reference repository '%s' is shallow"
22729 -msgstr "引用版本庫 '%s' 是一個淺複製"
23668 +msgstr "引用版本庫「%s」是淺拓製的"
23669
23670 #: odb.c
23671 #, c-format
23672 msgid "reference repository '%s' is grafted"
22734 -msgstr "引用版本庫 '%s' 已被移植"
23673 +msgstr "引用版本庫「%s」經過嫁接"
23674
23675 #: odb.c
23676 #, c-format
@@ -22964,6 +23903,26 @@ msgstr "mtimes 檔案 %s 有不支援的 hash ID %<PRIu32>"
23903 msgid "mtimes file %s is corrupt"
23904 msgstr "mtimes 檔案 %s 損壞"
23905
23906 +#: pack-refs.c
23907 +msgid "pack everything"
23908 +msgstr "打包一切"
23909 +
23910 +#: pack-refs.c
23911 +msgid "prune loose refs (default)"
23912 +msgstr "剪除鬆散引用（預設值）"
23913 +
23914 +#: pack-refs.c
23915 +msgid "auto-pack refs as needed"
23916 +msgstr "按需自動封裝引用"
23917 +
23918 +#: pack-refs.c
23919 +msgid "references to include"
23920 +msgstr "要包含的引用"
23921 +
23922 +#: pack-refs.c
23923 +msgid "references to exclude"
23924 +msgstr "要排除的引用"
23925 +
23926 #: pack-revindex.c
23927 #, c-format
23928 msgid "reverse-index file %s is too small"
@@ -23329,7 +24288,7 @@ msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容"
24288 msgid ""
24289 "global 'literal' pathspec setting is incompatible with all other global "
24290 "pathspec settings"
23332 -msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容"
24291 +msgstr "全域的 'literal' 路徑規格設定和其他的全域路徑規格設定不相容"
24292
24293 #: pathspec.c
24294 msgid "invalid parameter for pathspec magic 'prefix'"
@@ -23480,6 +24439,11 @@ msgstr "promisor 遠端名稱不能以 '/' 開始：%s"
24439 msgid "could not fetch %s from promisor remote"
24440 msgstr "無法從承諾者遠端抓取 %s"
24441
24442 +#: promisor-remote.c
24443 +#, c-format
24444 +msgid "unsupported field '%s' in '%s' config"
24445 +msgstr "不支援「%2$s」組態中的「%1$s」欄位"
24446 +
24447 #: promisor-remote.c
24448 #, c-format
24449 msgid "no or empty URL advertised for remote '%s'"
@@ -23492,13 +24456,18 @@ msgstr "已知有遠端名為「%s」，但其 URL 為「%s」而非「%s」"
24456
24457 #: promisor-remote.c
24458 #, c-format
23495 -msgid "unknown '%s' value for '%s' config option"
23496 -msgstr "「%2$s」組態選項的值「%1$s」未知"
24459 +msgid "invalid element '%s' from remote info"
24460 +msgstr "遠端資訊的元素「%s」無效"
24461 +
24462 +#: promisor-remote.c
24463 +#, c-format
24464 +msgid "server advertised a promisor remote without a name or URL: %s"
24465 +msgstr "伺服器公告了一個沒有名稱或 URL 的承諾者遠端：%s"
24466
24467 #: promisor-remote.c
24468 #, c-format
23500 -msgid "unknown element '%s' from remote info"
23501 -msgstr "遠端資訊的元素「%s」未知"
24469 +msgid "unknown '%s' value for '%s' config option"
24470 +msgstr "「%2$s」組態選項的值「%1$s」未知"
24471
24472 #: promisor-remote.c
24473 #, c-format
@@ -23608,6 +24577,16 @@ msgstr "無法解析 git 標頭「%.*s」"
24577 msgid "failed to generate diff"
24578 msgstr "生成 diff 失敗"
24579
24580 +#: range-diff.c
24581 +#, c-format
24582 +msgid ""
24583 +"range-diff: unable to compute the range-diff, since it exceeds the maximum "
24584 +"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s "
24585 +"(%<PRIuMAX> bytes)"
24586 +msgstr ""
24587 +"range-diff：無法計算範圍差異，因為它超過了成本矩陣的最大記憶體限制：%s（需要 "
24588 +"%<PRIuMAX> 位元組），限制為 %s（%<PRIuMAX> 位元組）"
24589 +
24590 #: range-diff.c
24591 #, c-format
24592 msgid "could not parse log for '%s'"
@@ -24232,6 +25211,10 @@ msgstr "不是引用日誌：%s"
25211 msgid "no reflog for '%s'"
25212 msgstr "沒有 '%s' 的引用日誌"
25213
25214 +#: refs.c
25215 +msgid "Checking references consistency"
25216 +msgstr "正在檢查引用一致性"
25217 +
25218 #: refs.c
25219 #, c-format
25220 msgid "%s does not point to a valid object!"
@@ -24253,8 +25236,9 @@ msgstr "在刪除 %3$s 後，%1$s%2$s 已經是懸空狀態\n"
25236 #, c-format
25237 msgid ""
25238 "Using '%s' as the name for the initial branch. This default branch name\n"
24256 -"is subject to change. To configure the initial branch name to use in all\n"
24257 -"of your new repositories, which will suppress this warning, call:\n"
25239 +"will change to \"main\" in Git 3.0. To configure the initial branch name\n"
25240 +"to use in all of your new repositories, which will suppress this warning,\n"
25241 +"call:\n"
25242 "\n"
25243 "\tgit config --global init.defaultBranch <name>\n"
25244 "\n"
@@ -24263,9 +25247,9 @@ msgid ""
25247 "\n"
25248 "\tgit branch -m <name>\n"
25249 msgstr ""
24266 -"將「%s」設定為初始分支的名稱。這個預設分支名稱可以變更。\n"
24267 -"如果要設定所有新版本庫要使用的初始分支名稱，\n"
24268 -"請呼叫（會隱藏這個警告）：\n"
25250 +"將「%s」設定為初始分支的名稱。這個預設分支名稱會在 Git 3.0\n"
25251 +"中改成「main」。如果要設定所有新版本庫要使用的初始分支\n"
25252 +"名稱，請呼叫（會隱藏這個警告）：\n"
25253 "\n"
25254 "\tgit config --global init.defaultBranch <name>\n"
25255 "\n"
@@ -24274,6 +25258,21 @@ msgstr ""
25258 "\n"
25259 "\tgit branch -m <name>\n"
25260
25261 +#: refs.c
25262 +#, c-format
25263 +msgid ""
25264 +"Using '%s' as the name for the initial branch since Git 3.0.\n"
25265 +"If you expected Git to create 'master', the just-created\n"
25266 +"branch can be renamed via this command:\n"
25267 +"\n"
25268 +"\tgit branch -m master\n"
25269 +msgstr ""
25270 +"由於 Git 3.0 的緣故，使用「%s」作為初始分支的名稱。\n"
25271 +"如果您預期 Git 建立「master」分支，可以透過以下命令\n"
25272 +"重新命名新建立的分支：\n"
25273 +"\n"
25274 +"\tgit branch -m master\n"
25275 +
25276 #: refs.c
25277 #, c-format
25278 msgid "could not retrieve `%s`"
@@ -24381,12 +25380,38 @@ msgstr "無法移除暫時性遷移目錄「%s」"
25380 msgid "migrated refs can be found at '%s'"
25381 msgstr "可以在「%s」找到已遷移的引用"
25382
25383 +#: refs/files-backend.c
25384 +msgid ""
25385 +"'core.preferSymlinkRefs=true' is nominated for removal.\n"
25386 +"hint: The use of symbolic links for symbolic refs is deprecated\n"
25387 +"hint: and will be removed in Git 3.0. The configuration that\n"
25388 +"hint: tells Git to use them is thus going away. You can unset\n"
25389 +"hint: it with:\n"
25390 +"hint:\n"
25391 +"hint:\tgit config unset core.preferSymlinkRefs\n"
25392 +"hint:\n"
25393 +"hint: Git will then use the textual symref format instead."
25394 +msgstr ""
25395 +"「core.preferSymlinkRefs=true」已被提名移除。\n"
25396 +"提示：使用符號連結表示符號引用的做法已被棄用\n"
25397 +"提示：並將在 Git 3.0 中移除。令 Git 使用符號連結的組態\n"
25398 +"提示：也將隨之消失。您可以透過以下命令取消該組態：\n"
25399 +"提示：\n"
25400 +"提示：\tgit config unset core.preferSymlinkRefs\n"
25401 +"提示：\n"
25402 +"提示：Git 將改為使用文字符號引用格式。"
25403 +
25404 #: refs/files-backend.c refs/reftable-backend.c
25405 #, c-format
25406 msgid ""
25407 "cannot lock ref '%s': expected symref with target '%s': but is a regular ref"
25408 msgstr "無法鎖定引用「%s」：預期是指向「%s」的符號引用，但這個是一般引用"
25409
25410 +#: refs/files-backend.c refs/reftable-backend.c
25411 +#, c-format
25412 +msgid "trying to write reflog for '%s' with incomplete values"
25413 +msgstr "嘗試將不完整的數值寫入「%s」的引用日誌"
25414 +
25415 #: refs/files-backend.c
25416 #, c-format
25417 msgid "cannot read ref file '%s'"
@@ -24397,10 +25422,6 @@ msgstr "無法寫入參照檔案「%s」"
25422 msgid "cannot open directory %s"
25423 msgstr "無法開啟 %s 目錄"
25424
24400 -#: refs/files-backend.c
24401 -msgid "Checking references consistency"
24402 -msgstr "正在檢查引用一致性"
24403 -
25425 #: refs/packed-backend.c
25426 #, c-format
25427 msgid "unable to open '%s'"
@@ -24444,6 +25465,11 @@ msgid ""
25465 "multiple updates for '%s' (including one via symref '%s') are not allowed"
25466 msgstr "不允許對「%s」進行多次更新（包含透過「%s」符號引用進行的更新）"
25467
25468 +#: refs/reftable-backend.c
25469 +#, c-format
25470 +msgid "cannot lock ref '%s': dangling symref already exists"
25471 +msgstr "無法鎖定引用「%s」：已經存在懸空符號引用"
25472 +
25473 #: refs/reftable-backend.c
25474 #, c-format
25475 msgid "cannot lock ref '%s': reference already exists"
@@ -24482,7 +25508,7 @@ msgstr "找不到引用名稱 %s"
25508 #: refs/reftable-backend.c
25509 #, c-format
25510 msgid "refname %s is a symbolic ref, copying it is not supported"
24485 -msgstr "引用名稱 %s 是象徵式引用，不支援拷貝"
25511 +msgstr "引用名稱 %s 是符號引用，不支援複製"
25512
25513 #: refspec.c
25514 #, c-format
@@ -24569,10 +25595,6 @@ msgstr "remote-curl: 非預期的回應結束封包"
25595 msgid "RPC failed; %s"
25596 msgstr "RPC 失敗。%s"
25597
24572 -#: remote-curl.c
24573 -msgid "cannot handle pushes this big"
24574 -msgstr "不能處理這麼大的推送"
24575 -
25598 #: remote-curl.c
25599 #, c-format
25600 msgid "cannot deflate request; zlib deflate error %d"
@@ -24790,6 +25812,12 @@ msgstr ""
25812 "您是想透過推送至「%s:refs/tags/%s」\n"
25813 "為新資料物件貼上標籤嗎？"
25814
25815 +#: remote.c
25816 +#, c-format
25817 +msgid ""
25818 +"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n"
25819 +msgstr "引用規格（「%s」）的 <src> 部分是個不存在的物件 ID。\n"
25820 +
25821 #: remote.c
25822 #, c-format
25823 msgid "%s cannot be resolved to branch"
@@ -24936,6 +25964,71 @@ msgstr "無法解析期望的物件名 '%s'"
25964 msgid "cannot strip one component off url '%s'"
25965 msgstr "無法從 url '%s' 剝離一個元件"
25966
25967 +#: repack-geometry.c
25968 +#, c-format
25969 +msgid "cannot open index for %s"
25970 +msgstr "無法開啟 %s 的索引"
25971 +
25972 +#: repack-geometry.c
25973 +#, c-format
25974 +msgid "pack %s too large to consider in geometric progression"
25975 +msgstr "%s 包太大，以致不能在等比數列中考慮"
25976 +
25977 +#: repack-geometry.c
25978 +#, c-format
25979 +msgid "pack %s too large to roll up"
25980 +msgstr "%s 包太大，以致不能縮合"
25981 +
25982 +#: repack-midx.c
25983 +#, c-format
25984 +msgid "could not open tempfile %s for writing"
25985 +msgstr "無法開啟暫存檔 %s 進行寫入"
25986 +
25987 +#: repack-midx.c
25988 +msgid "could not close refs snapshot tempfile"
25989 +msgstr "無法關閉 refs 的快照暫存檔"
25990 +
25991 +#: repack-midx.c
25992 +#, c-format
25993 +msgid "could not remove stale bitmap: %s"
25994 +msgstr "無法移除過時位圖：%s"
25995 +
25996 +#: repack-promisor.c
25997 +msgid "could not start pack-objects to repack promisor objects"
25998 +msgstr "無法開始 pack-objects 來重新打包 promisor 物件"
25999 +
26000 +#: repack-promisor.c
26001 +msgid "failed to feed promisor objects to pack-objects"
26002 +msgstr "無法將承諾者物件提供給 pack-objects"
26003 +
26004 +#: repack-promisor.c repack.c
26005 +msgid "repack: Expecting full hex object ID lines only from pack-objects."
26006 +msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。"
26007 +
26008 +#: repack-promisor.c
26009 +msgid "could not finish pack-objects to repack promisor objects"
26010 +msgstr "無法結束 pack-objects 來重新打包 promisor 物件"
26011 +
26012 +#: repack.c
26013 +#, c-format
26014 +msgid "pack prefix %s does not begin with objdir %s"
26015 +msgstr "封包前綴 %s 不以 objdir %s 開頭"
26016 +
26017 +#: repack.c
26018 +#, c-format
26019 +msgid "renaming pack to '%s' failed"
26020 +msgstr "無法將包重新命名為「%s」"
26021 +
26022 +#: repack.c
26023 +#, c-format
26024 +msgid "pack-objects did not write a '%s' file for pack %s-%s"
26025 +msgstr "pack-objects 沒有為 %2$s-%3$s 套件包寫入「%1$s」檔案"
26026 +
26027 +#: repack.c sequencer.c
26028 +#, c-format
26029 +msgid "could not unlink: %s"
26030 +msgstr "無法刪除：%s"
26031 +
26032 #: replace-object.c
26033 #, c-format
26034 msgid "bad replace ref name: %s"
@@ -25182,11 +26275,11 @@ msgstr "無法刪除編列名單目錄"
26275
26276 #: scalar.c
26277 msgid "branch to checkout after clone"
25185 -msgstr "複製後要簽出的分支"
26278 +msgstr "拓製後要簽出的分支"
26279
26280 #: scalar.c
26281 msgid "when cloning, create full working directory"
25189 -msgstr "複製時建立完整的工作目錄"
26282 +msgstr "拓製時建立完整的工作目錄"
26283
26284 #: scalar.c
26285 msgid "only download metadata for the branch that will be checked out"
@@ -25198,7 +26291,7 @@ msgstr "在「src」目錄建立版本庫"
26291
26292 #: scalar.c
26293 msgid "specify if tags should be fetched during clone"
25201 -msgstr "指定是否要在複製階段抓取標籤"
26294 +msgstr "指定是否要在拓製階段抓取標籤"
26295
26296 #: scalar.c
26297 msgid "specify if background maintenance should be enabled"
@@ -25244,11 +26337,11 @@ msgstr "無法設定「%s」"
26337
26338 #: scalar.c
26339 msgid "partial clone failed; attempting full clone"
25247 -msgstr "部分複製失敗。嘗試完整複製"
26340 +msgstr "部分拓製失敗。嘗試完整拓製"
26341
26342 #: scalar.c
26343 msgid "could not configure for full clone"
25251 -msgstr "無法設定完整複製"
26344 +msgstr "無法設定完整拓製"
26345
26346 #: scalar.c
26347 msgid "scalar diagnose [<enlistment>]"
@@ -26517,10 +27610,6 @@ msgstr "不是一個 git 版本庫：'%s'"
27610 msgid "cannot chdir to '%s'"
27611 msgstr "不能切換目錄到 '%s'"
27612
26520 -#: setup.c
26521 -msgid "cannot come back to cwd"
26522 -msgstr "無法返回目前工作目錄"
26523 -
27613 #: setup.c
27614 #, c-format
27615 msgid "failed to stat '%*s%s%s'"
@@ -26612,7 +27701,7 @@ msgstr "不能自 '%s' 到 '%s' 建立符號連結"
27701 #: setup.c
27702 #, c-format
27703 msgid "cannot copy '%s' to '%s'"
26615 -msgstr "無法將「%s」拷貝至「%s」"
27704 +msgstr "無法將「%s」複製至「%s」"
27705
27706 #: setup.c
27707 #, c-format
@@ -26627,7 +27716,7 @@ msgstr "沒有在 %s 中找到範本"
27716 #: setup.c
27717 #, c-format
27718 msgid "not copying templates from '%s': %s"
26630 -msgstr "未從「%s」拷貝範本：%s"
27719 +msgstr "未從「%s」複製範本：%s"
27720
27721 #: setup.c
27722 #, c-format
@@ -26932,12 +28021,12 @@ msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中"
28021 #: submodule.c
28022 #, c-format
28023 msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link"
26935 -msgstr "預期「%.*s」（位於子模組路徑「%s」）不是象徵式連結"
28024 +msgstr "預期「%.*s」（位於子模組路徑「%s」）不是符號連結"
28025
28026 #: submodule.c
28027 #, c-format
28028 msgid "expected submodule path '%s' not to be a symbolic link"
26940 -msgstr "預期子模組路徑「%s」不是象徵式連結"
28029 +msgstr "預期子模組路徑「%s」不是符號連結"
28030
28031 #: submodule.c
28032 #, c-format
@@ -27179,7 +28268,7 @@ msgstr "無法為 '%s' 找到遠端協助工具"
28268
28269 #: transport-helper.c
28270 msgid "can't dup helper output fd"
27182 -msgstr "無法複製協助工具輸出檔案句柄"
28271 +msgstr "無法再製協助工具輸出檔案句柄"
28272
28273 #: transport-helper.c
28274 #, c-format
@@ -27340,7 +28429,7 @@ msgstr "%s 執行緒等待失敗：%s"
28429 #: transport-helper.c
28430 #, c-format
28431 msgid "can't start thread for copying data: %s"
27343 -msgstr "無法啟動執行緒來拷貝資料: %s"
28432 +msgstr "無法啟動執行緒來複製資料: %s"
28433
28434 #: transport-helper.c
28435 #, c-format
@@ -27354,7 +28443,7 @@ msgstr "%s 進程失敗"
28443
28444 #: transport-helper.c
28445 msgid "can't start thread for copying data"
27357 -msgstr "無法啟動執行緒來拷貝資料"
28446 +msgstr "無法啟動執行緒來複製資料"
28447
28448 #: transport.c
28449 #, c-format
@@ -27783,19 +28872,34 @@ msgstr "錯誤: "
28872 msgid "warning: "
28873 msgstr "警告: "
28874
28875 +#: usage.c
28876 +#, c-format
28877 +msgid "'%s' is nominated for removal.\n"
28878 +msgstr "「%s」已被提名移除。\n"
28879 +
28880 #: usage.c
28881 #, c-format
28882 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"
28883 +"If you still use this command, here's what you can do:\n"
28884 +"\n"
28885 +"- read https://git-scm.com/docs/BreakingChanges.html\n"
28886 +"- check if anyone has discussed this on the mailing\n"
28887 +" list and if they came up with something that can\n"
28888 +" help you: https://lore.kernel.org/git/?q=%s\n"
28889 +"- send an email to <git@vger.kernel.org> to let us\n"
28890 +" know that you still use this command and were unable\n"
28891 +" to determine a suitable replacement\n"
28892 +"\n"
28893 msgstr ""
27795 -"「%s」命令已被提名移除。\n"
27796 -"如果您仍在使用該命令，請多加上「--i-still-use-this」\n"
27797 -"選項，然後寄封電子郵件到 <git@vger.kernel.org>，\n"
27798 -"讓我們知道您還在使用，謝謝。\n"
28894 +"如果您仍然使用此命令，以下是您可以採取的措施：\n"
28895 +"\n"
28896 +"- 閱讀 https://git-scm.com/docs/BreakingChanges.html\n"
28897 +"- 確認是否有人在郵件列表上討論過這個問題，\n"
28898 +" 以及他們是否有想出能幫助您的解決方案：\n"
28899 +" https://lore.kernel.org/git/?q=%s\n"
28900 +"- 寄送電子郵件至 <git@vger.kernel.org> 告知我們\n"
28901 +" 您仍在使用此命令，且無法找到合適的替代方案\n"
28902 +"\n"
28903
28904 #: usage.c
28905 msgid "refusing to run without --i-still-use-this"
@@ -28481,7 +29585,7 @@ msgstr "提交為空，但是存在尚未追蹤的檔案\n"
29585 #: wt-status.c
29586 #, c-format
29587 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
28484 -msgstr "沒有東西提交（建立/拷貝檔案並使用「git add」追蹤之）\n"
29588 +msgstr "沒有東西提交（建立/複製檔案並使用「git add」追蹤之）\n"
29589
29590 #: wt-status.c
29591 #, c-format
@@ -28650,7 +29754,7 @@ msgstr "'%s.final' 包含編輯的信件。\n"
29754
29755 #: git-send-email.perl
29756 msgid "--dump-aliases incompatible with other options\n"
28653 -msgstr "--dump-aliases 和其它選項不相容\n"
29757 +msgstr "--dump-aliases 和其他選項不相容\n"
29758
29759 #: git-send-email.perl
29760 msgid "--dump-aliases and --translate-aliases are mutually exclusive\n"
@@ -28864,6 +29968,10 @@ msgstr "傳送這封信件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
29968 msgid "Send this email reply required"
29969 msgstr "傳送要求的信件回覆"
29970
29971 +#: git-send-email.perl
29972 +msgid "The destination IMAP folder is not properly defined."
29973 +msgstr "目的地 IMAP 收件匣未正確定義。"
29974 +
29975 #: git-send-email.perl
29976 msgid "The required SMTP server is not properly defined."
29977 msgstr "要求的 SMTP 伺服器未被正確定義。"
@@ -29016,6 +30124,59 @@ msgstr "略過具有備份後綴「%2$s」的 %1$s。\n"
30124 msgid "Do you really want to send %s? [y|N]: "
30125 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
@@ -29071,10 +30232,6 @@ msgstr "您真的要傳送 %s？[y|N]： "
30232 #~ msgid "%s: object is of unknown type '%s': %s"
30233 #~ msgstr "%s：物件屬於「%s」未知類型：%s"
30234
29074 -#, c-format
29075 -#~ msgid "%s points nowhere!"
29076 -#~ msgstr "%s 指向不存在！"
29077 -
30235 #~ msgid "(bad commit)\n"
30236 #~ msgstr "（壞提交）\n"
30237
@@ -29263,10 +30420,6 @@ msgstr "您真的要傳送 %s？[y|N]： "
30420 #~ "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重"
30421 #~ "新命名目錄 %4$s->%5$s"
30422
29266 -#, c-format
29267 -#~ msgid "cannot read object %s"
29268 -#~ msgstr "不能讀取物件 %s"
29269 -
30423 #, c-format
30424 #~ msgid "object %s is not a blob"
30425 #~ msgstr "物件 %s 不是一個資料物件"