@matheusbsbs / matheus-bagliano / commits / dedb2883ce

l10n: zh_TW.po: Git 2.38.0, round 3

Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>

Yi-Jyun Pan committed Oct 1, 2022 at 19:04 UTC dedb2883ce5670401ccd2a18e47d6dae2bc798ab
1 file changed +1068 -490
po/zh_TW.po
+1068 -490
@@ -22,8 +22,8 @@ msgid ""
22 msgstr ""
23 "Project-Id-Version: Git\n"
24 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
25 -"POT-Creation-Date: 2022-06-23 21:13+0800\n"
26 -"PO-Revision-Date: 2022-06-23 23:02+0800\n"
25 +"POT-Creation-Date: 2022-09-23 21:57+0000\n"
26 +"PO-Revision-Date: 2022-10-01 19:02+0800\n"
27 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
28 "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
29 "po/git-cli/zh_Hant/>\n"
@@ -32,7 +32,7 @@ msgstr ""
32 "Content-Type: text/plain; charset=UTF-8\n"
33 "Content-Transfer-Encoding: 8bit\n"
34 "Plural-Forms: nplurals=1; plural=0;\n"
35 -"X-Generator: Poedit 3.1\n"
35 +"X-Generator: Poedit 3.1.1\n"
36 "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
37 "zhconvert.org\n"
38
@@ -41,7 +41,7 @@ msgstr ""
41 msgid "Huh (%s)?"
42 msgstr "嗯（%s）？"
43
44 -#: add-interactive.c builtin/rebase.c reset.c sequencer.c
44 +#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c
45 msgid "could not read index"
46 msgstr "無法讀取索引"
47
@@ -219,8 +219,8 @@ msgid "unstaged"
219 msgstr "未快取"
220
221 #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c
222 -#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c
223 -#: git-add--interactive.perl
222 +#: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c
223 +#: builtin/submodule--helper.c git-add--interactive.perl
224 msgid "path"
225 msgstr "路徑"
226
@@ -501,6 +501,26 @@ msgstr ""
501 "a - 套用此區塊和本檔案中後面的全部區塊\n"
502 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
503
504 +#: add-patch.c git-add--interactive.perl
505 +#, c-format, perl-format
506 +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
507 +msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? "
508 +
509 +#: add-patch.c git-add--interactive.perl
510 +#, c-format, perl-format
511 +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
512 +msgstr "將刪除變更套用到工作區 [y,n,q,a,d%s,?]? "
513 +
514 +#: add-patch.c git-add--interactive.perl
515 +#, c-format, perl-format
516 +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
517 +msgstr "將新增變更套用到工作區 [y,n,q,a,d%s,?]? "
518 +
519 +#: add-patch.c git-add--interactive.perl
520 +#, c-format, perl-format
521 +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
522 +msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? "
523 +
524 #: add-patch.c
525 msgid ""
526 "y - apply this hunk to worktree\n"
@@ -520,11 +540,6 @@ msgstr ""
540 msgid "could not parse hunk header '%.*s'"
541 msgstr "無法解析區塊標頭 '%.*s'"
542
523 -#: add-patch.c
524 -#, c-format
525 -msgid "could not parse colored hunk header '%.*s'"
526 -msgstr "無法解析上色過的區塊標頭 '%.*s'"
527 -
543 #: add-patch.c
544 msgid "could not parse diff"
545 msgstr "無法解析差異 (diff)"
@@ -589,6 +604,7 @@ msgstr ""
604 "要刪除 '%c' 開始的行，刪除它們。\n"
605 "以 %c 開始的行將被刪除。\n"
606
607 +#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#
608 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
609 #: add-patch.c git-add--interactive.perl
610 msgid ""
@@ -608,12 +624,14 @@ msgstr "無法解析區塊標頭"
624 msgid "'git apply --cached' failed"
625 msgstr "「git apply --cached」失敗"
626
627 +#. #-#-#-#-# add-patch.c.po #-#-#-#-#
628 #. TRANSLATORS: do not translate [y/n]
629 #. The program will only accept that input at this point.
630 #. Consider translating (saying "no" discards!) as
631 #. (saying "n" for "no" discards!) if the translation
632 #. of the word "no" does not start with n.
633 #.
634 +#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#
635 #. TRANSLATORS: do not translate [y/n]
636 #. The program will only accept that input
637 #. at this point.
@@ -852,6 +870,26 @@ msgstr ""
870 "將組態變數 advice.detachedHead 設定為 false，即可關閉本建議\n"
871 "\n"
872
873 +#: advice.c
874 +#, c-format
875 +msgid ""
876 +"The following paths have been moved outside the\n"
877 +"sparse-checkout definition but are not sparse due to local\n"
878 +"modifications.\n"
879 +msgstr ""
880 +"以下路徑已經移到稀疏簽出定義之外的地方，\n"
881 +"但因為有本機更動，因此路徑不是稀疏的。\n"
882 +
883 +#: advice.c
884 +msgid ""
885 +"To correct the sparsity of these paths, do the following:\n"
886 +"* Use \"git add --sparse <paths>\" to update the index\n"
887 +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules"
888 +msgstr ""
889 +"若要更正這些路徑的稀疏狀態，請：\n"
890 +"* 使用 `git add --sparse <路徑>` 更新索引\n"
891 +"* 使用 `git sparse-checkout reapply` 套用稀疏規則"
892 +
893 #: alias.c
894 msgid "cmdline ends with \\"
895 msgstr "指令列以 \\ 結尾"
@@ -1081,7 +1119,7 @@ msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，
1119 msgid "patch failed: %s:%ld"
1120 msgstr "打修補檔失敗：%s:%ld"
1121
1084 -#: apply.c
1122 +#: apply.c builtin/mv.c
1123 #, c-format
1124 msgid "cannot checkout %s"
1125 msgstr "不能簽出 %s"
@@ -1470,6 +1508,11 @@ msgstr "不能開啟資料物件 %s"
1508 msgid "unsupported file mode: 0%o (SHA1: %s)"
1509 msgstr "不支援的檔案模式：0%o (SHA1: %s)"
1510
1511 +#: archive-tar.c archive-zip.c builtin/pack-objects.c
1512 +#, c-format
1513 +msgid "deflate error (%d)"
1514 +msgstr "壓縮錯誤 (%d)"
1515 +
1516 #: archive-tar.c
1517 #, c-format
1518 msgid "unable to start '%s' filter"
@@ -1494,11 +1537,6 @@ msgstr "路徑不是有效的 UTF-8：%s"
1537 msgid "path too long (%d chars, SHA1: %s): %s"
1538 msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
1539
1497 -#: archive-zip.c builtin/pack-objects.c
1498 -#, c-format
1499 -msgid "deflate error (%d)"
1500 -msgstr "壓縮錯誤 (%d)"
1501 -
1540 #: archive-zip.c
1541 #, c-format
1542 msgid "timestamp too large for this system: %<PRIuMAX>"
@@ -1812,8 +1850,8 @@ msgid "--reverse and --first-parent together require specified latest commit"
1850 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1851
1852 #: blame.c builtin/commit.c builtin/log.c builtin/merge.c
1815 -#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c
1816 -#: remote.c sequencer.c submodule.c
1853 +#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c
1854 +#: ref-filter.c remote.c sequencer.c submodule.c
1855 msgid "revision walk setup failed"
1856 msgstr "版本遍歷設定失敗"
1857
@@ -1888,10 +1926,12 @@ msgid "not tracking: ambiguous information for ref '%s'"
1926 msgstr "未追蹤：「%s」引用有歧義"
1927
1928 # 譯者：為保證在輸出中對齊，注意調整句中空格！
1929 +#. #-#-#-#-# branch.c.po #-#-#-#-#
1930 #. TRANSLATORS: This is a line listing a remote with duplicate
1931 #. refspecs in the advice message below. For RTL languages you'll
1932 #. probably want to swap the "%s" and leading " " space around.
1933 #.
1934 +#. #-#-#-#-# object-name.c.po #-#-#-#-#
1935 #. TRANSLATORS: This is line item of ambiguous object output
1936 #. from describe_ambiguous_object() above. For RTL languages
1937 #. you'll probably want to swap the "%s" and leading " " space
@@ -2272,7 +2312,7 @@ msgstr "fseek 失敗"
2312 msgid "could not open '%s' for reading"
2313 msgstr "無法開啟 '%s' 進行讀取"
2314
2275 -#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c
2315 +#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c
2316 #, c-format
2317 msgid "could not open '%s' for writing"
2318 msgstr "無法開啟 '%s' 進行寫入"
@@ -2574,8 +2614,8 @@ msgid "n"
2614 msgstr "n"
2615
2616 #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
2577 -#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
2578 -#: builtin/verify-tag.c
2617 +#: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c
2618 +#: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c
2619 msgid "format"
2620 msgstr "格式"
2621
@@ -2678,7 +2718,7 @@ msgstr "互動式模式需要指令列上提供修補檔"
2718 msgid "git apply [<options>] [<patch>...]"
2719 msgstr "git apply [<選項>] [<修補檔>...]"
2720
2681 -#: builtin/archive.c contrib/scalar/scalar.c
2721 +#: builtin/archive.c diagnose.c
2722 msgid "could not redirect output"
2723 msgstr "不能重定向輸出"
2724
@@ -3561,8 +3601,8 @@ msgstr "排序和過濾屬於大小寫不敏感"
3601 msgid "recurse through submodules"
3602 msgstr "在子模組中遞迴"
3603
3564 -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c
3565 -#: builtin/verify-tag.c
3604 +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c
3605 +#: builtin/tag.c builtin/verify-tag.c
3606 msgid "format to use for the output"
3607 msgstr "輸出格式"
3608
@@ -3685,8 +3725,12 @@ msgid "not run from a git repository - no hooks to show\n"
3725 msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n"
3726
3727 #: builtin/bugreport.c
3688 -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
3689 -msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格式>]"
3728 +msgid ""
3729 +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--"
3730 +"diagnose[=<mode>]"
3731 +msgstr ""
3732 +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--"
3733 +"diagnose[=<mode>]"
3734
3735 #: builtin/bugreport.c
3736 msgid ""
@@ -3722,19 +3766,34 @@ msgstr ""
3766 "請檢閱臭蟲報告下方的剩餘部分。\n"
3767 "您可刪除任何您不想分享的地方。\n"
3768
3769 +#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c
3770 +#: parse-options.h
3771 +msgid "mode"
3772 +msgstr "模式"
3773 +
3774 #: builtin/bugreport.c
3726 -msgid "specify a destination for the bugreport file"
3727 -msgstr "請指定 bugreport 檔案的目的地"
3775 +msgid ""
3776 +"create an additional zip archive of detailed diagnostics (default 'stats')"
3777 +msgstr "建立詳細診斷資訊的額外 zip 封存檔案（預設值是 “stats”）"
3778
3779 #: builtin/bugreport.c
3730 -msgid "specify a strftime format suffix for the filename"
3731 -msgstr "請指定檔案名稱的 strftime 格式後綴"
3780 +msgid "specify a destination for the bugreport file(s)"
3781 +msgstr "指定錯誤報告檔案的目的地"
3782
3783 #: builtin/bugreport.c
3784 +msgid "specify a strftime format suffix for the filename(s)"
3785 +msgstr "指定檔名，strftime 格式的後綴"
3786 +
3787 +#: builtin/bugreport.c builtin/diagnose.c
3788 #, c-format
3789 msgid "could not create leading directories for '%s'"
3790 msgstr "無法建立 '%s' 的前置目錄"
3791
3792 +#: builtin/bugreport.c builtin/diagnose.c
3793 +#, c-format
3794 +msgid "unable to create diagnostics archive %s"
3795 +msgstr "無法建立 %s 診斷封存檔"
3796 +
3797 #: builtin/bugreport.c
3798 msgid "System Info"
3799 msgstr "系統資訊"
@@ -3810,11 +3869,6 @@ msgstr "需要版本庫才能拆分套件。"
3869 msgid "Unbundling objects"
3870 msgstr "正在解包物件"
3871
3813 -#: builtin/bundle.c builtin/remote.c
3814 -#, c-format
3815 -msgid "Unknown subcommand: %s"
3816 -msgstr "未知子指令：%s"
3817 -
3872 #: builtin/cat-file.c merge-recursive.c
3873 #, c-format
3874 msgid "cannot read object %s '%s'"
@@ -3912,6 +3966,10 @@ msgstr "顯示物件大小"
3966 msgid "allow -s and -t to work with broken/corrupt objects"
3967 msgstr "允許 -s 和 -t 對損壞的物件生效"
3968
3969 +#: builtin/cat-file.c builtin/log.c
3970 +msgid "use mail map file"
3971 +msgstr "使用信件映射檔案"
3972 +
3973 #: builtin/cat-file.c
3974 msgid "Batch objects requested on stdin (or --batch-all-objects)"
3975 msgstr "批次處理 stdin 上請求的物件（或 --batch-all-objects）"
@@ -3924,6 +3982,10 @@ msgstr "顯示完整的 <object> 或 <rev> 內容"
3982 msgid "like --batch, but don't emit <contents>"
3983 msgstr "類似 --batch 但不輸出 <contents>"
3984
3985 +#: builtin/cat-file.c
3986 +msgid "stdin is NUL-terminated"
3987 +msgstr "標準輸入的結尾是 NUL"
3988 +
3989 #: builtin/cat-file.c
3990 msgid "read commands from stdin"
3991 msgstr "從標準輸入讀取命令"
@@ -4991,6 +5053,14 @@ msgstr "任何複製的子模組都將使用它們的遠端追蹤分支"
5053 msgid "initialize sparse-checkout file to include only files at root"
5054 msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案"
5055
5056 +#: builtin/clone.c
5057 +msgid "uri"
5058 +msgstr "uri"
5059 +
5060 +#: builtin/clone.c
5061 +msgid "a URI for downloading bundles before fetching from origin remote"
5062 +msgstr "在從 origin 遠端抓取前，用來下載套件的 URI"
5063 +
5064 #: builtin/clone.c
5065 #, c-format
5066 msgid "info: Could not add alternate for '%s': %s\n"
@@ -5065,8 +5135,8 @@ msgid "failed to initialize sparse-checkout"
5135 msgstr "無法初始化稀疏簽出"
5136
5137 #: builtin/clone.c
5068 -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
5069 -msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n"
5138 +msgid "remote HEAD refers to nonexistent ref, unable to checkout"
5139 +msgstr "遠端 HEAD 指向不存在的引用，無法簽出"
5140
5141 #: builtin/clone.c
5142 msgid "unable to checkout working tree"
@@ -5088,7 +5158,7 @@ msgstr "無法刪除暫時的 alternates 檔案"
5158 msgid "Too many arguments."
5159 msgstr "太多參數。"
5160
5091 -#: builtin/clone.c contrib/scalar/scalar.c
5161 +#: builtin/clone.c scalar.c
5162 msgid "You must specify a repository to clone."
5163 msgstr "您必須指定要複製的版本庫。"
5164
@@ -5097,6 +5167,12 @@ msgstr "您必須指定要複製的版本庫。"
5167 msgid "options '%s' and '%s %s' cannot be used together"
5168 msgstr "「%s」和「%s %s」選項不得同時使用"
5169
5170 +#: builtin/clone.c
5171 +msgid ""
5172 +"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-"
5173 +"exclude"
5174 +msgstr "--bundle-uri 與 --depth、--shallow-since 和 --shallow-exclude 不相容"
5175 +
5176 #: builtin/clone.c
5177 #, c-format
5178 msgid "repository '%s' does not exist"
@@ -5185,6 +5261,15 @@ msgstr "--local 被忽略"
5261 msgid "cannot clone from filtered bundle"
5262 msgstr "無法從過濾後的套件複製"
5263
5264 +#: builtin/clone.c
5265 +msgid "failed to initialize the repo, skipping bundle URI"
5266 +msgstr "無法初始化版本庫，略過套件 URI"
5267 +
5268 +#: builtin/clone.c
5269 +#, c-format
5270 +msgid "failed to fetch objects from bundle URI '%s'"
5271 +msgstr "無法從套件 URL “%s” 抓取物件"
5272 +
5273 #: builtin/clone.c
5274 msgid "remote transport reported error"
5275 msgstr "遠端傳輸回報錯誤"
@@ -5332,11 +5417,6 @@ msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs"
5417 msgid "Collecting commits from input"
5418 msgstr "正在從輸入收集提交"
5419
5335 -#: builtin/commit-graph.c builtin/multi-pack-index.c
5336 -#, c-format
5337 -msgid "unrecognized subcommand: %s"
5338 -msgstr "未識別的子指令：%s"
5339 -
5420 #: builtin/commit-tree.c
5421 msgid ""
5422 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -5769,10 +5849,6 @@ msgstr "以長格式顯示狀態（預設）"
5849 msgid "terminate entries with NUL"
5850 msgstr "條目以 NUL 字元結尾"
5851
5772 -#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h
5773 -msgid "mode"
5774 -msgstr "模式"
5775 -
5852 #: builtin/commit.c
5853 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5854 msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）"
@@ -6513,6 +6589,26 @@ msgstr "沒有發現名稱，無法描述任何東西。"
6589 msgid "option '%s' and commit-ishes cannot be used together"
6590 msgstr "「%s」選項和提交號不得同時使用"
6591
6592 +#: builtin/diagnose.c
6593 +msgid ""
6594 +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--"
6595 +"mode=<mode>]"
6596 +msgstr ""
6597 +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--"
6598 +"mode=<mode>]"
6599 +
6600 +#: builtin/diagnose.c
6601 +msgid "specify a destination for the diagnostics archive"
6602 +msgstr "指定診斷封存檔的目的地"
6603 +
6604 +#: builtin/diagnose.c
6605 +msgid "specify a strftime format suffix for the filename"
6606 +msgstr "請指定檔案名稱的 strftime 格式後綴"
6607 +
6608 +#: builtin/diagnose.c
6609 +msgid "specify the content of the diagnostic archive"
6610 +msgstr "指定診斷封存檔的內容"
6611 +
6612 #: builtin/diff-tree.c
6613 msgid "--merge-base only works with two commits"
6614 msgstr "--merge-base 只對 2 個以上的提交有用"
@@ -6984,12 +7080,8 @@ msgid "[rejected]"
7080 msgstr "[已拒絕]"
7081
7082 #: builtin/fetch.c
6987 -msgid "can't fetch in current branch"
6988 -msgstr "目前分支下不能執行取得動作"
6989 -
6990 -#: builtin/fetch.c
6991 -msgid "checked out in another worktree"
6992 -msgstr "已在其他工作區簽出"
7083 +msgid "can't fetch into checked-out branch"
7084 +msgstr "無法抓取至已簽出分支"
7085
7086 #: builtin/fetch.c
7087 msgid "[tag update]"
@@ -7530,6 +7622,11 @@ msgstr "%s：cache-tree 中無效的 sha1 指標"
7622 msgid "non-tree in cache-tree"
7623 msgstr "cache-tree 中非樹狀物件"
7624
7625 +#: builtin/fsck.c
7626 +#, c-format
7627 +msgid "%s: invalid sha1 pointer in resolve-undo"
7628 +msgstr "%s：resolve-undo 的 sha1 指針無效"
7629 +
7630 #: builtin/fsck.c
7631 msgid "git fsck [<options>] [<object>...]"
7632 msgstr "git fsck [<選項>] [<物件>...]"
@@ -7946,12 +8043,16 @@ msgid "failed to run 'crontab -l'; your system might not support 'cron'"
8043 msgstr "無法執行 “crontab -l”；您的系統可能不支援 “cron”"
8044
8045 #: builtin/gc.c
7949 -msgid "failed to run 'crontab'; your system might not support 'cron'"
7950 -msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”"
8046 +msgid "failed to create crontab temporary file"
8047 +msgstr "無法建立 crontab 暫存檔"
8048 +
8049 +#: builtin/gc.c
8050 +msgid "failed to open temporary file"
8051 +msgstr "無法開啟暫存檔"
8052
8053 #: builtin/gc.c
7953 -msgid "failed to open stdin of 'crontab'"
7954 -msgstr "無法開啟 ‘crontab’ 的標準輸入"
8054 +msgid "failed to run 'crontab'; your system might not support 'cron'"
8055 +msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”"
8056
8057 #: builtin/gc.c
8058 msgid "'crontab' died"
@@ -8013,11 +8114,6 @@ msgstr "無法將版本庫加至全域設定"
8114 msgid "git maintenance <subcommand> [<options>]"
8115 msgstr "git maintenance <子命令> [<選項>]"
8116
8016 -#: builtin/gc.c
8017 -#, c-format
8018 -msgid "invalid subcommand: %s"
8019 -msgstr "無效子命令：%s"
8020 -
8117 #: builtin/grep.c
8118 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
8119 msgstr "git grep [<選項>] [-e] <模式> [<版本>...] [[--] <路徑>...]"
@@ -8032,6 +8128,7 @@ msgstr "grep：無法建立執行緒：%s"
8128 msgid "invalid number of threads specified (%d) for %s"
8129 msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
8130
8131 +#. #-#-#-#-# grep.c.po #-#-#-#-#
8132 #. TRANSLATORS: %s is the configuration
8133 #. variable for tweaking threads, currently
8134 #. grep.threads
@@ -8241,6 +8338,10 @@ msgstr "分頁顯示符合的檔案"
8338 msgid "allow calling of grep(1) (ignored by this build)"
8339 msgstr "允許呼叫 grep(1)（本次組建忽略）"
8340
8341 +#: builtin/grep.c
8342 +msgid "maximum number of results per file"
8343 +msgstr "每個檔案的最多結果數"
8344 +
8345 #: builtin/grep.c
8346 msgid "no pattern given"
8347 msgstr "未提供符合模式"
@@ -8352,13 +8453,21 @@ msgstr "列印指令描述"
8453 msgid "print list of useful guides"
8454 msgstr "顯示有用的指南列表"
8455
8456 +#: builtin/help.c
8457 +msgid "print list of user-facing repository, command and file interfaces"
8458 +msgstr "輸出面向使用者的版本庫、命令，和檔案介面清單"
8459 +
8460 +#: builtin/help.c
8461 +msgid "print list of file formats, protocols and other developer interfaces"
8462 +msgstr "輸出檔案格式、通訊協定和其他開發者介面的清單"
8463 +
8464 #: builtin/help.c
8465 msgid "print all configuration variable names"
8466 msgstr "列印所有設定變數名稱"
8467
8468 #: builtin/help.c
8360 -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
8361 -msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
8469 +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]"
8470 +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]"
8471
8472 #: builtin/help.c
8473 #, c-format
@@ -8943,8 +9052,8 @@ msgid "show source"
9052 msgstr "顯示來源"
9053
9054 #: builtin/log.c
8946 -msgid "use mail map file"
8947 -msgstr "使用信件映射檔案"
9055 +msgid "clear all previously-defined decoration filters"
9056 +msgstr "清除所有先前定義的裝飾過濾器"
9057
9058 #: builtin/log.c
9059 msgid "only decorate refs that match <pattern>"
@@ -9269,6 +9378,10 @@ msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異"
9378 msgid "percentage by which creation is weighted"
9379 msgstr "建立權重的百分比"
9380
9381 +#: builtin/log.c
9382 +msgid "show in-body From: even if identical to the e-mail header"
9383 +msgstr "顯示內文中的 From：即便和信件標頭的值相同"
9384 +
9385 #: builtin/log.c
9386 #, c-format
9387 msgid "invalid ident line: %s"
@@ -9344,11 +9457,26 @@ msgid ""
9457 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
9458 msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n"
9459
9460 +#: builtin/ls-files.c
9461 +#, c-format
9462 +msgid "bad ls-files format: element '%s' does not start with '('"
9463 +msgstr "ls-files 格式錯誤：“%s” 元素不以 “(” 開頭"
9464 +
9465 +#: builtin/ls-files.c
9466 +#, c-format
9467 +msgid "bad ls-files format: element '%s' does not end in ')'"
9468 +msgstr "ls-files 格式錯誤：“%s” 元素不以 “)” 結尾"
9469 +
9470 +#: builtin/ls-files.c
9471 +#, c-format
9472 +msgid "bad ls-files format: %%%.*s"
9473 +msgstr "ls-files 格式錯誤：%%%.*s"
9474 +
9475 #: builtin/ls-files.c
9476 msgid "git ls-files [<options>] [<file>...]"
9477 msgstr "git ls-files [<選項>] [<檔案>...]"
9478
9351 -#: builtin/ls-files.c
9479 +#: builtin/ls-files.c builtin/merge-tree.c
9480 msgid "separate paths with the NUL character"
9481 msgstr "用 NUL 字元分隔路徑"
9482
@@ -9456,6 +9584,13 @@ msgstr "不顯示重複項目"
9584 msgid "show sparse directories in the presence of a sparse index"
9585 msgstr "在稀疏索引存在時顯示稀疏目錄"
9586
9587 +#: builtin/ls-files.c
9588 +msgid ""
9589 +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, "
9590 +"--eol"
9591 +msgstr ""
9592 +"--format 不能和 -s、-o、-k、-t、--resolve-undo、--deduplicate、--eol 一起使用"
9593 +
9594 #: builtin/ls-remote.c
9595 msgid ""
9596 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -9738,6 +9873,50 @@ msgstr "無法解析引用 '%s'"
9873 msgid "Merging %s with %s\n"
9874 msgstr "合併 %s 和 %s\n"
9875
9876 +#: builtin/merge-tree.c builtin/merge.c
9877 +msgid "not something we can merge"
9878 +msgstr "不能合併"
9879 +
9880 +#: builtin/merge-tree.c builtin/merge.c
9881 +msgid "refusing to merge unrelated histories"
9882 +msgstr "拒絕合併無關的歷史"
9883 +
9884 +#: builtin/merge-tree.c
9885 +msgid "failure to merge"
9886 +msgstr "合併時發生錯誤"
9887 +
9888 +#: builtin/merge-tree.c
9889 +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>"
9890 +msgstr "git merge-tree [--write-tree] [<options>] <branch1> <branch2>"
9891 +
9892 +#: builtin/merge-tree.c
9893 +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>"
9894 +msgstr "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>"
9895 +
9896 +#: builtin/merge-tree.c
9897 +msgid "do a real merge instead of a trivial merge"
9898 +msgstr "執行真實合併，而非簡易合併"
9899 +
9900 +#: builtin/merge-tree.c
9901 +msgid "do a trivial merge only"
9902 +msgstr "只執行簡易合併"
9903 +
9904 +#: builtin/merge-tree.c
9905 +msgid "also show informational/conflict messages"
9906 +msgstr "亦顯示資訊性或衝突訊息"
9907 +
9908 +#: builtin/merge-tree.c
9909 +msgid "list filenames without modes/oids/stages"
9910 +msgstr "列出檔名，但不附加 modes/oids/stages"
9911 +
9912 +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c
9913 +msgid "allow merging unrelated histories"
9914 +msgstr "允許合並不相關的歷史"
9915 +
9916 +#: builtin/merge-tree.c
9917 +msgid "--trivial-merge is incompatible with all other options"
9918 +msgstr "--trivial-merge 和其他所有選項都不相容"
9919 +
9920 #: builtin/merge.c
9921 msgid "git merge [<options>] [<commit>...]"
9922 msgstr "git merge [<選項>] [<提交>...]"
@@ -9844,10 +10023,6 @@ msgstr "--abort，但是保留索引和工作區"
10023 msgid "continue the current in-progress merge"
10024 msgstr "繼續目前正在進行的合併"
10025
9847 -#: builtin/merge.c builtin/pull.c
9848 -msgid "allow merging unrelated histories"
9849 -msgstr "允許合並不相關的歷史"
9850 -
10026 #: builtin/merge.c
10027 msgid "bypass pre-merge-commit and commit-msg hooks"
10028 msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤"
@@ -9993,10 +10168,6 @@ msgstr "不能關閉 '%s'"
10168 msgid "not something we can merge in %s: %s"
10169 msgstr "不能在 %s 中合併：%s"
10170
9996 -#: builtin/merge.c
9997 -msgid "not something we can merge"
9998 -msgstr "不能合併"
9999 -
10171 #: builtin/merge.c
10172 msgid "--abort expects no arguments"
10173 msgstr "--abort 不帶參數"
@@ -10058,15 +10229,20 @@ msgstr "%s - 不能被合併"
10229 msgid "Can merge only exactly one commit into empty head"
10230 msgstr "只能將一個提交合並到空分支上"
10231
10061 -#: builtin/merge.c
10062 -msgid "refusing to merge unrelated histories"
10063 -msgstr "拒絕合併無關的歷史"
10064 -
10232 #: builtin/merge.c
10233 #, c-format
10234 msgid "Updating %s..%s\n"
10235 msgstr "更新 %s..%s\n"
10236
10237 +#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c
10238 +#, c-format
10239 +msgid ""
10240 +"Your local changes to the following files would be overwritten by merge:\n"
10241 +" %s"
10242 +msgstr ""
10243 +"您對下列檔案的本機修改將被合併動作覆蓋：\n"
10244 +" %s"
10245 +
10246 #: builtin/merge.c
10247 #, c-format
10248 msgid "Trying really trivial in-index merge...\n"
@@ -10107,6 +10283,11 @@ msgstr "使用 %s 策略，準備自行解決。\n"
10283 msgid "Automatic merge went well; stopped before committing as requested\n"
10284 msgstr "自動合併進展順利，按要求在提交前停止\n"
10285
10286 +#: builtin/merge.c
10287 +#, c-format
10288 +msgid "When finished, apply stashed changes with `git stash pop`\n"
10289 +msgstr "完成時，使用 `git stash pop` 套用儲藏更改\n"
10290 +
10291 #: builtin/mktag.c
10292 #, c-format
10293 msgid "warning: tag input does not pass fsck: %s"
@@ -10254,6 +10435,10 @@ msgstr "檢查 '%s' 到 '%s' 的重新命名\n"
10435 msgid "bad source"
10436 msgstr "來源損壞"
10437
10438 +#: builtin/mv.c
10439 +msgid "destination exists"
10440 +msgstr "目的地已存在"
10441 +
10442 #: builtin/mv.c
10443 msgid "can not move directory into itself"
10444 msgstr "不能將目錄移動到自身"
@@ -10274,10 +10459,6 @@ msgstr "不在版本控制之下"
10459 msgid "conflicted"
10460 msgstr "衝突"
10461
10277 -#: builtin/mv.c
10278 -msgid "destination exists"
10279 -msgstr "目的地已存在"
10280 -
10462 #: builtin/mv.c
10463 #, c-format
10464 msgid "overwriting '%s'"
@@ -10295,6 +10476,10 @@ msgstr "同一目標具有多個來源"
10476 msgid "destination directory does not exist"
10477 msgstr "找不到目的地目錄"
10478
10479 +#: builtin/mv.c
10480 +msgid "destination exists in the index"
10481 +msgstr "目的地已存在索引"
10482 +
10483 #: builtin/mv.c
10484 #, c-format
10485 msgid "%s, source=%s, destination=%s"
@@ -10737,10 +10922,10 @@ msgstr "註解引用"
10922 msgid "use notes from <notes-ref>"
10923 msgstr "從 <註解引用> 使用註解"
10924
10740 -#: builtin/notes.c builtin/stash.c
10925 +#: builtin/notes.c builtin/remote.c parse-options.c
10926 #, c-format
10742 -msgid "unknown subcommand: %s"
10743 -msgstr "未知子指令：%s"
10927 +msgid "unknown subcommand: `%s'"
10928 +msgstr "未知子指令：「%s」"
10929
10930 #: builtin/pack-objects.c
10931 msgid ""
@@ -11339,7 +11524,7 @@ msgstr "詳見 git-pull(1)。"
11524 msgid "<remote>"
11525 msgstr "<遠端>"
11526
11342 -#: builtin/pull.c contrib/scalar/scalar.c
11527 +#: builtin/pull.c scalar.c
11528 msgid "<branch>"
11529 msgstr "<分支>"
11530
@@ -11793,14 +11978,20 @@ msgstr "只發出跟第一個範圍相關的輸出"
11978 msgid "only emit output related to the second range"
11979 msgstr "只發出跟第二個範圍相關的輸出"
11980
11981 +#: builtin/range-diff.c
11982 +#, c-format
11983 +msgid "not a revision: '%s'"
11984 +msgstr "非修訂版：「%s」"
11985 +
11986 #: builtin/range-diff.c
11987 #, c-format
11988 msgid "not a commit range: '%s'"
11989 msgstr "不是提交範圍：「%s」"
11990
11991 #: builtin/range-diff.c
11802 -msgid "single arg format must be symmetric range"
11803 -msgstr "單個參數格式必須是對稱範圍（即包含...）"
11992 +#, c-format
11993 +msgid "not a symmetric range: '%s'"
11994 +msgstr "不是對稱範圍：「%s」"
11995
11996 #: builtin/range-diff.c
11997 msgid "need two commit ranges"
@@ -12135,6 +12326,10 @@ msgstr "保留開頭是空白的提交"
12326 msgid "move commits that begin with squash!/fixup! under -i"
12327 msgstr "在 -i 互動模式下，移動以 squash!/fixup! 開頭的提交"
12328
12329 +#: builtin/rebase.c
12330 +msgid "update branches that point to commits that are being rebased"
12331 +msgstr "更新指向正在重定基底的提交之分支"
12332 +
12333 #: builtin/rebase.c
12334 msgid "add exec lines after each commit of the editable list"
12335 msgstr "可編輯列表的每一個提交下面增加一行 exec"
@@ -12757,6 +12952,10 @@ msgstr " 新的（下一次取得將儲存於 remotes/%s）"
12952 msgid " tracked"
12953 msgstr " 已追蹤"
12954
12955 +#: builtin/remote.c
12956 +msgid " skipped"
12957 +msgstr " 略過"
12958 +
12959 #: builtin/remote.c
12960 msgid " stale (use 'git remote prune' to remove)"
12961 msgstr " 過時（使用 'git remote prune' 移除）"
@@ -13599,11 +13798,16 @@ msgstr "不能重設索引檔案至版本 '%s'。"
13798 msgid "Could not write new index file."
13799 msgstr "不能寫入新的索引檔案。"
13800
13602 -#: builtin/rev-list.c pack-bitmap.c
13801 +#: builtin/rev-list.c
13802 #, c-format
13803 msgid "unable to get disk usage of %s"
13804 msgstr "無法取得 %s 的磁碟用量"
13805
13806 +#: builtin/rev-list.c
13807 +#, c-format
13808 +msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
13809 +msgstr "「%s」的數值無效：「%s」，唯一允許的格式是「%s」"
13810 +
13811 #: builtin/rev-list.c
13812 msgid "rev-list does not support display of notes"
13813 msgstr "rev-list 不支援顯示註解"
@@ -13637,6 +13841,10 @@ msgstr "輸入過早到達結尾"
13841 msgid "no usage string given before the `--' separator"
13842 msgstr "「--」分隔符號前未提供用法字串"
13843
13844 +#: builtin/rev-parse.c
13845 +msgid "missing opt-spec before option flags"
13846 +msgstr "選項旗標前缺少 opt-spec"
13847 +
13848 #: builtin/rev-parse.c
13849 msgid "Needed a single revision"
13850 msgstr "需要一個修訂版本"
@@ -14182,7 +14390,7 @@ msgstr "以 cone 模式初始化稀疏簽出"
14390 msgid "toggle the use of a sparse index"
14391 msgstr "切換是否使用稀疏索引"
14392
14185 -#: builtin/sparse-checkout.c commit-graph.c midx.c
14393 +#: builtin/sparse-checkout.c commit-graph.c midx.c sequencer.c
14394 #, c-format
14395 msgid "unable to create leading directories of %s"
14396 msgstr "不能為 %s 建立先導目錄"
@@ -14577,6 +14785,11 @@ msgstr "為每一行的行首新增備註符和空格"
14785 msgid "Expecting a full ref name, got %s"
14786 msgstr "期望一個完整的引用名稱，卻得到 %s"
14787
14788 +#: builtin/submodule--helper.c
14789 +#, c-format
14790 +msgid "could not get a repository handle for submodule '%s'"
14791 +msgstr "無法獲得子模組 '%s' 的版本庫句柄"
14792 +
14793 #: builtin/submodule--helper.c
14794 #, c-format
14795 msgid ""
@@ -14584,14 +14797,6 @@ msgid ""
14797 "authoritative upstream."
14798 msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。"
14799
14587 -#: builtin/submodule--helper.c
14588 -msgid "alternative anchor for relative paths"
14589 -msgstr "相對路徑的替代錨記（anchor）"
14590 -
14591 -#: builtin/submodule--helper.c
14592 -msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
14593 -msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]"
14594 -
14800 #: builtin/submodule--helper.c
14801 #, c-format
14802 msgid "No url found for submodule path '%s' in .gitmodules"
@@ -14630,8 +14835,8 @@ msgid "recurse into nested submodules"
14835 msgstr "遞迴進入嵌套子模組中"
14836
14837 #: builtin/submodule--helper.c
14633 -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
14634 -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
14838 +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>"
14839 +msgstr "git submodule foreach [--quiet] [--recursive] [--] <command>"
14840
14841 #: builtin/submodule--helper.c
14842 #, c-format
@@ -14658,8 +14863,8 @@ msgid "suppress output for initializing a submodule"
14863 msgstr "隱藏初始化子模組的輸出"
14864
14865 #: builtin/submodule--helper.c
14661 -msgid "git submodule--helper init [<options>] [<path>]"
14662 -msgstr "git submodule--helper init [<選項>] [<路徑>]"
14866 +msgid "git submodule init [<options>] [<path>]"
14867 +msgstr "git submodule init [<options>] [<path>]"
14868
14869 #: builtin/submodule--helper.c
14870 #, c-format
@@ -14690,10 +14895,6 @@ msgstr "使用儲存在索引中的提交，而非儲存在子模組 HEAD 中的
14895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
14896 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]"
14897
14693 -#: builtin/submodule--helper.c
14694 -msgid "git submodule--helper name <path>"
14695 -msgstr "git submodule--helper name <路徑>"
14696 -
14898 #: builtin/submodule--helper.c
14899 #, c-format
14900 msgid "* %s %s(blob)->%s(submodule)"
@@ -14736,8 +14937,8 @@ msgid "limit the summary size"
14937 msgstr "限制摘要大小"
14938
14939 #: builtin/submodule--helper.c
14739 -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
14740 -msgstr "git submodule--helper summary [<選項>] [<提交>] [--] [<路徑>]"
14940 +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]"
14941 +msgstr "git submodule summary [<options>] [<commit>] [--] [<path>]"
14942
14943 #: builtin/submodule--helper.c
14944 msgid "could not fetch a revision for HEAD"
@@ -14753,11 +14954,6 @@ msgstr "為 '%s' 同步子模組 url\n"
14954 msgid "failed to register url for submodule path '%s'"
14955 msgstr "無法為子模組路徑 '%s' 註冊 url"
14956
14756 -#: builtin/submodule--helper.c
14757 -#, c-format
14758 -msgid "failed to get the default remote for submodule '%s'"
14759 -msgstr "無法得到子模組 '%s' 的預設遠端關聯"
14760 -
14957 #: builtin/submodule--helper.c
14958 #, c-format
14959 msgid "failed to update remote for submodule '%s'"
@@ -14768,8 +14964,8 @@ msgid "suppress output of synchronizing submodule url"
14964 msgstr "隱藏子模組 URL 同步的輸出"
14965
14966 #: builtin/submodule--helper.c
14771 -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
14772 -msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]"
14967 +msgid "git submodule sync [--quiet] [--recursive] [<path>]"
14968 +msgstr "git submodule sync [--quiet] [--recursive] [<path>]"
14969
14970 #: builtin/submodule--helper.c
14971 #, c-format
@@ -14836,6 +15032,11 @@ msgstr ""
15032 "以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n"
15033 "而非 '--reference' 複製。"
15034
15035 +#: builtin/submodule--helper.c
15036 +#, c-format
15037 +msgid "could not get a repository handle for gitdir '%s'"
15038 +msgstr "無法取得 gitdir “%s” 的版本庫控點"
15039 +
15040 #: builtin/submodule--helper.c
15041 #, c-format
15042 msgid "submodule '%s' cannot add alternate: %s"
@@ -14871,6 +15072,10 @@ msgstr "目錄不是空的：「%s」"
15072 msgid "could not get submodule directory for '%s'"
15073 msgstr "無法得到 '%s' 的子模組目錄"
15074
15075 +#: builtin/submodule--helper.c
15076 +msgid "alternative anchor for relative paths"
15077 +msgstr "相對路徑的替代錨記（anchor）"
15078 +
15079 #: builtin/submodule--helper.c
15080 msgid "where the new submodule will be cloned to"
15081 msgstr "新的子模組將要複製的路徑"
@@ -14905,11 +15110,6 @@ msgstr ""
15110 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
15111 "<filter-spec>] --url <url> --path <path>"
15112
14908 -#: builtin/submodule--helper.c
14909 -#, c-format
14910 -msgid "Invalid update mode '%s' for submodule path '%s'"
14911 -msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效"
14912 -
15113 #: builtin/submodule--helper.c
15114 #, c-format
15115 msgid "Invalid update mode '%s' configured for submodule path '%s'"
@@ -14996,6 +15196,11 @@ msgid ""
15196 "of that commit failed."
15197 msgstr "已經取得「%s」子模組路徑，這個路徑卻未包含「%s」。直接取得該提交失敗。"
15198
15199 +#: builtin/submodule--helper.c
15200 +#, c-format
15201 +msgid "could not initialize submodule at path '%s'"
15202 +msgstr "無法在「%s」路徑初始化子模組"
15203 +
15204 #: builtin/submodule--helper.c
15205 #, c-format
15206 msgid ""
@@ -15003,11 +15208,6 @@ msgid ""
15208 "the superproject is not on any branch"
15209 msgstr "子模組（%s）的分支設定為繼承上級專案的分支，但是上級專案不在任何分支上"
15210
15006 -#: builtin/submodule--helper.c
15007 -#, c-format
15008 -msgid "could not get a repository handle for submodule '%s'"
15009 -msgstr "無法獲得子模組 '%s' 的版本庫句柄"
15010 -
15211 #: builtin/submodule--helper.c
15212 #, c-format
15213 msgid "Unable to find current revision in submodule path '%s'"
@@ -15053,12 +15253,16 @@ msgid "path into the working tree"
15253 msgstr "到工作區的路徑"
15254
15255 #: builtin/submodule--helper.c
15056 -msgid "path into the working tree, across nested submodule boundaries"
15057 -msgstr "工作區中的路徑，遞迴嵌套子模組"
15256 +msgid "use the 'checkout' update strategy (default)"
15257 +msgstr "使用 “checkout” 更新策略（預設值）"
15258 +
15259 +#: builtin/submodule--helper.c
15260 +msgid "use the 'merge' update strategy"
15261 +msgstr "使用 “merge” 更新策略"
15262
15263 #: builtin/submodule--helper.c
15060 -msgid "rebase, merge, checkout or none"
15061 -msgstr "rebase、merge、checkout 或 none"
15264 +msgid "use the 'rebase' update strategy"
15265 +msgstr "使用 “rebase” 更新策略"
15266
15267 #: builtin/submodule--helper.c
15268 msgid "create a shallow clone truncated to the specified number of revisions"
@@ -15076,6 +15280,10 @@ msgstr "初始複製是否應該遵循建議的淺複製選項"
15280 msgid "don't print cloning progress"
15281 msgstr "不要輸出複製進度"
15282
15283 +#: builtin/submodule--helper.c
15284 +msgid "disallow cloning into non-empty directory, implies --init"
15285 +msgstr "不允許複製進非空白目錄，隱含 --init"
15286 +
15287 #: builtin/submodule--helper.c
15288 msgid ""
15289 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
@@ -15088,17 +15296,13 @@ msgstr ""
15296 "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
15297 "[--] [<path>...]"
15298
15091 -#: builtin/submodule--helper.c
15092 -msgid "bad value for update parameter"
15093 -msgstr "update 參數取值錯誤"
15094 -
15299 #: builtin/submodule--helper.c
15300 msgid "recurse into submodules"
15301 msgstr "在子模組中遞迴"
15302
15303 #: builtin/submodule--helper.c
15100 -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
15101 -msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]"
15304 +msgid "git submodule absorbgitdirs [<options>] [<path>...]"
15305 +msgstr "git submodule absorbgitdirs [<options>] [<path>...]"
15306
15307 #: builtin/submodule--helper.c
15308 msgid "check if it is safe to write to the .gitmodules file"
@@ -15125,8 +15329,8 @@ msgid "suppress output for setting url of a submodule"
15329 msgstr "隱藏子模組設定 URL 的輸出"
15330
15331 #: builtin/submodule--helper.c
15128 -msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
15129 -msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>"
15332 +msgid "git submodule set-url [--quiet] <path> <newurl>"
15333 +msgstr "git submodule set-url [--quiet] <path> <newurl>"
15334
15335 #: builtin/submodule--helper.c
15336 msgid "set the default tracking branch to master"
@@ -15137,14 +15341,12 @@ msgid "set the default tracking branch"
15341 msgstr "設定預設追蹤分支"
15342
15343 #: builtin/submodule--helper.c
15140 -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
15141 -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
15344 +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>"
15345 +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <path>"
15346
15347 #: builtin/submodule--helper.c
15144 -msgid ""
15145 -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
15146 -msgstr ""
15147 -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
15348 +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
15349 +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
15350
15351 #: builtin/submodule--helper.c
15352 msgid "--branch or --default required"
@@ -15259,8 +15461,8 @@ msgid ""
15461 msgstr "將子模組的名稱設為指定字串，而非預設為其路徑"
15462
15463 #: builtin/submodule--helper.c
15262 -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
15263 -msgstr "git submodule--helper add [<選項>] [--] <版本庫> [<路徑>]"
15464 +msgid "git submodule add [<options>] [--] <repository> [<path>]"
15465 +msgstr "git submodule add [<options>] [--] <repository> [<path>]"
15466
15467 #: builtin/submodule--helper.c
15468 msgid "Relative path can only be used from the toplevel of the working tree"
@@ -15513,6 +15715,19 @@ msgstr "已更新標籤 '%s'（曾為 %s）\n"
15715 msgid "pack exceeds maximum allowed size"
15716 msgstr "包超過了最大允許值"
15717
15718 +#: builtin/unpack-objects.c
15719 +msgid "failed to write object in stream"
15720 +msgstr "無法在串流中寫入物件"
15721 +
15722 +#: builtin/unpack-objects.c
15723 +#, c-format
15724 +msgid "inflate returned (%d)"
15725 +msgstr "inflate 回傳 (%d)"
15726 +
15727 +#: builtin/unpack-objects.c
15728 +msgid "invalid blob object from stream"
15729 +msgstr "源自串流的 blob 物件無效"
15730 +
15731 #: builtin/unpack-objects.c
15732 msgid "Unpacking objects"
15733 msgstr "展開物件中"
@@ -16153,6 +16368,33 @@ msgstr "將 <前綴> 子目錄內容寫到一個樹狀物件"
16368 msgid "only useful for debugging"
16369 msgstr "只對除錯有用"
16370
16371 +#: bulk-checkin.c
16372 +msgid "core.fsyncMethod = batch is unsupported on this platform"
16373 +msgstr "core.fsyncMethod = batch 不支援本平台"
16374 +
16375 +#: bundle-uri.c
16376 +msgid "failed to create temporary file"
16377 +msgstr "無法建立暫存檔"
16378 +
16379 +#: bundle-uri.c
16380 +msgid "insufficient capabilities"
16381 +msgstr "功能不足"
16382 +
16383 +#: bundle-uri.c
16384 +#, c-format
16385 +msgid "failed to download bundle from URI '%s'"
16386 +msgstr "無法從 “%s” URI 下載套件"
16387 +
16388 +#: bundle-uri.c
16389 +#, c-format
16390 +msgid "file at URI '%s' is not a bundle"
16391 +msgstr "位於 URI “%s” 的檔案不是套件"
16392 +
16393 +#: bundle-uri.c
16394 +#, c-format
16395 +msgid "failed to unbundle bundle from URI '%s'"
16396 +msgstr "無法解開源自 URI “%s” 的套件"
16397 +
16398 #: bundle.c
16399 #, c-format
16400 msgid "unrecognized bundle hash algorithm: %s"
@@ -16413,6 +16655,10 @@ msgstr "一個非常簡單的 Git 版本庫伺服器"
16655 msgid "Give an object a human readable name based on an available ref"
16656 msgstr "基於一個現存的引用為一個物件起一個可讀的名稱"
16657
16658 +#: command-list.h
16659 +msgid "Generate a zip archive of diagnostic information"
16660 +msgstr "產生診斷資訊的 zip 封存檔"
16661 +
16662 #: command-list.h
16663 msgid "Show changes between commits, commit and working tree, etc"
16664 msgstr "顯示提交之間、提交和工作區之間等的差異"
@@ -16582,8 +16828,8 @@ msgid "The standard helper program to use with git-merge-index"
16828 msgstr "與 git-merge-index 一起使用的標準嚮導程式"
16829
16830 #: command-list.h
16585 -msgid "Show three-way merge without touching index"
16586 -msgstr "顯示三路合併而不動索引"
16831 +msgid "Perform merge without touching index or working tree"
16832 +msgstr "在不接觸索引或工作區的情況下執行合併"
16833
16834 #: command-list.h
16835 msgid "Run merge conflict resolution tools to resolve merge conflicts"
@@ -16843,6 +17089,10 @@ msgstr "驗證打包的 Git 封存檔案"
17089 msgid "Check the GPG signature of tags"
17090 msgstr "檢查標籤的 GPG 簽名"
17091
17092 +#: command-list.h
17093 +msgid "Display version information about Git"
17094 +msgstr "顯示 Git 的版本資訊"
17095 +
17096 #: command-list.h
17097 msgid "Show logs with difference each commit introduces"
17098 msgstr "顯示每一個提交引入的差異日誌"
@@ -16888,8 +17138,32 @@ msgid "Frequently asked questions about using Git"
17138 msgstr "Git 使用的常見問題"
17139
17140 #: command-list.h
16891 -msgid "A Git Glossary"
16892 -msgstr "Git 詞彙表"
17141 +msgid "The bundle file format"
17142 +msgstr "套件檔案格式"
17143 +
17144 +#: command-list.h
17145 +msgid "Chunk-based file formats"
17146 +msgstr "以區塊為基礎的檔案格式"
17147 +
17148 +#: command-list.h
17149 +msgid "Git commit graph format"
17150 +msgstr "Git 提交圖格式"
17151 +
17152 +#: command-list.h
17153 +msgid "Git index format"
17154 +msgstr "Git 索引格式"
17155 +
17156 +#: command-list.h
17157 +msgid "Git pack format"
17158 +msgstr "Git 封包格式"
17159 +
17160 +#: command-list.h
17161 +msgid "Git cryptographic signature formats"
17162 +msgstr "Git 密碼編譯簽章格式"
17163 +
17164 +#: command-list.h
17165 +msgid "A Git Glossary"
17166 +msgstr "Git 詞彙表"
17167
17168 #: command-list.h
17169 msgid "Hooks used by Git"
@@ -16915,6 +17189,26 @@ msgstr "定義子模組屬性"
17189 msgid "Git namespaces"
17190 msgstr "Git 名字空間"
17191
17192 +#: command-list.h
17193 +msgid "Protocol v0 and v1 capabilities"
17194 +msgstr "v0 和 v1 版通訊協定功能"
17195 +
17196 +#: command-list.h
17197 +msgid "Things common to various protocols"
17198 +msgstr "各種通訊協定共通的部分"
17199 +
17200 +#: command-list.h
17201 +msgid "Git HTTP-based protocols"
17202 +msgstr "Git 以 HTTP 為基礎的通訊協定"
17203 +
17204 +#: command-list.h
17205 +msgid "How packs are transferred over-the-wire"
17206 +msgstr "封包在線上傳輸的方式"
17207 +
17208 +#: command-list.h
17209 +msgid "Git Wire Protocol, Version 2"
17210 +msgstr "Git Wire 通訊協定，第 2 版"
17211 +
17212 #: command-list.h
17213 msgid "Helper programs to interact with remote repositories"
17214 msgstr "用來與遠端版本庫互動的協助工具"
@@ -16947,6 +17241,10 @@ msgstr "Git web 介面（Git 版本庫的 web 前端）"
17241 msgid "An overview of recommended workflows with Git"
17242 msgstr "Git 推薦的工作流概覽"
17243
17244 +#: command-list.h
17245 +msgid "A tool for managing large Git repositories"
17246 +msgstr "用來管理大型 Git 版本庫的工具"
17247 +
17248 #: commit-graph.c
17249 msgid "commit-graph file is too small"
17250 msgstr "提交圖形檔案太小"
@@ -17233,6 +17531,16 @@ msgstr "沒有可用的編譯器資訊\n"
17531 msgid "no libc information available\n"
17532 msgstr "沒有可用的 libc 資訊\n"
17533
17534 +#: compat/disk.h
17535 +#, c-format
17536 +msgid "could not determine free disk size for '%s'"
17537 +msgstr "無法判斷 “%s” 的剩餘磁碟大小"
17538 +
17539 +#: compat/disk.h
17540 +#, c-format
17541 +msgid "could not get info for '%s'"
17542 +msgstr "無法取得 “%s” 的資訊"
17543 +
17544 #: compat/fsmonitor/fsm-health-win32.c
17545 #, c-format
17546 msgid "[GLE %ld] health thread could not open '%ls'"
@@ -17301,6 +17609,16 @@ msgstr "在 “%s” 上呼叫 GetOverlappedResult 失敗 [GLE %ld]"
17609 msgid "could not read directory changes [GLE %ld]"
17610 msgstr "無法讀取目錄變化 [GLE %ld]"
17611
17612 +#: compat/fsmonitor/fsm-settings-win32.c
17613 +#, c-format
17614 +msgid "[GLE %ld] unable to open for read '%ls'"
17615 +msgstr "[GLE %ld] 無法開啟以讀取「%ls」"
17616 +
17617 +#: compat/fsmonitor/fsm-settings-win32.c
17618 +#, c-format
17619 +msgid "[GLE %ld] unable to get protocol information for '%ls'"
17620 +msgstr "[GLE %ld] 無法取得「%ls」的通訊協定資訊"
17621 +
17622 #: compat/mingw.c
17623 #, c-format
17624 msgid "failed to copy SID (%ld)"
@@ -17974,229 +18292,6 @@ msgstr "寫入 rev-list 失敗"
18292 msgid "failed to close rev-list's stdin"
18293 msgstr "關閉 rev-list 的標準輸入失敗"
18294
17977 -#: contrib/scalar/scalar.c worktree.c
17978 -#, c-format
17979 -msgid "'%s' does not exist"
17980 -msgstr "'%s' 不存在"
17981 -
17982 -#: contrib/scalar/scalar.c
17983 -msgid "need a working directory"
17984 -msgstr "需要工作目錄"
17985 -
17986 -#: contrib/scalar/scalar.c
17987 -msgid "could not find enlistment root"
17988 -msgstr "找不到編列名單的根目錄"
17989 -
17990 -#: contrib/scalar/scalar.c
17991 -#, c-format
17992 -msgid "could not switch to '%s'"
17993 -msgstr "無法切換至「%s」"
17994 -
17995 -#: contrib/scalar/scalar.c
17996 -#, c-format
17997 -msgid "could not configure %s=%s"
17998 -msgstr "無法設定 %s=%s"
17999 -
18000 -#: contrib/scalar/scalar.c
18001 -msgid "could not configure log.excludeDecoration"
18002 -msgstr "無法設定 log.excludeDecoration"
18003 -
18004 -#: contrib/scalar/scalar.c
18005 -msgid "Scalar enlistments require a worktree"
18006 -msgstr "純量編列名單需要工作目錄"
18007 -
18008 -#: contrib/scalar/scalar.c dir.c
18009 -#, c-format
18010 -msgid "could not open directory '%s'"
18011 -msgstr "不能開啟目錄 '%s'"
18012 -
18013 -#: contrib/scalar/scalar.c
18014 -#, c-format
18015 -msgid "skipping '%s', which is neither file nor directory"
18016 -msgstr "略過 “%s”，其非檔案或目錄"
18017 -
18018 -#: contrib/scalar/scalar.c
18019 -#, c-format
18020 -msgid "could not determine free disk size for '%s'"
18021 -msgstr "無法判斷 “%s” 的剩餘磁碟大小"
18022 -
18023 -#: contrib/scalar/scalar.c
18024 -#, c-format
18025 -msgid "could not get info for '%s'"
18026 -msgstr "無法取得 “%s” 的資訊"
18027 -
18028 -#: contrib/scalar/scalar.c
18029 -#, c-format
18030 -msgid "remote HEAD is not a branch: '%.*s'"
18031 -msgstr "遠端 HEAD 不是分支：「%.*s」"
18032 -
18033 -#: contrib/scalar/scalar.c
18034 -msgid "failed to get default branch name from remote; using local default"
18035 -msgstr "無法從遠端取得預設分支名稱。改用本機預設名稱"
18036 -
18037 -#: contrib/scalar/scalar.c
18038 -msgid "failed to get default branch name"
18039 -msgstr "無法取得預設分支名稱"
18040 -
18041 -#: contrib/scalar/scalar.c
18042 -msgid "failed to unregister repository"
18043 -msgstr "無法取消註冊版本庫"
18044 -
18045 -#: contrib/scalar/scalar.c
18046 -msgid "failed to delete enlistment directory"
18047 -msgstr "無法刪除編列名單目錄"
18048 -
18049 -#: contrib/scalar/scalar.c
18050 -msgid "branch to checkout after clone"
18051 -msgstr "複製後要簽出的分支"
18052 -
18053 -#: contrib/scalar/scalar.c
18054 -msgid "when cloning, create full working directory"
18055 -msgstr "複製時建立完整的工作目錄"
18056 -
18057 -#: contrib/scalar/scalar.c
18058 -msgid "only download metadata for the branch that will be checked out"
18059 -msgstr "只下載會簽出的分支中介資料"
18060 -
18061 -#: contrib/scalar/scalar.c
18062 -msgid "scalar clone [<options>] [--] <repo> [<dir>]"
18063 -msgstr "scalar clone [<options>] [--] <repo> [<dir>]"
18064 -
18065 -#: contrib/scalar/scalar.c
18066 -#, c-format
18067 -msgid "cannot deduce worktree name from '%s'"
18068 -msgstr "無法從「%s」推論工作區名稱"
18069 -
18070 -#: contrib/scalar/scalar.c
18071 -#, c-format
18072 -msgid "directory '%s' exists already"
18073 -msgstr "「%s」目錄已經存在"
18074 -
18075 -#: contrib/scalar/scalar.c
18076 -#, c-format
18077 -msgid "failed to get default branch for '%s'"
18078 -msgstr "無法取得「%s」的預設分支"
18079 -
18080 -#: contrib/scalar/scalar.c
18081 -#, c-format
18082 -msgid "could not configure remote in '%s'"
18083 -msgstr "無法設定「%s」中的遠端"
18084 -
18085 -#: contrib/scalar/scalar.c
18086 -#, c-format
18087 -msgid "could not configure '%s'"
18088 -msgstr "無法設定「%s」"
18089 -
18090 -#: contrib/scalar/scalar.c
18091 -msgid "partial clone failed; attempting full clone"
18092 -msgstr "部分複製失敗。嘗試完整複製"
18093 -
18094 -#: contrib/scalar/scalar.c
18095 -msgid "could not configure for full clone"
18096 -msgstr "無法設定完整複製"
18097 -
18098 -#: contrib/scalar/scalar.c
18099 -msgid "scalar diagnose [<enlistment>]"
18100 -msgstr "scalar diagnose [<enlistment>]"
18101 -
18102 -#: contrib/scalar/scalar.c
18103 -#, c-format
18104 -msgid "could not create directory for '%s'"
18105 -msgstr "無法建立 “%s” 的目錄"
18106 -
18107 -#: contrib/scalar/scalar.c
18108 -msgid "could not duplicate stdout"
18109 -msgstr "無法複製 stdout"
18110 -
18111 -#: contrib/scalar/scalar.c
18112 -msgid "failed to write archive"
18113 -msgstr "無法寫入封存"
18114 -
18115 -#: contrib/scalar/scalar.c
18116 -msgid "`scalar list` does not take arguments"
18117 -msgstr "`scalar list` 未取引數"
18118 -
18119 -#: contrib/scalar/scalar.c
18120 -msgid "scalar register [<enlistment>]"
18121 -msgstr "scalar register [<enlistment>]"
18122 -
18123 -#: contrib/scalar/scalar.c
18124 -msgid "reconfigure all registered enlistments"
18125 -msgstr "重新設定所有註冊的編列名單"
18126 -
18127 -#: contrib/scalar/scalar.c
18128 -msgid "scalar reconfigure [--all | <enlistment>]"
18129 -msgstr "scalar reconfigure [--all | <enlistment>]"
18130 -
18131 -#: contrib/scalar/scalar.c
18132 -msgid "--all or <enlistment>, but not both"
18133 -msgstr "--all 或 <enlistment> 但不能傳入兩者"
18134 -
18135 -#: contrib/scalar/scalar.c
18136 -#, c-format
18137 -msgid "git repository gone in '%s'"
18138 -msgstr "git 版本庫在「%s」遺失"
18139 -
18140 -#: contrib/scalar/scalar.c
18141 -msgid ""
18142 -"scalar run <task> [<enlistment>]\n"
18143 -"Tasks:\n"
18144 -msgstr ""
18145 -"scalar run <task> [<enlistment>]\n"
18146 -"作業：\n"
18147 -
18148 -#: contrib/scalar/scalar.c
18149 -#, c-format
18150 -msgid "no such task: '%s'"
18151 -msgstr "無此作業：「%s」"
18152 -
18153 -#: contrib/scalar/scalar.c
18154 -msgid "scalar unregister [<enlistment>]"
18155 -msgstr "scalar unregister [<enlistment>]"
18156 -
18157 -#: contrib/scalar/scalar.c
18158 -msgid "scalar delete <enlistment>"
18159 -msgstr "scalar delete <enlistment>"
18160 -
18161 -#: contrib/scalar/scalar.c
18162 -msgid "refusing to delete current working directory"
18163 -msgstr "拒絕刪除目前工作目錄"
18164 -
18165 -#: contrib/scalar/scalar.c
18166 -msgid "include Git version"
18167 -msgstr "包含 Git 版本"
18168 -
18169 -#: contrib/scalar/scalar.c
18170 -msgid "include Git's build options"
18171 -msgstr "包含 Git 組建選項"
18172 -
18173 -#: contrib/scalar/scalar.c
18174 -msgid "scalar verbose [-v | --verbose] [--build-options]"
18175 -msgstr "scalar verbose [-v | --verbose] [--build-options]"
18176 -
18177 -#: contrib/scalar/scalar.c
18178 -msgid "-C requires a <directory>"
18179 -msgstr "-C 需要 <directory>"
18180 -
18181 -#: contrib/scalar/scalar.c
18182 -#, c-format
18183 -msgid "could not change to '%s'"
18184 -msgstr "無法更改為「%s」"
18185 -
18186 -#: contrib/scalar/scalar.c
18187 -msgid "-c requires a <key>=<value> argument"
18188 -msgstr "-c 需要 <key>=<value> 引數"
18189 -
18190 -#: contrib/scalar/scalar.c
18191 -msgid ""
18192 -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
18193 -"\n"
18194 -"Commands:\n"
18195 -msgstr ""
18196 -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
18197 -"\n"
18198 -"命令：\n"
18199 -
18295 #: convert.c
18296 #, c-format
18297 msgid "illegal crlf_action %d"
@@ -18427,6 +18522,39 @@ msgstr "來自 config 的資料島常規表示式有太多的擷取群組（最
18522 msgid "Marked %d islands, done.\n"
18523 msgstr "已標記 %d 個資料島，結束。\n"
18524
18525 +#: diagnose.c
18526 +#, c-format
18527 +msgid "invalid --%s value '%s'"
18528 +msgstr "無效的 --%s 值「%s」"
18529 +
18530 +#: diagnose.c
18531 +#, c-format
18532 +msgid "could not archive missing directory '%s'"
18533 +msgstr "無法封存不存在的路徑「%s」"
18534 +
18535 +#: diagnose.c dir.c
18536 +#, c-format
18537 +msgid "could not open directory '%s'"
18538 +msgstr "不能開啟目錄 '%s'"
18539 +
18540 +#: diagnose.c
18541 +#, c-format
18542 +msgid "skipping '%s', which is neither file nor directory"
18543 +msgstr "略過 “%s”，其非檔案或目錄"
18544 +
18545 +#: diagnose.c
18546 +msgid "could not duplicate stdout"
18547 +msgstr "無法複製 stdout"
18548 +
18549 +#: diagnose.c
18550 +#, c-format
18551 +msgid "could not add directory '%s' to archiver"
18552 +msgstr "無法將「%s」路徑加入封存工具中"
18553 +
18554 +#: diagnose.c
18555 +msgid "failed to write archive"
18556 +msgstr "無法寫入封存"
18557 +
18558 #: diff-lib.c
18559 msgid "--merge-base does not work with ranges"
18560 msgstr "--merge-base 跟範圍無法搭配運作"
@@ -19176,6 +19304,10 @@ msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"
19304 msgid "unable to write to remote"
19305 msgstr "無法寫到遠端"
19306
19307 +#: fetch-pack.c
19308 +msgid "Server supports filter"
19309 +msgstr "伺服器支援 filter"
19310 +
19311 #: fetch-pack.c
19312 #, c-format
19313 msgid "invalid shallow line: %s"
@@ -19317,10 +19449,6 @@ msgstr "伺服器不支援「%s」算法"
19449 msgid "Server does not support shallow requests"
19450 msgstr "伺服器不支援 shallow 請求"
19451
19320 -#: fetch-pack.c
19321 -msgid "Server supports filter"
19322 -msgstr "伺服器支援 filter"
19323 -
19452 #: fetch-pack.c
19453 msgid "unable to write request to remote"
19454 msgstr "無法將請求寫到遠端"
@@ -19735,6 +19863,14 @@ msgstr "低級指令 / 同步版本庫"
19863 msgid "Low-level Commands / Internal Helpers"
19864 msgstr "低級指令/內部協助工具"
19865
19866 +#: help.c
19867 +msgid "User-facing repository, command and file interfaces"
19868 +msgstr "面向使用者的版本庫、命令和檔案介面"
19869 +
19870 +#: help.c
19871 +msgid "Developer-facing file formats, protocols and other interfaces"
19872 +msgstr "面向開發者的檔案格式、通訊協定和介面"
19873 +
19874 #: help.c
19875 #, c-format
19876 msgid "available git commands in '%s'"
@@ -19752,6 +19888,14 @@ msgstr "這些是各種場合常見的 Git 指令："
19888 msgid "The Git concept guides are:"
19889 msgstr "Git 概念嚮導有："
19890
19891 +#: help.c
19892 +msgid "User-facing repository, command and file interfaces:"
19893 +msgstr "面向使用者的版本庫、命令和檔案介面："
19894 +
19895 +#: help.c
19896 +msgid "File formats, protocols and other developer interfaces:"
19897 +msgstr "檔案格式、通訊協定和其他開發者介面："
19898 +
19899 #: help.c
19900 msgid "External commands"
19901 msgstr "外部指令"
@@ -19842,11 +19986,6 @@ msgstr ""
19986 "因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n"
19987 "設定 `git config advice.ignoredHook false` 來關閉這條警告。"
19988
19845 -#: hook.c
19846 -#, c-format
19847 -msgid "Couldn't start hook '%s'\n"
19848 -msgstr "無法啟動「%s」掛鉤\n"
19849 -
19989 #: http-fetch.c
19990 #, c-format
19991 msgid "argument to --packfile must be a valid hash (got '%s')"
@@ -20066,20 +20205,16 @@ msgstr "在 ls-refs 引數之後應該有一個 flush 包"
20205 msgid "quoted CRLF detected"
20206 msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"
20207
20069 -#: merge-ort-wrappers.c merge-recursive.c
20070 -#, c-format
20071 -msgid ""
20072 -"Your local changes to the following files would be overwritten by merge:\n"
20073 -" %s"
20074 -msgstr ""
20075 -"您對下列檔案的本機修改將被合併動作覆蓋：\n"
20076 -" %s"
20077 -
20208 #: merge-ort.c merge-recursive.c
20209 #, c-format
20210 msgid "Failed to merge submodule %s (not checked out)"
20211 msgstr "無法合併子模組 %s （沒有簽出）"
20212
20213 +#: merge-ort.c
20214 +#, c-format
20215 +msgid "Failed to merge submodule %s (no merge base)"
20216 +msgstr "無法合併 %s 子模組（沒有合併基底）"
20217 +
20218 #: merge-ort.c merge-recursive.c
20219 #, c-format
20220 msgid "Failed to merge submodule %s (commits not present)"
@@ -20103,27 +20238,8 @@ msgstr "無法合併 %s 子模組"
20238 #: merge-ort.c
20239 #, c-format
20240 msgid ""
20106 -"Failed to merge submodule %s, but a possible merge resolution exists:\n"
20107 -"%s\n"
20108 -msgstr ""
20109 -"無法合併 %s 子模組，但有找到一個可行的合併方案：\n"
20110 -"%s\n"
20111 -
20112 -#: merge-ort.c merge-recursive.c
20113 -#, c-format
20114 -msgid ""
20115 -"If this is correct simply add it to the index for example\n"
20116 -"by using:\n"
20117 -"\n"
20118 -" git update-index --cacheinfo 160000 %s \"%s\"\n"
20119 -"\n"
20120 -"which will accept this suggestion.\n"
20121 -msgstr ""
20122 -"正確的話，就能直接加進索引，例如執行下述命令：\n"
20123 -"\n"
20124 -" git update-index --cacheinfo 160000 %s \"%s\"\n"
20125 -"\n"
20126 -"接受本建議。\n"
20241 +"Failed to merge submodule %s, but a possible merge resolution exists: %s"
20242 +msgstr "無法合併 %s 子模組，但存在合併可行方案：%s"
20243
20244 #: merge-ort.c
20245 #, c-format
@@ -20302,12 +20418,45 @@ msgstr ""
20418 "衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"
20419 "上。"
20420
20421 +#. TRANSLATORS: This is a line of advice to resolve a merge
20422 +#. conflict in a submodule. The first argument is the submodule
20423 +#. name, and the second argument is the abbreviated id of the
20424 +#. commit that needs to be merged. For example:
20425 +#. - go to submodule (mysubmodule), and either merge commit abc1234"
20426 +#.
20427 #: merge-ort.c
20428 #, c-format
20429 msgid ""
20308 -"Note: %s not up to date and in way of checking out conflicted version; old "
20309 -"copy renamed to %s"
20310 -msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重新命名至 %s"
20430 +" - go to submodule (%s), and either merge commit %s\n"
20431 +" or update to an existing commit which has merged those changes\n"
20432 +msgstr ""
20433 +" - 前往子模組 (%s)，並合併 %s 提交或\n"
20434 +" 更新至已經合併這些更改的提交\n"
20435 +
20436 +#: merge-ort.c
20437 +#, c-format
20438 +msgid ""
20439 +"Recursive merging with submodules currently only supports trivial cases.\n"
20440 +"Please manually handle the merging of each conflicted submodule.\n"
20441 +"This can be accomplished with the following steps:\n"
20442 +"%s - come back to superproject and run:\n"
20443 +"\n"
20444 +" git add %s\n"
20445 +"\n"
20446 +" to record the above merge or update\n"
20447 +" - resolve any other conflicts in the superproject\n"
20448 +" - commit the resulting index in the superproject\n"
20449 +msgstr ""
20450 +"與子模組進行遞迴合併，目前僅支援簡單的情況。\n"
20451 +"請自行處理每個有衝突之子模組的合併問題。\n"
20452 +"處理步驟有以下幾步：\n"
20453 +"%s - 回到上級專案，並執行：\n"
20454 +"\n"
20455 +" git add %s\n"
20456 +"\n"
20457 +" 來記錄上述的合併或更新\n"
20458 +" - 解決上級專案中的其它衝突\n"
20459 +" - 在上級專案中，提交產生之索引資訊\n"
20460
20461 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
20462 #. base, and 2-3) the trees for the two trees we're merging.
@@ -20394,6 +20543,22 @@ msgstr "無法合併子模組 %s（非快轉）"
20543 msgid "Found a possible merge resolution for the submodule:\n"
20544 msgstr "找到子模組的一個可能的合併方案：\n"
20545
20546 +#: merge-recursive.c
20547 +#, c-format
20548 +msgid ""
20549 +"If this is correct simply add it to the index for example\n"
20550 +"by using:\n"
20551 +"\n"
20552 +" git update-index --cacheinfo 160000 %s \"%s\"\n"
20553 +"\n"
20554 +"which will accept this suggestion.\n"
20555 +msgstr ""
20556 +"正確的話，就能直接加進索引，例如執行下述命令：\n"
20557 +"\n"
20558 +" git update-index --cacheinfo 160000 %s \"%s\"\n"
20559 +"\n"
20560 +"接受本建議。\n"
20561 +
20562 #: merge-recursive.c
20563 #, c-format
20564 msgid "Failed to merge submodule %s (multiple merges found)"
@@ -21029,6 +21194,26 @@ msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"
21194 msgid "confused by unstable object source data for %s"
21195 msgstr "被 %s 的不穩定物件來源資料混淆"
21196
21197 +#: object-file.c
21198 +#, c-format
21199 +msgid "write stream object %ld != %<PRIuMAX>"
21200 +msgstr "寫入串流物件 %ld != %<PRIuMAX>"
21201 +
21202 +#: object-file.c
21203 +#, c-format
21204 +msgid "unable to stream deflate new object (%d)"
21205 +msgstr "不能串流壓縮新物件 (%d)"
21206 +
21207 +#: object-file.c
21208 +#, c-format
21209 +msgid "deflateEnd on stream object failed (%d)"
21210 +msgstr "串流物件上的 deflateEnd 失敗 (%d)"
21211 +
21212 +#: object-file.c
21213 +#, c-format
21214 +msgid "unable to create directory %s"
21215 +msgstr "無法建立 %s 目錄"
21216 +
21217 #: object-file.c
21218 #, c-format
21219 msgid "cannot read object for %s"
@@ -21109,7 +21294,7 @@ msgstr "%s [無效物件]"
21294 #. TRANSLATORS: This is a line of ambiguous commit
21295 #. object output. E.g.:
21296 #. *
21112 -#. "deadbeef commit 2021-01-01 - Some Commit Message"
21297 +#. "deadbeef commit 2021-01-01 - Some Commit Message"
21298 #.
21299 #: object-name.c
21300 #, c-format
@@ -21119,7 +21304,7 @@ msgstr "%s 提交 %s - %s"
21304 #. TRANSLATORS: This is a line of ambiguous
21305 #. tag object output. E.g.:
21306 #. *
21122 -#. "deadbeef tag 2022-01-01 - Some Tag Message"
21307 +#. "deadbeef tag 2022-01-01 - Some Tag Message"
21308 #. *
21309 #. The second argument is the YYYY-MM-DD found
21310 #. in the tag.
@@ -21136,7 +21321,7 @@ msgstr "%s 標籤 %s - %s"
21321 #. tag object output where we couldn't parse
21322 #. the tag itself. E.g.:
21323 #. *
21139 -#. "deadbeef [bad tag, could not parse it]"
21324 +#. "deadbeef [bad tag, could not parse it]"
21325 #.
21326 #: object-name.c
21327 #, c-format
@@ -21260,59 +21445,184 @@ msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)"
21445 msgid "relative path syntax can't be used outside working tree"
21446 msgstr "相對路徑與法不能用在工作區外"
21447
21263 -#: object-name.c
21448 +#: object-name.c
21449 +#, c-format
21450 +msgid "<object>:<path> required, only <object> '%s' given"
21451 +msgstr "需要指定 <object>:<path>，卻只指定 <object>「%s」"
21452 +
21453 +#: object-name.c
21454 +#, c-format
21455 +msgid "invalid object name '%.*s'."
21456 +msgstr "'%.*s' 物件名稱無效。"
21457 +
21458 +#: object.c
21459 +#, c-format
21460 +msgid "invalid object type \"%s\""
21461 +msgstr "無效的物件類型 \"%s\""
21462 +
21463 +#: object.c
21464 +#, c-format
21465 +msgid "object %s is a %s, not a %s"
21466 +msgstr "物件 %s 是一個 %s，不是一個 %s"
21467 +
21468 +#: object.c
21469 +#, c-format
21470 +msgid "object %s has unknown type id %d"
21471 +msgstr "物件 %s 有未知的類型 id %d"
21472 +
21473 +#: object.c
21474 +#, c-format
21475 +msgid "unable to parse object: %s"
21476 +msgstr "不能解析物件：%s"
21477 +
21478 +#: object.c
21479 +#, c-format
21480 +msgid "hash mismatch %s"
21481 +msgstr "雜湊值與 %s 不符合"
21482 +
21483 +#: pack-bitmap-write.c
21484 +msgid "trying to write commit not in index"
21485 +msgstr "嘗試寫入不在索引的提交"
21486 +
21487 +#: pack-bitmap.c
21488 +msgid "failed to load bitmap index (corrupted?)"
21489 +msgstr "無法載入位圖索引（損壞？）"
21490 +
21491 +#: pack-bitmap.c
21492 +msgid "corrupted bitmap index (too small)"
21493 +msgstr "位圖索引損壞（過小）"
21494 +
21495 +#: pack-bitmap.c
21496 +msgid "corrupted bitmap index file (wrong header)"
21497 +msgstr "位圖索引檔案損壞（標頭錯誤）"
21498 +
21499 +#: pack-bitmap.c
21500 +#, c-format
21501 +msgid "unsupported version '%d' for bitmap index file"
21502 +msgstr "位圖索引檔案的版本 “%d” 不支援"
21503 +
21504 +#: pack-bitmap.c
21505 +msgid "corrupted bitmap index file (too short to fit hash cache)"
21506 +msgstr "位圖索引檔案損壞（不夠長，無法置入雜湊快取）"
21507 +
21508 +#: pack-bitmap.c
21509 +msgid "corrupted bitmap index file (too short to fit lookup table)"
21510 +msgstr "位圖索引檔案損壞（不夠長，無法置入查詢表）"
21511 +
21512 +#: pack-bitmap.c
21513 +#, c-format
21514 +msgid "duplicate entry in bitmap index: '%s'"
21515 +msgstr "位圖索引中有重複項目：「%s」"
21516 +
21517 +#: pack-bitmap.c
21518 +#, c-format
21519 +msgid "corrupt ewah bitmap: truncated header for entry %d"
21520 +msgstr "ewah 位圖損壞：項目 %d 的標頭遭截斷"
21521 +
21522 +#: pack-bitmap.c
21523 +#, c-format
21524 +msgid "corrupt ewah bitmap: commit index %u out of range"
21525 +msgstr "ewah 位圖損壞：提交索引 %u 超出範圍"
21526 +
21527 +#: pack-bitmap.c
21528 +msgid "corrupted bitmap pack index"
21529 +msgstr "位圖包索引損壞"
21530 +
21531 +#: pack-bitmap.c
21532 +msgid "invalid XOR offset in bitmap pack index"
21533 +msgstr "位圖包索引的 XOR 偏移無效"
21534 +
21535 +#: pack-bitmap.c
21536 +msgid "cannot fstat bitmap file"
21537 +msgstr "無法 fstat 位圖檔案"
21538 +
21539 +#: pack-bitmap.c
21540 +#, c-format
21541 +msgid "ignoring extra bitmap file: '%s'"
21542 +msgstr "忽略多出來的位圖檔案：「%s」"
21543 +
21544 +#: pack-bitmap.c
21545 +msgid "checksum doesn't match in MIDX and bitmap"
21546 +msgstr "總和檢查碼在 MIDX 和位圖中無符合項目"
21547 +
21548 +#: pack-bitmap.c
21549 +msgid "multi-pack bitmap is missing required reverse index"
21550 +msgstr "多包位圖缺少需要的反向索引"
21551 +
21552 +#: pack-bitmap.c
21553 +#, c-format
21554 +msgid "could not open pack %s"
21555 +msgstr "無法開啟封包 %s"
21556 +
21557 +#: pack-bitmap.c
21558 +#, c-format
21559 +msgid "preferred pack (%s) is invalid"
21560 +msgstr "偏好的封包 (%s) 無效"
21561 +
21562 +#: pack-bitmap.c
21563 +msgid "corrupt bitmap lookup table: triplet position out of index"
21564 +msgstr "位圖查詢表損壞：三元組位置超出索引"
21565 +
21566 +#: pack-bitmap.c
21567 +msgid "corrupt bitmap lookup table: xor chain exceeds entry count"
21568 +msgstr "位圖查詢表損壞：XOR 鏈超出項目數"
21569 +
21570 +#: pack-bitmap.c
21571 #, c-format
21265 -msgid "<object>:<path> required, only <object> '%s' given"
21266 -msgstr "需要指定 <object>:<path>，卻只指定 <object>「%s」"
21572 +msgid "corrupt bitmap lookup table: commit index %u out of range"
21573 +msgstr "位圖查詢表損壞：提交索引 %u 超出範圍"
21574
21268 -#: object-name.c
21575 +#: pack-bitmap.c
21576 #, c-format
21270 -msgid "invalid object name '%.*s'."
21271 -msgstr "'%.*s' 物件名稱無效。"
21577 +msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\""
21578 +msgstr "ewah 位圖損壞：提交 “%s” 之位圖的標頭遭截斷"
21579
21273 -#: object.c
21580 +#: pack-bitmap.c
21581 #, c-format
21275 -msgid "invalid object type \"%s\""
21276 -msgstr "無效的物件類型 \"%s\""
21582 +msgid "object '%s' not found in type bitmaps"
21583 +msgstr "在類型位圖中，找不到「%s」物件"
21584
21278 -#: object.c
21585 +#: pack-bitmap.c
21586 #, c-format
21280 -msgid "object %s is a %s, not a %s"
21281 -msgstr "物件 %s 是一個 %s，不是一個 %s"
21587 +msgid "object '%s' does not have a unique type"
21588 +msgstr "「%s」物件的類型不唯一"
21589
21283 -#: object.c
21590 +#: pack-bitmap.c
21591 #, c-format
21285 -msgid "object %s has unknown type id %d"
21286 -msgstr "物件 %s 有未知的類型 id %d"
21592 +msgid "object '%s': real type '%s', expected: '%s'"
21593 +msgstr "「%s」物件：實際類型是「%s」，但預期是「%s」"
21594
21288 -#: object.c
21595 +#: pack-bitmap.c
21596 #, c-format
21290 -msgid "unable to parse object: %s"
21291 -msgstr "不能解析物件：%s"
21597 +msgid "object not in bitmap: '%s'"
21598 +msgstr "物件不在位圖中：「%s」"
21599
21293 -#: object.c
21294 -#, c-format
21295 -msgid "hash mismatch %s"
21296 -msgstr "雜湊值與 %s 不符合"
21600 +#: pack-bitmap.c
21601 +msgid "failed to load bitmap indexes"
21602 +msgstr "無法載入位圖索引"
21603
21604 #: pack-bitmap.c
21299 -msgid "multi-pack bitmap is missing required reverse index"
21300 -msgstr "多包位圖缺少需要的反向索引"
21605 +msgid "you must specify exactly one commit to test"
21606 +msgstr "您必須指定剛好一個要測試的提交"
21607
21608 #: pack-bitmap.c
21609 #, c-format
21304 -msgid "could not open pack %s"
21305 -msgstr "無法開啟封包 %s"
21610 +msgid "commit '%s' doesn't have an indexed bitmap"
21611 +msgstr "提交「%s」無索引過的位圖"
21612 +
21613 +#: pack-bitmap.c
21614 +msgid "mismatch in bitmap results"
21615 +msgstr "位圖結果中有不符項目"
21616
21617 #: pack-bitmap.c
21618 #, c-format
21309 -msgid "preferred pack (%s) is invalid"
21310 -msgstr "偏好的封包 (%s) 無效"
21619 +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>"
21620 +msgstr "在「%2$s」封包，位移 %3$<PRIuMAX> 的地方找不到「%1$s」"
21621
21622 #: pack-bitmap.c
21623 #, c-format
21314 -msgid "could not find %s in pack %s at offset %<PRIuMAX>"
21315 -msgstr "找不到 %2$s 包，偏移位置 %3$<PRIuMAX> 的 %1$s"
21624 +msgid "unable to get disk usage of '%s'"
21625 +msgstr "無法取得「%s」的磁碟用量"
21626
21627 #: pack-mtimes.c
21628 #, c-format
@@ -21467,6 +21777,10 @@ msgstr "你的意思是 `--%s`（有兩個短線）嗎？"
21777 msgid "alias of --%s"
21778 msgstr "--%s 的別名"
21779
21780 +#: parse-options.c
21781 +msgid "need a subcommand"
21782 +msgstr "需要子命令"
21783 +
21784 #: parse-options.c
21785 #, c-format
21786 msgid "unknown option `%s'"
@@ -21996,32 +22310,38 @@ msgid ""
22310 "l, label <label> = label current HEAD with a name\n"
22311 "t, reset <label> = reset HEAD to a label\n"
22312 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
21999 -". create a merge commit using the original merge commit's\n"
22000 -". message (or the oneline, if no original merge commit was\n"
22001 -". specified); use -c <commit> to reword the commit message\n"
22313 +" create a merge commit using the original merge commit's\n"
22314 +" message (or the oneline, if no original merge commit was\n"
22315 +" specified); use -c <commit> to reword the commit message\n"
22316 +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n"
22317 +" to this position in the new commits. The <ref> is\n"
22318 +" updated at the end of the rebase\n"
22319 "\n"
22320 "These lines can be re-ordered; they are executed from top to bottom.\n"
22321 msgstr ""
22322 "\n"
22006 -"指令：\n"
22323 +"命令：\n"
22324 "p, pick <提交> = 使用提交\n"
22325 "r, reword <提交> = 使用提交，但編輯提交說明\n"
22326 "e, edit <提交> = 使用提交，但不直接修補 (amend) \n"
22327 "s, squash <提交> = 使用提交，但融合至上個提交\n"
22011 -"f, fixup [-C | -c] <提交> = 跟 “squash” 相似，但除非傳入「-C」\n"
22328 +"f, fixup [-C | -c] <提交> = 跟 “squash” 相似，但除非傳入 -C，\n"
22329 " 否則只保留上一個提交的日誌訊息。傳入 -C 表示只保留這個\n"
22330 " 提交的訊息；傳入 -c 與 -C 功能相同，但會開啟編輯器\n"
22014 -"x, exec <命令> = 使用 shell 執行指令（這一行的剩餘部分）\n"
22015 -"b, break = 在這停止（使用 'git rebase --continue' 繼續重定基底）\n"
22331 +"x, exec <命令> = 使用 shell 執行命令（這一列的剩餘部分）\n"
22332 +"b, break = 在此停止（使用 “git rebase --continue” 繼續重定基底）\n"
22333 "d, drop <提交> = 移除提交\n"
22334 "l, label <標籤> = 為目前 HEAD 打上指定名字標籤\n"
22335 "t, reset <標籤> = 重設 HEAD 到指定標籤\n"
22336 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
22020 -". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n"
22021 -". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n"
22022 -". -c <commit> 可以編輯提交說明。\n"
22337 +" 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n"
22338 +" 原始提交，則使用 <oneline> 作為提交說明）。\n"
22339 +" 使用 -c <commit> 編輯提交說明。\n"
22340 +"u, update-ref <ref> = 為 <ref> 引用設立佔位符號，\n"
22341 +" 以將這個引用更新為此處的新提交。\n"
22342 +" <ref> 會在重定基底後更新。\n"
22343 "\n"
22024 -"可以對這些行重新排序，會從上至下執行。\n"
22344 +"可以對這些列重新排序；執行順序由上到下。\n"
22345
22346 #: rebase-interactive.c
22347 #, c-format
@@ -22585,6 +22905,15 @@ msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'"
22905 msgid "http transport does not support %s"
22906 msgstr "http 傳輸協定不支援 %s"
22907
22908 +#: remote-curl.c
22909 +msgid "protocol error: expected '<url> <path>', missing space"
22910 +msgstr "協定錯誤：預期是「<URL> <路徑>」，但缺少空白"
22911 +
22912 +#: remote-curl.c
22913 +#, c-format
22914 +msgid "failed to download file at URL '%s'"
22915 +msgstr "無法下載位於 URL “%s” 的檔案"
22916 +
22917 #: remote-curl.c
22918 msgid "git-http-push failed"
22919 msgstr "git-http-push 失敗"
@@ -22989,6 +23318,16 @@ msgstr "不能確定 HEAD 版本"
23318 msgid "failed to find tree of %s"
23319 msgstr "無法找到 %s 指向的樹"
23320
23321 +#: revision.c
23322 +#, c-format
23323 +msgid "resolve-undo records `%s` which is missing"
23324 +msgstr "resolve-undo 不存在的「%s」記錄"
23325 +
23326 +#: revision.c
23327 +#, c-format
23328 +msgid "could not get commit for ancestry-path argument %s"
23329 +msgstr "無法取得 ancestry-path 引數 %s 的提交"
23330 +
23331 #: revision.c
23332 msgid "--unpacked=<packfile> no longer supported"
23333 msgstr "--unpacked=<packfile> 已不受支援"
@@ -23015,6 +23354,220 @@ msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"
23354 msgid "cannot create async thread: %s"
23355 msgstr "不能建立 async 執行緒：%s"
23356
23357 +#: scalar.c worktree.c
23358 +#, c-format
23359 +msgid "'%s' does not exist"
23360 +msgstr "'%s' 不存在"
23361 +
23362 +#: scalar.c
23363 +#, c-format
23364 +msgid "could not switch to '%s'"
23365 +msgstr "無法切換至「%s」"
23366 +
23367 +#: scalar.c
23368 +msgid "need a working directory"
23369 +msgstr "需要工作目錄"
23370 +
23371 +#: scalar.c
23372 +msgid "Scalar enlistments require a worktree"
23373 +msgstr "純量編列名單需要工作目錄"
23374 +
23375 +#: scalar.c
23376 +#, c-format
23377 +msgid "could not configure %s=%s"
23378 +msgstr "無法設定 %s=%s"
23379 +
23380 +#: scalar.c
23381 +msgid "could not configure log.excludeDecoration"
23382 +msgstr "無法設定 log.excludeDecoration"
23383 +
23384 +#: scalar.c
23385 +msgid "could not add enlistment"
23386 +msgstr "無法加入編列清單"
23387 +
23388 +#: scalar.c
23389 +msgid "could not set recommended config"
23390 +msgstr "無法設定建議組態"
23391 +
23392 +#: scalar.c
23393 +msgid "could not turn on maintenance"
23394 +msgstr "無法開啟維護模式"
23395 +
23396 +#: scalar.c
23397 +msgid "could not start the FSMonitor daemon"
23398 +msgstr "無法啟動 FSMonitor 守護程式"
23399 +
23400 +#: scalar.c
23401 +msgid "could not turn off maintenance"
23402 +msgstr "無法關閉維護模式"
23403 +
23404 +#: scalar.c
23405 +msgid "could not remove enlistment"
23406 +msgstr "無法移除編列清單"
23407 +
23408 +#: scalar.c
23409 +#, c-format
23410 +msgid "remote HEAD is not a branch: '%.*s'"
23411 +msgstr "遠端 HEAD 不是分支：「%.*s」"
23412 +
23413 +#: scalar.c
23414 +msgid "failed to get default branch name from remote; using local default"
23415 +msgstr "無法從遠端取得預設分支名稱。改用本機預設名稱"
23416 +
23417 +#: scalar.c
23418 +msgid "failed to get default branch name"
23419 +msgstr "無法取得預設分支名稱"
23420 +
23421 +#: scalar.c
23422 +msgid "failed to unregister repository"
23423 +msgstr "無法取消註冊版本庫"
23424 +
23425 +#: scalar.c
23426 +msgid "failed to stop the FSMonitor daemon"
23427 +msgstr "無法停止 FSMonitor 守護程式"
23428 +
23429 +#: scalar.c
23430 +msgid "failed to delete enlistment directory"
23431 +msgstr "無法刪除編列名單目錄"
23432 +
23433 +#: scalar.c
23434 +msgid "branch to checkout after clone"
23435 +msgstr "複製後要簽出的分支"
23436 +
23437 +#: scalar.c
23438 +msgid "when cloning, create full working directory"
23439 +msgstr "複製時建立完整的工作目錄"
23440 +
23441 +#: scalar.c
23442 +msgid "only download metadata for the branch that will be checked out"
23443 +msgstr "只下載會簽出的分支中介資料"
23444 +
23445 +#: scalar.c
23446 +msgid "scalar clone [<options>] [--] <repo> [<dir>]"
23447 +msgstr "scalar clone [<options>] [--] <repo> [<dir>]"
23448 +
23449 +#: scalar.c
23450 +#, c-format
23451 +msgid "cannot deduce worktree name from '%s'"
23452 +msgstr "無法從「%s」推論工作區名稱"
23453 +
23454 +#: scalar.c
23455 +#, c-format
23456 +msgid "directory '%s' exists already"
23457 +msgstr "「%s」目錄已經存在"
23458 +
23459 +#: scalar.c
23460 +#, c-format
23461 +msgid "failed to get default branch for '%s'"
23462 +msgstr "無法取得「%s」的預設分支"
23463 +
23464 +#: scalar.c
23465 +#, c-format
23466 +msgid "could not configure remote in '%s'"
23467 +msgstr "無法設定「%s」中的遠端"
23468 +
23469 +#: scalar.c
23470 +#, c-format
23471 +msgid "could not configure '%s'"
23472 +msgstr "無法設定「%s」"
23473 +
23474 +#: scalar.c
23475 +msgid "partial clone failed; attempting full clone"
23476 +msgstr "部分複製失敗。嘗試完整複製"
23477 +
23478 +#: scalar.c
23479 +msgid "could not configure for full clone"
23480 +msgstr "無法設定完整複製"
23481 +
23482 +#: scalar.c
23483 +msgid "scalar diagnose [<enlistment>]"
23484 +msgstr "scalar diagnose [<enlistment>]"
23485 +
23486 +#: scalar.c
23487 +msgid "`scalar list` does not take arguments"
23488 +msgstr "`scalar list` 未取引數"
23489 +
23490 +#: scalar.c
23491 +msgid "scalar register [<enlistment>]"
23492 +msgstr "scalar register [<enlistment>]"
23493 +
23494 +#: scalar.c
23495 +msgid "reconfigure all registered enlistments"
23496 +msgstr "重新設定所有註冊的編列名單"
23497 +
23498 +#: scalar.c
23499 +msgid "scalar reconfigure [--all | <enlistment>]"
23500 +msgstr "scalar reconfigure [--all | <enlistment>]"
23501 +
23502 +#: scalar.c
23503 +msgid "--all or <enlistment>, but not both"
23504 +msgstr "--all 或 <enlistment> 但不能傳入兩者"
23505 +
23506 +#: scalar.c
23507 +#, c-format
23508 +msgid "git repository gone in '%s'"
23509 +msgstr "git 版本庫在「%s」遺失"
23510 +
23511 +#: scalar.c
23512 +msgid ""
23513 +"scalar run <task> [<enlistment>]\n"
23514 +"Tasks:\n"
23515 +msgstr ""
23516 +"scalar run <task> [<enlistment>]\n"
23517 +"作業：\n"
23518 +
23519 +#: scalar.c
23520 +#, c-format
23521 +msgid "no such task: '%s'"
23522 +msgstr "無此作業：「%s」"
23523 +
23524 +#: scalar.c
23525 +msgid "scalar unregister [<enlistment>]"
23526 +msgstr "scalar unregister [<enlistment>]"
23527 +
23528 +#: scalar.c
23529 +msgid "scalar delete <enlistment>"
23530 +msgstr "scalar delete <enlistment>"
23531 +
23532 +#: scalar.c
23533 +msgid "refusing to delete current working directory"
23534 +msgstr "拒絕刪除目前工作目錄"
23535 +
23536 +#: scalar.c
23537 +msgid "include Git version"
23538 +msgstr "包含 Git 版本"
23539 +
23540 +#: scalar.c
23541 +msgid "include Git's build options"
23542 +msgstr "包含 Git 組建選項"
23543 +
23544 +#: scalar.c
23545 +msgid "scalar verbose [-v | --verbose] [--build-options]"
23546 +msgstr "scalar verbose [-v | --verbose] [--build-options]"
23547 +
23548 +#: scalar.c
23549 +msgid "-C requires a <directory>"
23550 +msgstr "-C 需要 <directory>"
23551 +
23552 +#: scalar.c
23553 +#, c-format
23554 +msgid "could not change to '%s'"
23555 +msgstr "無法更改為「%s」"
23556 +
23557 +#: scalar.c
23558 +msgid "-c requires a <key>=<value> argument"
23559 +msgstr "-c 需要 <key>=<value> 引數"
23560 +
23561 +#: scalar.c
23562 +msgid ""
23563 +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
23564 +"\n"
23565 +"Commands:\n"
23566 +msgstr ""
23567 +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
23568 +"\n"
23569 +"命令：\n"
23570 +
23571 #: send-pack.c
23572 msgid "unexpected flush packet while reading remote unpack status"
23573 msgstr "讀取遠端解包狀態時收到意外的 flush 包"
@@ -23159,11 +23712,6 @@ msgstr "您的本機修改將被%s覆蓋。"
23712 msgid "commit your changes or stash them to proceed."
23713 msgstr "提交您的修改或儲藏後再繼續。"
23714
23162 -#: sequencer.c
23163 -#, c-format
23164 -msgid "%s: fast-forward"
23165 -msgstr "%s：快轉"
23166 -
23715 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
23716 #. "rebase".
23717 #.
@@ -23751,6 +24299,30 @@ msgstr "甚至不能嘗試合併 '%.*s'"
24299 msgid "merge: Unable to write new index file"
24300 msgstr "合併：無法寫入新索引檔案"
24301
24302 +#: sequencer.c
24303 +#, c-format
24304 +msgid ""
24305 +"another 'rebase' process appears to be running; '%s.lock' already exists"
24306 +msgstr "似乎有另一個 “rebase” 程序正在進行；“%s.lock” 已經存在"
24307 +
24308 +#: sequencer.c
24309 +#, c-format
24310 +msgid ""
24311 +"Updated the following refs with %s:\n"
24312 +"%s"
24313 +msgstr ""
24314 +"已使用 %s 更新下述引用：\n"
24315 +"%s"
24316 +
24317 +#: sequencer.c
24318 +#, c-format
24319 +msgid ""
24320 +"Failed to update the following refs with %s:\n"
24321 +"%s"
24322 +msgstr ""
24323 +"無法使用 %s 更新下述引用：\n"
24324 +"%s"
24325 +
24326 #: sequencer.c
24327 msgid "Cannot autostash"
24328 msgstr "無法 autostash"
@@ -23953,6 +24525,11 @@ msgstr "無法略過不必要的揀選"
24525 msgid "the script was already rearranged."
24526 msgstr "腳本已經重新編排。"
24527
24528 +#: sequencer.c
24529 +#, c-format
24530 +msgid "update-refs file at '%s' is invalid"
24531 +msgstr "位於「%s」的 update-refs 檔案無效"
24532 +
24533 #: setup.c
24534 #, c-format
24535 msgid "'%s' is outside repository at '%s'"
@@ -24093,16 +24670,21 @@ msgstr ""
24670 #: setup.c
24671 #, c-format
24672 msgid ""
24096 -"unsafe repository ('%s' is owned by someone else)\n"
24097 -"To add an exception for this directory, call:\n"
24673 +"detected dubious ownership in repository at '%s'\n"
24674 +"%sTo add an exception for this directory, call:\n"
24675 "\n"
24676 "\tgit config --global --add safe.directory %s"
24677 msgstr ""
24101 -"不安全版本庫（「%s」由其他人所有）\n"
24102 -"若要放行本目錄，請呼叫：\n"
24678 +"在位於「%s」的版本庫偵測到可疑所有權\n"
24679 +"%s若要放行本目錄，請呼叫：\n"
24680 "\n"
24681 "\tgit config --global --add safe.directory %s"
24682
24683 +#: setup.c
24684 +#, c-format
24685 +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')"
24686 +msgstr "無法使用 “%s” 純版本庫（safe.bareRepository 是 “%s”）"
24687 +
24688 #: setup.c
24689 #, c-format
24690 msgid ""
@@ -25126,6 +25708,22 @@ msgstr "無效的埠號"
25708 msgid "invalid '..' path segment"
25709 msgstr "無效的 '..' 路徑區塊"
25710
25711 +#: usage.c
25712 +msgid "usage: "
25713 +msgstr "用法："
25714 +
25715 +#: usage.c
25716 +msgid "fatal: "
25717 +msgstr "致命錯誤："
25718 +
25719 +#: usage.c
25720 +msgid "error: "
25721 +msgstr "錯誤："
25722 +
25723 +#: usage.c
25724 +msgid "warning: "
25725 +msgstr "警告："
25726 +
25727 #: walker.c
25728 msgid "Fetching objects"
25729 msgstr "正在抓取物件"
@@ -25818,7 +26416,7 @@ msgstr "另外，您的索引中包含未提交的變更。"
26416 msgid "cannot %s: Your index contains uncommitted changes."
26417 msgstr "不能%s：您的索引中包含未提交的變更。"
26418
25821 -#: git-merge-octopus.sh
26419 +#: git-merge-octopus.sh git-merge-resolve.sh
26420 msgid ""
26421 "Error: Your local changes to the following files would be overwritten by "
26422 "merge"
@@ -26105,26 +26703,6 @@ msgstr "選取區塊不能套用到索引！\n"
26703 msgid "ignoring unmerged: %s\n"
26704 msgstr "忽略未套用的：%s\n"
26705
26108 -#: git-add--interactive.perl
26109 -#, perl-format
26110 -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
26111 -msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? "
26112 -
26113 -#: git-add--interactive.perl
26114 -#, perl-format
26115 -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
26116 -msgstr "將刪除變更套用到工作區 [y,n,q,a,d%s,?]? "
26117 -
26118 -#: git-add--interactive.perl
26119 -#, perl-format
26120 -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
26121 -msgstr "將新增變更套用到工作區 [y,n,q,a,d%s,?]? "
26122 -
26123 -#: git-add--interactive.perl
26124 -#, perl-format
26125 -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
26126 -msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? "
26127 -
26706 #: git-add--interactive.perl
26707 msgid "No other hunks to goto\n"
26708 msgstr "沒有其它可供跳轉的區塊\n"