msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-01-17 08:31+0800\n"
-"PO-Revision-Date: 2022-01-22 07:05+0800\n"
+"POT-Creation-Date: 2022-04-13 14:52+0800\n"
+"PO-Revision-Date: 2022-04-14 08:04+0800\n"
"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
"po/git-cli/zh_Hant/>\n"
"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
"zhconvert.org\n"
-#: add-interactive.c:380
+#: add-interactive.c:382
#, c-format
msgid "Huh (%s)?"
msgstr "嗯(%s)?"
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
-#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
-#: builtin/rebase.c:1642
+#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
+#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
+#: builtin/rebase.c:1671
msgid "could not read index"
msgstr "無法讀取索引"
-#: add-interactive.c:588 git-add--interactive.perl:269
+#: add-interactive.c:590 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "二進位"
-#: add-interactive.c:646 git-add--interactive.perl:278
+#: add-interactive.c:648 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "無"
-#: add-interactive.c:647 git-add--interactive.perl:314
+#: add-interactive.c:649 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "未變更"
-#: add-interactive.c:684 git-add--interactive.perl:641
+#: add-interactive.c:686 git-add--interactive.perl:641
msgid "Update"
msgstr "更新"
-#: add-interactive.c:701 add-interactive.c:889
+#: add-interactive.c:703 add-interactive.c:891
#, c-format
msgid "could not stage '%s'"
msgstr "無法暫存「%s」"
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
+#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
msgid "could not write index"
msgstr "無法寫入索引"
-#: add-interactive.c:710 git-add--interactive.perl:626
+#: add-interactive.c:712 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "已更新 %d 個路徑\n"
-#: add-interactive.c:728 git-add--interactive.perl:676
+#: add-interactive.c:730 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "注意:%s 現已不再追蹤。\n"
-#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
#: builtin/reset.c:167
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "「%s」路徑執行 make_cache_entry 失敗"
-#: add-interactive.c:763 git-add--interactive.perl:653
+#: add-interactive.c:765 git-add--interactive.perl:653
msgid "Revert"
msgstr "還原"
-#: add-interactive.c:779
+#: add-interactive.c:781
msgid "Could not parse HEAD^{tree}"
msgstr "不能解析 HEAD^{樹}"
-#: add-interactive.c:817 git-add--interactive.perl:629
+#: add-interactive.c:819 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "還原了 %d 個路徑\n"
-#: add-interactive.c:868 git-add--interactive.perl:693
+#: add-interactive.c:870 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "沒有未追蹤的檔案。\n"
-#: add-interactive.c:872 git-add--interactive.perl:687
+#: add-interactive.c:874 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "新增未追蹤的"
-#: add-interactive.c:899 git-add--interactive.perl:623
+#: add-interactive.c:901 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "增加了 %d 個路徑\n"
-#: add-interactive.c:929
+#: add-interactive.c:931
#, c-format
msgid "ignoring unmerged: %s"
msgstr "忽略未合併:%s"
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
#, c-format
msgid "Only binary files changed.\n"
msgstr "只有二進位檔案被修改。\n"
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
+#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
#, c-format
msgid "No changes.\n"
msgstr "沒有修改。\n"
-#: add-interactive.c:947 git-add--interactive.perl:1381
+#: add-interactive.c:949 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "修補檔更新"
-#: add-interactive.c:986 git-add--interactive.perl:1794
+#: add-interactive.c:988 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "檢視 diff"
-#: add-interactive.c:1014
+#: add-interactive.c:1016
msgid "show paths with changes"
msgstr "顯示有變更的路徑"
-#: add-interactive.c:1016
+#: add-interactive.c:1018
msgid "add working tree state to the staged set of changes"
msgstr "加入工作區狀態至暫存列表"
-#: add-interactive.c:1018
+#: add-interactive.c:1020
msgid "revert staged set of changes back to the HEAD version"
msgstr "還原修改的暫存集至 HEAD 版本"
-#: add-interactive.c:1020
+#: add-interactive.c:1022
msgid "pick hunks and update selectively"
msgstr "挑選區塊並選擇性更新"
-#: add-interactive.c:1022
+#: add-interactive.c:1024
msgid "view diff between HEAD and index"
msgstr "檢視 HEAD 及索引之間的差異"
-#: add-interactive.c:1024
+#: add-interactive.c:1026
msgid "add contents of untracked files to the staged set of changes"
msgstr "加入未追蹤檔案的內容至暫存列表"
-#: add-interactive.c:1032 add-interactive.c:1081
+#: add-interactive.c:1034 add-interactive.c:1083
msgid "Prompt help:"
msgstr "提示說明:"
-#: add-interactive.c:1034
+#: add-interactive.c:1036
msgid "select a single item"
msgstr "選擇單一項目"
-#: add-interactive.c:1036
+#: add-interactive.c:1038
msgid "select a range of items"
msgstr "選擇項目範圍"
-#: add-interactive.c:1038
+#: add-interactive.c:1040
msgid "select multiple ranges"
msgstr "選擇多個範圍"
-#: add-interactive.c:1040 add-interactive.c:1085
+#: add-interactive.c:1042 add-interactive.c:1087
msgid "select item based on unique prefix"
msgstr "基於唯一前綴選擇項目"
-#: add-interactive.c:1042
+#: add-interactive.c:1044
msgid "unselect specified items"
msgstr "取消選擇指定項目"
-#: add-interactive.c:1044
+#: add-interactive.c:1046
msgid "choose all items"
msgstr "選擇所有項目"
-#: add-interactive.c:1046
+#: add-interactive.c:1048
msgid "(empty) finish selecting"
msgstr "(空)完成選取"
-#: add-interactive.c:1083
+#: add-interactive.c:1085
msgid "select a numbered item"
msgstr "選擇編號過的項目"
-#: add-interactive.c:1087
+#: add-interactive.c:1089
msgid "(empty) select nothing"
msgstr "(空)全不選取"
-#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
+#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
msgid "*** Commands ***"
msgstr "*** 指令 ***"
-#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
+#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
msgid "What now"
msgstr "請選擇"
-#: add-interactive.c:1148 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "staged"
msgstr "快取"
-#: add-interactive.c:1148 git-add--interactive.perl:213
+#: add-interactive.c:1150 git-add--interactive.perl:213
msgid "unstaged"
msgstr "未快取"
-#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
-#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
-#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
+#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
+#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
+#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
+#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
#: git-add--interactive.perl:213
msgid "path"
msgstr "路徑"
-#: add-interactive.c:1155
+#: add-interactive.c:1157
msgid "could not refresh index"
msgstr "無法重新整理索引"
-#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
+#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "再見。\n"
msgid "could not parse colored hunk header '%.*s'"
msgstr "無法解析上色過的區塊標頭 '%.*s'"
-#: add-patch.c:420
+#: add-patch.c:431
msgid "could not parse diff"
msgstr "無法解析差異 (diff)"
-#: add-patch.c:439
+#: add-patch.c:450
msgid "could not parse colored diff"
msgstr "無法解析上色過的差異 (diff)"
-#: add-patch.c:453
+#: add-patch.c:464
#, c-format
msgid "failed to run '%s'"
msgstr "無法執行 '%s'"
-#: add-patch.c:612
+#: add-patch.c:618
msgid "mismatched output from interactive.diffFilter"
msgstr "interactive.diffFilter 的輸出不符"
-#: add-patch.c:613
+#: add-patch.c:619
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
"您的過濾器必須在其輸入及輸出行\n"
"維持一對一的對應關係。"
-#: add-patch.c:791
+#: add-patch.c:797
#, c-format
msgid ""
"expected context line #%d in\n"
"應有上下文行 #%d 於\n"
"%.*s"
-#: add-patch.c:806
+#: add-patch.c:812
#, c-format
msgid ""
"hunks do not overlap:\n"
"\t不以下述結尾:\n"
"%.*s"
-#: add-patch.c:1082 git-add--interactive.perl:1115
+#: add-patch.c:1088 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"
-#: add-patch.c:1086
+#: add-patch.c:1092
#, c-format
msgid ""
"---\n"
"以 %c 開始的行將被刪除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1100 git-add--interactive.perl:1129
+#: add-patch.c:1106 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"若刪掉此區塊的全部內容,則會中止\n"
"本次編輯,區塊則不會被修改。\n"
-#: add-patch.c:1133
+#: add-patch.c:1139
msgid "could not parse hunk header"
msgstr "無法解析區塊標頭"
-#: add-patch.c:1178
+#: add-patch.c:1184
msgid "'git apply --cached' failed"
msgstr "「git apply --cached」失敗"
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1244
+#: add-patch.c:1253 git-add--interactive.perl:1244
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "未套用編輯區塊。是否重新編輯(輸入 “no” 捨棄!) [y/n]? "
-#: add-patch.c:1290
+#: add-patch.c:1296
msgid "The selected hunks do not apply to the index!"
msgstr "選取的區塊不會套用進索引!"
-#: add-patch.c:1291 git-add--interactive.perl:1348
+#: add-patch.c:1297 git-add--interactive.perl:1348
msgid "Apply them to the worktree anyway? "
msgstr "無論如何都要套用到工作區嗎? "
-#: add-patch.c:1298 git-add--interactive.perl:1351
+#: add-patch.c:1304 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "未套用。\n"
-#: add-patch.c:1355
+#: add-patch.c:1361
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
"e - 手動編輯目前區塊\n"
"? - 顯示說明\n"
-#: add-patch.c:1517 add-patch.c:1527
+#: add-patch.c:1523 add-patch.c:1533
msgid "No previous hunk"
msgstr "沒有上一個區塊"
-#: add-patch.c:1522 add-patch.c:1532
+#: add-patch.c:1528 add-patch.c:1538
msgid "No next hunk"
msgstr "沒有下一個區塊"
-#: add-patch.c:1538
+#: add-patch.c:1544
msgid "No other hunks to goto"
msgstr "沒有其它可供跳轉的區塊"
-#: add-patch.c:1549 git-add--interactive.perl:1608
+#: add-patch.c:1555 git-add--interactive.perl:1608
msgid "go to which hunk (<ret> to see more)? "
msgstr "要跳轉到哪個區塊(<Enter> 檢視更多)? "
-#: add-patch.c:1550 git-add--interactive.perl:1610
+#: add-patch.c:1556 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "跳轉到哪個區塊? "
-#: add-patch.c:1561
+#: add-patch.c:1567
#, c-format
msgid "Invalid number: '%s'"
msgstr "無效數字:'%s'"
-#: add-patch.c:1566
+#: add-patch.c:1572
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "對不起,只有 %d 個可用區塊。"
-#: add-patch.c:1575
+#: add-patch.c:1581
msgid "No other hunks to search"
msgstr "沒有其它可供尋找的區塊"
-#: add-patch.c:1581 git-add--interactive.perl:1663
+#: add-patch.c:1587 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "使用常規表示式搜尋? "
-#: add-patch.c:1596
+#: add-patch.c:1602
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "錯誤的常規表示式 %s:%s"
-#: add-patch.c:1613
+#: add-patch.c:1619
msgid "No hunk matches the given pattern"
msgstr "沒有和提供模式相符合的區塊"
-#: add-patch.c:1620
+#: add-patch.c:1626
msgid "Sorry, cannot split this hunk"
msgstr "對不起,不能分割這個區塊"
-#: add-patch.c:1624
+#: add-patch.c:1630
#, c-format
msgid "Split into %d hunks."
msgstr "分割為 %d 個區塊。"
-#: add-patch.c:1628
+#: add-patch.c:1634
msgid "Sorry, cannot edit this hunk"
msgstr "對不起,不能編輯這個區塊"
-#: add-patch.c:1680
+#: add-patch.c:1686
msgid "'git apply' failed"
msgstr "'git apply' 失敗"
-#: advice.c:78
+#: advice.c:81
#, c-format
msgid ""
"\n"
"\n"
"請使用「git config advice.%s false」來停用此訊息"
-#: advice.c:94
+#: advice.c:97
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示:%.*s%s\n"
-#: advice.c:178
+#: advice.c:181
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "無法揀選,因為您有未合併的檔案。"
-#: advice.c:180
+#: advice.c:183
msgid "Committing is not possible because you have unmerged files."
msgstr "無法提交,因為您有未合併的檔案。"
-#: advice.c:182
+#: advice.c:185
msgid "Merging is not possible because you have unmerged files."
msgstr "無法合併,因為您有未合併的檔案。"
-#: advice.c:184
+#: advice.c:187
msgid "Pulling is not possible because you have unmerged files."
msgstr "無法拉取,因為您有未合併的檔案。"
-#: advice.c:186
+#: advice.c:189
msgid "Reverting is not possible because you have unmerged files."
msgstr "無法還原提交,因為您有未合併的檔案。"
-#: advice.c:188
+#: advice.c:191
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "無法 %s,因為您有未合併的檔案。"
-#: advice.c:196
+#: advice.c:199
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
"請在工作區改正檔案,然後酌情使用 'git add/rm <檔案>' 指令標記\n"
"解決方案並提交。"
-#: advice.c:204
+#: advice.c:207
msgid "Exiting because of an unresolved conflict."
msgstr "因為存在未解決的衝突而離開。"
-#: advice.c:209 builtin/merge.c:1382
+#: advice.c:212 builtin/merge.c:1388
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未結束您的合併(存在 MERGE_HEAD)。"
-#: advice.c:211
+#: advice.c:214
msgid "Please, commit your changes before merging."
msgstr "請在合併前先提交您的修改。"
-#: advice.c:212
+#: advice.c:215
msgid "Exiting because of unfinished merge."
msgstr "因為存在未完成的合併而離開。"
-#: advice.c:217
+#: advice.c:220
msgid "Not possible to fast-forward, aborting."
msgstr "無法快轉,終止。"
-#: advice.c:227
+#: advice.c:230
#, c-format
msgid ""
"The following paths and/or pathspecs matched paths that exist\n"
"符合稀疏簽出定義外且存在的路徑,\n"
"所以不會在索引中更新:\n"
-#: advice.c:234
+#: advice.c:237
msgid ""
"If you intend to update such entries, try one of the following:\n"
"* Use the --sparse option.\n"
"* 使用 --sparse 選項。\n"
"* 停用或修改稀疏規則。"
-#: advice.c:242
+#: advice.c:245
#, c-format
msgid ""
"Note: switching to '%s'.\n"
msgid "unrecognized whitespace ignore option '%s'"
msgstr "無法識別的空白字元忽略選項 '%s'"
-#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
-#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
-#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
-#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
-#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
-#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
-#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
-#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
-#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
-#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
-#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
-#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
-#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
-#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
-#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
-#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
-#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
-#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
-#: builtin/worktree.c:702
+#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
+#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
+#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
+#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
+#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
+#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
+#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
+#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
+#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
+#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
+#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
+#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
+#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
+#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
+#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
+#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
+#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
+#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
+#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
+#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
+#: builtin/worktree.c:779
#, c-format
msgid "options '%s' and '%s' cannot be used together"
msgstr "不能同時使用 '%s' 和 '%s' 選項"
-#: apply.c:139 apply.c:150 apply.c:153
+#: apply.c:141 apply.c:152 apply.c:155
#, c-format
msgid "'%s' outside a repository"
msgstr "'%s' 在版本庫之外"
-#: apply.c:800
+#: apply.c:807
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "無法準備時間戳常規表示式 %s"
-#: apply.c:809
+#: apply.c:816
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d,輸入為:%s"
-#: apply.c:883
+#: apply.c:890
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在修補檔的第 %d 行找到檔案名"
-#: apply.c:921
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply:錯誤的 git-diff - 應為 /dev/null,但在第 %2$d 行得到 %1$s"
-#: apply.c:927
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply:錯誤的 git-diff - 第 %d 行上新檔案名不一致"
-#: apply.c:928
+#: apply.c:935
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply:錯誤的 git-diff - 第 %d 行上舊檔案名不一致"
-#: apply.c:933
+#: apply.c:940
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply:錯誤的 git-diff - 第 %d 行處應為 /dev/null"
-#: apply.c:962
+#: apply.c:969
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "第 %d 行包含無效檔案模式:%s"
-#: apply.c:1281
+#: apply.c:1288
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "不一致的檔案頭,%d 行和 %d 行"
-#: apply.c:1371
+#: apply.c:1378
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"components (line %d)"
msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息(第 %d 行)"
-#: apply.c:1384
+#: apply.c:1391
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的標頭訊息中缺乏檔案名訊息(第 %d 行)"
-#: apply.c:1480
+#: apply.c:1487
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount:意外的行:%.*s"
-#: apply.c:1549
+#: apply.c:1556
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的修補檔區塊沒有標頭訊息:%.*s"
-#: apply.c:1752
+#: apply.c:1759
msgid "new file depends on old contents"
msgstr "新檔案依賴舊內容"
-#: apply.c:1754
+#: apply.c:1761
msgid "deleted file still has contents"
msgstr "刪除的檔案仍有內容"
-#: apply.c:1788
+#: apply.c:1795
#, c-format
msgid "corrupt patch at line %d"
msgstr "修補檔在第 %d 行發現損壞"
-#: apply.c:1825
+#: apply.c:1832
#, c-format
msgid "new file %s depends on old contents"
msgstr "新檔案 %s 依賴舊內容"
-#: apply.c:1827
+#: apply.c:1834
#, c-format
msgid "deleted file %s still has contents"
msgstr "刪除的檔案 %s 仍有內容"
-#: apply.c:1830
+#: apply.c:1837
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告:檔案 %s 成為空檔案但並未刪除"
-#: apply.c:1978
+#: apply.c:1985
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二進位修補檔在第 %d 行損壞:%.*s"
-#: apply.c:2015
+#: apply.c:2022
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "無法識別的二進位修補檔位於第 %d 行"
-#: apply.c:2177
+#: apply.c:2184
#, c-format
msgid "patch with only garbage at line %d"
msgstr "修補檔案的第 %d 行只有垃圾資料"
-#: apply.c:2263
+#: apply.c:2270
#, c-format
msgid "unable to read symlink %s"
msgstr "無法讀取符號連結 %s"
-#: apply.c:2267
+#: apply.c:2274
#, c-format
msgid "unable to open or read %s"
msgstr "不能開啟或讀取 %s"
-#: apply.c:2936
+#: apply.c:2943
#, c-format
msgid "invalid start of line: '%c'"
msgstr "無效的行首字元:'%c'"
-#: apply.c:3057
+#: apply.c:3064
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "區塊 #%d 成功套用於 %d(位移 %d 行)。"
-#: apply.c:3069
+#: apply.c:3076
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文減少到(%ld/%ld)以在第 %d 行套用修補檔區塊"
-#: apply.c:3075
+#: apply.c:3082
#, c-format
msgid ""
"while searching for:\n"
"當查詢:\n"
"%.*s"
-#: apply.c:3097
+#: apply.c:3104
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺少 '%s' 的二進位修補檔資料"
-#: apply.c:3105
+#: apply.c:3112
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔"
-#: apply.c:3152
+#: apply.c:3159
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔"
-#: apply.c:3163
+#: apply.c:3170
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "修補檔套用到 '%s'(%s),但是和目前內容不符合。"
-#: apply.c:3171
+#: apply.c:3178
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "修補檔套用到空檔案 '%s',但其並非空檔案"
-#: apply.c:3189
+#: apply.c:3196
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s"
-#: apply.c:3202
+#: apply.c:3209
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二進位修補檔未套用到 '%s'"
-#: apply.c:3209
+#: apply.c:3216
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二進位修補檔產生了不正確的結果(應為 %s,卻為 %s)"
-#: apply.c:3230
+#: apply.c:3237
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打修補檔失敗:%s:%ld"
-#: apply.c:3353
+#: apply.c:3360
#, c-format
msgid "cannot checkout %s"
msgstr "不能簽出 %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
-#: setup.c:309
+#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
+#: setup.c:310
#, c-format
msgid "failed to read %s"
msgstr "無法讀取 %s"
-#: apply.c:3413
+#: apply.c:3420
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "讀取位於符號連結中的 '%s'"
-#: apply.c:3442 apply.c:3711
+#: apply.c:3449 apply.c:3721
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路徑 %s 已經被重新命名/刪除"
-#: apply.c:3549 apply.c:3726
+#: apply.c:3559 apply.c:3736
#, c-format
msgid "%s: does not exist in index"
msgstr "%s:不存在於索引中"
-#: apply.c:3558 apply.c:3734 apply.c:3978
+#: apply.c:3568 apply.c:3744 apply.c:3960
#, c-format
msgid "%s: does not match index"
msgstr "%s:和索引不符合"
-#: apply.c:3595
+#: apply.c:3605
msgid "repository lacks the necessary blob to perform 3-way merge."
msgstr "版本庫缺少用來進行三方合併所需要的資料物件。"
-#: apply.c:3598
+#: apply.c:3608
#, c-format
msgid "Performing three-way merge...\n"
msgstr "正在進行三方合併⋯⋯\n"
-#: apply.c:3614 apply.c:3618
+#: apply.c:3624 apply.c:3628
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "無法讀取 '%s' 的目前內容"
-#: apply.c:3630
+#: apply.c:3640
#, c-format
msgid "Failed to perform three-way merge...\n"
msgstr "無法進行三方合併⋯⋯\n"
-#: apply.c:3644
+#: apply.c:3654
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "套用修補檔到 '%s' 存在衝突。\n"
-#: apply.c:3649
+#: apply.c:3659
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功套用修補檔到 '%s'。\n"
-#: apply.c:3666
+#: apply.c:3676
#, c-format
msgid "Falling back to direct application...\n"
msgstr "回復至直接套用模式⋯⋯\n"
-#: apply.c:3678
+#: apply.c:3688
msgid "removal patch leaves file contents"
msgstr "移除修補檔仍留下了檔案內容"
-#: apply.c:3751
+#: apply.c:3761
#, c-format
msgid "%s: wrong type"
msgstr "%s:錯誤類型"
-#: apply.c:3753
+#: apply.c:3763
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的類型是 %o,應為 %o"
-#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
-#: read-cache.c:1381
+#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
+#: read-cache.c:1399
#, c-format
msgid "invalid path '%s'"
msgstr "無效路徑 '%s'"
-#: apply.c:3976
+#: apply.c:3958
#, c-format
msgid "%s: already exists in index"
msgstr "%s:已經存在於索引中"
-#: apply.c:3980
+#: apply.c:3962
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s:已經存在於工作區中"
-#: apply.c:4000
+#: apply.c:3982
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式(%1$o)和舊模式(%3$o)不符合"
-#: apply.c:4005
+#: apply.c:3987
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式(%1$o)和 %4$s 的舊模式(%3$o)不符合"
-#: apply.c:4025
+#: apply.c:4007
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影響的檔案 '%s' 位於符號連結中"
-#: apply.c:4029
+#: apply.c:4011
#, c-format
msgid "%s: patch does not apply"
msgstr "%s:修補檔未套用"
-#: apply.c:4044
+#: apply.c:4026
#, c-format
msgid "Checking patch %s..."
msgstr "正在檢查修補檔 %s..."
-#: apply.c:4136
+#: apply.c:4118
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模組 %s 的 sha1 訊息缺少或無效"
-#: apply.c:4143
+#: apply.c:4125
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式變更,但它不在目前 HEAD 中"
-#: apply.c:4146
+#: apply.c:4128
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 訊息缺少或無效(%s)。"
-#: apply.c:4155
+#: apply.c:4137
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在暫時索引中新增 %s"
-#: apply.c:4165
+#: apply.c:4147
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把暫時索引寫入到 %s"
-#: apply.c:4303
+#: apply.c:4285
#, c-format
msgid "unable to remove %s from index"
msgstr "不能從索引中移除 %s"
-#: apply.c:4337
+#: apply.c:4319
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模組 %s 損壞的修補檔"
-#: apply.c:4343
+#: apply.c:4325
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能對建立檔案 '%s' 呼叫 stat"
-#: apply.c:4351
+#: apply.c:4333
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能為建立檔案 %s 建立後端儲存"
-#: apply.c:4357 apply.c:4502
+#: apply.c:4339 apply.c:4484
#, c-format
msgid "unable to add cache entry for %s"
msgstr "無法為 %s 新增快取條目"
-#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
#: builtin/gc.c:2293
#, c-format
msgid "failed to write to '%s'"
msgstr "寫入 '%s' 失敗"
-#: apply.c:4404
+#: apply.c:4386
#, c-format
msgid "closing file '%s'"
msgstr "關閉檔案 '%s'"
-#: apply.c:4474
+#: apply.c:4456
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能寫入檔案 '%s' 權限 %o"
-#: apply.c:4572
+#: apply.c:4554
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功套用修補檔 %s。"
-#: apply.c:4580
+#: apply.c:4562
msgid "internal error"
msgstr "內部錯誤"
-#: apply.c:4583
+#: apply.c:4565
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "套用 %%s 個修補檔,其中 %d 個被拒絕..."
-#: apply.c:4594
+#: apply.c:4576
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 檔案名為 %.*s.rej"
-#: apply.c:4602
+#: apply.c:4584
#, c-format
msgid "cannot open %s"
msgstr "不能開啟 %s"
-#: apply.c:4616
+#: apply.c:4598
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "成功套用第 #%d 個區塊。"
-#: apply.c:4620
+#: apply.c:4602
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒絕第 #%d 個區塊。"
-#: apply.c:4749
+#: apply.c:4731
#, c-format
msgid "Skipped patch '%s'."
msgstr "略過修補檔 '%s'。"
-#: apply.c:4758
+#: apply.c:4740
msgid "No valid patches in input (allow with \"--allow-empty\")"
msgstr "輸入中沒有有效的修補檔內容(傳入「--allow-empty」允許)"
-#: apply.c:4779
+#: apply.c:4761
msgid "unable to read index file"
msgstr "無法讀取索引檔案"
-#: apply.c:4936
+#: apply.c:4918
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能開啟修補檔 '%s':%s"
-#: apply.c:4963
+#: apply.c:4945
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 個空白字元誤用"
-#: apply.c:4969 apply.c:4984
+#: apply.c:4951 apply.c:4966
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字元誤用。"
-#: apply.c:4977
+#: apply.c:4959
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修復空白錯誤後,套用了 %d 行。"
-#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
+#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "無法寫入新索引檔案"
-#: apply.c:5021
+#: apply.c:5003
msgid "don't apply changes matching the given path"
msgstr "不要套用符合提供路徑的變更"
-#: apply.c:5024
+#: apply.c:5006
msgid "apply changes matching the given path"
msgstr "套用符合提供路徑的變更"
-#: apply.c:5026 builtin/am.c:2376
+#: apply.c:5008 builtin/am.c:2379
msgid "num"
msgstr "數字"
-#: apply.c:5027
+#: apply.c:5009
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線"
-#: apply.c:5030
+#: apply.c:5012
msgid "ignore additions made by the patch"
msgstr "忽略修補檔中的新增的檔案"
-#: apply.c:5032
+#: apply.c:5014
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不套用修補檔,而是顯示輸入的差異統計(diffstat)"
-#: apply.c:5036
+#: apply.c:5018
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十進位數顯示新增和刪除的行數"
-#: apply.c:5038
+#: apply.c:5020
msgid "instead of applying the patch, output a summary for the input"
msgstr "不套用修補檔,而是顯示輸入的概要"
-#: apply.c:5040
+#: apply.c:5022
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不套用修補檔,而是檢視修補檔是否可套用"
-#: apply.c:5042
+#: apply.c:5024
msgid "make sure the patch is applicable to the current index"
msgstr "確認修補檔可以套用到目前索引"
-#: apply.c:5044
+#: apply.c:5026
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"
-#: apply.c:5046
+#: apply.c:5028
msgid "apply a patch without touching the working tree"
msgstr "套用修補檔而不修改工作區"
-#: apply.c:5048
+#: apply.c:5030
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作區之外檔案的修補檔"
-#: apply.c:5051
+#: apply.c:5033
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "還套用此修補檔(與 --stat/--summary/--check 選項同時使用)"
-#: apply.c:5053
+#: apply.c:5035
msgid "attempt three-way merge, fall back on normal patch if that fails"
msgstr "嘗試三方合併。如果失敗,則回到正常修補檔 (patch) 模式"
-#: apply.c:5055
+#: apply.c:5037
msgid "build a temporary index based on embedded index information"
msgstr "建立一個暫時索引基於嵌入的索引訊息"
-#: apply.c:5058 builtin/checkout-index.c:196
+#: apply.c:5040 builtin/checkout-index.c:230
msgid "paths are separated with NUL character"
msgstr "路徑以 NUL 字元分隔"
-#: apply.c:5060
+#: apply.c:5042
msgid "ensure at least <n> lines of context match"
msgstr "確保至少符合 <n> 行上下文"
-#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
+#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
-#: builtin/rebase.c:1051
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
+#: builtin/rebase.c:1079
msgid "action"
msgstr "動作"
-#: apply.c:5062
+#: apply.c:5044
msgid "detect new or modified lines that have whitespace errors"
msgstr "檢查新增和修改的行中間的空白字元濫用"
-#: apply.c:5065 apply.c:5068
+#: apply.c:5047 apply.c:5050
msgid "ignore changes in whitespace when finding context"
msgstr "尋找上下文時忽略空白字元的變更"
-#: apply.c:5071
+#: apply.c:5053
msgid "apply the patch in reverse"
msgstr "反向套用修補檔"
-#: apply.c:5073
+#: apply.c:5055
msgid "don't expect at least one line of context"
msgstr "無需至少一行上下文"
-#: apply.c:5075
+#: apply.c:5057
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中"
-#: apply.c:5077
+#: apply.c:5059
msgid "allow overlapping hunks"
msgstr "允許重疊的修補檔區塊"
-#: apply.c:5080
+#: apply.c:5062
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允許不正確的檔案末尾換行符號"
-#: apply.c:5083
+#: apply.c:5065
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任修補檔區塊的標頭訊息中的行號"
-#: apply.c:5085 builtin/am.c:2364
+#: apply.c:5067 builtin/am.c:2367
msgid "root"
msgstr "根目錄"
-#: apply.c:5086
+#: apply.c:5068
msgid "prepend <root> to all filenames"
msgstr "為所有檔案名前新增 <根目錄>"
-#: apply.c:5089
+#: apply.c:5071
msgid "don't return error for empty patches"
msgstr "遇到空白修補檔時不回傳錯誤"
-#: archive-tar.c:125 archive-zip.c:345
+#: archive-tar.c:125 archive-zip.c:346
#, c-format
msgid "cannot stream blob %s"
msgstr "不能開啟資料物件 %s"
-#: archive-tar.c:265 archive-zip.c:358
+#: archive-tar.c:265 archive-zip.c:359
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "不支援的檔案模式:0%o (SHA1: %s)"
msgid "'%s' filter reported error"
msgstr "'%s' 過濾器報告了錯誤"
-#: archive-zip.c:318
+#: archive-zip.c:319
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "路徑不是有效的 UTF-8:%s"
-#: archive-zip.c:322
+#: archive-zip.c:323
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "路徑太長(%d 字元,SHA1:%s):%s"
-#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
#, c-format
msgid "deflate error (%d)"
msgstr "壓縮錯誤 (%d)"
-#: archive-zip.c:603
+#: archive-zip.c:604
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "對於本系統時間戳太大:%<PRIuMAX>"
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<選項>] <樹或提交> [<路徑>...]"
-#: archive.c:15
-msgid "git archive --list"
-msgstr "git archive --list"
-
#: archive.c:16
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr "git archive --remote <版本庫> [--exec <命令>] --list"
#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
-#: builtin/tag.c:578
+#: builtin/tag.c:579
#, c-format
msgid "cannot read '%s'"
msgstr "不能讀取 '%s'"
-#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路徑規格 '%s' 未符合任何檔案"
msgid "archive format"
msgstr "歸檔格式"
-#: archive.c:552 builtin/log.c:1790
+#: archive.c:552 builtin/log.c:1809
msgid "prefix"
msgstr "前綴"
msgid "prepend prefix to each pathname in the archive"
msgstr "為歸檔中每個路徑名加上前綴"
-#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
-#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
+#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
+#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
-#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
-#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
+#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
msgid "file"
msgstr "檔案"
msgid "list supported archive formats"
msgstr "列出支援的歸檔格式"
-#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
+#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
msgid "repo"
msgstr "版本庫"
msgid "Unexpected option --remote"
msgstr "未知參數 --remote"
-#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
-#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
-#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
-#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
-#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
+#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
+#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
+#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
+#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
+#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
#: http-fetch.c:153
#, c-format
msgid "the option '%s' requires '%s'"
msgid "Argument not supported for format '%s': -%d"
msgstr "參數不支援此格式 '%s':-%d"
-#: attr.c:203
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一個有效的屬性名"
-#: attr.c:364
+#: attr.c:363
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "不允許 %s:%s:%d"
-#: attr.c:404
+#: attr.c:403
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgid "We cannot bisect more!\n"
msgstr "我們無法進行更多的二分搜尋!\n"
-#: bisect.c:764
+#: bisect.c:765
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一個有效的提交名 %s"
-#: bisect.c:789
+#: bisect.c:790
#, c-format
msgid ""
"The merge base %s is bad.\n"
"合併基礎 %s 是壞的。\n"
"這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"
-#: bisect.c:794
+#: bisect.c:795
#, c-format
msgid ""
"The merge base %s is new.\n"
"合併基礎 %s 是新的。\n"
"介於 %s 和 [%s] 之間的屬性已經被修改。\n"
-#: bisect.c:799
+#: bisect.c:800
#, c-format
msgid ""
"The merge base %s is %s.\n"
"合併基礎 %s 是 %s。\n"
"這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n"
-#: bisect.c:807
+#: bisect.c:808
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"這種情況下 git 二分搜尋無法正常工作。\n"
"您可能弄錯了 %s 和 %s 版本?\n"
-#: bisect.c:820
+#: bisect.c:821
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n"
"我們仍舊繼續。"
-#: bisect.c:859
+#: bisect.c:860
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分搜尋中:合併基礎必須是經過測試的\n"
-#: bisect.c:909
+#: bisect.c:910
#, c-format
msgid "a %s revision is needed"
msgstr "需要一個 %s 版本"
-#: bisect.c:939
+#: bisect.c:940
#, c-format
msgid "could not create file '%s'"
msgstr "不能建立檔案 '%s'"
-#: bisect.c:985 builtin/merge.c:155
+#: bisect.c:986 builtin/merge.c:155
#, c-format
msgid "could not read file '%s'"
msgstr "不能讀取檔案 '%s'"
-#: bisect.c:1025
+#: bisect.c:1026
msgid "reading bisect refs failed"
msgstr "讀取二分搜尋引用失敗"
-#: bisect.c:1055
+#: bisect.c:1056
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同時為 %s 和 %s\n"
-#: bisect.c:1064
+#: bisect.c:1065
#, c-format
msgid ""
"No testable commit found.\n"
"沒找到能夠測試的提交。\n"
"可能是執行傳入的路徑引數是錯誤的?\n"
-#: bisect.c:1093
+#: bisect.c:1094
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1099
+#: bisect.c:1100
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "二分搜尋中:在此之後,還剩 %d 個版本待測試 %s\n"
-#: blame.c:2776
+#: blame.c:2773
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: blame.c:2790
+#: blame.c:2787
msgid "cannot use --contents with final commit object name"
msgstr "不能將 --contents 和最終的提交物件名共用"
-#: blame.c:2811
+#: blame.c:2808
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
-#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
-#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
-#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
-#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
+#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
+#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
+#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
+#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "版本遍歷設定失敗"
-#: blame.c:2838
+#: blame.c:2835
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用,需要第一祖先鏈上的提交範圍"
-#: blame.c:2849
+#: blame.c:2846
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中無此路徑 %1$s"
-#: blame.c:2860
+#: blame.c:2857
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能為路徑 %2$s 讀取資料物件 %1$s"
-#: branch.c:77
+#: branch.c:93
msgid ""
"cannot inherit upstream tracking configuration of multiple refs when "
"rebasing is requested"
msgstr "請求重定基底時,無法繼承多個參照的上游追蹤設定"
-#: branch.c:88
+#: branch.c:104
#, c-format
msgid "not setting branch '%s' as its own upstream"
msgstr "未將「%s」分支設定為其自己的上游"
-#: branch.c:144
+#: branch.c:160
#, c-format
msgid "branch '%s' set up to track '%s' by rebasing."
msgstr "已將「%s」分支設定為透過重定基底追蹤「%s」。"
-#: branch.c:145
+#: branch.c:161
#, c-format
msgid "branch '%s' set up to track '%s'."
msgstr "已將「%s」分支設定為追蹤「%s」。"
-#: branch.c:148
+#: branch.c:164
#, c-format
msgid "branch '%s' set up to track:"
msgstr "「%s」分支已設定追蹤:"
-#: branch.c:160
+#: branch.c:176
msgid "unable to write upstream branch configuration"
msgstr "無法寫入上游分支設定"
-#: branch.c:162
+#: branch.c:178
msgid ""
"\n"
"After fixing the error cause you may try to fix up\n"
"修正錯誤後,您可以執行下述命令\n"
"命令修正遠端追蹤資訊:"
-#: branch.c:203
+#: branch.c:219
#, c-format
msgid "asked to inherit tracking from '%s', but no remote is set"
msgstr "請求繼承「%s」的追蹤設定,但未設定遠端"
-#: branch.c:209
+#: branch.c:225
#, c-format
msgid "asked to inherit tracking from '%s', but no merge configuration is set"
msgstr "請求繼承「%s」的追蹤設定,但未設定合併設定"
-#: branch.c:252
+#: branch.c:277
+#, c-format
+msgid "not tracking: ambiguous information for ref '%s'"
+msgstr "未追蹤:「%s」引用有歧義"
+
+# 譯者:為保證在輸出中對齊,注意調整句中空格!
+#. TRANSLATORS: This is a line listing a remote with duplicate
+#. refspecs in the advice message below. For RTL languages you'll
+#. probably want to swap the "%s" and leading " " space around.
+#.
+#. TRANSLATORS: This is line item of ambiguous object output
+#. from describe_ambiguous_object() above. For RTL languages
+#. you'll probably want to swap the "%s" and leading " " space
+#. around.
+#.
+#: branch.c:289 object-name.c:464
+#, c-format
+msgid " %s\n"
+msgstr " %s\n"
+
+#. TRANSLATORS: The second argument is a \n-delimited list of
+#. duplicate refspecs, composed above.
+#.
+#: branch.c:295
#, c-format
-msgid "not tracking: ambiguous information for ref %s"
-msgstr "未追蹤:%s 引用有歧義"
+msgid ""
+"There are multiple remotes whose fetch refspecs map to the remote\n"
+"tracking ref '%s':\n"
+"%s\n"
+"This is typically a configuration error.\n"
+"\n"
+"To support setting up tracking branches, ensure that\n"
+"different remotes' fetch refspecs map into different\n"
+"tracking namespaces."
+msgstr ""
+"有多個遠端的抓取引用規格映射到遠端追蹤引用「%s」的規格:\n"
+"%s\n"
+"這通常是設定錯誤。\n"
+"\n"
+"若要支援設定追蹤分支,請確定不同遠端的抓取引用規格\n"
+"映射到不同的追蹤命名空間。"
-#: branch.c:287
+#: branch.c:344
#, c-format
msgid "'%s' is not a valid branch name"
msgstr "「%s」不是一個有效的分支名稱"
-#: branch.c:307
+#: branch.c:364
#, c-format
msgid "a branch named '%s' already exists"
msgstr "已有同名「%s」分支"
-#: branch.c:313
+#: branch.c:370
#, c-format
msgid "cannot force update the branch '%s' checked out at '%s'"
msgstr "無法強制更新在「%2$s」簽出的「%1$s」分支"
-#: branch.c:336
+#: branch.c:393
#, c-format
msgid "cannot set up tracking information; starting point '%s' is not a branch"
msgstr "無法設定追蹤資訊:起始點「%s」不是分支"
-#: branch.c:338
+#: branch.c:395
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "請求的上游分支 '%s' 不存在"
-#: branch.c:340
+#: branch.c:397
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"且建立兩個分支間的追蹤關係,\n"
"您可能需要使用「git push -u」推送分支並設定和上游的關聯。"
-#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
#: builtin/replace.c:423 builtin/replace.c:453
#, c-format
msgid "not a valid object name: '%s'"
msgstr "不是一個有效的物件名:'%s'"
-#: branch.c:404
+#: branch.c:465
#, c-format
msgid "ambiguous object name: '%s'"
msgstr "物件名稱有歧義:「%s」"
-#: branch.c:409
+#: branch.c:470
#, c-format
msgid "not a valid branch point: '%s'"
msgstr "無效的分支點:「%s」"
-#: branch.c:469
+#: branch.c:658
+#, c-format
+msgid "submodule '%s': unable to find submodule"
+msgstr "「%s」子模組:找不到子模組"
+
+#: branch.c:661
+#, c-format
+msgid ""
+"You may try updating the submodules using 'git checkout %s && git submodule "
+"update --init'"
+msgstr ""
+"您可以嘗試使用「git checkout %s && git submodule update --init」命令更新子模"
+"組"
+
+#: branch.c:672 branch.c:698
+#, c-format
+msgid "submodule '%s': cannot create branch '%s'"
+msgstr "「%s」子模組:無法建立「%s」分支"
+
+#: branch.c:730
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已經簽出到 '%s'"
-#: branch.c:494
+#: branch.c:755
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作區 %s 的 HEAD 指向沒有被更新"
-#: bundle.c:44
+#: bundle.c:45
#, c-format
msgid "unrecognized bundle hash algorithm: %s"
-msgstr "ç\84¡æ³\95è\98å\88¥ç\9a\84å\8c\85雜湊演算法:%s"
+msgstr "ç\84¡æ³\95è\98å\88¥ç\9a\84å¥\97件雜湊演算法:%s"
-#: bundle.c:48
+#: bundle.c:53
#, c-format
msgid "unknown capability '%s'"
msgstr "未知功能 '%s'"
-#: bundle.c:74
+#: bundle.c:79
#, c-format
msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' ä¸\8då\83\8fæ\98¯ä¸\80å\80\8b v2 æ\88\96 v3 ç\89\88æ\9c¬ç\9a\84å\8c\85檔案"
+msgstr "'%s' ä¸\8då\83\8fæ\98¯ä¸\80å\80\8b v2 æ\88\96 v3 ç\89\88æ\9c¬ç\9a\84å¥\97件檔案"
-#: bundle.c:113
+#: bundle.c:118
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "無法識別的包頭:%s%s (%d)"
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
-#: builtin/commit.c:862
+#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
+#: builtin/commit.c:865
#, c-format
msgid "could not open '%s'"
msgstr "不能開啟 '%s'"
-#: bundle.c:198
+#: bundle.c:203
msgid "Repository lacks these prerequisite commits:"
msgstr "版本庫中缺少這些必備的提交:"
-#: bundle.c:201
+#: bundle.c:206
msgid "need a repository to verify a bundle"
-msgstr "需要版本庫驗證一個包"
+msgstr "需要版本庫驗證套件"
-#: bundle.c:257
+#: bundle.c:264
#, c-format
msgid "The bundle contains this ref:"
-msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "é\80\99å\80\8bå\8c\85ä¸å\90«æ\9c\89é\80\99 %d 個引用:"
+msgid_plural "The bundle contains these %<PRIuMAX> refs:"
+msgstr[0] "é\80\99å\80\8bå¥\97件å\90«æ\9c\89é\80\99 %<PRIuMAX> 個引用:"
-#: bundle.c:264
+#: bundle.c:272
msgid "The bundle records a complete history."
-msgstr "é\80\99å\80\8bå\8c\85è¨\98é\8c\84ä¸\80å\80\8bå®\8cæ\95´æ·å\8f²。"
+msgstr "é\80\99å\80\8bå¥\97件è¨\98é\8c\84å®\8cæ\95´æ·å\8f²ç´\80é\8c\84。"
-#: bundle.c:266
+#: bundle.c:274
#, c-format
msgid "The bundle requires this ref:"
-msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "é\80\99å\80\8bå\8c\85é\9c\80è¦\81é\80\99 %d 個引用:"
+msgid_plural "The bundle requires these %<PRIuMAX> refs:"
+msgstr[0] "é\80\99å\80\8bå¥\97件é\9c\80è¦\81é\80\99 %<PRIuMAX> 個引用:"
-#: bundle.c:333
+#: bundle.c:350
msgid "unable to dup bundle descriptor"
-msgstr "無法複製 bundle 描述符"
+msgstr "無法複製套件描述符"
-#: bundle.c:340
+#: bundle.c:357
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 進程"
-#: bundle.c:351
+#: bundle.c:368
msgid "pack-objects died"
msgstr "pack-objects 終止"
-#: bundle.c:400
+#: bundle.c:417
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 選項排除"
-#: bundle.c:504
+#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
#, c-format
-msgid "unsupported bundle version %d"
-msgstr "不支援的包版本 %d"
+msgid "unrecognized argument: %s"
+msgstr "無法識別的參數:%s"
-#: bundle.c:506
+#: bundle.c:548
#, c-format
-msgid "cannot write bundle version %d with algorithm %s"
-msgstr "無法寫入 %2$s 演算法的包版本 %1$d"
+msgid "unsupported bundle version %d"
+msgstr "不支援的套件版本 %d"
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
+#: bundle.c:550
#, c-format
-msgid "unrecognized argument: %s"
-msgstr "無法識別的參數:%s"
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "無法寫入 %2$s 演算法的套件版本 %1$d"
-#: bundle.c:553
+#: bundle.c:600
msgid "Refusing to create empty bundle."
-msgstr "ä¸\8dè\83½å»ºç«\8b空å\8c\85。"
+msgstr "ä¸\8dè\83½å»ºç«\8b空å¥\97件。"
-#: bundle.c:563
+#: bundle.c:610
#, c-format
msgid "cannot create '%s'"
msgstr "不能建立 '%s'"
-#: bundle.c:588
+#: bundle.c:639
msgid "index-pack died"
msgstr "index-pack 終止"
msgid "invalid color value: %.*s"
msgstr "無效的顏色值:%.*s"
-#: commit-graph.c:204 midx.c:51
+#: commit-graph.c:204 midx.c:52
msgid "invalid hash version"
msgstr "無效的雜湊版本"
msgid "commit-graph file is too small to hold %u chunks"
msgstr "commit-graph 檔案不夠放置 %u 個區塊"
-#: commit-graph.c:482
+#: commit-graph.c:485
msgid "commit-graph has no base graphs chunk"
msgstr "提交圖形沒有基礎圖形區塊"
-#: commit-graph.c:492
+#: commit-graph.c:495
msgid "commit-graph chain does not match"
msgstr "提交圖形鏈不符合"
-#: commit-graph.c:540
+#: commit-graph.c:543
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr "無效的提交圖形鏈:行 '%s' 不是一個雜湊值"
-#: commit-graph.c:564
+#: commit-graph.c:567
msgid "unable to find all commit-graph files"
msgstr "無法找到所有提交圖形檔案"
-#: commit-graph.c:749 commit-graph.c:786
+#: commit-graph.c:752 commit-graph.c:789
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "無效的提交位置。提交圖形可能已損壞"
-#: commit-graph.c:770
+#: commit-graph.c:773
#, c-format
msgid "could not find commit %s"
msgstr "無法找到提交 %s"
-#: commit-graph.c:803
+#: commit-graph.c:806
msgid "commit-graph requires overflow generation data but has none"
msgstr "提交圖需要比目前更多的世代資料,但沒有相關資料"
-#: commit-graph.c:1108 builtin/am.c:1369
+#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
+#: builtin/clone.c:705
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: commit-graph.c:1370 builtin/pack-objects.c:3070
+#: commit-graph.c:1373 builtin/pack-objects.c:3078
#, c-format
msgid "unable to get type of object %s"
msgstr "無法獲得物件 %s 類型"
-#: commit-graph.c:1401
+#: commit-graph.c:1404
msgid "Loading known commits in commit graph"
msgstr "正在載入提交圖中的已知提交"
-#: commit-graph.c:1418
+#: commit-graph.c:1421
msgid "Expanding reachable commits in commit graph"
msgstr "正在展開提交圖中的可以取得的提交"
-#: commit-graph.c:1438
+#: commit-graph.c:1441
msgid "Clearing commit marks in commit graph"
msgstr "正在清除提交圖中的提交標記"
-#: commit-graph.c:1457
+#: commit-graph.c:1460
msgid "Computing commit graph topological levels"
msgstr "正在計算提交圖拓樸級別"
-#: commit-graph.c:1510
+#: commit-graph.c:1513
msgid "Computing commit graph generation numbers"
msgstr "正在計算提交圖世代數字"
-#: commit-graph.c:1591
+#: commit-graph.c:1598
msgid "Computing commit changed paths Bloom filters"
msgstr "正在計算提交變更路徑的布隆過濾器"
-#: commit-graph.c:1668
+#: commit-graph.c:1675
msgid "Collecting referenced commits"
msgstr "正在收集引用提交"
-#: commit-graph.c:1693
+#: commit-graph.c:1701
#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "正在 %d 個包中尋找提交圖的提交"
+msgid "Finding commits for commit graph in %<PRIuMAX> pack"
+msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
+msgstr[0] "正在從 %<PRIuMAX> 個包中尋找提交圖的提交"
-#: commit-graph.c:1706
+#: commit-graph.c:1714
#, c-format
msgid "error adding pack %s"
msgstr "新增包 %s 發生錯誤"
-#: commit-graph.c:1710
+#: commit-graph.c:1718
#, c-format
msgid "error opening index for %s"
msgstr "為 %s 開啟索引發生錯誤"
-#: commit-graph.c:1747
+#: commit-graph.c:1756
msgid "Finding commits for commit graph among packed objects"
msgstr "正在打包物件中尋找提交圖的提交"
-#: commit-graph.c:1765
+#: commit-graph.c:1774
msgid "Finding extra edges in commit graph"
msgstr "正在尋找提交圖中額外的邊"
-#: commit-graph.c:1814
+#: commit-graph.c:1823
msgid "failed to write correct number of base graph ids"
msgstr "無法寫入正確數量的基礎圖形 ID"
-#: commit-graph.c:1845 midx.c:1149
+#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能為 %s 建立先導目錄"
-#: commit-graph.c:1858
+#: commit-graph.c:1868
msgid "unable to create temporary graph layer"
msgstr "無法建立暫時的圖形層"
-#: commit-graph.c:1863
+#: commit-graph.c:1873
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr "無法調整「%s」的共用權限"
-#: commit-graph.c:1920
+#: commit-graph.c:1930
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "正在用 %d 步寫出提交圖"
-#: commit-graph.c:1956
+#: commit-graph.c:1967
msgid "unable to open commit-graph chain file"
msgstr "無法開啟提交圖形鏈檔案"
-#: commit-graph.c:1972
+#: commit-graph.c:1983
msgid "failed to rename base commit-graph file"
msgstr "無法重新命名基礎提交圖形檔案"
-#: commit-graph.c:1992
+#: commit-graph.c:2004
msgid "failed to rename temporary commit-graph file"
msgstr "無法重新命名暫時提交圖形檔案"
-#: commit-graph.c:2125
+#: commit-graph.c:2137
msgid "Scanning merged commits"
msgstr "正在掃描合併提交"
-#: commit-graph.c:2169
+#: commit-graph.c:2181
msgid "Merging commit-graph"
msgstr "正在合併提交圖形"
-#: commit-graph.c:2277
+#: commit-graph.c:2289
msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
msgstr "嘗試寫入提交圖形,但 “core.commitGraph” 已被停用"
-#: commit-graph.c:2384
+#: commit-graph.c:2396
msgid "too many commits to write graph"
msgstr "提交太多不能畫圖"
-#: commit-graph.c:2482
+#: commit-graph.c:2494
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交圖檔案的總和檢查碼錯誤,可能已經損壞"
-#: commit-graph.c:2492
+#: commit-graph.c:2504
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "提交圖形的物件 ID 順序不正確:%s 然後 %s"
-#: commit-graph.c:2502 commit-graph.c:2517
+#: commit-graph.c:2514 commit-graph.c:2529
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "提交圖形有不正確的扇出值:fanout[%d] = %u != %u"
-#: commit-graph.c:2509
+#: commit-graph.c:2521
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "無法從提交圖形中解析提交 %s"
-#: commit-graph.c:2527
+#: commit-graph.c:2539
msgid "Verifying commits in commit graph"
msgstr "正在驗證提交圖中的提交"
-#: commit-graph.c:2542
+#: commit-graph.c:2554
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr "無法從提交圖形的物件庫中解析提交 %s"
-#: commit-graph.c:2549
+#: commit-graph.c:2561
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
-#: commit-graph.c:2559
+#: commit-graph.c:2571
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "提交 %s 的提交圖形父提交列表太長了"
-#: commit-graph.c:2568
+#: commit-graph.c:2580
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s 的提交圖形父提交是 %s != %s"
-#: commit-graph.c:2582
+#: commit-graph.c:2594
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "提交 %s 的提交圖形父提交列表過早終止"
-#: commit-graph.c:2587
+#: commit-graph.c:2599
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr "提交圖形中提交 %s 的世代號是零,但其它地方非零"
-#: commit-graph.c:2591
+#: commit-graph.c:2603
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr "提交圖形中提交 %s 的世代號非零,但其它地方是零"
-#: commit-graph.c:2608
+#: commit-graph.c:2620
#, c-format
msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"
-#: commit-graph.c:2614
+#: commit-graph.c:2626
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
-#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
-#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
+#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
+#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
-#: commit.c:55
+#: commit.c:56
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一個提交!"
-#: commit.c:196
+#: commit.c:197
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"設定 \"git config advice.graftFileDeprecated false\"\n"
"可關閉本消息"
-#: commit.c:1241
+#: commit.c:1252
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
-#: commit.c:1245
+#: commit.c:1256
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
-#: commit.c:1248
+#: commit.c:1259
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 沒有 GPG 簽名。"
-#: commit.c:1251
+#: commit.c:1262
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
-#: commit.c:1505
+#: commit.c:1516
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "memory exhausted"
msgstr "記憶體耗盡"
-#: config.c:125
+#: compat/terminal.c:167
+msgid "cannot resume in the background, please use 'fg' to resume"
+msgstr "無法在背景繼續;請使用 “fg” 繼續"
+
+#: compat/terminal.c:168
+msgid "cannot restore terminal settings"
+msgstr "無法復原終端機設定"
+
+#: config.c:143
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"\t%2$s\n"
"這可能是因為循環包含。"
-#: config.c:141
+#: config.c:159
#, c-format
msgid "could not expand include path '%s'"
msgstr "無法展開包含路徑 '%s'"
-#: config.c:152
+#: config.c:170
msgid "relative config includes must come from files"
msgstr "相對路徑的設定檔案引用必須來自於檔案"
-#: config.c:201
+#: config.c:219
msgid "relative config include conditionals must come from files"
msgstr "相對路徑的設定檔案條件引用必須來自於檔案"
-#: config.c:398
+#: config.c:364
+msgid ""
+"remote URLs cannot be configured in file directly or indirectly included by "
+"includeIf.hasconfig:remote.*.url"
+msgstr ""
+"無法在檔案設定遠端 URL,無論是直接或間接透過 includeIf.hasconfig:remote.*."
+"url 引入"
+
+#: config.c:508
#, c-format
msgid "invalid config format: %s"
msgstr "無效的設定檔格式:%s"
-#: config.c:402
+#: config.c:512
#, c-format
msgid "missing environment variable name for configuration '%.*s'"
msgstr "缺少「%.*s」組態設定的環境變數名稱"
-#: config.c:407
+#: config.c:517
#, c-format
msgid "missing environment variable '%s' for configuration '%.*s'"
msgstr "缺少環境變數「%s」(於「%.*s」組態設定)"
-#: config.c:443
+#: config.c:553
#, c-format
msgid "key does not contain a section: %s"
msgstr "鍵名沒有包含一個小節名稱:%s"
-#: config.c:448
+#: config.c:558
#, c-format
msgid "key does not contain variable name: %s"
msgstr "鍵名沒有包含變數名:%s"
-#: config.c:470 sequencer.c:2806
+#: config.c:580 sequencer.c:2802
#, c-format
msgid "invalid key: %s"
msgstr "無效鍵名:%s"
-#: config.c:475
+#: config.c:585
#, c-format
msgid "invalid key (newline): %s"
msgstr "無效鍵名(有換行符號):%s"
-#: config.c:495
+#: config.c:605
msgid "empty config key"
msgstr "空白設定鍵"
-#: config.c:513 config.c:525
+#: config.c:623 config.c:635
#, c-format
msgid "bogus config parameter: %s"
msgstr "偽設定參數:%s"
-#: config.c:539 config.c:556 config.c:563 config.c:572
+#: config.c:649 config.c:666 config.c:673 config.c:682
#, c-format
msgid "bogus format in %s"
msgstr "%s 中格式錯誤"
-#: config.c:606
+#: config.c:716
#, c-format
msgid "bogus count in %s"
msgstr "%s 中有偽計數"
-#: config.c:610
+#: config.c:720
#, c-format
msgid "too many entries in %s"
msgstr "%s 中的項目過多"
-#: config.c:620
+#: config.c:730
#, c-format
msgid "missing config key %s"
msgstr "缺少 %s 設定鍵"
-#: config.c:628
+#: config.c:738
#, c-format
msgid "missing config value %s"
msgstr "缺少 %s 設定值"
-#: config.c:979
+#: config.c:1089
#, c-format
msgid "bad config line %d in blob %s"
msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"
-#: config.c:983
+#: config.c:1093
#, c-format
msgid "bad config line %d in file %s"
msgstr "檔案 %2$s 中錯誤的設定行 %1$d"
-#: config.c:987
+#: config.c:1097
#, c-format
msgid "bad config line %d in standard input"
msgstr "標準輸入中錯誤的設定行 %d"
-#: config.c:991
+#: config.c:1101
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d"
-#: config.c:995
+#: config.c:1105
#, c-format
msgid "bad config line %d in command line %s"
msgstr "指令列 %2$s 中錯誤的設定行 %1$d"
-#: config.c:999
+#: config.c:1109
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中錯誤的設定行 %1$d"
-#: config.c:1136
+#: config.c:1246
msgid "out of range"
msgstr "超出範圍"
-#: config.c:1136
+#: config.c:1246
msgid "invalid unit"
msgstr "無效的單位"
-#: config.c:1137
+#: config.c:1247
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤:%3$s"
-#: config.c:1147
+#: config.c:1257
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s':%4$s"
-#: config.c:1150
+#: config.c:1260
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s':%4$s"
-#: config.c:1153
+#: config.c:1263
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s':%3$s"
-#: config.c:1156
+#: config.c:1266
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s':%4$s"
-#: config.c:1159
+#: config.c:1269
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s':%4$s"
-#: config.c:1162
+#: config.c:1272
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s':%4$s"
-#: config.c:1241
+#: config.c:1368
+#, c-format
+msgid "invalid value for variable %s"
+msgstr "%s 變數的值無效"
+
+#: config.c:1389
+#, c-format
+msgid "ignoring unknown core.fsync component '%s'"
+msgstr "忽略未知的 core.fsync 組件「%s」"
+
+#: config.c:1425
#, c-format
msgid "bad boolean config value '%s' for '%s'"
msgstr "「%2$s」的「%1$s」布林設定值無效"
-#: config.c:1259
+#: config.c:1443
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "無法展開使用者目錄於:’%s’"
-#: config.c:1268
+#: config.c:1452
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳"
-#: config.c:1361
+#: config.c:1545
#, c-format
msgid "abbrev length out of range: %d"
msgstr "縮寫長度超出範圍:%d"
-#: config.c:1375 config.c:1386
+#: config.c:1559 config.c:1570
#, c-format
msgid "bad zlib compression level %d"
msgstr "錯誤的 zlib 壓縮級別 %d"
-#: config.c:1476
+#: config.c:1660
msgid "core.commentChar should only be one character"
msgstr "core.commentChar 應該是一個字元"
-#: config.c:1509
+#: config.c:1692
+#, c-format
+msgid "ignoring unknown core.fsyncMethod value '%s'"
+msgstr "忽略未知的 core.fsyncMethod 值「%s」"
+
+#: config.c:1698
+msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
+msgstr "core.fsyncObjectFiles 已被取代。請改用 core.fsync"
+
+#: config.c:1714
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "無效的物件建立模式:%s"
-#: config.c:1584
+#: config.c:1800
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式錯誤"
-#: config.c:1610
+#: config.c:1826
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式錯誤:%s"
-#: config.c:1611
+#: config.c:1827
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必須是其中之一:nothing、matching、simple、upstream 或 current"
-#: config.c:1672 builtin/pack-objects.c:4053
+#: config.c:1888 builtin/pack-objects.c:4078
#, c-format
msgid "bad pack compression level %d"
msgstr "錯誤的打包壓縮級別 %d"
-#: config.c:1795
+#: config.c:2014
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "無法從資料物件 '%s' 載入設定"
-#: config.c:1798
+#: config.c:2017
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 沒有指向一個資料物件"
-#: config.c:1816
+#: config.c:2035
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析設定物件 '%s'"
-#: config.c:1861
+#: config.c:2080
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失敗"
-#: config.c:1917
+#: config.c:2136
msgid "unable to parse command-line config"
msgstr "無法解析指令列中的設定"
-#: config.c:2285
+#: config.c:2512
msgid "unknown error occurred while reading the configuration files"
msgstr "在讀取設定檔案時遇到未知錯誤"
-#: config.c:2459
+#: config.c:2686
#, c-format
msgid "Invalid %s: '%s'"
msgstr "無效 %s:'%s'"
-#: config.c:2504
+#: config.c:2731
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"
-#: config.c:2550
+#: config.c:2763
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "無法解析指令列設定中的 '%s'"
-#: config.c:2552
+#: config.c:2765
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"
-#: config.c:2637
+#: config.c:2850
#, c-format
msgid "invalid section name '%s'"
msgstr "無效的小節名稱 '%s'"
-#: config.c:2669
+#: config.c:2882
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多個取值"
-#: config.c:2698
+#: config.c:2911
#, c-format
msgid "failed to write new configuration file %s"
msgstr "寫入新的設定檔案 %s 失敗"
-#: config.c:2950 config.c:3277
+#: config.c:3177 config.c:3518
#, c-format
msgid "could not lock config file %s"
msgstr "不能鎖定設定檔案 %s"
-#: config.c:2961
+#: config.c:3188
#, c-format
msgid "opening %s"
msgstr "開啟 %s"
-#: config.c:2998 builtin/config.c:361
+#: config.c:3225 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "無效模式:%s"
-#: config.c:3023
+#: config.c:3250
#, c-format
msgid "invalid config file %s"
msgstr "無效的設定檔案 %s"
-#: config.c:3036 config.c:3290
+#: config.c:3263 config.c:3531
#, c-format
msgid "fstat on %s failed"
msgstr "對 %s 呼叫 fstat 失敗"
-#: config.c:3047
+#: config.c:3274
#, c-format
msgid "unable to mmap '%s'%s"
msgstr "無法 mmap '%s'%s"
-#: config.c:3057 config.c:3295
+#: config.c:3284 config.c:3536
#, c-format
msgid "chmod on %s failed"
msgstr "對 %s 呼叫 chmod 失敗"
-#: config.c:3142 config.c:3392
+#: config.c:3369 config.c:3633
#, c-format
msgid "could not write config file %s"
msgstr "不能寫入設定檔案 %s"
-#: config.c:3176
+#: config.c:3403
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能設定 '%s' 為 '%s'"
-#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消設定 '%s'"
-#: config.c:3268
+#: config.c:3509
#, c-format
msgid "invalid section name: %s"
msgstr "無效的小節名稱:%s"
-#: config.c:3435
+#: config.c:3676
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺少"
msgid "refusing to work with credential missing protocol field"
msgstr "拒絕使用缺少通訊協定欄位的憑證"
-#: credential.c:395
+#: credential.c:396
#, c-format
msgid "url contains a newline in its %s component: %s"
msgstr "URL 的 %s 部分有換行:%s"
-#: credential.c:439
+#: credential.c:440
#, c-format
msgid "url has no scheme: %s"
msgstr "URL 沒有 Scheme:%s"
-#: credential.c:512
+#: credential.c:513
#, c-format
msgid "credential url cannot be parsed: %s"
msgstr "無法解析憑證 URL:%s"
-#: date.c:138
+#: date.c:139
msgid "in the future"
msgstr "在將來"
-#: date.c:144
+#: date.c:145
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "%<PRIuMAX> 秒鐘前"
-#: date.c:151
+#: date.c:152
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "%<PRIuMAX> 分鐘前"
-#: date.c:158
+#: date.c:159
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "%<PRIuMAX> 小時前"
-#: date.c:165
+#: date.c:166
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "%<PRIuMAX> 天前"
-#: date.c:171
+#: date.c:172
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> 周前"
-#: date.c:178
+#: date.c:179
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> 個月前"
-#: date.c:189
+#: date.c:190
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[0] "%<PRIuMAX> 年"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:192
+#: date.c:193
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s %<PRIuMAX> 個月前"
-#: date.c:197 date.c:202
+#: date.c:198 date.c:203
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgid "Marked %d islands, done.\n"
msgstr "已標記 %d 個資料島,結束。\n"
-#: diff-merges.c:70
+#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
+#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
+#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
+#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
+#: builtin/pull.c:47 builtin/pull.c:321
#, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "--diff-merges 的值無效:%s"
+msgid "invalid value for '%s': '%s'"
+msgstr "「%s」的值無效:「%s」"
#: diff-lib.c:561
msgid "--merge-base does not work with ranges"
msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"
# 譯者:請維持前導空格
-#: diff.c:158
+#: diff.c:159
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 無法解析 dirstat 截止(cut-off)百分比 '%s'\n"
# 譯者:請維持前導空格
-#: diff.c:163
+#: diff.c:164
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 參數 '%s'\n"
-#: diff.c:299
+#: diff.c:300
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-"
"zebra'、'plain'"
-#: diff.c:327
+#: diff.c:328
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
-#: diff.c:335
+#: diff.c:336
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr "color-moved-ws:allow-indentation-change 不能與其它空白字元模式共用"
-#: diff.c:412
+#: diff.c:413
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "設定變數 'diff.submodule' 未知的取值:'%s'"
-#: diff.c:472
+#: diff.c:473
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"發現設定變數 'diff.dirstat' 中的錯誤:\n"
"%s"
-#: diff.c:4237
+#: diff.c:4282
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 離開,停止在 %s"
-#: diff.c:4589
+#: diff.c:4677 parse-options.c:1114
#, c-format
msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
msgstr "「%s」、「%s」、「%s」和「%s」選項不得同時使用"
-#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
#, c-format
msgid "options '%s', '%s', and '%s' cannot be used together"
msgstr "「%s」、「%s」和「%s」選項不得同時使用"
-#: diff.c:4597
+#: diff.c:4685
#, c-format
msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
msgstr "「%s」和「%s」選項不得同時使用,請使用「%s」搭配「%s」"
-#: diff.c:4601
+#: diff.c:4689
#, c-format
msgid ""
"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
msgstr "「%s」和「%s」選項不得同時使用,請使用「%s」搭配「%s」、「%s」"
-#: diff.c:4681
+#: diff.c:4769
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明確要求只跟一個路徑規格"
-#: diff.c:4729
+#: diff.c:4823
#, c-format
msgid "invalid --stat value: %s"
msgstr "無效的 --stat 值:%s"
-#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
+#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
#: parse-options.c:217 parse-options.c:221
#, c-format
msgid "%s expects a numerical value"
msgstr "%s 期望一個數字值"
-#: diff.c:4766
+#: diff.c:4860
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"無法解析 --dirstat/-X 選項的參數:\n"
"%s"
-#: diff.c:4851
+#: diff.c:4893
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
-#: diff.c:4875
+#: diff.c:4917
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之後未知的值"
-#: diff.c:4889
+#: diff.c:4931
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
-#: diff.c:4939 diff.c:4945
+#: diff.c:4981 diff.c:4987
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
-#: diff.c:4957
+#: diff.c:4999
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一個字元,得到 '%s'"
-#: diff.c:4978
+#: diff.c:5020
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "壞的 --color-moved 參數:%s"
-#: diff.c:4997
+#: diff.c:5039
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws 中的無效模式 '%s'"
-#: diff.c:5037
+#: diff.c:5079
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: diff.c:5073 diff.c:5093
+#: diff.c:5115 diff.c:5135
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的參數無效"
-#: diff.c:5197
+#: diff.c:5239
#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr "傳入 -I 的常規表示式無效:「%s」"
-#: diff.c:5246
+#: diff.c:5288
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "無法解析 --submodule 選項的參數:'%s'"
-#: diff.c:5302
+#: diff.c:5344
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "壞的 --word-diff 參數:%s"
-#: diff.c:5338
+#: diff.c:5380
msgid "Diff output format options"
msgstr "差異輸出格式化選項"
-#: diff.c:5340 diff.c:5346
+#: diff.c:5382 diff.c:5388
msgid "generate patch"
msgstr "生成修補檔"
-#: diff.c:5343 builtin/log.c:179
+#: diff.c:5385 builtin/log.c:180
msgid "suppress diff output"
msgstr "不顯示差異輸出"
-#: diff.c:5348 diff.c:5462 diff.c:5469
+#: diff.c:5390 diff.c:5504 diff.c:5511
msgid "<n>"
msgstr "<n>"
-#: diff.c:5349 diff.c:5352
+#: diff.c:5391 diff.c:5394
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差異"
-#: diff.c:5354
+#: diff.c:5396
msgid "generate the diff in raw format"
msgstr "生成原始格式的差異"
-#: diff.c:5357
+#: diff.c:5399
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同義"
-#: diff.c:5361
+#: diff.c:5403
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同義"
-#: diff.c:5365
+#: diff.c:5407
msgid "machine friendly --stat"
msgstr "機器友好的 --stat"
-#: diff.c:5368
+#: diff.c:5410
msgid "output only the last line of --stat"
msgstr "只輸出 --stat 的最後一行"
-#: diff.c:5370 diff.c:5378
+#: diff.c:5412 diff.c:5420
msgid "<param1,param2>..."
msgstr "<參數1,參數2>..."
-#: diff.c:5371
+#: diff.c:5413
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "輸出每個子目錄相對變更的分布"
-#: diff.c:5375
+#: diff.c:5417
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同義"
-#: diff.c:5379
+#: diff.c:5421
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同義詞"
-#: diff.c:5383
+#: diff.c:5425
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果變更中引入衝突定界符或空白錯誤,給出警告"
-#: diff.c:5386
+#: diff.c:5428
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精簡摘要,例如建立、重新命名和模式變更"
-#: diff.c:5389
+#: diff.c:5431
msgid "show only names of changed files"
msgstr "只顯示變更檔案的檔案名"
-#: diff.c:5392
+#: diff.c:5434
msgid "show only names and status of changed files"
msgstr "只顯示變更檔案的檔案名和狀態"
-#: diff.c:5394
+#: diff.c:5436
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"
-#: diff.c:5395
+#: diff.c:5437
msgid "generate diffstat"
msgstr "生成差異統計(diffstat)"
-#: diff.c:5397 diff.c:5400 diff.c:5403
+#: diff.c:5439 diff.c:5442 diff.c:5445
msgid "<width>"
msgstr "<寬度>"
-#: diff.c:5398
+#: diff.c:5440
msgid "generate diffstat with a given width"
msgstr "使用提供的長度生成差異統計"
-#: diff.c:5401
+#: diff.c:5443
msgid "generate diffstat with a given name width"
msgstr "使用提供的檔案名長度生成差異統計"
-#: diff.c:5404
+#: diff.c:5446
msgid "generate diffstat with a given graph width"
msgstr "使用提供的圖形長度生成差異統計"
-#: diff.c:5406
+#: diff.c:5448
msgid "<count>"
msgstr "<次數>"
-#: diff.c:5407
+#: diff.c:5449
msgid "generate diffstat with limited lines"
msgstr "生成有限行數的差異統計"
-#: diff.c:5410
+#: diff.c:5452
msgid "generate compact summary in diffstat"
msgstr "生成差異統計的簡潔摘要"
-#: diff.c:5413
+#: diff.c:5455
msgid "output a binary diff that can be applied"
msgstr "輸出一個可以套用的二進位差異"
-#: diff.c:5416
+#: diff.c:5458
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行顯示完整的前後物件名稱"
-#: diff.c:5418
+#: diff.c:5460
msgid "show colored diff"
msgstr "顯示帶顏色的差異"
-#: diff.c:5419
+#: diff.c:5461
msgid "<kind>"
msgstr "<類型>"
-#: diff.c:5420
+#: diff.c:5462
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "對於差異中的上下文、舊的和新的行,加亮顯示錯誤的空白字元"
-#: diff.c:5423
+#: diff.c:5465
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
"在 --raw 或者 --numstat 中,不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"
"符"
-#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
+#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
msgid "<prefix>"
msgstr "<前綴>"
-#: diff.c:5427
+#: diff.c:5469
msgid "show the given source prefix instead of \"a/\""
msgstr "顯示提供的來源前綴,而非 \"a/\""
-#: diff.c:5430
+#: diff.c:5472
msgid "show the given destination prefix instead of \"b/\""
msgstr "顯示提供的目的地前綴取代 \"b/\""
-#: diff.c:5433
+#: diff.c:5475
msgid "prepend an additional prefix to every line of output"
msgstr "輸出的每一行附加前綴"
-#: diff.c:5436
+#: diff.c:5478
msgid "do not show any source or destination prefix"
msgstr "不顯示任何來源和目的地前綴"
-#: diff.c:5439
+#: diff.c:5481
msgid "show context between diff hunks up to the specified number of lines"
msgstr "顯示指定行數的差異區塊間的上下文"
-#: diff.c:5443 diff.c:5448 diff.c:5453
+#: diff.c:5485 diff.c:5490 diff.c:5495
msgid "<char>"
msgstr "<字元>"
-#: diff.c:5444
+#: diff.c:5486
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一個字元取代 '+' 來表示新的一行"
-#: diff.c:5449
+#: diff.c:5491
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一個字元取代 '-' 來表示舊的一行"
-#: diff.c:5454
+#: diff.c:5496
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一個字元取代 ' ' 來表示一行上下文"
-#: diff.c:5457
+#: diff.c:5499
msgid "Diff rename options"
msgstr "差異重新命名選項"
-#: diff.c:5458
+#: diff.c:5500
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5459
+#: diff.c:5501
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "將完全重寫的變更打破為成對的刪除和建立"
-#: diff.c:5463
+#: diff.c:5505
msgid "detect renames"
msgstr "檢測重新命名"
-#: diff.c:5467
+#: diff.c:5509
msgid "omit the preimage for deletes"
msgstr "省略刪除變更的差異輸出"
-#: diff.c:5470
+#: diff.c:5512
msgid "detect copies"
msgstr "檢測複製"
-#: diff.c:5474
+#: diff.c:5516
msgid "use unmodified files as source to find copies"
msgstr "使用未修改的檔案做為發現拷貝的來源"
-#: diff.c:5476
+#: diff.c:5518
msgid "disable rename detection"
msgstr "停用重新命名偵測"
-#: diff.c:5479
+#: diff.c:5521
msgid "use empty blobs as rename source"
msgstr "使用空的資料物件做為重新命名的來源"
-#: diff.c:5481
+#: diff.c:5523
msgid "continue listing the history of a file beyond renames"
msgstr "繼續列出檔案重新命名以外的歷史記錄"
-#: diff.c:5484
+#: diff.c:5526
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重新命名/複製目標超過提供的限制,禁止重新命名/複製檢測"
-#: diff.c:5486
+#: diff.c:5528
msgid "Diff algorithm options"
msgstr "差異演算法選項"
-#: diff.c:5488
+#: diff.c:5530
msgid "produce the smallest possible diff"
msgstr "生成儘可能小的差異"
-#: diff.c:5491
+#: diff.c:5533
msgid "ignore whitespace when comparing lines"
msgstr "行比較時忽略空白字元"
-#: diff.c:5494
+#: diff.c:5536
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字元的變更"
-#: diff.c:5497
+#: diff.c:5539
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字元變更"
-#: diff.c:5500
+#: diff.c:5542
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的Enter符(CR)"
-#: diff.c:5503
+#: diff.c:5545
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的變更"
-#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
+#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
msgid "<regex>"
msgstr "<正則>"
-#: diff.c:5506
+#: diff.c:5548
msgid "ignore changes whose all lines match <regex>"
msgstr "忽略整行符合 <regex> 的變更"
-#: diff.c:5509
+#: diff.c:5551
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "啟發式轉換差異邊界以便閱讀"
-#: diff.c:5512
+#: diff.c:5554
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "使用 \"patience diff\" 演算法生成差異"
-#: diff.c:5516
+#: diff.c:5558
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "使用 \"histogram diff\" 演算法生成差異"
-#: diff.c:5518
+#: diff.c:5560
msgid "<algorithm>"
msgstr "<演算法>"
-#: diff.c:5519
+#: diff.c:5561
msgid "choose a diff algorithm"
msgstr "選擇一個差異演算法"
-#: diff.c:5521
+#: diff.c:5563
msgid "<text>"
msgstr "<文字>"
-#: diff.c:5522
+#: diff.c:5564
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "使用 \"anchored diff\" 演算法生成差異"
-#: diff.c:5524 diff.c:5533 diff.c:5536
+#: diff.c:5566 diff.c:5575 diff.c:5578
msgid "<mode>"
msgstr "<模式>"
-#: diff.c:5525
+#: diff.c:5567
msgid "show word diff, using <mode> to delimit changed words"
msgstr "顯示單詞差異,使用 <模式> 分隔變更的單詞"
-#: diff.c:5528
+#: diff.c:5570
msgid "use <regex> to decide what a word is"
msgstr "使用 <常規表示式> 確定何為一個詞"
-#: diff.c:5531
+#: diff.c:5573
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
-#: diff.c:5534
+#: diff.c:5576
msgid "moved lines of code are colored differently"
msgstr "移動的程式碼行用不同方式著色"
-#: diff.c:5537
+#: diff.c:5579
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字元"
-#: diff.c:5540
+#: diff.c:5582
msgid "Other diff options"
msgstr "其它差異選項"
-#: diff.c:5542
+#: diff.c:5584
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "當從子目錄執行,排除目錄之外的變更並顯示相對路徑"
-#: diff.c:5546
+#: diff.c:5588
msgid "treat all files as text"
msgstr "把所有檔案當做文字處理"
-#: diff.c:5548
+#: diff.c:5590
msgid "swap two inputs, reverse the diff"
msgstr "交換兩個輸入,反轉差異"
-#: diff.c:5550
+#: diff.c:5592
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差異時離開碼為 1,否則為 0"
-#: diff.c:5552
+#: diff.c:5594
msgid "disable all output of the program"
msgstr "停用本程式的所有輸出"
-#: diff.c:5554
+#: diff.c:5596
msgid "allow an external diff helper to be executed"
msgstr "允許執行一個外部的差異協助工具"
-#: diff.c:5556
+#: diff.c:5598
msgid "run external text conversion filters when comparing binary files"
msgstr "當比較二進位檔案時,執行外部的文字轉換過濾器"
-#: diff.c:5558
+#: diff.c:5600
msgid "<when>"
msgstr "<何時>"
-#: diff.c:5559
+#: diff.c:5601
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差異時,忽略子模組的更改"
-#: diff.c:5562
+#: diff.c:5604
msgid "<format>"
msgstr "<格式>"
-#: diff.c:5563
+#: diff.c:5605
msgid "specify how differences in submodules are shown"
msgstr "指定子模組的差異如何顯示"
-#: diff.c:5567
+#: diff.c:5609
msgid "hide 'git add -N' entries from the index"
msgstr "隱藏索引中 'git add -N' 條目"
-#: diff.c:5570
+#: diff.c:5612
msgid "treat 'git add -N' entries as real in the index"
msgstr "將索引中 'git add -N' 條目當做真實的"
-#: diff.c:5572
+#: diff.c:5614
msgid "<string>"
msgstr "<字串>"
-#: diff.c:5573
+#: diff.c:5615
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "尋找改變了指定字串出現次數的差異"
-#: diff.c:5576
+#: diff.c:5618
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "尋找改變指定正則符合出現次數的差異"
-#: diff.c:5579
+#: diff.c:5621
msgid "show all changes in the changeset with -S or -G"
msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
-#: diff.c:5582
+#: diff.c:5624
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式"
-#: diff.c:5585
+#: diff.c:5627
msgid "control the order in which files appear in the output"
msgstr "控制輸出中的檔案顯示順序"
-#: diff.c:5586 diff.c:5589
+#: diff.c:5628 diff.c:5631
msgid "<path>"
msgstr "<路徑>"
-#: diff.c:5587
+#: diff.c:5629
msgid "show the change in the specified path first"
msgstr "先顯示指定路徑的變更"
-#: diff.c:5590
+#: diff.c:5632
msgid "skip the output to the specified path"
msgstr "略過輸出至指定路徑"
-#: diff.c:5592
+#: diff.c:5634
msgid "<object-id>"
msgstr "<物件 ID>"
-#: diff.c:5593
+#: diff.c:5635
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "尋找改變指定物件出現次數的差異"
-#: diff.c:5595
+#: diff.c:5637
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5596
+#: diff.c:5638
msgid "select files by diff type"
msgstr "透過差異類型選擇檔案"
-#: diff.c:5598
+#: diff.c:5640
msgid "<file>"
msgstr "<檔案>"
-#: diff.c:5599
-msgid "Output to a specific file"
-msgstr "輸出到一個指定的檔案"
+#: diff.c:5641
+msgid "output to a specific file"
+msgstr "輸出至指定檔案"
-#: diff.c:6257
+#: diff.c:6321
msgid "exhaustive rename detection was skipped due to too many files."
msgstr "因為檔案太多,已略過詳細重新命名偵測。"
-#: diff.c:6260
+#: diff.c:6324
msgid "only found copies from modified paths due to too many files."
msgstr "因為檔案太多,只在修改的路徑中尋找複製。"
-#: diff.c:6263
+#: diff.c:6327
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "cannot use %s as an exclude file"
msgstr "不能將 %s 用作排除檔案"
-#: dir.c:2418
+#: dir.c:2419
#, c-format
msgid "could not open directory '%s'"
msgstr "不能開啟目錄 '%s'"
-#: dir.c:2720
+#: dir.c:2721
msgid "failed to get kernel name and information"
msgstr "無法獲得核心名稱和訊息"
-#: dir.c:2844
+#: dir.c:2846
msgid "untracked cache is disabled on this system or location"
msgstr "快取未追蹤檔案在本系統或位置中被停用"
-#: dir.c:3112
+#: dir.c:3119
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
"無法猜到目錄名。\n"
"請在指令列指定一個目錄"
-#: dir.c:3800
+#: dir.c:3807
#, c-format
msgid "index file corrupt in repo %s"
msgstr "版本庫 %s 中的索引檔案損壞"
-#: dir.c:3847 dir.c:3852
+#: dir.c:3854 dir.c:3859
#, c-format
msgid "could not create directories for %s"
msgstr "不能為 %s 建立目錄"
-#: dir.c:3881
+#: dir.c:3888
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"
msgid "could not stat file '%s'"
msgstr "不能對檔案 '%s' 呼叫 stat"
-#: environment.c:145
+#: environment.c:147
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "錯誤的 git 名字空間路徑 \"%s\""
msgid "unable to write to remote"
msgstr "無法寫到遠端"
-#: fetch-pack.c:395 fetch-pack.c:1439
+#: fetch-pack.c:397 fetch-pack.c:1460
#, c-format
msgid "invalid shallow line: %s"
msgstr "無效的 shallow 訊息:%s"
-#: fetch-pack.c:401 fetch-pack.c:1445
+#: fetch-pack.c:403 fetch-pack.c:1466
#, c-format
msgid "invalid unshallow line: %s"
msgstr "無效的 unshallow 訊息:%s"
-#: fetch-pack.c:403 fetch-pack.c:1447
+#: fetch-pack.c:405 fetch-pack.c:1468
#, c-format
msgid "object not found: %s"
msgstr "物件未找到:%s"
-#: fetch-pack.c:406 fetch-pack.c:1450
+#: fetch-pack.c:408 fetch-pack.c:1471
#, c-format
msgid "error in object: %s"
msgstr "物件中發生錯誤:%s"
-#: fetch-pack.c:408 fetch-pack.c:1452
+#: fetch-pack.c:410 fetch-pack.c:1473
#, c-format
msgid "no shallow found: %s"
msgstr "未發現 shallow:%s"
-#: fetch-pack.c:411 fetch-pack.c:1456
+#: fetch-pack.c:413 fetch-pack.c:1477
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "應為 shallow/unshallow,卻得到 %s"
-#: fetch-pack.c:451
+#: fetch-pack.c:453
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:468
+#: fetch-pack.c:470
#, c-format
msgid "invalid commit %s"
msgstr "無效提交 %s"
-#: fetch-pack.c:499
+#: fetch-pack.c:501
msgid "giving up"
msgstr "放棄"
-#: fetch-pack.c:512 progress.c:339
+#: fetch-pack.c:514 progress.h:25
msgid "done"
msgstr "完成"
-#: fetch-pack.c:524
+#: fetch-pack.c:526
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:560
+#: fetch-pack.c:562
#, c-format
msgid "Marking %s as complete"
msgstr "標記 %s 為完成"
-#: fetch-pack.c:775
+#: fetch-pack.c:784
#, c-format
msgid "already have %s (%s)"
msgstr "已經有 %s(%s)"
-#: fetch-pack.c:861
+#: fetch-pack.c:870
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack:無法衍生 sideband 多路輸出"
-#: fetch-pack.c:869
+#: fetch-pack.c:878
msgid "protocol error: bad pack header"
msgstr "協定錯誤:壞的包頭"
-#: fetch-pack.c:965
+#: fetch-pack.c:974
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack:無法 fork %s 處理程序"
-#: fetch-pack.c:971
+#: fetch-pack.c:980
msgid "fetch-pack: invalid index-pack output"
msgstr "fetch-pack:無效的 index-pack 輸出"
-#: fetch-pack.c:988
+#: fetch-pack.c:997
#, c-format
msgid "%s failed"
msgstr "%s 失敗"
-#: fetch-pack.c:990
+#: fetch-pack.c:999
msgid "error in sideband demultiplexer"
msgstr "sideband 多路輸出發生錯誤"
-#: fetch-pack.c:1035
+#: fetch-pack.c:1048
#, c-format
msgid "Server version is %.*s"
msgstr "伺服器版本 %.*s"
-#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
-#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
+#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
+#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
+#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
+#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
#, c-format
msgid "Server supports %s"
msgstr "伺服器支援 %s"
-#: fetch-pack.c:1045
+#: fetch-pack.c:1058
msgid "Server does not support shallow clients"
msgstr "伺服器不支援 shallow 用戶端"
-#: fetch-pack.c:1105
+#: fetch-pack.c:1118
msgid "Server does not support --shallow-since"
msgstr "伺服器不支援 --shallow-since"
-#: fetch-pack.c:1110
+#: fetch-pack.c:1123
msgid "Server does not support --shallow-exclude"
msgstr "伺服器不支援 --shallow-exclude"
-#: fetch-pack.c:1114
+#: fetch-pack.c:1127
msgid "Server does not support --deepen"
msgstr "伺服器不支援 --deepen"
-#: fetch-pack.c:1116
+#: fetch-pack.c:1129
msgid "Server does not support this repository's object format"
msgstr "伺服器不支援此版本庫的物件格式"
-#: fetch-pack.c:1129
+#: fetch-pack.c:1142
msgid "no common commits"
msgstr "沒有共同的提交"
-#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
+#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
msgid "source repository is shallow, reject to clone."
msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。"
-#: fetch-pack.c:1144 fetch-pack.c:1681
+#: fetch-pack.c:1157 fetch-pack.c:1705
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack:取得失敗。"
-#: fetch-pack.c:1258
+#: fetch-pack.c:1271
#, c-format
msgid "mismatched algorithms: client %s; server %s"
msgstr "算法不一致:用戶端 %s;伺服器 %s"
-#: fetch-pack.c:1262
+#: fetch-pack.c:1275
#, c-format
msgid "the server does not support algorithm '%s'"
msgstr "伺服器不支援「%s」算法"
-#: fetch-pack.c:1295
+#: fetch-pack.c:1308
msgid "Server does not support shallow requests"
msgstr "伺服器不支援 shallow 請求"
-#: fetch-pack.c:1302
+#: fetch-pack.c:1315
msgid "Server supports filter"
msgstr "伺服器支援 filter"
-#: fetch-pack.c:1345 fetch-pack.c:2063
+#: fetch-pack.c:1358 fetch-pack.c:2087
msgid "unable to write request to remote"
msgstr "無法將請求寫到遠端"
-#: fetch-pack.c:1363
+#: fetch-pack.c:1376
#, c-format
msgid "error reading section header '%s'"
msgstr "讀取節標題 '%s' 發生錯誤"
-#: fetch-pack.c:1369
+#: fetch-pack.c:1382
#, c-format
msgid "expected '%s', received '%s'"
msgstr "預期 '%s',得到 '%s'"
-#: fetch-pack.c:1403
+#: fetch-pack.c:1416
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的確認行:'%s'"
-#: fetch-pack.c:1408
+#: fetch-pack.c:1421
#, c-format
msgid "error processing acks: %d"
msgstr "處理 ack 發生錯誤:%d"
-#: fetch-pack.c:1418
-msgid "expected packfile to be sent after 'ready'"
-msgstr "預期在 'ready' 之後傳送 packfile"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1435
+#, c-format
+msgid "expected packfile to be sent after '%s'"
+msgstr "預期在 「%s」後傳送 packfile"
-#: fetch-pack.c:1420
-msgid "expected no other sections to be sent after no 'ready'"
-msgstr "在沒有 'ready' 不應該傳送其它小節"
+#. TRANSLATORS: The parameter will be 'ready', a protocol
+#. keyword.
+#.
+#: fetch-pack.c:1441
+#, c-format
+msgid "expected no other sections to be sent after no '%s'"
+msgstr "預期在沒有「%s」後不傳送其他區段"
-#: fetch-pack.c:1461
+#: fetch-pack.c:1482
#, c-format
msgid "error processing shallow info: %d"
msgstr "處理淺複製訊息發生錯誤:%d"
-#: fetch-pack.c:1510
+#: fetch-pack.c:1531
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "預期 wanted-ref,得到 '%s'"
-#: fetch-pack.c:1515
+#: fetch-pack.c:1536
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref:'%s'"
-#: fetch-pack.c:1520
+#: fetch-pack.c:1541
#, c-format
msgid "error processing wanted refs: %d"
msgstr "處理要取得的引用發生錯誤:%d"
-#: fetch-pack.c:1550
+#: fetch-pack.c:1571
msgid "git fetch-pack: expected response end packet"
msgstr "git fetch-pack: 預期要有回應結束封包"
-#: fetch-pack.c:1959
+#: fetch-pack.c:1983
msgid "no matching remote head"
msgstr "沒有符合的遠端分支"
-#: fetch-pack.c:1982 builtin/clone.c:581
+#: fetch-pack.c:2006 builtin/clone.c:587
msgid "remote did not send all necessary objects"
msgstr "遠端沒有傳送所有必需的物件"
-#: fetch-pack.c:2085
+#: fetch-pack.c:2109
msgid "unexpected 'ready' from remote"
msgstr "從遠端收到非預期的 ‘ready’"
-#: fetch-pack.c:2108
+#: fetch-pack.c:2132
#, c-format
msgid "no such remote ref %s"
msgstr "沒有這樣的遠端引用 %s"
-#: fetch-pack.c:2111
+#: fetch-pack.c:2135
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "伺服器不允許請求未公開的物件 %s"
-#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
-#: gpg-interface.c:990
+#: fsmonitor-ipc.c:119
+#, c-format
+msgid "fsmonitor_ipc__send_query: invalid path '%s'"
+msgstr "fsmonitor_ipc__send_query:路徑「%s」無效"
+
+#: fsmonitor-ipc.c:125
+#, c-format
+msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
+msgstr "fsmonitor_ipc__send_query:「%s」上有未指定的錯誤"
+
+#: fsmonitor-ipc.c:155
+msgid "fsmonitor--daemon is not running"
+msgstr "fsmonitor--daemon 未在運作"
+
+#: fsmonitor-ipc.c:164
+#, c-format
+msgid "could not send '%s' command to fsmonitor--daemon"
+msgstr "無法將「%s」命令傳送到 fsmonitor--daemon"
+
+#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
+#: gpg-interface.c:1011
msgid "could not create temporary file"
msgstr "不能建立暫存檔"
-#: gpg-interface.c:332 gpg-interface.c:460
+#: gpg-interface.c:332 gpg-interface.c:459
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "無法將分離式簽名寫入 '%s'"
-#: gpg-interface.c:451
+#: gpg-interface.c:450
msgid ""
"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
"signature verification"
msgstr "SSH 簽名驗證需要設定 gpg.ssh.allowedSignersFile,簽名檔案也要存在"
-#: gpg-interface.c:480
+#: gpg-interface.c:479
msgid ""
"ssh-keygen -Y find-principals/verify is needed for ssh signature "
"verification (available in openssh version 8.2p1+)"
"SSH 簽名驗證需要 ssh-keygen -Y find-principals/verify(可以在 openssh 8.2p1+ "
"版本使用)"
-#: gpg-interface.c:536
+#: gpg-interface.c:550
#, c-format
msgid "ssh signing revocation file configured but not found: %s"
msgstr "有設定 SSH 簽名廢止檔案,但找不到檔案本體:%s"
-#: gpg-interface.c:624
+#: gpg-interface.c:638
#, c-format
msgid "bad/incompatible signature '%s'"
msgstr "簽名「%s」損壞或者不相容"
-#: gpg-interface.c:801 gpg-interface.c:806
+#: gpg-interface.c:815 gpg-interface.c:820
#, c-format
msgid "failed to get the ssh fingerprint for key '%s'"
msgstr "無法取得「%s」金鑰的 SSH 指紋"
-#: gpg-interface.c:829
+#: gpg-interface.c:843
msgid ""
"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一"
-#: gpg-interface.c:851
+#: gpg-interface.c:865
#, c-format
msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
msgstr "gpg.ssh.defaultKeyCommand 執行成功,但沒回傳按鍵:%s %s"
-#: gpg-interface.c:857
+#: gpg-interface.c:871
#, c-format
msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
msgstr "gpg.ssh.defaultKeyCommand 執行失敗:%s %s"
-#: gpg-interface.c:945
+#: gpg-interface.c:966
msgid "gpg failed to sign the data"
msgstr "gpg 無法為資料簽名"
-#: gpg-interface.c:967
+#: gpg-interface.c:988
msgid "user.signingkey needs to be set for ssh signing"
msgstr "需要設定 user.signingkey 才能進行 SSH 簽名"
-#: gpg-interface.c:978
+#: gpg-interface.c:999
#, c-format
msgid "failed writing ssh signing key to '%s'"
msgstr "無法將 SSH 簽名金鑰寫入「%s」"
-#: gpg-interface.c:996
+#: gpg-interface.c:1017
#, c-format
msgid "failed writing ssh signing key buffer to '%s'"
msgstr "無法將 SSH 簽名金鑰緩衝區寫入「%s」"
-#: gpg-interface.c:1014
+#: gpg-interface.c:1035
msgid ""
"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
"8.2p1+)"
msgstr "SSH 簽名需要 ssh-keygen -Y sign(可以在 openssh 8.2p1+ 版本使用)"
-#: gpg-interface.c:1026
+#: gpg-interface.c:1047
#, c-format
msgid "failed reading ssh signing data buffer from '%s'"
msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區"
msgid "ignored invalid color '%.*s' in log.graphColors"
msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩"
-#: grep.c:531
+#: grep.c:446
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
"提供的模式包含 NULL 字元(通過 -f <檔案> 參數)。只有 PCRE v2 下的 -P 支援此"
"功能"
-#: grep.c:1942
+#: grep.c:1859
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s':無法讀取 %s"
-#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
#: builtin/rm.c:136
#, c-format
msgid "failed to stat '%s'"
msgstr "對 '%s' 呼叫 stat 失敗"
-#: grep.c:1970
+#: grep.c:1887
#, c-format
msgid "'%s': short read"
msgstr "'%s':讀取不完整"
-#: help.c:24
+#: help.c:25
msgid "start a working area (see also: git help tutorial)"
msgstr "開始一個工作區(參見:git help tutorial)"
-#: help.c:25
+#: help.c:26
msgid "work on the current change (see also: git help everyday)"
msgstr "在目前變更上工作(參見:git help everyday)"
-#: help.c:26
+#: help.c:27
msgid "examine the history and state (see also: git help revisions)"
msgstr "檢查歷史和狀態(參見:git help revisions)"
-#: help.c:27
+#: help.c:28
msgid "grow, mark and tweak your common history"
msgstr "擴展、標記和調校您的歷史記錄"
-#: help.c:28
+#: help.c:29
msgid "collaborate (see also: git help workflows)"
msgstr "協同(參見:git help workflows)"
-#: help.c:32
+#: help.c:33
msgid "Main Porcelain Commands"
msgstr "主要的上層指令"
-#: help.c:33
+#: help.c:34
msgid "Ancillary Commands / Manipulators"
msgstr "輔助指令/動作者"
-#: help.c:34
+#: help.c:35
msgid "Ancillary Commands / Interrogators"
msgstr "輔助指令/詢問者"
-#: help.c:35
+#: help.c:36
msgid "Interacting with Others"
msgstr "與其它系統互動"
-#: help.c:36
+#: help.c:37
msgid "Low-level Commands / Manipulators"
msgstr "低級指令/動作者"
-#: help.c:37
+#: help.c:38
msgid "Low-level Commands / Interrogators"
msgstr "低級指令/詢問者"
-#: help.c:38
+#: help.c:39
msgid "Low-level Commands / Syncing Repositories"
msgstr "低級指令 / 同步版本庫"
-#: help.c:39
+#: help.c:40
msgid "Low-level Commands / Internal Helpers"
msgstr "低級指令/內部協助工具"
-#: help.c:313
+#: help.c:316
#, c-format
msgid "available git commands in '%s'"
msgstr "在 '%s' 下可用的 git 指令"
-#: help.c:320
+#: help.c:323
msgid "git commands available from elsewhere on your $PATH"
msgstr "在 $PATH 路徑中的其他地方可用的 git 指令"
-#: help.c:329
+#: help.c:332
msgid "These are common Git commands used in various situations:"
msgstr "這些是各種場合常見的 Git 指令:"
-#: help.c:378 git.c:100
+#: help.c:382 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "不支援的指令列表類型 '%s'"
-#: help.c:418
+#: help.c:422
msgid "The Git concept guides are:"
msgstr "Git 概念嚮導有:"
-#: help.c:442
-msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "執行 'git help <command>' 來檢視特定子指令"
-
-#: help.c:447
+#: help.c:446
msgid "External commands"
msgstr "外部指令"
-#: help.c:462
+#: help.c:468
msgid "Command aliases"
msgstr "指令別名"
-#: help.c:543
+#: help.c:486
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "執行 'git help <command>' 來檢視特定子指令"
+
+#: help.c:563
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"'%s' 像是一個 git 指令,但卻無法執行。\n"
"可能是 git-%s 受損?"
-#: help.c:565 help.c:662
+#: help.c:585 help.c:682
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git:'%s' 不是一個 git 指令。參見 'git --help'。"
-#: help.c:613
+#: help.c:633
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀,您的系統中未發現 Git 指令。"
-#: help.c:635
+#: help.c:655
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "警告:您執行了一個並不存在的 Git 指令 '%s'。"
-#: help.c:640
+#: help.c:660
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "假定你想要的是 '%s' 並繼續。"
-#: help.c:646
+#: help.c:666
#, c-format
msgid "Run '%s' instead [y/N]? "
msgstr "改執行「%s」[y/N]? "
-#: help.c:654
+#: help.c:674
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒鐘後繼續。"
-#: help.c:666
+#: help.c:686
msgid ""
"\n"
"The most similar command is"
"\n"
"最類似的指令有"
-#: help.c:706
+#: help.c:729
msgid "git version [<options>]"
msgstr "git version [<選項>]"
-#: help.c:761
+#: help.c:784
#, c-format
msgid "%s: %s - %s"
msgstr "%s:%s - %s"
-#: help.c:765
+#: help.c:788
msgid ""
"\n"
"Did you mean this?"
"\n"
"您指的是這個嗎?"
-#: hook.c:27
+#: hook.c:28
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
"因為沒有將掛鉤 '%s' 設定為可執行,掛鉤被忽略。您可以透過\n"
"設定 `git config advice.ignoredHook false` 來關閉這條警告。"
-#: ident.c:353
+#: hook.c:87
+#, c-format
+msgid "Couldn't start hook '%s'\n"
+msgstr "無法啟動「%s」掛鉤\n"
+
+#: ident.c:354
msgid "Author identity unknown\n"
msgstr "作者身分未知\n"
-#: ident.c:356
+#: ident.c:357
msgid "Committer identity unknown\n"
msgstr "提交者身分未知\n"
-#: ident.c:362
+#: ident.c:363
msgid ""
"\n"
"*** Please tell me who you are.\n"
"若只要在這個版本庫設定身份標記,請省略 --global 參數。\n"
"\n"
-#: ident.c:397
+#: ident.c:398
msgid "no email was given and auto-detection is disabled"
msgstr "未提供信件位址且自動偵測被停用"
-#: ident.c:402
+#: ident.c:403
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "無法自動偵測信件位址(得到 '%s')"
-#: ident.c:419
+#: ident.c:420
msgid "no name was given and auto-detection is disabled"
msgstr "未提供姓名且自動偵測被停用"
-#: ident.c:425
+#: ident.c:426
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "無法自動偵測姓名(得到 '%s')"
-#: ident.c:433
+#: ident.c:434
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "不允許空的姓名(對於 <%s>)"
-#: ident.c:439
+#: ident.c:440
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中僅包含停用字元:%s"
-#: ident.c:454 builtin/commit.c:648
+#: ident.c:455 builtin/commit.c:649
#, c-format
msgid "invalid date format: %s"
msgstr "無效的日期格式:%s"
-#: list-objects-filter-options.c:83
+#: list-objects-filter-options.c:68
msgid "expected 'tree:<depth>'"
msgstr "期望 'tree:<深度>'"
-#: list-objects-filter-options.c:98
+#: list-objects-filter-options.c:83
msgid "sparse:path filters support has been dropped"
msgstr "sparse:path 過濾器支援已被刪除"
-#: list-objects-filter-options.c:105
+#: list-objects-filter-options.c:90
#, c-format
msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式"
-#: list-objects-filter-options.c:124
+#: list-objects-filter-options.c:109
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "無效的過濾器規格 '%s'"
-#: list-objects-filter-options.c:140
+#: list-objects-filter-options.c:125
#, c-format
msgid "must escape char in sub-filter-spec: '%c'"
msgstr "必須對 sub-filter-spec 中的字元進行轉義:'%c'"
-#: list-objects-filter-options.c:182
+#: list-objects-filter-options.c:167
msgid "expected something after combine:"
msgstr "期望在組合後有一些東西:"
-#: list-objects-filter-options.c:264
+#: list-objects-filter-options.c:249
msgid "multiple filter-specs cannot be combined"
msgstr "不能混用多種過濾規格"
-#: list-objects-filter-options.c:376
+#: list-objects-filter-options.c:365
msgid "unable to upgrade repository format to support partial clone"
msgstr "無法升級版本庫格式,以致不支援部分複製"
msgid "unable to parse sparse filter data in %s"
msgstr "無法解析 %s 中的稀疏過濾器資料"
-#: list-objects.c:127
+#: list-objects.c:144
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性,但不是一個樹狀物件"
-#: list-objects.c:140
+#: list-objects.c:157
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性,但不是一個資料物件"
-#: list-objects.c:398
+#: list-objects.c:415
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "無法為提交 %s 載入根樹"
msgid "Unable to create '%s.lock': %s"
msgstr "不能建立 '%s.lock':%s"
-#: ls-refs.c:37
-#, c-format
-msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "lsrefs.unborn 的值「%s」無效"
-
-#: ls-refs.c:174
+#: ls-refs.c:175
#, c-format
msgid "unexpected line: '%s'"
msgstr "遇到非預期橫列:「%s」"
-#: ls-refs.c:178
+#: ls-refs.c:179
msgid "expected flush after ls-refs arguments"
msgstr "在 ls-refs 引數之後應該有一個 flush 包"
msgid "quoted CRLF detected"
msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"
-#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
#, c-format
msgid "bad action '%s' for '%s'"
msgstr "「%s」動作對「%s」無效"
-#: merge-ort.c:1584 merge-recursive.c:1211
+#: merge-ort.c:1630 merge-recursive.c:1214
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "無法合併子模組 %s (沒有簽出)"
-#: merge-ort.c:1593 merge-recursive.c:1218
+#: merge-ort.c:1639 merge-recursive.c:1221
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "無法合併子模組 %s(提交不存在)"
-#: merge-ort.c:1602 merge-recursive.c:1225
+#: merge-ort.c:1648 merge-recursive.c:1228
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "無法合併子模組 %s (提交未跟隨合併基礎)"
-#: merge-ort.c:1612 merge-ort.c:1620
+#: merge-ort.c:1658 merge-ort.c:1666
#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr "注意:正在將 %s 子模組快轉到 %s"
-#: merge-ort.c:1642
+#: merge-ort.c:1688
#, c-format
msgid "Failed to merge submodule %s"
msgstr "無法合併 %s 子模組"
-#: merge-ort.c:1649
+#: merge-ort.c:1695
#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
"無法合併 %s 子模組,但有找到一個可行的合併方案:\n"
"%s\n"
-#: merge-ort.c:1653 merge-recursive.c:1281
+#: merge-ort.c:1699 merge-recursive.c:1284
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"\n"
"接受本建議。\n"
-#: merge-ort.c:1666
+#: merge-ort.c:1712
#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
"無法合併 %s 子模組,但有找到幾個可行的合併方案:\n"
"%s"
-#: merge-ort.c:1887 merge-recursive.c:1372
+#: merge-ort.c:1937 merge-recursive.c:1375
msgid "Failed to execute internal merge"
msgstr "無法執行內部合併"
-#: merge-ort.c:1892 merge-recursive.c:1377
+#: merge-ort.c:1942 merge-recursive.c:1380
#, c-format
msgid "Unable to add %s to database"
msgstr "不能新增 %s 至物件庫"
-#: merge-ort.c:1899 merge-recursive.c:1410
+#: merge-ort.c:1949 merge-recursive.c:1413
#, c-format
msgid "Auto-merging %s"
msgstr "自動合併 %s"
-#: merge-ort.c:2038 merge-recursive.c:2132
+#: merge-ort.c:2088 merge-recursive.c:2135
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"衝突(隱式目錄重新命名):處於隱式目錄重新命名的現存檔案/目錄 %s,將以下路徑"
"放在:%s。"
-#: merge-ort.c:2048 merge-recursive.c:2142
+#: merge-ort.c:2098 merge-recursive.c:2145
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"衝突(隱式目錄重新命名):無法映射一個以上路徑到 %s,隱式目錄重新命名嘗試將這"
"些路徑放置於此:%s"
-#: merge-ort.c:2106
+#: merge-ort.c:2156
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
"衝突(分割的目錄重新命名):未知 %s 重新命名的位置。它被重新命名為多個其他目"
"錄,但沒有目的地取得過半檔案。"
-#: merge-ort.c:2260 merge-recursive.c:2478
+#: merge-ort.c:2310 merge-recursive.c:2481
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr "警告:避免套用 %s -> %s 的重新命名到 %s,因為 %s 本身已被重新命名。"
-#: merge-ort.c:2400 merge-recursive.c:3261
+#: merge-ort.c:2450 merge-recursive.c:3264
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
msgstr ""
"路徑已更新:%s 新增到 %s,位於一個被重新命名到 %s 的目錄中,將其移動到 %s。"
-#: merge-ort.c:2407 merge-recursive.c:3268
+#: merge-ort.c:2457 merge-recursive.c:3271
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"路徑已更新:%1$s 重新命名為 %3$s 中的 %2$s,而該目錄被重新命名到 %4$s 中,將"
"其移動到 %5$s。"
-#: merge-ort.c:2420 merge-recursive.c:3264
+#: merge-ort.c:2470 merge-recursive.c:3267
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"衝突(檔案位置):%s 新增到 %s,位於一個被重新命名為 %s 的目錄中,建議將其移"
"動到 %s。"
-#: merge-ort.c:2428 merge-recursive.c:3271
+#: merge-ort.c:2478 merge-recursive.c:3274
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"衝突(檔案位置):%1$s 重新命名為 %3$s 中的 %2$s,而該目錄被重新命名到 %4$s "
"中,建議將其移動到 %5$s。"
-#: merge-ort.c:2584
+#: merge-ort.c:2634
#, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"衝突(重新命名/重新命名):%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 "
"%4$s。"
-#: merge-ort.c:2679
+#: merge-ort.c:2729
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
"衝突(重新命名陷入相撞):%s -> %s 這個重新命名有內容衝突並與其他路徑相撞,可"
"能會因此出現巢狀衝突標記。"
-#: merge-ort.c:2698 merge-ort.c:2722
+#: merge-ort.c:2748 merge-ort.c:2772
#, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"衝突(重新命名/刪除):%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。"
-#: merge-ort.c:3212 merge-recursive.c:3022
+#: merge-ort.c:3261 merge-recursive.c:3025
#, c-format
msgid "cannot read object %s"
msgstr "不能讀取物件 %s"
-#: merge-ort.c:3215 merge-recursive.c:3025
+#: merge-ort.c:3264 merge-recursive.c:3028
#, c-format
msgid "object %s is not a blob"
msgstr "物件 %s 不是一個資料物件"
-#: merge-ort.c:3644
+#: merge-ort.c:3693
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr "衝突(檔案/目錄):目錄佔住 %2$s 中 %1$s 的位置。改移動到 %3$s。"
-#: merge-ort.c:3721
+#: merge-ort.c:3770
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
"衝突(類型有異):兩方的 %s 類型皆不同。已經重新命名這兩個來源,這樣就可以分"
"別記錄這兩方檔案。"
-#: merge-ort.c:3728
+#: merge-ort.c:3777
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
"衝突(類型有異):兩方的 %s 類型皆不同。已經重新命名其中一個來源,這樣就可以"
"分別記錄這兩方檔案。"
-#: merge-ort.c:3819 merge-recursive.c:3101
+#: merge-ort.c:3866 merge-recursive.c:3104
msgid "content"
msgstr "內容"
-#: merge-ort.c:3821 merge-recursive.c:3105
+#: merge-ort.c:3868 merge-recursive.c:3108
msgid "add/add"
msgstr "新增/新增"
-#: merge-ort.c:3823 merge-recursive.c:3150
+#: merge-ort.c:3870 merge-recursive.c:3153
msgid "submodule"
msgstr "子模組"
-#: merge-ort.c:3825 merge-recursive.c:3151
+#: merge-ort.c:3872 merge-recursive.c:3154
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "衝突(%s):合併衝突於 %s"
-#: merge-ort.c:3869
+#: merge-ort.c:3916
#, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
"衝突(修改/刪除):%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"
"上。"
-#: merge-ort.c:4165
+#: merge-ort.c:4212
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4534
+#: merge-ort.c:4586
#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr "%s, %s, %s 樹的合併資訊收集失敗"
-#: merge-ort-wrappers.c:13 merge-recursive.c:3716
+#: merge-ort-wrappers.c:13 merge-recursive.c:3723
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"您對下列檔案的本機修改將被合併動作覆蓋:\n"
" %s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
+#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
msgid "Already up to date."
msgstr "已經是最新的。"
msgid "refusing to lose untracked file at '%s'"
msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"
-#: merge-recursive.c:956 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:47
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能讀取物件 %s '%s'"
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何處理 %06o %s '%s'"
-#: merge-recursive.c:1233 merge-recursive.c:1246
+#: merge-recursive.c:1236 merge-recursive.c:1249
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "子模組 %s 快轉到如下提交:"
-#: merge-recursive.c:1236 merge-recursive.c:1249
+#: merge-recursive.c:1239 merge-recursive.c:1252
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "快轉子模組 %s"
-#: merge-recursive.c:1273
+#: merge-recursive.c:1276
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "無法合併子模組 %s (沒發現合併跟隨的提交)"
-#: merge-recursive.c:1277
+#: merge-recursive.c:1280
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "無法合併子模組 %s(非快轉)"
-#: merge-recursive.c:1278
+#: merge-recursive.c:1281
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "找到子模組的一個可能的合併方案:\n"
-#: merge-recursive.c:1290
+#: merge-recursive.c:1293
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "無法合併子模組 %s (發現多個合併)"
-#: merge-recursive.c:1434
+#: merge-recursive.c:1437
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "錯誤:拒絕遺失未追蹤檔案 '%s',而是寫入 %s。"
-#: merge-recursive.c:1506
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"衝突(%1$s/刪除):%2$s 在 %3$s 中被刪除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本被保留。"
-#: merge-recursive.c:1511
+#: merge-recursive.c:1514
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"衝突(%1$s/刪除):%2$s 在 %3$s 中被刪除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"
-#: merge-recursive.c:1518
+#: merge-recursive.c:1521
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"衝突(%1$s/刪除):%2$s 在 %3$s 中被刪除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本保留在 %8$s 中。"
-#: merge-recursive.c:1523
+#: merge-recursive.c:1526
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"衝突(%1$s/刪除):%2$s 在 %3$s 中被刪除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"
-#: merge-recursive.c:1558
+#: merge-recursive.c:1561
msgid "rename"
msgstr "重新命名"
-#: merge-recursive.c:1558
+#: merge-recursive.c:1561
msgid "renamed"
msgstr "重新命名"
-#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
+#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒絕遺失髒檔案 '%s'"
-#: merge-recursive.c:1619
+#: merge-recursive.c:1622
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "拒絕在 '%s' 處失去未追蹤檔案,即使它存在於重新命名中。"
-#: merge-recursive.c:1677
+#: merge-recursive.c:1680
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"衝突(重新命名/新增):在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"
-#: merge-recursive.c:1708
+#: merge-recursive.c:1711
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增"
-#: merge-recursive.c:1713
+#: merge-recursive.c:1716
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "拒絕遺失未追蹤檔案 '%s',而是新增為 %s"
-#: merge-recursive.c:1740
+#: merge-recursive.c:1743
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"衝突(重新命名/重新命名):在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\",在"
"分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1745
+#: merge-recursive.c:1748
msgid " (left unresolved)"
msgstr " (留下未解決)"
-#: merge-recursive.c:1837
+#: merge-recursive.c:1840
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"衝突(重新命名/重新命名):在 %3$s 中重新命名 %1$s->%2$s,在 %6$s 中重新命名 "
"%4$s->%5$s"
-#: merge-recursive.c:2100
+#: merge-recursive.c:2103
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"衝突(分割的目錄重新命名):不清楚 %s 應該放在哪裡,因為目錄 %s 被重新命名到"
"多個其它目錄,沒有目錄包含大部分檔案。"
-#: merge-recursive.c:2234
+#: merge-recursive.c:2237
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
"衝突(重新命名/重新命名):在 %3$s 中重新命名目錄 %1$s->%2$s,在 %6$s 中重新"
"命名目錄 %4$s->%5$s"
-#: merge-recursive.c:3089
+#: merge-recursive.c:3092
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:3089
+#: merge-recursive.c:3092
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:3128
+#: merge-recursive.c:3131
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略過 %s(已經做過相同合併)"
-#: merge-recursive.c:3181
+#: merge-recursive.c:3184
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 為名新增"
-#: merge-recursive.c:3385
+#: merge-recursive.c:3388
#, c-format
msgid "Removing %s"
msgstr "刪除 %s"
-#: merge-recursive.c:3408
+#: merge-recursive.c:3411
msgid "file/directory"
msgstr "檔案/目錄"
-#: merge-recursive.c:3413
+#: merge-recursive.c:3416
msgid "directory/file"
msgstr "目錄/檔案"
-#: merge-recursive.c:3420
+#: merge-recursive.c:3423
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "衝突(%1$s):在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s"
-#: merge-recursive.c:3429
+#: merge-recursive.c:3432
#, c-format
msgid "Adding %s"
msgstr "新增 %s"
-#: merge-recursive.c:3438
+#: merge-recursive.c:3441
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "衝突(add/add):合併衝突於 %s"
-#: merge-recursive.c:3491
+#: merge-recursive.c:3494
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "無法合併樹 %s 和 %s"
-#: merge-recursive.c:3585
+#: merge-recursive.c:3588
msgid "Merging:"
msgstr "合併:"
-#: merge-recursive.c:3598
+#: merge-recursive.c:3601
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "發現 %u 個共同祖先:"
-#: merge-recursive.c:3648
+#: merge-recursive.c:3651
msgid "merge returned no commit"
msgstr "合併未返回提交"
-#: merge-recursive.c:3816
+#: merge-recursive.c:3823
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析物件 '%s'"
-#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
+#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
#: builtin/stash.c:489
msgid "Unable to write index."
msgstr "不能寫入索引。"
msgid "failed to read the cache"
msgstr "讀取快取失敗"
-#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
-#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
+#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
+#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
#: builtin/stash.c:269
msgid "unable to write new index file"
msgstr "無法寫新的索引檔案"
-#: midx.c:78
+#: midx.c:79
msgid "multi-pack-index OID fanout is of the wrong size"
msgstr "多包索引的物件 ID fanout 大小錯誤"
-#: midx.c:111
+#: midx.c:112
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引檔案 %s 太小"
-#: midx.c:127
+#: midx.c:128
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"
-#: midx.c:132
+#: midx.c:133
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被識別"
-#: midx.c:137
+#: midx.c:138
#, c-format
msgid "multi-pack-index hash version %u does not match version %u"
msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"
-#: midx.c:154
+#: midx.c:155
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名區塊"
-#: midx.c:156
+#: midx.c:157
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "多包索引缺少必需的物件 ID fanout 區塊"
-#: midx.c:158
+#: midx.c:159
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "多包索引缺少必需的物件 ID 查詢區塊"
-#: midx.c:160
+#: midx.c:161
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的物件位移區塊"
-#: midx.c:176
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名無序:'%s' 在 '%s' 之前"
-#: midx.c:224
+#: midx.c:228
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "錯的 pack-int-id:%u(共有 %u 個包)"
-#: midx.c:274
+#: midx.c:278
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引儲存一個64位位移,但是 off_t 太小"
-#: midx.c:505
+#: midx.c:509
#, c-format
msgid "failed to add packfile '%s'"
msgstr "新增 packfile '%s' 失敗"
-#: midx.c:511
+#: midx.c:515
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "開啟包索引 '%s' 失敗"
-#: midx.c:579
+#: midx.c:583
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "在 packfile 中定位物件 %d 失敗"
-#: midx.c:895
+#: midx.c:911
msgid "cannot store reverse index file"
msgstr "無法儲存倒排索引檔案"
-#: midx.c:993
+#: midx.c:1009
#, c-format
msgid "could not parse line: %s"
msgstr "無法解析橫列:%s"
-#: midx.c:995
+#: midx.c:1011
#, c-format
msgid "malformed line: %s"
msgstr "橫列格式錯誤:%s"
-#: midx.c:1162
+#: midx.c:1181
msgid "ignoring existing multi-pack-index; checksum mismatch"
msgstr "忽略現有的多包索引:總和檢查碼不符"
-#: midx.c:1187
+#: midx.c:1206
msgid "could not load pack"
msgstr "無法載入包"
-#: midx.c:1193
+#: midx.c:1212
#, c-format
msgid "could not open index for %s"
msgstr "無法開啟 %s 的索引"
-#: midx.c:1204
+#: midx.c:1223
msgid "Adding packfiles to multi-pack-index"
msgstr "正在新增 packfile 至多包索引"
-#: midx.c:1247
+#: midx.c:1266
#, c-format
msgid "unknown preferred pack: '%s'"
msgstr "未知偏好包:「%s」"
-#: midx.c:1292
+#: midx.c:1311
#, c-format
msgid "cannot select preferred pack %s with no objects"
msgstr "無法選取偏好,沒有物件的 %s 包"
-#: midx.c:1324
+#: midx.c:1343
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "沒有看到要捨棄的包檔案 %s"
-#: midx.c:1370
+#: midx.c:1389
#, c-format
msgid "preferred pack '%s' is expired"
msgstr "偏好包「%s」已經過期"
-#: midx.c:1383
+#: midx.c:1402
msgid "no pack files to index."
msgstr "沒有要索引的 pack 檔案。"
-#: midx.c:1420
+#: midx.c:1409
+msgid "refusing to write multi-pack .bitmap without any objects"
+msgstr "拒絕寫入無任何物件的多包 .bitmap"
+
+#: midx.c:1451
msgid "could not write multi-pack bitmap"
msgstr "無法寫入多包位圖"
-#: midx.c:1430
+#: midx.c:1461
msgid "could not write multi-pack-index"
msgstr "無法寫入多包索引"
-#: midx.c:1489 builtin/clean.c:37
+#: midx.c:1520 builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "刪除 %s 失敗"
-#: midx.c:1522
+#: midx.c:1553
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "清理位於 %s 的多包索引失敗"
-#: midx.c:1585
+#: midx.c:1616
msgid "multi-pack-index file exists, but failed to parse"
msgstr "有 multi-pack-index 檔案,但無法解析"
-#: midx.c:1593
+#: midx.c:1624
msgid "incorrect checksum"
msgstr "總和檢查碼不正確"
-#: midx.c:1596
+#: midx.c:1627
msgid "Looking for referenced packfiles"
msgstr "正在尋找引用的 packfile"
-#: midx.c:1611
+#: midx.c:1642
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "物件 ID 扇出無序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1616
+#: midx.c:1647
msgid "the midx contains no oid"
msgstr "midx 沒有 oid"
-#: midx.c:1625
+#: midx.c:1656
msgid "Verifying OID order in multi-pack-index"
msgstr "正在驗證多包索引中的物件 ID 順序"
-#: midx.c:1634
+#: midx.c:1665
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "物件 ID 查詢無序:oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1654
+#: midx.c:1685
msgid "Sorting objects by packfile"
msgstr "透過 packfile 為物件排序"
-#: midx.c:1661
+#: midx.c:1692
msgid "Verifying object offsets"
msgstr "正在驗證物件位移"
-#: midx.c:1677
+#: midx.c:1708
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "為 oid[%d] = %s 載入包條目失敗"
-#: midx.c:1683
+#: midx.c:1714
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "為 packfile %s 載入包索引失敗"
-#: midx.c:1692
+#: midx.c:1723
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 錯誤的物件位移:%<PRIx64> != %<PRIx64>"
-#: midx.c:1719
+#: midx.c:1750
msgid "Counting referenced objects"
msgstr "正在計算引用物件"
-#: midx.c:1729
+#: midx.c:1760
msgid "Finding and deleting unreferenced packfiles"
msgstr "正在尋找並刪除沒有引用的 packfile"
-#: midx.c:1921
+#: midx.c:1952
msgid "could not start pack-objects"
msgstr "不能開始 pack-objects"
-#: midx.c:1941
+#: midx.c:1972
msgid "could not finish pack-objects"
msgstr "不能結束 pack-objects"
msgid "unable to join lazy_name thread: %s"
msgstr "不能加入 lazy_name 執行緒:%s"
-#: notes-merge.c:277
+#: notes-merge.c:276
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"在開始一個新的備註合併之前,請使用 'git notes merge --commit' 或者 'git "
"notes merge --abort' 來提交/終止前一次合併。"
-#: notes-merge.c:284
+#: notes-merge.c:283
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "您尚未結束備註合併(存在 %s)。"
msgid "Bad %s value: '%s'"
msgstr "壞的 %s 值:'%s'"
-#: object-file.c:456
+#: object-file.c:457
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "物件目錄 %s 不存在,檢查 .git/objects/info/alternates"
-#: object-file.c:514
+#: object-file.c:515
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "無法規範化備用物件路徑:%s"
-#: object-file.c:588
+#: object-file.c:589
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s:忽略備用物件庫,嵌套太深"
-#: object-file.c:595
+#: object-file.c:596
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "無法規範化物件目錄: %s"
-#: object-file.c:638
+#: object-file.c:639
msgid "unable to fdopen alternates lockfile"
msgstr "無法 fdopen 取代鎖檔案"
-#: object-file.c:656
+#: object-file.c:657
msgid "unable to read alternates file"
msgstr "無法讀取替代檔案"
-#: object-file.c:663
+#: object-file.c:664
msgid "unable to move new alternates file into place"
msgstr "無法將新的替代檔案移動到位"
-#: object-file.c:741
+#: object-file.c:742
#, c-format
msgid "path '%s' does not exist"
msgstr "路徑 '%s' 不存在"
-#: object-file.c:762
+#: object-file.c:763
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。"
-#: object-file.c:768
+#: object-file.c:769
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "引用版本庫 '%s' 不是一個本機版本庫。"
-#: object-file.c:774
+#: object-file.c:775
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "引用版本庫 '%s' 是一個淺複製"
-#: object-file.c:782
+#: object-file.c:783
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "引用版本庫 '%s' 已被移植"
-#: object-file.c:813
+#: object-file.c:814
#, c-format
msgid "could not find object directory matching %s"
msgstr "找不到符合 %s 的物件目錄"
-#: object-file.c:863
+#: object-file.c:864
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "解析備用引用時無效的行:%s"
-#: object-file.c:1013
+#: object-file.c:1014
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "嘗試 mmap %<PRIuMAX>,超過了最大值 %<PRIuMAX>"
-#: object-file.c:1048
+#: object-file.c:1049
#, c-format
msgid "mmap failed%s"
msgstr "mmap 失敗%s"
-#: object-file.c:1214
+#: object-file.c:1230
#, c-format
msgid "object file %s is empty"
msgstr "物件檔案 %s 為空"
-#: object-file.c:1333 object-file.c:2542
+#: object-file.c:1349 object-file.c:2588
#, c-format
msgid "corrupt loose object '%s'"
msgstr "損壞的鬆散物件 '%s'"
-#: object-file.c:1335 object-file.c:2546
+#: object-file.c:1351 object-file.c:2592
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "鬆散物件 '%s' 後面有垃圾資料"
-#: object-file.c:1457
+#: object-file.c:1473
#, c-format
msgid "unable to parse %s header"
msgstr "無法解析 %s 頭部"
-#: object-file.c:1459
+#: object-file.c:1475
msgid "invalid object type"
msgstr "無效的物件類型"
-#: object-file.c:1470
+#: object-file.c:1486
#, c-format
msgid "unable to unpack %s header"
msgstr "無法解開 %s 頭部"
-#: object-file.c:1474
+#: object-file.c:1490
#, c-format
msgid "header for %s too long, exceeds %d bytes"
msgstr "%s 的標頭過長,超出 %d 位元組"
-#: object-file.c:1704
+#: object-file.c:1720
#, c-format
msgid "failed to read object %s"
msgstr "讀取物件 %s 失敗"
-#: object-file.c:1708
+#: object-file.c:1724
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: object-file.c:1712
+#: object-file.c:1728
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "鬆散物件 %s(儲存在 %s)已損壞"
-#: object-file.c:1716
+#: object-file.c:1732
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包物件 %s(儲存在 %s)已損壞"
-#: object-file.c:1821
+#: object-file.c:1855
#, c-format
msgid "unable to write file %s"
msgstr "無法寫檔案 %s"
-#: object-file.c:1828
+#: object-file.c:1862
#, c-format
msgid "unable to set permission to '%s'"
msgstr "無法為 '%s' 設定權限"
-#: object-file.c:1835
+#: object-file.c:1869
msgid "file write error"
msgstr "檔案寫錯誤"
-#: object-file.c:1858
+#: object-file.c:1904
msgid "error when closing loose object file"
msgstr "關閉鬆散物件檔案時發生錯誤"
-#: object-file.c:1925
+#: object-file.c:1971
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "權限不足,無法在版本庫物件庫 %s 中新增物件"
-#: object-file.c:1927
+#: object-file.c:1973
msgid "unable to create temporary file"
msgstr "無法建立暫存檔"
-#: object-file.c:1951
+#: object-file.c:1997
msgid "unable to write loose object file"
msgstr "不能寫鬆散物件檔案"
-#: object-file.c:1957
+#: object-file.c:2003
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能壓縮新物件 %s(%d)"
-#: object-file.c:1961
+#: object-file.c:2007
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在物件 %s 上呼叫 deflateEnd 失敗(%d)"
-#: object-file.c:1965
+#: object-file.c:2011
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "被 %s 的不穩定物件來源資料混淆"
-#: object-file.c:1976 builtin/pack-objects.c:1243
+#: object-file.c:2022 builtin/pack-objects.c:1251
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上呼叫 utime() 失敗"
-#: object-file.c:2054
+#: object-file.c:2100
#, c-format
msgid "cannot read object for %s"
msgstr "不能讀取物件 %s"
-#: object-file.c:2105
+#: object-file.c:2151
msgid "corrupt commit"
msgstr "損壞的提交"
-#: object-file.c:2113
+#: object-file.c:2159
msgid "corrupt tag"
msgstr "損壞的標籤"
-#: object-file.c:2213
+#: object-file.c:2259
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 時讀取錯誤"
-#: object-file.c:2216
+#: object-file.c:2262
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 時讀入不完整"
-#: object-file.c:2289 object-file.c:2299
+#: object-file.c:2335 object-file.c:2345
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s:插入資料庫失敗"
-#: object-file.c:2305
+#: object-file.c:2351
#, c-format
msgid "%s: unsupported file type"
msgstr "%s:不支援的檔案類型"
-#: object-file.c:2329 builtin/fetch.c:1453
+#: object-file.c:2375 builtin/fetch.c:1494
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一個有效的物件"
-#: object-file.c:2331
+#: object-file.c:2377
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一個有效的 '%s' 物件"
-#: object-file.c:2358
+#: object-file.c:2404
#, c-format
msgid "unable to open %s"
msgstr "不能開啟 %s"
-#: object-file.c:2553
+#: object-file.c:2599
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s 的雜湊值不符合(預期 %s)"
-#: object-file.c:2576
+#: object-file.c:2622
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
-#: object-file.c:2582
+#: object-file.c:2628
#, c-format
msgid "unable to unpack header of %s"
msgstr "無法解壓縮 %s 的頭部"
-#: object-file.c:2587
+#: object-file.c:2633
#, c-format
msgid "unable to parse header of %s"
msgstr "無法解析 %s 的頭部"
-#: object-file.c:2598
+#: object-file.c:2644
#, c-format
msgid "unable to unpack contents of %s"
msgstr "無法解壓縮 %s 的內容"
-#: object-name.c:480
+#. TRANSLATORS: This is a line of ambiguous object
+#. output shown when we cannot look up or parse the
+#. object in question. E.g. "deadbeef [bad object]".
+#.
+#: object-name.c:382
+#, c-format
+msgid "%s [bad object]"
+msgstr "%s [無效物件]"
+
+#. TRANSLATORS: This is a line of ambiguous commit
+#. object output. E.g.:
+#. *
+#. "deadbeef commit 2021-01-01 - Some Commit Message"
+#.
+#: object-name.c:407
+#, c-format
+msgid "%s commit %s - %s"
+msgstr "%s 提交 %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output. E.g.:
+#. *
+#. "deadbeef tag 2022-01-01 - Some Tag Message"
+#. *
+#. The second argument is the YYYY-MM-DD found
+#. in the tag.
+#. *
+#. The third argument is the "tag" string
+#. from object.c.
+#.
+#: object-name.c:428
+#, c-format
+msgid "%s tag %s - %s"
+msgstr "%s 標籤 %s - %s"
+
+#. TRANSLATORS: This is a line of ambiguous
+#. tag object output where we couldn't parse
+#. the tag itself. E.g.:
+#. *
+#. "deadbeef [bad tag, could not parse it]"
+#.
+#: object-name.c:439
+#, c-format
+msgid "%s [bad tag, could not parse it]"
+msgstr "%s [無效標籤,無法解析]"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef tree".
+#.
+#: object-name.c:447
+#, c-format
+msgid "%s tree"
+msgstr "%s 樹"
+
+#. TRANSLATORS: This is a line of ambiguous <type>
+#. object output. E.g. "deadbeef blob".
+#.
+#: object-name.c:453
+#, c-format
+msgid "%s blob"
+msgstr "%s blob"
+
+#: object-name.c:569
#, c-format
msgid "short object ID %s is ambiguous"
msgstr "短物件 ID %s 存在歧義"
-#: object-name.c:491
-msgid "The candidates are:"
-msgstr "候選者有:"
+#. TRANSLATORS: The argument is the list of ambiguous
+#. objects composed in show_ambiguous_object(). See
+#. its "TRANSLATORS" comments for details.
+#.
+#: object-name.c:591
+#, c-format
+msgid ""
+"The candidates are:\n"
+"%s"
+msgstr ""
+"候選物件有:\n"
+"%s"
-#: object-name.c:790
+#: object-name.c:888
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"請檢查這些引用,並視需要刪除。執行\n"
"「git config advice.objectNameWarning false」命令以關閉本訊息通知"
-#: object-name.c:910
+#: object-name.c:1008
#, c-format
msgid "log for '%.*s' only goes back to %s"
msgstr "'%.*s' 的日誌只能回到 %s"
-#: object-name.c:918
+#: object-name.c:1016
#, c-format
msgid "log for '%.*s' only has %d entries"
msgstr "'%.*s' 的日誌只有 %d 個項目"
-#: object-name.c:1696
+#: object-name.c:1794
#, c-format
msgid "path '%s' exists on disk, but not in '%.*s'"
msgstr "磁碟上存在 '%s' 路徑,但不存在於 '%.*s'"
-#: object-name.c:1702
+#: object-name.c:1800
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
"'%s' 路徑存在,但不是 '%s'\n"
"提示:你在說 '%.*s:%s',即 '%.*s:./%s' 嗎?"
-#: object-name.c:1711
+#: object-name.c:1809
#, c-format
msgid "path '%s' does not exist in '%.*s'"
msgstr "'%s' 路徑不存在於 '%.*s'"
-#: object-name.c:1739
+#: object-name.c:1837
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
"'%s' 路徑在索引,但不在 %d 暫存區\n"
"提示:你在說 ':%d:%s' 嗎?"
-#: object-name.c:1755
+#: object-name.c:1853
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
"'%s' 路徑在索引,但不是 '%s'\n"
"提示:你在說 ':%d:%s',即 ':%d:%s' 嗎?"
-#: object-name.c:1763
+#: object-name.c:1861
#, c-format
msgid "path '%s' exists on disk, but not in the index"
msgstr "磁碟上存在 '%s' 路徑,但不在索引中"
-#: object-name.c:1765
+#: object-name.c:1863
#, c-format
msgid "path '%s' does not exist (neither on disk nor in the index)"
msgstr "'%s' 路徑不存在 (既不存在磁碟,也不存在索引)"
-#: object-name.c:1778
+#: object-name.c:1876
msgid "relative path syntax can't be used outside working tree"
msgstr "相對路徑與法不能用在工作區外"
-#: object-name.c:1916
+#: object-name.c:1901
+#, c-format
+msgid "<object>:<path> required, only <object> '%s' given"
+msgstr "需要指定 <object>:<path>,卻只指定 <object>「%s」"
+
+#: object-name.c:2014
#, c-format
msgid "invalid object name '%.*s'."
msgstr "'%.*s' 物件名稱無效。"
msgid "unable to parse object: %s"
msgstr "不能解析物件:%s"
-#: object.c:283 object.c:295
+#: object.c:283 object.c:294
#, c-format
msgid "hash mismatch %s"
msgstr "雜湊值與 %s 不符合"
msgid "multi-pack bitmap is missing required reverse index"
msgstr "多包位圖缺少需要的反向索引"
-#: pack-bitmap.c:429
+#: pack-bitmap.c:433
msgid "load_reverse_index: could not open pack"
msgstr "load_reverse_index:無法開啟包"
-#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432
#, c-format
msgid "unable to get size of %s"
msgstr "不能得到 %s 的大小"
-#: pack-bitmap.c:1935
+#: pack-bitmap.c:1937
#, c-format
msgid "could not find %s in pack %s at offset %<PRIuMAX>"
msgstr "找不到 %2$s 包,偏移位置 %3$<PRIuMAX> 的 %1$s"
-#: pack-bitmap.c:1971 builtin/rev-list.c:92
+#: pack-bitmap.c:1973 builtin/rev-list.c:91
#, c-format
msgid "unable to get disk usage of %s"
msgstr "無法取得 %s 的磁碟用量"
msgid "failed to make %s readable"
msgstr "無法讓 %s 能夠寫入"
-#: pack-write.c:520
+#: pack-write.c:521
#, c-format
msgid "could not write '%s' promisor file"
msgstr "無法寫入「%s」promisor 檔案"
msgid "Removing duplicate objects"
msgstr "正在刪除重複物件"
-#: range-diff.c:67
+#: range-diff.c:68
msgid "could not start `log`"
msgstr "不能啟動 `log`"
-#: range-diff.c:69
+#: range-diff.c:70
msgid "could not read `log` output"
msgstr "不能讀取 `log` 的輸出"
-#: range-diff.c:97 sequencer.c:5602
+#: range-diff.c:98 sequencer.c:5575
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
-#: range-diff.c:111
+#: range-diff.c:109
#, c-format
msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
"'%s'"
msgstr "無法解析第一行「log」輸出:開頭不是「commit」:「%s」"
-#: range-diff.c:137
+#: range-diff.c:132
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "無法解析 git 頭 '%.*s'"
-#: range-diff.c:304
+#: range-diff.c:300
msgid "failed to generate diff"
msgstr "生成 diff 失敗"
-#: range-diff.c:562 range-diff.c:564
+#: range-diff.c:558 range-diff.c:560
#, c-format
msgid "could not parse log for '%s'"
msgstr "不能解析 '%s' 的日誌"
-#: read-cache.c:723
+#: read-cache.c:737
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "將不會新增檔案別名 '%s'('%s' 已經存在於索引中)"
-#: read-cache.c:739
+#: read-cache.c:753
msgid "cannot create an empty blob in the object database"
msgstr "不能在物件資料庫中建立空的資料物件"
-#: read-cache.c:761
+#: read-cache.c:775
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr "%s:只能新增一般檔案、符號連結或 git 目錄"
-#: read-cache.c:766 builtin/submodule--helper.c:3242
+#: read-cache.c:780 builtin/submodule--helper.c:3359
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' 沒有簽出一個提交"
-#: read-cache.c:818
+#: read-cache.c:832
#, c-format
msgid "unable to index file '%s'"
msgstr "無法索引檔案 '%s'"
-#: read-cache.c:837
+#: read-cache.c:851
#, c-format
msgid "unable to add '%s' to index"
msgstr "無法在索引中新增 '%s'"
-#: read-cache.c:848
+#: read-cache.c:862
#, c-format
msgid "unable to stat '%s'"
msgstr "無法對 %s 執行 stat"
-#: read-cache.c:1386
+#: read-cache.c:1404
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' 看起來既是檔案又是目錄"
-#: read-cache.c:1601
+#: read-cache.c:1619
msgid "Refresh index"
msgstr "重新整理索引"
-#: read-cache.c:1733
+#: read-cache.c:1751
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"設定了 index.version,但是取值無效。\n"
"使用版本 %i"
-#: read-cache.c:1743
+#: read-cache.c:1761
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"設定了 GIT_INDEX_VERSION,但是取值無效。\n"
"使用版本 %i"
-#: read-cache.c:1799
+#: read-cache.c:1817
#, c-format
msgid "bad signature 0x%08x"
msgstr "壞的簽名 0x%08x"
-#: read-cache.c:1802
+#: read-cache.c:1820
#, c-format
msgid "bad index version %d"
msgstr "壞的索引版本 %d"
-#: read-cache.c:1811
+#: read-cache.c:1829
msgid "bad index file sha1 signature"
msgstr "壞的索引檔案 sha1 簽名"
-#: read-cache.c:1845
+#: read-cache.c:1863
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "索引使用不被支援的 %.4s 副檔名"
#
-#: read-cache.c:1847
+#: read-cache.c:1865
#, c-format
msgid "ignoring %.4s extension"
msgstr "忽略 %.4s 副檔名"
-#: read-cache.c:1884
+#: read-cache.c:1902
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "未知的索引條目格式 0x%08x"
-#: read-cache.c:1900
+#: read-cache.c:1918
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"
-#: read-cache.c:1957
+#: read-cache.c:1975
msgid "unordered stage entries in index"
msgstr "索引中有未排序的暫存條目"
-#: read-cache.c:1960
+#: read-cache.c:1978
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "合併檔案 '%s' 有多個暫存條目"
-#: read-cache.c:1963
+#: read-cache.c:1981
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' 的未排序暫存條目"
-#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
-#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
-#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
+#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096
+#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183
+#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016
+#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521
+#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293
+#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319
msgid "index file corrupt"
msgstr "索引檔案損壞"
-#: read-cache.c:2222
+#: read-cache.c:2240
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "無法建立 load_cache_entries 執行緒:%s"
-#: read-cache.c:2235
+#: read-cache.c:2253
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "無法加入 load_cache_entries 執行緒:%s"
-#: read-cache.c:2268
+#: read-cache.c:2286
#, c-format
msgid "%s: index file open failed"
msgstr "%s:開啟索引檔案失敗"
-#: read-cache.c:2272
+#: read-cache.c:2290
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s:不能對開啟的索引執行 stat 動作"
-#: read-cache.c:2276
+#: read-cache.c:2294
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s:索引檔案比預期的小"
-#: read-cache.c:2280
+#: read-cache.c:2298
#, c-format
msgid "%s: unable to map index file%s"
msgstr "%s:無法 map 索引檔案%s"
-#: read-cache.c:2323
+#: read-cache.c:2341
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "無法建立 load_index_extensions 執行緒:%s"
-#: read-cache.c:2350
+#: read-cache.c:2368
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "無法加入 load_index_extensions 執行緒:%s"
-#: read-cache.c:2396
+#: read-cache.c:2414
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "無法重新整理共享索引 '%s'"
-#: read-cache.c:2455
+#: read-cache.c:2473
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "損壞的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
-#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
+#: read-cache.c:3032
+msgid "cannot write split index for a sparse index"
+msgstr "無法寫入稀疏索引的索引分割"
+
+#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156
#, c-format
msgid "could not close '%s'"
msgstr "不能關閉 '%s'"
-#: read-cache.c:3129
+#: read-cache.c:3157
msgid "failed to convert to a sparse-index"
msgstr "無法轉換成稀疏索引"
-#: read-cache.c:3200
+#: read-cache.c:3228
#, c-format
msgid "could not stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
-#: read-cache.c:3213
+#: read-cache.c:3241
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能開啟 git 目錄:%s"
-#: read-cache.c:3225
+#: read-cache.c:3253
#, c-format
msgid "unable to unlink: %s"
msgstr "無法刪除:%s"
-#: read-cache.c:3254
+#: read-cache.c:3282
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "不能修復 '%s' 的權限位"
-#: read-cache.c:3411
+#: read-cache.c:3439
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s:不能落到暫存區 #0"
"然而,如果您刪除全部內容,重定基底動作將會終止。\n"
"\n"
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
-#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
-#: builtin/rebase.c:190
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879
+#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791
+#: builtin/rebase.c:191
#, c-format
msgid "could not write '%s'"
msgstr "不能寫入 '%s'"
msgid "%s: 'preserve' superseded by 'merges'"
msgstr "%s:「preserve」已經改成「merges」"
-#: ref-filter.c:42 wt-status.c:2048
+#: ref-filter.c:42 wt-status.c:2057
msgid "gone"
msgstr "遺失"
msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
msgstr "--format=%.*s 不能和 --python、--shell、--tcl 一起使用"
-#: ref-filter.c:1706
+#: ref-filter.c:1707
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(無分支,重定 %s 的基底)"
-#: ref-filter.c:1709
+#: ref-filter.c:1710
#, c-format
msgid "(no branch, rebasing detached HEAD %s)"
msgstr "(無分支,重定 %s 分離開頭指標的基底)"
-#: ref-filter.c:1712
+#: ref-filter.c:1713
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(無分支,二分搜尋從 %s 開始)"
-#: ref-filter.c:1716
+#: ref-filter.c:1717
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(開頭指標分離於 %s)"
-#: ref-filter.c:1719
+#: ref-filter.c:1720
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(開頭指標分離自 %s)"
-#: ref-filter.c:1722
+#: ref-filter.c:1723
msgid "(no branch)"
msgstr "(無分支)"
-#: ref-filter.c:1754 ref-filter.c:1972
+#: ref-filter.c:1755 ref-filter.c:1973
#, c-format
msgid "missing object %s for %s"
msgstr "缺少 %2$s 的物件 %1$s"
-#: ref-filter.c:1764
+#: ref-filter.c:1765
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"
-#: ref-filter.c:2155
+#: ref-filter.c:2156
#, c-format
msgid "malformed object at '%s'"
msgstr "格式錯誤的物件 '%s'"
-#: ref-filter.c:2245
+#: ref-filter.c:2246
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略帶有錯誤名稱 %s 的引用"
-#: ref-filter.c:2250 refs.c:676
+#: ref-filter.c:2251 refs.c:672
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略損壞的引用 %s"
-#: ref-filter.c:2629
+#: ref-filter.c:2630
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式:缺少 %%(end) 元素"
-#: ref-filter.c:2740
+#: ref-filter.c:2741
#, c-format
msgid "malformed object name %s"
msgstr "格式錯誤的物件名 %s"
-#: ref-filter.c:2745
+#: ref-filter.c:2746
#, c-format
msgid "option `%s' must point to a commit"
msgstr "選項 `%s' 必須指向一個提交"
-#: refs.c:261
+#: reflog.c:407
+#, c-format
+msgid "not a reflog: %s"
+msgstr "不是引用日誌:%s"
+
+#: reflog.c:410
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "沒有 '%s' 的引用日誌"
+
+#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s 沒有指向一個有效的物件!"
-#: refs.c:563
+#: refs.c:561
#, c-format
msgid ""
"Using '%s' as the name for the initial branch. This default branch name\n"
"\n"
"\tgit branch -m <name>\n"
-#: refs.c:585
+#: refs.c:583
#, c-format
msgid "could not retrieve `%s`"
msgstr "無法擷取「%s」"
-#: refs.c:595
+#: refs.c:593
#, c-format
msgid "invalid branch name: %s = %s"
msgstr "分支名稱無效:%s = %s"
-#: refs.c:674
+#: refs.c:670
#, c-format
msgid "ignoring dangling symref %s"
msgstr "忽略懸空符號引用 %s"
-#: refs.c:925
+#: refs.c:919
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "引用 %s 的日誌在 %s 之後有缺口"
-#: refs.c:932
+#: refs.c:926
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "引用 %s 的日誌意外終止於 %s"
-#: refs.c:997
+#: refs.c:991
#, c-format
msgid "log for %s is empty"
msgstr "%s 的日誌為空"
-#: refs.c:1090
+#: refs.c:1086
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
-#: refs.c:1168
+#: refs.c:1164
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "對引用 '%s' 執行 update_ref 失敗:%s"
-#: refs.c:2067
+#: refs.c:2059
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "不允許對引用 '%s' 多次更新"
-#: refs.c:2150
+#: refs.c:2145
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔離環境中禁止更新引用"
-#: refs.c:2161
+#: refs.c:2156
msgid "ref updates aborted by hook"
msgstr "引用更新被掛鉤拒絕"
-#: refs.c:2269 refs.c:2299
+#: refs.c:2264 refs.c:2294
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' 已存在,無法建立 '%s'"
-#: refs.c:2275 refs.c:2310
+#: refs.c:2270 refs.c:2305
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "無法同時處理 '%s' 和 '%s'"
-#: refs/files-backend.c:1267
+#: refs/files-backend.c:1295
#, c-format
msgid "could not remove reference %s"
msgstr "無法刪除引用 %s"
-#: refs/files-backend.c:1281 refs/packed-backend.c:1549
-#: refs/packed-backend.c:1559
+#: refs/files-backend.c:1310 refs/packed-backend.c:1565
+#: refs/packed-backend.c:1575
#, c-format
msgid "could not delete reference %s: %s"
msgstr "無法刪除引用 %s:%s"
-#: refs/files-backend.c:1284 refs/packed-backend.c:1562
+#: refs/files-backend.c:1313 refs/packed-backend.c:1578
#, c-format
msgid "could not delete references: %s"
msgstr "無法刪除引用:%s"
msgid "more than one uploadpack given, using the first"
msgstr "提供了一個以上的 uploadpack,使用第一個"
-#: remote.c:699
+#: remote.c:698
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同時取得 %s 和 %s 至 %s"
-#: remote.c:703
+#: remote.c:702
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常追蹤 %s,而非 %s"
-#: remote.c:707
+#: remote.c:706
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同時追蹤 %s 和 %s"
-#: remote.c:775
+#: remote.c:774
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "模式的鍵 '%s' 沒有 '*'"
-#: remote.c:785
+#: remote.c:784
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "模式的值 '%s' 沒有 '*'"
-#: remote.c:1192
+#: remote.c:1191
#, c-format
msgid "src refspec %s does not match any"
msgstr "來源引用規格 %s 沒有符合項目"
-#: remote.c:1197
+#: remote.c:1196
#, c-format
msgid "src refspec %s matches more than one"
msgstr "來源引用規格 %s 符合超過一個"
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1212
+#: remote.c:1211
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"\n"
"由於這些猜測都不正確,我們放棄了。您必須給出完整引用。"
-#: remote.c:1232
+#: remote.c:1231
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"您是想透過推送至「%s:refs/heads/%s」\n"
"來建立新分支嗎?"
-#: remote.c:1237
+#: remote.c:1236
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"您是想透過推送至「%s:refs/tags/%s」\n"
"來建立新標籤嗎?"
-#: remote.c:1242
+#: remote.c:1241
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"您是想透過推送至「%s:refs/tags/%s」\n"
"為新樹狀物件貼上標籤嗎?"
-#: remote.c:1247
+#: remote.c:1246
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"您是想透過推送至「%s:refs/tags/%s」\n"
"為新資料物件貼上標籤嗎?"
-#: remote.c:1283
+#: remote.c:1282
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s 無法被解析為分支"
-#: remote.c:1294
+#: remote.c:1293
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "無法刪除 '%s':遠端引用不存在"
-#: remote.c:1306
+#: remote.c:1305
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "目的地引用規格 %s 符合超過一個"
-#: remote.c:1313
+#: remote.c:1312
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "目的地引用 %s 接收超過一個來源"
-#: remote.c:1834 remote.c:1941
+#: remote.c:1833 remote.c:1940
msgid "HEAD does not point to a branch"
msgstr "HEAD 沒有指向一個分支"
-#: remote.c:1843
+#: remote.c:1842
#, c-format
msgid "no such branch: '%s'"
msgstr "沒有此分支:'%s'"
-#: remote.c:1846
+#: remote.c:1845
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未給分支 '%s' 設定上游"
-#: remote.c:1852
+#: remote.c:1851
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支"
-#: remote.c:1867
+#: remote.c:1866
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目的地 '%s' 至遠端 '%s' 沒有本機追蹤分支"
-#: remote.c:1882
+#: remote.c:1881
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 沒有設定要推送的遠端伺服器"
-#: remote.c:1892
+#: remote.c:1891
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用規格未包含 '%s'"
-#: remote.c:1905
+#: remote.c:1904
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送沒有目的地(push.default 是 'nothing')"
-#: remote.c:1927
+#: remote.c:1926
msgid "cannot resolve 'simple' push to a single destination"
msgstr "無法解析 'simple' 推送至單獨目的地"
-#: remote.c:2060
+#: remote.c:2059
#, c-format
msgid "couldn't find remote ref %s"
msgstr "無法找到遠端引用 %s"
-#: remote.c:2073
+#: remote.c:2072
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* 在本機忽略可笑的引用 '%s'"
-#: remote.c:2236
+#: remote.c:2235
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基於 '%s',但此上游分支已經不存在。\n"
-#: remote.c:2240
+#: remote.c:2239
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (使用 \"git branch --unset-upstream\" 來修復)\n"
-#: remote.c:2243
+#: remote.c:2242
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支與上游分支 '%s' 一致。\n"
-#: remote.c:2247
+#: remote.c:2246
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
-#: remote.c:2250
+#: remote.c:2249
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (使用 \"%s\" 檢視詳情)\n"
-#: remote.c:2254
+#: remote.c:2253
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n"
-#: remote.c:2260
+#: remote.c:2259
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (使用 \"git push\" 來發布您的本機提交)\n"
-#: remote.c:2263
+#: remote.c:2262
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[0] "您的分支落後 '%s' 共 %d 個提交,並且可以快轉。\n"
# 譯者:請維持前導空格
-#: remote.c:2271
+#: remote.c:2270
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (使用 \"git pull\" 來更新您的本機分支)\n"
-#: remote.c:2274
+#: remote.c:2273
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"並且分別有 %d 和 %d 處不同的提交。\n"
# 譯者:請維持前導空格
-#: remote.c:2284
+#: remote.c:2283
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (使用 \"git pull\" 來合併遠端分支)\n"
-#: remote.c:2476
+#: remote.c:2475
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "無法解析期望的物件名 '%s'"
#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
#, c-format
msgid "failed to flush '%s'"
-msgstr "重新整理 '%s' 失敗"
+msgstr "排清 '%s' 失敗"
-#: rerere.c:487 rerere.c:1023
+#: rerere.c:487 rerere.c:1024
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "不能解析 '%s' 中的衝突區塊"
-#: rerere.c:668
+#: rerere.c:669
#, c-format
msgid "failed utime() on '%s'"
msgstr "在 '%s' 上呼叫 utime() 失敗"
-#: rerere.c:678
+#: rerere.c:679
#, c-format
msgid "writing '%s' failed"
msgstr "寫入 '%s' 失敗"
-#: rerere.c:698
+#: rerere.c:699
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "使用之前的解決方案暫存 '%s'。"
-#: rerere.c:737
+#: rerere.c:738
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "已記錄 '%s' 的解決方案。"
-#: rerere.c:772
+#: rerere.c:773
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "使用之前的解決方案解決 '%s'。"
-#: rerere.c:787
+#: rerere.c:788
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "不能刪除 stray '%s'"
-#: rerere.c:791
+#: rerere.c:792
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "為 '%s' 記錄 preimage"
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
-#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
+#: rerere.c:866 submodule.c:2290 builtin/log.c:2042
+#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833
#, c-format
msgid "could not create directory '%s'"
msgstr "不能建立目錄 '%s'"
-#: rerere.c:1041
+#: rerere.c:1042
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "更新 '%s' 中的衝突狀態失敗"
-#: rerere.c:1052 rerere.c:1059
+#: rerere.c:1053 rerere.c:1060
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "沒有為 '%s' 記憶的解決方案"
-#: rerere.c:1061
+#: rerere.c:1062
#, c-format
msgid "cannot unlink '%s'"
msgstr "不能刪除 '%s'"
-#: rerere.c:1071
+#: rerere.c:1072
#, c-format
msgid "Updated preimage for '%s'"
msgstr "已為 '%s' 更新 preimage"
-#: rerere.c:1080
+#: rerere.c:1081
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "忘記 '%s' 的解決方案\n"
-#: rerere.c:1191
+#: rerere.c:1192
msgid "unable to open rr-cache directory"
msgstr "不能開啟 rr-cache 目錄"
-#: reset.c:42
+#: reset.c:112
msgid "could not determine HEAD revision"
msgstr "不能確定 HEAD 版本"
-#: reset.c:70 reset.c:76 sequencer.c:3700
+#: reset.c:141 reset.c:147 sequencer.c:3696
#, c-format
msgid "failed to find tree of %s"
msgstr "無法找到 %s 指向的樹"
-#: revision.c:2347
+#: revision.c:2358
msgid "--unpacked=<packfile> no longer supported"
msgstr "--unpacked=<packfile> 已不受支援"
-#: revision.c:2686
+#: revision.c:2712
msgid "your current branch appears to be broken"
msgstr "您的目前分支好像被損壞"
-#: revision.c:2689
+#: revision.c:2715
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的目前分支 '%s' 尚無任何提交"
-#: revision.c:2891
+#: revision.c:2901
+msgid "object filtering requires --objects"
+msgstr "物件過濾需要 --objects"
+
+#: revision.c:2918
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"
msgid "could not delete '%s'"
msgstr "無法刪除 '%s'"
-#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326
#: builtin/rm.c:409
#, c-format
msgid "could not remove '%s'"
"若要取消並返回 \"git revert\" 前的狀態,\n"
"請執行 \"git revert --abort\"。"
-#: sequencer.c:448 sequencer.c:3292
+#: sequencer.c:448 sequencer.c:3288
#, c-format
msgid "could not lock '%s'"
msgstr "不能鎖定 '%s'"
-#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
+#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715
#, c-format
msgid "could not write to '%s'"
msgstr "不能寫入 '%s'"
msgid "could not write eol to '%s'"
msgstr "不能將換行符號寫入 '%s'"
-#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
-#: sequencer.c:3569
+#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3565
#, c-format
msgid "failed to finalize '%s'"
msgstr "無法完成 '%s'"
-#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
-#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547
+#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154
#, c-format
msgid "could not read '%s'"
msgstr "不能讀取 '%s'"
msgid "%s: fast-forward"
msgstr "%s:快轉"
-#: sequencer.c:574 builtin/tag.c:614
+#: sequencer.c:574 builtin/tag.c:615
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "無效的清理模式 %s"
msgid "unable to dequote value of '%s'"
msgstr "無法為 '%s' 的值去引號"
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
-#: builtin/am.c:848 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757
+#: builtin/am.c:849 builtin/rebase.c:699
#, c-format
msgid "could not open '%s' for reading"
msgstr "無法開啟 '%s' 進行讀取"
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1288
+#: sequencer.c:1287
msgid "couldn't look up newly created commit"
msgstr "無法找到新建立的提交"
-#: sequencer.c:1290
+#: sequencer.c:1289
msgid "could not parse newly created commit"
msgstr "不能解析新建立的提交"
-#: sequencer.c:1339
+#: sequencer.c:1336
msgid "unable to resolve HEAD after creating commit"
msgstr "建立提交後,不能解析 HEAD"
-#: sequencer.c:1342
+#: sequencer.c:1338
msgid "detached HEAD"
msgstr "分離 HEAD"
# 譯者:中文字串拼接,可刪除前導空格
-#: sequencer.c:1346
+#: sequencer.c:1342
msgid " (root-commit)"
msgstr " (根提交)"
-#: sequencer.c:1367
+#: sequencer.c:1363
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1369
+#: sequencer.c:1365
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一個提交!"
-#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
+#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1429 sequencer.c:2314
+#: sequencer.c:1425 sequencer.c:2310
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
+#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 無法寫入樹狀物件"
-#: sequencer.c:1473 sequencer.c:1593
+#: sequencer.c:1469 sequencer.c:1589
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能從 '%s' 讀取提交說明"
-#: sequencer.c:1504 sequencer.c:1536
+#: sequencer.c:1500 sequencer.c:1532
#, c-format
msgid "invalid author identity '%s'"
msgstr "無效的作者身分 '%s'"
-#: sequencer.c:1510
+#: sequencer.c:1506
msgid "corrupt author: missing date information"
msgstr "作者資訊損壞:缺少日期資訊"
-#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
-#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921
+#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "寫提交物件失敗"
-#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199
#: t/helper/test-fast-rebase.c:217
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:1625
+#: sequencer.c:1621
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1630
+#: sequencer.c:1626
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1713 sequencer.c:1994
+#: sequencer.c:1709 sequencer.c:1990
#, c-format
msgid "unknown command: %d"
msgstr "未知指令:%d"
-#: sequencer.c:1755
+#: sequencer.c:1751
msgid "This is the 1st commit message:"
msgstr "這是第一個提交說明:"
-#: sequencer.c:1756
+#: sequencer.c:1752
#, c-format
msgid "This is the commit message #%d:"
msgstr "這是提交說明 #%d:"
-#: sequencer.c:1757
+#: sequencer.c:1753
msgid "The 1st commit message will be skipped:"
msgstr "略過第 1 個提交說明:"
-#: sequencer.c:1758
+#: sequencer.c:1754
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "略過第 %d 個提交說明:"
-#: sequencer.c:1759
+#: sequencer.c:1755
#, c-format
msgid "This is a combination of %d commits."
msgstr "這是整合 %d 個提交的集合提交。"
-#: sequencer.c:1906 sequencer.c:1963
+#: sequencer.c:1902 sequencer.c:1959
#, c-format
msgid "cannot write '%s'"
msgstr "不能寫 '%s'"
-#: sequencer.c:1953
+#: sequencer.c:1949
msgid "need a HEAD to fixup"
msgstr "需要一個 HEAD 來修復"
-#: sequencer.c:1955 sequencer.c:3596
+#: sequencer.c:1951 sequencer.c:3592
msgid "could not read HEAD"
msgstr "不能讀取 HEAD"
-#: sequencer.c:1957
+#: sequencer.c:1953
msgid "could not read HEAD's commit message"
msgstr "不能讀取 HEAD 的提交說明"
-#: sequencer.c:1981
+#: sequencer.c:1977
#, c-format
msgid "could not read commit message of %s"
msgstr "不能讀取 %s 的提交說明"
-#: sequencer.c:2091
+#: sequencer.c:2087
msgid "your index file is unmerged."
msgstr "您的索引檔案未完成合併。"
-#: sequencer.c:2098
+#: sequencer.c:2094
msgid "cannot fixup root commit"
msgstr "不能修復根提交"
-#: sequencer.c:2117
+#: sequencer.c:2113
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一個合併提交但未提供 -m 選項。"
-#: sequencer.c:2125 sequencer.c:2133
+#: sequencer.c:2121 sequencer.c:2129
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 沒有第 %d 個父提交"
-#: sequencer.c:2139
+#: sequencer.c:2135
#, c-format
msgid "cannot get commit message for %s"
msgstr "不能得到 %s 的提交說明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2158
+#: sequencer.c:2154
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s:不能解析父提交 %s"
-#: sequencer.c:2224
+#: sequencer.c:2220
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能將 '%s' 重新命名為 '%s'"
-#: sequencer.c:2284
+#: sequencer.c:2280
#, c-format
msgid "could not revert %s... %s"
msgstr "不能還原 %s... %s"
-#: sequencer.c:2285
+#: sequencer.c:2281
#, c-format
msgid "could not apply %s... %s"
msgstr "不能套用 %s... %s"
-#: sequencer.c:2306
+#: sequencer.c:2302
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n"
-#: sequencer.c:2364
+#: sequencer.c:2360
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s:無法讀取索引"
-#: sequencer.c:2372
+#: sequencer.c:2368
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s:無法重新整理索引"
-#: sequencer.c:2452
+#: sequencer.c:2448
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受參數:'%s'"
-#: sequencer.c:2461
+#: sequencer.c:2457
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的參數"
-#: sequencer.c:2504
+#: sequencer.c:2500
#, c-format
msgid "could not parse '%s'"
msgstr "無法解析 '%s'"
-#: sequencer.c:2565
+#: sequencer.c:2561
#, c-format
msgid "invalid line %d: %.*s"
msgstr "無效行 %d:%.*s"
-#: sequencer.c:2576
+#: sequencer.c:2572
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "沒有父提交的情況下不能 '%s'"
-#: sequencer.c:2624 builtin/rebase.c:184
+#: sequencer.c:2620 builtin/rebase.c:185
#, c-format
msgid "could not read '%s'."
msgstr "不能讀取 '%s'。"
-#: sequencer.c:2662
+#: sequencer.c:2658
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一個進行中的揀選"
-#: sequencer.c:2671
+#: sequencer.c:2667
msgid "cancelling a revert in progress"
msgstr "正在取消一個進行中的還原"
-#: sequencer.c:2711
+#: sequencer.c:2707
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "請用 'git rebase --edit-todo' 來修改。"
-#: sequencer.c:2713
+#: sequencer.c:2709
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清單:'%s'"
-#: sequencer.c:2718
+#: sequencer.c:2714
msgid "no commits parsed."
msgstr "沒有解析提交。"
-#: sequencer.c:2729
+#: sequencer.c:2725
msgid "cannot cherry-pick during a revert."
msgstr "不能在還原提交中執行揀選。"
-#: sequencer.c:2731
+#: sequencer.c:2727
msgid "cannot revert during a cherry-pick."
msgstr "不能在揀選中執行還原提交。"
-#: sequencer.c:2809
-#, c-format
-msgid "invalid value for %s: %s"
-msgstr "%s 的值無效:%s"
-
-#: sequencer.c:2918
+#: sequencer.c:2914
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2938
+#: sequencer.c:2934
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式錯誤的選項清單:'%s'"
-#: sequencer.c:3033 sequencer.c:4902
+#: sequencer.c:3029 sequencer.c:4875
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:3050
+#: sequencer.c:3046
msgid "revert is already in progress"
msgstr "一個還原動作已在進行"
-#: sequencer.c:3052
+#: sequencer.c:3048
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:3055
+#: sequencer.c:3051
msgid "cherry-pick is already in progress"
msgstr "揀選動作已在進行"
-#: sequencer.c:3057
+#: sequencer.c:3053
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:3071
+#: sequencer.c:3067
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能建立序列目錄 '%s'"
-#: sequencer.c:3086
+#: sequencer.c:3082
msgid "could not lock HEAD"
msgstr "不能鎖定 HEAD"
-#: sequencer.c:3146 sequencer.c:4612
+#: sequencer.c:3142 sequencer.c:4585
msgid "no cherry-pick or revert in progress"
msgstr "揀選或還原動作並未進行"
-#: sequencer.c:3148 sequencer.c:3159
+#: sequencer.c:3144 sequencer.c:3155
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:3150 sequencer.c:3194
+#: sequencer.c:3146 sequencer.c:3190
msgid "cannot abort from a branch yet to be born"
msgstr "不能從尚未建立的分支終止"
-#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
-#: builtin/grep.c:772
+#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457
+#: builtin/grep.c:774
#, c-format
msgid "cannot open '%s'"
msgstr "不能開啟 '%s'"
-#: sequencer.c:3182
+#: sequencer.c:3178
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能讀取 '%s':%s"
-#: sequencer.c:3183
+#: sequencer.c:3179
msgid "unexpected end of file"
msgstr "意外的檔案結束"
-#: sequencer.c:3189
+#: sequencer.c:3185
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞"
-#: sequencer.c:3200
+#: sequencer.c:3196
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移動了 HEAD。未能還原,檢查您的 HEAD!"
-#: sequencer.c:3241
+#: sequencer.c:3237
msgid "no revert in progress"
msgstr "沒有正在進行的還原"
-#: sequencer.c:3250
+#: sequencer.c:3246
msgid "no cherry-pick in progress"
msgstr "沒有正在進行的揀選"
-#: sequencer.c:3260
+#: sequencer.c:3256
msgid "failed to skip the commit"
msgstr "無法略過這個提交"
-#: sequencer.c:3267
+#: sequencer.c:3263
msgid "there is nothing to skip"
msgstr "沒有要略過的"
-#: sequencer.c:3270
+#: sequencer.c:3266
#, c-format
msgid ""
"have you committed already?\n"
"您已經提交了嗎?\n"
"試試 \"git %s --continue\""
-#: sequencer.c:3432 sequencer.c:4503
+#: sequencer.c:3428 sequencer.c:4476
msgid "cannot read HEAD"
msgstr "不能讀取 HEAD"
-#: sequencer.c:3449
+#: sequencer.c:3445
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "無法複製 '%s' 至 '%s'"
-#: sequencer.c:3457
+#: sequencer.c:3453
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:3467
+#: sequencer.c:3463
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能套用 %s... %.*s"
-#: sequencer.c:3474
+#: sequencer.c:3470
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合併 %.*s"
-#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
+#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能複製 '%s' 至 '%s'"
-#: sequencer.c:3503
+#: sequencer.c:3499
#, c-format
msgid "Executing: %s\n"
msgstr "執行:%s\n"
# 譯者:請維持前導空格
-#: sequencer.c:3514
+#: sequencer.c:3510
#, c-format
msgid ""
"execution failed: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3520
+#: sequencer.c:3516
msgid "and made changes to the index and/or the working tree\n"
msgstr "並且修改索引和/或工作區\n"
-#: sequencer.c:3526
+#: sequencer.c:3522
#, c-format
msgid ""
"execution succeeded: %s\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:3586
+#: sequencer.c:3582
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的標籤名稱:'%.*s'"
-#: sequencer.c:3659
+#: sequencer.c:3655
msgid "writing fake root commit"
msgstr "寫偽根提交"
-#: sequencer.c:3664
+#: sequencer.c:3660
msgid "writing squash-onto"
msgstr "寫入 squash-onto"
-#: sequencer.c:3743
+#: sequencer.c:3739
#, c-format
msgid "could not resolve '%s'"
msgstr "無法解析 '%s'"
-#: sequencer.c:3775
+#: sequencer.c:3771
msgid "cannot merge without a current revision"
msgstr "沒有目前版本不能合併"
-#: sequencer.c:3797
+#: sequencer.c:3793
#, c-format
msgid "unable to parse '%.*s'"
msgstr "無法解析 '%.*s'"
-#: sequencer.c:3806
+#: sequencer.c:3802
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "無可用合併:'%.*s'"
-#: sequencer.c:3818
+#: sequencer.c:3814
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章魚合並不能在一個新的根提交上執行"
-#: sequencer.c:3873
+#: sequencer.c:3869
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能取得 '%s' 的提交說明"
-#: sequencer.c:4019
+#: sequencer.c:4013
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能嘗試合併 '%.*s'"
-#: sequencer.c:4035
+#: sequencer.c:4029
msgid "merge: Unable to write new index file"
msgstr "合併:無法寫入新索引檔案"
-#: sequencer.c:4116
+#: sequencer.c:4110
msgid "Cannot autostash"
msgstr "無法 autostash"
-#: sequencer.c:4119
+#: sequencer.c:4113
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "意外的 stash 回應:'%s'"
-#: sequencer.c:4125
+#: sequencer.c:4119
#, c-format
msgid "Could not create directory for '%s'"
msgstr "不能為 '%s' 建立目錄"
-#: sequencer.c:4128
+#: sequencer.c:4122
#, c-format
msgid "Created autostash: %s\n"
msgstr "建立了 autostash:%s\n"
-#: sequencer.c:4132
+#: sequencer.c:4124
msgid "could not reset --hard"
msgstr "無法 reset --hard"
-#: sequencer.c:4157
+#: sequencer.c:4148
#, c-format
msgid "Applied autostash.\n"
msgstr "已套用 autostash。\n"
-#: sequencer.c:4169
+#: sequencer.c:4160
#, c-format
msgid "cannot store %s"
msgstr "不能儲存 %s"
-#: sequencer.c:4172
+#: sequencer.c:4163
#, c-format
msgid ""
"%s\n"
"您的修改安全地儲存在儲藏區中。\n"
"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:4177
+#: sequencer.c:4168
msgid "Applying autostash resulted in conflicts."
msgstr "因套用自動儲藏而導致衝突。"
-#: sequencer.c:4178
+#: sequencer.c:4169
msgid "Autostash exists; creating a new stash entry."
msgstr "已有自動儲藏;建立新儲藏項目。"
-#: sequencer.c:4252
+#: sequencer.c:4225
msgid "could not detach HEAD"
msgstr "不能分離開頭指標"
-#: sequencer.c:4267
+#: sequencer.c:4240
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:4269
+#: sequencer.c:4242
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:4301
+#: sequencer.c:4274
#, c-format
msgid ""
"Could not execute the todo command\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:4347
+#: sequencer.c:4320
#, c-format
msgid "Rebasing (%d/%d)%s"
msgstr "正在重定基底 (%d/%d)%s"
-#: sequencer.c:4393
+#: sequencer.c:4366
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:4463
+#: sequencer.c:4436
#, c-format
msgid "unknown command %d"
msgstr "未知指令 %d"
-#: sequencer.c:4511
+#: sequencer.c:4484
msgid "could not read orig-head"
msgstr "不能讀取 orig-head"
-#: sequencer.c:4516
+#: sequencer.c:4489
msgid "could not read 'onto'"
msgstr "不能讀取 'onto'"
-#: sequencer.c:4530
+#: sequencer.c:4503
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 為 %s"
-#: sequencer.c:4590
+#: sequencer.c:4563
#, c-format
msgid "Successfully rebased and updated %s.\n"
msgstr "成功重定基底並更新 %s。\n"
-#: sequencer.c:4642
+#: sequencer.c:4615
msgid "cannot rebase: You have unstaged changes."
msgstr "不能重定基底:您有未暫存的變更。"
-#: sequencer.c:4651
+#: sequencer.c:4624
msgid "cannot amend non-existing commit"
msgstr "不能修補不存在的提交"
-#: sequencer.c:4653
+#: sequencer.c:4626
#, c-format
msgid "invalid file: '%s'"
msgstr "無效檔案:'%s'"
-#: sequencer.c:4655
+#: sequencer.c:4628
#, c-format
msgid "invalid contents: '%s'"
msgstr "無效內容:'%s'"
-#: sequencer.c:4658
+#: sequencer.c:4631
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"\n"
"您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"
-#: sequencer.c:4694 sequencer.c:4733
+#: sequencer.c:4667 sequencer.c:4706
#, c-format
msgid "could not write file: '%s'"
msgstr "不能寫入檔案:'%s'"
-#: sequencer.c:4749
+#: sequencer.c:4722
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能刪除 CHERRY_PICK_HEAD"
-#: sequencer.c:4759
+#: sequencer.c:4732
msgid "could not commit staged changes."
msgstr "不能提交暫存的修改。"
-#: sequencer.c:4879
+#: sequencer.c:4852
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s:不能揀選一個%s"
-#: sequencer.c:4883
+#: sequencer.c:4856
#, c-format
msgid "%s: bad revision"
msgstr "%s:錯誤的版本"
-#: sequencer.c:4918
+#: sequencer.c:4891
msgid "can't revert as initial commit"
msgstr "不能作為初始提交還原提交"
-#: sequencer.c:5189 sequencer.c:5418
+#: sequencer.c:5162 sequencer.c:5391
#, c-format
msgid "skipped previously applied commit %s"
msgstr "已略過先前套用的 %s 提交"
-#: sequencer.c:5259 sequencer.c:5434
+#: sequencer.c:5232 sequencer.c:5407
msgid "use --reapply-cherry-picks to include skipped commits"
msgstr "使用 --reapply-cherry-picks 以包含略過提交"
-#: sequencer.c:5405
+#: sequencer.c:5378
msgid "make_script: unhandled options"
msgstr "make_script:有未能處理的選項"
-#: sequencer.c:5408
+#: sequencer.c:5381
msgid "make_script: error preparing revisions"
msgstr "make_script:準備版本時錯誤"
-#: sequencer.c:5666 sequencer.c:5683
+#: sequencer.c:5639 sequencer.c:5656
msgid "nothing to do"
msgstr "無事可做"
-#: sequencer.c:5702
+#: sequencer.c:5675
msgid "could not skip unnecessary pick commands"
msgstr "無法略過不必要的揀選"
-#: sequencer.c:5802
+#: sequencer.c:5775
msgid "the script was already rearranged."
msgstr "腳本已經重新編排。"
-#: setup.c:134
+#: setup.c:135
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' 在位於 '%s' 的版本庫之外"
-#: setup.c:186
+#: setup.c:187
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"%s:工作區中無此路徑。\n"
"使用指令 'git <命令> -- <路徑>...' 來指定本機不存在的路徑。"
-#: setup.c:199
+#: setup.c:200
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"使用 '--' 來分隔版本和路徑,例如:\n"
"'git <命令> [<版本>...] -- [<檔案>...]'"
-#: setup.c:265
+#: setup.c:266
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "選項 '%s' 必須在其他非選項參數之前"
-#: setup.c:284
+#: setup.c:285
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"使用 '--' 來分隔版本和路徑,例如:\n"
"'git <命令> [<版本>...] -- [<檔案>...]'"
-#: setup.c:420
+#: setup.c:421
msgid "unable to set up work tree using invalid config"
msgstr "無法使用無效設定來建立工作區"
-#: setup.c:424 builtin/rev-parse.c:895
+#: setup.c:425 builtin/rev-parse.c:895
msgid "this operation must be run in a work tree"
msgstr "該動作必須在一個工作區中執行"
-#: setup.c:722
+#: setup.c:724
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 版本庫版本 <= %d,卻得到 %d"
-#: setup.c:730
+#: setup.c:732
msgid "unknown repository extension found:"
msgid_plural "unknown repository extensions found:"
msgstr[0] "找到未知的儲存庫擴充元件:"
-#: setup.c:744
+#: setup.c:746
msgid "repo version is 0, but v1-only extension found:"
msgid_plural "repo version is 0, but v1-only extensions found:"
msgstr[0] "repo 版本是 0 (v0),但找到只支援 v1 的擴充元件:"
-#: setup.c:765
+#: setup.c:767
#, c-format
msgid "error opening '%s'"
msgstr "開啟 '%s' 發生錯誤"
-#: setup.c:767
+#: setup.c:769
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "檔案太大,無法作為 .git 檔案:'%s'"
-#: setup.c:769
+#: setup.c:771
#, c-format
msgid "error reading %s"
msgstr "讀取 %s 發生錯誤"
-#: setup.c:771
+#: setup.c:773
#, c-format
msgid "invalid gitfile format: %s"
msgstr "無效的 gitfile 格式:%s"
-#: setup.c:773
+#: setup.c:775
#, c-format
msgid "no path in gitfile: %s"
msgstr "在 gitfile 中沒有路徑:%s"
-#: setup.c:775
+#: setup.c:777
#, c-format
msgid "not a git repository: %s"
msgstr "不是一個 git 版本庫:%s"
-#: setup.c:877
+#: setup.c:879
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' 太大"
-#: setup.c:891
+#: setup.c:893
#, c-format
msgid "not a git repository: '%s'"
msgstr "不是一個 git 版本庫:'%s'"
-#: setup.c:920 setup.c:922 setup.c:953
+#: setup.c:922 setup.c:924 setup.c:955
#, c-format
msgid "cannot chdir to '%s'"
msgstr "不能切換目錄到 '%s'"
-#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
+#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040
msgid "cannot come back to cwd"
msgstr "無法返回目前工作目錄"
-#: setup.c:1052
+#: setup.c:1054
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "取得 '%*s%s%s' 狀態(stat)失敗"
-#: setup.c:1295
+#: setup.c:1338
msgid "Unable to read current working directory"
msgstr "不能讀取目前工作目錄"
-#: setup.c:1304 setup.c:1310
+#: setup.c:1347 setup.c:1353
#, c-format
msgid "cannot change to '%s'"
msgstr "不能切換到 '%s'"
-#: setup.c:1315
+#: setup.c:1358
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "不是一個 git 版本庫(或者任何父目錄):%s"
-#: setup.c:1321
+#: setup.c:1364
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"不是一個 git 版本庫(或者直至掛載點 %s 的任何父目錄)\n"
"停止在檔案系統邊界(未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
-#: setup.c:1446
+#: setup.c:1374
+#, c-format
+msgid ""
+"unsafe repository ('%s' is owned by someone else)\n"
+"To add an exception for this directory, call:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+msgstr ""
+"不安全版本庫(「%s」由其他人所有)\n"
+"若要放行本目錄,請呼叫:\n"
+"\n"
+"\tgit config --global --add safe.directory %s"
+
+#: setup.c:1502
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"參數 core.sharedRepository 的檔案屬性值有問題(0%.3o)。\n"
"檔案所有者必須始終擁有讀寫權限。"
-#: setup.c:1508
+#: setup.c:1564
msgid "fork failed"
msgstr "fork 失敗"
-#: setup.c:1513
+#: setup.c:1569
msgid "setsid failed"
msgstr "setsid 失敗"
-#: sparse-index.c:289
+#: sparse-index.c:285
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr "索引項目是資料夾,但不是稀疏資料夾(%08x)"
+#: split-index.c:9
+msgid "cannot use split index with a sparse index"
+msgstr "無法在稀疏索引使用索引分割"
+
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:850
+#: strbuf.c:851
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:852
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u GiB/s"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:860
+#: strbuf.c:861
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:862
+#: strbuf.c:863
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u MiB/s"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:869
+#: strbuf.c:870
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:871
+#: strbuf.c:872
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u KiB/s"
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:877
+#: strbuf.c:878
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[0] "%u 位元組"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:879
+#: strbuf.c:880
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u 位元組/秒"
-#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
-#: builtin/rebase.c:650
+#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766
+#: builtin/rebase.c:653
#, c-format
msgid "could not open '%s' for writing"
msgstr "無法開啟 '%s' 進行寫入"
-#: strbuf.c:1195
+#: strbuf.c:1196
#, c-format
msgid "could not edit '%s'"
msgstr "無法編輯 '%s'"
-#: submodule-config.c:237
+#: submodule-config.c:238
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "忽略可疑的子模組名稱:%s"
-#: submodule-config.c:304
+#: submodule-config.c:305
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "submodule.fetchjobs 不允許為負值"
-#: submodule-config.c:402
+#: submodule-config.c:403
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr "忽略可能被解析為指令列選項的 '%s':%s"
-#: submodule-config.c:499
+#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148
#, c-format
-msgid "invalid value for %s"
-msgstr "%s 的值無效"
+msgid "invalid value for '%s'"
+msgstr "「%s」的值無效"
-#: submodule-config.c:767
+#: submodule-config.c:828
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 條目 %s"
-#: submodule.c:114 submodule.c:143
+#: submodule.c:115 submodule.c:144
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "無法修改未合併的 .gitmodules,先解決合併衝突"
-#: submodule.c:118 submodule.c:147
+#: submodule.c:119 submodule.c:148
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "無法在 .gitmodules 中找到 path=%s 的小節"
-#: submodule.c:154
+#: submodule.c:155
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "無法移除 %s 的 .gitmodules 條目"
-#: submodule.c:165
+#: submodule.c:166
msgid "staging updated .gitmodules failed"
msgstr "將更新後 .gitmodules 新增暫存區失敗"
-#: submodule.c:358
+#: submodule.c:346
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "位於未簽出的子模組 '%s'"
-#: submodule.c:389
+#: submodule.c:377
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路徑規格 '%s' 在子模組 '%.*s' 中"
-#: submodule.c:466
+#: submodule.c:454
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "無效 --ignore-submodules 參數:%s"
-#: submodule.c:844
+#: submodule.c:866
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr "%s 提交位於路徑:'%s' 的子模組與同名的子模組衝突。略過。"
-#: submodule.c:954
+#: submodule.c:987
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "子模組條目 '%s'(%s)是一個 %s,不是一個提交"
-#: submodule.c:1042
+#: submodule.c:1069
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1' 命令"
-#: submodule.c:1165
+#: submodule.c:1192
#, c-format
msgid "process for submodule '%s' failed"
msgstr "處理 '%s' 子模組失敗"
-#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
+#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827
msgid "Failed to resolve HEAD as a valid ref."
msgstr "無法將 HEAD 解析為有效引用。"
-#: submodule.c:1205
+#: submodule.c:1232
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "正在推送 '%s' 子模組\n"
-#: submodule.c:1208
+#: submodule.c:1235
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "無法推送 '%s' 子模組\n"
-#: submodule.c:1491
+#: submodule.c:1567
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "正在抓取 %s%s 子模組\n"
-#: submodule.c:1525
+#: submodule.c:1589
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "無法存取子模組 '%s'\n"
-#: submodule.c:1680
+#: submodule.c:1618
+#, c-format
+msgid "Could not access submodule '%s' at commit %s\n"
+msgstr "無法存取 %2$s 提交的子模組「%1$s」\n"
+
+#: submodule.c:1629
+#, c-format
+msgid "Fetching submodule %s%s at commit %s\n"
+msgstr "正在抓取 %3$s 提交的 %1$s%2$s 子模組\n"
+
+#: submodule.c:1849
#, c-format
msgid ""
"Errors during submodule fetch:\n"
"抓取子模組時發生錯誤:\n"
"%s"
-#: submodule.c:1705
+#: submodule.c:1874
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "無法將 '%s' 識別為一個 git 版本庫"
-#: submodule.c:1722
+#: submodule.c:1891
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "無法在 %s 子模組執行 'git status --porcelain=2'"
-#: submodule.c:1763
+#: submodule.c:1932
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "%s 子模組執行 'git status --porcelain=2' 失敗"
-#: submodule.c:1838
+#: submodule.c:2007
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "無法在子模組 '%s' 中啟動 'git status'"
-#: submodule.c:1851
+#: submodule.c:2020
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "無法在子模組 '%s' 中執行 'git status'"
-#: submodule.c:1868
+#: submodule.c:2037
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定"
-#: submodule.c:1895 submodule.c:2210
+#: submodule.c:2064 submodule.c:2379
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "無法遞迴子模組路徑 '%s'"
-#: submodule.c:1917
+#: submodule.c:2086
msgid "could not reset submodule index"
msgstr "無法重設子模組的索引"
-#: submodule.c:1959
+#: submodule.c:2128
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "子模組 '%s' 中有髒索引"
-#: submodule.c:2013
+#: submodule.c:2182
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "子模組 '%s' 無法被更新。"
-#: submodule.c:2081
+#: submodule.c:2250
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中"
-#: submodule.c:2102
+#: submodule.c:2271
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir"
-#: submodule.c:2114 submodule.c:2174
+#: submodule.c:2283 submodule.c:2343
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查詢子模組 '%s' 的名稱"
-#: submodule.c:2118
+#: submodule.c:2287
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "拒絕移動「%s」至現存 git 目錄"
-#: submodule.c:2124
+#: submodule.c:2293
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' 遷移至\n"
"'%s'\n"
-#: submodule.c:2255
+#: submodule.c:2424
msgid "could not start ls-files in .."
msgstr "無法在 .. 中啟動 ls-files"
-#: submodule.c:2295
+#: submodule.c:2464
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
msgid "unknown value '%s' for key '%s'"
msgstr "鍵 '%2$s' 的未知取值 '%1$s'"
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:327
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300
+#: builtin/remote.c:328
#, c-format
msgid "more than one %s"
msgstr "多於一個 %s"
msgid "could not read input file '%s'"
msgstr "不能讀取輸入檔案 '%s'"
-#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563
msgid "could not read from stdin"
msgstr "不能自標準輸入讀取"
-#: trailer.c:1024 wrapper.c:684
+#: trailer.c:1024 wrapper.c:760
#, c-format
msgid "could not stat %s"
msgstr "不能對 %s 呼叫 stat"
msgid "error while running fast-import"
msgstr "執行 fast-import 發生錯誤"
-#: transport-helper.c:549 transport-helper.c:1251
+#: transport-helper.c:549 transport-helper.c:1254
#, c-format
msgid "could not read ref %s"
msgstr "無法讀取引用 %s"
msgid "invalid remote service path"
msgstr "無效的遠端服務路徑"
-#: transport-helper.c:661 transport.c:1479
+#: transport-helper.c:661 transport.c:1496
msgid "operation not supported by protocol"
msgstr "協定不支援該動作"
msgid "can't connect to subservice %s"
msgstr "不能連線到子服務 %s"
-#: transport-helper.c:693 transport.c:404
+#: transport-helper.c:693 transport.c:415
msgid "--negotiate-only requires protocol v2"
msgstr "--negotiate-only 需要 v2 版協定"
-#: transport-helper.c:755
+#: transport-helper.c:758
msgid "'option' without a matching 'ok/error' directive"
msgstr "'option' 缺少對應的 'ok/error' 指令"
-#: transport-helper.c:798
+#: transport-helper.c:801
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "預期 ok/error,協助工具說 '%s'"
-#: transport-helper.c:859
+#: transport-helper.c:862
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "協助工具報告 %s 的意外狀態"
-#: transport-helper.c:942
+#: transport-helper.c:945
#, c-format
msgid "helper %s does not support dry-run"
msgstr "協助工具 %s 不支援 dry-run"
-#: transport-helper.c:945
+#: transport-helper.c:948
#, c-format
msgid "helper %s does not support --signed"
msgstr "協助工具 %s 不支援 --signed"
-#: transport-helper.c:948
+#: transport-helper.c:951
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "協助工具 %s 不支援 --signed=if-asked"
-#: transport-helper.c:953
+#: transport-helper.c:956
#, c-format
msgid "helper %s does not support --atomic"
msgstr "協助工具 %s 不支援 --atomic"
-#: transport-helper.c:957
+#: transport-helper.c:960
#, c-format
msgid "helper %s does not support --%s"
msgstr "協助工具 %s 不支援 --%s"
-#: transport-helper.c:964
+#: transport-helper.c:967
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "協助工具 %s 不支援 'push-option'"
-#: transport-helper.c:1064
+#: transport-helper.c:1067
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-heper 不支援 push,需要引用規格"
-#: transport-helper.c:1069
+#: transport-helper.c:1072
#, c-format
msgid "helper %s does not support 'force'"
msgstr "協助工具 %s 不支援 'force'"
-#: transport-helper.c:1116
+#: transport-helper.c:1119
msgid "couldn't run fast-export"
msgstr "無法執行 fast-export"
-#: transport-helper.c:1121
+#: transport-helper.c:1124
msgid "error while running fast-export"
msgstr "執行 fast-export 時發生錯誤"
-#: transport-helper.c:1146
+#: transport-helper.c:1149
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"沒有共同的引用並且也沒有指定,什麼也不會做。\n"
"您或許得指定一個分支。\n"
-#: transport-helper.c:1228
+#: transport-helper.c:1231
#, c-format
msgid "unsupported object format '%s'"
msgstr "不支援的物件格式「%s」"
-#: transport-helper.c:1237
+#: transport-helper.c:1240
#, c-format
msgid "malformed response in ref list: %s"
msgstr "引用列表中格式錯誤的回應:%s"
-#: transport-helper.c:1389
+#: transport-helper.c:1392
#, c-format
msgid "read(%s) failed"
msgstr "讀取(%s)失敗"
-#: transport-helper.c:1416
+#: transport-helper.c:1419
#, c-format
msgid "write(%s) failed"
msgstr "寫(%s)失敗"
-#: transport-helper.c:1465
+#: transport-helper.c:1468
#, c-format
msgid "%s thread failed"
msgstr "%s 執行緒失敗"
-#: transport-helper.c:1469
+#: transport-helper.c:1472
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s 執行緒等待失敗:%s"
-#: transport-helper.c:1488 transport-helper.c:1492
+#: transport-helper.c:1491 transport-helper.c:1495
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "不能啟動執行緒來複製資料:%s"
-#: transport-helper.c:1529
+#: transport-helper.c:1532
#, c-format
msgid "%s process failed to wait"
msgstr "%s 進程等待失敗"
-#: transport-helper.c:1533
+#: transport-helper.c:1536
#, c-format
msgid "%s process failed"
msgstr "%s 進程失敗"
-#: transport-helper.c:1551 transport-helper.c:1560
+#: transport-helper.c:1554 transport-helper.c:1563
msgid "can't start thread for copying data"
msgstr "不能啟動執行緒來複製資料"
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n"
-#: transport.c:145
+#: transport.c:138
#, c-format
msgid "could not read bundle '%s'"
-msgstr "無法讀取 bundle '%s'"
+msgstr "無法讀取「%s」套件"
-#: transport.c:227
+#: transport.c:234
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "傳輸:無效的深度選項 '%s'"
-#: transport.c:279
+#: transport.c:289
msgid "see protocol.version in 'git help config' for more details"
msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息"
-#: transport.c:280
+#: transport.c:290
msgid "server options require protocol version 2 or later"
msgstr "服務端選項需要版本 2 協定或更高"
-#: transport.c:407
+#: transport.c:418
msgid "server does not support wait-for-done"
msgstr "伺服器不支援「等待完成」(wait-for-done) 功能"
-#: transport.c:759
+#: transport.c:770
msgid "could not parse transport.color.* config"
msgstr "不能解析 transport.color.* 設定"
-#: transport.c:834
+#: transport.c:845
msgid "support for protocol v2 not implemented yet"
msgstr "協定 v2 的支援尚未實現"
-#: transport.c:967
+#: transport.c:978
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "設定 '%s' 的取值未知:%s"
-#: transport.c:1033
+#: transport.c:1044
#, c-format
msgid "transport '%s' not allowed"
msgstr "傳輸 '%s' 不允許"
-#: transport.c:1082
+#: transport.c:1093
msgid "git-over-rsync is no longer supported"
msgstr "不再支援 git-over-rsync"
-#: transport.c:1185
+#: transport.c:1196
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模組路徑所包含的修改在任何遠端來源中都找不到:\n"
-#: transport.c:1189
+#: transport.c:1200
#, c-format
msgid ""
"\n"
"以推送至遠端。\n"
"\n"
-#: transport.c:1197
+#: transport.c:1208
msgid "Aborting."
msgstr "正在終止。"
-#: transport.c:1343
+#: transport.c:1354
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模組"
"以下路徑發生碰撞(如:在不區分大小寫的檔案系統上的區分大小寫的路徑),\n"
"並且碰撞組中只有一個檔案存在工作區中:\n"
-#: unpack-trees.c:1636
+#: unpack-trees.c:1664
msgid "Updating index flags"
msgstr "正在更新索引旗標"
-#: unpack-trees.c:2803
+#: unpack-trees.c:2925
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr "工作區和未追蹤提交有重複項目:%s"
-#: upload-pack.c:1565
+#: upload-pack.c:1579
msgid "expected flush after fetch arguments"
msgstr "在 fetch 引數應為一個 flush 包"
msgid "Fetching objects"
msgstr "正在抓取物件"
-#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
+#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156
#, c-format
msgid "failed to read '%s'"
msgstr "讀取 '%s' 失敗"
-#: worktree.c:305
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "在主工作區的 '%s' 不是版本庫目錄"
-#: worktree.c:316
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "檔案 '%s' 不包含工作區的絕對路徑"
-#: worktree.c:328
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
-#: worktree.c:334
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' 不是一個 .git 檔案,錯誤碼 %d"
-#: worktree.c:343
+#: worktree.c:342
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' 沒有指回到 '%s'"
-#: worktree.c:604
+#: worktree.c:600
msgid "not a directory"
msgstr "不是目錄"
-#: worktree.c:613
+#: worktree.c:609
msgid ".git is not a file"
msgstr ".git 不是檔案"
-#: worktree.c:615
+#: worktree.c:611
msgid ".git file broken"
msgstr ".git 檔案損毀"
-#: worktree.c:617
+#: worktree.c:613
msgid ".git file incorrect"
msgstr ".git 檔案不正確"
-#: worktree.c:723
+#: worktree.c:719
msgid "not a valid path"
msgstr "非有效路徑"
-#: worktree.c:729
+#: worktree.c:725
msgid "unable to locate repository; .git is not a file"
msgstr "無法定位版本庫;.git 不是檔案"
-#: worktree.c:733
+#: worktree.c:729
msgid "unable to locate repository; .git file does not reference a repository"
msgstr "無法定位版本庫:.git 檔案未指向版本庫"
-#: worktree.c:737
+#: worktree.c:733
msgid "unable to locate repository; .git file broken"
msgstr "無法定位版本庫;.git 檔案損壞"
-#: worktree.c:743
+#: worktree.c:739
msgid "gitdir unreadable"
msgstr "無法讀取 gitdir"
-#: worktree.c:747
+#: worktree.c:743
msgid "gitdir incorrect"
msgstr "不正確的 gitdir"
-#: worktree.c:772
+#: worktree.c:768
msgid "not a valid directory"
msgstr "非有效目錄"
-#: worktree.c:778
+#: worktree.c:774
msgid "gitdir file does not exist"
msgstr "找不到 gitdir 檔案"
-#: worktree.c:783 worktree.c:792
+#: worktree.c:779 worktree.c:788
#, c-format
msgid "unable to read gitdir file (%s)"
msgstr "無法讀取 gitdir 檔案 (%s)"
-#: worktree.c:802
+#: worktree.c:798
#, c-format
msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr "讀取過短(預期有 %<PRIuMAX> 位元組,只讀到 %<PRIuMAX>)"
-#: worktree.c:810
+#: worktree.c:806
msgid "invalid gitdir file"
msgstr "gitdir 檔案無效"
-#: worktree.c:818
+#: worktree.c:814
msgid "gitdir file points to non-existent location"
msgstr "gitdir 檔案指向的位置不存在"
-#: wrapper.c:151
+#: worktree.c:830
+#, c-format
+msgid "unable to set %s in '%s'"
+msgstr "無法在「%2$s」設定 %1$s"
+
+#: worktree.c:832
+#, c-format
+msgid "unable to unset %s in '%s'"
+msgstr "無法取消在「%2$s」設定的 %1$s"
+
+#: worktree.c:852
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "無法設定 extensions.worktreeConfig 設定"
+
+#: wrapper.c:161
#, c-format
msgid "could not setenv '%s'"
msgstr "無法 setenv '%s'"
-#: wrapper.c:203
+#: wrapper.c:213
#, c-format
msgid "unable to create '%s'"
msgstr "不能建立 '%s'"
-#: wrapper.c:205 wrapper.c:375
+#: wrapper.c:215 wrapper.c:385
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "無法開啟 '%s' 進行讀寫"
-#: wrapper.c:406 wrapper.c:607
+#: wrapper.c:416 wrapper.c:683
#, c-format
msgid "unable to access '%s'"
msgstr "不能存取 '%s'"
-#: wrapper.c:615
+#: wrapper.c:691
msgid "unable to get current working directory"
msgstr "不能取得目前工作目錄"
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (使用 \"git rm <檔案>...\" 標記解決方案)"
-#: wt-status.c:211 wt-status.c:1131
+#: wt-status.c:211 wt-status.c:1140
msgid "Changes to be committed:"
msgstr "要提交的變更:"
-#: wt-status.c:234 wt-status.c:1140
+#: wt-status.c:234 wt-status.c:1149
msgid "Changes not staged for commit:"
msgstr "尚未暫存以備提交的變更:"
msgid "untracked content, "
msgstr "未追蹤的內容, "
-#: wt-status.c:964
+#: wt-status.c:973
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "您的儲藏區目前有 %d 條紀錄"
-#: wt-status.c:995
+#: wt-status.c:1004
msgid "Submodules changed but not updated:"
msgstr "子模組已修改但尚未更新:"
-#: wt-status.c:997
+#: wt-status.c:1006
msgid "Submodule changes to be committed:"
msgstr "要提交的子模組變更:"
-#: wt-status.c:1079
+#: wt-status.c:1088
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
"不要改動或刪除上面的一行。\n"
"其下所有內容都將被忽略。"
-#: wt-status.c:1171
+#: wt-status.c:1180
#, c-format
msgid ""
"\n"
"花了 %.2f 秒才計算出分支的領先/落後範圍。\n"
"為避免,您可以使用 '--no-ahead-behind'。\n"
-#: wt-status.c:1201
+#: wt-status.c:1210
msgid "You have unmerged paths."
msgstr "您有尚未合併的路徑。"
# 譯者:請維持前導空格
-#: wt-status.c:1204
+#: wt-status.c:1213
msgid " (fix conflicts and run \"git commit\")"
msgstr " (解決衝突並執行 \"git commit\")"
# 譯者:請維持前導空格
-#: wt-status.c:1206
+#: wt-status.c:1215
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (使用 \"git merge --abort\" 終止合併)"
-#: wt-status.c:1210
+#: wt-status.c:1219
msgid "All conflicts fixed but you are still merging."
msgstr "所有衝突已解決但您仍處於合併中。"
# 譯者:請維持前導空格
-#: wt-status.c:1213
+#: wt-status.c:1222
msgid " (use \"git commit\" to conclude merge)"
msgstr " (使用 \"git commit\" 結束合併)"
-#: wt-status.c:1224
+#: wt-status.c:1233
msgid "You are in the middle of an am session."
msgstr "您正處於 am 動作過程中。"
-#: wt-status.c:1227
+#: wt-status.c:1236
msgid "The current patch is empty."
msgstr "目前的修補檔為空。"
# 譯者:請維持前導空格
-#: wt-status.c:1232
+#: wt-status.c:1241
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (解決衝突,然後執行 \"git am --continue\")"
# 譯者:請維持前導空格
-#: wt-status.c:1234
+#: wt-status.c:1243
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (使用 \"git am --skip\" 略過此修補檔)"
# 譯者:請維持前導空格
-#: wt-status.c:1237
+#: wt-status.c:1246
msgid ""
" (use \"git am --allow-empty\" to record this patch as an empty commit)"
msgstr " (使用 \"git am --allow-empty\" 將目前修補檔錄製為空白提交)"
# 譯者:請維持前導空格
-#: wt-status.c:1239
+#: wt-status.c:1248
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (使用 \"git am --abort\" 復原原有分支)"
-#: wt-status.c:1372
+#: wt-status.c:1381
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 遺失。"
-#: wt-status.c:1374
+#: wt-status.c:1383
msgid "No commands done."
msgstr "沒有指令被執行。"
-#: wt-status.c:1377
+#: wt-status.c:1386
#, c-format
-msgid "Last command done (%d command done):"
-msgid_plural "Last commands done (%d commands done):"
-msgstr[0] "最後一條指令已完成(%d 條指令被執行):"
+msgid "Last command done (%<PRIuMAX> command done):"
+msgid_plural "Last commands done (%<PRIuMAX> commands done):"
+msgstr[0] "上次完成的命令(完成 %<PRIuMAX> 條指令):"
-#: wt-status.c:1388
+#: wt-status.c:1397
#, c-format
msgid " (see more in file %s)"
msgstr " (更多參見檔案 %s)"
-#: wt-status.c:1393
+#: wt-status.c:1402
msgid "No commands remaining."
msgstr "未剩下任何指令。"
-#: wt-status.c:1396
+#: wt-status.c:1405
#, c-format
-msgid "Next command to do (%d remaining command):"
-msgid_plural "Next commands to do (%d remaining commands):"
-msgstr[0] "接下來要執行的指令(剩餘 %d 條指令):"
+msgid "Next command to do (%<PRIuMAX> remaining command):"
+msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):"
+msgstr[0] "接下來要執行的命令(剩餘 %<PRIuMAX> 條命令):"
# 譯者:請維持前導空格
-#: wt-status.c:1404
+#: wt-status.c:1413
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (使用 \"git rebase --edit-todo\" 來檢視和編輯)"
-#: wt-status.c:1416
+#: wt-status.c:1425
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。"
-#: wt-status.c:1421
+#: wt-status.c:1430
msgid "You are currently rebasing."
msgstr "您在執行重定基底動作。"
# 譯者:請維持前導空格
-#: wt-status.c:1434
+#: wt-status.c:1443
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (解決衝突,然後執行 \"git rebase --continue\")"
# 譯者:請維持前導空格
-#: wt-status.c:1436
+#: wt-status.c:1445
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (使用 \"git rebase --skip\" 略過此修補檔)"
# 譯者:請維持前導空格
-#: wt-status.c:1438
+#: wt-status.c:1447
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (使用 \"git rebase --abort\" 以簽出原有分支)"
# 譯者:請維持前導空格
-#: wt-status.c:1445
+#: wt-status.c:1454
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (所有衝突已解決:執行 \"git rebase --continue\")"
-#: wt-status.c:1449
+#: wt-status.c:1458
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。"
-#: wt-status.c:1454
+#: wt-status.c:1463
msgid "You are currently splitting a commit during a rebase."
msgstr "您在執行重定基底動作時分割提交。"
# 譯者:請維持前導空格
-#: wt-status.c:1457
+#: wt-status.c:1466
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (一旦您工作目錄提交乾淨後,執行 \"git rebase --continue\")"
-#: wt-status.c:1461
+#: wt-status.c:1470
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。"
-#: wt-status.c:1466
+#: wt-status.c:1475
msgid "You are currently editing a commit during a rebase."
msgstr "您在執行重定基底動作時編輯提交。"
# 譯者:請維持前導空格
-#: wt-status.c:1469
+#: wt-status.c:1478
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (使用 \"git commit --amend\" 修補目前提交)"
# 譯者:請維持前導空格
-#: wt-status.c:1471
+#: wt-status.c:1480
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (當您對您的修改滿意後執行 \"git rebase --continue\")"
-#: wt-status.c:1482
+#: wt-status.c:1491
msgid "Cherry-pick currently in progress."
msgstr "揀選動作正在進行中。"
-#: wt-status.c:1485
+#: wt-status.c:1494
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在執行揀選提交 %s 的動作。"
# 譯者:請維持前導空格
-#: wt-status.c:1492
+#: wt-status.c:1501
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (解決衝突並執行 \"git cherry-pick --continue\")"
# 譯者:請維持前導空格
-#: wt-status.c:1495
+#: wt-status.c:1504
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (執行 \"git cherry-pick --continue\" 以繼續)"
# 譯者:請維持前導空格
-#: wt-status.c:1498
+#: wt-status.c:1507
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (所有衝突已解決:執行 \"git cherry-pick --continue\")"
# 譯者:請維持前導空格
-#: wt-status.c:1500
+#: wt-status.c:1509
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (使用 \"git cherry-pick --skip\" 略過此修補檔)"
# 譯者:請維持前導空格
-#: wt-status.c:1502
+#: wt-status.c:1511
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (使用 \"git cherry-pick --abort\" 以取消揀選動作)"
-#: wt-status.c:1512
+#: wt-status.c:1521
msgid "Revert currently in progress."
msgstr "還原動作正在進行中。"
-#: wt-status.c:1515
+#: wt-status.c:1524
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在執行反轉提交 %s 的動作。"
# 譯者:請維持前導空格
-#: wt-status.c:1521
+#: wt-status.c:1530
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (解決衝突並執行 \"git revert --continue\")"
# 譯者:請維持前導空格
-#: wt-status.c:1524
+#: wt-status.c:1533
msgid " (run \"git revert --continue\" to continue)"
msgstr " (執行 \"git revert --continue\" 以繼續)"
# 譯者:請維持前導空格
-#: wt-status.c:1527
+#: wt-status.c:1536
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (所有衝突已解決:執行 \"git revert --continue\")"
# 譯者:請維持前導空格
-#: wt-status.c:1529
+#: wt-status.c:1538
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (使用 \"git revert --skip\" 略過此修補檔)"
# 譯者:請維持前導空格
-#: wt-status.c:1531
+#: wt-status.c:1540
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (使用 \"git revert --abort\" 以取消反轉提交動作)"
-#: wt-status.c:1541
+#: wt-status.c:1550
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在執行從分支 '%s' 開始的二分搜尋動作。"
-#: wt-status.c:1545
+#: wt-status.c:1554
msgid "You are currently bisecting."
msgstr "您在執行二分搜尋動作。"
# 譯者:請維持前導空格
-#: wt-status.c:1548
+#: wt-status.c:1557
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (使用 \"git bisect reset\" 簽出原有分支)"
-#: wt-status.c:1559
+#: wt-status.c:1568
msgid "You are in a sparse checkout."
msgstr "您正在稀疏簽出的工作區中。"
-#: wt-status.c:1562
+#: wt-status.c:1571
#, c-format
msgid "You are in a sparse checkout with %d%% of tracked files present."
msgstr "您處於稀疏簽出狀態,包含 %d%% 的追蹤檔案。"
-#: wt-status.c:1806
+#: wt-status.c:1815
msgid "On branch "
msgstr "位於分支 "
-#: wt-status.c:1813
+#: wt-status.c:1822
msgid "interactive rebase in progress; onto "
msgstr "互動式重定基底動作正在進行中;至 "
-#: wt-status.c:1815
+#: wt-status.c:1824
msgid "rebase in progress; onto "
msgstr "重定基底動作正在進行中;至 "
-#: wt-status.c:1820
+#: wt-status.c:1829
msgid "HEAD detached at "
msgstr "開頭指標分離於 "
-#: wt-status.c:1822
+#: wt-status.c:1831
msgid "HEAD detached from "
msgstr "開頭指標分離自 "
-#: wt-status.c:1825
+#: wt-status.c:1834
msgid "Not currently on any branch."
msgstr "目前不在任何分支上。"
-#: wt-status.c:1842
+#: wt-status.c:1851
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1843
+#: wt-status.c:1852
msgid "No commits yet"
msgstr "尚無提交"
-#: wt-status.c:1857
+#: wt-status.c:1866
msgid "Untracked files"
msgstr "未追蹤的檔案"
-#: wt-status.c:1859
+#: wt-status.c:1868
msgid "Ignored files"
msgstr "忽略的檔案"
-#: wt-status.c:1863
+#: wt-status.c:1872
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度,\n"
"但您需要小心不要忘了新增新檔案(參見 'git help status')。"
-#: wt-status.c:1869
+#: wt-status.c:1878
#, c-format
msgid "Untracked files not listed%s"
msgstr "未追蹤的檔案沒有列出%s"
# 譯者:中文字串拼接,可刪除前導空格
-#: wt-status.c:1871
+#: wt-status.c:1880
msgid " (use -u option to show untracked files)"
msgstr " (使用 -u 參數顯示未追蹤的檔案)"
-#: wt-status.c:1877
+#: wt-status.c:1886
msgid "No changes"
msgstr "沒有修改"
-#: wt-status.c:1882
+#: wt-status.c:1891
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
-#: wt-status.c:1886
+#: wt-status.c:1895
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1890
+#: wt-status.c:1899
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交為空,但是存在尚未追蹤的檔案(使用 \"git add\" 建立追蹤)\n"
-#: wt-status.c:1894
+#: wt-status.c:1903
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交為空,但是存在尚未追蹤的檔案\n"
# 譯者:中文字串拼接,可刪除前導空格
-#: wt-status.c:1898
+#: wt-status.c:1907
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "無檔案要提交(建立/複製檔案並使用 \"git add\" 建立追蹤)\n"
-#: wt-status.c:1902 wt-status.c:1908
+#: wt-status.c:1911 wt-status.c:1917
#, c-format
msgid "nothing to commit\n"
msgstr "無檔案要提交\n"
# 譯者:中文字串拼接,可刪除前導空格
-#: wt-status.c:1905
+#: wt-status.c:1914
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "無檔案要提交(使用 -u 顯示未追蹤的檔案)\n"
# 譯者:中文字串拼接,可刪除前導空格
-#: wt-status.c:1910
+#: wt-status.c:1919
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "沒有要提交的檔案,工作區為乾淨狀態\n"
-#: wt-status.c:2015
+#: wt-status.c:2024
msgid "No commits yet on "
msgstr "尚無提交在 "
-#: wt-status.c:2019
+#: wt-status.c:2028
msgid "HEAD (no branch)"
msgstr "HEAD(非分支)"
-#: wt-status.c:2050
+#: wt-status.c:2059
msgid "different"
msgstr "不同"
# 譯者:請維持句尾空格
-#: wt-status.c:2052 wt-status.c:2060
+#: wt-status.c:2061 wt-status.c:2069
msgid "behind "
msgstr "落後 "
-#: wt-status.c:2055 wt-status.c:2058
+#: wt-status.c:2064 wt-status.c:2067
msgid "ahead "
msgstr "領先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2596
+#: wt-status.c:2605
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s:您有未暫存的變更。"
-#: wt-status.c:2602
+#: wt-status.c:2611
msgid "additionally, your index contains uncommitted changes."
msgstr "另外,您的索引中包含未提交的變更。"
-#: wt-status.c:2604
+#: wt-status.c:2613
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s:您的索引中包含未提交的變更。"
msgid "could not start worker[0] for '%s'"
msgstr "無法啟動「%s」的 worker[0]"
-#: compat/precompose_utf8.c:58 builtin/clone.c:347
+#: compat/precompose_utf8.c:58 builtin/clone.c:353
#, c-format
msgid "failed to unlink '%s'"
msgstr "刪除 '%s' 失敗"
+#: compat/fsmonitor/fsm-listen-darwin.c:355
+msgid "Unable to create FSEventStream."
+msgstr "無法建立 FSEventStream。"
+
+#: compat/fsmonitor/fsm-listen-darwin.c:403
+msgid "Failed to start the FSEventStream"
+msgstr "無法啟動 FSEventStream"
+
#: builtin/add.c:26
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<選項>] [--] <路徑規格>..."
-#: builtin/add.c:64
+#: builtin/add.c:63
#, c-format
msgid "cannot chmod %cx '%s'"
msgstr "無法 chmod %cx ‘%s’"
-#: builtin/add.c:106
+#: builtin/add.c:105
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差異狀態 %c"
-#: builtin/add.c:111 builtin/commit.c:298
+#: builtin/add.c:110 builtin/commit.c:299
msgid "updating files failed"
msgstr "更新檔案失敗"
-#: builtin/add.c:121
+#: builtin/add.c:120
#, c-format
msgid "remove '%s'\n"
msgstr "刪除 '%s'\n"
-#: builtin/add.c:205
+#: builtin/add.c:204
msgid "Unstaged changes after refreshing the index:"
msgstr "重新整理索引之後尚未被暫存的變更:"
-#: builtin/add.c:313 builtin/rev-parse.c:993
+#: builtin/add.c:312 builtin/rev-parse.c:993
msgid "Could not read the index"
msgstr "不能讀取索引"
-#: builtin/add.c:326
+#: builtin/add.c:325
msgid "Could not write patch"
msgstr "不能生成修補檔"
-#: builtin/add.c:329
+#: builtin/add.c:328
msgid "editing patch failed"
msgstr "編輯修補檔失敗"
-#: builtin/add.c:332
+#: builtin/add.c:331
#, c-format
msgid "Could not stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
-#: builtin/add.c:334
+#: builtin/add.c:333
msgid "Empty patch. Aborted."
msgstr "空修補檔。異常終止。"
-#: builtin/add.c:340
+#: builtin/add.c:339
#, c-format
msgid "Could not apply '%s'"
msgstr "不能套用 '%s'"
-#: builtin/add.c:348
+#: builtin/add.c:347
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略:\n"
-#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
+#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124
#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
-#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
+#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194
msgid "dry run"
msgstr "測試執行"
-#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
-#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338
#: builtin/mv.c:123 builtin/read-tree.c:120
msgid "be verbose"
msgstr "詳細輸出"
-#: builtin/add.c:371
+#: builtin/add.c:370
msgid "interactive picking"
msgstr "互動式揀選"
-#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
+#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417
msgid "select hunks interactively"
msgstr "互動式挑選資料區塊"
-#: builtin/add.c:373
+#: builtin/add.c:372
msgid "edit current diff and apply"
msgstr "編輯目前差異並套用"
-#: builtin/add.c:374
+#: builtin/add.c:373
msgid "allow adding otherwise ignored files"
msgstr "允許新增忽略的檔案"
-#: builtin/add.c:375
+#: builtin/add.c:374
msgid "update tracked files"
msgstr "更新已追蹤的檔案"
-#: builtin/add.c:376
+#: builtin/add.c:375
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "對已追蹤檔案(隱含 -u)重新歸一換行符號"
-#: builtin/add.c:377
+#: builtin/add.c:376
msgid "record only the fact that the path will be added later"
msgstr "只記錄,該路徑稍後再新增"
-#: builtin/add.c:378
+#: builtin/add.c:377
msgid "add changes from all tracked and untracked files"
msgstr "新增所有改變的已追蹤檔案和未追蹤檔案"
-#: builtin/add.c:381
+#: builtin/add.c:380
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作區中移除的路徑(和 --no-all 相同)"
-#: builtin/add.c:383
+#: builtin/add.c:382
msgid "don't add, only refresh the index"
msgstr "不新增,只重新整理索引"
-#: builtin/add.c:384
+#: builtin/add.c:383
msgid "just skip files which cannot be added because of errors"
msgstr "略過因發生錯誤不能新增的檔案"
-#: builtin/add.c:385
+#: builtin/add.c:384
msgid "check if - even missing - files are ignored in dry run"
msgstr "檢查在測試執行模式下檔案(即使不存在)是否被忽略"
-#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251
msgid "allow updating entries outside of the sparse-checkout cone"
msgstr "允許更新稀疏簽出 cone 外的項目"
-#: builtin/add.c:388 builtin/update-index.c:1004
+#: builtin/add.c:387 builtin/update-index.c:1023
msgid "override the executable bit of the listed files"
msgstr "覆蓋列表裡檔案的可執行位"
-#: builtin/add.c:390
+#: builtin/add.c:389
msgid "warn when adding an embedded repository"
msgstr "建立一個嵌入式版本庫時給予警告"
-#: builtin/add.c:392
-msgid "backend for `git stash -p`"
-msgstr "`git stash -p` 的後端"
-
-#: builtin/add.c:410
+#: builtin/add.c:407
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"\n"
"參見 \"git help submodule\" 取得更多訊息。"
-#: builtin/add.c:439
+#: builtin/add.c:436
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在新增嵌入式 git 版本庫:%s"
-#: builtin/add.c:459
+#: builtin/add.c:456
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
"如要關閉此訊息,請執行\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:474
+#: builtin/add.c:471
msgid "adding files failed"
msgstr "新增檔案失敗"
-#: builtin/add.c:548
+#: builtin/add.c:534
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x"
-#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
-#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365
+#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702
#, c-format
msgid "'%s' and pathspec arguments cannot be used together"
msgstr "「%s」和路徑規格引數不得同時使用"
-#: builtin/add.c:580
+#: builtin/add.c:566
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "沒有指定檔案,也沒有檔案被新增。\n"
-#: builtin/add.c:582
+#: builtin/add.c:568
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
"如要關閉此訊息,請執行\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:202
-#, c-format
-msgid "Invalid value for --empty: %s"
-msgstr "傳入 --empty 的值無效:%s"
-
-#: builtin/am.c:392
+#: builtin/am.c:393
msgid "could not parse author script"
msgstr "不能解析作者腳本"
-#: builtin/am.c:482
+#: builtin/am.c:483
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 掛鉤刪除"
-#: builtin/am.c:524
+#: builtin/am.c:525
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的輸入行:'%s'。"
-#: builtin/am.c:562
+#: builtin/am.c:563
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "從 '%s' 複製註解到 '%s' 時失敗"
-#: builtin/am.c:588
+#: builtin/am.c:589
msgid "fseek failed"
msgstr "fseek 失敗"
-#: builtin/am.c:776
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "無法解析修補檔 '%s'"
-#: builtin/am.c:841
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一個 StGIT 修補檔佇列被套用"
-#: builtin/am.c:889
+#: builtin/am.c:890
msgid "invalid timestamp"
msgstr "無效的時間戳"
-#: builtin/am.c:894 builtin/am.c:906
+#: builtin/am.c:895 builtin/am.c:907
msgid "invalid Date line"
msgstr "無效的日期行"
-#: builtin/am.c:901
+#: builtin/am.c:902
msgid "invalid timezone offset"
msgstr "無效的時區位移值"
-#: builtin/am.c:994
+#: builtin/am.c:995
msgid "Patch format detection failed."
msgstr "修補檔格式偵測失敗。"
-#: builtin/am.c:999 builtin/clone.c:300
+#: builtin/am.c:1000 builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
msgstr "建立目錄 '%s' 失敗"
-#: builtin/am.c:1004
+#: builtin/am.c:1005
msgid "Failed to split patches."
msgstr "分割修補檔失敗。"
-#: builtin/am.c:1153
+#: builtin/am.c:1154
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "當您解決這一問題,執行 \"%s --continue\"。"
-#: builtin/am.c:1154
+#: builtin/am.c:1155
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要略過這一修補檔,則執行 \"%s --skip\"。"
-#: builtin/am.c:1159
+#: builtin/am.c:1160
#, c-format
msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
msgstr "若要將空白修補檔錄製為空白提交,請執行「%s --allow-empty」。"
-#: builtin/am.c:1161
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要復原至原始分支並停止修補動作,執行 \"%s --abort\"。"
-#: builtin/am.c:1256
+#: builtin/am.c:1257
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr "修補檔使用 format=flowed 格式傳送,行尾的空格可能會遺失。"
-#: builtin/am.c:1344
+#: builtin/am.c:1345
#, c-format
msgid "missing author line in commit %s"
msgstr "在提交 %s 中缺少作者行"
-#: builtin/am.c:1347
+#: builtin/am.c:1348
#, c-format
msgid "invalid ident line: %.*s"
msgstr "無效的身份標記:%.*s"
-#: builtin/am.c:1566
+#: builtin/am.c:1567
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "版本庫缺乏必要的資料物件以進行三方合併。"
-#: builtin/am.c:1568
+#: builtin/am.c:1569
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引來重建一個(三方合併的)基礎目錄樹..."
-#: builtin/am.c:1587
+#: builtin/am.c:1588
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"您是否曾手動編輯過您的修補檔?\n"
"無法套用修補檔到索引中的資料物件上。"
-#: builtin/am.c:1593
+#: builtin/am.c:1594
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基礎版本上修補及進行三方合併..."
-#: builtin/am.c:1619
+#: builtin/am.c:1620
msgid "Failed to merge in the changes."
msgstr "無法合併變更。"
-#: builtin/am.c:1651
+#: builtin/am.c:1652
msgid "applying to an empty history"
msgstr "正套用到一個空歷史上"
-#: builtin/am.c:1703 builtin/am.c:1707
+#: builtin/am.c:1704 builtin/am.c:1708
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "無法繼續:%s 不存在。"
-#: builtin/am.c:1725
+#: builtin/am.c:1726
msgid "Commit Body is:"
msgstr "提交內容為:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1735
+#: builtin/am.c:1736
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "套用?是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]: "
-#: builtin/am.c:1781 builtin/commit.c:409
+#: builtin/am.c:1782 builtin/commit.c:410
msgid "unable to write index file"
msgstr "無法寫入索引檔案"
-#: builtin/am.c:1785
+#: builtin/am.c:1786
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "髒索引:不能套用修補檔(髒檔案:%s)"
-#: builtin/am.c:1827
+#: builtin/am.c:1828
#, c-format
msgid "Skipping: %.*s"
msgstr "略過:%.*s"
-#: builtin/am.c:1832
+#: builtin/am.c:1833
#, c-format
msgid "Creating an empty commit: %.*s"
msgstr "建立空白提交:%.*s"
-#: builtin/am.c:1836
+#: builtin/am.c:1837
msgid "Patch is empty."
msgstr "修補檔為空。"
-#: builtin/am.c:1847 builtin/am.c:1916
+#: builtin/am.c:1848 builtin/am.c:1917
#, c-format
msgid "Applying: %.*s"
msgstr "套用:%.*s"
-#: builtin/am.c:1864
+#: builtin/am.c:1865
msgid "No changes -- Patch already applied."
msgstr "沒有變更——修補檔已經套用過。"
-#: builtin/am.c:1870
+#: builtin/am.c:1871
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打修補檔失敗於 %s %.*s"
-#: builtin/am.c:1874
+#: builtin/am.c:1875
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔"
-#: builtin/am.c:1920
+#: builtin/am.c:1921
msgid "No changes - recorded it as an empty commit."
msgstr "沒有變更 - 將其錄製為空白提交。"
-#: builtin/am.c:1922
+#: builtin/am.c:1923
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"如果沒有什麼要新增到暫存區的,則很可能是其它提交已經引入了相同的變更。\n"
"您也許想要略過這個修補檔。"
-#: builtin/am.c:1930
+#: builtin/am.c:1931
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n"
"你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。"
-#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
-#: builtin/reset.c:456
+#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455
+#: builtin/reset.c:463
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析物件 '%s'。"
-#: builtin/am.c:2090 builtin/am.c:2166
+#: builtin/am.c:2091 builtin/am.c:2167
msgid "failed to clean index"
msgstr "清空索引失敗"
-#: builtin/am.c:2134
+#: builtin/am.c:2135
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD"
-#: builtin/am.c:2242
-#, c-format
-msgid "Invalid value for --patch-format: %s"
-msgstr "無效的 --patch-format 值:%s"
-
-#: builtin/am.c:2285
-#, c-format
-msgid "Invalid value for --show-current-patch: %s"
-msgstr "無效的 --show-current-patch 值:%s"
-
-#: builtin/am.c:2289
+#: builtin/am.c:2292
#, c-format
msgid "options '%s=%s' and '%s=%s' cannot be used together"
msgstr "「%s=%s」和「%s=%s」選項不得同時使用"
-#: builtin/am.c:2320
+#: builtin/am.c:2323
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2321
+#: builtin/am.c:2324
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<選項>] (--continue | --skip | --abort)"
-#: builtin/am.c:2327
+#: builtin/am.c:2330
msgid "run interactively"
msgstr "以互動式方式執行"
-#: builtin/am.c:2329
+#: builtin/am.c:2332
msgid "historical option -- no-op"
msgstr "老的參數 —— 無作用"
-#: builtin/am.c:2331
+#: builtin/am.c:2334
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要,允許使用三方合併"
-#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:642 builtin/stash.c:962
+#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:646 builtin/stash.c:946
msgid "be quiet"
msgstr "靜默模式"
-#: builtin/am.c:2334
+#: builtin/am.c:2337
msgid "add a Signed-off-by trailer to the commit message"
msgstr "在提交說明結尾加入 Signed-off-by"
-#: builtin/am.c:2337
+#: builtin/am.c:2340
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字元集(預設)"
-#: builtin/am.c:2339
+#: builtin/am.c:2342
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -k 參數"
-#: builtin/am.c:2341
+#: builtin/am.c:2344
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -b 參數"
-#: builtin/am.c:2343
+#: builtin/am.c:2346
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -m 參數"
-#: builtin/am.c:2345
+#: builtin/am.c:2348
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "針對 mbox 格式,向 git-mailsplit 傳遞 --keep-cr 參數"
-#: builtin/am.c:2348
+#: builtin/am.c:2351
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數,覆蓋 am.keepcr 的設定"
-#: builtin/am.c:2351
+#: builtin/am.c:2354
msgid "strip everything before a scissors line"
msgstr "捨棄裁切線前的所有內容"
-#: builtin/am.c:2353
+#: builtin/am.c:2356
msgid "pass it through git-mailinfo"
msgstr "透過 git-mailinfo 傳遞"
-#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
-#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
-#: builtin/am.c:2383
+#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368
+#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380
+#: builtin/am.c:2386
msgid "pass it through git-apply"
msgstr "傳遞給 git-apply"
-#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
-#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
+#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263
#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
-#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
-#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:317
+#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661
+#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180
+#: parse-options.h:348
msgid "n"
msgstr "n"
-#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
-#: builtin/verify-tag.c:38
+#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109
+#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856
+#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555
+#: builtin/tag.c:480 builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2380
+#: builtin/am.c:2383
msgid "format the patch(es) are in"
msgstr "修補檔的格式"
-#: builtin/am.c:2386
+#: builtin/am.c:2389
msgid "override error message when patch failure occurs"
msgstr "打修補檔失敗時顯示的錯誤訊息"
-#: builtin/am.c:2388
+#: builtin/am.c:2391
msgid "continue applying patches after resolving a conflict"
msgstr "衝突解決後繼續套用修補檔"
-#: builtin/am.c:2391
+#: builtin/am.c:2394
msgid "synonyms for --continue"
msgstr "和 --continue 同義"
-#: builtin/am.c:2394
+#: builtin/am.c:2397
msgid "skip the current patch"
msgstr "略過目前修補檔"
-#: builtin/am.c:2397
+#: builtin/am.c:2400
msgid "restore the original branch and abort the patching operation"
msgstr "還原原始分支並中止修補動作"
-#: builtin/am.c:2400
+#: builtin/am.c:2403
msgid "abort the patching operation but keep HEAD where it is"
msgstr "終止修補動作但保持 HEAD 不變"
-#: builtin/am.c:2404
+#: builtin/am.c:2407
msgid "show the patch being applied"
msgstr "顯示正在套用的修補檔"
-#: builtin/am.c:2408
+#: builtin/am.c:2411
msgid "record the empty patch as an empty commit"
msgstr "將空白修補檔錄製為空白提交"
-#: builtin/am.c:2412
+#: builtin/am.c:2415
msgid "lie about committer date"
msgstr "將作者日期作為提交日期"
-#: builtin/am.c:2414
+#: builtin/am.c:2417
msgid "use current timestamp for author date"
msgstr "用目前時間作為作者日期"
-#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
-#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
-#: builtin/revert.c:117 builtin/tag.c:460
+#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127
+#: builtin/revert.c:117 builtin/tag.c:461
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2417 builtin/rebase.c:1100
+#: builtin/am.c:2420 builtin/rebase.c:1128
msgid "GPG-sign commits"
msgstr "使用 GPG 簽名提交"
-#: builtin/am.c:2420
+#: builtin/am.c:2423
msgid "how to handle empty patches"
msgstr "空白修補檔的處理方式"
-#: builtin/am.c:2423
+#: builtin/am.c:2426
msgid "(internal use for git-rebase)"
msgstr "(內部使用,用於 git-rebase)"
-#: builtin/am.c:2441
+#: builtin/am.c:2444
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"參數 -b/--binary 已經很長時間不做任何實質動作了,並且將被移除。\n"
"請不要再使用它了。"
-#: builtin/am.c:2448
+#: builtin/am.c:2451
msgid "failed to read the index"
msgstr "讀取索引失敗"
-#: builtin/am.c:2463
+#: builtin/am.c:2466
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的重定基底目錄 %s 仍然存在,但卻提供了 mbox。"
-#: builtin/am.c:2487
+#: builtin/am.c:2490
#, c-format
msgid ""
"Stray %s directory found.\n"
"發現了錯誤的 %s 目錄。\n"
"使用 \"git am --abort\" 刪除它。"
-#: builtin/am.c:2493
+#: builtin/am.c:2496
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解決動作未進行,我們不會繼續。"
-#: builtin/am.c:2503
+#: builtin/am.c:2506
msgid "interactive mode requires patches on the command line"
msgstr "互動式模式需要指令列上提供修補檔"
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<提交>]"
-#: builtin/bisect--helper.c:25
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-
#: builtin/bisect--helper.c:26
msgid ""
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
"git bisect--helper --bisect-start [--term-{new,bad}=<術語> --term-{old,good}"
"=<術語>] [--no-checkout] [--first-parent] [<壞> [<好>...]] [--] [<路徑>...]"
-#: builtin/bisect--helper.c:28
-msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-next"
-
#: builtin/bisect--helper.c:29
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
msgstr "git bisect--helper --bisect-state (bad|new) [<修訂版>]"
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr "git bisect--helper --bisect-skip [(<修訂版>|<範圍>)...]"
-#: builtin/bisect--helper.c:33
-msgid "git bisect--helper --bisect-visualize"
-msgstr "git bisect--helper --bisect-visualize"
-
#: builtin/bisect--helper.c:34
msgid "git bisect--helper --bisect-run <cmd>..."
msgstr "git bisect--helper --bisect-run <cmd>..."
msgid "cannot read file '%s' for replaying"
msgstr "無法讀取「%s」檔案來重放"
-#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152
+#, c-format
+msgid "running %s\n"
+msgstr "正在執行 %s\n"
+
+#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335
msgid "bisect run failed: no command provided."
msgstr "二分搜尋執行失敗:沒有提供指令。"
-#: builtin/bisect--helper.c:1116
+#: builtin/bisect--helper.c:1166
#, c-format
-msgid "running %s\n"
-msgstr "正在執行 %s\n"
+msgid "unable to verify '%s' on good revision"
+msgstr "無法在正確修訂版上驗證「%s」"
+
+#: builtin/bisect--helper.c:1172
+#, c-format
+msgid "bogus exit code %d for good revision"
+msgstr "正確修訂版回傳偽造的錯誤代碼 %d"
-#: builtin/bisect--helper.c:1120
+#: builtin/bisect--helper.c:1180
#, c-format
msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
msgstr "二分搜尋執行失敗:「%2$s」返回的離開碼 %1$d 小於 0 或 >= 128"
-#: builtin/bisect--helper.c:1136
+#: builtin/bisect--helper.c:1195
#, c-format
msgid "cannot open file '%s' for writing"
msgstr "無法開啟「%s」檔案進行寫入"
-#: builtin/bisect--helper.c:1152
+#: builtin/bisect--helper.c:1213
msgid "bisect run cannot continue any more"
msgstr "二分搜尋不能繼續執行"
-#: builtin/bisect--helper.c:1154
+#: builtin/bisect--helper.c:1215
#, c-format
msgid "bisect run success"
msgstr "二分搜尋執行成功"
-#: builtin/bisect--helper.c:1157
+#: builtin/bisect--helper.c:1218
#, c-format
msgid "bisect found first bad commit"
msgstr "二分搜尋發現到第一個有問題的提交"
-#: builtin/bisect--helper.c:1160
+#: builtin/bisect--helper.c:1221
#, c-format
msgid ""
"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
msgstr ""
"二分搜尋執行失敗:'git bisect--helper --bisect-state %s' 以錯誤代碼 %d 離開"
-#: builtin/bisect--helper.c:1192
+#: builtin/bisect--helper.c:1253
msgid "reset the bisection state"
msgstr "清除二分搜尋狀態"
-#: builtin/bisect--helper.c:1194
+#: builtin/bisect--helper.c:1255
msgid "check whether bad or good terms exist"
msgstr "檢查壞的或好的術語是否存在"
-#: builtin/bisect--helper.c:1196
+#: builtin/bisect--helper.c:1257
msgid "print out the bisect terms"
msgstr "列印二分搜尋術語"
-#: builtin/bisect--helper.c:1198
+#: builtin/bisect--helper.c:1259
msgid "start the bisect session"
msgstr "啟動二分搜尋過程"
-#: builtin/bisect--helper.c:1200
+#: builtin/bisect--helper.c:1261
msgid "find the next bisection commit"
msgstr "尋找下一個二分搜尋提交"
-#: builtin/bisect--helper.c:1202
+#: builtin/bisect--helper.c:1263
msgid "mark the state of ref (or refs)"
msgstr "標記 ref (或 refs) 的狀態"
-#: builtin/bisect--helper.c:1204
+#: builtin/bisect--helper.c:1265
msgid "list the bisection steps so far"
msgstr "列出迄今的二分搜尋步驟"
-#: builtin/bisect--helper.c:1206
+#: builtin/bisect--helper.c:1267
msgid "replay the bisection process from the given file"
msgstr "從指定檔案重放二分搜尋過程"
-#: builtin/bisect--helper.c:1208
+#: builtin/bisect--helper.c:1269
msgid "skip some commits for checkout"
msgstr "略過要簽出的部分提交"
-#: builtin/bisect--helper.c:1210
+#: builtin/bisect--helper.c:1271
msgid "visualize the bisection"
msgstr "視覺化二分搜尋過程"
-#: builtin/bisect--helper.c:1212
-msgid "use <cmd>... to automatically bisect."
-msgstr "使用 <cmd>... 自動進行二分搜尋。"
+#: builtin/bisect--helper.c:1273
+msgid "use <cmd>... to automatically bisect"
+msgstr "使用 <cmd>... 自動進行二分搜尋"
-#: builtin/bisect--helper.c:1214
+#: builtin/bisect--helper.c:1275
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE 無日誌"
-#: builtin/bisect--helper.c:1229
+#: builtin/bisect--helper.c:1290
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset 無需參數或者需要一個提交"
-#: builtin/bisect--helper.c:1234
+#: builtin/bisect--helper.c:1295
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 需要 0 或 1 個參數"
-#: builtin/bisect--helper.c:1243
+#: builtin/bisect--helper.c:1304
msgid "--bisect-next requires 0 arguments"
msgstr "--bisect-next 需要 0 個引數"
-#: builtin/bisect--helper.c:1254
+#: builtin/bisect--helper.c:1315
msgid "--bisect-log requires 0 arguments"
msgstr "--bisect-log 需要 0 個引數"
-#: builtin/bisect--helper.c:1259
+#: builtin/bisect--helper.c:1320
msgid "no logfile given"
msgstr "未提供日誌檔案"
msgid "must end with a color"
msgstr "必須以一個顏色結尾"
-#: builtin/blame.c:724
-#, c-format
-msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "設定 color.blame.repeatedLines 中的無效顏色 '%s'"
-
-#: builtin/blame.c:742
-msgid "invalid value for blame.coloring"
-msgstr "設定 blame.coloring 中的無效取值"
-
-#: builtin/blame.c:841
+#: builtin/blame.c:842
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "不能找到要忽略的版本 %s"
-#: builtin/blame.c:863
+#: builtin/blame.c:864
msgid "show blame entries as we find them, incrementally"
msgstr "增量式顯示發現的 blame 條目"
-#: builtin/blame.c:864
+#: builtin/blame.c:865
msgid "do not show object names of boundary commits (Default: off)"
msgstr "不要顯示邊界提交的物件名稱(預設值: off)"
-#: builtin/blame.c:865
+#: builtin/blame.c:866
msgid "do not treat root commits as boundaries (Default: off)"
msgstr "不將根提交看作邊界(預設值:off)"
-#: builtin/blame.c:866
+#: builtin/blame.c:867
msgid "show work cost statistics"
msgstr "顯示工作量統計"
-#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181
#: builtin/merge.c:301 builtin/multi-pack-index.c:103
#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
-#: builtin/send-pack.c:202
+#: builtin/remote.c:683 builtin/send-pack.c:202
msgid "force progress reporting"
msgstr "強制顯示進度報告"
-#: builtin/blame.c:868
+#: builtin/blame.c:869
msgid "show output score for blame entries"
msgstr "顯示判斷 blame 條目位移的得分診斷訊息"
-#: builtin/blame.c:869
+#: builtin/blame.c:870
msgid "show original filename (Default: auto)"
msgstr "顯示原始檔案名稱(預設值:auto)"
-#: builtin/blame.c:870
+#: builtin/blame.c:871
msgid "show original linenumber (Default: off)"
msgstr "顯示原始檔案名稱(預設值:off)"
-#: builtin/blame.c:871
+#: builtin/blame.c:872
msgid "show in a format designed for machine consumption"
msgstr "顯示成適合機器讀取的格式"
-#: builtin/blame.c:872
+#: builtin/blame.c:873
msgid "show porcelain format with per-line commit information"
msgstr "顯示每一列適合機器的提交說明"
-#: builtin/blame.c:873
+#: builtin/blame.c:874
msgid "use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的輸出模式(預設值:off)"
-#: builtin/blame.c:874
+#: builtin/blame.c:875
msgid "show raw timestamp (Default: off)"
msgstr "顯示原始時間戳(預設值:off)"
-#: builtin/blame.c:875
+#: builtin/blame.c:876
msgid "show long commit SHA1 (Default: off)"
msgstr "顯示較長的 SHA1 提交編號(預設值:off)"
-#: builtin/blame.c:876
+#: builtin/blame.c:877
msgid "suppress author name and timestamp (Default: off)"
msgstr "隱藏作者名字及時間戳(預設值:off)"
-#: builtin/blame.c:877
+#: builtin/blame.c:878
msgid "show author email instead of name (Default: off)"
msgstr "顯示作者信箱而非名稱(預設值:off)"
-#: builtin/blame.c:878
+#: builtin/blame.c:879
msgid "ignore whitespace differences"
msgstr "忽略空白差異"
-#: builtin/blame.c:879 builtin/log.c:1838
+#: builtin/blame.c:880 builtin/log.c:1857
msgid "rev"
msgstr "版本"
-#: builtin/blame.c:879
+#: builtin/blame.c:880
msgid "ignore <rev> when blaming"
msgstr "在執行 blame 動作時忽略 <修訂版>"
-#: builtin/blame.c:880
+#: builtin/blame.c:881
msgid "ignore revisions from <file>"
msgstr "忽略 <檔案> 中的修訂版"
-#: builtin/blame.c:881
+#: builtin/blame.c:882
msgid "color redundant metadata from previous line differently"
msgstr "使用顏色間隔輸出與前一行不同的重複中介資料"
-#: builtin/blame.c:882
+#: builtin/blame.c:883
msgid "color lines by age"
msgstr "依據時間著色"
-#: builtin/blame.c:883
+#: builtin/blame.c:884
msgid "spend extra cycles to find better match"
msgstr "循環更多次以找到更佳符合"
-#: builtin/blame.c:884
+#: builtin/blame.c:885
msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list"
-#: builtin/blame.c:885
+#: builtin/blame.c:886
msgid "use <file>'s contents as the final image"
msgstr "將 <檔案> 的內容當成是最終 image"
-#: builtin/blame.c:886 builtin/blame.c:887
+#: builtin/blame.c:887 builtin/blame.c:888
msgid "score"
msgstr "得分"
-#: builtin/blame.c:886
+#: builtin/blame.c:887
msgid "find line copies within and across files"
msgstr "找到檔案內及跨檔案的複製列"
-#: builtin/blame.c:887
+#: builtin/blame.c:888
msgid "find line movements within and across files"
msgstr "找到檔案內及跨檔案的移動列"
-#: builtin/blame.c:888
+#: builtin/blame.c:889
msgid "range"
msgstr "range"
-#: builtin/blame.c:889
+#: builtin/blame.c:890
msgid "process only line range <start>,<end> or function :<funcname>"
msgstr "只處理範圍在 <開始>,<結尾> 的列,或是 :<函數名稱> 函數"
-#: builtin/blame.c:947
+#: builtin/blame.c:949
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用"
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:998
+#: builtin/blame.c:1000
msgid "4 years, 11 months ago"
msgstr "4 年 11 個月前"
-#: builtin/blame.c:1114
+#: builtin/blame.c:1116
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "檔案 %s 只有 %lu 行"
-#: builtin/blame.c:1159
+#: builtin/blame.c:1161
msgid "Blaming lines"
msgstr "追蹤程式碼行"
msgstr "git branch [<選項>] [-r | -a] [--merged] [--no-merged]"
#: builtin/branch.c:30
-msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<選項>] [-l] [-f] <分支名> [<起始點>]"
+msgid ""
+"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
+"point>]"
+msgstr "git branch [<選項>] [-f] [--recurse-submodules] <分支名> [<起始點>]"
#: builtin/branch.c:31
+msgid "git branch [<options>] [-l] [<pattern>...]"
+msgstr "git branch [<選項>] [-l] [<模式>...]"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<選項>] [-r] (-d | -D) <分支名>..."
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<選項>] (-m | -M) [<舊分支>] <新分支>"
-#: builtin/branch.c:33
+#: builtin/branch.c:34
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<選項>] (-c | -C) [<老分支>] <新分支>"
-#: builtin/branch.c:34
+#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<選項>] [-r | -a] [--points-at]"
-#: builtin/branch.c:35
+#: builtin/branch.c:36
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<選項>] [-r | -a] [--format]"
# 譯者:保持原換行格式,在輸出時 %s 的替代內容會讓字串變長
-#: builtin/branch.c:153
+#: builtin/branch.c:165
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s',但未合併到 HEAD。"
# 譯者:保持原換行格式,在輸出時 %s 的替代內容會讓字串變長
-#: builtin/branch.c:157
+#: builtin/branch.c:169
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"並未刪除分支 '%s', 雖然它已經合併到 HEAD,\n"
" 然而卻尚未被合併到分支 '%s' 。"
-#: builtin/branch.c:171
+#: builtin/branch.c:183
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "無法查詢 '%s' 指向的提交物件"
-#: builtin/branch.c:175
+#: builtin/branch.c:187
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"分支 '%s' 沒有完全合併。\n"
"如果您確認要刪除它,執行 'git branch -D %s'。"
-#: builtin/branch.c:188
+#: builtin/branch.c:200
msgid "Update of config-file failed"
msgstr "更新設定檔案失敗"
-#: builtin/branch.c:223
+#: builtin/branch.c:235
msgid "cannot use -a with -d"
msgstr "不能將 -a 和 -d 同時使用"
-#: builtin/branch.c:230
+#: builtin/branch.c:242
msgid "Couldn't look up commit object for HEAD"
msgstr "無法查詢 HEAD 指向的提交物件"
-#: builtin/branch.c:247
+#: builtin/branch.c:259
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "無法刪除在「%2$s」簽出的「%1$s」分支"
-#: builtin/branch.c:262
+#: builtin/branch.c:274
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到遠端追蹤分支 '%s'。"
-#: builtin/branch.c:263
+#: builtin/branch.c:275
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未發現。"
-#: builtin/branch.c:294
+#: builtin/branch.c:306
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已刪除遠端追蹤分支 %s(曾為 %s)。\n"
-#: builtin/branch.c:295
+#: builtin/branch.c:307
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已刪除分支 %s(曾為 %s)。\n"
-#: builtin/branch.c:445 builtin/tag.c:63
+#: builtin/branch.c:457 builtin/tag.c:64
msgid "unable to parse format string"
msgstr "不能解析格式化字串"
-#: builtin/branch.c:476
+#: builtin/branch.c:488
msgid "could not resolve HEAD"
msgstr "不能解析 HEAD 提交"
-#: builtin/branch.c:482
+#: builtin/branch.c:494
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) 指向 refs/heads/ 之外"
-#: builtin/branch.c:497
+#: builtin/branch.c:509
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被重定基底到 %s"
-#: builtin/branch.c:501
+#: builtin/branch.c:513
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分搜尋於 %s"
-#: builtin/branch.c:518
+#: builtin/branch.c:530
msgid "cannot copy the current branch while not on any."
msgstr "無法複製目前分支因為不處於任何分支上。"
-#: builtin/branch.c:520
+#: builtin/branch.c:532
msgid "cannot rename the current branch while not on any."
msgstr "無法重新命名目前分支因為不處於任何分支上。"
-#: builtin/branch.c:531
+#: builtin/branch.c:543
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "無效的分支名:'%s'"
-#: builtin/branch.c:560
+#: builtin/branch.c:572
msgid "Branch rename failed"
msgstr "分支重新命名失敗"
-#: builtin/branch.c:562
+#: builtin/branch.c:574
msgid "Branch copy failed"
msgstr "分支複製失敗"
-#: builtin/branch.c:566
+#: builtin/branch.c:578
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "已為錯誤命名的分支 '%s' 建立了一個副本"
-#: builtin/branch.c:569
+#: builtin/branch.c:581
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "已將錯誤命名的分支 '%s' 重新命名"
-#: builtin/branch.c:575
+#: builtin/branch.c:587
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重新命名為 %s,但 HEAD 沒有更新!"
-#: builtin/branch.c:584
+#: builtin/branch.c:596
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重新命名,但更新設定檔案失敗"
-#: builtin/branch.c:586
+#: builtin/branch.c:598
msgid "Branch is copied, but update of config-file failed"
msgstr "分支已複製,但更新設定檔案失敗"
-#: builtin/branch.c:602
+#: builtin/branch.c:614
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"以 '%c' 開頭的行將被過濾。\n"
-#: builtin/branch.c:637
+#: builtin/branch.c:651
msgid "Generic options"
msgstr "通用選項"
-#: builtin/branch.c:639
+#: builtin/branch.c:653
msgid "show hash and subject, give twice for upstream branch"
msgstr "顯示雜湊值和主題,若參數出現兩次則顯示上游分支"
-#: builtin/branch.c:640
+#: builtin/branch.c:654
msgid "suppress informational messages"
msgstr "不顯示訊息"
-#: builtin/branch.c:642
+#: builtin/branch.c:656 builtin/checkout.c:1571
+#: builtin/submodule--helper.c:3077
msgid "set branch tracking configuration"
msgstr "設定分支追蹤設定"
-#: builtin/branch.c:645
+#: builtin/branch.c:659
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:647
+#: builtin/branch.c:661
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:647
+#: builtin/branch.c:661
msgid "change the upstream info"
msgstr "改變上游訊息"
-#: builtin/branch.c:648
+#: builtin/branch.c:662
msgid "unset the upstream info"
msgstr "取消上游資訊設定"
-#: builtin/branch.c:649
+#: builtin/branch.c:663
msgid "use colored output"
msgstr "使用彩色輸出"
-#: builtin/branch.c:650
+#: builtin/branch.c:664
msgid "act on remote-tracking branches"
msgstr "作用於遠端追蹤分支"
-#: builtin/branch.c:652 builtin/branch.c:654
+#: builtin/branch.c:666 builtin/branch.c:668
msgid "print only branches that contain the commit"
msgstr "只列印包含該提交的分支"
-#: builtin/branch.c:653 builtin/branch.c:655
+#: builtin/branch.c:667 builtin/branch.c:669
msgid "print only branches that don't contain the commit"
msgstr "只列印不包含該提交的分支"
-#: builtin/branch.c:658
+#: builtin/branch.c:672
msgid "Specific git-branch actions:"
msgstr "具體的 git-branch 動作:"
-#: builtin/branch.c:659
+#: builtin/branch.c:673
msgid "list both remote-tracking and local branches"
msgstr "列出遠端追蹤及本機分支"
-#: builtin/branch.c:661
+#: builtin/branch.c:675
msgid "delete fully merged branch"
msgstr "刪除完全合併的分支"
-#: builtin/branch.c:662
+#: builtin/branch.c:676
msgid "delete branch (even if not merged)"
msgstr "刪除分支(即使沒有合併)"
-#: builtin/branch.c:663
+#: builtin/branch.c:677
msgid "move/rename a branch and its reflog"
msgstr "移動/重新命名一個分支,以及它的引用日誌"
-#: builtin/branch.c:664
+#: builtin/branch.c:678
msgid "move/rename a branch, even if target exists"
msgstr "移動/重新命名一個分支,即使目標已存在"
-#: builtin/branch.c:665
+#: builtin/branch.c:679
msgid "copy a branch and its reflog"
-msgstr "複製一個分支和它的引用日誌"
+msgstr "複製分支及其引用日誌"
-#: builtin/branch.c:666
+#: builtin/branch.c:680
msgid "copy a branch, even if target exists"
msgstr "複製一個分支,即使目標已存在"
-#: builtin/branch.c:667
+#: builtin/branch.c:681
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:668
+#: builtin/branch.c:682
msgid "show current branch name"
msgstr "顯示目前分支名"
-#: builtin/branch.c:669
+#: builtin/branch.c:683 builtin/submodule--helper.c:3075
msgid "create the branch's reflog"
msgstr "建立分支的引用日誌"
-#: builtin/branch.c:671
+#: builtin/branch.c:685
msgid "edit the description for the branch"
msgstr "標記分支的描述"
-#: builtin/branch.c:672
+#: builtin/branch.c:686
msgid "force creation, move/rename, deletion"
msgstr "強制建立、移動/重新命名、刪除"
-#: builtin/branch.c:673
+#: builtin/branch.c:687
msgid "print only branches that are merged"
msgstr "只列印已經合併的分支"
-#: builtin/branch.c:674
+#: builtin/branch.c:688
msgid "print only branches that are not merged"
msgstr "只列印尚未合併的分支"
-#: builtin/branch.c:675
+#: builtin/branch.c:689
msgid "list branches in columns"
msgstr "以列的方式顯示分支"
-#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
+#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413
#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
-#: builtin/tag.c:475
+#: builtin/tag.c:476
msgid "object"
msgstr "物件"
-#: builtin/branch.c:678
+#: builtin/branch.c:692
msgid "print only branches of the object"
msgstr "只列印指向該物件的分支"
-#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
+#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483
msgid "sorting and filtering are case insensitive"
msgstr "排序和過濾屬於大小寫不敏感"
-#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:694 builtin/ls-files.c:667
+msgid "recurse through submodules"
+msgstr "在子模組中遞迴"
+
+#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358
+#: builtin/tag.c:481 builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "輸出格式"
-#: builtin/branch.c:703 builtin/clone.c:678
+#: builtin/branch.c:718 builtin/clone.c:684
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 沒有位於 /refs/heads 之下!"
-#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
+#: builtin/branch.c:739
+msgid ""
+"branch with --recurse-submodules can only be used if submodule."
+"propagateBranches is enabled"
+msgstr ""
+"有 --recurse-submodules 的分支只能在啟用 submodule.propagateBranches 時使用"
+
+#: builtin/branch.c:741
+msgid "--recurse-submodules can only be used to create branches"
+msgstr "--recurse-submodules 只能用來建立分支"
+
+#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835
msgid "branch name required"
msgstr "必須提供分支名"
-#: builtin/branch.c:774
+#: builtin/branch.c:802
msgid "Cannot give description to detached HEAD"
msgstr "不能向分離開頭指標提供描述"
-#: builtin/branch.c:779
+#: builtin/branch.c:807
msgid "cannot edit description of more than one branch"
msgstr "不能為一個以上的分支編輯描述"
-#: builtin/branch.c:786
+#: builtin/branch.c:814
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚無提交。"
-#: builtin/branch.c:789
+#: builtin/branch.c:817
#, c-format
msgid "No branch named '%s'."
msgstr "沒有分支 '%s'。"
-#: builtin/branch.c:804
+#: builtin/branch.c:832
msgid "too many branches for a copy operation"
msgstr "為複製動作提供了太多的分支名"
-#: builtin/branch.c:813
+#: builtin/branch.c:841
msgid "too many arguments for a rename operation"
msgstr "為重新命名動作提供了太多的參數"
-#: builtin/branch.c:818
+#: builtin/branch.c:846
msgid "too many arguments to set new upstream"
msgstr "為設定新上游提供了太多的參數"
-#: builtin/branch.c:822
+#: builtin/branch.c:850
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "無法設定 HEAD 的上游為 %s,因為 HEAD 沒有指向任何分支。"
-#: builtin/branch.c:825 builtin/branch.c:848
+#: builtin/branch.c:853 builtin/branch.c:873
#, c-format
msgid "no such branch '%s'"
msgstr "沒有此分支 '%s'"
-#: builtin/branch.c:829
+#: builtin/branch.c:857
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:842
+#: builtin/branch.c:867
msgid "too many arguments to unset upstream"
msgstr "為取消上游設定動作提供了太多的參數"
-#: builtin/branch.c:846
+#: builtin/branch.c:871
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。"
-#: builtin/branch.c:852
+#: builtin/branch.c:877
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 沒有上游訊息"
-#: builtin/branch.c:862
+#: builtin/branch.c:890
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
"'git branch' 的 -a 和 -r 選項不帶一個分支名。\n"
"您是否想要使用:-a|-r --list <模式>?"
-#: builtin/branch.c:866
+#: builtin/branch.c:894
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <檔案> [<引用名稱>...]"
-#: builtin/bundle.c:65 builtin/pack-objects.c:3876
+#: builtin/bundle.c:65 builtin/pack-objects.c:3899
msgid "do not show progress meter"
msgstr "不顯示進度表"
-#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
+#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901
msgid "show progress meter"
msgstr "顯示進度表"
-#: builtin/bundle.c:69 builtin/pack-objects.c:3880
+#: builtin/bundle.c:69 builtin/pack-objects.c:3903
msgid "show progress meter during object writing phase"
msgstr "在物件寫入階段顯示進度表"
-#: builtin/bundle.c:72 builtin/pack-objects.c:3883
+#: builtin/bundle.c:72 builtin/pack-objects.c:3906
msgid "similar to --all-progress when progress meter is shown"
msgstr "當進度表顯示時類似於 --all-progress"
#: builtin/bundle.c:74
msgid "specify bundle format version"
-msgstr "æ\8c\87å®\9aå\8c\85格式版本"
+msgstr "æ\8c\87å®\9aå¥\97件ç\9a\84格式版本"
#: builtin/bundle.c:94
msgid "Need a repository to create a bundle."
-msgstr "需要一個版本庫來建立包。"
+msgstr "需要版本庫來建立套件。"
-#: builtin/bundle.c:107
+#: builtin/bundle.c:108
msgid "do not show bundle details"
-msgstr "ä¸\8d顯示å\8c\85 (bundle) 詳細資訊"
+msgstr "ä¸\8d顯示å¥\97件詳細資訊"
-#: builtin/bundle.c:126
+#: builtin/bundle.c:127
#, c-format
msgid "%s is okay\n"
msgstr "%s 可以\n"
-#: builtin/bundle.c:182
+#: builtin/bundle.c:183
msgid "Need a repository to unbundle."
-msgstr "需要版本庫才能拆分。"
+msgstr "需要版本庫才能拆分套件。"
-#: builtin/bundle.c:185
+#: builtin/bundle.c:186
msgid "Unbundling objects"
msgstr "正在解包物件"
-#: builtin/bundle.c:219 builtin/remote.c:1733
+#: builtin/bundle.c:220 builtin/remote.c:1758
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子指令:%s"
-#: builtin/cat-file.c:622
+#: builtin/cat-file.c:568
+msgid "flush is only for --buffer mode"
+msgstr "排清功能只能用於 --buffer 模式"
+
+#: builtin/cat-file.c:612
+msgid "empty command in input"
+msgstr "輸入中沒有命令"
+
+#: builtin/cat-file.c:614
+#, c-format
+msgid "whitespace before command: '%s'"
+msgstr "命令前空格:「%s」"
+
+#: builtin/cat-file.c:623
+#, c-format
+msgid "%s requires arguments"
+msgstr "%s 需要引數"
+
+#: builtin/cat-file.c:628
+#, c-format
+msgid "%s takes no arguments"
+msgstr "%s 不取引數"
+
+#: builtin/cat-file.c:636
+#, c-format
+msgid "unknown command: '%s'"
+msgstr "未知命令:「%s」"
+
+#: builtin/cat-file.c:795
+msgid "only one batch option may be specified"
+msgstr "只能指定一個批次處理選項"
+
+#: builtin/cat-file.c:824
+msgid "git cat-file <type> <object>"
+msgstr "git cat-file <type> <object>"
+
+#: builtin/cat-file.c:825
+msgid "git cat-file (-e | -p) <object>"
+msgstr "git cat-file (-e | -p) <object>"
+
+#: builtin/cat-file.c:826
+msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>"
+
+#: builtin/cat-file.c:827
msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"
+"git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
+"objects]\n"
+" [--buffer] [--follow-symlinks] [--unordered]\n"
+" [--textconv | --filters]"
-#: builtin/cat-file.c:623
+#: builtin/cat-file.c:830
msgid ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
msgstr ""
-"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
-"symlinks] [--textconv | --filters]"
+"git cat-file (--textconv | --filters)\n"
+" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
-#: builtin/cat-file.c:644
-msgid "only one batch option may be specified"
-msgstr "只能指定一個批次處理選項"
+#: builtin/cat-file.c:836
+msgid "Check object existence or emit object contents"
+msgstr "檢查物件的存在狀態,或輸出物件內容"
-#: builtin/cat-file.c:662
-msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr "<類型> 可以是其中之一:blob、tree、commit、tag"
+#: builtin/cat-file.c:838
+msgid "check if <object> exists"
+msgstr "檢查 <object> 是否存在"
-#: builtin/cat-file.c:663
-msgid "show object type"
-msgstr "顯示物件類型"
+#: builtin/cat-file.c:839
+msgid "pretty-print <object> content"
+msgstr "美化輸出 <object> 的內容"
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:841
+msgid "Emit [broken] object attributes"
+msgstr "輸出 [損壞的] 物件屬性"
+
+#: builtin/cat-file.c:842
+msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
+msgstr "顯示物件類型(可以是 “blob”、“tree”、“commit”、“tag” 等其中一個)"
+
+#: builtin/cat-file.c:843
msgid "show object size"
msgstr "顯示物件大小"
-#: builtin/cat-file.c:666
-msgid "exit with zero when there's no error"
-msgstr "當沒有錯誤時離開並返回零"
+#: builtin/cat-file.c:845
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "允許 -s 和 -t 對損壞的物件生效"
-#: builtin/cat-file.c:667
-msgid "pretty-print object's content"
-msgstr "美觀地列印物件的內容"
+#: builtin/cat-file.c:847
+msgid "Batch objects requested on stdin (or --batch-all-objects)"
+msgstr "批次處理 stdin 上請求的物件(或 --batch-all-objects)"
-#: builtin/cat-file.c:669
-msgid "for blob objects, run textconv on object's content"
-msgstr "對於資料物件,對其內容做文字轉換"
+#: builtin/cat-file.c:849
+msgid "show full <object> or <rev> contents"
+msgstr "顯示完整的 <object> 或 <rev> 內容"
-#: builtin/cat-file.c:671
-msgid "for blob objects, run filters on object's content"
-msgstr "對於資料物件,對其內容做過濾"
+#: builtin/cat-file.c:853
+msgid "like --batch, but don't emit <contents>"
+msgstr "類似 --batch 但不輸出 <contents>"
-#: builtin/cat-file.c:672
-msgid "blob"
-msgstr "blob"
+#: builtin/cat-file.c:857
+msgid "read commands from stdin"
+msgstr "從標準輸入讀取命令"
-#: builtin/cat-file.c:673
-msgid "use a specific path for --textconv/--filters"
-msgstr "å°\8dæ\96¼ --textconv/--filters 使ç\94¨ä¸\80å\80\8bç\89¹å®\9aç\9a\84è·¯å¾\91"
+#: builtin/cat-file.c:861
+msgid "with --batch[-check]: ignores stdin, batches all known objects"
+msgstr "å\82³å\85¥ --batch[-check]ï¼\9a忽ç\95¥æ¨\99æº\96輸å\85¥ï¼\8cæ\89¹æ¬¡è\99\95ç\90\86æ\89\80æ\9c\89å·²ç\9f¥ç\89©ä»¶"
-#: builtin/cat-file.c:675
-msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr "允許 -s 和 -t 對損壞的物件生效"
+#: builtin/cat-file.c:863
+msgid "Change or optimize batch output"
+msgstr "變更或最佳化批次處理的輸出"
-#: builtin/cat-file.c:676
+#: builtin/cat-file.c:864
msgid "buffer --batch output"
msgstr "緩衝 --batch 的輸出"
-#: builtin/cat-file.c:678
-msgid "show info and content of objects fed from the standard input"
-msgstr "顯示從標準輸入提供的物件的訊息和內容"
+#: builtin/cat-file.c:866
+msgid "follow in-tree symlinks"
+msgstr "追蹤樹中的符號連結"
-#: builtin/cat-file.c:682
-msgid "show info about objects fed from the standard input"
-msgstr "顯示從標準輸入提供的物件的訊息"
+#: builtin/cat-file.c:868
+msgid "do not order objects before emitting them"
+msgstr "不要在輸出物件前排序"
-#: builtin/cat-file.c:686
-msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr "跟隨樹內符號連結(和 --batch 或 --batch-check 共用)"
+#: builtin/cat-file.c:870
+msgid ""
+"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
+"batch)"
+msgstr "轉換或過濾後輸出物件(blob 或樹)(單獨或批次處理)"
-#: builtin/cat-file.c:688
-msgid "show all objects with --batch or --batch-check"
-msgstr "使用 --batch 或 --batch-check 參數顯示所有物件"
+#: builtin/cat-file.c:872
+msgid "run textconv on object's content"
+msgstr "在物件內容執行 textconv"
-#: builtin/cat-file.c:690
-msgid "do not order --batch-all-objects output"
-msgstr "不要對 --batch-all-objects 的輸出排序"
+#: builtin/cat-file.c:874
+msgid "run filters on object's content"
+msgstr "在物件內容執行過濾器"
-#: builtin/check-attr.c:13
-msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
-msgstr "git check-attr [-a | --all | <屬性>...] [--] <路徑名>..."
+#: builtin/cat-file.c:875
+msgid "blob|tree"
+msgstr "blob|tree"
-#: builtin/check-attr.c:14
-msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
-msgstr "git check-attr --stdin [-z] [-a | --all | <屬性>...]"
+#: builtin/cat-file.c:876
+msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
+msgstr "請在 (--textconv | --filters) 使用 <path>,而非 “batch”"
-#: builtin/check-attr.c:21
-msgid "report all attributes set on file"
-msgstr "報告設定在檔案上的所有屬性"
+#: builtin/cat-file.c:894
+#, c-format
+msgid "'%s=<%s>' needs '%s' or '%s'"
+msgstr "「%s=<%s>」需要「%s」或「%s」"
-#: builtin/check-attr.c:22
-msgid "use .gitattributes only from the index"
-msgstr "只使用索引中的 .gitattributes"
+#: builtin/cat-file.c:896
+msgid "path|tree-ish"
+msgstr "path|tree-ish"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
+#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909
+#, c-format
+msgid "'%s' requires a batch mode"
+msgstr "「%s」需要批次處理模式"
+
+#: builtin/cat-file.c:921
+#, c-format
+msgid "'-%c' is incompatible with batch mode"
+msgstr "「-%c」與批次處理模式不相容"
+
+#: builtin/cat-file.c:924
+msgid "batch modes take no arguments"
+msgstr "批次處理模式不取引數"
+
+#: builtin/cat-file.c:932 builtin/cat-file.c:935
+#, c-format
+msgid "<rev> required with '%s'"
+msgstr "<rev> 需要搭配「%s」"
+
+#: builtin/cat-file.c:938
+#, c-format
+msgid "<object> required with '-%c'"
+msgstr "<object> 需要搭配「-%c」"
+
+#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429
+#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596
+#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965
+#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489
+#: builtin/tag.c:592
+msgid "too many arguments"
+msgstr "太多參數"
+
+#: builtin/cat-file.c:947
+#, c-format
+msgid "only two arguments allowed in <type> <object> mode, not %d"
+msgstr "只允許在 <type> <object> 模式傳入兩個引數,但傳了 %d 個"
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <屬性>...] [--] <路徑名>..."
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <屬性>...]"
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr "報告設定在檔案上的所有屬性"
+
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
+msgstr "只使用索引中的 .gitattributes"
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101
msgid "read file names from stdin"
msgstr "從標準輸入讀出檔案名"
msgid "terminate input and output records by a NUL character"
msgstr "輸入和輸出的紀錄使用 NUL 字元終結"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
-#: builtin/worktree.c:493
+#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550
+#: builtin/worktree.c:565
msgid "suppress progress reporting"
msgstr "不顯示進度報告"
msgid "git checkout--worker [<options>]"
msgstr "git checkout--worker [<選項>]"
-#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
-#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
-#: builtin/worktree.c:491 builtin/worktree.c:728
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2716 builtin/worktree.c:563
+#: builtin/worktree.c:808
msgid "string"
msgstr "字串"
-#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236
msgid "when creating files, prepend <string>"
msgstr "在建立檔案時,在前面加上 <字串>"
-#: builtin/checkout-index.c:152
+#: builtin/checkout-index.c:184
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<選項>] [--] [<檔案>...]"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:201
msgid "stage should be between 1 and 3 or all"
msgstr "索引值應該取值 1 到 3 或者 all"
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:219
msgid "check out all files in the index"
msgstr "簽出索引區的所有檔案"
-#: builtin/checkout-index.c:188
+#: builtin/checkout-index.c:221
+msgid "do not skip files with skip-worktree set"
+msgstr "設定 skip-worktree 時不略過檔案"
+
+#: builtin/checkout-index.c:222
msgid "force overwrite of existing files"
msgstr "強制覆蓋現有的檔案"
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:224
msgid "no warning for existing files and files not in index"
msgstr "存在或不在索引中的檔案都沒有警告"
-#: builtin/checkout-index.c:192
+#: builtin/checkout-index.c:226
msgid "don't checkout new files"
msgstr "不簽出新檔案"
-#: builtin/checkout-index.c:194
+#: builtin/checkout-index.c:228
msgid "update stat information in the index file"
msgstr "更新索引中檔案的狀態訊息"
-#: builtin/checkout-index.c:198
+#: builtin/checkout-index.c:232
msgid "read list of paths from the standard input"
msgstr "從標準輸入讀取路徑列表"
-#: builtin/checkout-index.c:200
+#: builtin/checkout-index.c:234
msgid "write the content to temporary files"
msgstr "將內容寫入暫存檔"
-#: builtin/checkout-index.c:204
+#: builtin/checkout-index.c:238
msgid "copy out the files from named stage"
msgstr "從指定暫存區中拷出檔案"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:34
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<選項>] <分支>"
-#: builtin/checkout.c:34
+#: builtin/checkout.c:35
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<選項>] [<分支>] -- <檔案>..."
-#: builtin/checkout.c:39
+#: builtin/checkout.c:40
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<選項>] [<分支>]"
-#: builtin/checkout.c:44
+#: builtin/checkout.c:45
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<選項>] [--source=<分支>] <檔案>..."
-#: builtin/checkout.c:198 builtin/checkout.c:237
+#: builtin/checkout.c:199 builtin/checkout.c:238
#, c-format
msgid "path '%s' does not have our version"
msgstr "路徑 '%s' 沒有我們的版本"
-#: builtin/checkout.c:200 builtin/checkout.c:239
+#: builtin/checkout.c:201 builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have their version"
msgstr "路徑 '%s' 沒有他們的版本"
-#: builtin/checkout.c:216
+#: builtin/checkout.c:217
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路徑 '%s' 沒有全部必需的版本"
-#: builtin/checkout.c:269
+#: builtin/checkout.c:271
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路徑 '%s' 沒有必需的版本"
-#: builtin/checkout.c:286
+#: builtin/checkout.c:291
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s':無法合併"
-#: builtin/checkout.c:302
+#: builtin/checkout.c:307
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "無法為 '%s' 新增合併結果"
-#: builtin/checkout.c:419
+#: builtin/checkout.c:424
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "重新建立了 %d 個合併衝突"
-#: builtin/checkout.c:424
+#: builtin/checkout.c:429
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "從 %2$s 更新了 %1$d 個路徑"
-#: builtin/checkout.c:431
+#: builtin/checkout.c:436
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "從索引區更新了 %d 個路徑"
-#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
-#: builtin/checkout.c:464
+#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:469
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路徑時使用"
-#: builtin/checkout.c:474
+#: builtin/checkout.c:479
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同時更新路徑並切換到分支'%s'。"
-#: builtin/checkout.c:478
+#: builtin/checkout.c:483
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "'%s' 或 '%s' 都沒有指定"
-#: builtin/checkout.c:482
+#: builtin/checkout.c:487
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "未指定 '%2$s' 時,必須使用 '%1$s'"
-#: builtin/checkout.c:487 builtin/checkout.c:492
+#: builtin/checkout.c:492 builtin/checkout.c:497
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
-#: builtin/checkout.c:566 builtin/checkout.c:573
+#: builtin/checkout.c:571 builtin/checkout.c:578
#, c-format
msgid "path '%s' is unmerged"
msgstr "路徑 '%s' 未合併"
-#: builtin/checkout.c:747
+#: builtin/checkout.c:753
msgid "you need to resolve your current index first"
msgstr "您需要先解決目前索引的衝突"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:809
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"不能繼續,下列檔案有暫存的修改:\n"
"%s"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:902
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能對 '%s' 執行 reflog 動作:%s\n"
-#: builtin/checkout.c:934
+#: builtin/checkout.c:947
msgid "HEAD is now at"
msgstr "HEAD 目前位於"
-#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:942
+#: builtin/checkout.c:955
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重設分支 '%s'\n"
-#: builtin/checkout.c:945
+#: builtin/checkout.c:958
#, c-format
msgid "Already on '%s'\n"
msgstr "已經位於 '%s'\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:962
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切換並重設分支 '%s'\n"
-#: builtin/checkout.c:951 builtin/checkout.c:1388
+#: builtin/checkout.c:964 builtin/checkout.c:1398
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切換到一個新分支 '%s'\n"
-#: builtin/checkout.c:953
+#: builtin/checkout.c:966
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切換到分支 '%s'\n"
# 譯者:請維持前導空格
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1017
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 個。\n"
-#: builtin/checkout.c:1010
+#: builtin/checkout.c:1023
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:1029
+#: builtin/checkout.c:1042
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:1064
+#: builtin/checkout.c:1077
msgid "internal error in revision walk"
msgstr "在版本遍歷時遇到內部錯誤"
-#: builtin/checkout.c:1068
+#: builtin/checkout.c:1081
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:1114 builtin/checkout.c:1383
+#: builtin/checkout.c:1124 builtin/checkout.c:1393
msgid "You are on a branch yet to be born"
msgstr "您位於一個尚未初始化的分支"
-#: builtin/checkout.c:1196
+#: builtin/checkout.c:1206
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"'%s' 既可以是一個本機檔案,也可以是一個追蹤分支。\n"
"請使用 --(和可選的 --no-guess)來消除歧義"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1213
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"如果您總是喜歡使用模糊的簡短分支名 <name>,而不喜歡如 'origin' 的遠端\n"
"版本庫名,可以在設定中設定 checkout.defaultRemote=origin。"
-#: builtin/checkout.c:1213
+#: builtin/checkout.c:1223
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' 符合多個 (%d) 遠端追蹤分支"
-#: builtin/checkout.c:1279
+#: builtin/checkout.c:1289
msgid "only one reference expected"
msgstr "預期只有一個引用"
-#: builtin/checkout.c:1296
+#: builtin/checkout.c:1306
#, c-format
msgid "only one reference expected, %d given."
msgstr "應只有一個引用,卻提供了 %d 個。"
-#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
+#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508
#, c-format
msgid "invalid reference: %s"
msgstr "無效引用:%s"
-#: builtin/checkout.c:1355 builtin/checkout.c:1725
+#: builtin/checkout.c:1365 builtin/checkout.c:1744
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一個樹:%s"
-#: builtin/checkout.c:1402
+#: builtin/checkout.c:1413
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "期望一個分支,得到標籤 '%s'"
-#: builtin/checkout.c:1404
+#: builtin/checkout.c:1415
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "期望一個分支,得到遠端分支 '%s'"
-#: builtin/checkout.c:1405 builtin/checkout.c:1413
+#: builtin/checkout.c:1417 builtin/checkout.c:1426
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "期望一個分支,得到 '%s'"
-#: builtin/checkout.c:1408
+#: builtin/checkout.c:1420
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "期望一個分支,得到提交 '%s'"
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1429
+msgid ""
+"If you want to detach HEAD at the commit, try again with the --detach option."
+msgstr "若您想要分離提交的 HEAD,請傳入 --detach 選項重試。"
+
+#: builtin/checkout.c:1442
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
"不能在合併時切換分支\n"
"考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1446
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
"不能在 am 工作階段期間切換分支\n"
"考慮使用 \"git am --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1450
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
"不能在重定基底時切換分支\n"
"考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1436
+#: builtin/checkout.c:1454
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
"不能在揀選時切換分支\n"
"考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1458
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
"不能在還原時切換分支\n"
"考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1444
+#: builtin/checkout.c:1462
msgid "you are switching branch while bisecting"
msgstr "您在執行二分搜尋時切換分支"
-#: builtin/checkout.c:1451
+#: builtin/checkout.c:1469
msgid "paths cannot be used with switching branches"
msgstr "路徑不能和切換分支同時使用"
-#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
+#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切換分支同時使用"
-#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
-#: builtin/checkout.c:1477 builtin/checkout.c:1482
+#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490
+#: builtin/checkout.c:1495 builtin/checkout.c:1500
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同時使用"
-#: builtin/checkout.c:1479
+#: builtin/checkout.c:1497
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' 不帶 <起始點>"
-#: builtin/checkout.c:1487
+#: builtin/checkout.c:1505
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切換分支到一個非提交 '%s'"
-#: builtin/checkout.c:1494
+#: builtin/checkout.c:1512
msgid "missing branch or commit argument"
msgstr "缺少分支或提交參數"
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1555
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支執行三方合併"
-#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
+#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354
msgid "style"
msgstr "風格"
-#: builtin/checkout.c:1539
+#: builtin/checkout.c:1557
msgid "conflict style (merge, diff3, or zdiff3)"
msgstr "衝突輸出風格(merge、diff3 或 zdiff3)"
-#: builtin/checkout.c:1551 builtin/worktree.c:488
+#: builtin/checkout.c:1569 builtin/worktree.c:560
msgid "detach HEAD at named commit"
msgstr "HEAD 從指定的提交分離"
-#: builtin/checkout.c:1553
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "設定追蹤模式(參見 git-pull(1))"
-
-#: builtin/checkout.c:1556
+#: builtin/checkout.c:1574
msgid "force checkout (throw away local modifications)"
msgstr "強制簽出(捨棄本機修改)"
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1576
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1576
msgid "new unparented branch"
msgstr "新的沒有父提交的分支"
-#: builtin/checkout.c:1560 builtin/merge.c:305
+#: builtin/checkout.c:1578 builtin/merge.c:305
msgid "update ignored files (default)"
msgstr "更新忽略的檔案(預設)"
-#: builtin/checkout.c:1563
+#: builtin/checkout.c:1581
msgid "do not check if another worktree is holding the given ref"
msgstr "不檢查指定的引用是否被其他工作區所占用"
-#: builtin/checkout.c:1576
+#: builtin/checkout.c:1594
msgid "checkout our version for unmerged files"
msgstr "對尚未合併的檔案簽出我們的版本"
-#: builtin/checkout.c:1579
+#: builtin/checkout.c:1597
msgid "checkout their version for unmerged files"
msgstr "對尚未合併的檔案簽出他們的版本"
-#: builtin/checkout.c:1583
+#: builtin/checkout.c:1601
msgid "do not limit pathspecs to sparse entries only"
msgstr "對路徑不做稀疏簽出的限制"
-#: builtin/checkout.c:1640
+#: builtin/checkout.c:1659
#, c-format
msgid "options '-%c', '-%c', and '%s' cannot be used together"
msgstr "「-%c」、「-%c」和「%s」選項不得同時使用"
-#: builtin/checkout.c:1681
+#: builtin/checkout.c:1700
msgid "--track needs a branch name"
msgstr "--track 需要一個分支名"
-#: builtin/checkout.c:1686
+#: builtin/checkout.c:1705
#, c-format
msgid "missing branch name; try -%c"
msgstr "缺少分支名稱,請嘗試 -%c"
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1737
#, c-format
msgid "could not resolve %s"
msgstr "無法解析 %s"
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1753
msgid "invalid path specification"
msgstr "無效的路徑規格"
-#: builtin/checkout.c:1741
+#: builtin/checkout.c:1760
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一個提交,不能基於它建立分支 '%s'"
-#: builtin/checkout.c:1745
+#: builtin/checkout.c:1764
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout:--detach 不能接收路徑參數 '%s'"
-#: builtin/checkout.c:1770
+#: builtin/checkout.c:1789
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout:在從索引簽出時,--ours/--theirs、--force 和 --merge 不相容。"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1794
msgid "you must specify path(s) to restore"
msgstr "您必須指定一個要復原的路徑"
-#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
-#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2959
-#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873
+#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171
+#: builtin/remote.c:173 builtin/submodule--helper.c:3038
+#: builtin/submodule--helper.c:3371 builtin/worktree.c:556
+#: builtin/worktree.c:558
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1801
+#: builtin/checkout.c:1820
msgid "create and checkout a new branch"
msgstr "建立並簽出一個新的分支"
-#: builtin/checkout.c:1803
+#: builtin/checkout.c:1822
msgid "create/reset and checkout a branch"
msgstr "建立/重設並簽出一個分支"
-#: builtin/checkout.c:1804
+#: builtin/checkout.c:1823
msgid "create reflog for new branch"
msgstr "為新的分支建立引用日誌"
-#: builtin/checkout.c:1806
+#: builtin/checkout.c:1825
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "二次猜測 'git checkout <無此分支>'(預設)"
-#: builtin/checkout.c:1807
+#: builtin/checkout.c:1826
msgid "use overlay mode (default)"
msgstr "使用疊加模式(預設)"
-#: builtin/checkout.c:1855
+#: builtin/checkout.c:1874
msgid "create and switch to a new branch"
msgstr "建立並切換一個新分支"
-#: builtin/checkout.c:1857
+#: builtin/checkout.c:1876
msgid "create/reset and switch to a branch"
msgstr "建立/重設並切換一個分支"
-#: builtin/checkout.c:1859
+#: builtin/checkout.c:1878
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜測 'git switch <無此分支>'"
-#: builtin/checkout.c:1861
+#: builtin/checkout.c:1880
msgid "throw away local modifications"
msgstr "捨棄本機修改"
-#: builtin/checkout.c:1897
+#: builtin/checkout.c:1916
msgid "which tree-ish to checkout from"
msgstr "要簽出哪一個樹"
-#: builtin/checkout.c:1899
+#: builtin/checkout.c:1918
msgid "restore the index"
msgstr "復原索引"
-#: builtin/checkout.c:1901
+#: builtin/checkout.c:1920
msgid "restore the working tree (default)"
msgstr "復原工作區(預設)"
-#: builtin/checkout.c:1903
+#: builtin/checkout.c:1922
msgid "ignore unmerged entries"
msgstr "忽略未合併條目"
-#: builtin/checkout.c:1904
+#: builtin/checkout.c:1923
msgid "use overlay mode"
msgstr "使用疊加模式"
msgstr "刪除整個目錄"
#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
+#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187
+#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同時使用"
-#: builtin/clone.c:45
+#: builtin/clone.c:47
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]"
-#: builtin/clone.c:96
+#: builtin/clone.c:100
msgid "don't clone shallow repository"
msgstr "不要複製淺版本庫"
-#: builtin/clone.c:98
+#: builtin/clone.c:102
msgid "don't create a checkout"
msgstr "不建立一個簽出"
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542
msgid "create a bare repository"
msgstr "建立一個純版本庫"
-#: builtin/clone.c:103
+#: builtin/clone.c:107
msgid "create a mirror repository (implies bare)"
msgstr "建立一個鏡像版本庫(也是純版本庫)"
-#: builtin/clone.c:105
+#: builtin/clone.c:109
msgid "to clone from a local repository"
msgstr "從本機版本庫複製"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "don't use local hardlinks, always copy"
msgstr "不使用本機硬連結,始終複製"
-#: builtin/clone.c:109
+#: builtin/clone.c:113
msgid "setup as shared repository"
msgstr "設定為共享版本庫"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "pathspec"
msgstr "路徑規格"
-#: builtin/clone.c:111
+#: builtin/clone.c:115
msgid "initialize submodules in the clone"
msgstr "在複製時初始化子模組"
-#: builtin/clone.c:115
+#: builtin/clone.c:119
msgid "number of submodules cloned in parallel"
msgstr "並行複製的子模組數"
-#: builtin/clone.c:116 builtin/init-db.c:539
+#: builtin/clone.c:120 builtin/init-db.c:539
msgid "template-directory"
msgstr "範本目錄"
-#: builtin/clone.c:117 builtin/init-db.c:540
+#: builtin/clone.c:121 builtin/init-db.c:540
msgid "directory from which templates will be used"
msgstr "範本目錄將被使用"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
-#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
+#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378
msgid "reference repository"
msgstr "引用版本庫"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1873
-#: builtin/submodule--helper.c:2516
+#: builtin/clone.c:127 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2721
msgid "use --reference only while cloning"
msgstr "僅在複製時參考 --reference 指向的本機版本庫"
-#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27
#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
-#: builtin/pack-objects.c:3944 builtin/repack.c:665
-#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
+#: builtin/pack-objects.c:3967 builtin/repack.c:669
+#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595
#: t/helper/test-simple-ipc.c:597
msgid "name"
msgstr "名稱"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游"
-#: builtin/clone.c:127
+#: builtin/clone.c:131
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "簽出 <分支> 而不是遠端 HEAD"
-#: builtin/clone.c:129
+#: builtin/clone.c:133
msgid "path to git-upload-pack on the remote"
msgstr "遠端 git-upload-pack 路徑"
-#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877
#: builtin/pull.c:212
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:131
+#: builtin/clone.c:135
msgid "create a shallow clone of that depth"
msgstr "建立一個指定深度的淺複製"
-#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956
#: builtin/pull.c:215
msgid "time"
msgstr "時間"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "create a shallow clone since a specific time"
msgstr "建立從指定時間到現在的淺複製"
-#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
-#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
+#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050
msgid "revision"
msgstr "修訂版"
-#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
+#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219
msgid "deepen history of shallow clone, excluding rev"
msgstr "取得更多淺複製的過去歷史記錄,除了特定版本"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1883
-#: builtin/submodule--helper.c:2530
+#: builtin/clone.c:141 builtin/submodule--helper.c:1897
+#: builtin/submodule--helper.c:2735
msgid "clone only one branch, HEAD or --branch"
msgstr "只複製一個分支、HEAD 或 --branch"
-#: builtin/clone.c:139
+#: builtin/clone.c:143
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "不要複製任何標籤,之後取得也不要追蹤這些標籤"
-#: builtin/clone.c:141
+#: builtin/clone.c:145
msgid "any cloned submodules will be shallow"
msgstr "子模組將以淺下載模式複製"
-#: builtin/clone.c:142 builtin/init-db.c:548
+#: builtin/clone.c:146 builtin/init-db.c:548
msgid "gitdir"
msgstr "git目錄"
-#: builtin/clone.c:143 builtin/init-db.c:549
+#: builtin/clone.c:147 builtin/init-db.c:549
msgid "separate git dir from working tree"
msgstr "git目錄和工作區分離"
-#: builtin/clone.c:144
+#: builtin/clone.c:148
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:145
+#: builtin/clone.c:149
msgid "set config inside the new repository"
msgstr "在新版本庫中設定設定訊息"
-#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
msgid "server-specific"
msgstr "server-specific"
-#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
+#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77
#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
msgid "option to transmit"
msgstr "傳輸選項"
-#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
+#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238
#: builtin/push.c:576
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 位址"
-#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
+#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241
#: builtin/push.c:578
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 位址"
-#: builtin/clone.c:154
+#: builtin/clone.c:158
+msgid "apply partial clone filters to submodules"
+msgstr "將部分複製過濾器套用至子模組"
+
+#: builtin/clone.c:160
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "任何複製的子模組都將使用它們的遠端追蹤分支"
-#: builtin/clone.c:156
+#: builtin/clone.c:162
msgid "initialize sparse-checkout file to include only files at root"
msgstr "初始化稀疏簽出檔案,只包含根目錄中的檔案"
-#: builtin/clone.c:231
+#: builtin/clone.c:237
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能為 '%s' 新增一個備用:%s\n"
-#: builtin/clone.c:304
+#: builtin/clone.c:310
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一個目錄"
-#: builtin/clone.c:322
+#: builtin/clone.c:328
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "無法在 '%s' 上啟動疊代器"
-#: builtin/clone.c:353
+#: builtin/clone.c:359
#, c-format
msgid "failed to create link '%s'"
msgstr "建立連結 '%s' 失敗"
-#: builtin/clone.c:357
+#: builtin/clone.c:363
#, c-format
msgid "failed to copy file to '%s'"
msgstr "複製檔案至 '%s' 失敗"
-#: builtin/clone.c:362
+#: builtin/clone.c:368
#, c-format
msgid "failed to iterate over '%s'"
msgstr "無法在 '%s' 上疊代"
-#: builtin/clone.c:389
+#: builtin/clone.c:395
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:403
+#: builtin/clone.c:409
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"您可以透過 'git status' 檢查哪些已被簽出,然後使用指令\n"
"'git restore --source=HEAD :/' 重試\n"
-#: builtin/clone.c:480
+#: builtin/clone.c:486
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "找不到要複製的遠端分支 %s。"
-#: builtin/clone.c:597
+#: builtin/clone.c:603
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:645
+#: builtin/clone.c:651
msgid "failed to initialize sparse-checkout"
msgstr "無法初始化稀疏簽出"
-#: builtin/clone.c:668
+#: builtin/clone.c:674
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "遠端 HEAD 指向一個不存在的引用,無法簽出。\n"
-#: builtin/clone.c:701
+#: builtin/clone.c:709
msgid "unable to checkout working tree"
msgstr "不能簽出工作區"
-#: builtin/clone.c:779
+#: builtin/clone.c:793
msgid "unable to write parameters to config file"
msgstr "無法將參數寫入設定檔案"
-#: builtin/clone.c:842
+#: builtin/clone.c:856
msgid "cannot repack to clean up"
msgstr "無法執行 repack 來清理"
-#: builtin/clone.c:844
+#: builtin/clone.c:858
msgid "cannot unlink temporary alternates file"
msgstr "無法刪除暫時的 alternates 檔案"
-#: builtin/clone.c:886
+#: builtin/clone.c:901
msgid "Too many arguments."
msgstr "太多參數。"
-#: builtin/clone.c:890 contrib/scalar/scalar.c:414
+#: builtin/clone.c:905 contrib/scalar/scalar.c:413
msgid "You must specify a repository to clone."
msgstr "您必須指定要複製的版本庫。"
-#: builtin/clone.c:903
+#: builtin/clone.c:918
#, c-format
msgid "options '%s' and '%s %s' cannot be used together"
msgstr "「%s」和「%s %s」選項不得同時使用"
-#: builtin/clone.c:920
+#: builtin/clone.c:935
#, c-format
msgid "repository '%s' does not exist"
msgstr "版本庫 '%s' 不存在"
-#: builtin/clone.c:924 builtin/fetch.c:2052
+#: builtin/clone.c:939 builtin/fetch.c:2176
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一個正數"
-#: builtin/clone.c:934
+#: builtin/clone.c:949
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目的地路徑 '%s' 已經存在,並且不是一個空目錄。"
-#: builtin/clone.c:940
+#: builtin/clone.c:955
#, c-format
msgid "repository path '%s' already exists and is not an empty directory."
msgstr "版本庫路徑 '%s' 已經存在,並且不是一個空目錄。"
-#: builtin/clone.c:954
+#: builtin/clone.c:969
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作區 '%s' 已經存在。"
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
-#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256
+#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能為 '%s' 建立先導目錄"
-#: builtin/clone.c:974
+#: builtin/clone.c:989
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能建立工作區目錄 '%s'"
-#: builtin/clone.c:994
+#: builtin/clone.c:1009
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "複製到純版本庫 '%s'...\n"
-#: builtin/clone.c:996
+#: builtin/clone.c:1011
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正複製到 '%s'...\n"
-#: builtin/clone.c:1025
+#: builtin/clone.c:1040
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容"
-#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
+#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' 不是一個有效的遠端名稱"
-#: builtin/clone.c:1121
+#: builtin/clone.c:1157
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "本機複製會忽略 --depth。請改用 file:// 通訊協定。"
-#: builtin/clone.c:1123
+#: builtin/clone.c:1159
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "本機複製會忽略 --shallow-since。請改用 file:// 協定。"
-#: builtin/clone.c:1125
+#: builtin/clone.c:1161
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// 協定。"
-#: builtin/clone.c:1127
+#: builtin/clone.c:1163
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "本機複製會忽略 --filter。請改用 file:// 協定。"
-#: builtin/clone.c:1132
+#: builtin/clone.c:1168
msgid "source repository is shallow, ignoring --local"
msgstr "來源版本庫是淺複製,忽略 --local"
-#: builtin/clone.c:1137
+#: builtin/clone.c:1173
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1216 builtin/clone.c:1276
+#: builtin/clone.c:1185
+msgid "cannot clone from filtered bundle"
+msgstr "無法從過濾後的套件複製"
+
+#: builtin/clone.c:1265 builtin/clone.c:1324
msgid "remote transport reported error"
msgstr "遠端傳輸回報錯誤"
-#: builtin/clone.c:1228 builtin/clone.c:1239
+#: builtin/clone.c:1277 builtin/clone.c:1289
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "遠端分支 %s 在上游 %s 未發現"
-#: builtin/clone.c:1242
+#: builtin/clone.c:1292
msgid "You appear to have cloned an empty repository."
msgstr "您複製的版本庫似乎是空的。"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
-#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
+#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813
msgid "dir"
msgstr "目錄"
msgid "duplicate parent %s ignored"
msgstr "忽略重複的父提交 %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590
#, c-format
msgid "not a valid object name %s"
msgstr "不是一個有效的物件名 %s"
msgid "id of a parent commit object"
msgstr "父提交物件 ID"
-#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
-#: builtin/tag.c:454
+#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666
+#: builtin/tag.c:455
msgid "message"
msgstr "訊息"
-#: builtin/commit-tree.c:113 builtin/commit.c:1627
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
msgid "commit message"
msgstr "提交說明"
msgid "read commit log message from file"
msgstr "從檔案中讀取提交說明"
-#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303
#: builtin/pull.c:180 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交簽名"
msgid "git commit-tree: failed to read"
msgstr "git commit-tree:讀取失敗"
-#: builtin/commit.c:42
+#: builtin/commit.c:43
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<選項>] [--] <路徑規格>..."
-#: builtin/commit.c:47
+#: builtin/commit.c:48
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<選項>] [--] <路徑規格>..."
-#: builtin/commit.c:52
+#: builtin/commit.c:53
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"您要修補最近的提交,但這麼做會讓它成為空提交。您可以重複您的指令並帶上\n"
"--allow-empty 選項,或者您可用指令 \"git reset HEAD^\" 整個刪除該提交。\n"
-#: builtin/commit.c:57
+#: builtin/commit.c:58
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:64
+#: builtin/commit.c:65
msgid "Otherwise, please use 'git rebase --skip'\n"
msgstr "否則,請使用 'git rebase --skip'\n"
-#: builtin/commit.c:67
+#: builtin/commit.c:68
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "否則,請使用 'git cherry-pick --skip'\n"
-#: builtin/commit.c:70
+#: builtin/commit.c:71
msgid ""
"and then use:\n"
"\n"
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:325
+#: builtin/commit.c:326
msgid "failed to unpack HEAD tree object"
msgstr "解包 HEAD 樹狀物件失敗"
-#: builtin/commit.c:375
+#: builtin/commit.c:376
msgid "No paths with --include/--only does not make sense."
msgstr "參數 --include/--only 不跟路徑沒有意義。"
-#: builtin/commit.c:387
+#: builtin/commit.c:388
msgid "unable to create temporary index"
msgstr "不能建立暫時索引"
-#: builtin/commit.c:396
+#: builtin/commit.c:397
msgid "interactive add failed"
msgstr "互動式新增失敗"
-#: builtin/commit.c:411
+#: builtin/commit.c:412
msgid "unable to update temporary index"
msgstr "無法更新暫時索引"
-#: builtin/commit.c:413
+#: builtin/commit.c:414
msgid "Failed to update main cache tree"
msgstr "不能更新樹的主快取"
-#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
+#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510
msgid "unable to write new_index file"
msgstr "無法寫 new_index 檔案"
-#: builtin/commit.c:490
+#: builtin/commit.c:491
msgid "cannot do a partial commit during a merge."
msgstr "在合併過程中不能做部分提交。"
-#: builtin/commit.c:492
+#: builtin/commit.c:493
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在揀選過程中不能做部分提交。"
-#: builtin/commit.c:494
+#: builtin/commit.c:495
msgid "cannot do a partial commit during a rebase."
msgstr "在重定基底過程中不能做部分提交。"
-#: builtin/commit.c:502
+#: builtin/commit.c:503
msgid "cannot read the index"
msgstr "無法讀取索引"
-#: builtin/commit.c:521
+#: builtin/commit.c:522
msgid "unable to write temporary index file"
msgstr "無法寫暫時索引檔案"
-#: builtin/commit.c:619
+#: builtin/commit.c:620
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者訊息"
-#: builtin/commit.c:621
+#: builtin/commit.c:622
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有格式錯誤的作者訊息"
-#: builtin/commit.c:640
+#: builtin/commit.c:641
msgid "malformed --author parameter"
msgstr "格式錯誤的 --author 參數"
-#: builtin/commit.c:693
+#: builtin/commit.c:694
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "無法選擇一個未被目前提交說明使用的備註字元"
-#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
+#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查詢提交 %s"
-#: builtin/commit.c:759 builtin/shortlog.c:416
+#: builtin/commit.c:762 builtin/shortlog.c:417
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(正從標準輸入中讀取日誌訊息)\n"
-#: builtin/commit.c:761
+#: builtin/commit.c:764
msgid "could not read log from standard input"
msgstr "不能從標準輸入中讀取日誌訊息"
-#: builtin/commit.c:765
+#: builtin/commit.c:768
#, c-format
msgid "could not read log file '%s'"
msgstr "不能讀取日誌檔案 '%s'"
-#: builtin/commit.c:802
+#: builtin/commit.c:805
#, c-format
msgid "options '%s' and '%s:%s' cannot be used together"
msgstr "「%s」和「%s:%s」選項不得同時使用"
-#: builtin/commit.c:814 builtin/commit.c:830
+#: builtin/commit.c:817 builtin/commit.c:833
msgid "could not read SQUASH_MSG"
msgstr "不能讀取 SQUASH_MSG"
-#: builtin/commit.c:821
+#: builtin/commit.c:824
msgid "could not read MERGE_MSG"
msgstr "不能讀取 MERGE_MSG"
-#: builtin/commit.c:881
+#: builtin/commit.c:884
msgid "could not write commit template"
msgstr "不能寫提交範本"
-#: builtin/commit.c:894
+#: builtin/commit.c:897
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"請輸入描述您變更的提交訊息。\n"
"開頭是「%c」的行皆會忽略。\n"
-#: builtin/commit.c:896
+#: builtin/commit.c:899
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"請輸入描述您變更的提交訊息。開頭是「%c」\n"
"的行皆會忽略。提交訊息空白則取消本次提交作業。\n"
-#: builtin/commit.c:900
+#: builtin/commit.c:903
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"請輸入描述您變更的提交訊息。會保留開頭是「%c」\n"
"的行,但也可以自己移除掉這些行。\n"
-#: builtin/commit.c:904
+#: builtin/commit.c:907
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"「%c」的行,但也可以自己移除掉這些行。\n"
"提交訊息空白則取消本次提交作業。\n"
-#: builtin/commit.c:916
+#: builtin/commit.c:919
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
"\tgit update-ref -d MERGE_HEAD\n"
"後重試。\n"
-#: builtin/commit.c:921
+#: builtin/commit.c:924
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
"後重試。\n"
# 譯者:為保證在輸出中對齊,注意調整句中空格!
-#: builtin/commit.c:948
+#: builtin/commit.c:951
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者: %.*s <%.*s>"
# 譯者:為保證在輸出中對齊,注意調整句中空格!
-#: builtin/commit.c:956
+#: builtin/commit.c:959
#, c-format
msgid "%sDate: %s"
msgstr "%s日期: %s"
# 譯者:為保證在輸出中對齊,注意調整句中空格!
-#: builtin/commit.c:963
+#: builtin/commit.c:966
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者:%.*s <%.*s>"
-#: builtin/commit.c:981
+#: builtin/commit.c:984
msgid "Cannot read index"
msgstr "無法讀取索引"
-#: builtin/commit.c:1026
+#: builtin/commit.c:1029
msgid "unable to pass trailers to --trailers"
msgstr "無法將尾部署名傳遞至 --trailers"
-#: builtin/commit.c:1066
+#: builtin/commit.c:1069
msgid "Error building trees"
msgstr "無法建立樹狀物件"
-#: builtin/commit.c:1080 builtin/tag.c:316
+#: builtin/commit.c:1083 builtin/tag.c:317
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "請使用 -m 或 -F 選項提供提交說明。\n"
-#: builtin/commit.c:1124
+#: builtin/commit.c:1128
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 '姓名 <信箱>' 格式,且未能在現有作者中找到符合"
-#: builtin/commit.c:1138
+#: builtin/commit.c:1142
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "無效的忽略模式 '%s'"
-#: builtin/commit.c:1156 builtin/commit.c:1451
+#: builtin/commit.c:1160 builtin/commit.c:1450
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "無效的未追蹤檔案參數 '%s'"
-#: builtin/commit.c:1227
+#: builtin/commit.c:1231
msgid "You are in the middle of a merge -- cannot reword."
msgstr "正在合併中——不能重新輸入。"
-#: builtin/commit.c:1229
+#: builtin/commit.c:1233
msgid "You are in the middle of a cherry-pick -- cannot reword."
msgstr "正在揀選中——不能重新輸入。"
-#: builtin/commit.c:1232
+#: builtin/commit.c:1236
#, c-format
msgid "reword option of '%s' and path '%s' cannot be used together"
msgstr "「%s」的改寫選項和「%s」路徑不得同時使用"
-#: builtin/commit.c:1234
+#: builtin/commit.c:1238
#, c-format
msgid "reword option of '%s' and '%s' cannot be used together"
msgstr "「%s」的改寫選項和「%s」不得同時使用"
-#: builtin/commit.c:1254
-msgid "Using both --reset-author and --author does not make sense"
-msgstr "同時使用 --reset-author 和 --author 沒有意義"
-
-#: builtin/commit.c:1261
+#: builtin/commit.c:1263
msgid "You have nothing to amend."
msgstr "您沒有可修補的提交。"
-#: builtin/commit.c:1264
+#: builtin/commit.c:1266
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正處於一個合併過程中 -- 無法修補提交。"
-#: builtin/commit.c:1266
+#: builtin/commit.c:1268
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正處於一個揀選過程中 -- 無法修補提交。"
-#: builtin/commit.c:1268
+#: builtin/commit.c:1270
msgid "You are in the middle of a rebase -- cannot amend."
msgstr "您正處於重定基底的過程中 -- 無法修訂。"
-#: builtin/commit.c:1271
-msgid "Options --squash and --fixup cannot be used together"
-msgstr "選項 --squash 和 --fixup 不能同時使用"
-
-#: builtin/commit.c:1281
-msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "只能用一個 -c/-C/-F/--fixup 選項。"
-
-#: builtin/commit.c:1283
-msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "選項 -m 不能和 -c/-C/-F 同時使用。"
-
-#: builtin/commit.c:1292
+#: builtin/commit.c:1290
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。"
-#: builtin/commit.c:1310
-msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
-msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。"
-
-#: builtin/commit.c:1338
+#: builtin/commit.c:1337
#, c-format
msgid "unknown option: --fixup=%s:%s"
msgstr "未知選項:--fixup=%s:%s"
-#: builtin/commit.c:1355
+#: builtin/commit.c:1354
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義"
-#: builtin/commit.c:1486 builtin/commit.c:1655
+#: builtin/commit.c:1485 builtin/commit.c:1654
msgid "show status concisely"
msgstr "以簡潔的格式顯示狀態"
-#: builtin/commit.c:1488 builtin/commit.c:1657
+#: builtin/commit.c:1487 builtin/commit.c:1656
msgid "show branch information"
msgstr "顯示分支訊息"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1489
msgid "show stash information"
msgstr "顯示儲藏區訊息"
-#: builtin/commit.c:1492 builtin/commit.c:1659
+#: builtin/commit.c:1491 builtin/commit.c:1658
msgid "compute full ahead/behind values"
msgstr "計算完整的領先/落後值"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1493
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
-#: builtin/worktree.c:690
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:765
msgid "machine-readable output"
msgstr "機器可讀的輸出"
-#: builtin/commit.c:1497 builtin/commit.c:1663
+#: builtin/commit.c:1496 builtin/commit.c:1662
msgid "show status in long format (default)"
msgstr "以長格式顯示狀態(預設)"
-#: builtin/commit.c:1500 builtin/commit.c:1666
+#: builtin/commit.c:1499 builtin/commit.c:1665
msgid "terminate entries with NUL"
msgstr "條目以 NUL 字元結尾"
-#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
-#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
+#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1503 builtin/commit.c:1669
+#: builtin/commit.c:1502 builtin/commit.c:1668
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "顯示未追蹤的檔案,「模式」的可選參數:all、normal、no。(預設值:all)"
-#: builtin/commit.c:1507
+#: builtin/commit.c:1506
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
"顯示已忽略的檔案,可選模式:traditional、matching、no。(預設值:"
"traditional)"
-#: builtin/commit.c:1509 parse-options.h:192
+#: builtin/commit.c:1508 parse-options.h:197
msgid "when"
msgstr "何時"
-#: builtin/commit.c:1510
+#: builtin/commit.c:1509
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模組的更改,「何時」的可選參數:all、dirty、untracked。(預設值:all)"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1511
msgid "list untracked files in columns"
msgstr "以列的方式顯示未追蹤的檔案"
-#: builtin/commit.c:1513
+#: builtin/commit.c:1512
msgid "do not detect renames"
msgstr "不檢測重新命名"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1514
msgid "detect renames, optionally set similarity index"
msgstr "檢測重新命名,可以設定索引相似度"
-#: builtin/commit.c:1538
+#: builtin/commit.c:1537
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支援已忽略和未追蹤檔案參數的組合"
-#: builtin/commit.c:1620
+#: builtin/commit.c:1619
msgid "suppress summary after successful commit"
msgstr "提交成功後不顯示概述訊息"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1620
msgid "show diff in commit message template"
msgstr "在提交說明範本裡顯示差異"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1622
msgid "Commit message options"
msgstr "提交說明選項"
-#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
+#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457
msgid "read message from file"
msgstr "從檔案中讀取提交說明"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1624
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1625
+#: builtin/commit.c:1624
msgid "override author for commit"
msgstr "提交時覆蓋作者"
-#: builtin/commit.c:1626 builtin/gc.c:551
+#: builtin/commit.c:1625 builtin/gc.c:551
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1625
msgid "override date for commit"
msgstr "提交時覆蓋日期"
-#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
-#: parse-options.h:329 ref-filter.h:89
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:360 ref-filter.h:89
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1627
msgid "reuse and edit message from specified commit"
msgstr "重用並編輯指定提交的提交說明"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1628
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交說明"
#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
#. and only translate <commit>.
#.
-#: builtin/commit.c:1634
+#: builtin/commit.c:1633
msgid "[(amend|reword):]commit"
msgstr "[(amend|reword):]commit"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1633
msgid ""
"use autosquash formatted message to fixup or amend/reword specified commit"
msgstr "使用 autosquash 格式化後的說明來 fixup 或是 amend/reword 指定提交"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1634
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交"
-#: builtin/commit.c:1636
+#: builtin/commit.c:1635
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "現在將該提交的作者改為我(和 -C/-c/--amend 參數共用)"
-#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "尾部署名"
-#: builtin/commit.c:1637
+#: builtin/commit.c:1636
msgid "add custom trailer(s)"
msgstr "加入自訂尾部署名"
-#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
+#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306
#: builtin/pull.c:146 builtin/revert.c:110
msgid "add a Signed-off-by trailer"
msgstr "在結尾加入 Signed-off-by"
-#: builtin/commit.c:1639
+#: builtin/commit.c:1638
msgid "use specified template file"
msgstr "使用指定的範本檔案"
-#: builtin/commit.c:1640
+#: builtin/commit.c:1639
msgid "force edit of commit"
msgstr "強制編輯提交"
-#: builtin/commit.c:1642
+#: builtin/commit.c:1641
msgid "include status in commit message template"
msgstr "在提交說明範本裡包含狀態訊息"
-#: builtin/commit.c:1647
+#: builtin/commit.c:1646
msgid "Commit contents options"
msgstr "提交內容選項"
-#: builtin/commit.c:1648
+#: builtin/commit.c:1647
msgid "commit all changed files"
msgstr "提交所有改動的檔案"
-#: builtin/commit.c:1649
+#: builtin/commit.c:1648
msgid "add specified files to index for commit"
msgstr "新增指定的檔案到索引區等待提交"
-#: builtin/commit.c:1650
+#: builtin/commit.c:1649
msgid "interactively add files"
msgstr "互動式新增檔案"
-#: builtin/commit.c:1651
+#: builtin/commit.c:1650
msgid "interactively add changes"
msgstr "互動式新增變更"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1651
msgid "commit only specified files"
msgstr "只提交指定的檔案"
-#: builtin/commit.c:1653
+#: builtin/commit.c:1652
msgid "bypass pre-commit and commit-msg hooks"
msgstr "繞過 pre-commit 和 commit-msg 掛鉤"
-#: builtin/commit.c:1654
+#: builtin/commit.c:1653
msgid "show what would be committed"
msgstr "顯示將要提交的內容"
-#: builtin/commit.c:1667
+#: builtin/commit.c:1666
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1668
+#: builtin/commit.c:1667
msgid "bypass post-rewrite hook"
msgstr "繞過 post-rewrite 掛鉤"
-#: builtin/commit.c:1675
+#: builtin/commit.c:1674
msgid "ok to record an empty change"
msgstr "允許一個空提交"
-#: builtin/commit.c:1677
+#: builtin/commit.c:1676
msgid "ok to record a change with an empty message"
msgstr "允許空的提交說明"
-#: builtin/commit.c:1753
+#: builtin/commit.c:1752
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "損壞的 MERGE_HEAD 檔案(%s)"
-#: builtin/commit.c:1760
+#: builtin/commit.c:1759
msgid "could not read MERGE_MODE"
msgstr "不能讀取 MERGE_MODE"
-#: builtin/commit.c:1781
+#: builtin/commit.c:1780
#, c-format
msgid "could not read commit message: %s"
msgstr "不能讀取提交說明:%s"
-#: builtin/commit.c:1788
+#: builtin/commit.c:1787
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "終止提交因為提交說明為空。\n"
-#: builtin/commit.c:1793
+#: builtin/commit.c:1792
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "終止提交;您未更改來自範本的提交說明。\n"
-#: builtin/commit.c:1804
+#: builtin/commit.c:1803
#, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "提交說明內文空白,中止提交作業。\n"
-#: builtin/commit.c:1840
+#: builtin/commit.c:1839
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
msgid "Type"
msgstr "類型"
+#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97
+msgid "type"
+msgstr "類型"
+
#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "取值為該類型"
msgid "no such section: %s"
msgstr "無此小節:%s"
-#: builtin/count-objects.c:90
-msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr "git count-objects [-v] [-H | --human-readable]"
-
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "以使用者可讀的格式顯示大小"
msgid "do not consider tags matching <pattern>"
msgstr "不考慮符合 <模式> 的標籤"
-#: builtin/describe.c:570 builtin/name-rev.c:544
+#: builtin/describe.c:570 builtin/name-rev.c:595
msgid "show abbreviated commit object as fallback"
msgstr "顯示簡寫的提交號作為後備"
msgid "Not a git repository"
msgstr "不是一個 git 版本庫"
-#: builtin/diff.c:537 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:700
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了無效物件 '%s'。"
msgid "difftool requires worktree or --no-index"
msgstr "difftool 要求工作區或者 --no-index"
-#: builtin/difftool.c:744
+#: builtin/difftool.c:745
msgid "no <tool> given for --tool=<tool>"
msgstr "沒有為 --tool=<工具> 參數提供 <工具>"
-#: builtin/difftool.c:751
+#: builtin/difftool.c:752
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>"
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>"
-#: builtin/env--helper.c:42 builtin/hash-object.c:96
-msgid "type"
-msgstr "類型"
-
#: builtin/env--helper.c:46
msgid "default for git_env_*(...) to fall back on"
msgstr "git_env_*(...) 的預設值"
msgstr "選項「--default」預期收到「--type=ulong」的無號 long 數值,而非「%s」"
#: builtin/fast-export.c:29
-msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [rev-list-opts]"
+msgid "git fast-export [<rev-list-opts>]"
+msgstr "git fast-export [<rev-list-opts>]"
#: builtin/fast-export.c:843
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgid "skip output of blob data"
msgstr "略過資料物件資料的輸出"
-#: builtin/fast-export.c:1196 builtin/log.c:1841
+#: builtin/fast-export.c:1196 builtin/log.c:1860
msgid "refspec"
msgstr "引用規格"
msgid "label tags with mark ids"
msgstr "為包含標記 ID 的標籤打上標記"
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3097
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr "「%s」子模組缺少 from 標記"
-#: builtin/fast-import.c:3092
+#: builtin/fast-import.c:3099
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr "「%s」子模組缺少 to 標記"
-#: builtin/fast-import.c:3227
+#: builtin/fast-import.c:3234
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "預期 'mark' 指令,得到 %s"
-#: builtin/fast-import.c:3232
+#: builtin/fast-import.c:3239
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "預期 'to' 指令,得到 %s"
-#: builtin/fast-import.c:3324
+#: builtin/fast-import.c:3331
msgid "Expected format name:filename for submodule rewrite option"
msgstr "期望子模組 rewrite 選項的格式是 name:filename"
-#: builtin/fast-import.c:3379
+#: builtin/fast-import.c:3386
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "沒有 --allow-unsafe-features 時,禁止在輸入中使用 '%s' 功能"
-#: builtin/fetch-pack.c:242
+#: builtin/fetch-pack.c:246
#, c-format
msgid "Lockfile created but not reported: %s"
msgstr "已建立鎖定檔案,但尚未回報:%s"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<選項>]"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:124
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel 不能為負數"
-#: builtin/fetch.c:146 builtin/pull.c:189
+#: builtin/fetch.c:147 builtin/pull.c:189
msgid "fetch from all remotes"
msgstr "從所有的遠端抓取"
-#: builtin/fetch.c:148 builtin/pull.c:249
+#: builtin/fetch.c:149 builtin/pull.c:249
msgid "set upstream for git pull/fetch"
msgstr "為 git pull/fetch 設定上游"
-#: builtin/fetch.c:150 builtin/pull.c:192
+#: builtin/fetch.c:151 builtin/pull.c:192
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"
-#: builtin/fetch.c:152
+#: builtin/fetch.c:153
msgid "use atomic transaction to update references"
msgstr "使用 atomic 事務更新引用"
-#: builtin/fetch.c:154 builtin/pull.c:195
+#: builtin/fetch.c:155 builtin/pull.c:195
msgid "path to upload pack on remote end"
msgstr "上傳包到遠端的路徑"
-#: builtin/fetch.c:155
+#: builtin/fetch.c:156
msgid "force overwrite of local reference"
msgstr "強制覆蓋本機引用"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:158
msgid "fetch from multiple remotes"
msgstr "從多個遠端抓取"
-#: builtin/fetch.c:159 builtin/pull.c:199
+#: builtin/fetch.c:160 builtin/pull.c:199
msgid "fetch all tags and associated objects"
msgstr "抓取所有的標籤和關聯物件"
-#: builtin/fetch.c:161
+#: builtin/fetch.c:162
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何標籤(--no-tags)"
-#: builtin/fetch.c:163
+#: builtin/fetch.c:164
msgid "number of submodules fetched in parallel"
msgstr "並行取得的子模組數量"
-#: builtin/fetch.c:165
+#: builtin/fetch.c:166
msgid "modify the refspec to place all refs within refs/prefetch/"
msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中"
-#: builtin/fetch.c:167 builtin/pull.c:202
+#: builtin/fetch.c:168 builtin/pull.c:202
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除遠端已經不存在的分支的追蹤分支"
-#: builtin/fetch.c:169
+#: builtin/fetch.c:170
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "清除遠端不存在的本機標籤,並且取代變更標籤"
# 譯者:可選值,不能翻譯
-#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
+#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:171
+#: builtin/fetch.c:172
msgid "control recursive fetching of submodules"
msgstr "控制子模組的遞迴抓取"
-#: builtin/fetch.c:176
+#: builtin/fetch.c:177
msgid "write fetched references to the FETCH_HEAD file"
msgstr "將取得的引用寫入 FETCH_HEAD 檔案"
-#: builtin/fetch.c:177 builtin/pull.c:210
+#: builtin/fetch.c:178 builtin/pull.c:210
msgid "keep downloaded pack"
msgstr "保持下載包"
-#: builtin/fetch.c:179
+#: builtin/fetch.c:180
msgid "allow updating of HEAD ref"
msgstr "允許更新 HEAD 引用"
-#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
+#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213
#: builtin/pull.c:222
msgid "deepen history of shallow clone"
msgstr "取得淺複製的更多過去歷史記錄"
-#: builtin/fetch.c:184 builtin/pull.c:216
+#: builtin/fetch.c:185 builtin/pull.c:216
msgid "deepen history of shallow repository based on time"
msgstr "基於時間來深化淺複製的歷史"
-#: builtin/fetch.c:190 builtin/pull.c:225
+#: builtin/fetch.c:191 builtin/pull.c:225
msgid "convert to a complete repository"
msgstr "轉換為一個完整的版本庫"
-#: builtin/fetch.c:193
+#: builtin/fetch.c:194
+msgid "re-fetch without negotiating common commits"
+msgstr "重新抓取而不協商共同提交"
+
+#: builtin/fetch.c:197
msgid "prepend this to submodule path output"
msgstr "在子模組路徑輸出的前面加上此目錄"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:200
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "遞迴取得子模組的預設值(比設定檔案優先度低)"
-#: builtin/fetch.c:200 builtin/pull.c:228
+#: builtin/fetch.c:204 builtin/pull.c:228
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:201 builtin/pull.c:230
+#: builtin/fetch.c:205 builtin/pull.c:230
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:202 builtin/pull.c:231
+#: builtin/fetch.c:206 builtin/pull.c:231
msgid "specify fetch refmap"
msgstr "指定取得動作的引用映射"
-#: builtin/fetch.c:209 builtin/pull.c:244
+#: builtin/fetch.c:213 builtin/pull.c:244
msgid "report that we have only objects reachable from this object"
msgstr "報告我們只擁有從該物件開始可以取得的物件"
-#: builtin/fetch.c:211
+#: builtin/fetch.c:215
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
-msgstr "不取得包檔案,而是輸出交涉的祖先提交"
+msgstr "不取得包檔案,而是輸出協商的祖先提交"
-#: builtin/fetch.c:214 builtin/fetch.c:216
+#: builtin/fetch.c:218 builtin/fetch.c:220
msgid "run 'maintenance --auto' after fetching"
msgstr "取得 (fetch) 後執行 'maintenance --auto'"
-#: builtin/fetch.c:218 builtin/pull.c:247
+#: builtin/fetch.c:222 builtin/pull.c:247
msgid "check for forced-updates on all updated branches"
msgstr "在所有更新分支上檢查強制更新"
-#: builtin/fetch.c:220
+#: builtin/fetch.c:224
msgid "write the commit-graph after fetching"
msgstr "抓取後寫入分支圖"
-#: builtin/fetch.c:222
+#: builtin/fetch.c:226
msgid "accept refspecs from stdin"
msgstr "從標準輸入中接受引用規格"
-#: builtin/fetch.c:592
+#: builtin/fetch.c:618
msgid "couldn't find remote ref HEAD"
msgstr "找不到遠端 HEAD 引用"
-#: builtin/fetch.c:766
-#, c-format
-msgid "configuration fetch.output contains invalid value %s"
-msgstr "設定變數 fetch.output 包含無效值 %s"
-
-#: builtin/fetch.c:867
+#: builtin/fetch.c:893
#, c-format
msgid "object %s not found"
msgstr "物件 %s 未發現"
-#: builtin/fetch.c:871
+#: builtin/fetch.c:897
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
+#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999
msgid "[rejected]"
msgstr "[已拒絕]"
-#: builtin/fetch.c:885
+#: builtin/fetch.c:911
msgid "can't fetch in current branch"
msgstr "目前分支下不能執行取得動作"
-#: builtin/fetch.c:886
+#: builtin/fetch.c:912
msgid "checked out in another worktree"
msgstr "已在其他工作區簽出"
-#: builtin/fetch.c:896
+#: builtin/fetch.c:922
msgid "[tag update]"
msgstr "[標籤更新]"
-#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
-#: builtin/fetch.c:968
+#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982
+#: builtin/fetch.c:994
msgid "unable to update local ref"
msgstr "不能更新本機引用"
-#: builtin/fetch.c:901
+#: builtin/fetch.c:927
msgid "would clobber existing tag"
msgstr "會破壞現有的標籤"
-#: builtin/fetch.c:923
+#: builtin/fetch.c:949
msgid "[new tag]"
msgstr "[新標籤]"
-#: builtin/fetch.c:926
+#: builtin/fetch.c:952
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:929
+#: builtin/fetch.c:955
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:968
+#: builtin/fetch.c:994
msgid "forced update"
msgstr "強制更新"
-#: builtin/fetch.c:973
+#: builtin/fetch.c:999
msgid "non-fast-forward"
msgstr "非快轉"
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1102
msgid ""
"fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
"要重新啟用,請使用「--show-forced-updates」選項,或執行\n"
"「git config fetch.showForcedUpdates true」"
-#: builtin/fetch.c:1080
+#: builtin/fetch.c:1106
#, c-format
msgid ""
"it took %.2f seconds to check forced updates; you can use\n"
"花了 %.2f 秒檢查強制更新。您可以使用「--no-show-forced-updates」\n"
"或執行「git config fetch.showForcedUpdates false」避免此項檢查\n"
-#: builtin/fetch.c:1112
+#: builtin/fetch.c:1136
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未傳送所有必需的物件\n"
-#: builtin/fetch.c:1141
+#: builtin/fetch.c:1156
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "已拒絕 %s,不允許更新淺複製"
-#: builtin/fetch.c:1231 builtin/fetch.c:1379
+#: builtin/fetch.c:1259 builtin/fetch.c:1418
#, c-format
msgid "From %.*s\n"
msgstr "來自 %.*s\n"
-#: builtin/fetch.c:1252
+#: builtin/fetch.c:1269
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' 來刪除舊的、有衝突的分支"
# 譯者:請維持前導空格
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1377
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s 將成為懸空狀態)"
# 譯者:請維持前導空格
-#: builtin/fetch.c:1350
+#: builtin/fetch.c:1378
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s 已成為懸空狀態)"
-#: builtin/fetch.c:1382
+#: builtin/fetch.c:1421
msgid "[deleted]"
msgstr "[已刪除]"
-#: builtin/fetch.c:1383 builtin/remote.c:1128
+#: builtin/fetch.c:1422 builtin/remote.c:1153
msgid "(none)"
msgstr "(無)"
-#: builtin/fetch.c:1405
+#: builtin/fetch.c:1446
#, c-format
msgid "refusing to fetch into branch '%s' checked out at '%s'"
msgstr "拒絕取得在「%2$s」簽出的「%1$s」分支"
-#: builtin/fetch.c:1425
+#: builtin/fetch.c:1466
#, c-format
msgid "option \"%s\" value \"%s\" is not valid for %s"
msgstr "選項「%s」的值「%s」對 %s 無效"
-#: builtin/fetch.c:1428
+#: builtin/fetch.c:1469
#, c-format
msgid "option \"%s\" is ignored for %s\n"
msgstr "選項「%s」被 %s 忽略\n"
-#: builtin/fetch.c:1455
+#: builtin/fetch.c:1496
#, c-format
msgid "the object %s does not exist"
msgstr "%s 物件不存在"
-#: builtin/fetch.c:1643
+#: builtin/fetch.c:1748
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "檢測到多分支,和 --set-upstream 不相容"
-#: builtin/fetch.c:1655
+#: builtin/fetch.c:1760
#, c-format
msgid ""
"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
msgstr ""
"無法將 HEAD 的上游從「%2$s」設定為「%1$s」,因為 HEAD 沒有指向任何分支。"
-#: builtin/fetch.c:1668
+#: builtin/fetch.c:1773
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "沒有為一個遠端追蹤分支設定上游"
-#: builtin/fetch.c:1670
+#: builtin/fetch.c:1775
msgid "not setting upstream for a remote tag"
msgstr "沒有為一個遠端標籤設定上游"
-#: builtin/fetch.c:1672
+#: builtin/fetch.c:1777
msgid "unknown branch type"
msgstr "未知的分支類型"
-#: builtin/fetch.c:1674
+#: builtin/fetch.c:1779
msgid ""
"no source branch found;\n"
"you need to specify exactly one branch with the --set-upstream option"
"找不到來源分支。\n"
"您得使用 --set-upstream 選項明確指定一個分支"
-#: builtin/fetch.c:1804 builtin/fetch.c:1867
+#: builtin/fetch.c:1904 builtin/fetch.c:1967
#, c-format
msgid "Fetching %s\n"
msgstr "正在取得 %s\n"
-#: builtin/fetch.c:1814 builtin/fetch.c:1869
+#: builtin/fetch.c:1914 builtin/fetch.c:1969
#, c-format
msgid "could not fetch %s"
msgstr "不能取得 %s"
-#: builtin/fetch.c:1826
+#: builtin/fetch.c:1926
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "無法取得 '%s'(離開碼:%d)\n"
-#: builtin/fetch.c:1930
+#: builtin/fetch.c:2030
msgid ""
"no remote repository specified; please specify either a URL or a\n"
"remote name from which new revisions should be fetched"
"未指定遠端版本庫。請指定用以取得新修訂版本之\n"
"來源 URL 或者遠端版本庫名稱"
-#: builtin/fetch.c:1966
+#: builtin/fetch.c:2066
msgid "you need to specify a tag name"
msgstr "您需要指定標籤名稱"
-#: builtin/fetch.c:2032
-msgid "--negotiate-only needs one or more --negotiate-tip=*"
-msgstr "--negotiate-only 需要一或多個 --negotiate-tip=*"
+#: builtin/fetch.c:2156
+msgid "--negotiate-only needs one or more --negotiation-tip=*"
+msgstr "--negotiate-only 需要一或多個 --negotiation-tip=*"
-#: builtin/fetch.c:2036
+#: builtin/fetch.c:2160
msgid "negative depth in --deepen is not supported"
msgstr "--deepen 不支援負數深度"
-#: builtin/fetch.c:2045
+#: builtin/fetch.c:2169
msgid "--unshallow on a complete repository does not make sense"
msgstr "對於一個完整的版本庫,參數 --unshallow 沒有意義"
-#: builtin/fetch.c:2062
+#: builtin/fetch.c:2186
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能帶一個版本庫參數"
-#: builtin/fetch.c:2064
+#: builtin/fetch.c:2188
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 帶引用規格沒有任何意義"
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2197
#, c-format
msgid "no such remote or remote group: %s"
msgstr "無此遠端或遠端群組:%s"
-#: builtin/fetch.c:2081
+#: builtin/fetch.c:2205
msgid "fetching a group and specifying refspecs does not make sense"
msgstr "取得群組並指定引用規格無意義"
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2221
msgid "must supply remote when using --negotiate-only"
msgstr "使用 --negotiate-only 時必須提供遠端"
-#: builtin/fetch.c:2102
+#: builtin/fetch.c:2226
msgid "protocol does not support --negotiate-only, exiting"
msgstr "通訊協定不支援 --negotiate-only。結束"
-#: builtin/fetch.c:2121
+#: builtin/fetch.c:2246
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr "只可以將 --filter 用於在 extensions.partialclone 中設定的遠端版本庫"
-#: builtin/fetch.c:2125
+#: builtin/fetch.c:2250
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic 只能在擷取 (fetch) 一個遠端時使用"
-#: builtin/fetch.c:2129
+#: builtin/fetch.c:2254
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin 只能在取得一個遠端時使用"
msgid "show only <n> matched refs"
msgstr "只顯示 <n> 個符合的引用"
-#: builtin/for-each-ref.c:42 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:482
msgid "respect format colors"
msgstr "遵照格式中的顏色輸出"
msgid "Checking %s link"
msgstr "正在檢查 %s 連結"
-#: builtin/fsck.c:710 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:862
#, c-format
msgid "invalid %s"
msgstr "無效的 %s"
#: builtin/fsck.c:795
msgid "make reflogs head nodes (default)"
-msgstr "將引用日誌作為檢查的頭節點(預設)"
+msgstr "將引用日誌作為檢查的 HEAD 節點(預設)"
#: builtin/fsck.c:796
msgid "also consider packs and alternate objects"
msgid "check only connectivity"
msgstr "僅檢查連通性"
-#: builtin/fsck.c:798 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:75
msgid "enable more strict checking"
msgstr "啟用更嚴格的檢查"
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "無效的參數:期望 sha1,得到 '%s'"
+#: builtin/fsmonitor--daemon.c:13
+msgid "git fsmonitor--daemon start [<options>]"
+msgstr "git fsmonitor--daemon start [<options>]"
+
+#: builtin/fsmonitor--daemon.c:14
+msgid "git fsmonitor--daemon run [<options>]"
+msgstr "git fsmonitor--daemon run [<options>]"
+
+#: builtin/fsmonitor--daemon.c:15
+msgid "git fsmonitor--daemon stop"
+msgstr "git fsmonitor--daemon stop"
+
+#: builtin/fsmonitor--daemon.c:16
+msgid "git fsmonitor--daemon status"
+msgstr "git fsmonitor--daemon status"
+
+#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47
+#, c-format
+msgid "value of '%s' out of range: %d"
+msgstr "「%s」的數值超出範圍:%d"
+
+#: builtin/fsmonitor--daemon.c:57
+#, c-format
+msgid "value of '%s' not bool or int: %d"
+msgstr "「%s」的數值不是布林值或整數:%d"
+
+#: builtin/fsmonitor--daemon.c:99
+#, c-format
+msgid "fsmonitor-daemon is watching '%s'\n"
+msgstr "fsmonitor-daemon 正在監控「%s」\n"
+
+#: builtin/fsmonitor--daemon.c:104
+#, c-format
+msgid "fsmonitor-daemon is not watching '%s'\n"
+msgstr "fsmonitor-daemon 未在監控「%s」\n"
+
+#: builtin/fsmonitor--daemon.c:170
+#, c-format
+msgid "could not create fsmonitor cookie '%s'"
+msgstr "無法建立 fsmonitor cookie「%s」"
+
+#: builtin/fsmonitor--daemon.c:753
+#, c-format
+msgid "fsmonitor: cookie_result '%d' != SEEN"
+msgstr "fsmonitor:cookie_result '%d' != SEEN"
+
+#: builtin/fsmonitor--daemon.c:1187
+#, c-format
+msgid "could not start IPC thread pool on '%s'"
+msgstr "無法在「%s」啟動 IPC 執行緒集區"
+
+#: builtin/fsmonitor--daemon.c:1199
+msgid "could not start fsmonitor listener thread"
+msgstr "無法啟動 fsmonitor 監聽執行緒"
+
+#: builtin/fsmonitor--daemon.c:1297
+msgid "could not initialize listener thread"
+msgstr "無法初始化監聽執行緒"
+
+#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383
+#, c-format
+msgid "fsmonitor--daemon is already running '%s'"
+msgstr "fsmonitor--daemon 已在執行「%s」"
+
+#: builtin/fsmonitor--daemon.c:1332
+#, c-format
+msgid "running fsmonitor-daemon in '%s'\n"
+msgstr "正在「%s」執行 fsmonitor-daemon\n"
+
+#: builtin/fsmonitor--daemon.c:1387
+#, c-format
+msgid "starting fsmonitor-daemon in '%s'\n"
+msgstr "正在「%s」啟動 fsmonitor-daemon\n"
+
+#: builtin/fsmonitor--daemon.c:1413
+msgid "daemon failed to start"
+msgstr "無法啟動守護程式"
+
+#: builtin/fsmonitor--daemon.c:1416
+msgid "daemon not online yet"
+msgstr "守護程式尚未上線"
+
+#: builtin/fsmonitor--daemon.c:1419
+msgid "daemon terminated"
+msgstr "守護程式已終止"
+
+#: builtin/fsmonitor--daemon.c:1429
+msgid "detach from console"
+msgstr "從主控台分離"
+
+#: builtin/fsmonitor--daemon.c:1432
+msgid "use <n> ipc worker threads"
+msgstr "使用 <n> 個 IPC 工作執行緒"
+
+#: builtin/fsmonitor--daemon.c:1435
+msgid "max seconds to wait for background daemon startup"
+msgstr "要等待背景守護程式啟動的最長秒數"
+
+#: builtin/fsmonitor--daemon.c:1449
+#, c-format
+msgid "invalid 'ipc-threads' value (%d)"
+msgstr "無效的「ipc-threads」數值(%d)"
+
+#: builtin/fsmonitor--daemon.c:1464
+#, c-format
+msgid "Unhandled subcommand '%s'"
+msgstr "未處理的子命令「%s」"
+
+#: builtin/fsmonitor--daemon.c:1477
+msgid "fsmonitor--daemon not supported on this platform"
+msgstr "fsmonitor--daemon 不支援本平台"
+
#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<選項>]"
#: builtin/gc.c:707
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr "有太多無法取得的鬆散物件,執行 'git prune' 刪除它們。"
+msgstr "有太多無法取得的鬆散物件,執行「git prune」刪除它們。"
#: builtin/gc.c:717
msgid ""
msgid "failed to run systemctl"
msgstr "無法執行 systemctl"
-#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
-#: builtin/worktree.c:944
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63
+#: builtin/worktree.c:1024
#, c-format
msgid "failed to delete '%s'"
msgstr "刪除 '%s' 失敗"
msgid "invalid subcommand: %s"
msgstr "無效子命令:%s"
-#: builtin/grep.c:30
+#: builtin/grep.c:32
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<選項>] [-e] <模式> [<版本>...] [[--] <路徑>...]"
-#: builtin/grep.c:239
+#: builtin/grep.c:241
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep:無法建立執行緒:%s"
-#: builtin/grep.c:293
+#: builtin/grep.c:295
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
-#: builtin/pack-objects.c:3142
+#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3150
#, c-format
msgid "no threads support, ignoring %s"
msgstr "沒有執行緒支援,忽略 %s"
-#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
+#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659
#, c-format
msgid "unable to read tree (%s)"
msgstr "無法讀取樹(%s)"
-#: builtin/grep.c:672
+#: builtin/grep.c:674
#, c-format
msgid "unable to grep from object of type %s"
msgstr "無法抓取來自於 %s 類型的物件"
-#: builtin/grep.c:752
+#: builtin/grep.c:754
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "開關 `%c' 期望一個數字值"
-#: builtin/grep.c:851
+#: builtin/grep.c:852
msgid "search in index instead of in the work tree"
msgstr "在索引區搜尋而不是在工作區"
-#: builtin/grep.c:853
+#: builtin/grep.c:854
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的內容中尋找"
# 譯者:中文字串拼接,可刪除前導空格
-#: builtin/grep.c:855
+#: builtin/grep.c:856
msgid "search in both tracked and untracked files"
msgstr "在追蹤和未追蹤的檔案中搜尋"
-#: builtin/grep.c:857
+#: builtin/grep.c:858
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的檔案"
-#: builtin/grep.c:859
+#: builtin/grep.c:860
msgid "recursively search in each submodule"
msgstr "在每一個子模組中遞迴搜尋"
-#: builtin/grep.c:862
+#: builtin/grep.c:863
msgid "show non-matching lines"
msgstr "顯示未符合的行"
-#: builtin/grep.c:864
+#: builtin/grep.c:865
msgid "case insensitive matching"
msgstr "不區分大小寫符合"
-#: builtin/grep.c:866
+#: builtin/grep.c:867
msgid "match patterns only at word boundaries"
msgstr "只在單詞邊界符合模式"
-#: builtin/grep.c:868
+#: builtin/grep.c:869
msgid "process binary files as text"
msgstr "把二進位檔案當做文字處理"
-#: builtin/grep.c:870
+#: builtin/grep.c:871
msgid "don't match patterns in binary files"
msgstr "不在二進位檔案中符合模式"
-#: builtin/grep.c:873
+#: builtin/grep.c:874
msgid "process binary files with textconv filters"
msgstr "用 textconv 過濾器處理二進位檔案"
-#: builtin/grep.c:875
+#: builtin/grep.c:876
msgid "search in subdirectories (default)"
msgstr "在子目錄中尋找(預設)"
-#: builtin/grep.c:877
+#: builtin/grep.c:878
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下尋找"
-#: builtin/grep.c:881
+#: builtin/grep.c:882
msgid "use extended POSIX regular expressions"
msgstr "使用延伸的 POSIX 常規表示式"
-#: builtin/grep.c:884
+#: builtin/grep.c:885
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 常規表示式(預設)"
-#: builtin/grep.c:887
+#: builtin/grep.c:888
msgid "interpret patterns as fixed strings"
msgstr "把模式解析為固定的字串"
-#: builtin/grep.c:890
+#: builtin/grep.c:891
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 相容的常規表示式"
-#: builtin/grep.c:893
+#: builtin/grep.c:894
msgid "show line numbers"
msgstr "顯示行號"
-#: builtin/grep.c:894
+#: builtin/grep.c:895
msgid "show column number of first match"
msgstr "顯示第一個符合的列號"
-#: builtin/grep.c:895
+#: builtin/grep.c:896
msgid "don't show filenames"
msgstr "不顯示檔案名"
-#: builtin/grep.c:896
+#: builtin/grep.c:897
msgid "show filenames"
msgstr "顯示檔案名"
-#: builtin/grep.c:898
+#: builtin/grep.c:899
msgid "show filenames relative to top directory"
msgstr "顯示相對於頂級目錄的檔案名"
-#: builtin/grep.c:900
+#: builtin/grep.c:901
msgid "show only filenames instead of matching lines"
msgstr "只顯示檔案名而不顯示符合的行"
-#: builtin/grep.c:902
+#: builtin/grep.c:903
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同義"
-#: builtin/grep.c:905
+#: builtin/grep.c:906
msgid "show only the names of files without match"
msgstr "只顯示未符合的檔案名"
-#: builtin/grep.c:907
+#: builtin/grep.c:908
msgid "print NUL after filenames"
msgstr "在檔案名後輸出 NUL 字元"
-#: builtin/grep.c:910
+#: builtin/grep.c:911
msgid "show only matching parts of a line"
msgstr "只顯示行中的符合的部分"
-#: builtin/grep.c:912
+#: builtin/grep.c:913
msgid "show the number of matches instead of matching lines"
msgstr "顯示總符合行數,而不顯示符合的行"
-#: builtin/grep.c:913
+#: builtin/grep.c:914
msgid "highlight matches"
msgstr "高亮顯示符合項"
-#: builtin/grep.c:915
+#: builtin/grep.c:916
msgid "print empty line between matches from different files"
msgstr "在不同檔案的符合項之間列印空行"
-#: builtin/grep.c:917
+#: builtin/grep.c:918
msgid "show filename only once above matches from same file"
msgstr "只在同一檔案的符合項的上面顯示一次檔案名"
-#: builtin/grep.c:920
+#: builtin/grep.c:921
msgid "show <n> context lines before and after matches"
msgstr "顯示符合項前後的 <n> 行上下文"
-#: builtin/grep.c:923
+#: builtin/grep.c:924
msgid "show <n> context lines before matches"
msgstr "顯示符合項前 <n> 行上下文"
-#: builtin/grep.c:925
+#: builtin/grep.c:926
msgid "show <n> context lines after matches"
msgstr "顯示符合項後 <n> 行上下文"
-#: builtin/grep.c:927
+#: builtin/grep.c:928
msgid "use <n> worker threads"
msgstr "使用 <n> 個工作執行緒"
-#: builtin/grep.c:928
+#: builtin/grep.c:929
msgid "shortcut for -C NUM"
msgstr "快捷鍵 -C 數字"
-#: builtin/grep.c:931
+#: builtin/grep.c:932
msgid "show a line with the function name before matches"
msgstr "在符合的前面顯示一行函數名"
-#: builtin/grep.c:933
+#: builtin/grep.c:934
msgid "show the surrounding function"
msgstr "顯示所在函數的前後內容"
-#: builtin/grep.c:936
+#: builtin/grep.c:937
msgid "read patterns from file"
msgstr "從檔案讀取模式"
-#: builtin/grep.c:938
+#: builtin/grep.c:939
msgid "match <pattern>"
msgstr "符合 <模式>"
-#: builtin/grep.c:940
+#: builtin/grep.c:941
msgid "combine patterns specified with -e"
msgstr "組合用 -e 參數設定的模式"
-#: builtin/grep.c:952
+#: builtin/grep.c:953
msgid "indicate hit with exit status without output"
msgstr "不輸出,而用離開碼標記命中狀態"
-#: builtin/grep.c:954
+#: builtin/grep.c:955
msgid "show only matches from files that match all patterns"
msgstr "只顯示符合所有模式的檔案中的符合"
-#: builtin/grep.c:957
+#: builtin/grep.c:958
msgid "pager"
msgstr "分頁"
-#: builtin/grep.c:957
+#: builtin/grep.c:958
msgid "show matching files in the pager"
msgstr "分頁顯示符合的檔案"
-#: builtin/grep.c:961
+#: builtin/grep.c:962
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允許呼叫 grep(1)(本次組建忽略)"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1028
msgid "no pattern given"
msgstr "未提供符合模式"
-#: builtin/grep.c:1063
+#: builtin/grep.c:1064
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同時使用"
-#: builtin/grep.c:1071
+#: builtin/grep.c:1072
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本:%s"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1102
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked 不支援與 --recurse-submodules 一起使用"
-#: builtin/grep.c:1105
+#: builtin/grep.c:1106
msgid "invalid option combination, ignoring --threads"
msgstr "無效的選項組合,忽略 --threads"
-#: builtin/grep.c:1108 builtin/pack-objects.c:4059
+#: builtin/grep.c:1109 builtin/pack-objects.c:4084
msgid "no threads support, ignoring --threads"
msgstr "沒有執行緒支援,忽略 --threads"
-#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
+#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的執行緒數無效(%d)"
-#: builtin/grep.c:1145
+#: builtin/grep.c:1146
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 僅用於工作區"
-#: builtin/grep.c:1171
-msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached 或 --untracked 不能與 --no-index 同時使用"
-
-#: builtin/grep.c:1174
-msgid "--untracked cannot be used with --cached"
-msgstr "--untracked 不能與 --cached 一起使用"
-
-#: builtin/grep.c:1180
+#: builtin/grep.c:1179
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用於已追蹤內容"
-#: builtin/grep.c:1188
+#: builtin/grep.c:1187
msgid "both --cached and trees are given"
msgstr "同時給出了 --cached 和樹狀物件"
"git hash-object [-t <類型>] [-w] [--path=<檔案> | --no-filters] [--stdin] "
"[--] <檔案>..."
-#: builtin/hash-object.c:84
-msgid "git hash-object --stdin-paths"
-msgstr "git hash-object --stdin-paths"
-
-#: builtin/hash-object.c:96
+#: builtin/hash-object.c:97
msgid "object type"
msgstr "物件類型"
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "write the object into the object database"
msgstr "將物件寫入物件資料庫"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid "read the object from stdin"
msgstr "從標準輸入讀取物件"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
msgid "store file as is without filters"
msgstr "原樣儲存檔案不使用過濾器"
-#: builtin/hash-object.c:102
+#: builtin/hash-object.c:103
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "允許對任意隨機垃圾資料做散列來建立損壞的物件以便除錯 Git"
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:104
msgid "process file as it were from this path"
msgstr "處理檔案並假設其來自於此路徑"
-#: builtin/help.c:55
+#: builtin/help.c:57
msgid "print all available commands"
msgstr "列印所有可用的指令"
-#: builtin/help.c:57
+#: builtin/help.c:60
+msgid "show external commands in --all"
+msgstr "在 --all 顯示外部命令"
+
+#: builtin/help.c:61
+msgid "show aliases in --all"
+msgstr "在 --all 顯示別名"
+
+#: builtin/help.c:62
msgid "exclude guides"
msgstr "排除嚮導"
-#: builtin/help.c:58
+#: builtin/help.c:63
msgid "show man page"
msgstr "顯示 man 手冊"
-#: builtin/help.c:59
+#: builtin/help.c:64
msgid "show manual in web browser"
msgstr "在 web 瀏覽器中顯示手冊"
-#: builtin/help.c:61
+#: builtin/help.c:66
msgid "show info page"
msgstr "顯示 info 手冊"
-#: builtin/help.c:63
+#: builtin/help.c:68
msgid "print command description"
msgstr "列印指令描述"
-#: builtin/help.c:65
+#: builtin/help.c:70
msgid "print list of useful guides"
msgstr "顯示有用的指南列表"
-#: builtin/help.c:67
+#: builtin/help.c:72
msgid "print all configuration variable names"
msgstr "列印所有設定變數名稱"
-#: builtin/help.c:78
-msgid ""
-"git help [-a|--all] [--[no-]verbose]]\n"
-" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
-msgstr ""
-"git help [-a|--all] [--[no-]verbose]]\n"
-" [[-i|--info] [-m|--man] [-w|--web]] [<命令>]"
-
-#: builtin/help.c:80
-msgid "git help [-g|--guides]"
-msgstr "git help [-g|--guides]"
-
-#: builtin/help.c:81
-msgid "git help [-c|--config]"
-msgstr "git help [-c|--config]"
+#: builtin/help.c:84
+msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
-#: builtin/help.c:196
+#: builtin/help.c:201
#, c-format
msgid "unrecognized help format '%s'"
msgstr "無法識別的協助格式 '%s'"
-#: builtin/help.c:222
+#: builtin/help.c:227
msgid "Failed to start emacsclient."
msgstr "無法啟動 emacsclient。"
-#: builtin/help.c:235
+#: builtin/help.c:240
msgid "Failed to parse emacsclient version."
msgstr "無法解析 emacsclient 版本。"
-#: builtin/help.c:243
+#: builtin/help.c:248
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老(< 22)。"
-#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
+#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306
#, c-format
msgid "failed to exec '%s'"
msgstr "執行 '%s' 失敗"
-#: builtin/help.c:339
+#: builtin/help.c:344
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"'%s':不支援的 man 手冊檢視器的路徑。\n"
"請使用 'man.<工具>.cmd'。"
-#: builtin/help.c:351
+#: builtin/help.c:356
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"'%s': 支援的 man 手冊檢視器指令。\n"
"請使用 'man.<工具>.path'。"
-#: builtin/help.c:466
+#: builtin/help.c:471
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s':未知的 man 檢視器。"
-#: builtin/help.c:482
+#: builtin/help.c:487
msgid "no man viewer handled the request"
msgstr "沒有 man 檢視器處理此請求"
-#: builtin/help.c:489
+#: builtin/help.c:494
msgid "no info viewer handled the request"
msgstr "沒有 info 檢視器處理此請求"
-#: builtin/help.c:550 builtin/help.c:561 git.c:348
+#: builtin/help.c:555 builtin/help.c:566 git.c:348
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' 是 '%s' 的別名"
-#: builtin/help.c:564 git.c:380
+#: builtin/help.c:569 git.c:380
#, c-format
msgid "bad alias.%s string: %s"
msgstr "壞的 alias.%s 字串:%s"
-#: builtin/help.c:580
-msgid "this option doesn't take any other arguments"
-msgstr "本選項不取其他引數"
+#: builtin/help.c:611
+#, c-format
+msgid "the '%s' option doesn't take any non-option arguments"
+msgstr "「%s」選項不取非選項的引數"
+
+#: builtin/help.c:631
+msgid ""
+"the '--no-[external-commands|aliases]' options can only be used with '--all'"
+msgstr "「--no-[external-commands|aliases]」選項只能與「--all」一起使用"
-#: builtin/help.c:601 builtin/help.c:628
+#: builtin/help.c:643 builtin/help.c:671
#, c-format
msgid "usage: %s%s"
msgstr "用法:%s%s"
-#: builtin/help.c:623
+#: builtin/help.c:666
msgid "'git help config' for more information"
msgstr "'git help config' 取得更多訊息"
+#: builtin/hook.c:10
+msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+msgstr "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
+
+#: builtin/hook.c:30
+msgid "silently ignore missing requested <hook-name>"
+msgstr "靜默忽略不存在而請求的 <hook-name>"
+
#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgid "used more bytes than were available"
msgstr "用掉了超過可用的位元組"
-#: builtin/index-pack.c:324 builtin/pack-objects.c:756
+#: builtin/index-pack.c:324 builtin/pack-objects.c:754
msgid "pack too large for current definition of off_t"
msgstr "包太大超過了目前 off_t 的定義"
-#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
-msgid "pack exceeds maximum allowed size"
-msgstr "包超過了最大允許值"
+#: builtin/index-pack.c:329
+#, c-format
+msgid "pack exceeds maximum allowed size (%s)"
+msgstr "包超過了最大允許大小 (%s)"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "包簽名不符合"
-#: builtin/index-pack.c:360
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支援包版本 %<PRIu32>"
-#: builtin/index-pack.c:376
+#: builtin/index-pack.c:380
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有錯誤的物件位於位移量 %<PRIuMAX>:%s"
-#: builtin/index-pack.c:482
+#: builtin/index-pack.c:485
#, c-format
msgid "inflate returned %d"
msgstr "解壓縮返回 %d"
-#: builtin/index-pack.c:531
+#: builtin/index-pack.c:534
msgid "offset value overflow for delta base object"
msgstr "位移值覆蓋了 delta 基準物件"
-#: builtin/index-pack.c:539
+#: builtin/index-pack.c:542
msgid "delta base offset is out of bound"
msgstr "delta 基準位移越界"
-#: builtin/index-pack.c:547
+#: builtin/index-pack.c:550
#, c-format
msgid "unknown object type %d"
msgstr "未知物件類型 %d"
-#: builtin/index-pack.c:578
+#: builtin/index-pack.c:581
msgid "cannot pread pack file"
msgstr "無法讀取包檔案"
-#: builtin/index-pack.c:580
+#: builtin/index-pack.c:583
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "包檔案過早結束,缺少 %<PRIuMAX> 位元組"
-#: builtin/index-pack.c:606
+#: builtin/index-pack.c:609
msgid "serious inflate inconsistency"
msgstr "解壓縮嚴重的不一致"
-#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
-#: builtin/index-pack.c:820 builtin/index-pack.c:829
+#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784
+#: builtin/index-pack.c:823 builtin/index-pack.c:832
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "發現 %s 出現 SHA1 衝突!"
-#: builtin/index-pack.c:754 builtin/pack-objects.c:292
-#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
+#: builtin/index-pack.c:757 builtin/pack-objects.c:290
+#: builtin/pack-objects.c:350 builtin/pack-objects.c:456
#, c-format
msgid "unable to read %s"
msgstr "不能讀 %s"
-#: builtin/index-pack.c:818
+#: builtin/index-pack.c:821
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能讀取現存物件訊息 %s"
-#: builtin/index-pack.c:826
+#: builtin/index-pack.c:829
#, c-format
msgid "cannot read existing object %s"
msgstr "不能讀取現存物件 %s"
-#: builtin/index-pack.c:840
+#: builtin/index-pack.c:843
#, c-format
msgid "invalid blob object %s"
msgstr "無效的資料物件 %s"
-#: builtin/index-pack.c:843 builtin/index-pack.c:862
+#: builtin/index-pack.c:846 builtin/index-pack.c:865
msgid "fsck error in packed object"
msgstr "對打包物件 fsck 檢查發生錯誤"
-#: builtin/index-pack.c:864
+#: builtin/index-pack.c:867
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子物件並非都可以取得"
-#: builtin/index-pack.c:925 builtin/index-pack.c:972
+#: builtin/index-pack.c:928 builtin/index-pack.c:975
msgid "failed to apply delta"
msgstr "套用 delta 失敗"
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "接收物件中"
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "索引物件中"
-#: builtin/index-pack.c:1190
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包衝突(SHA1 不符合)"
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "不能對 packfile 呼叫 fstat"
-#: builtin/index-pack.c:1198
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "包的結尾有垃圾資料"
-#: builtin/index-pack.c:1210
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的問題"
-#: builtin/index-pack.c:1233
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "處理 delta 中"
-#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913
#, c-format
msgid "unable to create thread: %s"
msgstr "不能建立執行緒:%s"
-#: builtin/index-pack.c:1277
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "完成 %d 個本機物件"
-#: builtin/index-pack.c:1295
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "對 %s 的尾部總和檢查出現意外(磁碟損壞?)"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 個未解決的 delta"
-#: builtin/index-pack.c:1323
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能壓縮附加物件(%d)"
-#: builtin/index-pack.c:1419
+#: builtin/index-pack.c:1423
#, c-format
msgid "local object %s is corrupt"
msgstr "本機物件 %s 已損壞"
-#: builtin/index-pack.c:1440
+#: builtin/index-pack.c:1445
#, c-format
msgid "packfile name '%s' does not end with '.%s'"
msgstr "packfile 名稱「%s」的結尾不是「.%s」"
-#: builtin/index-pack.c:1464
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "無法寫入 %s 檔案 '%s'"
-#: builtin/index-pack.c:1472
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "無法關閉已寫入的 %s 檔案 '%s'"
-#: builtin/index-pack.c:1489
+#: builtin/index-pack.c:1494
#, c-format
msgid "unable to rename temporary '*.%s' file to '%s'"
msgstr "無法將「*.%s」暫存檔的檔名更改為「%s」"
-#: builtin/index-pack.c:1514
+#: builtin/index-pack.c:1519
msgid "error while closing pack file"
msgstr "關閉包檔案時發生錯誤"
-#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
+#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "壞的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1648
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "無法開啟現有包檔案 '%s'"
-#: builtin/index-pack.c:1645
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "無法為 %s 開啟包索引檔案"
-#: builtin/index-pack.c:1693
+#: builtin/index-pack.c:1698
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta:%d 個物件"
-#: builtin/index-pack.c:1700
+#: builtin/index-pack.c:1705
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "鏈長 = %d: %lu 物件"
-#: builtin/index-pack.c:1742
+#: builtin/index-pack.c:1748
msgid "Cannot come back to cwd"
msgstr "無法返回目前工作目錄"
-#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
-#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
+#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
+#: builtin/index-pack.c:1825 builtin/index-pack.c:1829
#, c-format
msgid "bad %s"
msgstr "錯誤選項 %s"
-#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
+#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614
#, c-format
msgid "unknown hash algorithm '%s'"
msgstr "未知的「%s」雜湊算法"
-#: builtin/index-pack.c:1850
+#: builtin/index-pack.c:1856
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一個 git 版本庫"
-#: builtin/index-pack.c:1867
+#: builtin/index-pack.c:1873
msgid "--verify with no packfile name given"
msgstr "--verify 沒有提供 packfile 名稱參數"
-#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584
msgid "fsck error in pack objects"
msgstr "在打包物件中 fsck 檢查發生錯誤"
msgid "no input file given for in-place editing"
msgstr "沒有給出要原位編輯的檔案"
-#: builtin/log.c:59
+#: builtin/log.c:60
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]"
-#: builtin/log.c:60
+#: builtin/log.c:61
msgid "git show [<options>] <object>..."
msgstr "git show [<選項>] <物件>..."
-#: builtin/log.c:113
+#: builtin/log.c:114
#, c-format
msgid "invalid --decorate option: %s"
msgstr "無效的 --decorate 選項:%s"
-#: builtin/log.c:180
+#: builtin/log.c:181
msgid "show source"
msgstr "顯示來源"
-#: builtin/log.c:181
+#: builtin/log.c:182
msgid "use mail map file"
msgstr "使用信件映射檔案"
-#: builtin/log.c:184
+#: builtin/log.c:185
msgid "only decorate refs that match <pattern>"
msgstr "只修飾與 <模式> 符合的引用"
-#: builtin/log.c:186
+#: builtin/log.c:187
msgid "do not decorate refs that match <pattern>"
msgstr "不修飾和 <模式> 符合的引用"
-#: builtin/log.c:187
+#: builtin/log.c:188
msgid "decorate options"
msgstr "修飾選項"
-#: builtin/log.c:190
+#: builtin/log.c:191
msgid ""
"trace the evolution of line range <start>,<end> or function :<funcname> in "
"<file>"
msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱> 的變化史"
-#: builtin/log.c:213
+#: builtin/log.c:214
msgid "-L<range>:<file> cannot be used with pathspec"
msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用"
-#: builtin/log.c:321
+#: builtin/log.c:322
#, c-format
msgid "Final output: %d %s\n"
msgstr "最終輸出:%d %s\n"
-#: builtin/log.c:586
+#: builtin/log.c:429
+msgid "unable to create temporary object directory"
+msgstr "無法建立暫存物件目錄"
+
+#: builtin/log.c:599
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 損壞的檔案"
-#: builtin/log.c:601 builtin/log.c:691
+#: builtin/log.c:614 builtin/log.c:706
#, c-format
msgid "could not read object %s"
msgstr "不能讀取物件 %s"
-#: builtin/log.c:716
+#: builtin/log.c:731
#, c-format
msgid "unknown type: %d"
msgstr "未知類型:%d"
-#: builtin/log.c:861
+#: builtin/log.c:880
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s:從描述產生附函的模式無效"
-#: builtin/log.c:868
+#: builtin/log.c:887
msgid "format.headers without value"
msgstr "format.headers 沒有值"
-#: builtin/log.c:997
+#: builtin/log.c:1016
#, c-format
msgid "cannot open patch file %s"
msgstr "無法開啟修補檔案 %s"
-#: builtin/log.c:1014
+#: builtin/log.c:1033
msgid "need exactly one range"
msgstr "只需要一個範圍"
-#: builtin/log.c:1024
+#: builtin/log.c:1043
msgid "not a range"
msgstr "不是一個範圍"
-#: builtin/log.c:1188
+#: builtin/log.c:1207
msgid "cover letter needs email format"
msgstr "附函需要信件位址格式"
-#: builtin/log.c:1194
+#: builtin/log.c:1213
msgid "failed to create cover-letter file"
msgstr "無法建立附函檔案"
-#: builtin/log.c:1281
+#: builtin/log.c:1300
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to:%s"
-#: builtin/log.c:1308
+#: builtin/log.c:1327
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<選項>] [<從> | <版本範圍>]"
-#: builtin/log.c:1366
+#: builtin/log.c:1385
msgid "two output directories?"
msgstr "兩個輸出目錄?"
-#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
+#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383
#, c-format
msgid "unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "無法將 '%s' 解析為一個有效引用"
-#: builtin/log.c:1537
+#: builtin/log.c:1556
msgid "could not find exact merge base"
msgstr "不能找到準確的合併基礎"
-#: builtin/log.c:1547
+#: builtin/log.c:1566
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n"
"參數 --base=<基礎提交> 手動指定一個基礎提交"
-#: builtin/log.c:1570
+#: builtin/log.c:1589
msgid "failed to find exact merge base"
msgstr "無法找到準確的合併基礎"
-#: builtin/log.c:1587
+#: builtin/log.c:1606
msgid "base commit should be the ancestor of revision list"
msgstr "基礎提交應該是版本列表的祖先"
-#: builtin/log.c:1597
+#: builtin/log.c:1616
msgid "base commit shouldn't be in revision list"
msgstr "基礎提交不應該出現在版本列表中"
-#: builtin/log.c:1655
+#: builtin/log.c:1674
msgid "cannot get patch id"
msgstr "無法得到修補檔 id"
-#: builtin/log.c:1718
+#: builtin/log.c:1737
msgid "failed to infer range-diff origin of current series"
msgstr "無法推斷目前系列的 range-diff 起點"
-#: builtin/log.c:1720
+#: builtin/log.c:1739
#, c-format
msgid "using '%s' as range-diff origin of current series"
msgstr "將 '%s' 當作目前系列的 range-diff 起點"
-#: builtin/log.c:1764
+#: builtin/log.c:1783
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m],即使只有一個修補檔"
-#: builtin/log.c:1767
+#: builtin/log.c:1786
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH],即使有多個修補檔"
-#: builtin/log.c:1771
+#: builtin/log.c:1790
msgid "print patches to standard out"
msgstr "列印修補檔到標準輸出"
-#: builtin/log.c:1773
+#: builtin/log.c:1792
msgid "generate a cover letter"
msgstr "生成一封附函"
-#: builtin/log.c:1775
+#: builtin/log.c:1794
msgid "use simple number sequence for output file names"
msgstr "使用簡單的數字序列作為輸出檔案名"
-#: builtin/log.c:1776
+#: builtin/log.c:1795
msgid "sfx"
msgstr "後綴"
-#: builtin/log.c:1777
+#: builtin/log.c:1796
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <後綴> 代替 '.patch'"
-#: builtin/log.c:1779
+#: builtin/log.c:1798
msgid "start numbering patches at <n> instead of 1"
msgstr "修補檔以 <n> 開始編號,而不是1"
-#: builtin/log.c:1780
+#: builtin/log.c:1799
msgid "reroll-count"
msgstr "reroll-count"
-#: builtin/log.c:1781
+#: builtin/log.c:1800
msgid "mark the series as Nth re-roll"
msgstr "標記修補檔系列是第幾次重製"
-#: builtin/log.c:1783
+#: builtin/log.c:1802
msgid "max length of output filename"
msgstr "輸出檔名的最大長度"
-#: builtin/log.c:1785
+#: builtin/log.c:1804
msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1788
+#: builtin/log.c:1807
msgid "cover-from-description-mode"
msgstr "從描述產生附函的模式"
-#: builtin/log.c:1789
+#: builtin/log.c:1808
msgid "generate parts of a cover letter based on a branch's description"
msgstr "基於分支描述產生部分附函"
-#: builtin/log.c:1791
+#: builtin/log.c:1810
msgid "use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前綴>] 代替 [PATCH]"
-#: builtin/log.c:1794
+#: builtin/log.c:1813
msgid "store resulting files in <dir>"
msgstr "把結果檔案儲存在 <目錄>"
-#: builtin/log.c:1797
+#: builtin/log.c:1816
msgid "don't strip/add [PATCH]"
msgstr "不刪除/新增 [PATCH]"
-#: builtin/log.c:1800
+#: builtin/log.c:1819
msgid "don't output binary diffs"
msgstr "不輸出二進位差異"
-#: builtin/log.c:1802
+#: builtin/log.c:1821
msgid "output all-zero hash in From header"
msgstr "在 From 標頭訊息中輸出全為零的雜湊值"
-#: builtin/log.c:1804
+#: builtin/log.c:1823
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的修補檔"
-#: builtin/log.c:1806
+#: builtin/log.c:1825
msgid "show patch format instead of default (patch + stat)"
msgstr "顯示純修補檔格式而非預設的(修補檔+狀態)"
-#: builtin/log.c:1808
+#: builtin/log.c:1827
msgid "Messaging"
msgstr "信件傳送"
-#: builtin/log.c:1809
+#: builtin/log.c:1828
msgid "header"
msgstr "header"
-#: builtin/log.c:1810
+#: builtin/log.c:1829
msgid "add email header"
msgstr "新增信件頭"
-#: builtin/log.c:1811 builtin/log.c:1812
+#: builtin/log.c:1830 builtin/log.c:1831
msgid "email"
msgstr "信件位址"
-#: builtin/log.c:1811
+#: builtin/log.c:1830
msgid "add To: header"
msgstr "新增收件人"
-#: builtin/log.c:1812
+#: builtin/log.c:1831
msgid "add Cc: header"
msgstr "新增抄送"
-#: builtin/log.c:1813
+#: builtin/log.c:1832
msgid "ident"
msgstr "標記"
-#: builtin/log.c:1814
+#: builtin/log.c:1833
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "將 From 位址設定為 <標記>(如若不提供,則用提交者 ID 做為位址)"
-#: builtin/log.c:1816
+#: builtin/log.c:1835
msgid "message-id"
msgstr "信件標記"
-#: builtin/log.c:1817
+#: builtin/log.c:1836
msgid "make first mail a reply to <message-id>"
msgstr "使第一封信件作為對 <信件標記> 的回覆"
-#: builtin/log.c:1818 builtin/log.c:1821
+#: builtin/log.c:1837 builtin/log.c:1840
msgid "boundary"
msgstr "邊界"
-#: builtin/log.c:1819
+#: builtin/log.c:1838
msgid "attach the patch"
msgstr "附件方式新增修補檔"
-#: builtin/log.c:1822
+#: builtin/log.c:1841
msgid "inline the patch"
msgstr "內聯顯示修補檔"
-#: builtin/log.c:1826
+#: builtin/log.c:1845
msgid "enable message threading, styles: shallow, deep"
msgstr "啟用信件線索,風格:淺,深"
-#: builtin/log.c:1828
+#: builtin/log.c:1847
msgid "signature"
msgstr "簽名"
-#: builtin/log.c:1829
+#: builtin/log.c:1848
msgid "add a signature"
msgstr "新增一個簽名"
-#: builtin/log.c:1830
+#: builtin/log.c:1849
msgid "base-commit"
msgstr "基礎提交"
-#: builtin/log.c:1831
+#: builtin/log.c:1850
msgid "add prerequisite tree info to the patch series"
msgstr "為修補檔列表新增前置樹訊息"
-#: builtin/log.c:1834
+#: builtin/log.c:1853
msgid "add a signature from a file"
msgstr "從檔案新增一個簽名"
-#: builtin/log.c:1835
+#: builtin/log.c:1854
msgid "don't print the patch filenames"
msgstr "不要列印修補檔檔案名"
-#: builtin/log.c:1837
+#: builtin/log.c:1856
msgid "show progress while generating patches"
msgstr "在生成修補檔時顯示進度"
-#: builtin/log.c:1839
+#: builtin/log.c:1858
msgid "show changes against <rev> in cover letter or single patch"
msgstr "在附函或單個修補檔中顯示和 <rev> 的差異"
-#: builtin/log.c:1842
+#: builtin/log.c:1861
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異"
-#: builtin/log.c:1844 builtin/range-diff.c:28
+#: builtin/log.c:1863 builtin/range-diff.c:28
msgid "percentage by which creation is weighted"
msgstr "建立權重的百分比"
-#: builtin/log.c:1931
+#: builtin/log.c:1953
#, c-format
msgid "invalid ident line: %s"
msgstr "包含無效的身份標記:%s"
-#: builtin/log.c:1956
+#: builtin/log.c:1978
msgid "--name-only does not make sense"
msgstr "--name-only 無意義"
-#: builtin/log.c:1958
+#: builtin/log.c:1980
msgid "--name-status does not make sense"
msgstr "--name-status 無意義"
-#: builtin/log.c:1960
+#: builtin/log.c:1982
msgid "--check does not make sense"
msgstr "--check 無意義"
-#: builtin/log.c:2104
+#: builtin/log.c:1984
+msgid "--remerge-diff does not make sense"
+msgstr "--remerge-diff 無意義"
+
+#: builtin/log.c:2129
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff 需要 --cover-letter 或單一修補檔"
-#: builtin/log.c:2108
+#: builtin/log.c:2133
msgid "Interdiff:"
msgstr "版本間差異:"
-#: builtin/log.c:2109
+#: builtin/log.c:2134
#, c-format
msgid "Interdiff against v%d:"
msgstr "對 v%d 的版本差異:"
-#: builtin/log.c:2119
+#: builtin/log.c:2144
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff 需要 --cover-letter 或單一修補檔"
-#: builtin/log.c:2127
+#: builtin/log.c:2152
msgid "Range-diff:"
msgstr "範圍差異:"
-#: builtin/log.c:2128
+#: builtin/log.c:2153
#, c-format
msgid "Range-diff against v%d:"
msgstr "對 v%d 的範圍差異:"
-#: builtin/log.c:2139
+#: builtin/log.c:2164
#, c-format
msgid "unable to read signature file '%s'"
msgstr "無法讀取簽名檔案 '%s'"
-#: builtin/log.c:2175
+#: builtin/log.c:2200
msgid "Generating patches"
msgstr "生成修補檔"
-#: builtin/log.c:2219
+#: builtin/log.c:2244
msgid "failed to create output files"
msgstr "無法建立輸出檔案"
-#: builtin/log.c:2279
+#: builtin/log.c:2304
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]"
-#: builtin/log.c:2333
+#: builtin/log.c:2358
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgid "make the output relative to the project top directory"
msgstr "顯示相對於頂級目錄的檔案名"
-#: builtin/ls-files.c:667
-msgid "recurse through submodules"
-msgstr "在子模組中遞迴"
-
#: builtin/ls-files.c:669
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <檔案> 都不在索引區,視為錯誤"
msgid "do not print remote URL"
msgstr "不列印遠端 URL"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131
msgid "exec"
msgstr "exec"
msgid "show underlying ref in addition to the object pointed by it"
msgstr "除了顯示指向的物件外,顯示指向的引用名"
-#: builtin/ls-tree.c:30
+#: builtin/ls-tree.c:36
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<選項>] <樹或提交> [<路徑>...]"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:54
+#, c-format
+msgid "could not get object info about '%s'"
+msgstr "無法取得「%s」相關的物件資訊"
+
+#: builtin/ls-tree.c:79
+#, c-format
+msgid "bad ls-tree format: element '%s' does not start with '('"
+msgstr "無效的 ls-tree 格式:「%s」元素的開頭不是「(」"
+
+#: builtin/ls-tree.c:83
+#, c-format
+msgid "bad ls-tree format: element '%s' does not end in ')'"
+msgstr "無效的 ls-tree 格式:「%s」元素的結尾不是「)」"
+
+#: builtin/ls-tree.c:109
+#, c-format
+msgid "bad ls-tree format: %%%.*s"
+msgstr "無效的 ls-tree 格式:%%%.*s"
+
+#: builtin/ls-tree.c:336
msgid "only show trees"
msgstr "只顯示樹"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:338
msgid "recurse into subtrees"
msgstr "遞迴到子樹"
-#: builtin/ls-tree.c:132
+#: builtin/ls-tree.c:340
msgid "show trees when recursing"
msgstr "當遞迴時顯示樹"
-#: builtin/ls-tree.c:135
+#: builtin/ls-tree.c:343
msgid "terminate entries with NUL byte"
msgstr "條目以 NUL 字元終止"
-#: builtin/ls-tree.c:136
+#: builtin/ls-tree.c:344
msgid "include object size"
msgstr "包括物件大小"
-#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+#: builtin/ls-tree.c:346 builtin/ls-tree.c:348
msgid "list only filenames"
msgstr "只列出檔案名"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:350
+msgid "list only objects"
+msgstr "只列出物件"
+
+#: builtin/ls-tree.c:353
msgid "use full path names"
msgstr "使用檔案的全路徑"
-#: builtin/ls-tree.c:145
+#: builtin/ls-tree.c:355
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "列出整個樹;不僅僅目前目錄(隱含 --full-name)"
+#: builtin/ls-tree.c:391
+msgid "--format can't be combined with other format-altering options"
+msgstr "--format 不能與其他修改格式的選項結合使用"
+
#. TRANSLATORS: keep <> in "<" mail ">" info.
#: builtin/mailinfo.c:14
msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
msgid "use headers in message's body"
msgstr "在訊息內文中使用標頭"
-#: builtin/mailsplit.c:239
+#: builtin/mailsplit.c:227
+msgid "reading patches from stdin/tty..."
+msgstr "正在從標準輸入或 tty 讀取修補檔內容⋯⋯"
+
+#: builtin/mailsplit.c:242
#, c-format
msgid "empty mbox: '%s'"
msgstr "空的 mbox:'%s'"
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <引用> [<提交>]"
-#: builtin/merge-base.c:143
+#: builtin/merge-base.c:144
msgid "output all common ancestors"
msgstr "輸出所有共同的祖先"
-#: builtin/merge-base.c:145
+#: builtin/merge-base.c:146
msgid "find ancestors for a single n-way merge"
msgstr "尋找一個多路合併的祖先提交"
-#: builtin/merge-base.c:147
+#: builtin/merge-base.c:148
msgid "list revs not reachable from others"
msgstr "顯示不能被其他存取到的版本"
-#: builtin/merge-base.c:149
+#: builtin/merge-base.c:150
msgid "is the first one ancestor of the other?"
msgstr "第一個是其他的祖先提交嗎?"
-#: builtin/merge-base.c:151
+#: builtin/merge-base.c:152
msgid "find where <commit> forked from reflog of <ref>"
msgstr "根據 <引用> 的引用日誌尋找 <提交> 的衍生處"
msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名"
#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
-#: builtin/rebase.c:1117 builtin/revert.c:114
+#: builtin/rebase.c:1145 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
"the commit.\n"
msgstr "以 '%c' 開始的行將被忽略,而空的提交說明將終止提交。\n"
-#: builtin/merge.c:894
+#: builtin/merge.c:900
msgid "Empty commit message."
msgstr "空提交說明。"
-#: builtin/merge.c:909
+#: builtin/merge.c:915
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:970
+#: builtin/merge.c:976
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自動合併失敗,修正衝突然後提交修正的結果。\n"
-#: builtin/merge.c:1009
+#: builtin/merge.c:1015
msgid "No current branch."
msgstr "沒有目前分支。"
-#: builtin/merge.c:1011
+#: builtin/merge.c:1017
msgid "No remote for the current branch."
msgstr "目前分支沒有對應的遠端版本庫。"
-#: builtin/merge.c:1013
+#: builtin/merge.c:1019
msgid "No default upstream defined for the current branch."
msgstr "目前分支沒有定義預設的上游分支。"
-#: builtin/merge.c:1018
+#: builtin/merge.c:1024
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支"
-#: builtin/merge.c:1075
+#: builtin/merge.c:1081
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'"
-#: builtin/merge.c:1177
+#: builtin/merge.c:1183
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合併:%s"
-#: builtin/merge.c:1211
+#: builtin/merge.c:1217
msgid "not something we can merge"
msgstr "不能合併"
-#: builtin/merge.c:1324
+#: builtin/merge.c:1330
msgid "--abort expects no arguments"
msgstr "--abort 不帶參數"
-#: builtin/merge.c:1328
+#: builtin/merge.c:1334
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "沒有要終止的合併(MERGE_HEAD 遺失)。"
-#: builtin/merge.c:1346
+#: builtin/merge.c:1352
msgid "--quit expects no arguments"
msgstr "--quit 不帶參數"
-#: builtin/merge.c:1359
+#: builtin/merge.c:1365
msgid "--continue expects no arguments"
msgstr "--continue 不帶參數"
-#: builtin/merge.c:1363
+#: builtin/merge.c:1369
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "沒有進行中的合併(MERGE_HEAD 遺失)。"
-#: builtin/merge.c:1379
+#: builtin/merge.c:1385
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"您尚未結束您的合併(存在 MERGE_HEAD)。\n"
"請在合併前先提交您的修改。"
-#: builtin/merge.c:1386
+#: builtin/merge.c:1392
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"您尚未結束您的揀選(存在 CHERRY_PICK_HEAD)。\n"
"請在合併前先提交您的修改。"
-#: builtin/merge.c:1389
+#: builtin/merge.c:1395
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未結束您的揀選(存在 CHERRY_PICK_HEAD)。"
-#: builtin/merge.c:1421
+#: builtin/merge.c:1427
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交並且 merge.defaultToUpstream 未設定。"
-#: builtin/merge.c:1438
+#: builtin/merge.c:1444
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支援到空分支的壓縮提交"
-#: builtin/merge.c:1440
+#: builtin/merge.c:1446
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快轉式提交沒有意義"
-#: builtin/merge.c:1445
+#: builtin/merge.c:1451
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合併"
-#: builtin/merge.c:1447
+#: builtin/merge.c:1453
msgid "Can merge only exactly one commit into empty head"
msgstr "只能將一個提交合並到空分支上"
-#: builtin/merge.c:1534
+#: builtin/merge.c:1540
msgid "refusing to merge unrelated histories"
msgstr "拒絕合併無關的歷史"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1559
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1601
+#: builtin/merge.c:1606
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "嘗試非常小的索引內合併...\n"
-#: builtin/merge.c:1608
+#: builtin/merge.c:1613
#, c-format
msgid "Nope.\n"
msgstr "無。\n"
-#: builtin/merge.c:1667 builtin/merge.c:1733
+#: builtin/merge.c:1671 builtin/merge.c:1737
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "將樹回滾至原始狀態...\n"
-#: builtin/merge.c:1671
+#: builtin/merge.c:1675
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "嘗試合併策略 %s...\n"
-#: builtin/merge.c:1723
+#: builtin/merge.c:1727
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "沒有合併策略處理此合併。\n"
-#: builtin/merge.c:1725
+#: builtin/merge.c:1729
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合併失敗。\n"
-#: builtin/merge.c:1735
+#: builtin/merge.c:1739
#, c-format
msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "使用 %s 策略,準備自行解決。\n"
-#: builtin/merge.c:1749
+#: builtin/merge.c:1753
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自動合併進展順利,按要求在提交前停止\n"
-#: builtin/mktag.c:10
-msgid "git mktag"
-msgstr "git mktag"
-
#: builtin/mktag.c:27
#, c-format
msgid "warning: tag input does not pass fsck: %s"
msgid "object '%s' tagged as '%s', but is a '%s' type"
msgstr "「%s」已標為「%s」,但卻是「%s」類型"
-#: builtin/mktag.c:98
+#: builtin/mktag.c:97
msgid "tag on stdin did not pass our strict fsck check"
msgstr "stdin 上的標籤未通過我們的嚴格 fsck 檢查"
-#: builtin/mktag.c:101
+#: builtin/mktag.c:100
msgid "tag on stdin did not refer to a valid object"
msgstr "標準輸入上的標籤指向的不是有效物件"
-#: builtin/mktag.c:104 builtin/tag.c:242
+#: builtin/mktag.c:103 builtin/tag.c:243
msgid "unable to write tag file"
msgstr "無法寫標籤檔案"
-#: builtin/mktree.c:66
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
-
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "輸入以 NUL 字元終止"
msgid "Renaming %s to %s\n"
msgstr "重新命名 %s 至 %s\n"
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
+#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861
#, c-format
msgid "renaming '%s' failed"
msgstr "重新命名 '%s' 失敗"
-#: builtin/name-rev.c:474
+#: builtin/name-rev.c:524
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<選項>] <提交>..."
-#: builtin/name-rev.c:475
+#: builtin/name-rev.c:525
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<選項>] --all"
-#: builtin/name-rev.c:476
-msgid "git name-rev [<options>] --stdin"
-msgstr "git name-rev [<選項>] --stdin"
+#: builtin/name-rev.c:526
+msgid "git name-rev [<options>] --annotate-stdin"
+msgstr "git name-rev [<options>] --annotate-stdin"
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:583
msgid "print only ref-based names (no object names)"
msgstr "只輸出基於引用的名稱 (沒有物件名稱)"
-#: builtin/name-rev.c:534
+#: builtin/name-rev.c:584
msgid "only use tags to name the commits"
msgstr "只使用標籤來命名提交"
-#: builtin/name-rev.c:536
+#: builtin/name-rev.c:586
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相符合的引用"
-#: builtin/name-rev.c:538
+#: builtin/name-rev.c:588
msgid "ignore refs matching <pattern>"
msgstr "忽略和 <模式> 相符合的引用"
-#: builtin/name-rev.c:540
+#: builtin/name-rev.c:590
msgid "list all commits reachable from all refs"
msgstr "列出可以從所有引用存取的提交"
-#: builtin/name-rev.c:541
-msgid "read from stdin"
-msgstr "å¾\9eæ¨\99æº\96輸å\85¥è®\80å\8f\96"
+#: builtin/name-rev.c:591
+msgid "deprecated: use annotate-stdin instead"
+msgstr "å·²å\8f\96代ï¼\9aè«\8bæ\94¹ç\94¨ annotate-stdin"
-#: builtin/name-rev.c:542
+#: builtin/name-rev.c:592
+msgid "annotate text from stdin"
+msgstr "註解從標準輸入收到的文字"
+
+#: builtin/name-rev.c:593
msgid "allow to print `undefined` names (default)"
msgstr "允許列印 `未定義` 的名稱(預設)"
-#: builtin/name-rev.c:548
+#: builtin/name-rev.c:599
msgid "dereference tags in the input (internal use)"
msgstr "反向解析輸入中的標籤(內部使用)"
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr "git notes [--ref <註解引用>] merge [-v | -q] [-s <策略> ] <註解引用>"
-#: builtin/notes.c:35
-msgid "git notes merge --commit [-v | -q]"
-msgstr "git notes merge --commit [-v | -q]"
-
-#: builtin/notes.c:36
-msgid "git notes merge --abort [-v | -q]"
-msgstr "git notes merge --abort [-v | -q]"
-
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <註解引用>] remove [<物件>...]"
msgid "git notes prune [<options>]"
msgstr "git notes prune [<選項>]"
-#: builtin/notes.c:92
-msgid "git notes get-ref"
-msgstr "git notes get-ref"
-
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "為下面的物件寫/編輯說明:"
msgid "the note contents have been left in %s"
msgstr "註解內容被留在 %s 中"
-#: builtin/notes.c:240 builtin/tag.c:581
+#: builtin/notes.c:240 builtin/tag.c:582
#, c-format
msgid "could not open or read '%s'"
msgstr "不能開啟或讀取 '%s'"
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "拒絕向 %2$s(在 refs/notes/ 之外)%1$s註解"
-#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
-#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
-#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
-msgid "too many arguments"
-msgstr "太多參數"
-
#: builtin/notes.c:387 builtin/notes.c:676
#, c-format
msgid "no note found for object %s."
"自動合併說明失敗。修改 %s 中的衝突並且使用指令 'git notes merge --commit' 提"
"交結果,或者使用指令 'git notes merge --abort' 終止合併。\n"
-#: builtin/notes.c:899 builtin/tag.c:594
+#: builtin/notes.c:899 builtin/tag.c:595
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "無法解析 '%s' 為一個有效引用。"
msgid "read object names from the standard input"
msgstr "從標準輸入讀取物件名稱"
-#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "不刪除,只顯示"
#: builtin/notes.c:957
msgid "report pruned notes"
-msgstr "å ±å\91\8aæ¸\85除的註解"
+msgstr "å\9b\9eå ±å\89ª除的註解"
#: builtin/notes.c:1000
msgid "notes-ref"
msgid "use notes from <notes-ref>"
msgstr "從 <註解引用> 使用註解"
-#: builtin/notes.c:1036 builtin/stash.c:1818
+#: builtin/notes.c:1036 builtin/stash.c:1802
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子指令:%s"
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:570
#, c-format
msgid ""
"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
msgstr ""
"write_reuse_object:無法定位 %1$s,預期在 %3$s 包中的 %2$<PRIuMAX> 偏移量"
-#: builtin/pack-objects.c:580
+#: builtin/pack-objects.c:578
#, c-format
msgid "bad packed object CRC for %s"
msgstr "%s 錯的包物件 CRC"
-#: builtin/pack-objects.c:591
+#: builtin/pack-objects.c:589
#, c-format
msgid "corrupt packed object for %s"
msgstr "%s 損壞的包物件"
-#: builtin/pack-objects.c:722
+#: builtin/pack-objects.c:720
#, c-format
msgid "recursive delta detected for object %s"
msgstr "發現物件 %s 遞迴 delta"
-#: builtin/pack-objects.c:941
+#: builtin/pack-objects.c:939
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "排序了 %u 個物件,預期 %<PRIu32> 個"
-#: builtin/pack-objects.c:1036
+#: builtin/pack-objects.c:1034
#, c-format
msgid "expected object at offset %<PRIuMAX> in pack %s"
msgstr "預期 %2$s 包中的偏移 %1$<PRIuMAX> 有物件"
-#: builtin/pack-objects.c:1160
+#: builtin/pack-objects.c:1158
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "停用 bitmap 寫入,因為 pack.packSizeLimit 設定使得包被切分為多個"
-#: builtin/pack-objects.c:1173
+#: builtin/pack-objects.c:1171
msgid "Writing objects"
msgstr "寫入物件中"
-#: builtin/pack-objects.c:1235 builtin/update-index.c:90
+#: builtin/pack-objects.c:1243 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "對 %s 呼叫 stat 失敗"
-#: builtin/pack-objects.c:1268
+#: builtin/pack-objects.c:1276
msgid "failed to write bitmap index"
msgstr "無法寫入位圖索引"
-#: builtin/pack-objects.c:1294
+#: builtin/pack-objects.c:1302
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個"
-#: builtin/pack-objects.c:1536
+#: builtin/pack-objects.c:1544
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "停用 bitmap 寫入,因為一些物件將不會被打包"
-#: builtin/pack-objects.c:1984
+#: builtin/pack-objects.c:1992
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 壓縮中 delta 基準位移越界"
-#: builtin/pack-objects.c:1993
+#: builtin/pack-objects.c:2001
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基準位移越界"
-#: builtin/pack-objects.c:2274
+#: builtin/pack-objects.c:2282
msgid "Counting objects"
msgstr "物件計數中"
-#: builtin/pack-objects.c:2439
+#: builtin/pack-objects.c:2447
#, c-format
msgid "unable to parse object header of %s"
msgstr "無法解析物件 %s 標頭訊息"
-#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
-#: builtin/pack-objects.c:2535
+#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533
+#: builtin/pack-objects.c:2543
#, c-format
msgid "object %s cannot be read"
msgstr "物件 %s 無法讀取"
-#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
+#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "物件 %s 不一致的物件長度(%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2549
+#: builtin/pack-objects.c:2557
msgid "suboptimal pack - out of memory"
msgstr "次優(suboptimal)打包 - 記憶體不足"
-#: builtin/pack-objects.c:2864
+#: builtin/pack-objects.c:2872
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 個執行緒進行壓縮"
-#: builtin/pack-objects.c:3003
+#: builtin/pack-objects.c:3011
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "無法為標籤 %s 壓縮物件"
-#: builtin/pack-objects.c:3089
+#: builtin/pack-objects.c:3097
msgid "Compressing objects"
msgstr "壓縮物件中"
-#: builtin/pack-objects.c:3095
+#: builtin/pack-objects.c:3103
msgid "inconsistency with delta count"
msgstr "不一致的差異計數"
-#: builtin/pack-objects.c:3174
+#: builtin/pack-objects.c:3182
#, c-format
msgid ""
"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
"uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> "
"<uri>' (收到 '%s')"
-#: builtin/pack-objects.c:3177
+#: builtin/pack-objects.c:3185
#, c-format
msgid ""
"object already configured in another uploadpack.blobpackfileuri (got '%s')"
msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')"
-#: builtin/pack-objects.c:3212
+#: builtin/pack-objects.c:3220
#, c-format
msgid "could not get type of object %s in pack %s"
msgstr "無法取得 %2$s 包中 %1$s 物件的類型"
-#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
-#: builtin/pack-objects.c:3365
+#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359
+#: builtin/pack-objects.c:3373
#, c-format
msgid "could not find pack '%s'"
msgstr "找不到「%s」包"
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3416
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
"預期邊界物件(edge object)ID,卻得到垃圾資料:\n"
" %s"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3422
#, c-format
msgid ""
"expected object ID, got garbage:\n"
"預期物件 ID,卻得到垃圾資料:\n"
" %s"
-#: builtin/pack-objects.c:3507
-msgid "invalid value for --missing"
-msgstr "選項 --missing 的值無效"
-
-#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
+#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627
msgid "cannot open pack index"
msgstr "無法開啟包檔案索引"
-#: builtin/pack-objects.c:3541
+#: builtin/pack-objects.c:3549
#, c-format
msgid "loose object at %s could not be examined"
msgstr "無法檢查 %s 處的鬆散物件"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3635
msgid "unable to force loose object"
msgstr "無法強制鬆散物件"
-#: builtin/pack-objects.c:3757
+#: builtin/pack-objects.c:3763
#, c-format
msgid "not a rev '%s'"
msgstr "不是一個版本 '%s'"
-#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
+#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061
#, c-format
msgid "bad revision '%s'"
msgstr "壞的版本 '%s'"
-#: builtin/pack-objects.c:3788
+#: builtin/pack-objects.c:3794
msgid "unable to add recent objects"
msgstr "無法新增最近的物件"
-#: builtin/pack-objects.c:3841
+#: builtin/pack-objects.c:3847
#, c-format
msgid "unsupported index version %s"
msgstr "不支援的索引版本 %s"
-#: builtin/pack-objects.c:3845
+#: builtin/pack-objects.c:3851
#, c-format
msgid "bad index version '%s'"
msgstr "壞的索引版本 '%s'"
-#: builtin/pack-objects.c:3884
+#: builtin/pack-objects.c:3907
msgid "<version>[,<offset>]"
msgstr "<版本>[,<位移>]"
-#: builtin/pack-objects.c:3885
+#: builtin/pack-objects.c:3908
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本來寫包索引檔案"
-#: builtin/pack-objects.c:3888
+#: builtin/pack-objects.c:3911
msgid "maximum size of each output pack file"
msgstr "每個輸出包的最大尺寸"
-#: builtin/pack-objects.c:3890
+#: builtin/pack-objects.c:3913
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略從備用物件儲存裡借用物件"
-#: builtin/pack-objects.c:3892
+#: builtin/pack-objects.c:3915
msgid "ignore packed objects"
msgstr "忽略包物件"
-#: builtin/pack-objects.c:3894
+#: builtin/pack-objects.c:3917
msgid "limit pack window by objects"
msgstr "限制打包視窗的物件數"
-#: builtin/pack-objects.c:3896
+#: builtin/pack-objects.c:3919
msgid "limit pack window by memory in addition to object limit"
msgstr "除物件數量限制外設定打包視窗的記憶體限制"
-#: builtin/pack-objects.c:3898
+#: builtin/pack-objects.c:3921
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允許的 delta 鏈的最大長度"
-#: builtin/pack-objects.c:3900
+#: builtin/pack-objects.c:3923
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:3902
+#: builtin/pack-objects.c:3925
msgid "reuse existing objects"
msgstr "重用已存在的物件"
-#: builtin/pack-objects.c:3904
+#: builtin/pack-objects.c:3927
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 物件"
-#: builtin/pack-objects.c:3906
+#: builtin/pack-objects.c:3929
msgid "use threads when searching for best delta matches"
msgstr "使用執行緒查詢最佳 delta 符合"
-#: builtin/pack-objects.c:3908
+#: builtin/pack-objects.c:3931
msgid "do not create an empty pack output"
msgstr "不建立空的包輸出"
-#: builtin/pack-objects.c:3910
+#: builtin/pack-objects.c:3933
msgid "read revision arguments from standard input"
msgstr "從標準輸入讀取版本號參數"
-#: builtin/pack-objects.c:3912
+#: builtin/pack-objects.c:3935
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的物件"
-#: builtin/pack-objects.c:3915
+#: builtin/pack-objects.c:3938
msgid "include objects reachable from any reference"
msgstr "包括可以從任何引用存取到的物件"
-#: builtin/pack-objects.c:3918
+#: builtin/pack-objects.c:3941
msgid "include objects referred by reflog entries"
msgstr "包括被引用日誌引用到的物件"
-#: builtin/pack-objects.c:3921
+#: builtin/pack-objects.c:3944
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的物件"
-#: builtin/pack-objects.c:3924
+#: builtin/pack-objects.c:3947
msgid "read packs from stdin"
msgstr "從標準輸入中讀取包"
-#: builtin/pack-objects.c:3926
+#: builtin/pack-objects.c:3949
msgid "output pack to stdout"
msgstr "輸出包到標準輸出"
-#: builtin/pack-objects.c:3928
+#: builtin/pack-objects.c:3951
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包物件的標籤物件"
-#: builtin/pack-objects.c:3930
+#: builtin/pack-objects.c:3953
msgid "keep unreachable objects"
msgstr "維持無法取得的物件"
-#: builtin/pack-objects.c:3932
+#: builtin/pack-objects.c:3955
msgid "pack loose unreachable objects"
msgstr "打包鬆散的無法取得物件"
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:3957
msgid "unpack unreachable objects newer than <time>"
msgstr "將比提供 <時間> 新的無法存取的物件解包"
-#: builtin/pack-objects.c:3937
+#: builtin/pack-objects.c:3960
msgid "use the sparse reachability algorithm"
msgstr "使用稀疏可以取得性演算法"
-#: builtin/pack-objects.c:3939
+#: builtin/pack-objects.c:3962
msgid "create thin packs"
msgstr "建立精簡包"
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:3964
msgid "create packs suitable for shallow fetches"
msgstr "建立適合淺複製版本庫取得的包"
-#: builtin/pack-objects.c:3943
+#: builtin/pack-objects.c:3966
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 檔案的包"
-#: builtin/pack-objects.c:3945
+#: builtin/pack-objects.c:3968
msgid "ignore this pack"
msgstr "忽略該 pack"
-#: builtin/pack-objects.c:3947
+#: builtin/pack-objects.c:3970
msgid "pack compression level"
msgstr "打包壓縮級別"
-#: builtin/pack-objects.c:3949
+#: builtin/pack-objects.c:3972
msgid "do not hide commits by grafts"
msgstr "顯示被移植隱藏的提交"
-#: builtin/pack-objects.c:3951
+#: builtin/pack-objects.c:3974
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引(如果有的話)以提高物件計數時的速度"
-#: builtin/pack-objects.c:3953
+#: builtin/pack-objects.c:3976
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同時建立 bitmap 索引"
-#: builtin/pack-objects.c:3957
+#: builtin/pack-objects.c:3980
msgid "write a bitmap index if possible"
msgstr "如果可能,寫 bitmap 索引"
-#: builtin/pack-objects.c:3961
+#: builtin/pack-objects.c:3984
msgid "handling for missing objects"
msgstr "處理遺失的物件"
-#: builtin/pack-objects.c:3964
+#: builtin/pack-objects.c:3987
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor packfile 中的物件"
-#: builtin/pack-objects.c:3966
+#: builtin/pack-objects.c:3989
msgid "respect islands during delta compression"
msgstr "在差異壓縮時尊重資料島"
-#: builtin/pack-objects.c:3968
+#: builtin/pack-objects.c:3991
msgid "protocol"
msgstr "通訊協定"
-#: builtin/pack-objects.c:3969
+#: builtin/pack-objects.c:3992
msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
msgstr "排除任何設定過,使用此通訊協定的 uploadpack.blobpackfileuri"
-#: builtin/pack-objects.c:4002
+#: builtin/pack-objects.c:4027
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量鏈深度 %d 太深了,強制為 %d"
-#: builtin/pack-objects.c:4007
+#: builtin/pack-objects.c:4032
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "設定 pack.deltaCacheLimit 太高了,強制為 %d"
-#: builtin/pack-objects.c:4063
+#: builtin/pack-objects.c:4088
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "不能使用 --max-pack-size 來組建傳輸用的包檔案"
-#: builtin/pack-objects.c:4065
+#: builtin/pack-objects.c:4090
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包檔案大小是 1 MiB"
-#: builtin/pack-objects.c:4070
+#: builtin/pack-objects.c:4095
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用於建立一個可索引包"
-#: builtin/pack-objects.c:4079
+#: builtin/pack-objects.c:4104
msgid "cannot use --filter without --stdout"
msgstr "不能在沒有 --stdout 的情況下使用 --filter"
-#: builtin/pack-objects.c:4081
+#: builtin/pack-objects.c:4106
msgid "cannot use --filter with --stdin-packs"
msgstr "無法將 --filter 及 --stdin-packs 結合使用"
-#: builtin/pack-objects.c:4085
+#: builtin/pack-objects.c:4110
msgid "cannot use internal rev list with --stdin-packs"
msgstr "無法將內部版本清單與 --stdin-packs 結合使用"
-#: builtin/pack-objects.c:4144
+#: builtin/pack-objects.c:4169
msgid "Enumerating objects"
msgstr "枚舉物件"
-#: builtin/pack-objects.c:4180
+#: builtin/pack-objects.c:4210
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
-msgstr "清除鬆散的引用(預設)"
-
-#: builtin/prune-packed.c:6
-msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
-msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr "剪除鬆散引用(預設)"
#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
#: builtin/prune.c:145
msgid "report pruned objects"
-msgstr "å ±å\91\8aæ¸\85除的物件"
+msgstr "å\9b\9eå ±å\89ª除的物件"
#: builtin/prune.c:148
msgid "expire objects older than <time>"
#: builtin/prune.c:163
msgid "cannot prune in a precious-objects repo"
-msgstr "不能在珍品版本庫中執行清理動作"
-
-#: builtin/pull.c:45 builtin/pull.c:47
-#, c-format
-msgid "Invalid value for %s: %s"
-msgstr "%s 的值無效:%s"
+msgstr "不能在珍品版本庫中執行剪除動作"
#: builtin/pull.c:67
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgid "control use of pre-merge-commit and commit-msg hooks"
msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用"
-#: builtin/pull.c:171 parse-options.h:340
+#: builtin/pull.c:171 parse-options.h:371
msgid "automatically stash/stash pop before and after"
msgstr "在動作前後執行自動儲藏和彈出儲藏"
msgid "number of submodules pulled in parallel"
msgstr "並行拉取的子模組數量"
-#: builtin/pull.c:321
-#, c-format
-msgid "Invalid value for pull.ff: %s"
-msgstr "pull.ff 的取值無效:%s"
-
#: builtin/pull.c:449
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"您要求從遠端 '%s' 拉取,但是未指定一個分支。因為這不是目前\n"
"分支預設的遠端版本庫,您必須在指令列中指定一個分支名。"
-#: builtin/pull.c:460 builtin/rebase.c:951
+#: builtin/pull.c:460 builtin/rebase.c:978
msgid "You are not currently on a branch."
msgstr "您目前不在一個分支上。"
msgstr "詳見 git-pull(1)。"
#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
-#: builtin/rebase.c:957
+#: builtin/rebase.c:984
msgid "<remote>"
msgstr "<遠端>"
#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
-#: contrib/scalar/scalar.c:375
+#: contrib/scalar/scalar.c:374
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:475 builtin/rebase.c:949
+#: builtin/pull.c:475 builtin/rebase.c:976
msgid "There is no tracking information for the current branch."
msgstr "目前分支沒有追蹤訊息。"
"pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n"
"設定的預設值。\n"
-#: builtin/pull.c:1046
+#: builtin/pull.c:1047
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未誕生的分支,變更新增至索引。"
-#: builtin/pull.c:1050
+#: builtin/pull.c:1051
msgid "pull with rebase"
msgstr "重定基底式拉取"
-#: builtin/pull.c:1051
+#: builtin/pull.c:1052
msgid "please commit or stash them."
msgstr "請提交或儲藏它們。"
-#: builtin/pull.c:1076
+#: builtin/pull.c:1077
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fetch 更新了目前的分支。快轉您的工作區\n"
"至提交 %s。"
-#: builtin/pull.c:1082
+#: builtin/pull.c:1083
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"$ git reset --hard\n"
"復原之前的狀態。"
-#: builtin/pull.c:1097
+#: builtin/pull.c:1098
msgid "Cannot merge multiple branches into empty head."
msgstr "無法將多個分支合併到空分支。"
-#: builtin/pull.c:1102
+#: builtin/pull.c:1103
msgid "Cannot rebase onto multiple branches."
msgstr "無法重定基底到多個分支。"
-#: builtin/pull.c:1104
+#: builtin/pull.c:1105
msgid "Cannot fast-forward to multiple branches."
msgstr "無法快轉至多個分支。"
-#: builtin/pull.c:1119
+#: builtin/pull.c:1120
msgid "Need to specify how to reconcile divergent branches."
msgstr "需要指定如何調和偏離的分支。"
-#: builtin/pull.c:1133
+#: builtin/pull.c:1134
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本機子模組中有修改,無法重定基底"
msgid "failed to push some refs to '%s'"
msgstr "推送一些引用到 '%s' 失敗"
-#: builtin/push.c:544 builtin/submodule--helper.c:3259
+#: builtin/push.c:544 builtin/submodule--helper.c:3377
msgid "repository"
msgstr "版本庫"
#: builtin/push.c:567
msgid "prune locally removed refs"
-msgstr "清除本機刪除的引用"
+msgstr "剪除本機刪除的引用"
#: builtin/push.c:569
msgid "bypass pre-push hook"
msgid "suppress feedback messages"
msgstr "抑制回饋訊息"
-#: builtin/read-tree.c:183
+#: builtin/read-tree.c:190
msgid "You need to resolve your current index first"
msgstr "您需要先解決目前索引的衝突"
-#: builtin/rebase.c:35
+#: builtin/rebase.c:36
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
"git rebase [-i] [options] [--exec <命令>] [--onto <新基礎> | --keep-base] [<"
"上游> [<分支>]]"
-#: builtin/rebase.c:37
+#: builtin/rebase.c:38
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [選項] [--exec <命令>] [--onto <新基礎>] --root [<分支>]"
-#: builtin/rebase.c:39
-msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-
-#: builtin/rebase.c:230
+#: builtin/rebase.c:231
#, c-format
msgid "could not create temporary %s"
msgstr "無法建立暫時的 %s"
-#: builtin/rebase.c:236
+#: builtin/rebase.c:237
msgid "could not mark as interactive"
msgstr "無法標記為互動式"
-#: builtin/rebase.c:289
+#: builtin/rebase.c:290
msgid "could not generate todo list"
msgstr "無法生成待辦列表"
-#: builtin/rebase.c:331
+#: builtin/rebase.c:332
msgid "a base commit must be provided with --upstream or --onto"
msgstr "使用 --upstream 或 --onto 必須提供一個基礎提交"
-#: builtin/rebase.c:390
+#: builtin/rebase.c:391
#, c-format
msgid "%s requires the merge backend"
msgstr "%s 需要合併後端"
-#: builtin/rebase.c:432
+#: builtin/rebase.c:433
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "無法取得 'onto':'%s'"
-#: builtin/rebase.c:449
+#: builtin/rebase.c:450
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "無效的原始 head:'%s'"
-#: builtin/rebase.c:474
+#: builtin/rebase.c:475
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略無效的 allow_rerere_autoupdate:'%s'"
-#: builtin/rebase.c:597
+#: builtin/rebase.c:600
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"\"git rebase --skip\" 指令略過這個提交。如果想要終止執行並回到\n"
"\"git rebase\" 執行之前的狀態,執行 \"git rebase --abort\"。"
-#: builtin/rebase.c:680
+#: builtin/rebase.c:685
#, c-format
msgid ""
"\n"
"\n"
"因此 git 無法對其重定基底。"
-#: builtin/rebase.c:925
+#: builtin/rebase.c:836
+#, c-format
+msgid "could not switch to %s"
+msgstr "無法切換到 %s"
+
+#: builtin/rebase.c:952
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr "無法識別的 '%s' 空類型;有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。"
-#: builtin/rebase.c:943
+#: builtin/rebase.c:970
#, c-format
msgid ""
"%s\n"
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:959
+#: builtin/rebase.c:986
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:989
+#: builtin/rebase.c:1016
msgid "exec commands cannot contain newlines"
msgstr "exec 指令不能包含換行符號"
-#: builtin/rebase.c:993
+#: builtin/rebase.c:1020
msgid "empty exec command"
msgstr "空的 exec 指令"
-#: builtin/rebase.c:1023
+#: builtin/rebase.c:1051
msgid "rebase onto given branch instead of upstream"
msgstr "重定基底到提供的分支而非上游"
-#: builtin/rebase.c:1025
+#: builtin/rebase.c:1053
msgid "use the merge-base of upstream and branch as the current base"
msgstr "使用上游和分支的合併基礎做為目前基礎"
-#: builtin/rebase.c:1027
+#: builtin/rebase.c:1055
msgid "allow pre-rebase hook to run"
msgstr "允許執行 pre-rebase 掛鉤"
-#: builtin/rebase.c:1029
+#: builtin/rebase.c:1057
msgid "be quiet. implies --no-stat"
msgstr "安靜。暗示 --no-stat"
-#: builtin/rebase.c:1032
+#: builtin/rebase.c:1060
msgid "display a diffstat of what changed upstream"
msgstr "顯示上游變化的差異統計"
-#: builtin/rebase.c:1035
+#: builtin/rebase.c:1063
msgid "do not show diffstat of what changed upstream"
msgstr "不顯示上游變化的差異統計"
-#: builtin/rebase.c:1038
+#: builtin/rebase.c:1066
msgid "add a Signed-off-by trailer to each commit"
msgstr "在每個提交結尾加入 Signed-off-by"
-#: builtin/rebase.c:1041
+#: builtin/rebase.c:1069
msgid "make committer date match author date"
msgstr "使提交日期與製作日期相符合"
-#: builtin/rebase.c:1043
+#: builtin/rebase.c:1071
msgid "ignore author date and use current date"
msgstr "忽略製作日期而使用日前日期"
-#: builtin/rebase.c:1045
+#: builtin/rebase.c:1073
msgid "synonym of --reset-author-date"
msgstr "和 --reset-author-date 同義"
-#: builtin/rebase.c:1047 builtin/rebase.c:1051
+#: builtin/rebase.c:1075 builtin/rebase.c:1079
msgid "passed to 'git apply'"
msgstr "傳遞給 'git apply'"
-#: builtin/rebase.c:1049
+#: builtin/rebase.c:1077
msgid "ignore changes in whitespace"
msgstr "忽略空白字元中的變更"
-#: builtin/rebase.c:1053 builtin/rebase.c:1056
+#: builtin/rebase.c:1081 builtin/rebase.c:1084
msgid "cherry-pick all commits, even if unchanged"
msgstr "揀選所有提交,即使未修改"
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:1086
msgid "continue"
msgstr "繼續"
-#: builtin/rebase.c:1061
+#: builtin/rebase.c:1089
msgid "skip current patch and continue"
msgstr "略過目前修補檔並繼續"
# 譯者:請維持前導空格
-#: builtin/rebase.c:1063
+#: builtin/rebase.c:1091
msgid "abort and check out the original branch"
msgstr "終止並簽出原有分支"
-#: builtin/rebase.c:1066
+#: builtin/rebase.c:1094
msgid "abort but keep HEAD where it is"
msgstr "終止但保持 HEAD 不變"
-#: builtin/rebase.c:1067
+#: builtin/rebase.c:1095
msgid "edit the todo list during an interactive rebase"
msgstr "在互動式重定基底中編輯待辦列表"
-#: builtin/rebase.c:1070
+#: builtin/rebase.c:1098
msgid "show the patch file being applied or merged"
msgstr "顯示正在套用或合併的修補檔案"
-#: builtin/rebase.c:1073
+#: builtin/rebase.c:1101
msgid "use apply strategies to rebase"
msgstr "使用套用策略進行重定基底"
-#: builtin/rebase.c:1077
+#: builtin/rebase.c:1105
msgid "use merging strategies to rebase"
msgstr "使用合併策略進行重定基底"
-#: builtin/rebase.c:1081
+#: builtin/rebase.c:1109
msgid "let the user edit the list of commits to rebase"
msgstr "讓使用者編輯要重定基底的提交列表"
-#: builtin/rebase.c:1085
+#: builtin/rebase.c:1113
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(已棄用)嘗試重建合併提交而非忽略它們"
-#: builtin/rebase.c:1090
+#: builtin/rebase.c:1118
msgid "how to handle commits that become empty"
msgstr "處理空白提交的方式"
-#: builtin/rebase.c:1093
+#: builtin/rebase.c:1121
msgid "keep commits which start empty"
msgstr "保留開頭是空白的提交"
-#: builtin/rebase.c:1097
+#: builtin/rebase.c:1125
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 互動模式下,移動以 squash!/fixup! 開頭的提交"
-#: builtin/rebase.c:1104
+#: builtin/rebase.c:1132
msgid "add exec lines after each commit of the editable list"
msgstr "可編輯列表的每一個提交下面增加一行 exec"
-#: builtin/rebase.c:1108
+#: builtin/rebase.c:1136
msgid "allow rebasing commits with empty messages"
msgstr "允許針對空提交說明的提交重定基底"
-#: builtin/rebase.c:1112
+#: builtin/rebase.c:1140
msgid "try to rebase merges instead of skipping them"
msgstr "嘗試對合併提交重定基底而不是忽略它們"
-#: builtin/rebase.c:1115
+#: builtin/rebase.c:1143
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 來最佳化上游"
-#: builtin/rebase.c:1117
+#: builtin/rebase.c:1145
msgid "use the given merge strategy"
msgstr "使用提供的合併策略"
-#: builtin/rebase.c:1119 builtin/revert.c:115
+#: builtin/rebase.c:1147 builtin/revert.c:115
msgid "option"
msgstr "選項"
-#: builtin/rebase.c:1120
+#: builtin/rebase.c:1148
msgid "pass the argument through to the merge strategy"
msgstr "將參數傳遞給合併策略"
-#: builtin/rebase.c:1123
+#: builtin/rebase.c:1151
msgid "rebase all reachable commits up to the root(s)"
msgstr "將所有可以取得的提交重定基底到根提交"
-#: builtin/rebase.c:1126
+#: builtin/rebase.c:1154
msgid "automatically re-schedule any `exec` that fails"
msgstr "自動重新安排任何失敗的 `exec`"
-#: builtin/rebase.c:1128
+#: builtin/rebase.c:1156
msgid "apply all changes, even those already present upstream"
msgstr "即使已提供上游,仍套用所有變更"
-#: builtin/rebase.c:1149
+#: builtin/rebase.c:1177
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起來 'git am' 正在執行中。無法重定基底。"
-#: builtin/rebase.c:1180
+#: builtin/rebase.c:1208
msgid "--preserve-merges was replaced by --rebase-merges"
msgstr "--preserve-merges 已經被 --rebase-merges 取代"
-#: builtin/rebase.c:1202
+#: builtin/rebase.c:1230
msgid "No rebase in progress?"
msgstr "沒有正在進行的重定基底?"
-#: builtin/rebase.c:1206
+#: builtin/rebase.c:1234
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。"
-#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
+#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122
msgid "Cannot read HEAD"
msgstr "不能讀取 HEAD"
-#: builtin/rebase.c:1241
+#: builtin/rebase.c:1269
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
"您必須編輯所有的合併衝突,然後透過 git add\n"
"指令將它們標記為已解決"
-#: builtin/rebase.c:1260
+#: builtin/rebase.c:1287
msgid "could not discard worktree changes"
msgstr "無法捨棄工作區變更"
-#: builtin/rebase.c:1279
+#: builtin/rebase.c:1308
#, c-format
msgid "could not move back to %s"
msgstr "無法移回 %s"
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1354
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"\t%s\n"
"然後再重新執行。 為避免遺失重要資料,我已經停止目前動作。\n"
-#: builtin/rebase.c:1353
+#: builtin/rebase.c:1382
msgid "switch `C' expects a numerical value"
msgstr "開關 `C' 期望一個數字值"
-#: builtin/rebase.c:1395
+#: builtin/rebase.c:1424
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式:%s"
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1463
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1492
msgid "apply options and merge options cannot be used together"
msgstr "套用選項與合併選項不得同時使用"
-#: builtin/rebase.c:1476
+#: builtin/rebase.c:1505
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "未知 rebase 後端:%s"
-#: builtin/rebase.c:1505
+#: builtin/rebase.c:1534
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1565
#, c-format
msgid "invalid upstream '%s'"
msgstr "無效的上游 '%s'"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1571
msgid "Could not create new root commit"
msgstr "不能建立新的根提交"
-#: builtin/rebase.c:1568
+#: builtin/rebase.c:1597
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s':只需要與分支的一個合併基礎"
-#: builtin/rebase.c:1571
+#: builtin/rebase.c:1600
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s':只需要一個合併基礎"
-#: builtin/rebase.c:1580
+#: builtin/rebase.c:1609
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "沒有指向一個有效的提交 '%s'"
-#: builtin/rebase.c:1607
+#: builtin/rebase.c:1636
#, c-format
msgid "no such branch/commit '%s'"
msgstr "沒有此分支/提交 '%s'"
-#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2659
+#: builtin/rebase.c:1647 builtin/submodule--helper.c:43
+#: builtin/submodule--helper.c:2477
#, c-format
msgid "No such ref: %s"
msgstr "沒有這樣的引用:%s"
-#: builtin/rebase.c:1629
+#: builtin/rebase.c:1658
msgid "Could not resolve HEAD to a revision"
msgstr "無法將 HEAD 解析為一個版本"
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1679
msgid "Please commit or stash them."
msgstr "請提交或儲藏修改。"
-#: builtin/rebase.c:1686
-#, c-format
-msgid "could not switch to %s"
-msgstr "無法切換到 %s"
-
-#: builtin/rebase.c:1697
+#: builtin/rebase.c:1714
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:1699
+#: builtin/rebase.c:1716
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "目前分支 %s 是最新的。\n"
-#: builtin/rebase.c:1707
+#: builtin/rebase.c:1724
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的,強制重定基底。"
-#: builtin/rebase.c:1709
+#: builtin/rebase.c:1726
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "目前分支 %s 是最新的,強制重定基底。\n"
-#: builtin/rebase.c:1717
+#: builtin/rebase.c:1734
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 掛鉤拒絕了重定基底動作。"
-#: builtin/rebase.c:1724
+#: builtin/rebase.c:1741
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的變更:\n"
-#: builtin/rebase.c:1727
+#: builtin/rebase.c:1744
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "從 %s 到 %s 的變更:\n"
-#: builtin/rebase.c:1752
+#: builtin/rebase.c:1769
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先,還原開頭指標以便在其上重放您的工作...\n"
-#: builtin/rebase.c:1761
+#: builtin/rebase.c:1781
msgid "Could not detach HEAD"
msgstr "無法分離開頭指標"
-#: builtin/rebase.c:1770
+#: builtin/rebase.c:1790
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快轉 %s 到 %s。\n"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <版本庫目錄>"
-#: builtin/receive-pack.c:1275
+#: builtin/receive-pack.c:1263
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"若要封鎖此訊息且保持預設行為,設定 'receive.denyCurrentBranch'\n"
"設定變數為 'refuse'。"
-#: builtin/receive-pack.c:1295
+#: builtin/receive-pack.c:1283
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"若要封鎖此訊息,您可以設定它為 'refuse'。"
-#: builtin/receive-pack.c:2474
+#: builtin/receive-pack.c:2476
msgid "quiet"
msgstr "靜默模式"
-#: builtin/receive-pack.c:2489
+#: builtin/receive-pack.c:2491
msgid "you must specify a directory"
msgstr "您必須指定目錄"
-#: builtin/reflog.c:17
+#: builtin/reflog.c:9
+msgid "git reflog [show] [<log-options>] [<ref>]"
+msgstr "git reflog [show] [<log-options>] [<ref>]"
+
+#: builtin/reflog.c:12
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
msgstr ""
-"git reflog expire [--expire=<時間>] [--expire-unreachable=<時間>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
-"用>..."
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
+" [--rewrite] [--updateref] [--stale-fix]\n"
+" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
+"<refs>...]"
-#: builtin/reflog.c:22
+#: builtin/reflog.c:17
msgid ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
-"<refs>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
msgstr ""
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
-"用>..."
+"git reflog delete [--rewrite] [--updateref]\n"
+" [--dry-run | -n] [--verbose] <ref>@{<specifier>}..."
-#: builtin/reflog.c:25
+#: builtin/reflog.c:21
msgid "git reflog exists <ref>"
msgstr "git reflog exists <引用>"
-#: builtin/reflog.c:585 builtin/reflog.c:590
+#: builtin/reflog.c:197 builtin/reflog.c:211
#, c-format
-msgid "'%s' is not a valid timestamp"
-msgstr "'%s' 不是一個有效的時間戳"
+msgid "invalid timestamp '%s' given to '--%s'"
+msgstr "傳入「--%s」的時間戳「%s」無效"
+
+#: builtin/reflog.c:240 builtin/reflog.c:359
+msgid "do not actually prune any entries"
+msgstr "不實際剪除任何項目"
-#: builtin/reflog.c:631
+#: builtin/reflog.c:243 builtin/reflog.c:362
+msgid ""
+"rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"
+msgstr "將舊的 SHA1 重寫為現在比它早的新 SHA1"
+
+#: builtin/reflog.c:246 builtin/reflog.c:365
+msgid "update the reference to the value of the top reflog entry"
+msgstr "更新引用至首個引用日誌項目的值"
+
+#: builtin/reflog.c:248 builtin/reflog.c:367
+msgid "print extra information on screen"
+msgstr "在螢幕上輸出額外資訊"
+
+#: builtin/reflog.c:249 builtin/reflog.c:253
+msgid "timestamp"
+msgstr "時間戳"
+
+#: builtin/reflog.c:250
+msgid "prune entries older than the specified time"
+msgstr "剪除舊於指定時間的項目"
+
+#: builtin/reflog.c:254
+msgid ""
+"prune entries older than <time> that are not reachable from the current tip "
+"of the branch"
+msgstr "剪除早於 <time> 且不能從分支目前開頭到達的項目"
+
+#: builtin/reflog.c:258
+msgid "prune any reflog entries that point to broken commits"
+msgstr "剪除任何指向損壞提交的引用日誌項目"
+
+#: builtin/reflog.c:259
+msgid "process the reflogs of all references"
+msgstr "處理所有引用的 reflog"
+
+#: builtin/reflog.c:261
+msgid "limits processing to reflogs from the current worktree only"
+msgstr "限制只處理目前工作區的引用日誌"
+
+#: builtin/reflog.c:294
#, c-format
msgid "Marking reachable objects..."
msgstr "正在標記可以取得物件..."
-#: builtin/reflog.c:675
+#: builtin/reflog.c:338
#, c-format
msgid "%s points nowhere!"
msgstr "%s 指向不存在!"
-#: builtin/reflog.c:731
+#: builtin/reflog.c:374
msgid "no reflog specified to delete"
msgstr "未指定要刪除的引用日誌"
-#: builtin/reflog.c:742
-#, c-format
-msgid "not a reflog: %s"
-msgstr "不是一個引用日誌:%s"
-
-#: builtin/reflog.c:747
-#, c-format
-msgid "no reflog for '%s'"
-msgstr "沒有 '%s' 的引用日誌"
-
-#: builtin/reflog.c:794
+#: builtin/reflog.c:396
#, c-format
msgid "invalid ref format: %s"
msgstr "無效的引用格式:%s"
-#: builtin/reflog.c:803
-msgid "git reflog [ show | expire | delete | exists ]"
-msgstr "git reflog [ show | expire | delete | exists ]"
-
-#: builtin/remote.c:17
-msgid "git remote [-v | --verbose]"
-msgstr "git remote [-v | --verbose]"
-
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <名稱> <位址>"
-#: builtin/remote.c:19 builtin/remote.c:39
-msgid "git remote rename <old> <new>"
-msgstr "git remote rename <舊名稱> <新名稱>"
+#: builtin/remote.c:20 builtin/remote.c:40
+msgid "git remote rename [--[no-]progress] <old> <new>"
+msgstr "git remote rename [--[no-]progress] <old> <new>"
-#: builtin/remote.c:20 builtin/remote.c:44
+#: builtin/remote.c:21 builtin/remote.c:45
msgid "git remote remove <name>"
msgstr "git remote remove <名稱>"
-#: builtin/remote.c:21 builtin/remote.c:49
+#: builtin/remote.c:22 builtin/remote.c:50
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <名稱> (-a | --auto | -d | --delete | <分支>)"
-#: builtin/remote.c:22
+#: builtin/remote.c:23
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <名稱>"
-#: builtin/remote.c:23
+#: builtin/remote.c:24
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <名稱>"
-#: builtin/remote.c:24
+#: builtin/remote.c:25
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr "git remote [-v | --verbose] update [-p | --prune] [(<組> | <遠端>)...]"
-#: builtin/remote.c:25
+#: builtin/remote.c:26
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <名稱> <分支>..."
-#: builtin/remote.c:26 builtin/remote.c:75
+#: builtin/remote.c:27 builtin/remote.c:76
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <名稱>"
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <名稱> <新的位址> [<舊的位址>]"
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <名稱> <新的位址>"
-#: builtin/remote.c:29 builtin/remote.c:82
+#: builtin/remote.c:30 builtin/remote.c:83
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <名稱> <位址>"
-#: builtin/remote.c:34
+#: builtin/remote.c:35
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<選項>] <名稱> <位址>"
-#: builtin/remote.c:54
+#: builtin/remote.c:55
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <名稱> <分支>..."
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <名稱> <分支>..."
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<選項>] <名稱>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<選項>] <名稱>"
-#: builtin/remote.c:70
+#: builtin/remote.c:71
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<選項>] [<組> | <遠端>]..."
-#: builtin/remote.c:99
+#: builtin/remote.c:100
#, c-format
msgid "Updating %s"
msgstr "更新 %s 中"
-#: builtin/remote.c:101
+#: builtin/remote.c:102
#, c-format
msgid "Could not fetch %s"
msgstr "不能取得 %s"
-#: builtin/remote.c:131
+#: builtin/remote.c:132
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
"--mirror 選項危險且過時,請使用 --mirror=fetch\n"
"\t 或 --mirror=push"
-#: builtin/remote.c:148
+#: builtin/remote.c:149
#, c-format
msgid "unknown mirror argument: %s"
msgstr "未知的鏡像參數:%s"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "fetch the remote branches"
msgstr "抓取遠端的分支"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "import all tags and associated objects when fetching"
msgstr "抓取時匯入所有的標籤和關聯物件"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "或不抓取任何標籤(--no-tags)"
-#: builtin/remote.c:171
+#: builtin/remote.c:172
msgid "branch(es) to track"
msgstr "追蹤的分支"
-#: builtin/remote.c:172
+#: builtin/remote.c:173
msgid "master branch"
msgstr "master 分支"
-#: builtin/remote.c:174
+#: builtin/remote.c:175
msgid "set up remote as a mirror to push to or fetch from"
msgstr "把遠端設定為用以推送或抓取的鏡像"
-#: builtin/remote.c:186
+#: builtin/remote.c:187
msgid "specifying a master branch makes no sense with --mirror"
msgstr "指定一個 master 分支並使用 --mirror 選項沒有意義"
-#: builtin/remote.c:188
+#: builtin/remote.c:189
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義"
-#: builtin/remote.c:195 builtin/remote.c:705
+#: builtin/remote.c:196 builtin/remote.c:716
#, c-format
msgid "remote %s already exists."
msgstr "遠端 %s 已經存在。"
-#: builtin/remote.c:240
+#: builtin/remote.c:241
#, c-format
msgid "Could not setup master '%s'"
msgstr "無法設定 master '%s'"
-#: builtin/remote.c:322
+#: builtin/remote.c:323
#, c-format
msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
msgstr "branch.%s.rebase=%s 未處理。假設成 'true'"
-#: builtin/remote.c:366
+#: builtin/remote.c:367
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "無法得到引用規格 %s 的取得列表"
-#: builtin/remote.c:460 builtin/remote.c:468
+#: builtin/remote.c:461 builtin/remote.c:469
msgid "(matching)"
msgstr "(符合)"
-#: builtin/remote.c:472
+#: builtin/remote.c:473
msgid "(delete)"
msgstr "(刪除)"
-#: builtin/remote.c:660
+#: builtin/remote.c:664
#, c-format
msgid "could not set '%s'"
msgstr "無法設定 '%s'"
-#: builtin/remote.c:665
+#: builtin/remote.c:669
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
"\t%s:%d\n"
"現命名成不存在的遠端分支 '%s'"
-#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
+#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973
#, c-format
msgid "No such remote: '%s'"
msgstr "沒有此遠端版本庫:'%s'"
-#: builtin/remote.c:715
+#: builtin/remote.c:726
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重新命名設定小節 '%s' 到 '%s'"
-#: builtin/remote.c:735
+#: builtin/remote.c:746
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\t如果必要請手動更新設定。"
-#: builtin/remote.c:775
+#: builtin/remote.c:783
+msgid "Renaming remote references"
+msgstr "正在重新命名遠端引用"
+
+#: builtin/remote.c:794
#, c-format
msgid "deleting '%s' failed"
msgstr "刪除 '%s' 失敗"
-#: builtin/remote.c:809
+#: builtin/remote.c:832
#, c-format
msgid "creating '%s' failed"
msgstr "建立 '%s' 失敗"
-#: builtin/remote.c:887
+#: builtin/remote.c:912
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
"to delete them, use:"
msgstr[0] "注意:ref/remotes 層級之外的一個分支未被移除。要刪除它,使用:"
-#: builtin/remote.c:901
+#: builtin/remote.c:926
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除設定小節 '%s'"
-#: builtin/remote.c:1009
+#: builtin/remote.c:1034
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的(下一次取得將儲存於 remotes/%s)"
-#: builtin/remote.c:1012
+#: builtin/remote.c:1037
msgid " tracked"
msgstr " 已追蹤"
-#: builtin/remote.c:1014
+#: builtin/remote.c:1039
msgid " stale (use 'git remote prune' to remove)"
-msgstr " 過時(使用 'git remote prune' 來移除)"
+msgstr " 過時(使用 'git remote prune' 移除)"
-#: builtin/remote.c:1016
+#: builtin/remote.c:1041
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1057
+#: builtin/remote.c:1082
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "無效的 branch.%s.merge,不能重定基底到一個以上的分支"
-#: builtin/remote.c:1066
+#: builtin/remote.c:1091
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "互動式重定基底到遠端 %s"
-#: builtin/remote.c:1068
+#: builtin/remote.c:1093
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "互動式重定基底(含合併提交)到遠端 %s"
-#: builtin/remote.c:1071
+#: builtin/remote.c:1096
#, c-format
msgid "rebases onto remote %s"
msgstr "重定基底到遠端 %s"
-#: builtin/remote.c:1075
+#: builtin/remote.c:1100
#, c-format
msgid " merges with remote %s"
msgstr " 與遠端 %s 合併"
-#: builtin/remote.c:1078
+#: builtin/remote.c:1103
#, c-format
msgid "merges with remote %s"
msgstr "與遠端 %s 合併"
-#: builtin/remote.c:1081
+#: builtin/remote.c:1106
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和遠端 %s\n"
-#: builtin/remote.c:1124
+#: builtin/remote.c:1149
msgid "create"
msgstr "建立"
-#: builtin/remote.c:1127
+#: builtin/remote.c:1152
msgid "delete"
msgstr "刪除"
-#: builtin/remote.c:1131
+#: builtin/remote.c:1156
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1134
+#: builtin/remote.c:1159
msgid "fast-forwardable"
msgstr "可快轉"
-#: builtin/remote.c:1137
+#: builtin/remote.c:1162
msgid "local out of date"
msgstr "本機已過時"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1169
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 強制推送至 %-*s (%s)"
-#: builtin/remote.c:1147
+#: builtin/remote.c:1172
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1151
+#: builtin/remote.c:1176
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 強制推送至 %s"
-#: builtin/remote.c:1154
+#: builtin/remote.c:1179
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1222
+#: builtin/remote.c:1247
msgid "do not query remotes"
msgstr "不查詢遠端"
-#: builtin/remote.c:1243
+#: builtin/remote.c:1268
#, c-format
msgid "* remote %s"
msgstr "* 遠端 %s"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1269
#, c-format
msgid " Fetch URL: %s"
msgstr " 取得位址:%s"
-#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
+#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423
msgid "(no URL)"
msgstr "(無 URL)"
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1259 builtin/remote.c:1261
+#: builtin/remote.c:1284 builtin/remote.c:1286
#, c-format
msgid " Push URL: %s"
msgstr " 推送位址:%s"
-#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
+#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支:%s"
# 譯者:中文字串拼接,可刪除前導空格
-#: builtin/remote.c:1263
+#: builtin/remote.c:1288
msgid "(not queried)"
msgstr "(未查詢)"
-#: builtin/remote.c:1265
+#: builtin/remote.c:1290
msgid "(unknown)"
msgstr "(未知)"
-#: builtin/remote.c:1269
+#: builtin/remote.c:1294
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支(遠端 HEAD 模糊,可能是下列中的一個):\n"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1306
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " 遠端分支:%s"
# 譯者:中文字串拼接,可刪除前導空格
-#: builtin/remote.c:1284 builtin/remote.c:1310
+#: builtin/remote.c:1309 builtin/remote.c:1335
msgid " (status not queried)"
msgstr " (狀態未查詢)"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1318
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 為 'git pull' 設定的本機分支:"
-#: builtin/remote.c:1301
+#: builtin/remote.c:1326
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本機引用將在 'git push' 時被鏡像"
-#: builtin/remote.c:1307
+#: builtin/remote.c:1332
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 為 'git push' 設定的本機引用%s:"
-#: builtin/remote.c:1328
+#: builtin/remote.c:1353
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根據遠端設定 refs/remotes/<名稱>/HEAD"
-#: builtin/remote.c:1330
+#: builtin/remote.c:1355
msgid "delete refs/remotes/<name>/HEAD"
msgstr "刪除 refs/remotes/<名稱>/HEAD"
-#: builtin/remote.c:1344
+#: builtin/remote.c:1369
msgid "Cannot determine remote HEAD"
msgstr "無法確定遠端 HEAD"
-#: builtin/remote.c:1346
+#: builtin/remote.c:1371
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多個遠端 HEAD 分支。請明確地選擇一個用指令:"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1381
#, c-format
msgid "Could not delete %s"
msgstr "無法刪除 %s"
-#: builtin/remote.c:1364
+#: builtin/remote.c:1389
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一個有效引用:%s"
-#: builtin/remote.c:1366
+#: builtin/remote.c:1391
#, c-format
msgid "Could not setup %s"
msgstr "不能設定 %s"
# 譯者:請維持前導空格
-#: builtin/remote.c:1384
+#: builtin/remote.c:1409
#, c-format
msgid " %s will become dangling!"
msgstr " %s 將成為懸空狀態!"
# 譯者:請維持前導空格
-#: builtin/remote.c:1385
+#: builtin/remote.c:1410
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成為懸空狀態!"
-#: builtin/remote.c:1394
+#: builtin/remote.c:1419
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1395
+#: builtin/remote.c:1420
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: builtin/remote.c:1411
+#: builtin/remote.c:1436
#, c-format
msgid " * [would prune] %s"
-msgstr " * [å°\87å\88ªé\99¤] %s"
+msgstr " * [å°\87å\89ªé\99¤] %s"
-#: builtin/remote.c:1414
+#: builtin/remote.c:1439
#, c-format
msgid " * [pruned] %s"
-msgstr " * [å·²å\88ªé\99¤] %s"
+msgstr " * [å·²å\89ªé\99¤] %s"
-#: builtin/remote.c:1459
+#: builtin/remote.c:1484
msgid "prune remotes after fetching"
-msgstr "抓取後清除遠端"
+msgstr "抓取後剪除遠端"
-#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
+#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674
#, c-format
msgid "No such remote '%s'"
msgstr "沒有此遠端 '%s'"
-#: builtin/remote.c:1541
+#: builtin/remote.c:1566
msgid "add branch"
msgstr "新增分支"
-#: builtin/remote.c:1548
+#: builtin/remote.c:1573
msgid "no remote specified"
msgstr "未指定遠端"
-#: builtin/remote.c:1565
+#: builtin/remote.c:1590
msgid "query push URLs rather than fetch URLs"
msgstr "查詢推送 URL 位址,而非取得 URL 位址"
-#: builtin/remote.c:1567
+#: builtin/remote.c:1592
msgid "return all URLs"
msgstr "返回所有 URL 位址"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1622
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "沒有給遠端版本庫 '%s' 設定 URL"
-#: builtin/remote.c:1623
+#: builtin/remote.c:1648
msgid "manipulate push URLs"
msgstr "動作推送 URLS"
-#: builtin/remote.c:1625
+#: builtin/remote.c:1650
msgid "add URL"
msgstr "新增 URL"
-#: builtin/remote.c:1627
+#: builtin/remote.c:1652
msgid "delete URLs"
msgstr "刪除 URL"
-#: builtin/remote.c:1634
+#: builtin/remote.c:1659
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 無意義"
-#: builtin/remote.c:1675
+#: builtin/remote.c:1700
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "無效的舊 URL 符合範本:%s"
-#: builtin/remote.c:1683
+#: builtin/remote.c:1708
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL:%s"
-#: builtin/remote.c:1685
+#: builtin/remote.c:1710
msgid "Will not delete all non-push URLs"
msgstr "將不會刪除所有非推送 URL 位址"
-#: builtin/remote.c:1702
+#: builtin/remote.c:1727
msgid "be verbose; must be placed before a subcommand"
msgstr "詳細輸出;必須置於子指令之前"
-#: builtin/repack.c:28
+#: builtin/repack.c:29
msgid "git repack [<options>]"
msgstr "git repack [<選項>]"
-#: builtin/repack.c:33
+#: builtin/repack.c:34
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
"增量 repack 和 bitmap 索引不相容。 使用 --no-write-bitmap-index\n"
"或停用 pack.writebitmaps 設定。"
-#: builtin/repack.c:201
+#: builtin/repack.c:206
msgid "could not start pack-objects to repack promisor objects"
msgstr "無法開始 pack-objects 來重新打包 promisor 物件"
-#: builtin/repack.c:275 builtin/repack.c:820
+#: builtin/repack.c:280 builtin/repack.c:824
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack:期望來自 pack-objects 的完整十六進位物件 ID。"
-#: builtin/repack.c:299
+#: builtin/repack.c:304
msgid "could not finish pack-objects to repack promisor objects"
msgstr "無法完成 pack-objects 來重新打包 promisor 物件"
-#: builtin/repack.c:314
+#: builtin/repack.c:319
#, c-format
msgid "cannot open index for %s"
msgstr "無法開啟 %s 的索引"
-#: builtin/repack.c:373
+#: builtin/repack.c:378
#, c-format
msgid "pack %s too large to consider in geometric progression"
msgstr "%s 包太大,以致不能在等比數列中考慮"
-#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
+#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423
#, c-format
msgid "pack %s too large to roll up"
msgstr "%s 包太大,以致不能縮合"
-#: builtin/repack.c:498
+#: builtin/repack.c:503
#, c-format
msgid "could not open tempfile %s for writing"
msgstr "無法開啟 '%s' 暫存檔進行寫入"
-#: builtin/repack.c:516
+#: builtin/repack.c:521
msgid "could not close refs snapshot tempfile"
msgstr "無法關閉 refs 的快照暫存檔"
-#: builtin/repack.c:630
+#: builtin/repack.c:634
msgid "pack everything in a single pack"
msgstr "所有內容打包到一個包檔案中"
-#: builtin/repack.c:632
+#: builtin/repack.c:636
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同,並將無法取得的物件設為鬆散物件"
-#: builtin/repack.c:635
+#: builtin/repack.c:639
msgid "remove redundant packs, and run git-prune-packed"
-msgstr "刪除多餘的包,執行 git-prune-packed"
+msgstr "刪除多餘的包,然後執行 git-prune-packed"
-#: builtin/repack.c:637
+#: builtin/repack.c:641
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta"
-#: builtin/repack.c:639
+#: builtin/repack.c:643
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object"
-#: builtin/repack.c:641
+#: builtin/repack.c:645
msgid "do not run git-update-server-info"
msgstr "不執行 git-update-server-info"
-#: builtin/repack.c:644
+#: builtin/repack.c:648
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --local"
-#: builtin/repack.c:646
+#: builtin/repack.c:650
msgid "write bitmap index"
msgstr "寫 bitmap 索引"
-#: builtin/repack.c:648
+#: builtin/repack.c:652
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --delta-islands"
-#: builtin/repack.c:649
+#: builtin/repack.c:653
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:650
+#: builtin/repack.c:654
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A,不要將早於提供時間的物件過期"
-#: builtin/repack.c:652
+#: builtin/repack.c:656
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ,重新對無法取得物件打包"
-#: builtin/repack.c:654
+#: builtin/repack.c:658
msgid "size of the window used for delta compression"
msgstr "用於增量壓縮的視窗值"
-#: builtin/repack.c:655 builtin/repack.c:661
+#: builtin/repack.c:659 builtin/repack.c:665
msgid "bytes"
msgstr "位元組"
-#: builtin/repack.c:656
+#: builtin/repack.c:660
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似,但限制記憶體大小而非條目數"
-#: builtin/repack.c:658
+#: builtin/repack.c:662
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:660
+#: builtin/repack.c:664
msgid "limits the maximum number of threads"
msgstr "限制最大執行緒數"
-#: builtin/repack.c:662
+#: builtin/repack.c:666
msgid "maximum size of each packfile"
msgstr "每個 packfile 的最大尺寸"
-#: builtin/repack.c:664
+#: builtin/repack.c:668
msgid "repack objects in packs marked with .keep"
msgstr "對標記為 .keep 的包中的物件重新打包"
-#: builtin/repack.c:666
+#: builtin/repack.c:670
msgid "do not repack this pack"
msgstr "不要對該包檔案重新打包"
-#: builtin/repack.c:668
+#: builtin/repack.c:672
msgid "find a geometric progression with factor <N>"
msgstr "尋找因數是 <N> 的等比數列"
-#: builtin/repack.c:670
+#: builtin/repack.c:674
msgid "write a multi-pack index of the resulting packs"
msgstr "寫入結果包的多包索引"
-#: builtin/repack.c:680
+#: builtin/repack.c:684
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能刪除珍品版本庫中的打包檔案"
-#: builtin/repack.c:829
+#: builtin/repack.c:833
msgid "Nothing new to pack."
msgstr "沒有新的要打包。"
-#: builtin/repack.c:859
+#: builtin/repack.c:863
#, c-format
msgid "missing required file: %s"
msgstr "缺少必要檔案:%s"
-#: builtin/repack.c:861
+#: builtin/repack.c:865
#, c-format
msgid "could not unlink: %s"
msgstr "無法取消連結:%s"
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <提交> [<父提交>...]"
-#: builtin/replace.c:25
-msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --convert-graft-file"
-
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <物件>..."
msgstr "HEAD 現在位於 %s"
# 譯者:漢字之間無空格,故刪除%s前後空格
-#: builtin/reset.c:299
+#: builtin/reset.c:304
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合併過程中不能做%s重設動作。"
-#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
-#: builtin/stash.c:704
+#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669
+#: builtin/stash.c:693
msgid "be quiet, only report errors"
msgstr "安靜模式,只報告錯誤"
-#: builtin/reset.c:398
+#: builtin/reset.c:404
+msgid "skip refreshing the index after reset"
+msgstr "重設後略過重新整理索引的步驟"
+
+#: builtin/reset.c:406
msgid "reset HEAD and index"
msgstr "重設 HEAD 和索引"
-#: builtin/reset.c:399
+#: builtin/reset.c:407
msgid "reset only HEAD"
msgstr "只重設 HEAD"
-#: builtin/reset.c:401 builtin/reset.c:403
+#: builtin/reset.c:409 builtin/reset.c:411
msgid "reset HEAD, index and working tree"
msgstr "重設 HEAD、索引和工作區"
-#: builtin/reset.c:405
+#: builtin/reset.c:413
msgid "reset HEAD but keep local changes"
msgstr "重設 HEAD 但儲存本機變更"
-#: builtin/reset.c:411
+#: builtin/reset.c:419
msgid "record only the fact that removed paths will be added later"
msgstr "將刪除的路徑標記為稍後新增"
-#: builtin/reset.c:445
+#: builtin/reset.c:452
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "無法將 '%s' 解析為一個有效的版本。"
-#: builtin/reset.c:453
+#: builtin/reset.c:460
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "無法將 '%s' 解析為一個有效的樹狀物件。"
-#: builtin/reset.c:472
+#: builtin/reset.c:479
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 帶路徑已棄用,而是用 'git reset -- <路徑>'。"
# 譯者:漢字之間無空格,故刪除%s前後空格
-#: builtin/reset.c:474
+#: builtin/reset.c:481
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能帶路徑進行%s重設。"
# 譯者:漢字之間無空格,故刪除%s前後空格
-#: builtin/reset.c:489
+#: builtin/reset.c:496
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能對純版本庫進行%s重設"
-#: builtin/reset.c:520
+#: builtin/reset.c:527
msgid "Unstaged changes after reset:"
msgstr "重設後取消暫存的變更:"
-#: builtin/reset.c:523
+#: builtin/reset.c:530
#, c-format
msgid ""
-"\n"
-"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
-"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
-"to make this the default.\n"
+"It took %.2f seconds to refresh the index after reset. You can use\n"
+"'--no-refresh' to avoid this."
msgstr ""
-"\n"
-"重設後,枚舉未暫存變更花費了 %.2f 秒。 您可以使用 '--quiet' 避免此情況。\n"
-"將設定變數 reset.quiet 設定為 true 可使其成為預設值。\n"
+"重設後花費 %.2f 秒重新整理索引。\n"
+"您可以使用「--no-refresh」避開本步驟。"
-#: builtin/reset.c:541
+#: builtin/reset.c:547
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重設索引檔案至版本 '%s'。"
-#: builtin/reset.c:546
+#: builtin/reset.c:552
msgid "Could not write new index file."
msgstr "不能寫入新的索引檔案。"
-#: builtin/rev-list.c:602
-msgid "object filtering requires --objects"
-msgstr "物件過濾需要 --objects"
-
-#: builtin/rev-list.c:674
+#: builtin/rev-list.c:659
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支援顯示註解"
-#: builtin/rev-list.c:679
+#: builtin/rev-list.c:664
#, c-format
msgid "marked counting and '%s' cannot be used together"
msgstr "標記計數 (marked counting) 與「%s」不得同時使用"
msgid "group by field"
msgstr "依欄位分組"
-#: builtin/shortlog.c:394
+#: builtin/shortlog.c:395
msgid "too many arguments given outside repository"
msgstr "版本庫外執行提供了太多的參數"
-#: builtin/show-branch.c:13
+#: builtin/show-branch.c:14
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
" [--no-name | --sha1-name] [--topics] [(<版本> | <萬用字元"
">)...]"
-#: builtin/show-branch.c:17
+#: builtin/show-branch.c:18
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<起始點>]] [--list] [<引用>]"
-#: builtin/show-branch.c:395
+#: builtin/show-branch.c:396
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "忽略 %s,無法處理 %d 個以上的引用"
-#: builtin/show-branch.c:547
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "沒有和 %s 符合的引用"
-#: builtin/show-branch.c:644
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "顯示遠端追蹤的和本機的分支"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "顯示遠端追蹤的分支"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "著色 '*!+-' 到相應的分支"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "顯示共同祖先後的 <n> 個提交"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "和 more=-1 同義"
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "不顯示字串命名"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "包括目前分支"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "以物件名字命名提交"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "顯示可能合併的基礎"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "顯示沒有任何引用的的引用"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "以拓撲順序顯示提交"
-#: builtin/show-branch.c:666
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "只顯示不在第一個分支上的提交"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "顯示僅一個分支可存取的合併提交"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "拓撲方式排序,並儘可能地保持日期順序"
-#: builtin/show-branch.c:673
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "顯示從起始點開始的 <n> 條最近的引用日誌記錄"
-#: builtin/show-branch.c:734
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "未提供分支,且 HEAD 無效"
-#: builtin/show-branch.c:737
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "選項 --reflog 需要一個分支名"
-#: builtin/show-branch.c:740
+#: builtin/show-branch.c:741
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "一次只能顯示 %d 個條目。"
-#: builtin/show-branch.c:744
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "無此引用 %s"
-#: builtin/show-branch.c:830
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "不能處理 %d 個以上的版本。"
-#: builtin/show-branch.c:834
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' 不是一個有效的引用。"
-#: builtin/show-branch.c:837
+#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "不能找到提交 %s(%s)"
msgid "show refs from stdin that aren't in local repository"
msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用"
-#: builtin/sparse-checkout.c:22
+#: builtin/sparse-checkout.c:23
msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <選項>"
-#: builtin/sparse-checkout.c:46
-msgid "git sparse-checkout list"
-msgstr "git sparse-checkout list"
-
-#: builtin/sparse-checkout.c:60
+#: builtin/sparse-checkout.c:61
msgid "this worktree is not sparse"
msgstr "這不是稀疏工作區"
-#: builtin/sparse-checkout.c:75
+#: builtin/sparse-checkout.c:76
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr "這不是稀疏工作區(sparse-checkout 檔案可能不存在)"
-#: builtin/sparse-checkout.c:176
+#: builtin/sparse-checkout.c:177
#, c-format
msgid ""
"directory '%s' contains untracked files, but is not in the sparse-checkout "
"cone"
msgstr "「%s」目錄有未追蹤的檔案,但不在稀疏提交的 cone 中"
-#: builtin/sparse-checkout.c:184
+#: builtin/sparse-checkout.c:185
#, c-format
msgid "failed to remove directory '%s'"
msgstr "無法移除 '%s' 目錄"
-#: builtin/sparse-checkout.c:324
+#: builtin/sparse-checkout.c:327
msgid "failed to create directory for sparse-checkout file"
msgstr "無法建立稀疏簽出檔案的目錄"
-#: builtin/sparse-checkout.c:365
-msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr "無法升級版本庫格式,以致無法啟用 worktreeConfig"
-
-#: builtin/sparse-checkout.c:367
-msgid "failed to set extensions.worktreeConfig setting"
-msgstr "無法設定 extensions.worktreeConfig 設定"
+#: builtin/sparse-checkout.c:366
+msgid "failed to initialize worktree config"
+msgstr "無法初始化工作區組態"
#: builtin/sparse-checkout.c:411
msgid "failed to modify sparse-index config"
msgstr "無法修改稀疏索引設定"
-#: builtin/sparse-checkout.c:422
-msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-
-#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
-#: builtin/sparse-checkout.c:778
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793
+#: builtin/sparse-checkout.c:847
msgid "initialize the sparse-checkout in cone mode"
msgstr "以 cone 模式初始化稀疏簽出"
-#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
-#: builtin/sparse-checkout.c:780
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795
+#: builtin/sparse-checkout.c:849
msgid "toggle the use of a sparse index"
msgstr "切換是否使用稀疏索引"
-#: builtin/sparse-checkout.c:476
+#: builtin/sparse-checkout.c:479
#, c-format
msgid "failed to open '%s'"
msgstr "無法開啟「%s」"
-#: builtin/sparse-checkout.c:528
+#: builtin/sparse-checkout.c:531
#, c-format
msgid "could not normalize path %s"
msgstr "無法標準化路徑 %s"
-#: builtin/sparse-checkout.c:557
+#: builtin/sparse-checkout.c:560
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "無法去掉 '%s' C 樣式字串的引號"
-#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
+#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643
msgid "unable to load existing sparse-checkout patterns"
msgstr "無法載入現存的稀疏簽出樣式"
-#: builtin/sparse-checkout.c:616
+#: builtin/sparse-checkout.c:619
msgid "existing sparse-checkout patterns do not use cone mode"
msgstr "現有的稀疏簽出樣式不使用 cone 模式"
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout add (--stdin | <patterns>)"
-msgstr "git sparse-checkout add (--stdin | <樣式>)"
+#: builtin/sparse-checkout.c:707
+msgid "please run from the toplevel directory in non-cone mode"
+msgstr "請從上層目錄,以非 cone 模式執行"
+
+#: builtin/sparse-checkout.c:712
+msgid "specify directories rather than patterns (no leading slash)"
+msgstr "指定目錄而非模式(沒有前置斜線)"
+
+#: builtin/sparse-checkout.c:714
+msgid ""
+"specify directories rather than patterns. If your directory starts with a "
+"'!', pass --skip-checks"
+msgstr "指定目錄而非模式。若您的目錄是以「!」開頭,請傳入 --skip-checks"
+
+#: builtin/sparse-checkout.c:716
+msgid ""
+"specify directories rather than patterns. If your directory really has any "
+"of '*?[]\\' in it, pass --skip-checks"
+msgstr ""
+"指定目錄而非模式。若您的目錄名稱真的包含「*?[]\\」其中一個,請傳入 --skip-"
+"checks"
+
+#: builtin/sparse-checkout.c:732
+#, c-format
+msgid ""
+"'%s' is not a directory; to treat it as a directory anyway, rerun with --"
+"skip-checks"
+msgstr "「%s」不是目錄。若要仍將其視作目錄,請重新傳入 --skip-checks 執行"
+
+#: builtin/sparse-checkout.c:734
+#, c-format
+msgid ""
+"pass a leading slash before paths such as '%s' if you want a single file "
+"(see NON-CONE PROBLEMS in the git-sparse-checkout manual)."
+msgstr ""
+"若您想要單一檔案,請在目錄前打上斜線,如「%s」(見 git-sparse-checkout 手冊"
+"〈NON-CONE PROBLEMS〉一節)。"
+
+#: builtin/sparse-checkout.c:739
+msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
+msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)"
-#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
+#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797
+msgid ""
+"skip some sanity checks on the given paths that might give false positives"
+msgstr "在可能給出誤判結果的指定目錄,略過某些完整性檢查"
+
+#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800
msgid "read patterns from standard in"
msgstr "從標準輸入讀取樣式"
-#: builtin/sparse-checkout.c:699
+#: builtin/sparse-checkout.c:760
msgid "no sparse-checkout to add to"
msgstr "沒有要加入之稀疏簽出"
-#: builtin/sparse-checkout.c:712
+#: builtin/sparse-checkout.c:775
msgid ""
-"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
-"<patterns>)"
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
msgstr ""
-"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
-"<patterns>)"
-
-#: builtin/sparse-checkout.c:765
-msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] "
+"(--stdin | <patterns>)"
-#: builtin/sparse-checkout.c:785
+#: builtin/sparse-checkout.c:854
msgid "must be in a sparse-checkout to reapply sparsity patterns"
msgstr "必須在稀疏提交才能重新套用稀疏樣式 (sparsity pattern)"
-#: builtin/sparse-checkout.c:803
-msgid "git sparse-checkout disable"
-msgstr "git sparse-checkout disable"
-
-#: builtin/sparse-checkout.c:845
+#: builtin/sparse-checkout.c:914
msgid "error while refreshing working directory"
msgstr "重新整理工作目錄時發生錯誤"
msgid "could not restore untracked files from stash"
msgstr "無法從儲藏條目中復原未追蹤檔案"
-#: builtin/stash.c:608 builtin/stash.c:706
+#: builtin/stash.c:608 builtin/stash.c:695
msgid "attempt to recreate the index"
msgstr "嘗試重建索引"
-#: builtin/stash.c:652
+#: builtin/stash.c:641
#, c-format
msgid "Dropped %s (%s)"
msgstr "捨棄了 %s(%s)"
-#: builtin/stash.c:655
+#: builtin/stash.c:644
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s:無法捨棄儲藏條目"
-#: builtin/stash.c:668
+#: builtin/stash.c:657
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一個儲藏引用"
-#: builtin/stash.c:718
+#: builtin/stash.c:707
msgid "The stash entry is kept in case you need it again."
msgstr "儲藏條目被保留以備您再次需要。"
-#: builtin/stash.c:741
+#: builtin/stash.c:730
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:825
+#: builtin/stash.c:809
msgid "failed to parse tree"
msgstr "無法解析樹"
-#: builtin/stash.c:836
+#: builtin/stash.c:820
msgid "failed to unpack trees"
msgstr "無法解包樹"
-#: builtin/stash.c:856
+#: builtin/stash.c:840
msgid "include untracked files in the stash"
msgstr "在儲藏區包含未追蹤檔案"
-#: builtin/stash.c:859
+#: builtin/stash.c:843
msgid "only show untracked files in the stash"
msgstr "只在儲藏區顯示未追蹤檔案"
-#: builtin/stash.c:946 builtin/stash.c:983
+#: builtin/stash.c:930 builtin/stash.c:967
#, c-format
msgid "Cannot update %s with %s"
msgstr "無法用 %2$s 更新 %1$s"
-#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
+#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739
msgid "stash message"
msgstr "儲藏說明"
-#: builtin/stash.c:974
+#: builtin/stash.c:958
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一個 <提交> 參數"
-#: builtin/stash.c:1159
+#: builtin/stash.c:1143
msgid "No staged changes"
msgstr "無暫存變更"
-#: builtin/stash.c:1220
+#: builtin/stash.c:1204
msgid "No changes selected"
msgstr "沒有選擇變更"
-#: builtin/stash.c:1320
+#: builtin/stash.c:1304
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1347
+#: builtin/stash.c:1331
msgid "Cannot save the current index state"
msgstr "無法儲存目前索引狀態"
-#: builtin/stash.c:1356
+#: builtin/stash.c:1340
msgid "Cannot save the untracked files"
msgstr "無法儲存未追蹤檔案"
-#: builtin/stash.c:1367 builtin/stash.c:1386
+#: builtin/stash.c:1351 builtin/stash.c:1370
msgid "Cannot save the current worktree state"
msgstr "無法儲存目前工作區狀態"
-#: builtin/stash.c:1377
+#: builtin/stash.c:1361
msgid "Cannot save the current staged state"
msgstr "無法儲存目前暫存狀態"
-#: builtin/stash.c:1414
+#: builtin/stash.c:1398
msgid "Cannot record working tree state"
msgstr "不能記錄工作區狀態"
-#: builtin/stash.c:1463
+#: builtin/stash.c:1447
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1474
+#: builtin/stash.c:1458
msgid "Can't use --staged and --include-untracked or --all at the same time"
msgstr "--staged 和 --include-untracked 或 --all 不得同時使用"
-#: builtin/stash.c:1492
+#: builtin/stash.c:1476
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了執行 'git add'?"
-#: builtin/stash.c:1507
+#: builtin/stash.c:1491
msgid "No local changes to save"
msgstr "沒有要儲存的本機修改"
-#: builtin/stash.c:1514
+#: builtin/stash.c:1498
msgid "Cannot initialize stash"
msgstr "無法初始化儲藏"
-#: builtin/stash.c:1529
+#: builtin/stash.c:1513
msgid "Cannot save the current status"
msgstr "無法儲存目前狀態"
-#: builtin/stash.c:1534
+#: builtin/stash.c:1518
#, c-format
msgid "Saved working directory and index state %s"
msgstr "儲存工作目錄和索引狀態 %s"
-#: builtin/stash.c:1627
+#: builtin/stash.c:1615
msgid "Cannot remove worktree changes"
msgstr "無法刪除工作區變更"
-#: builtin/stash.c:1667 builtin/stash.c:1739
+#: builtin/stash.c:1656 builtin/stash.c:1728
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1669 builtin/stash.c:1741
+#: builtin/stash.c:1658 builtin/stash.c:1730
msgid "stash staged changes only"
msgstr "只儲藏暫存變更"
-#: builtin/stash.c:1671 builtin/stash.c:1743
+#: builtin/stash.c:1660 builtin/stash.c:1732
msgid "stash in patch mode"
msgstr "以修補檔模式儲藏"
-#: builtin/stash.c:1672 builtin/stash.c:1744
+#: builtin/stash.c:1661 builtin/stash.c:1733
msgid "quiet mode"
msgstr "靜默模式"
-#: builtin/stash.c:1674 builtin/stash.c:1746
+#: builtin/stash.c:1663 builtin/stash.c:1735
msgid "include untracked files in stash"
msgstr "儲藏中包含未追蹤檔案"
-#: builtin/stash.c:1676 builtin/stash.c:1748
+#: builtin/stash.c:1665 builtin/stash.c:1737
msgid "include ignore files"
msgstr "包含忽略的檔案"
-#: builtin/stash.c:1783
-msgid ""
-"the stash.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"對 stash.useBuiltin 的支援已被刪除!\n"
-"詳見「git help config」中的條目。"
-
-#: builtin/stripspace.c:18
-msgid "git stripspace [-s | --strip-comments]"
-msgstr "git stripspace [-s | --strip-comments]"
-
-#: builtin/stripspace.c:19
-msgid "git stripspace [-c | --comment-lines]"
-msgstr "git stripspace [-c | --comment-lines]"
-
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "略過和移除所有的備註行"
msgid "prepend comment character and space to each line"
msgstr "為每一行的行首新增備註符和空格"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
+#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一個完整的引用名稱,卻得到 %s"
-#: builtin/submodule--helper.c:63
-msgid "submodule--helper print-default-remote takes no arguments"
-msgstr "submodule--helper print-default-remote 不帶參數"
-
-#: builtin/submodule--helper.c:101
+#: builtin/submodule--helper.c:103
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "無法從 url '%s' 剝離一個元件"
-#: builtin/submodule--helper.c:211
+#: builtin/submodule--helper.c:213
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。"
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
+#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873
msgid "alternative anchor for relative paths"
msgstr "相對路徑的替代錨記(anchor)"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:418
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]"
-#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
-#: builtin/submodule--helper.c:628
+#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617
+#: builtin/submodule--helper.c:640
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模組 '%s' 的 url"
-#: builtin/submodule--helper.c:520
+#: builtin/submodule--helper.c:528
#, c-format
msgid "Entering '%s'\n"
msgstr "進入 '%s'\n"
-#: builtin/submodule--helper.c:523
+#: builtin/submodule--helper.c:531
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"對 %s 執行 run_command 返回非零值。\n"
"."
-#: builtin/submodule--helper.c:545
+#: builtin/submodule--helper.c:553
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"在遞迴 %s 的子模組執行 run_command 時返回非零值。\n"
"."
-#: builtin/submodule--helper.c:561
+#: builtin/submodule--helper.c:569
msgid "suppress output of entering each submodule command"
msgstr "隱藏每個子模組進入命令的輸出"
-#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
-#: builtin/submodule--helper.c:1453
+#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:1458
msgid "recurse into nested submodules"
msgstr "遞迴進入嵌套子模組中"
-#: builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:576
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
-#: builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:654
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "無法為子模組 '%s' 註冊 url"
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:658
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "子模組 '%s'(%s)已對路徑 '%s' 註冊\n"
-#: builtin/submodule--helper.c:656
+#: builtin/submodule--helper.c:668
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告:建議子模組 '%s' 使用指令更新模式\n"
-#: builtin/submodule--helper.c:663
+#: builtin/submodule--helper.c:675
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "無法為子模組 '%s' 註冊更新模式"
-#: builtin/submodule--helper.c:685
+#: builtin/submodule--helper.c:697
msgid "suppress output for initializing a submodule"
msgstr "隱藏初始化子模組的輸出"
-#: builtin/submodule--helper.c:690
+#: builtin/submodule--helper.c:702
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<選項>] [<路徑>]"
-#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
+#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射"
-#: builtin/submodule--helper.c:811
+#: builtin/submodule--helper.c:823
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "無法解析子模組 '%s' 的 HEAD 引用"
-#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
+#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "遞迴子模組 '%s' 失敗"
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595
msgid "suppress submodule status output"
msgstr "隱藏子模組的狀態輸出"
-#: builtin/submodule--helper.c:863
+#: builtin/submodule--helper.c:875
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "使用儲存在索引中的提交,而非儲存在子模組 HEAD 中的提交"
-#: builtin/submodule--helper.c:869
+#: builtin/submodule--helper.c:881
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]"
-#: builtin/submodule--helper.c:893
+#: builtin/submodule--helper.c:905
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路徑>"
-#: builtin/submodule--helper.c:965
+#: builtin/submodule--helper.c:977
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr "* %s %s(blob)->%s(submodule)"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:980
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr "* %s %s(submodule)->%s(blob)"
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:993
#, c-format
msgid "%s"
msgstr "%s"
-#: builtin/submodule--helper.c:1031
+#: builtin/submodule--helper.c:1043
#, c-format
msgid "couldn't hash object from '%s'"
msgstr "無法雜湊來自 '%s' 的物件"
-#: builtin/submodule--helper.c:1035
+#: builtin/submodule--helper.c:1047
#, c-format
msgid "unexpected mode %o\n"
msgstr "非預期的模式 %o\n"
-#: builtin/submodule--helper.c:1276
+#: builtin/submodule--helper.c:1288
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr "使用儲存在索引中的提交而非子模組 HEAD"
-#: builtin/submodule--helper.c:1278
+#: builtin/submodule--helper.c:1290
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "比較索引中提交與子模組 HEAD 提交的差異"
-#: builtin/submodule--helper.c:1280
+#: builtin/submodule--helper.c:1292
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr "'ignore_config' 值設為 'all' 時略過子模組"
-#: builtin/submodule--helper.c:1282
+#: builtin/submodule--helper.c:1294
msgid "limit the summary size"
msgstr "限制摘要大小"
-#: builtin/submodule--helper.c:1287
+#: builtin/submodule--helper.c:1299
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr "git submodule--helper summary [<選項>] [<提交>] [--] [<路徑>]"
-#: builtin/submodule--helper.c:1311
+#: builtin/submodule--helper.c:1323
msgid "could not fetch a revision for HEAD"
msgstr "無法取得 HEAD 的版本"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1384
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "為 '%s' 同步子模組 url\n"
-#: builtin/submodule--helper.c:1379
+#: builtin/submodule--helper.c:1390
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "無法為子模組路徑 '%s' 註冊 url"
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1399
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "無法得到子模組 '%s' 的預設遠端關聯"
-#: builtin/submodule--helper.c:1404
+#: builtin/submodule--helper.c:1409
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "無法為子模組 '%s' 更新遠端關聯"
-#: builtin/submodule--helper.c:1451
+#: builtin/submodule--helper.c:1456
msgid "suppress output of synchronizing submodule url"
msgstr "隱藏子模組 URL 同步的輸出"
-#: builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:1463
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]"
-#: builtin/submodule--helper.c:1508
+#: builtin/submodule--helper.c:1513
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory. This will be replaced "
msgstr ""
"子模組工作區「%s」內有 .git 目錄。使用 absorbgitdirs 會將其替換為 .git 檔案。"
-#: builtin/submodule--helper.c:1525
+#: builtin/submodule--helper.c:1530
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr "子模組工作區 '%s' 包含本機修改;使用 '-f' 捨棄它們"
-#: builtin/submodule--helper.c:1533
+#: builtin/submodule--helper.c:1538
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "已清除目錄 '%s'\n"
-#: builtin/submodule--helper.c:1535
+#: builtin/submodule--helper.c:1540
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "無法移除子模組工作區 '%s'\n"
-#: builtin/submodule--helper.c:1546
+#: builtin/submodule--helper.c:1551
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "不能建立空的子模組目錄 %s"
-#: builtin/submodule--helper.c:1562
+#: builtin/submodule--helper.c:1567
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "子模組 '%s'(%s)未對路徑 '%s' 註冊\n"
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1596
msgid "remove submodule working trees even if they contain local changes"
msgstr "即使有本機變更仍移除子模組的工作區"
-#: builtin/submodule--helper.c:1592
+#: builtin/submodule--helper.c:1597
msgid "unregister all submodules"
msgstr "取消註冊所有子模組"
-#: builtin/submodule--helper.c:1597
+#: builtin/submodule--helper.c:1602
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]"
-#: builtin/submodule--helper.c:1611
+#: builtin/submodule--helper.c:1616
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您確定想要對所有子模組執行取消初始化,請使用 '--all'"
-#: builtin/submodule--helper.c:1656
+#: builtin/submodule--helper.c:1665
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
"以允許 Git 不用備用版本庫複製,亦可使用等效的 '--reference-if-able'\n"
"而非 '--reference' 複製。"
-#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
+#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模組 '%s' 不能新增版本庫備選:%s"
-#: builtin/submodule--helper.c:1740
+#: builtin/submodule--helper.c:1749
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:1747
+#: builtin/submodule--helper.c:1756
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能識別 submodule.alternateLocation 的取值 '%s'"
-#: builtin/submodule--helper.c:1772
+#: builtin/submodule--helper.c:1781
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr "拒絕在其他子模組的 git 路徑建立/使用「%s」"
-#: builtin/submodule--helper.c:1813
+#: builtin/submodule--helper.c:1826
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "無法複製 '%s' 到子模組路徑 '%s'"
-#: builtin/submodule--helper.c:1818
+#: builtin/submodule--helper.c:1831
#, c-format
msgid "directory not empty: '%s'"
msgstr "目錄不是空的:「%s」"
-#: builtin/submodule--helper.c:1830
+#: builtin/submodule--helper.c:1843
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "無法得到 '%s' 的子模組目錄"
-#: builtin/submodule--helper.c:1862
+#: builtin/submodule--helper.c:1876
msgid "where the new submodule will be cloned to"
msgstr "新的子模組將要複製的路徑"
-#: builtin/submodule--helper.c:1865
+#: builtin/submodule--helper.c:1879
msgid "name of the new submodule"
msgstr "新子模組的名稱"
-#: builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:1882
msgid "url where to clone the submodule from"
msgstr "複製子模組的 url 位址"
-#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383
msgid "depth for shallow clones"
msgstr "淺複製的深度"
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
-#: builtin/submodule--helper.c:3258
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731
+#: builtin/submodule--helper.c:3376
msgid "force cloning progress"
msgstr "強制顯示複製進度"
-#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733
msgid "disallow cloning into non-empty directory"
msgstr "不允許複製至非空白目錄"
-#: builtin/submodule--helper.c:1888
+#: builtin/submodule--helper.c:1903
+#| msgid ""
+#| "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+#| "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--"
+#| "filter <filter-spec>]--url <url> --path <path>"
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
-"<url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
msgstr ""
-"git submodule--helper clone [--prefix=<路徑>] [--quiet] [--reference <版本庫"
-">] [--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路"
-"徑>"
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter "
+"<filter-spec>] --url <url> --path <path>"
-#: builtin/submodule--helper.c:1925
+#: builtin/submodule--helper.c:1943
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效"
-#: builtin/submodule--helper.c:1929
+#: builtin/submodule--helper.c:1947
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效"
-#: builtin/submodule--helper.c:2044
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模組 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:2048
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "也許您想要執行 'update --init'?"
-#: builtin/submodule--helper.c:2078
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略過未合併的子模組 %s"
-#: builtin/submodule--helper.c:2107
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略過子模組 '%s'"
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次嘗試複製 '%s' 失敗,中止作業"
-#: builtin/submodule--helper.c:2373
+#: builtin/submodule--helper.c:2371
#, c-format
msgid "Unable to checkout '%s' in submodule path '%s'"
msgstr "無法在「%2$s」子模組路徑簽出「%1$s」"
-#: builtin/submodule--helper.c:2377
+#: builtin/submodule--helper.c:2375
#, c-format
msgid "Unable to rebase '%s' in submodule path '%s'"
msgstr "無法在「%2$s」子模組路徑重定「%1$s」的基底"
-#: builtin/submodule--helper.c:2381
+#: builtin/submodule--helper.c:2379
#, c-format
msgid "Unable to merge '%s' in submodule path '%s'"
msgstr "無法在「%2$s」子模組路徑合併「%1$s」"
-#: builtin/submodule--helper.c:2385
+#: builtin/submodule--helper.c:2383
#, c-format
msgid "Execution of '%s %s' failed in submodule path '%s'"
msgstr "「%s %s」在「%s」子模組路徑執行失敗"
-#: builtin/submodule--helper.c:2409
+#: builtin/submodule--helper.c:2402
#, c-format
msgid "Submodule path '%s': checked out '%s'\n"
msgstr "子模組路徑「%s」:已簽出「%s」\n"
-#: builtin/submodule--helper.c:2413
+#: builtin/submodule--helper.c:2406
#, c-format
msgid "Submodule path '%s': rebased into '%s'\n"
msgstr "子模組路徑「%s」:已重定基底至「%s」\n"
-#: builtin/submodule--helper.c:2417
+#: builtin/submodule--helper.c:2410
#, c-format
msgid "Submodule path '%s': merged in '%s'\n"
msgstr "子模組路徑「%s」:已在「%s」合併\n"
-#: builtin/submodule--helper.c:2421
+#: builtin/submodule--helper.c:2414
#, c-format
msgid "Submodule path '%s': '%s %s'\n"
msgstr "子模組路徑「%s」:「%s %s」\n"
-#: builtin/submodule--helper.c:2445
+#: builtin/submodule--helper.c:2438
#, c-format
msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
msgstr "無法在子模組路徑 「%s」中取得。嘗試直接取得 %s:"
-#: builtin/submodule--helper.c:2454
+#: builtin/submodule--helper.c:2447
#, c-format
msgid ""
"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
"of that commit failed."
msgstr "已經取得「%s」子模組路徑,這個路徑卻未包含「%s」。直接取得該提交失敗。"
-#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2481
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr "子模組(%s)的分支設定為繼承上級專案的分支,但是上級專案不在任何分支上"
+
+#: builtin/submodule--helper.c:2499
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "無法獲得子模組 '%s' 的版本庫句柄"
+
+#: builtin/submodule--helper.c:2588
+#, c-format
+msgid "Unable to find current revision in submodule path '%s'"
+msgstr "無法在子模組路徑「%s」中尋找目前的修訂版本"
+
+#: builtin/submodule--helper.c:2599
+#, c-format
+msgid "Unable to fetch in submodule path '%s'"
+msgstr "無法在子模組路徑「%s」中抓取"
+
+#: builtin/submodule--helper.c:2604
+#, c-format
+msgid "Unable to find %s revision in submodule path '%s'"
+msgstr "無法在子模組路徑「%s」中尋找 %s 修訂版本"
+
+#: builtin/submodule--helper.c:2640
+#, c-format
+msgid "Failed to recurse into submodule path '%s'"
+msgstr "無法遞迴子模組路徑「%s」"
+
+#: builtin/submodule--helper.c:2699
+msgid "force checkout updates"
+msgstr "強制簽出更新"
+
+#: builtin/submodule--helper.c:2701
+msgid "initialize uninitialized submodules before update"
+msgstr "在更新前,初始化尚未進行初始化的子模組"
+
+#: builtin/submodule--helper.c:2703
+msgid "use SHA-1 of submodule's remote tracking branch"
+msgstr "使用子模組遠端追蹤分支的 SHA-1"
+
+#: builtin/submodule--helper.c:2705
+msgid "traverse submodules recursively"
+msgstr "遞迴遍歷子模組"
+
+#: builtin/submodule--helper.c:2707
+msgid "don't fetch new objects from the remote site"
+msgstr "不從遠端站台取得新物件"
+
+#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892
msgid "path into the working tree"
msgstr "到工作區的路徑"
-#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
+#: builtin/submodule--helper.c:2713
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作區中的路徑,遞迴嵌套子模組"
-#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
+#: builtin/submodule--helper.c:2717
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:2518
+#: builtin/submodule--helper.c:2723
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "建立一個縮減至指定版本數的淺複製"
-#: builtin/submodule--helper.c:2521
+#: builtin/submodule--helper.c:2726
msgid "parallel jobs"
msgstr "並行任務"
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2728
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始複製是否應該遵循建議的淺複製選項"
-#: builtin/submodule--helper.c:2524
+#: builtin/submodule--helper.c:2729
msgid "don't print cloning progress"
msgstr "不要輸出複製進度"
-#: builtin/submodule--helper.c:2535
-msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]"
+#: builtin/submodule--helper.c:2741
+msgid ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
+msgstr ""
+"git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
+"[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-"
+"shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "
+"[--] [<path>...]"
-#: builtin/submodule--helper.c:2548
+#: builtin/submodule--helper.c:2767
msgid "bad value for update parameter"
msgstr "update 參數取值錯誤"
-#: builtin/submodule--helper.c:2566
-msgid "suppress output for update by rebase or merge"
-msgstr "隱藏 rebase 或 merge 觸發之更新的輸出"
-
-#: builtin/submodule--helper.c:2567
-msgid "force checkout updates"
-msgstr "強制簽出更新"
-
-#: builtin/submodule--helper.c:2569
-msgid "don't fetch new objects from the remote site"
-msgstr "不從遠端站台取得新物件"
-
-#: builtin/submodule--helper.c:2571
-msgid "overrides update mode in case the repository is a fresh clone"
-msgstr "如果版本庫是剛複製的,就覆蓋更新模式"
-
-#: builtin/submodule--helper.c:2572
-msgid "depth for shallow fetch"
-msgstr "淺 fetch 的深度"
-
-#: builtin/submodule--helper.c:2582
-msgid "sha1"
-msgstr "sha1"
-
-#: builtin/submodule--helper.c:2583
-msgid "SHA1 expected by superproject"
-msgstr "上層專案預期應是 SHA1"
-
-#: builtin/submodule--helper.c:2585
-msgid "subsha1"
-msgstr "subsha1"
-
-#: builtin/submodule--helper.c:2586
-msgid "SHA1 of submodule's HEAD"
-msgstr "子模組 HEAD 的 SHA1"
-
-#: builtin/submodule--helper.c:2592
-msgid "git submodule--helper run-update-procedure [<options>] <path>"
-msgstr "git submodule--helper run-update-procedure [<選項>] [<路徑>]"
-
-#: builtin/submodule--helper.c:2663
-#, c-format
-msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but "
-"the superproject is not on any branch"
-msgstr "子模組(%s)的分支設定為繼承上級專案的分支,但是上級專案不在任何分支上"
-
-#: builtin/submodule--helper.c:2781
-#, c-format
-msgid "could not get a repository handle for submodule '%s'"
-msgstr "無法獲得子模組 '%s' 的版本庫句柄"
-
-#: builtin/submodule--helper.c:2814
+#: builtin/submodule--helper.c:2893
msgid "recurse into submodules"
msgstr "在子模組中遞迴"
-#: builtin/submodule--helper.c:2820
+#: builtin/submodule--helper.c:2899
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]"
-#: builtin/submodule--helper.c:2876
+#: builtin/submodule--helper.c:2955
msgid "check if it is safe to write to the .gitmodules file"
msgstr "檢查寫入 .gitmodules 檔案是否安全"
-#: builtin/submodule--helper.c:2879
+#: builtin/submodule--helper.c:2958
msgid "unset the config in the .gitmodules file"
msgstr "取消 .gitmodules 檔案中的設定"
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2963
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <名稱> [<值>]"
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2964
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <名稱>"
-#: builtin/submodule--helper.c:2886
-msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper config --check-writeable"
-
-#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
-#: builtin/submodule--helper.c:3277
+#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238
+#: builtin/submodule--helper.c:3395
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "請確認 .gitmodules 檔案在工作區裡"
-#: builtin/submodule--helper.c:2921
+#: builtin/submodule--helper.c:3000
msgid "suppress output for setting url of a submodule"
msgstr "隱藏子模組設定 URL 的輸出"
-#: builtin/submodule--helper.c:2925
+#: builtin/submodule--helper.c:3004
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>"
-#: builtin/submodule--helper.c:2958
+#: builtin/submodule--helper.c:3037
msgid "set the default tracking branch to master"
msgstr "將預設的追蹤分支設為 master"
-#: builtin/submodule--helper.c:2960
+#: builtin/submodule--helper.c:3039
msgid "set the default tracking branch"
msgstr "設定預設追蹤分支"
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:3043
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
-#: builtin/submodule--helper.c:2965
+#: builtin/submodule--helper.c:3044
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
msgstr ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
-#: builtin/submodule--helper.c:2972
+#: builtin/submodule--helper.c:3051
msgid "--branch or --default required"
msgstr "需要 --branch 或 --default"
-#: builtin/submodule--helper.c:3038
+#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375
+msgid "print only error messages"
+msgstr "只輸出錯誤訊息"
+
+#: builtin/submodule--helper.c:3073
+msgid "force creation"
+msgstr "強制建立"
+
+#: builtin/submodule--helper.c:3081
+msgid "show whether the branch would be created"
+msgstr "顯示分支是否會被建立"
+
+#: builtin/submodule--helper.c:3085
+#| msgid ""
+#| "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+#| "quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"
+msgid ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+msgstr ""
+"git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--"
+"quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"
+
+#: builtin/submodule--helper.c:3097
+#, c-format
+msgid "creating branch '%s'"
+msgstr "建立分支「%s」"
+
+#: builtin/submodule--helper.c:3155
#, c-format
msgid "Adding existing repo at '%s' to the index\n"
msgstr "正在將位於 '%s' 的現有版本庫加入至索引\n"
-#: builtin/submodule--helper.c:3041
+#: builtin/submodule--helper.c:3158
#, c-format
msgid "'%s' already exists and is not a valid git repo"
msgstr "「%s」已存在,且不是有效的 git 版本庫"
-#: builtin/submodule--helper.c:3054
+#: builtin/submodule--helper.c:3171
#, c-format
msgid "A git directory for '%s' is found locally with remote(s):\n"
msgstr "在本機找到「%s」Git 目錄,與其對應的遠端版本庫:\n"
-#: builtin/submodule--helper.c:3061
+#: builtin/submodule--helper.c:3178
#, c-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
"請使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n"
"假如您不太懂意思,請使用 '--name' 選項輸入其他名稱。"
-#: builtin/submodule--helper.c:3073
+#: builtin/submodule--helper.c:3190
#, c-format
msgid "Reactivating local git directory for submodule '%s'\n"
msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n"
-#: builtin/submodule--helper.c:3110
+#: builtin/submodule--helper.c:3227
#, c-format
msgid "unable to checkout submodule '%s'"
msgstr "無法簽出「%s」子模組"
-#: builtin/submodule--helper.c:3149
+#: builtin/submodule--helper.c:3266
#, c-format
msgid "Failed to add submodule '%s'"
msgstr "無法加入子模組「%s」"
-#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
-#: builtin/submodule--helper.c:3166
+#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275
+#: builtin/submodule--helper.c:3283
#, c-format
msgid "Failed to register submodule '%s'"
msgstr "無法註冊子模組「%s」"
-#: builtin/submodule--helper.c:3222
+#: builtin/submodule--helper.c:3339
#, c-format
msgid "'%s' already exists in the index"
msgstr "「%s」已在索引中"
-#: builtin/submodule--helper.c:3225
+#: builtin/submodule--helper.c:3342
#, c-format
msgid "'%s' already exists in the index and is not a submodule"
msgstr "「%s」已在索引中,且不是子模組"
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3372
msgid "branch of repository to add as submodule"
msgstr "要加入為子模組的版本庫分支"
-#: builtin/submodule--helper.c:3255
+#: builtin/submodule--helper.c:3373
msgid "allow adding an otherwise ignored submodule path"
msgstr "允許加入忽略的子模組路徑"
-#: builtin/submodule--helper.c:3257
-msgid "print only error messages"
-msgstr "只輸出錯誤訊息"
-
-#: builtin/submodule--helper.c:3261
+#: builtin/submodule--helper.c:3379
msgid "borrow the objects from reference repositories"
msgstr "從引用的版本庫借用物件"
-#: builtin/submodule--helper.c:3263
+#: builtin/submodule--helper.c:3381
msgid ""
"sets the submodule’s name to the given string instead of defaulting to its "
"path"
msgstr "將子模組名稱設定為指定字串,而非預設的路徑名稱"
-#: builtin/submodule--helper.c:3270
+#: builtin/submodule--helper.c:3388
msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
msgstr "git submodule--helper add [<選項>] [--] <版本庫> [<路徑>]"
-#: builtin/submodule--helper.c:3298
+#: builtin/submodule--helper.c:3416
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "只能在工作區的頂級目錄中使用相對路徑"
-#: builtin/submodule--helper.c:3306
+#: builtin/submodule--helper.c:3425
#, c-format
msgid "repo URL: '%s' must be absolute or begin with ./|../"
msgstr "版本庫 URL:「%s」必須是絕對路徑,或開頭是 ./|../"
-#: builtin/submodule--helper.c:3341
+#: builtin/submodule--helper.c:3460
#, c-format
msgid "'%s' is not a valid submodule name"
msgstr "「%s」不是有效的子模組名稱"
-#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
+#: builtin/submodule--helper.c:3520 git.c:453 git.c:729
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支援 --super-prefix"
-#: builtin/submodule--helper.c:3411
+#: builtin/submodule--helper.c:3526
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一個有效的 submodule--helper 子指令"
msgid "reason of the update"
msgstr "更新的原因"
-#: builtin/tag.c:25
+#: builtin/tag.c:26
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
" <tagname> [<head>]"
"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <檔案>]\n"
" <標籤名> [<head>]"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid "git tag -d <tagname>..."
msgstr "git tag -d <標籤名>..."
-#: builtin/tag.c:28
+#: builtin/tag.c:29
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
"at <物件>]\n"
" [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
-#: builtin/tag.c:30
+#: builtin/tag.c:31
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<格式>] <標籤名>..."
-#: builtin/tag.c:100
+#: builtin/tag.c:101
#, c-format
msgid "tag '%s' not found."
msgstr "未發現標籤 '%s'。"
-#: builtin/tag.c:135
+#: builtin/tag.c:136
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已刪除標籤 '%s'(曾為 %s)\n"
-#: builtin/tag.c:170
+#: builtin/tag.c:171
#, c-format
msgid ""
"\n"
" %s\n"
"以 '%c' 開頭的行將被忽略。\n"
-#: builtin/tag.c:174
+#: builtin/tag.c:175
#, c-format
msgid ""
"\n"
" %s\n"
"以 '%c' 開頭的行將被保留,如果您願意也可以刪除它們。\n"
-#: builtin/tag.c:240
+#: builtin/tag.c:241
msgid "unable to sign the tag"
msgstr "無法簽署標籤"
-#: builtin/tag.c:258
+#: builtin/tag.c:259
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:274
+#: builtin/tag.c:275
msgid "bad object type."
msgstr "壞的物件類型。"
-#: builtin/tag.c:325
+#: builtin/tag.c:326
msgid "no tag message?"
msgstr "無標籤說明?"
-#: builtin/tag.c:332
+#: builtin/tag.c:333
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "標籤說明被保留在 %s\n"
-#: builtin/tag.c:444
+#: builtin/tag.c:445
msgid "list tag names"
msgstr "列出標籤名稱"
-#: builtin/tag.c:446
+#: builtin/tag.c:447
msgid "print <n> lines of each tag message"
msgstr "每個標籤訊息列印 <n> 行"
-#: builtin/tag.c:448
+#: builtin/tag.c:449
msgid "delete tags"
msgstr "刪除標籤"
-#: builtin/tag.c:449
+#: builtin/tag.c:450
msgid "verify tags"
msgstr "驗證標籤"
-#: builtin/tag.c:451
+#: builtin/tag.c:452
msgid "Tag creation options"
msgstr "標籤建立選項"
-#: builtin/tag.c:453
+#: builtin/tag.c:454
msgid "annotated tag, needs a message"
msgstr "附註標籤,需要一個說明"
-#: builtin/tag.c:455
+#: builtin/tag.c:456
msgid "tag message"
msgstr "標籤說明"
-#: builtin/tag.c:457
+#: builtin/tag.c:458
msgid "force edit of tag message"
msgstr "強制編輯標籤說明"
-#: builtin/tag.c:458
+#: builtin/tag.c:459
msgid "annotated and GPG-signed tag"
msgstr "附註並附加 GPG 簽名的標籤"
-#: builtin/tag.c:461
+#: builtin/tag.c:462
msgid "use another key to sign the tag"
msgstr "使用另外的私鑰簽名該標籤"
-#: builtin/tag.c:462
+#: builtin/tag.c:463
msgid "replace the tag if exists"
msgstr "如果存在,取代現有的標籤"
-#: builtin/tag.c:463 builtin/update-ref.c:511
+#: builtin/tag.c:464 builtin/update-ref.c:511
msgid "create a reflog"
msgstr "建立引用日誌"
-#: builtin/tag.c:465
+#: builtin/tag.c:466
msgid "Tag listing options"
msgstr "標籤列表選項"
-#: builtin/tag.c:466
+#: builtin/tag.c:467
msgid "show tag list in columns"
msgstr "以列的方式顯示標籤列表"
-#: builtin/tag.c:467 builtin/tag.c:469
+#: builtin/tag.c:468 builtin/tag.c:470
msgid "print only tags that contain the commit"
msgstr "只列印包含該提交的標籤"
-#: builtin/tag.c:468 builtin/tag.c:470
+#: builtin/tag.c:469 builtin/tag.c:471
msgid "print only tags that don't contain the commit"
msgstr "只列印不包含該提交的標籤"
-#: builtin/tag.c:471
+#: builtin/tag.c:472
msgid "print only tags that are merged"
msgstr "只列印已經合併的標籤"
-#: builtin/tag.c:472
+#: builtin/tag.c:473
msgid "print only tags that are not merged"
msgstr "只列印尚未合併的標籤"
-#: builtin/tag.c:476
+#: builtin/tag.c:477
msgid "print only tags of the object"
msgstr "只列印指向該物件的標籤"
-#: builtin/tag.c:558
+#: builtin/tag.c:559
#, c-format
msgid "the '%s' option is only allowed in list mode"
msgstr "「%s」選項只能在列表顯示模式使用"
-#: builtin/tag.c:597
+#: builtin/tag.c:598
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一個有效的標籤名稱。"
-#: builtin/tag.c:602
+#: builtin/tag.c:603
#, c-format
msgid "tag '%s' already exists"
msgstr "標籤 '%s' 已存在"
-#: builtin/tag.c:633
+#: builtin/tag.c:634
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新標籤 '%s'(曾為 %s)\n"
+#: builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "包超過了最大允許值"
+
#: builtin/unpack-objects.c:504
msgid "Unpacking objects"
msgstr "展開物件中"
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<選項>] [--] [<檔案>...]"
-#: builtin/update-index.c:974
+#: builtin/update-index.c:993
msgid "continue refresh even when index needs update"
msgstr "當索引需要更新時繼續重新整理"
-#: builtin/update-index.c:977
+#: builtin/update-index.c:996
msgid "refresh: ignore submodules"
msgstr "重新整理:忽略子模組"
-#: builtin/update-index.c:980
+#: builtin/update-index.c:999
msgid "do not ignore new files"
msgstr "不忽略新的檔案"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:1001
msgid "let files replace directories and vice-versa"
msgstr "讓檔案取代目錄(反之亦然)"
-#: builtin/update-index.c:984
+#: builtin/update-index.c:1003
msgid "notice files missing from worktree"
msgstr "通知檔案從工作區遺失"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:1005
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引區包含未合併的條目也執行重新整理"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:1008
msgid "refresh stat information"
msgstr "重新整理統計訊息"
-#: builtin/update-index.c:993
+#: builtin/update-index.c:1012
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "類似於 --refresh,但是忽略 assume-unchanged 設定"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1016
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<物件>,<路徑>"
-#: builtin/update-index.c:998
+#: builtin/update-index.c:1017
msgid "add the specified entry to the index"
msgstr "新增指定的條目到索引區"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1027
msgid "mark files as \"not changing\""
msgstr "把檔案標記為 \"沒有變更\""
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1030
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1033
msgid "mark files as \"index-only\""
msgstr "把檔案標記為 \"僅索引\""
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1036
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1039
msgid "do not touch index-only entries"
msgstr "不要建立只有索引的項目"
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1041
msgid "add to index only; do not add content to object database"
msgstr "只新增到索引區;不新增物件到物件庫"
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1043
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作區裡,也刪除路徑"
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1045
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "攜帶 --stdin:輸入的行以 null 字元終止"
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1047
msgid "read list of paths to be updated from standard input"
msgstr "從標準輸入中讀取需要更新的路徑列表"
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1051
msgid "add entries from standard input to the index"
msgstr "從標準輸入新增條目到索引區"
-#: builtin/update-index.c:1036
+#: builtin/update-index.c:1055
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "為指定檔案重新生成第2和第3暫存區"
-#: builtin/update-index.c:1040
+#: builtin/update-index.c:1059
msgid "only update entries that differ from HEAD"
msgstr "只更新與 HEAD 不同的條目"
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1063
msgid "ignore files missing from worktree"
msgstr "忽略工作區遺失的檔案"
-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1066
msgid "report actions to standard output"
msgstr "在標準輸出顯示動作"
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1068
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘記儲存的未解決的衝突"
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1072
msgid "write index in this format"
msgstr "以這種格式寫入索引區"
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1074
msgid "enable or disable split index"
msgstr "啟用或停用索引分割"
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1076
msgid "enable/disable untracked cache"
msgstr "啟用/停用對未追蹤檔案的快取"
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1078
msgid "test if the filesystem supports untracked cache"
msgstr "測試檔案系統是否支援未追蹤檔案快取"
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1080
msgid "enable untracked cache without testing the filesystem"
msgstr "無需檢測檔案系統,啟用對未追蹤檔案的快取"
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1082
msgid "write out the index even if is not flagged as changed"
msgstr "即使沒有被標記為已更改,也要寫出索引"
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1084
msgid "enable or disable file system monitor"
msgstr "啟用或停用檔案系統監控"
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1086
msgid "mark files as fsmonitor valid"
msgstr "標記檔案為 fsmonitor 有效"
-#: builtin/update-index.c:1070
+#: builtin/update-index.c:1089
msgid "clear fsmonitor valid bit"
msgstr "清除 fsmonitor 有效位"
-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1195
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr "core.splitIndex 被設定為 false。如果您確定要啟用索引分割,請移除或修改"
-#: builtin/update-index.c:1182
+#: builtin/update-index.c:1204
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr "core.splitIndex 被設定為 true。如果您確定要停用索引分割,請移除或修改"
-#: builtin/update-index.c:1194
+#: builtin/update-index.c:1216
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
"core.untrackedCache 被設定為 true。如果您確定要停用未追蹤檔案的快取,請移除或"
"修改"
-#: builtin/update-index.c:1198
+#: builtin/update-index.c:1220
msgid "Untracked cache disabled"
msgstr "快取未追蹤檔案被停用"
-#: builtin/update-index.c:1206
+#: builtin/update-index.c:1228
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
"core.untrackedCache 被設定為 false。如果您確定要啟用未追蹤檔案快取,請移除或"
"修改"
-#: builtin/update-index.c:1210
+#: builtin/update-index.c:1232
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "快取未追蹤檔案在 '%s' 啟用"
-#: builtin/update-index.c:1218
+#: builtin/update-index.c:1241
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "core.fsmonitor 未設定;如果想要啟用 fsmonitor 請設定該選項"
-#: builtin/update-index.c:1222
+#: builtin/update-index.c:1246
msgid "fsmonitor enabled"
msgstr "fsmonitor 被啟用"
-#: builtin/update-index.c:1225
+#: builtin/update-index.c:1250
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr "core.fsmonitor 已設定;如果想要停用 fsmonitor 請移除該選項"
-#: builtin/update-index.c:1229
+#: builtin/update-index.c:1254
msgid "fsmonitor disabled"
msgstr "fsmonitor 被停用"
msgid "read updates from stdin"
msgstr "從標準輸入讀取更新"
-#: builtin/update-server-info.c:7
-msgid "git update-server-info [--force]"
-msgstr "git update-server-info [--force]"
-
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "從頭開始更新檔案訊息"
msgstr "git worktree remove [<選項>] <工作區>"
#: builtin/worktree.c:25
+msgid "git worktree repair [<path>...]"
+msgstr "git worktree repair [<路徑>...]"
+
+#: builtin/worktree.c:26
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路徑>"
-#: builtin/worktree.c:75
+#: builtin/worktree.c:76
#, c-format
msgid "Removing %s/%s: %s"
msgstr "移除 %s/%s: %s"
-#: builtin/worktree.c:148
+#: builtin/worktree.c:149
msgid "report pruned working trees"
-msgstr "報告清除的工作區"
+msgstr "報告剪除的工作區"
-#: builtin/worktree.c:150
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "將早於 <時間> 的工作區過期"
-#: builtin/worktree.c:220
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已經存在"
-#: builtin/worktree.c:229
+#: builtin/worktree.c:230
#, c-format
msgid "unusable worktree destination '%s'"
msgstr "無法使用的工作目錄目的地「%s」"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:235
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
-"'%s' 是個遺失但被鎖定的工作區;\n"
-"使用 '%s -f -f' 覆蓋,或 'unlock' 和 'prune' 或 'remove' 清除"
+"「%s」是個遺失但被鎖定的工作區;\n"
+"使用「%s -f -f」覆蓋,或「unlock」和「prune」或「remove」清除"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:237
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use '%s -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-"'%s' 是個遺失但已註冊的工作區;\n"
-"使用 '%s -f' 覆蓋,或 'prune' 或 'remove' 清除"
+"「%s」是個遺失但已註冊的工作區;\n"
+"使用「%s -f」覆蓋,或「prune」或「remove」清除"
+
+#: builtin/worktree.c:248
+#, c-format
+msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly"
+msgstr "無法將「%s」複製到「%s」;稀疏簽出可能無法正常運作"
+
+#: builtin/worktree.c:268
+#, c-format
+msgid "failed to copy worktree config from '%s' to '%s'"
+msgstr "無法將工作區組態從「%s」複製到「%s」"
+
+#: builtin/worktree.c:280 builtin/worktree.c:285
+#, c-format
+msgid "failed to unset '%s' in '%s'"
+msgstr "無法取消「%2$s」中「%1$s」的設定"
-#: builtin/worktree.c:287
+#: builtin/worktree.c:356
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能建立目錄 '%s'"
-#: builtin/worktree.c:309
+#: builtin/worktree.c:378
msgid "initializing"
msgstr "正在初始化"
-#: builtin/worktree.c:420 builtin/worktree.c:426
+#: builtin/worktree.c:492 builtin/worktree.c:498
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "準備工作區(新分支 '%s')"
-#: builtin/worktree.c:422
+#: builtin/worktree.c:494
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "準備工作區(重設分支 '%s',之前為 %s)"
-#: builtin/worktree.c:431
+#: builtin/worktree.c:503
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "準備工作區(簽出 '%s')"
-#: builtin/worktree.c:437
+#: builtin/worktree.c:509
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "準備工作區(分離開頭指標 %s)"
-#: builtin/worktree.c:482
+#: builtin/worktree.c:554
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "簽出 <分支>,即使已經被簽出到其它工作區"
-#: builtin/worktree.c:485
+#: builtin/worktree.c:557
msgid "create a new branch"
msgstr "建立一個新分支"
-#: builtin/worktree.c:487
+#: builtin/worktree.c:559
msgid "create or reset a branch"
msgstr "建立或重設一個分支"
-#: builtin/worktree.c:489
+#: builtin/worktree.c:561
msgid "populate the new working tree"
msgstr "生成新的工作區"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:562
msgid "keep the new working tree locked"
msgstr "鎖定新工作區"
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/worktree.c:564 builtin/worktree.c:809
msgid "reason for locking"
msgstr "鎖定原因"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:567
msgid "set up tracking mode (see git-branch(1))"
msgstr "設定追蹤模式(參見 git-branch(1))"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:570
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "嘗試為新分支名符合一個遠端追蹤分支"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:584
msgid "added with --lock"
msgstr "已使用 --lock 加入"
-#: builtin/worktree.c:574
+#: builtin/worktree.c:646
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在建立新分支時使用 --[no-]track 選項"
-#: builtin/worktree.c:691
+#: builtin/worktree.c:766
msgid "show extended annotations and reasons, if available"
msgstr "如果有則顯示延伸的註釋和原因"
-#: builtin/worktree.c:693
+#: builtin/worktree.c:768
msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr "對舊於 <時間> 的工作區加上 ‘prunable’ 標示"
-#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
-#: builtin/worktree.c:972
+#: builtin/worktree.c:770
+msgid "terminate records with a NUL character"
+msgstr "以一個 NUL 字元終止記錄"
+
+#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928
+#: builtin/worktree.c:1052
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一個工作區"
-#: builtin/worktree.c:743 builtin/worktree.c:776
+#: builtin/worktree.c:823 builtin/worktree.c:856
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作區無法被加鎖或解鎖"
-#: builtin/worktree.c:748
+#: builtin/worktree.c:828
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被鎖定,原因:%s"
-#: builtin/worktree.c:750
+#: builtin/worktree.c:830
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被鎖定"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:858
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被鎖定"
-#: builtin/worktree.c:819
+#: builtin/worktree.c:899
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移動或刪除包含子模組的工作區"
-#: builtin/worktree.c:827
+#: builtin/worktree.c:907
msgid "force move even if worktree is dirty or locked"
msgstr "強制移動,即使工作區是髒的或已鎖定"
-#: builtin/worktree.c:850 builtin/worktree.c:974
+#: builtin/worktree.c:930 builtin/worktree.c:1054
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一個主工作區"
-#: builtin/worktree.c:855
+#: builtin/worktree.c:935
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "無法從 '%s' 算出目的地名稱"
-#: builtin/worktree.c:868
+#: builtin/worktree.c:948
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"無法移動一個鎖定的工作區,鎖定原因:%s\n"
"使用 'move -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:870
+#: builtin/worktree.c:950
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
"無法移動一個鎖定的工作區,\n"
"使用 'move -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:873
+#: builtin/worktree.c:953
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "驗證失敗,無法移動工作區:%s"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:958
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移動 '%s' 到 '%s' 失敗"
-#: builtin/worktree.c:924
+#: builtin/worktree.c:1004
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中執行 'git status' 失敗"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:1008
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr "'%s' 包含修改或未追蹤的檔案,使用 --force 刪除"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:1013
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中執行 'git status' 失敗,離開碼 %d"
-#: builtin/worktree.c:956
+#: builtin/worktree.c:1036
msgid "force removal even if worktree is dirty or locked"
msgstr "強制刪除,即使工作區是髒的或已鎖定"
-#: builtin/worktree.c:979
+#: builtin/worktree.c:1059
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"無法刪除一個鎖定的工作區,鎖定原因:%s\n"
"使用 'remove -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:981
+#: builtin/worktree.c:1061
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
"無法刪除一個鎖定的工作區,\n"
"使用 'remove -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:984
+#: builtin/worktree.c:1064
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "驗證失敗,無法刪除工作區:%s"
-#: builtin/worktree.c:1008
+#: builtin/worktree.c:1088
#, c-format
msgid "repair: %s: %s"
msgstr "修復:%s:%s"
-#: builtin/worktree.c:1011
+#: builtin/worktree.c:1091
#, c-format
msgid "error: %s: %s"
msgstr "錯誤:%s:%s"
msgid "recursive alias: %s"
msgstr "遞迴的別名:%s"
-#: git.c:479
+#: git.c:480
msgid "write failure on standard output"
msgstr "在標準輸出寫入失敗"
-#: git.c:481
+#: git.c:482
msgid "unknown write failure on standard output"
msgstr "到標準輸出的未知寫入錯誤"
-#: git.c:483
+#: git.c:484
msgid "close failed on standard output"
msgstr "標準輸出關閉失敗"
-#: git.c:835
+#: git.c:838
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "偵測到別名循環:展開後的「%s」無窮無盡:%s"
-#: git.c:885
+#: git.c:888
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作為內建指令處理 %s"
-#: git.c:898
+#: git.c:901
#, c-format
msgid ""
"usage: %s\n"
"用法:%s\n"
"\n"
-#: git.c:918
+#: git.c:921
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "展開別名指令 '%s' 失敗,'%s' 不是一個 git 指令\n"
-#: git.c:930
+#: git.c:933
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "執行指令 '%s' 失敗:%s\n"
" 請求:%s\n"
" 重定向:%s"
-#: remote-curl.c:183
+#: remote-curl.c:184
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "在 push-option 取值中無效的引號:'%s'"
-#: remote-curl.c:304
+#: remote-curl.c:308
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs 無效:這是一個 git 版本庫嗎?"
-#: remote-curl.c:405
+#: remote-curl.c:409
msgid "invalid server response; expected service, got flush packet"
msgstr "無效的服務端回應。預期服務,得到 flush 包"
-#: remote-curl.c:436
+#: remote-curl.c:440
#, c-format
msgid "invalid server response; got '%s'"
msgstr "無效的服務端回應,得到 '%s'"
-#: remote-curl.c:496
+#: remote-curl.c:500
#, c-format
msgid "repository '%s' not found"
msgstr "版本庫 '%s' 未找到"
-#: remote-curl.c:500
+#: remote-curl.c:504
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' 身份驗證失敗"
-#: remote-curl.c:504
+#: remote-curl.c:508
#, c-format
msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
msgstr "無法依 http.pinnedPubkey 之設定存取「%s」:%s"
-#: remote-curl.c:508
+#: remote-curl.c:512
#, c-format
msgid "unable to access '%s': %s"
msgstr "無法存取 '%s':%s"
-#: remote-curl.c:514
+#: remote-curl.c:518
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
-#: remote-curl.c:645
+#: remote-curl.c:649
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "當沒有設定溫和處理檔案結束符(EOF)時,不應該有檔案結束符"
-#: remote-curl.c:657
+#: remote-curl.c:661
msgid "remote server sent unexpected response end packet"
msgstr "遠端伺服器傳送了非預期的回應結束封包"
-#: remote-curl.c:726
+#: remote-curl.c:730
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer"
-#: remote-curl.c:755
+#: remote-curl.c:759
#, c-format
msgid "remote-curl: bad line length character: %.4s"
msgstr "remote-curl: 錯誤的行長度字串:%.4s"
-#: remote-curl.c:757
+#: remote-curl.c:761
msgid "remote-curl: unexpected response end packet"
msgstr "remote-curl: 非預期的回應結束封包"
-#: remote-curl.c:833
+#: remote-curl.c:837
#, c-format
msgid "RPC failed; %s"
msgstr "RPC 失敗。%s"
-#: remote-curl.c:873
+#: remote-curl.c:877
msgid "cannot handle pushes this big"
msgstr "不能處理這麼大的推送"
-#: remote-curl.c:986
+#: remote-curl.c:990
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "不能壓縮請求,zlib 壓縮錯誤 %d"
-#: remote-curl.c:990
+#: remote-curl.c:994
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "不能壓縮請求,zlib 結束錯誤 %d"
-#: remote-curl.c:1040
+#: remote-curl.c:1044
#, c-format
msgid "%d bytes of length header were received"
msgstr "收到了 %d 位元組長度的標頭"
-#: remote-curl.c:1042
+#: remote-curl.c:1046
#, c-format
msgid "%d bytes of body are still expected"
msgstr "預期仍要有 %d 位元組的本文 (body)"
-#: remote-curl.c:1131
+#: remote-curl.c:1135
msgid "dumb http transport does not support shallow capabilities"
msgstr "啞 http 傳輸不支援 shallow 能力"
-#: remote-curl.c:1146
+#: remote-curl.c:1150
msgid "fetch failed."
msgstr "取得失敗。"
-#: remote-curl.c:1192
+#: remote-curl.c:1198
msgid "cannot fetch by sha1 over smart http"
msgstr "無法透過智慧 HTTP 取得 sha1"
-#: remote-curl.c:1236 remote-curl.c:1242
+#: remote-curl.c:1242 remote-curl.c:1248
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "協定錯誤:期望 sha/ref,卻得到 '%s'"
-#: remote-curl.c:1254 remote-curl.c:1372
+#: remote-curl.c:1260 remote-curl.c:1378
#, c-format
msgid "http transport does not support %s"
msgstr "http 傳輸協定不支援 %s"
-#: remote-curl.c:1290
+#: remote-curl.c:1296
msgid "git-http-push failed"
msgstr "git-http-push 失敗"
-#: remote-curl.c:1478
+#: remote-curl.c:1485
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl:用法:git remote-curl <遠端> [<url>]"
-#: remote-curl.c:1510
+#: remote-curl.c:1517
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl:錯誤讀取來自 git 的指令流"
-#: remote-curl.c:1517
+#: remote-curl.c:1524
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl:嘗試沒有本機版本庫下取得"
-#: remote-curl.c:1558
+#: remote-curl.c:1565
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl:未知的來自 git 的指令 '%s'"
msgid "could not find enlistment root"
msgstr "找不到編列名單的根目錄"
-#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
-#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350
+#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578
#, c-format
msgid "could not switch to '%s'"
msgstr "無法切換至「%s」"
-#: contrib/scalar/scalar.c:180
+#: contrib/scalar/scalar.c:179
#, c-format
msgid "could not configure %s=%s"
msgstr "無法設定 %s=%s"
-#: contrib/scalar/scalar.c:198
+#: contrib/scalar/scalar.c:197
msgid "could not configure log.excludeDecoration"
msgstr "無法設定 log.excludeDecoration"
-#: contrib/scalar/scalar.c:219
+#: contrib/scalar/scalar.c:218
msgid "Scalar enlistments require a worktree"
msgstr "純量編列名單需要工作目錄"
-#: contrib/scalar/scalar.c:311
+#: contrib/scalar/scalar.c:310
#, c-format
msgid "remote HEAD is not a branch: '%.*s'"
msgstr "遠端 HEAD 不是分支:「%.*s」"
-#: contrib/scalar/scalar.c:317
+#: contrib/scalar/scalar.c:316
msgid "failed to get default branch name from remote; using local default"
msgstr "無法從遠端取得預設分支名稱。改用本機預設名稱"
-#: contrib/scalar/scalar.c:330
+#: contrib/scalar/scalar.c:329
msgid "failed to get default branch name"
msgstr "無法取得預設分支名稱"
-#: contrib/scalar/scalar.c:341
+#: contrib/scalar/scalar.c:340
msgid "failed to unregister repository"
msgstr "無法取消註冊版本庫"
-#: contrib/scalar/scalar.c:356
+#: contrib/scalar/scalar.c:355
msgid "failed to delete enlistment directory"
msgstr "無法刪除編列名單目錄"
-#: contrib/scalar/scalar.c:376
+#: contrib/scalar/scalar.c:375
msgid "branch to checkout after clone"
msgstr "複製後要簽出的分支"
-#: contrib/scalar/scalar.c:378
+#: contrib/scalar/scalar.c:377
msgid "when cloning, create full working directory"
msgstr "複製時建立完整的工作目錄"
-#: contrib/scalar/scalar.c:380
+#: contrib/scalar/scalar.c:379
msgid "only download metadata for the branch that will be checked out"
msgstr "只下載會簽出的分支中介資料"
-#: contrib/scalar/scalar.c:385
+#: contrib/scalar/scalar.c:384
msgid "scalar clone [<options>] [--] <repo> [<dir>]"
msgstr "scalar clone [<options>] [--] <repo> [<dir>]"
-#: contrib/scalar/scalar.c:410
+#: contrib/scalar/scalar.c:409
#, c-format
msgid "cannot deduce worktree name from '%s'"
msgstr "無法從「%s」推論工作區名稱"
-#: contrib/scalar/scalar.c:419
+#: contrib/scalar/scalar.c:418
#, c-format
msgid "directory '%s' exists already"
msgstr "「%s」目錄已經存在"
-#: contrib/scalar/scalar.c:446
+#: contrib/scalar/scalar.c:445
#, c-format
msgid "failed to get default branch for '%s'"
msgstr "無法取得「%s」的預設分支"
-#: contrib/scalar/scalar.c:457
+#: contrib/scalar/scalar.c:456
#, c-format
msgid "could not configure remote in '%s'"
msgstr "無法設定「%s」中的遠端"
-#: contrib/scalar/scalar.c:466
+#: contrib/scalar/scalar.c:465
#, c-format
msgid "could not configure '%s'"
msgstr "無法設定「%s」"
-#: contrib/scalar/scalar.c:469
+#: contrib/scalar/scalar.c:468
msgid "partial clone failed; attempting full clone"
msgstr "部分複製失敗。嘗試完整複製"
-#: contrib/scalar/scalar.c:473
+#: contrib/scalar/scalar.c:472
msgid "could not configure for full clone"
msgstr "無法設定完整複製"
-#: contrib/scalar/scalar.c:505
+#: contrib/scalar/scalar.c:504
msgid "`scalar list` does not take arguments"
msgstr "`scalar list` 未取引數"
-#: contrib/scalar/scalar.c:518
+#: contrib/scalar/scalar.c:517
msgid "scalar register [<enlistment>]"
msgstr "scalar register [<enlistment>]"
-#: contrib/scalar/scalar.c:545
+#: contrib/scalar/scalar.c:544
msgid "reconfigure all registered enlistments"
msgstr "重新設定所有註冊的編列名單"
-#: contrib/scalar/scalar.c:549
+#: contrib/scalar/scalar.c:548
msgid "scalar reconfigure [--all | <enlistment>]"
msgstr "scalar reconfigure [--all | <enlistment>]"
-#: contrib/scalar/scalar.c:567
+#: contrib/scalar/scalar.c:566
msgid "--all or <enlistment>, but not both"
msgstr "--all 或 <enlistment> 但不能傳入兩者"
-#: contrib/scalar/scalar.c:582
+#: contrib/scalar/scalar.c:581
#, c-format
msgid "git repository gone in '%s'"
msgstr "git 版本庫在「%s」遺失"
-#: contrib/scalar/scalar.c:622
+#: contrib/scalar/scalar.c:621
msgid ""
"scalar run <task> [<enlistment>]\n"
"Tasks:\n"
"scalar run <task> [<enlistment>]\n"
"作業:\n"
-#: contrib/scalar/scalar.c:640
+#: contrib/scalar/scalar.c:639
#, c-format
msgid "no such task: '%s'"
msgstr "無此作業:「%s」"
-#: contrib/scalar/scalar.c:690
+#: contrib/scalar/scalar.c:689
msgid "scalar unregister [<enlistment>]"
msgstr "scalar unregister [<enlistment>]"
-#: contrib/scalar/scalar.c:737
+#: contrib/scalar/scalar.c:736
msgid "scalar delete <enlistment>"
msgstr "scalar delete <enlistment>"
-#: contrib/scalar/scalar.c:752
+#: contrib/scalar/scalar.c:751
msgid "refusing to delete current working directory"
msgstr "拒絕刪除目前工作目錄"
-#: contrib/scalar/scalar.c:767
+#: contrib/scalar/scalar.c:766
msgid "include Git version"
msgstr "包含 Git 版本"
-#: contrib/scalar/scalar.c:769
+#: contrib/scalar/scalar.c:768
msgid "include Git's build options"
msgstr "包含 Git 組建選項"
-#: contrib/scalar/scalar.c:773
+#: contrib/scalar/scalar.c:772
msgid "scalar verbose [-v | --verbose] [--build-options]"
msgstr "scalar verbose [-v | --verbose] [--build-options]"
+#: contrib/scalar/scalar.c:813
+msgid "-C requires a <directory>"
+msgstr "-C 需要 <directory>"
+
+#: contrib/scalar/scalar.c:815
+#, c-format
+msgid "could not change to '%s'"
+msgstr "無法更改為「%s」"
+
#: contrib/scalar/scalar.c:821
+msgid "-c requires a <key>=<value> argument"
+msgstr "-c 需要 <key>=<value> 引數"
+
+#: contrib/scalar/scalar.c:839
msgid ""
-"scalar <command> [<options>]\n"
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
"\n"
"Commands:\n"
msgstr ""
-"scalar <command> [<options>]\n"
+"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
"\n"
"命令:\n"
msgid "no libc information available\n"
msgstr "沒有可用的 libc 資訊\n"
-#: list-objects-filter-options.h:94
+#: list-objects-filter-options.h:126
msgid "args"
msgstr "參數"
-#: list-objects-filter-options.h:95
+#: list-objects-filter-options.h:127
msgid "object filtering"
msgstr "物件過濾"
-#: parse-options.h:183
+#: parse-options.h:188
msgid "expiry-date"
msgstr "到期時間"
-#: parse-options.h:197
+#: parse-options.h:202
msgid "no-op (backward compatibility)"
msgstr "空動作(向後相容)"
-#: parse-options.h:310
+#: parse-options.h:341
msgid "be more verbose"
msgstr "更加詳細"
-#: parse-options.h:312
+#: parse-options.h:343
msgid "be more quiet"
msgstr "更加安靜"
-#: parse-options.h:318
+#: parse-options.h:349
msgid "use <n> digits to display object names"
msgstr "用 <n> 位數字顯示物件名稱"
-#: parse-options.h:337
+#: parse-options.h:368
msgid "how to strip spaces and #comments from message"
msgstr "設定如何刪除提交說明裡的空格和 #備註"
-#: parse-options.h:338
+#: parse-options.h:369
msgid "read pathspec from file"
msgstr "從檔案讀取 <路徑規格>"
-#: parse-options.h:339
+#: parse-options.h:370
msgid ""
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "如使用 --pathspec-from-file,則 <路徑規格> 元件會使用 NUL 字元分隔"
msgstr "顯示 Git 的說明訊息"
#: command-list.h:108
+msgid "Run git hooks"
+msgstr "執行 git 掛鉤"
+
+#: command-list.h:109
msgid "Server side implementation of Git over HTTP"
msgstr "Git HTTP 協定的服務端實現"
-#: command-list.h:109
+#: command-list.h:110
msgid "Download from a remote Git repository via HTTP"
msgstr "通過 HTTP 從遠端 Git 版本庫下載"
-#: command-list.h:110
+#: command-list.h:111
msgid "Push objects over HTTP/DAV to another repository"
msgstr "通過 HTTP/DAV 推送物件另一個版本庫"
-#: command-list.h:111
+#: command-list.h:112
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "從標準輸入將一組修補檔傳送到IMAP資料夾"
-#: command-list.h:112
+#: command-list.h:113
msgid "Build pack index file for an existing packed archive"
msgstr "從一個現存的包存檔檔案建立包索引"
-#: command-list.h:113
+#: command-list.h:114
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "建立一個空的 Git 版本庫或重新初始化一個已存在的版本庫"
-#: command-list.h:114
+#: command-list.h:115
msgid "Instantly browse your working repository in gitweb"
msgstr "在 gitweb 中即時瀏覽您的工作版本庫"
-#: command-list.h:115
+#: command-list.h:116
msgid "Add or parse structured information in commit messages"
msgstr "新增或解析提交說明中的結構化訊息"
-#: command-list.h:116
+#: command-list.h:117
msgid "Show commit logs"
msgstr "顯示提交日誌"
-#: command-list.h:117
+#: command-list.h:118
msgid "Show information about files in the index and the working tree"
msgstr "顯示索引和工作區中檔案的訊息"
-#: command-list.h:118
+#: command-list.h:119
msgid "List references in a remote repository"
msgstr "顯示一個遠端版本庫的引用"
-#: command-list.h:119
+#: command-list.h:120
msgid "List the contents of a tree object"
msgstr "顯示一個樹狀物件的內容"
-#: command-list.h:120
+#: command-list.h:121
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "從單個電子信件中擷取修補檔和作者身份"
-#: command-list.h:121
+#: command-list.h:122
msgid "Simple UNIX mbox splitter program"
msgstr "簡單的 UNIX mbox 信箱切分程式"
-#: command-list.h:122
+#: command-list.h:123
msgid "Run tasks to optimize Git repository data"
msgstr "執行用來最佳化 Git 版本庫資料的作業"
-#: command-list.h:123
+#: command-list.h:124
msgid "Join two or more development histories together"
msgstr "合併兩個或更多開發歷史"
-#: command-list.h:124
+#: command-list.h:125
msgid "Find as good common ancestors as possible for a merge"
msgstr "為了合併尋找儘可能好的公共祖先提交"
-#: command-list.h:125
+#: command-list.h:126
msgid "Run a three-way file merge"
msgstr "執行一個三路檔案合併"
-#: command-list.h:126
+#: command-list.h:127
msgid "Run a merge for files needing merging"
msgstr "對於需要合併的檔案執行合併"
-#: command-list.h:127
+#: command-list.h:128
msgid "The standard helper program to use with git-merge-index"
msgstr "與 git-merge-index 一起使用的標準嚮導程式"
-#: command-list.h:128
+#: command-list.h:129
msgid "Show three-way merge without touching index"
msgstr "顯示三路合併而不動索引"
-#: command-list.h:129
+#: command-list.h:130
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "執行合併衝突解決工具以解決合併衝突"
-#: command-list.h:130
+#: command-list.h:131
msgid "Creates a tag object with extra validation"
msgstr "建立有額外驗證的標籤物件"
-#: command-list.h:131
+#: command-list.h:132
msgid "Build a tree-object from ls-tree formatted text"
msgstr "基於 ls-tree 的格式化文字建立一個樹狀物件"
-#: command-list.h:132
+#: command-list.h:133
msgid "Write and verify multi-pack-indexes"
msgstr "寫入和驗證多包索引"
-#: command-list.h:133
+#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "移動或重新命名一個檔案、目錄或符號連結"
# 尋找提供版本的符號名稱
-#: command-list.h:134
+#: command-list.h:135
msgid "Find symbolic names for given revs"
msgstr "尋找提供版本的符號名稱"
-#: command-list.h:135
+#: command-list.h:136
msgid "Add or inspect object notes"
msgstr "新增或檢查物件備註"
-#: command-list.h:136
+#: command-list.h:137
msgid "Import from and submit to Perforce repositories"
msgstr "匯入和提交到 Perforce 版本庫中"
-#: command-list.h:137
+#: command-list.h:138
msgid "Create a packed archive of objects"
msgstr "建立物件的存檔包"
-#: command-list.h:138
+#: command-list.h:139
msgid "Find redundant pack files"
msgstr "尋找冗餘的包檔案"
-#: command-list.h:139
+#: command-list.h:140
msgid "Pack heads and tags for efficient repository access"
msgstr "打包頭和標籤以實現高效的版本庫存取"
-#: command-list.h:140
+#: command-list.h:141
msgid "Compute unique ID for a patch"
msgstr "計算一個修補檔的唯一 ID"
-#: command-list.h:141
+#: command-list.h:142
msgid "Prune all unreachable objects from the object database"
-msgstr "å\88ªé\99¤ç\89©ä»¶åº«ä¸æ\89\80æ\9c\89ç\84¡æ³\95å\8f\96å¾\97物件"
+msgstr "å\89ªé\99¤ç\89©ä»¶åº«ä¸æ\89\80æ\9c\89ç\84¡æ³\95å\8f\96å¾\97ç\9a\84物件"
-#: command-list.h:142
+#: command-list.h:143
msgid "Remove extra objects that are already in pack files"
msgstr "刪除已經在包檔案中的多餘物件"
-#: command-list.h:143
+#: command-list.h:144
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "取得並整合另外的版本庫或一個本機分支"
-#: command-list.h:144
+#: command-list.h:145
msgid "Update remote refs along with associated objects"
msgstr "更新遠端引用和相關的物件"
-#: command-list.h:145
+#: command-list.h:146
msgid "Applies a quilt patchset onto the current branch"
msgstr "將一個 quilt 修補檔集合套用到目前分支"
-#: command-list.h:146
+#: command-list.h:147
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr "比較兩個提交範圍(如一個分支的兩個版本)"
-#: command-list.h:147
+#: command-list.h:148
msgid "Reads tree information into the index"
msgstr "將樹訊息讀取到索引"
-#: command-list.h:148
+#: command-list.h:149
msgid "Reapply commits on top of another base tip"
msgstr "在另一個分支上重新套用提交"
-#: command-list.h:149
+#: command-list.h:150
msgid "Receive what is pushed into the repository"
msgstr "接收推送到版本庫中的物件"
-#: command-list.h:150
+#: command-list.h:151
msgid "Manage reflog information"
msgstr "管理 reflog 訊息"
-#: command-list.h:151
+#: command-list.h:152
msgid "Manage set of tracked repositories"
msgstr "管理已追蹤版本庫"
-#: command-list.h:152
+#: command-list.h:153
msgid "Pack unpacked objects in a repository"
msgstr "打包版本庫中未打包物件"
-#: command-list.h:153
+#: command-list.h:154
msgid "Create, list, delete refs to replace objects"
msgstr "建立、列出、刪除物件取代引用"
-#: command-list.h:154
+#: command-list.h:155
msgid "Generates a summary of pending changes"
msgstr "生成待定更改的摘要"
-#: command-list.h:155
+#: command-list.h:156
msgid "Reuse recorded resolution of conflicted merges"
msgstr "重用衝突合併的解決方案記錄"
-#: command-list.h:156
+#: command-list.h:157
msgid "Reset current HEAD to the specified state"
msgstr "重設目前 HEAD 到指定狀態"
-#: command-list.h:157
+#: command-list.h:158
msgid "Restore working tree files"
msgstr "復原工作區檔案"
-#: command-list.h:158
+#: command-list.h:159
msgid "Lists commit objects in reverse chronological order"
msgstr "按時間順序列出提交物件"
-#: command-list.h:159
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "選出並處理參數"
-#: command-list.h:160
+#: command-list.h:161
msgid "Revert some existing commits"
msgstr "還原一些現存提交"
-#: command-list.h:161
+#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr "從工作區和索引中刪除檔案"
-#: command-list.h:162
+#: command-list.h:163
msgid "Send a collection of patches as emails"
msgstr "透過電子信件傳送一組修補檔"
-#: command-list.h:163
+#: command-list.h:164
msgid "Push objects over Git protocol to another repository"
msgstr "使用 Git 協定推送物件到另一個版本庫"
-#: command-list.h:164
+#: command-list.h:165
msgid "Git's i18n setup code for shell scripts"
msgstr "為 shell 腳本準備的 Git 國際化設定程式碼"
-#: command-list.h:165
+#: command-list.h:166
msgid "Common Git shell script setup code"
msgstr "常用的 Git shell 腳本設定程式碼"
-#: command-list.h:166
+#: command-list.h:167
msgid "Restricted login shell for Git-only SSH access"
msgstr "只允許 Git SSH 存取的受限登入shell"
-#: command-list.h:167
+#: command-list.h:168
msgid "Summarize 'git log' output"
msgstr "'git log' 輸出摘要"
-#: command-list.h:168
+#: command-list.h:169
msgid "Show various types of objects"
msgstr "顯示各種類型的物件"
-#: command-list.h:169
+#: command-list.h:170
msgid "Show branches and their commits"
msgstr "顯示分支和提交"
-#: command-list.h:170
+#: command-list.h:171
msgid "Show packed archive index"
msgstr "顯示打包歸檔索引"
-#: command-list.h:171
+#: command-list.h:172
msgid "List references in a local repository"
msgstr "顯示本機版本庫中的引用"
-#: command-list.h:172
-msgid "Initialize and modify the sparse-checkout"
-msgstr "初始化並修改稀疏簽出"
-
+# 譯者:中文字串拼接,可刪除前導空格
#: command-list.h:173
+msgid "Reduce your working tree to a subset of tracked files"
+msgstr "將工作區限縮至只包含追蹤檔案的子集"
+
+#: command-list.h:174
msgid "Add file contents to the staging area"
msgstr "將檔案內容新增到索引"
-#: command-list.h:174
+#: command-list.h:175
msgid "Stash the changes in a dirty working directory away"
msgstr "儲藏髒工作區中的修改"
-#: command-list.h:175
+#: command-list.h:176
msgid "Show the working tree status"
msgstr "顯示工作區狀態"
-#: command-list.h:176
+#: command-list.h:177
msgid "Remove unnecessary whitespace"
msgstr "刪除不必要的空白字元"
-#: command-list.h:177
+#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "初始化、更新或檢查子模組"
-#: command-list.h:178
+#: command-list.h:179
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Subversion 版本庫和 Git 之間的雙向動作"
-#: command-list.h:179
+#: command-list.h:180
msgid "Switch branches"
msgstr "切換分支"
-#: command-list.h:180
+#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "讀取、修改和刪除符號引用"
-#: command-list.h:181
+#: command-list.h:182
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "建立、列出、刪除或驗證一個 GPG 簽名的標籤物件"
-#: command-list.h:182
+#: command-list.h:183
msgid "Creates a temporary file with a blob's contents"
msgstr "用資料物件的內容建立暫存檔"
-#: command-list.h:183
+#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "從打包檔案中解壓縮物件"
-#: command-list.h:184
+#: command-list.h:185
msgid "Register file contents in the working tree to the index"
msgstr "將工作區的檔案內容註冊到索引"
-#: command-list.h:185
+#: command-list.h:186
msgid "Update the object name stored in a ref safely"
msgstr "安全地更新儲存於引用中的物件名稱"
-#: command-list.h:186
+#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr "更新輔助訊息檔案以協助啞協定服務"
-#: command-list.h:187
+#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "將存檔傳送回 git-archive"
-#: command-list.h:188
+#: command-list.h:189
msgid "Send objects packed back to git-fetch-pack"
msgstr "將物件壓縮包傳送回 git-fetch-pack"
-#: command-list.h:189
+#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "顯示 Git 邏輯變數"
-#: command-list.h:190
+#: command-list.h:191
msgid "Check the GPG signature of commits"
msgstr "檢查 GPG 提交簽名"
-#: command-list.h:191
+#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "驗證打包的 Git 封存檔案"
-#: command-list.h:192
+#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "檢查標籤的 GPG 簽名"
-#: command-list.h:193
+#: command-list.h:194
msgid "Show logs with difference each commit introduces"
msgstr "顯示每一個提交引入的差異日誌"
-#: command-list.h:194
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "管理多個工作區"
-#: command-list.h:195
+#: command-list.h:196
msgid "Create a tree object from the current index"
msgstr "從目前索引建立一個樹狀物件"
-#: command-list.h:196
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "定義路徑的屬性"
-#: command-list.h:197
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Git 指令列介面和約定"
-#: command-list.h:198
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "面向開發人員的 Git 核心教學"
-#: command-list.h:199
+#: command-list.h:200
msgid "Providing usernames and passwords to Git"
msgstr "將使用者名稱及密碼提供給 Git"
-#: command-list.h:200
+#: command-list.h:201
msgid "Git for CVS users"
msgstr "適合 CVS 使用者的 Git 協助"
-#: command-list.h:201
+#: command-list.h:202
msgid "Tweaking diff output"
msgstr "調整差異輸出"
-#: command-list.h:202
+#: command-list.h:203
msgid "A useful minimum set of commands for Everyday Git"
msgstr "每一天 Git 的一組有用的最小指令集合"
-#: command-list.h:203
+#: command-list.h:204
msgid "Frequently asked questions about using Git"
msgstr "Git 使用的常見問題"
-#: command-list.h:204
+#: command-list.h:205
msgid "A Git Glossary"
msgstr "Git 詞彙表"
-#: command-list.h:205
+#: command-list.h:206
msgid "Hooks used by Git"
msgstr "Git 使用的掛鉤"
-#: command-list.h:206
+#: command-list.h:207
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未追蹤檔案"
-#: command-list.h:207
+#: command-list.h:208
msgid "The Git repository browser"
msgstr "Git 版本庫瀏覽器"
-#: command-list.h:208
+#: command-list.h:209
msgid "Map author/committer names and/or E-Mail addresses"
msgstr "映射作者或提交者的名稱和(或)電子信箱地址"
-#: command-list.h:209
+#: command-list.h:210
msgid "Defining submodule properties"
msgstr "定義子模組屬性"
-#: command-list.h:210
+#: command-list.h:211
msgid "Git namespaces"
msgstr "Git 名字空間"
-#: command-list.h:211
+#: command-list.h:212
msgid "Helper programs to interact with remote repositories"
msgstr "用來與遠端版本庫互動的協助工具"
-#: command-list.h:212
+#: command-list.h:213
msgid "Git Repository Layout"
msgstr "Git 版本庫配置"
-#: command-list.h:213
+#: command-list.h:214
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本範圍"
-#: command-list.h:214
+#: command-list.h:215
msgid "Mounting one repository inside another"
msgstr "在某個版本庫掛載某個版本庫"
-#: command-list.h:215
+#: command-list.h:216
msgid "A tutorial introduction to Git"
msgstr "一個 Git 教學"
-#: command-list.h:216
+#: command-list.h:217
msgid "A tutorial introduction to Git: part two"
msgstr "一個 Git 教學:第二部分"
-#: command-list.h:217
+#: command-list.h:218
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Git web 介面(Git 版本庫的 web 前端)"
-#: command-list.h:218
+#: command-list.h:219
msgid "An overview of recommended workflows with Git"
msgstr "Git 推薦的工作流概覽"
msgid "Simple merge did not work, trying automatic merge."
msgstr "簡單合併未生效,嘗試自動合併。"
-#: git-submodule.sh:401
-#, sh-format
-msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "無法在子模組路徑 '$displaypath' 中找到目前版本"
-
-#: git-submodule.sh:411
-#, sh-format
-msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "無法在子模組路徑 '$sm_path' 中取得"
-
-#: git-submodule.sh:416
-#, sh-format
-msgid ""
-"Unable to find current ${remote_name}/${branch} revision in submodule path "
-"'$sm_path'"
-msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}"
-
-#: git-submodule.sh:464
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "無法遞迴進子模組路徑 '$displaypath'"
-
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "用法:$dashless $USAGE"
-#: git-sh-setup.sh:183
+#: git-sh-setup.sh:182
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "不能切換目錄到 $cdup,工作區的頂級目錄"
-#: git-sh-setup.sh:192 git-sh-setup.sh:199
+#: git-sh-setup.sh:191 git-sh-setup.sh:198
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "致命錯誤:$program_name 不能在沒有工作區的情況下使用。"
-#: git-sh-setup.sh:213
+#: git-sh-setup.sh:212
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "不能重寫分支:您有未暫存的變更。"
-#: git-sh-setup.sh:216
+#: git-sh-setup.sh:215
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "不能 $action:您有未暫存的變更。"
-#: git-sh-setup.sh:227
+#: git-sh-setup.sh:226
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "不能 $action:您的索引中包含未提交的變更。"
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:228
msgid "Additionally, your index contains uncommitted changes."
msgstr "而且您的索引中包含未提交的變更。"
-#: git-sh-setup.sh:349
+#: git-sh-setup.sh:348
msgid "You need to run this command from the toplevel of the working tree."
msgstr "您需要在工作區的頂級目錄中執行這個指令。"
-#: git-sh-setup.sh:354
+#: git-sh-setup.sh:353
msgid "Unable to determine absolute path of git directory"
msgstr "不能確定 git 目錄的絕對路徑"
msgid "invalid transfer encoding"
msgstr "無效的傳送編碼"
-#: git-send-email.perl:2095
+#: git-send-email.perl:2100
#, perl-format
msgid ""
-"fatal: %s: rejected by sendemail-validate hook\n"
+"fatal: %s: rejected by %s hook\n"
"%s\n"
"warning: no patches were sent\n"
msgstr ""
-"致命錯誤:%s:被 sendemail-validate 掛鈎拒絕\n"
+"致命錯誤:%s:被 %s 掛鈎拒絕\n"
"%s\n"
"警告:修補檔未能傳送\n"
-#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
+#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "不能開啟 %s:%s\n"
-#: git-send-email.perl:2108
+#: git-send-email.perl:2113
#, perl-format
msgid ""
"fatal: %s:%d is longer than 998 characters\n"
"致命錯誤:%s:%d 的字元數超過 998\n"
"警告:修補檔未能傳送\n"
-#: git-send-email.perl:2126
+#: git-send-email.perl:2131
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "略過 %s 含備份後綴 '%s'。\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2130
+#: git-send-email.perl:2135
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要傳送 %s?[y|N]: "
+#, perl-format
+#~ msgid "fatal: %s: rejected by %s hook\n"
+#~ msgstr "致命錯誤:%s:被 %s 掛勾拒絕\n"
+
+#~ msgid "git archive --list"
+#~ msgstr "git archive --list"
+
+#, c-format
+#~ msgid "unknown value for --diff-merges: %s"
+#~ msgstr "--diff-merges 的值無效:%s"
+
+#, c-format
+#~ msgid "invalid value '%s' for lsrefs.unborn"
+#~ msgstr "lsrefs.unborn 的值「%s」無效"
+
+#~ msgid "backend for `git stash -p`"
+#~ msgstr "`git stash -p` 的後端"
+
+#, c-format
+#~ msgid "Invalid value for --empty: %s"
+#~ msgstr "傳入 --empty 的值無效:%s"
+
+#, c-format
+#~ msgid "Invalid value for --patch-format: %s"
+#~ msgstr "無效的 --patch-format 值:%s"
+
+#, c-format
+#~ msgid "Invalid value for --show-current-patch: %s"
+#~ msgstr "無效的 --show-current-patch 值:%s"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad "
+#~ "| --term-new]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad "
+#~ "| --term-new]"
+
+#~ msgid "git bisect--helper --bisect-next"
+#~ msgstr "git bisect--helper --bisect-next"
+
+#~ msgid "git bisect--helper --bisect-visualize"
+#~ msgstr "git bisect--helper --bisect-visualize"
+
+#, c-format
+#~ msgid "invalid color '%s' in color.blame.repeatedLines"
+#~ msgstr "設定 color.blame.repeatedLines 中的無效顏色 '%s'"
+
+#~ msgid "invalid value for blame.coloring"
+#~ msgstr "設定 blame.coloring 中的無效取值"
+
+#~ msgid ""
+#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e "
+#~ "| -p | <type> | --textconv | --filters) [--path=<path>] <object>"
+#~ msgstr ""
+#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e "
+#~ "| -p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"
+
+#~ msgid "show object type"
+#~ msgstr "顯示物件類型"
+
+#~ msgid "exit with zero when there's no error"
+#~ msgstr "當沒有錯誤時離開並返回零"
+
+#~ msgid "show info and content of objects fed from the standard input"
+#~ msgstr "顯示從標準輸入提供的物件的訊息和內容"
+
+#~ msgid "show info about objects fed from the standard input"
+#~ msgstr "顯示從標準輸入提供的物件的訊息"
+
+#~ msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+#~ msgstr "跟隨樹內符號連結(和 --batch 或 --batch-check 共用)"
+
+#~ msgid "show all objects with --batch or --batch-check"
+#~ msgstr "使用 --batch 或 --batch-check 參數顯示所有物件"
+
+#~ msgid "do not order --batch-all-objects output"
+#~ msgstr "不要對 --batch-all-objects 的輸出排序"
+
+#~ msgid "set up tracking mode (see git-pull(1))"
+#~ msgstr "設定追蹤模式(參見 git-pull(1))"
+
+#~ msgid "Using both --reset-author and --author does not make sense"
+#~ msgstr "同時使用 --reset-author 和 --author 沒有意義"
+
+#~ msgid "Options --squash and --fixup cannot be used together"
+#~ msgstr "選項 --squash 和 --fixup 不能同時使用"
+
+#~ msgid "Only one of -c/-C/-F/--fixup can be used."
+#~ msgstr "只能用一個 -c/-C/-F/--fixup 選項。"
+
+#~ msgid "Option -m cannot be combined with -c/-C/-F."
+#~ msgstr "選項 -m 不能和 -c/-C/-F 同時使用。"
+
+#~ msgid ""
+#~ "Only one of --include/--only/--all/--interactive/--patch can be used."
+#~ msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。"
+
+#~ msgid "git count-objects [-v] [-H | --human-readable]"
+#~ msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#, c-format
+#~ msgid "configuration fetch.output contains invalid value %s"
+#~ msgstr "設定變數 fetch.output 包含無效值 %s"
+
+#~ msgid "--cached or --untracked cannot be used with --no-index"
+#~ msgstr "--cached 或 --untracked 不能與 --no-index 同時使用"
+
+#~ msgid "--untracked cannot be used with --cached"
+#~ msgstr "--untracked 不能與 --cached 一起使用"
+
+#~ msgid "git hash-object --stdin-paths"
+#~ msgstr "git hash-object --stdin-paths"
+
+#~ msgid "git help [-g|--guides]"
+#~ msgstr "git help [-g|--guides]"
+
+#~ msgid "git help [-c|--config]"
+#~ msgstr "git help [-c|--config]"
+
+#~ msgid "git mktag"
+#~ msgstr "git mktag"
+
+#~ msgid "git mktree [-z] [--missing] [--batch]"
+#~ msgstr "git mktree [-z] [--missing] [--batch]"
+
+#~ msgid "read from stdin"
+#~ msgstr "從標準輸入讀取"
+
+#~ msgid "git notes merge --commit [-v | -q]"
+#~ msgstr "git notes merge --commit [-v | -q]"
+
+#~ msgid "git notes merge --abort [-v | -q]"
+#~ msgstr "git notes merge --abort [-v | -q]"
+
+#~ msgid "git notes get-ref"
+#~ msgstr "git notes get-ref"
+
+#~ msgid "invalid value for --missing"
+#~ msgstr "選項 --missing 的值無效"
+
+#~ msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+#~ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#, c-format
+#~ msgid "Invalid value for %s: %s"
+#~ msgstr "%s 的值無效:%s"
+
+#, c-format
+#~ msgid "Invalid value for pull.ff: %s"
+#~ msgstr "pull.ff 的取值無效:%s"
+
+#~ msgid "git rebase --continue | --abort | --skip | --edit-todo"
+#~ msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+
+#, c-format
+#~ msgid "'%s' is not a valid timestamp"
+#~ msgstr "'%s' 不是一個有效的時間戳"
+
+#~ msgid "git reflog [ show | expire | delete | exists ]"
+#~ msgstr "git reflog [ show | expire | delete | exists ]"
+
+#~ msgid "git remote [-v | --verbose]"
+#~ msgstr "git remote [-v | --verbose]"
+
+#~ msgid "git replace [-f] --convert-graft-file"
+#~ msgstr "git replace [-f] --convert-graft-file"
+
+#, c-format
+#~ msgid ""
+#~ "\n"
+#~ "It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
+#~ "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
+#~ "to make this the default.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "重設後,枚舉未暫存變更花費了 %.2f 秒。 您可以使用 '--quiet' 避免此情況。\n"
+#~ "將設定變數 reset.quiet 設定為 true 可使其成為預設值。\n"
+
+#~ msgid "git sparse-checkout list"
+#~ msgstr "git sparse-checkout list"
+
+#~ msgid "unable to upgrade repository format to enable worktreeConfig"
+#~ msgstr "無法升級版本庫格式,以致無法啟用 worktreeConfig"
+
+#~ msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+#~ msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#~ msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+#~ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#~ msgid "git sparse-checkout disable"
+#~ msgstr "git sparse-checkout disable"
+
+#~ msgid ""
+#~ "the stash.useBuiltin support has been removed!\n"
+#~ "See its entry in 'git help config' for details."
+#~ msgstr ""
+#~ "對 stash.useBuiltin 的支援已被刪除!\n"
+#~ "詳見「git help config」中的條目。"
+
+#~ msgid "git stripspace [-s | --strip-comments]"
+#~ msgstr "git stripspace [-s | --strip-comments]"
+
+#~ msgid "git stripspace [-c | --comment-lines]"
+#~ msgstr "git stripspace [-c | --comment-lines]"
+
+#~ msgid "submodule--helper print-default-remote takes no arguments"
+#~ msgstr "submodule--helper print-default-remote 不帶參數"
+
+#~ msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+#~ msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]"
+
+#~ msgid "suppress output for update by rebase or merge"
+#~ msgstr "隱藏 rebase 或 merge 觸發之更新的輸出"
+
+#~ msgid "overrides update mode in case the repository is a fresh clone"
+#~ msgstr "如果版本庫是剛複製的,就覆蓋更新模式"
+
+#~ msgid "depth for shallow fetch"
+#~ msgstr "淺 fetch 的深度"
+
+#~ msgid "sha1"
+#~ msgstr "sha1"
+
+#~ msgid "SHA1 expected by superproject"
+#~ msgstr "上層專案預期應是 SHA1"
+
+#~ msgid "subsha1"
+#~ msgstr "subsha1"
+
+#~ msgid "SHA1 of submodule's HEAD"
+#~ msgstr "子模組 HEAD 的 SHA1"
+
+#~ msgid "git submodule--helper run-update-procedure [<options>] <path>"
+#~ msgstr "git submodule--helper run-update-procedure [<選項>] [<路徑>]"
+
+#~ msgid "git submodule--helper config --check-writeable"
+#~ msgstr "git submodule--helper config --check-writeable"
+
+#~ msgid "git update-server-info [--force]"
+#~ msgstr "git update-server-info [--force]"
+
+#~ msgid "Initialize and modify the sparse-checkout"
+#~ msgstr "初始化並修改稀疏簽出"
+
+#, sh-format
+#~ msgid ""
+#~ "Unable to find current ${remote_name}/${branch} revision in submodule "
+#~ "path '$sm_path'"
+#~ msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}"
+
+#, sh-format
+#~ msgid "Failed to recurse into submodule path '$displaypath'"
+#~ msgstr "無法遞迴進子模組路徑 '$displaypath'"
+
#~ msgid "--index outside a repository"
#~ msgstr "--index 在版本庫之外"
#~ msgid "cannot store pack file"
#~ msgstr "無法儲存包檔案"
-#~ msgid "cannot store index file"
-#~ msgstr "無法儲存索引檔案"
-
#~ msgid "exclude patterns are read from <file>"
#~ msgstr "從 <檔案> 中讀取排除模式"
#~ msgid "socket/pipe already in use: '%s'"
#~ msgstr "通訊端 (socket) 或管道 (pipe) 已在使用:「%s」"
-#~ msgid "could not start server on: '%s'"
-#~ msgstr "無法在下述位置啟動伺服器:「%s」"
-
#~ msgid "could not spawn daemon in the background"
#~ msgstr "無法在背景啟動 (spawn) 守護程式"
#~ msgid "waitpid failed"
#~ msgstr "waitpid 失敗"
-#~ msgid "daemon not online yet"
-#~ msgstr "守護程式尚未上線"
-
-#~ msgid "daemon failed to start"
-#~ msgstr "無法啟動守護程式"
-
#~ msgid "waitpid is confused"
#~ msgstr "waitpid 被混淆"
#~ msgid "Error deleting remote-tracking branch '%s'"
#~ msgstr "無法刪除遠端追蹤分支 '%s'"
-#~ msgid "Error deleting branch '%s'"
-#~ msgstr "無法刪除分支 '%s'"
-
#~ msgid "show parse tree for grep expression"
#~ msgstr "顯示 grep 表達式的解析樹"